refactor(server): refactor wire

rot1024 · rot1024 · commit a9f7ce961bf5 · 2025-03-21T03:02:42.000+09:00
diff --git a/server/internal/di/wire.go b/server/internal/di/wire.go
@@ -1,4 +1,5 @@
 //go:build wireinject
+// +build wireinject
 
 package di
 
diff --git a/server/internal/di/wire_gen.go b/server/internal/di/wire_gen.go
diff --git a/server/internal/usecase/todouc/create.go b/server/internal/usecase/todouc/create.go
@@ -33,44 +33,28 @@ func (p CreateParam) Validate() error {
 }
 
 type Create struct {
-	assetRepo     todo.Repo
-	projectRepo   project.Repo
-	workspaceRepo workspace.Repo
-	assetPolicy   todo.Policy
-	storage       gateway.Storage
-}
-
-func NewCreate(
-	assetRepo todo.Repo,
-	projectRepo project.Repo,
-	workspaceRepo workspace.Repo,
-	assetPolicy todo.Policy,
-	storage gateway.Storage,
-) *Create {
-	return &Create{
-		assetRepo:     assetRepo,
-		projectRepo:   projectRepo,
-		workspaceRepo: workspaceRepo,
-		assetPolicy:   assetPolicy,
-		storage:       storage,
-	}
+	TodoRepo      todo.Repo
+	ProjectRepo   project.Repo
+	WorkspaceRepo workspace.Repo
+	TodoPolicy    todo.Policy
+	Storage       gateway.Storage
 }
 
 func (uc *Create) Execute(ctx context.Context, param CreateParam, user *user.User) (*todo.Todo, error) {
 	if err := param.Validate(); err != nil {
 		return nil, err
 	}
 
-	_, project, _, err := UsecaseBuilder(ctx, user).
-		FindProjectByID(param.ProjectID, uc.projectRepo, uc.workspaceRepo).
-		CanCreateTodo(uc.assetPolicy).
+	_, project, _, err := build(ctx, user).
+		FindProjectByID(param.ProjectID, uc.ProjectRepo, uc.WorkspaceRepo).
+		CanCreateTodo(uc.TodoPolicy).
 		Result()
 
 	if err != nil {
 		return nil, err
 	}
 
-	if err := uc.storage.Save(ctx, param.Name, param.Data); err != nil {
+	if err := uc.Storage.Save(ctx, param.Name, param.Data); err != nil {
 		return nil, err
 	}
 
@@ -83,7 +67,7 @@ func (uc *Create) Execute(ctx context.Context, param CreateParam, user *user.Use
 		return nil, err
 	}
 
-	if err := uc.assetRepo.Save(ctx, asset); err != nil {
+	if err := uc.TodoRepo.Save(ctx, asset); err != nil {
 		return nil, err
 	}
 
diff --git a/server/internal/usecase/todouc/find_by_ids.go b/server/internal/usecase/todouc/find_by_ids.go
@@ -10,44 +10,29 @@ import (
 )
 
 type FindByIDs struct {
-	assetRepo     todo.Repo
-	projectRepo   project.Repo
-	workspaceRepo workspace.Repo
-
-	assetPolicy todo.Policy
-}
-
-func NewFindByIDs(
-	assetRepo todo.Repo,
-	projectRepo project.Repo,
-	workspaceRepo workspace.Repo,
-	assetPolicy todo.Policy,
-) *FindByIDs {
-	return &FindByIDs{
-		assetRepo:     assetRepo,
-		projectRepo:   projectRepo,
-		workspaceRepo: workspaceRepo,
-		assetPolicy:   assetPolicy,
-	}
+	TodoRepo      todo.Repo
+	ProjectRepo   project.Repo
+	WorkspaceRepo workspace.Repo
+	TodoPolicy    todo.Policy
 }
 
 func (uc *FindByIDs) Execute(ctx context.Context, ids todo.IDList, user *user.User) (todo.List, error) {
-	assets, err := uc.assetRepo.FindByIDs(ctx, ids)
+	assets, err := uc.TodoRepo.FindByIDs(ctx, ids)
 	if err != nil {
 		return nil, err
 	}
 
-	projects, err := uc.projectRepo.FindByIDs(ctx, assets.ProjectIDs())
+	projects, err := uc.ProjectRepo.FindByIDs(ctx, assets.ProjectIDs())
 	if err != nil {
 		return nil, err
 	}
 
-	workspaces, err := uc.workspaceRepo.FindByIDs(ctx, projects.WorkspaceIDs())
+	workspaces, err := uc.WorkspaceRepo.FindByIDs(ctx, projects.WorkspaceIDs())
 	if err != nil {
 		return nil, err
 	}
 
-	assets, err = uc.assetPolicy.Filter(ctx, user, workspaces, projects, assets)
+	assets, err = uc.TodoPolicy.Filter(ctx, user, workspaces, projects, assets)
 	if err != nil {
 		return nil, err
 	}
diff --git a/server/internal/usecase/todouc/find_by_project.go b/server/internal/usecase/todouc/find_by_project.go
@@ -10,36 +10,22 @@ import (
 )
 
 type FindByProject struct {
-	assetRepo     todo.Repo
-	projectRepo   project.Repo
-	workspaceRepo workspace.Repo
-	assetPolicy   todo.Policy
-}
-
-func NewFindByProject(
-	assetRepo todo.Repo,
-	projectRepo project.Repo,
-	workspaceRepo workspace.Repo,
-	assetPolicy todo.Policy,
-) *FindByProject {
-	return &FindByProject{
-		assetRepo:     assetRepo,
-		projectRepo:   projectRepo,
-		workspaceRepo: workspaceRepo,
-		assetPolicy:   assetPolicy,
-	}
+	TodoRepo      todo.Repo
+	ProjectRepo   project.Repo
+	WorkspaceRepo workspace.Repo
+	TodoPolicy    todo.Policy
 }
 
 func (uc *FindByProject) Execute(ctx context.Context, pid project.ID, user *user.User) (todo.List, error) {
-	_, project, _, err := UsecaseBuilder(ctx, user).
-		FindProjectByID(pid, uc.projectRepo, uc.workspaceRepo).
-		CanListTodo(uc.assetPolicy).
+	_, project, _, err := build(ctx, user).
+		FindProjectByID(pid, uc.ProjectRepo, uc.WorkspaceRepo).
+		CanListTodo(uc.TodoPolicy).
 		Result()
 	if err != nil {
 		return nil, err
 	}
 
-	assets, err := uc.assetRepo.FindByProject(ctx, project.ID())
+	assets, err := uc.TodoRepo.FindByProject(ctx, project.ID())
 	if err != nil {
 		return nil, err
 	}
diff --git a/server/internal/usecase/todouc/update.go b/server/internal/usecase/todouc/update.go
@@ -24,47 +24,33 @@ func (p UpdateParam) Validate() error {
 }
 
 type Update struct {
-	assetRepo     todo.Repo
-	projectRepo   project.Repo
-	workspaceRepo workspace.Repo
-	assetPolicy   todo.Policy
-}
-
-func NewUpdate(
-	assetRepo todo.Repo,
-	projectRepo project.Repo,
-	workspaceRepo workspace.Repo,
-	assetPolicy todo.Policy,
-) *Update {
-	return &Update{
-		assetRepo:     assetRepo,
-		projectRepo:   projectRepo,
-		workspaceRepo: workspaceRepo,
-		assetPolicy:   assetPolicy,
-	}
+	TodoRepo      todo.Repo
+	ProjectRepo   project.Repo
+	WorkspaceRepo workspace.Repo
+	TodoPolicy    todo.Policy
 }
 
 func (uc *Update) Execute(ctx context.Context, param UpdateParam, user *user.User) (*todo.Todo, error) {
 	if err := param.Validate(); err != nil {
 		return nil, err
 	}
 
-	asset, _, _, err := UsecaseBuilder(ctx, user).
-		FindTodoByID(param.ID, uc.assetRepo).
-		FindProjectByTodo(uc.projectRepo, uc.workspaceRepo).
-		CanUpdateTodo(uc.assetPolicy).
+	todo, _, _, err := build(ctx, user).
+		FindTodoByID(param.ID, uc.TodoRepo).
+		FindProjectByTodo(uc.ProjectRepo, uc.WorkspaceRepo).
+		CanUpdateTodo(uc.TodoPolicy).
 		Result()
 	if err != nil {
 		return nil, err
 	}
 
 	if param.Name != nil {
-		asset.SetName(*param.Name)
+		todo.SetName(*param.Name)
 	}
 
-	if err := uc.assetRepo.Save(ctx, asset); err != nil {
+	if err := uc.TodoRepo.Save(ctx, todo); err != nil {
 		return nil, err
 	}
 
-	return asset, nil
+	return todo, nil
 }
diff --git a/server/internal/usecase/todouc/usecase.go b/server/internal/usecase/todouc/usecase.go
@@ -12,10 +12,10 @@ import (
 )
 
 var Wire = wire.NewSet(
-	NewFindByIDs,
-	NewFindByProject,
-	NewCreate,
-	NewUpdate,
+	wire.Struct(new(FindByIDs), "*"),
+	wire.Struct(new(FindByProject), "*"),
+	wire.Struct(new(Create), "*"),
+	wire.Struct(new(Update), "*"),
 	wire.Struct(new(Usecase), "*"),
 )
 
@@ -26,7 +26,7 @@ type Usecase struct {
 	Update        *Update
 }
 
-type Builder struct {
+type builder struct {
 	ctx       context.Context
 	err       error
 	user      *user.User
@@ -35,26 +35,26 @@ type Builder struct {
 	workspace *workspace.Workspace
 }
 
-func UsecaseBuilder(ctx context.Context, user *user.User) *Builder {
-	return &Builder{ctx: ctx, user: user}
+func build(ctx context.Context, user *user.User) *builder {
+	return &builder{ctx: ctx, user: user}
 }
 
-func (b *Builder) Result() (*todo.Todo, *project.Project, *workspace.Workspace, error) {
+func (b *builder) Result() (*todo.Todo, *project.Project, *workspace.Workspace, error) {
 	if b.err != nil {
 		return nil, nil, nil, b.err
 	}
 	return b.todo, b.project, b.workspace, b.err
 }
 
-func (b *Builder) FindTodoByID(id todo.ID, assetRepo todo.Repo) *Builder {
+func (b *builder) FindTodoByID(id todo.ID, assetRepo todo.Repo) *builder {
 	if b.err != nil {
 		return b
 	}
 	b.todo, b.err = assetRepo.FindByID(b.ctx, id)
 	return b
 }
 
-func (b *Builder) FindProjectByID(id project.ID, projectRepo project.Repo, workspaceRepo workspace.Repo) *Builder {
+func (b *builder) FindProjectByID(id project.ID, projectRepo project.Repo, workspaceRepo workspace.Repo) *builder {
 	if b.err != nil {
 		return b
 	}
@@ -65,7 +65,7 @@ func (b *Builder) FindProjectByID(id project.ID, projectRepo project.Repo, works
 	return b
 }
 
-func (b *Builder) FindProjectByTodo(projectRepo project.Repo, workspaceRepo workspace.Repo) *Builder {
+func (b *builder) FindProjectByTodo(projectRepo project.Repo, workspaceRepo workspace.Repo) *builder {
 	if b.err != nil {
 		return b
 	}
@@ -80,39 +80,39 @@ func (b *Builder) FindProjectByTodo(projectRepo project.Repo, workspaceRepo work
 	return b
 }
 
-func (b *Builder) CanReadTodo(assetPolicy todo.Policy) *Builder {
+func (b *builder) CanReadTodo(assetPolicy todo.Policy) *builder {
 	if b.err != nil {
 		return b
 	}
 	b.err = assetPolicy.CanRead(b.ctx, b.user, b.workspace, b.project, b.todo)
 	return b
 }
 
-func (b *Builder) CanListTodo(assetPolicy todo.Policy) *Builder {
+func (b *builder) CanListTodo(assetPolicy todo.Policy) *builder {
 	if b.err != nil {
 		return b
 	}
 	b.err = assetPolicy.CanList(b.ctx, b.user, b.workspace, b.project)
 	return b
 }
 
-func (b *Builder) CanCreateTodo(assetPolicy todo.Policy) *Builder {
+func (b *builder) CanCreateTodo(assetPolicy todo.Policy) *builder {
 	if b.err != nil {
 		return b
 	}
 	b.err = assetPolicy.CanCreate(b.ctx, b.user, b.workspace, b.project)
 	return b
 }
 
-func (b *Builder) CanUpdateTodo(assetPolicy todo.Policy) *Builder {
+func (b *builder) CanUpdateTodo(assetPolicy todo.Policy) *builder {
 	if b.err != nil {
 		return b
 	}
 	b.err = assetPolicy.CanUpdate(b.ctx, b.user, b.workspace, b.project, b.todo)
 	return b
 }
 
-func (b *Builder) CanDeleteTodo(assetPolicy todo.Policy) *Builder {
+func (b *builder) CanDeleteTodo(assetPolicy todo.Policy) *builder {
 	if b.err != nil {
 		return b
 	}
diff --git a/server/internal/usecase/useruc/find_by_sub.go b/server/internal/usecase/useruc/find_by_sub.go
diff --git a/server/internal/usecase/useruc/usecase.go b/server/internal/usecase/useruc/usecase.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`//go:build wireinject`
	`2`	`+// +build wireinject`
`2`	`3`
`3`	`4`	`package di`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var Wire = wire.NewSet(`
`15`		`- NewFindByIDs,`
`16`		`- NewFindByProject,`
`17`		`- NewCreate,`
`18`		`- NewUpdate,`
	`15`	`+ wire.Struct(new(FindByIDs), "*"),`
	`16`	`+ wire.Struct(new(FindByProject), "*"),`
	`17`	`+ wire.Struct(new(Create), "*"),`
	`18`	`+ wire.Struct(new(Update), "*"),`
`19`	`19`	`wire.Struct(new(Usecase), "*"),`
`20`	`20`	`)`
`21`	`21`
`@@ -26,7 +26,7 @@ type Usecase struct {`
`26`	`26`	`Update *Update`
`27`	`27`	`}`
`28`	`28`
`29`		`-type Builder struct {`
	`29`	`+type builder struct {`
`30`	`30`	`ctx context.Context`
`31`	`31`	`err error`
`32`	`32`	`user *user.User`
`@@ -35,26 +35,26 @@ type Builder struct {`
`35`	`35`	`workspace *workspace.Workspace`
`36`	`36`	`}`
`37`	`37`
`38`		`-func UsecaseBuilder(ctx context.Context, user user.User) Builder {`
`39`		`- return &Builder{ctx: ctx, user: user}`
	`38`	`+func build(ctx context.Context, user user.User) builder {`
	`39`	`+ return &builder{ctx: ctx, user: user}`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (b Builder) Result() (todo.Todo, project.Project, workspace.Workspace, error) {`
	`42`	`+func (b builder) Result() (todo.Todo, project.Project, workspace.Workspace, error) {`
`43`	`43`	`if b.err != nil {`
`44`	`44`	`return nil, nil, nil, b.err`
`45`	`45`	`}`
`46`	`46`	`return b.todo, b.project, b.workspace, b.err`
`47`	`47`	`}`
`48`	`48`
`49`		`-func (b Builder) FindTodoByID(id todo.ID, assetRepo todo.Repo) Builder {`
	`49`	`+func (b builder) FindTodoByID(id todo.ID, assetRepo todo.Repo) builder {`
`50`	`50`	`if b.err != nil {`
`51`	`51`	`return b`
`52`	`52`	`}`
`53`	`53`	`b.todo, b.err = assetRepo.FindByID(b.ctx, id)`
`54`	`54`	`return b`
`55`	`55`	`}`
`56`	`56`
`57`		`-func (b Builder) FindProjectByID(id project.ID, projectRepo project.Repo, workspaceRepo workspace.Repo) Builder {`
	`57`	`+func (b builder) FindProjectByID(id project.ID, projectRepo project.Repo, workspaceRepo workspace.Repo) builder {`
`58`	`58`	`if b.err != nil {`
`59`	`59`	`return b`
`60`	`60`	`}`
`@@ -65,7 +65,7 @@ func (b *Builder) FindProjectByID(id project.ID, projectRepo project.Repo, works`
`65`	`65`	`return b`
`66`	`66`	`}`
`67`	`67`
`68`		`-func (b Builder) FindProjectByTodo(projectRepo project.Repo, workspaceRepo workspace.Repo) Builder {`
	`68`	`+func (b builder) FindProjectByTodo(projectRepo project.Repo, workspaceRepo workspace.Repo) builder {`
`69`	`69`	`if b.err != nil {`
`70`	`70`	`return b`
`71`	`71`	`}`
`@@ -80,39 +80,39 @@ func (b *Builder) FindProjectByTodo(projectRepo project.Repo, workspaceRepo work`
`80`	`80`	`return b`
`81`	`81`	`}`
`82`	`82`
`83`		`-func (b Builder) CanReadTodo(assetPolicy todo.Policy) Builder {`
	`83`	`+func (b builder) CanReadTodo(assetPolicy todo.Policy) builder {`
`84`	`84`	`if b.err != nil {`
`85`	`85`	`return b`
`86`	`86`	`}`
`87`	`87`	`b.err = assetPolicy.CanRead(b.ctx, b.user, b.workspace, b.project, b.todo)`
`88`	`88`	`return b`
`89`	`89`	`}`
`90`	`90`
`91`		`-func (b Builder) CanListTodo(assetPolicy todo.Policy) Builder {`
	`91`	`+func (b builder) CanListTodo(assetPolicy todo.Policy) builder {`
`92`	`92`	`if b.err != nil {`
`93`	`93`	`return b`
`94`	`94`	`}`
`95`	`95`	`b.err = assetPolicy.CanList(b.ctx, b.user, b.workspace, b.project)`
`96`	`96`	`return b`
`97`	`97`	`}`
`98`	`98`
`99`		`-func (b Builder) CanCreateTodo(assetPolicy todo.Policy) Builder {`
	`99`	`+func (b builder) CanCreateTodo(assetPolicy todo.Policy) builder {`
`100`	`100`	`if b.err != nil {`
`101`	`101`	`return b`
`102`	`102`	`}`
`103`	`103`	`b.err = assetPolicy.CanCreate(b.ctx, b.user, b.workspace, b.project)`
`104`	`104`	`return b`
`105`	`105`	`}`
`106`	`106`
`107`		`-func (b Builder) CanUpdateTodo(assetPolicy todo.Policy) Builder {`
	`107`	`+func (b builder) CanUpdateTodo(assetPolicy todo.Policy) builder {`
`108`	`108`	`if b.err != nil {`
`109`	`109`	`return b`
`110`	`110`	`}`
`111`	`111`	`b.err = assetPolicy.CanUpdate(b.ctx, b.user, b.workspace, b.project, b.todo)`
`112`	`112`	`return b`
`113`	`113`	`}`
`114`	`114`
`115`		`-func (b Builder) CanDeleteTodo(assetPolicy todo.Policy) Builder {`
	`115`	`+func (b builder) CanDeleteTodo(assetPolicy todo.Policy) builder {`
`116`	`116`	`if b.err != nil {`
`117`	`117`	`return b`
`118`	`118`	`}`