feat(server): Implement from domain models to Adapter on the public

server/internal/adapter/gql/gqlmodel/convert_model.go

@@ -18,6 +18,7 @@ func ToModel(m *model.Model) *Model {
 		Key:         m.Key().String(),
 		Project:     nil,
 		Schema:      nil,
+		Public:      m.Public(),
 		CreatedAt:   m.ID().Timestamp(),
 		UpdatedAt:   m.UpdatedAt(),
 	}

server/internal/adapter/gql/gqlmodel/convert_model_test.go

@@ -38,6 +38,7 @@ func TestToModel(t *testing.T) {
 				Key:         k.String(),
 				Project:     nil,
 				Schema:      nil,
+				Public:      false,
 				CreatedAt:   mId.Timestamp(),
 				UpdatedAt:   mId.Timestamp(),
 			},

server/internal/adapter/gql/gqlmodel/convert_project.go

@@ -11,10 +11,43 @@ func ToProject(p *project.Project) *Project {
 
 	return &Project{
 		ID:          IDFrom(p.ID()),
+		WorkspaceID: IDFrom(p.Workspace()),
 		CreatedAt:   p.CreatedAt(),
 		Alias:       p.Alias(),
 		Name:        p.Name(),
 		Description: p.Description(),
 		UpdatedAt:   p.UpdatedAt(),
+		Publication: ToProjectPublication(p.Publication()),
 	}
 }
+
+func ToProjectPublication(p *project.Publication) *ProjectPublication {
+	if p == nil {
+		return nil
+	}
+
+	return &ProjectPublication{
+		Scope:       ToProjectPublicationScope(p.Scope()),
+		AssetPublic: p.AssetPublic(),
+	}
+}
+
+func ToProjectPublicationScope(p project.PublicationScope) ProjectPublicationScope {
+	switch p {
+	case project.PublicationScopePublic:
+		return ProjectPublicationScopePublic
+	case project.PublicationScopeLimited:
+		return ProjectPublicationScopeLimited
+	}
+	return ProjectPublicationScopePrivate
+}
+
+func FromProjectPublicationScope(p ProjectPublicationScope) project.PublicationScope {
+	switch p {
+	case ProjectPublicationScopePublic:
+		return project.PublicationScopePublic
+	case ProjectPublicationScopeLimited:
+		return project.PublicationScopeLimited
+	}
+	return project.PublicationScopePrivate
+}

server/internal/adapter/gql/resolver_mutation_model.go

