fix(account): remove policy repo

reearth · Oct 4, 2023 · bceec51 · bceec51
1 parent ee497cc
commit bceec51
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 560 deletions.
diff --git a/account/accountdomain/workspace/policy.go b/account/accountdomain/workspace/policy.go
diff --git a/account/accountdomain/workspace/policy_test.go b/account/accountdomain/workspace/policy_test.go
diff --git a/account/accountinfrastructure/accountmongo/mongodoc/workspace.go b/account/accountinfrastructure/accountmongo/mongodoc/workspace.go
@@ -4,6 +4,7 @@ import (
 	"github.com/reearth/reearthx/account/accountdomain"
 	"github.com/reearth/reearthx/account/accountdomain/workspace"
 	"github.com/reearth/reearthx/mongox"
+	"github.com/samber/lo"
 )
 
 type WorkspaceMemberDocument struct {
@@ -18,6 +19,7 @@ type WorkspaceDocument struct {
 	Members      map[string]WorkspaceMemberDocument
 	Integrations map[string]WorkspaceMemberDocument
 	Personal     bool
+	Policy       string `bson:",omitempty"`
 }
 
 func NewWorkspace(ws *workspace.Workspace) (*WorkspaceDocument, string) {
@@ -29,6 +31,7 @@ func NewWorkspace(ws *workspace.Workspace) (*WorkspaceDocument, string) {
 			InvitedBy: m.InvitedBy.String(),
 		}
 	}
+
 	integrationsDoc := map[string]WorkspaceMemberDocument{}
 	for iId, m := range ws.Members().Integrations() {
 		integrationsDoc[iId.String()] = WorkspaceMemberDocument{
@@ -37,13 +40,15 @@ func NewWorkspace(ws *workspace.Workspace) (*WorkspaceDocument, string) {
 			InvitedBy: m.InvitedBy.String(),
 		}
 	}
+
 	wId := ws.ID().String()
 	return &WorkspaceDocument{
 		ID:           wId,
 		Name:         ws.Name(),
 		Members:      membersDoc,
 		Integrations: integrationsDoc,
 		Personal:     ws.IsPersonal(),
+		Policy:       lo.FromPtr(ws.Policy()).String(),
 	}, wId
 }
 
@@ -71,6 +76,7 @@ func (d *WorkspaceDocument) Model() (*workspace.Workspace, error) {
 			}
 		}
 	}
+
 	integrations := map[accountdomain.IntegrationID]workspace.Member{}
 	if d.Integrations != nil {
 		for iId, integrationDoc := range d.Integrations {
@@ -85,12 +91,19 @@ func (d *WorkspaceDocument) Model() (*workspace.Workspace, error) {
 			}
 		}
 	}
+
+	var policy *workspace.PolicyID
+	if d.Policy != "" {
+		policy = workspace.PolicyID(d.Policy).Ref()
+	}
+
 	return workspace.New().
 		ID(tid).
 		Name(d.Name).
 		Members(members).
 		Integrations(integrations).
 		Personal(d.Personal).
+		Policy(policy).
 		Build()
 }
 

diff --git a/account/accountusecase/accountinteractor/workspace.go b/account/accountusecase/accountinteractor/workspace.go
@@ -39,13 +39,6 @@ func (i *Workspace) FindByUser(ctx context.Context, id accountdomain.UserID, ope
 	})
 }
 
-func (i *Workspace) FetchPolicy(ctx context.Context, ids []workspace.PolicyID, operator *accountusecase.Operator) ([]*workspace.Policy, error) {
-	return Run1(ctx, operator, i.repos, Usecase().Transaction(), func(ctx context.Context) ([]*workspace.Policy, error) {
-		res, err := i.repos.Policy.FindByIDs(ctx, ids)
-		return res, err
-	})
-}
-
 func (i *Workspace) Create(ctx context.Context, name string, firstUser accountdomain.UserID, operator *accountusecase.Operator) (_ *workspace.Workspace, err error) {
 	if operator.User == nil {
 		return nil, accountinterfaces.ErrInvalidOperator

diff --git a/account/accountusecase/accountinterfaces/workspace.go b/account/accountusecase/accountinterfaces/workspace.go
@@ -21,7 +21,6 @@ var (
 type Workspace interface {
 	Fetch(context.Context, accountdomain.WorkspaceIDList, *accountusecase.Operator) ([]*workspace.Workspace, error)
 	FindByUser(context.Context, accountdomain.UserID, *accountusecase.Operator) ([]*workspace.Workspace, error)
-	FetchPolicy(context.Context, []workspace.PolicyID, *accountusecase.Operator) ([]*workspace.Policy, error)
 	Create(context.Context, string, accountdomain.UserID, *accountusecase.Operator) (*workspace.Workspace, error)
 	Update(context.Context, accountdomain.WorkspaceID, string, *accountusecase.Operator) (*workspace.Workspace, error)
 	AddUserMember(context.Context, accountdomain.WorkspaceID, map[accountdomain.UserID]workspace.Role, *accountusecase.Operator) (*workspace.Workspace, error)