fix review

reearth · Nov 21, 2024 · 7eed562 · 7eed562
1 parent 78f7e15
commit 7eed562
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 12 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,3 +1,4 @@
+version: "3"
 services:
   reearth:
     image: reearth/reearth-visualizer:latest

diff --git a/server/internal/adapter/gql/loader_user.go b/server/internal/adapter/gql/loader_user.go
@@ -2,7 +2,6 @@ package gql
 
 import (
 	"context"
-	"errors"
 
 	"github.com/reearth/reearth/server/internal/adapter/gql/gqldataloader"
 	"github.com/reearth/reearth/server/internal/adapter/gql/gqlmodel"
@@ -44,13 +43,7 @@ func (c *UserLoader) SearchUser(ctx context.Context, nameOrEmail string) (*gqlmo
 		return nil, err
 	}
 
-	for _, user := range res {
-		if user.Name == nameOrEmail || user.Email == nameOrEmail {
-			return gqlmodel.ToUserFromSimple(user), nil
-		}
-	}
-
-	return nil, errors.New("user not found.")
+	return gqlmodel.ToUserFromSimple(res), nil
 }
 
 // data loader

diff --git a/server/internal/infrastructure/mongo/project_test.go b/server/internal/infrastructure/mongo/project_test.go
@@ -151,12 +151,14 @@ func TestProject_FindStarredByWorkspace(t *testing.T) {
 	pid2 := id.NewProjectID()
 	pid3 := id.NewProjectID()
 	pid4 := id.NewProjectID()
+	pid5 := id.NewProjectID()
 
 	_, _ = c.Collection("project").InsertMany(ctx, []any{
-		bson.M{"id": pid1.String(), "team": wid.String(), "name": "Project 1", "starred": true},
-		bson.M{"id": pid2.String(), "team": wid.String(), "name": "Project 2", "starred": true},
-		bson.M{"id": pid3.String(), "team": wid.String(), "name": "Project 3", "starred": false},
-		bson.M{"id": pid4.String(), "team": wid2.String(), "name": "Project 4", "starred": true},
+		bson.M{"id": pid1.String(), "team": wid.String(), "name": "Project 1", "starred": true, "coresupport": true},
+		bson.M{"id": pid2.String(), "team": wid.String(), "name": "Project 2", "starred": true, "coresupport": true},
+		bson.M{"id": pid3.String(), "team": wid.String(), "name": "Project 3", "starred": false, "coresupport": true},
+		bson.M{"id": pid4.String(), "team": wid2.String(), "name": "Project 4", "starred": true, "coresupport": true},
+		bson.M{"id": pid5.String(), "team": wid2.String(), "name": "Project 5", "starred": true, "coresupport": false},
 	})
 
 	r := NewProject(mongox.NewClientWithDatabase(c))
@@ -191,3 +193,32 @@ func TestProject_FindStarredByWorkspace(t *testing.T) {
 		assert.Empty(t, got)
 	})
 }
+
+func TestProject_FindDeletedByWorkspace(t *testing.T) {
+	c := mongotest.Connect(t)(t)
+	ctx := context.Background()
+
+	wid := accountdomain.NewWorkspaceID()
+	wid2 := accountdomain.NewWorkspaceID()
+
+	pid1 := id.NewProjectID()
+	pid2 := id.NewProjectID()
+	pid3 := id.NewProjectID()
+	pid4 := id.NewProjectID()
+
+	_, _ = c.Collection("project").InsertMany(ctx, []any{
+		bson.M{"id": pid1.String(), "team": wid.String(), "name": "Project 1", "deleted": false, "coresupport": true},
+		bson.M{"id": pid2.String(), "team": wid.String(), "name": "Project 2", "deleted": true, "coresupport": true},
+		bson.M{"id": pid3.String(), "team": wid2.String(), "name": "Project 3", "deleted": false, "coresupport": true},
+		bson.M{"id": pid4.String(), "team": wid2.String(), "name": "Project 4", "deleted": true, "coresupport": true},
+	})
+
+	r := NewProject(mongox.NewClientWithDatabase(c))
+
+	t.Run("FindDeletedByWorkspace", func(t *testing.T) {
+		got, err := r.FindDeletedByWorkspace(ctx, wid)
+		assert.NoError(t, err)
+		assert.Equal(t, 1, len(got))
+	})
+
+}