Merge branch 'main' into release

Author: reearth-app[bot]

server/.env.example

@@ -23,6 +23,9 @@ REEARTH_COGNITO_REGION=
 REEARTH_COGNITO_USERPOOLID=
 REEARTH_COGNITO_CLIENTID=
 
+# Local Mock Auth
+REEARTH_MOCKAUTH=
+
 # Auth client
 #REEARTH_AUTH_ISS=https://hoge.com
 #REEARTH_AUTH_AUD=https://api.reearth.example.com

server/Makefile

@@ -13,6 +13,7 @@ help:
 	@echo "  run-app    Run the application"
 	@echo "  run-db     Run the MongoDB database using Docker Compose"
 	@echo "  gql        Generate GraphQL code"
+	@echo "  mockuser   Create a mock user by executing a curl request"
 
 lint:
 	golangci-lint run --fix
@@ -38,4 +39,7 @@ run-db:
 gql:
 	go generate ./internal/adapter/gql
 
-.PHONY: lint test failcheck e2e build run-app run-db gql
+mockuser:
+	curl -H 'Content-Type: application/json' -d '{"email": "[email protected]", "username": "Mock User"}' http://localhost:8080/api/signup
+
+.PHONY: lint test failcheck e2e build run-app run-db gql mockuser

server/e2e/gql_project_test.go

