fix(server): bug fix coresupport filter (#108)

Author: hexaforce

server/internal/adapter/gql/loader_scene.go

@@ -2,11 +2,13 @@ package gql
 
 import (
 	"context"
+	"errors"
 
 	"github.com/reearth/reearth/server/internal/adapter/gql/gqldataloader"
 	"github.com/reearth/reearth/server/internal/adapter/gql/gqlmodel"
 	"github.com/reearth/reearth/server/internal/usecase/interfaces"
 	"github.com/reearth/reearth/server/pkg/id"
+	"github.com/reearth/reearthx/rerror"
 	"github.com/reearth/reearthx/util"
 )
 
@@ -44,6 +46,9 @@ func (c *SceneLoader) FindByProject(ctx context.Context, projectID gqlmodel.ID)
 
 	res, err := c.usecase.FindByProject(ctx, pid, getOperator(ctx))
 	if err != nil {
+		if errors.Is(err, rerror.ErrNotFound) {
+			return nil, nil
+		}
 		return nil, err
 	}
 

server/internal/infrastructure/memory/project.go

@@ -42,9 +42,11 @@ func (r *Project) FindByWorkspace(ctx context.Context, id accountdomain.Workspac
 	}
 
 	result := []*project.Project{}
+	var totalCount int64
 	for _, d := range r.data {
-		if d.Workspace() == id {
+		if d.Workspace() == id && !d.CoreSupport() {
 			result = append(result, d)
+			totalCount++
 		}
 	}
 
@@ -57,11 +59,11 @@ func (r *Project) FindByWorkspace(ctx context.Context, id accountdomain.Workspac
 	}
 
 	return result, usecasex.NewPageInfo(
-		int64(len(r.data)),
+		totalCount,
 		startCursor,
 		endCursor,
-		true,
-		true,
+		false,
+		false,
 	), nil
 }
 

server/internal/infrastructure/mongo/project.go

@@ -154,10 +154,15 @@ func (r *Project) FindByWorkspace(ctx context.Context, id accountdomain.Workspac
 		return nil, usecasex.EmptyPageInfo(), nil
 	}
 
-	absoluteFilter := bson.M{"$or": []bson.M{
-		{"workspace": id.String()},
-		{"team": id.String()},
-	}}
+	absoluteFilter := bson.M{
+		"$and": []bson.M{
+			{"$or": []bson.M{
+				{"workspace": id.String()},
+				{"team": id.String()},
+			}},
+			{"coresupport": bson.M{"$ne": true}},
+		},
+	}
 
 	totalCount, err := r.client.Client().CountDocuments(ctx, absoluteFilter)
 	if err != nil {

server/internal/usecase/interactor/project.go

@@ -62,11 +62,36 @@ func NewProject(r *repo.Container, gr *gateway.Container) interfaces.Project {
 }
 
 func (i *Project) Fetch(ctx context.Context, ids []id.ProjectID, _ *usecase.Operator) ([]*project.Project, error) {
-	return i.projectRepo.FindByIDs(ctx, ids)
+	projects, err := i.projectRepo.FindByIDs(ctx, ids)
+	if err != nil {
+		return nil, err
+	}
+
+	for idx, p := range projects {
+		if p != nil && p.CoreSupport() {
+			projects[idx] = nil
+		}
+	}
+
+	return projects, nil
 }
 
 func (i *Project) FindByWorkspace(ctx context.Context, id accountdomain.WorkspaceID, p *usecasex.Pagination, _ *usecase.Operator) ([]*project.Project, *usecasex.PageInfo, error) {
-	return i.projectRepo.FindByWorkspace(ctx, id, p)
+	projects, pageInfo, err := i.projectRepo.FindByWorkspace(ctx, id, p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Re-check to avoid returning core projects even if repository did not filter.
+	filtered := make([]*project.Project, 0, len(projects))
+	for _, prj := range projects {
+		if prj != nil && prj.CoreSupport() {
+			continue
+		}
+		filtered = append(filtered, prj)
+	}
+
+	return filtered, pageInfo, nil
 }
 
 func (i *Project) Create(ctx context.Context, p interfaces.CreateProjectParam, operator *usecase.Operator) (_ *project.Project, err error) {

server/internal/usecase/interactor/scene.go

@@ -74,6 +74,14 @@ func (i *Scene) Fetch(ctx context.Context, ids []id.SceneID, operator *usecase.O
 }
 
 func (i *Scene) FindByProject(ctx context.Context, id id.ProjectID, operator *usecase.Operator) (*scene.Scene, error) {
+	prj, err := i.projectRepo.FindByID(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+	if prj.CoreSupport() {
+		return nil, rerror.ErrNotFound
+	}
+
 	s, err := i.sceneRepo.FindByProject(ctx, id)
 	if err != nil {
 		return nil, err