@@ -6,19 +6,20 @@ import (
 	"github.com/reearth/reearth-cms/server/internal/adapter/gql/gqlmodel"
 	"github.com/reearth/reearth-cms/server/internal/usecase/interfaces"
 	"github.com/reearth/reearth-cms/server/pkg/id"
+	"github.com/samber/lo"
 )
 
 func (r *mutationResolver) CreateModel(ctx context.Context, input gqlmodel.CreateModelInput) (*gqlmodel.ModelPayload, error) {
 	pId, err := gqlmodel.ToID[id.Project](input.ProjectID)
 	if err != nil {
 		return nil, err
 	}
-
 	res, err := usecases(ctx).Model.Create(ctx, interfaces.CreateModelParam{
 		ProjectId:   pId,
 		Name:        input.Name,
 		Description: input.Description,
 		Key:         input.Key,
+		Public:      nil,
 	}, getOperator(ctx))
 	if err != nil {
 		return nil, err
@@ -40,6 +41,7 @@ func (r *mutationResolver) UpdateModel(ctx context.Context, input gqlmodel.Updat
 		Name:        input.Name,
 		Description: input.Description,
 		Key:         input.Key,
+		Public:      lo.ToPtr(input.Public),
 	}, getOperator(ctx))
 	if err != nil {
 		return nil, err

server/internal/adapter/gql/resolver_mutation_project.go

@@ -6,6 +6,8 @@ import (
 	"github.com/reearth/reearth-cms/server/internal/adapter/gql/gqlmodel"
 	"github.com/reearth/reearth-cms/server/internal/usecase/interfaces"
 	"github.com/reearth/reearth-cms/server/pkg/id"
+	"github.com/reearth/reearth-cms/server/pkg/project"
+	"github.com/samber/lo"
 )
 
 func (r *mutationResolver) CreateProject(ctx context.Context, input gqlmodel.CreateProjectInput) (*gqlmodel.ProjectPayload, error) {
@@ -33,10 +35,23 @@ func (r *mutationResolver) UpdateProject(ctx context.Context, input gqlmodel.Upd
 		return nil, err
 	}
 
+	var pub *interfaces.UpdateProjectPublicationParam
+	if input.Publication != nil {
+		var scope *project.PublicationScope
+		if input.Publication.Scope != nil {
+			scope = lo.ToPtr(gqlmodel.FromProjectPublicationScope(*input.Publication.Scope))
+		}
+		pub = &interfaces.UpdateProjectPublicationParam{
+			Scope:       scope,
+			AssetPublic: input.Publication.AssetPublic,
+		}
+	}
+
 	res, err := usecases(ctx).Project.Update(ctx, interfaces.UpdateProjectParam{
 		ID:          pid,
 		Name:        input.Name,
 		Description: input.Description,
+		Publication: pub,
 	}, getOperator(ctx))
 	if err != nil {
 		return nil, err

server/internal/infrastructure/mongo/mongodoc/model.go

@@ -54,7 +54,7 @@ func (d *ModelDocument) Model() (*model.Model, error) {
 		Description(d.Description).
 		UpdatedAt(d.UpdatedAt).
 		Key(key.New(d.Key)).
-		IsPublic(d.Public).
+		Public(d.Public).
 		Project(pId).
 		Schema(sId).
 		Build()

server/internal/infrastructure/mongo/mongodoc/project.go

@@ -17,6 +17,12 @@ type ProjectDocument struct {
 	Alias       string
 	ImageURL    string
 	Workspace   string
+	Publication *ProjectPublicationDocument
+}
+
+type ProjectPublicationDocument struct {
+	AssetPublic bool
+	Scope       string
 }
 
 func NewProject(project *project.Project) (*ProjectDocument, string) {
@@ -35,9 +41,21 @@ func NewProject(project *project.Project) (*ProjectDocument, string) {
 		Alias:       project.Alias(),
 		ImageURL:    imageURL,
 		Workspace:   project.Workspace().String(),
+		Publication: NewProjectPublication(project.Publication()),
 	}, pid
 }
 
+func NewProjectPublication(p *project.Publication) *ProjectPublicationDocument {
+	if p == nil {
+		return nil
+	}
+
+	return &ProjectPublicationDocument{
+		AssetPublic: p.AssetPublic(),
+		Scope:       string(p.Scope()),
+	}
+}
+
 func (d *ProjectDocument) Model() (*project.Project, error) {
 	pid, err := id.ProjectIDFrom(d.ID)
 	if err != nil {
@@ -63,9 +81,17 @@ func (d *ProjectDocument) Model() (*project.Project, error) {
 		Alias(d.Alias).
 		Workspace(tid).
 		ImageURL(imageURL).
+		Publication(d.Publication.Model()).
 		Build()
 }
 
+func (d *ProjectPublicationDocument) Model() *project.Publication {
+	if d == nil {
+		return nil
+	}
+	return project.NewPublication(project.PublicationScope(d.Scope), d.AssetPublic)
+}
+
 type ProjectConsumer = mongox.SliceFuncConsumer[*ProjectDocument, *project.Project]
 
 func NewProjectConsumer() *ProjectConsumer {

server/internal/usecase/interactor/model.go

@@ -71,7 +71,7 @@ func (i Model) Create(ctx context.Context, param interfaces.CreateModelParam, op
 				New().
 				NewID().
 				Schema(s.ID()).
-				IsPublic(false).
+				Public(false).
 				Project(param.ProjectId)
 
 			if param.Name != nil {
@@ -80,6 +80,9 @@ func (i Model) Create(ctx context.Context, param interfaces.CreateModelParam, op
 			if param.Description != nil {
 				mb = mb.Description(*param.Description)
 			}
+			if param.Public != nil {
+				mb = mb.Public(*param.Public)
+			}
 			if param.Key != nil {
 				k := key.New(*param.Key)
 				if !k.IsValid() {
@@ -126,6 +129,9 @@ func (i Model) Update(ctx context.Context, param interfaces.UpdateModelParam, op
 					return nil, err
 				}
 			}
+			if param.Public != nil {
+				m.SetPublic(*param.Public)
+			}
 
 			if err := i.repos.Model.Save(ctx, m); err != nil {
 				return nil, err

server/internal/usecase/interactor/model_test.go

@@ -186,10 +186,11 @@ func TestModel_Create(t *testing.T) {
 		// 			Name:        lo.ToPtr("m1"),
 		// 			Description: lo.ToPtr("m1"),
 		// 			Key:         lo.ToPtr("k123456"),
+		// 			Public:      lo.ToPtr(true),
 		// 		},
 		// 		operator: op,
 		// 	},
-		// 	want:    model.New().ID(mId).Schema(sId).Project(pid1).Name("m1").Description("m1").Key(key.New("k123456")).UpdatedAt(mockTime).MustBuild(),
+		// 	want:    model.New().ID(mId).Schema(sId).Project(pid1).Name("m1").Description("m1").Key(key.New("k123456")).Public(true).UpdatedAt(mockTime).MustBuild(),
 		// 	mockErr: false,
 		// 	wantErr: nil,
 		// },

server/internal/usecase/interactor/project.go

@@ -87,6 +87,20 @@ func (i *Project) Update(ctx context.Context, p interfaces.UpdateProjectParam, o
 				proj.UpdateDescription(*p.Description)
 			}
 
+			if p.Publication != nil {
+				pub := proj.Publication()
+				if pub == nil {
+					pub = project.NewPublication(project.PublicationScopePrivate, false)
+				}
+				if p.Publication.Scope != nil {
+					pub.SetScope(*p.Publication.Scope)
+				}
+				if p.Publication.AssetPublic != nil {
+					pub.SetAssetPublic(*p.Publication.AssetPublic)
+				}
+				proj.SetPublication(pub)
+			}
+
 			if err := i.repos.Project.Save(ctx, proj); err != nil {
 				return nil, err
 			}

server/internal/usecase/interactor/project_test.go

@@ -349,8 +349,6 @@ func TestProject_Update(t *testing.T) {
 
 	pid1 := id.NewProjectID()
 	p1 := project.New().ID(pid1).Workspace(wid1).UpdatedAt(mocktime.Add(-time.Second)).MustBuild()
-	p1Updated := project.New().ID(pid1).Workspace(wid1).Name("test123").Description("desc321").
-		UpdatedAt(mocktime).MustBuild()
 
 	pid2 := id.NewProjectID()
 	p2 := project.New().ID(pid2).Workspace(wid2).UpdatedAt(mocktime).MustBuild()
@@ -385,7 +383,13 @@ func TestProject_Update(t *testing.T) {
 				},
 				operator: op,
 			},
-			want:    p1Updated,
+			want: project.New().
+				ID(pid1).
+				Workspace(wid1).
+				Name("test123").
+				Description("desc321").
+				UpdatedAt(mocktime).
+				MustBuild(),
 			wantErr: nil,
 		},
 		{
@@ -402,6 +406,26 @@ func TestProject_Update(t *testing.T) {
 			want:    nil,
 			wantErr: interfaces.ErrOperationDenied,
 		},
+		{
+			name:  "update publication",
+			seeds: project.List{p1, p2},
+			args: args{
+				upp: interfaces.UpdateProjectParam{
+					ID: p1.ID(),
+					Publication: &interfaces.UpdateProjectPublicationParam{
+						Scope:       lo.ToPtr(project.PublicationScopePublic),
+						AssetPublic: lo.ToPtr(true),
+					},
+				},
+				operator: op,
+			},
+			want: project.New().
+				ID(pid1).
+				Workspace(wid1).
+				UpdatedAt(mocktime).
+				Publication(project.NewPublication(project.PublicationScopePublic, true)).
+				MustBuild(),
+		},
 		{
 			name:           "mock error",
 			wantErr:        errors.New("test"),

server/internal/usecase/interfaces/model.go

@@ -15,13 +15,15 @@ type CreateModelParam struct {
 	Name        *string
 	Description *string
 	Key         *string
+	Public      *bool
 }
 
 type UpdateModelParam struct {
 	ModelId     id.ModelID
 	Name        *string
 	Description *string
 	Key         *string
+	Public      *bool
 }
 
 var (

server/internal/usecase/interfaces/project.go

@@ -21,6 +21,12 @@ type UpdateProjectParam struct {
 	ID          id.ProjectID
 	Name        *string
 	Description *string
+	Publication *UpdateProjectPublicationParam
+}
+
+type UpdateProjectPublicationParam struct {
+	Scope       *project.PublicationScope
+	AssetPublic *bool
 }
 
 var (

server/pkg/model/builder.go

@@ -82,7 +82,7 @@ func (b *Builder) RandomKey() *Builder {
 	return b
 }
 
-func (b *Builder) IsPublic(public bool) *Builder {
+func (b *Builder) Public(public bool) *Builder {
 	b.model.public = public
 	return b
 }

server/pkg/model/builder_test.go

@@ -411,7 +411,7 @@ func TestBuilder_ID(t *testing.T) {
 	}
 }
 
-func TestBuilder_IsPublic(t *testing.T) {
+func TestBuilder_Public(t *testing.T) {
 	type fields struct {
 		model *Model
 		k     key.Key
@@ -467,7 +467,7 @@ func TestBuilder_IsPublic(t *testing.T) {
 				model: tt.fields.model,
 				k:     tt.fields.k,
 			}
-			assert.Equal(t, tt.want, b.IsPublic(tt.args.public))
+			assert.Equal(t, tt.want, b.Public(tt.args.public))
 		})
 	}
 }