@@ -210,10 +210,15 @@ func TestFindStarredByWorkspace(t *testing.T) {
 	project2ID := createProject(e, "Project 2")
 	project3ID := createProject(e, "Project 3")
 	project4ID := createProject(e, "Project 4")
+	project5ID := createProject(e, "Project 5")
 
 	starProject(e, project1ID)
 	starProject(e, project3ID)
 
+	// star and deleted 'Project 5'
+	starProject(e, project5ID)
+	deleteProject(e, project5ID)
+
 	requestBody := GraphQLRequest{
 		OperationName: "GetStarredProjects",
 		Query: `
@@ -251,6 +256,8 @@ func TestFindStarredByWorkspace(t *testing.T) {
 	nodeCount := int(nodes.Length().Raw())
 	assert.Equal(t, 2, nodeCount, "Expected 2 nodes in the response")
 
+	nodes.Length().Equal(2) // 'Project 1' and 'Project 3'
+
 	starredProjectsMap := make(map[string]bool)
 	for _, node := range nodes.Iter() {
 		obj := node.Object()
@@ -275,7 +282,6 @@ func TestFindStarredByWorkspace(t *testing.T) {
 	assert.True(t, starredProjectsMap[project3ID], "Project 3 should be starred")
 	assert.False(t, starredProjectsMap[project2ID], "Project 2 should not be starred")
 	assert.False(t, starredProjectsMap[project4ID], "Project 4 should not be starred")
-
 }
 
 func starProject(e *httpexpect.Expect, projectID string) {
@@ -449,6 +455,96 @@ func TestSortByUpdatedAt(t *testing.T) {
 
 	edges.Length().Equal(3)
 	edges.Element(0).Object().Value("node").Object().Value("name").Equal("project2-test") // 'project2' is first
-	edges.Element(1).Object().Value("node").Object().Value("name").Equal("project3-test")
-	edges.Element(2).Object().Value("node").Object().Value("name").Equal("project1-test")
+}
+
+//  go test -v -run TestDeleteProjects ./e2e/...
+
+func TestDeleteProjects(t *testing.T) {
+
+	e := StartServer(t, &config.Config{
+		Origins: []string{"https://example.com"},
+		AuthSrv: config.AuthSrvConfig{
+			Disabled: true,
+		},
+	}, true, baseSeeder)
+
+	createProject(e, "project1-test")
+	project2ID := createProject(e, "project2-test")
+	createProject(e, "project3-test")
+
+	// Deleted 'project2'
+	deleteProject(e, project2ID)
+
+	// check
+	requestBody := GraphQLRequest{
+		OperationName: "GetDeletedProjects",
+		Query: `
+			query GetDeletedProjects($teamId: ID!) {
+				deletedProjects(teamId: $teamId) {
+					nodes {
+						id
+						name
+						isDeleted
+					}
+					totalCount
+				}
+			}`,
+		Variables: map[string]any{
+			"teamId": wID,
+		},
+	}
+	deletedProjects := e.POST("/api/graphql").
+		WithHeader("Origin", "https://example.com").
+		WithHeader("X-Reearth-Debug-User", uID.String()).
+		WithHeader("Content-Type", "application/json").
+		WithJSON(requestBody).
+		Expect().
+		Status(http.StatusOK).
+		JSON().
+		Object().Value("data").Object().Value("deletedProjects").Object()
+
+	deletedProjects.Value("totalCount").Equal(1)
+	deletedProjects.Value("nodes").Array().Length().Equal(1)
+	deletedProjects.Value("nodes").Array().First().Object().Value("name").Equal("project2-test")
+}
+
+func deleteProject(e *httpexpect.Expect, projectID string) {
+
+	updateProjectMutation := GraphQLRequest{
+		OperationName: "UpdateProject",
+		Query: `mutation UpdateProject($input: UpdateProjectInput!) {
+			updateProject(input: $input) {
+				project {
+					id
+					name
+					isDeleted
+					updatedAt
+					__typename
+				}
+				__typename
+			}
+		}`,
+		Variables: map[string]any{
+			"input": map[string]any{
+				"projectId": projectID,
+				"deleted":   true,
+			},
+		},
+	}
+
+	response := e.POST("/api/graphql").
+		WithHeader("Origin", "https://example.com").
+		WithHeader("X-Reearth-Debug-User", uID.String()).
+		WithHeader("Content-Type", "application/json").
+		WithJSON(updateProjectMutation).
+		Expect().
+		Status(http.StatusOK).
+		JSON().
+		Object().
+		Value("data").Object().
+		Value("updateProject").Object().
+		Value("project").Object()
+
+	response.ValueEqual("id", projectID).
+		ValueEqual("isDeleted", true)
 }

server/e2e/gql_storytelling_test.go

@@ -1048,7 +1048,7 @@ func TestStoryPublishing(t *testing.T) {
 	_, err = buf.ReadFrom(rc)
 	assert.NoError(t, err)
 
-	pub := regexp.MustCompile(fmt.Sprintf(`{"schemaVersion":1,"id":"%s","publishedAt":".*","property":{"tiles":\[{"id":".*"}]},"plugins":{},"layers":null,"widgets":\[],"widgetAlignSystem":null,"tags":\[],"clusters":\[],"story":{"id":"%s","property":{},"pages":\[{"id":"%s","property":{},"title":"test","blocks":\[{"id":"%s","property":{"default":{"text":"test value"},"panel":{"padding":{"top":2,"bottom":3,"left":0,"right":1}}},"plugins":null,"extensionId":"%s","pluginId":"%s"}],"swipeable":true,"swipeableLayers":\[],"layers":\[]}],"position":"left","bgColor":""},"nlsLayers":null,"layerStyles":null,"coreSupport":true,"enableGa":false,"trackingId":""}`, sID, storyID, pageID, blockID, extensionId, pluginId))
+	pub := regexp.MustCompile(fmt.Sprintf(`{"schemaVersion":1,"id":"%s","publishedAt":".*","property":{"tiles":\[{"id":".*"}]},"plugins":{},"layers":null,"widgets":\[],"widgetAlignSystem":null,"tags":\[],"clusters":\[],"story":{"id":"%s","title":"","property":{},"pages":\[{"id":"%s","property":{},"title":"test","blocks":\[{"id":"%s","property":{"default":{"text":"test value"},"panel":{"padding":{"top":2,"bottom":3,"left":0,"right":1}}},"plugins":null,"extensionId":"%s","pluginId":"%s"}],"swipeable":true,"swipeableLayers":\[],"layers":\[]}],"position":"left","bgColor":""},"nlsLayers":null,"layerStyles":null,"coreSupport":true,"enableGa":false,"trackingId":""}`, sID, storyID, pageID, blockID, extensionId, pluginId))
 	assert.Regexp(t, pub, buf.String())
 
 	resString := e.GET("/p/test-alias/data.json").

server/e2e/mock_test.go

@@ -0,0 +1,57 @@
+package e2e
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/reearth/reearth/server/internal/app/config"
+)
+
+// go test -v -run TestMockAuth ./e2e/...
+
+func TestMockAuth(t *testing.T) {
+	e := StartServer(t, &config.Config{
+		Dev:      true,
+		MockAuth: true,
+		Origins:  []string{"https://example.com"},
+		AuthSrv: config.AuthSrvConfig{
+			Disabled: true,
+		},
+	}, true, nil)
+
+	requestBody := map[string]interface{}{
+		"email":    "[email protected]",
+		"username": "Mock User",
+	}
+
+	response := e.POST("/api/signup").
+		WithJSON(requestBody).
+		Expect().
+		Status(http.StatusOK).
+		JSON()
+
+	response.Object().ContainsKey("id")
+	response.Object().ValueEqual("email", "[email protected]")
+	response.Object().ValueEqual("name", "Mock User")
+	userId := response.Object().Value("id").String().Raw()
+
+	// checkj query GetMe
+	requestBody2 := GraphQLRequest{
+		OperationName: "GetMe",
+		Query:         "query GetMe { \n me { \n id \n name \n email\n } \n}",
+		Variables:     map[string]any{},
+	}
+	response2 := e.POST("/api/graphql").
+		WithHeader("Origin", "https://example.com").
+		WithHeader("X-Reearth-Debug-User", userId).
+		WithHeader("Content-Type", "application/json").
+		WithJSON(requestBody2).
+		Expect().
+		Status(http.StatusOK).
+		JSON().
+		Object()
+
+	response2.Value("data").Object().Value("me").Object().ContainsKey("id")
+	response2.Value("data").Object().Value("me").Object().Value("name").String().Equal("Mock User")
+	response2.Value("data").Object().Value("me").Object().Value("email").String().Equal("[email protected]")
+}

server/go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/paulmach/go.geojson v1.4.0
 	github.com/pkg/errors v0.9.1
 	github.com/ravilushqa/otelgqlgen v0.15.0
-	github.com/reearth/reearthx v0.0.0-20240809105752-94879dbf747b
+	github.com/reearth/reearthx v0.0.0-20241016122433-351e92319d1c
 	github.com/samber/lo v1.39.0
 	github.com/spf13/afero v1.11.0
 	github.com/square/mongo-lock v0.0.0-20201208161834-4db518ed7fb2

server/go.sum

@@ -509,8 +509,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/ravilushqa/otelgqlgen v0.15.0 h1:U85nrlweMXTGaMChUViYM39/MXBZVeVVlpuHq+6eECQ=
 github.com/ravilushqa/otelgqlgen v0.15.0/go.mod h1:o+1Eju0VySmgq2BP8Vupz2YrN21Bj7D7imBqu3m2uB8=
-github.com/reearth/reearthx v0.0.0-20240809105752-94879dbf747b h1:Vt1oXaj7pntxlQoKi/zJwvMHovlM86sYweOOx2rlH7Q=
-github.com/reearth/reearthx v0.0.0-20240809105752-94879dbf747b/go.mod h1:d1WXkdCVzSoc8pl3vW9/9yKfk4fdoZQZhX8Ot8jqgnc=
+github.com/reearth/reearthx v0.0.0-20241016122433-351e92319d1c h1:T9gk3oxbgGsb8SasgjDpwtoxB/T8rdHbGUGymNhAvfc=
+github.com/reearth/reearthx v0.0.0-20241016122433-351e92319d1c/go.mod h1:d1WXkdCVzSoc8pl3vW9/9yKfk4fdoZQZhX8Ot8jqgnc=
 github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

server/gql/project.graphql

@@ -24,6 +24,7 @@ type Project implements Node {
   enableGa: Boolean!
   trackingId: String!
   starred: Boolean!
+  isDeleted: Boolean!
 }
 
 type ProjectAliasAvailability {
@@ -80,6 +81,7 @@ input UpdateProjectInput {
   trackingId: String
   sceneId: ID
   starred: Boolean
+  deleted: Boolean
 }
 
 input PublishProjectInput {
@@ -102,6 +104,7 @@ input ExportProjectInput {
 }
 
 input ImportProjectInput {
+  teamId: ID!
   file: Upload!
 }
 
@@ -140,13 +143,13 @@ type ProjectEdge {
 extend type Query {
   projects(
     teamId: ID!
-    includeArchived: Boolean
     pagination: Pagination
     keyword: String
     sort: ProjectSort
-  ): ProjectConnection!
+  ): ProjectConnection! # not included deleted projects
   checkProjectAlias(alias: String!): ProjectAliasAvailability!
   starredProjects(teamId: ID!): ProjectConnection!
+  deletedProjects(teamId: ID!): ProjectConnection!
 }
 
 extend type Mutation {

server/internal/adapter/context.go

@@ -18,6 +18,7 @@ const (
 	contextOperator ContextKey = "operator"
 	ContextAuthInfo ContextKey = "authinfo"
 	contextUsecases ContextKey = "usecases"
+	contextMockAuth ContextKey = "mockauth"
 )
 
 var defaultLang = language.English
@@ -44,6 +45,10 @@ func AttachUsecases(ctx context.Context, u *interfaces.Container) context.Contex
 	return ctx
 }
 
+func AttachMockAuth(ctx context.Context, mockAuth bool) context.Context {
+	return context.WithValue(ctx, contextMockAuth, mockAuth)
+}
+
 func User(ctx context.Context) *user.User {
 	if v := ctx.Value(contextUser); v != nil {
 		if u, ok := v.(*user.User); ok {
@@ -90,6 +95,13 @@ func AcOperator(ctx context.Context) *accountusecase.Operator {
 }
 
 func GetAuthInfo(ctx context.Context) *appx.AuthInfo {
+	if IsMockAuth(ctx) {
+		return &appx.AuthInfo{
+			Sub:   user.NewID().String(), // Use it if there is a Mock user in the DB
+			Name:  "Mock User",
+			Email: "[email protected]",
+		}
+	}
 	if v := ctx.Value(ContextAuthInfo); v != nil {
 		if v2, ok := v.(appx.AuthInfo); ok {
 			return &v2
@@ -101,3 +113,12 @@ func GetAuthInfo(ctx context.Context) *appx.AuthInfo {
 func Usecases(ctx context.Context) *interfaces.Container {
 	return ctx.Value(contextUsecases).(*interfaces.Container)
 }
+
+func IsMockAuth(ctx context.Context) bool {
+	if v := ctx.Value(contextMockAuth); v != nil {
+		if mockAuth, ok := v.(bool); ok {
+			return mockAuth
+		}
+	}
+	return false
+}