feat(server): add workspace id to project in integration api (#1209)

imp
reearth · Aug 23, 2024 · 8ea6a52 · 8ea6a52
1 parent 28c7386
commit 8ea6a52
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 76 deletions.
diff --git a/server/e2e/integration_project_test.go b/server/e2e/integration_project_test.go
@@ -32,14 +32,17 @@ func TestIntegrationProjectGetAPI(t *testing.T) {
 		Expect().
 		Status(http.StatusNotFound)
 
-	e.GET(endpoint, wId0).
+	res := e.GET(endpoint, wId0).
 		WithHeader("authorization", "Bearer "+secret).
 		Expect().
 		Status(http.StatusOK).
 		JSON().
-		Object().
-		HasValue("page", 1).
+		Object()
+
+	res.HasValue("page", 1).
 		HasValue("perPage", 50).
 		HasValue("totalCount", 1).
 		Path("$.projects[:].id").Array().IsEqual([]string{pid.String()})
+
+	res.Path("$.projects[:].workspaceId").Array().IsEqual([]string{wId0.String()})
 }
diff --git a/server/internal/adapter/integration/server.gen.go b/server/internal/adapter/integration/server.gen.go
diff --git a/server/pkg/integrationapi/project.go b/server/pkg/integrationapi/project.go
@@ -7,11 +7,12 @@ import (
 
 func NewProject(p *project.Project) Project {
 	return Project{
-		Alias:       lo.ToPtr(p.Alias()),
-		CreatedAt:   lo.ToPtr(p.CreatedAt()),
-		Description: lo.ToPtr(p.Description()),
 		Id:          p.ID().Ref(),
+		WorkspaceId: p.Workspace().Ref(),
 		Name:        lo.ToPtr(p.Name()),
+		Description: lo.ToPtr(p.Description()),
+		Alias:       lo.ToPtr(p.Alias()),
+		CreatedAt:   lo.ToPtr(p.CreatedAt()),
 		UpdatedAt:   lo.ToPtr(p.UpdatedAt()),
 	}
 }
diff --git a/server/pkg/integrationapi/types.gen.go b/server/pkg/integrationapi/types.gen.go
diff --git a/server/schemas/integration.yml b/server/schemas/integration.yml
@@ -1441,6 +1441,9 @@ components:
         id:
           x-go-type: id.ProjectID
           type: string
+        workspaceId:
+          x-go-type: accountdomain.WorkspaceID
+          type: string
         name:
           type: string
         description: