TeamDetail.MembersをTeamに移した

docs/swagger/traPortfolio.v1.yaml

@@ -1164,10 +1164,16 @@ components:
         result:
           type: string
           description: 順位などの結果
+        members:
+          type: array
+          description: チームメンバーのUUID
+          items:
+            $ref: '#/components/schemas/User'
       required:
         - id
         - name
         - result
+        - members
     ContestTeamDetail:
       title: ContestTeamDetail
       type: object
@@ -1191,7 +1197,6 @@ components:
           required:
             - link
             - description
-            - members
     PrPermitted:
       title: PrPermitted
       type: boolean

domain/contest.go

@@ -25,11 +25,11 @@ type ContestTeam struct {
 	ContestID uuid.UUID
 	Name      string
 	Result    string
+	Members   []*User
 }
 
 type ContestTeamDetail struct {
 	ContestTeam
 	Link        string
 	Description string
-	Members     []*User
 }

interfaces/handler/contest.go

@@ -58,7 +58,11 @@
 
 	teams := make([]ContestTeam, len(contest.ContestTeams))
 	for i, v := range contest.ContestTeams {
-		teams[i] = newContestTeam(v.ID, v.Name, v.Result)
+		members := make([]User, len(v.Members))
+		for j, ct := range v.Members {
+			members[j] = newUser(ct.ID, ct.Name, ct.RealName())
+		}
+		teams[i] = newContestTeam(v.ID, v.Name, v.Result, members)
 	}
 
 	res := newContestDetail(
@@ -96,7 +100,7 @@
 
 	contestTeams := make([]ContestTeam, 0, len(contest.ContestTeams))
 	for _, team := range contest.ContestTeams {
-		contestTeams = append(contestTeams, newContestTeam(team.ID, team.Name, team.Result))
+		contestTeams = append(contestTeams, newContestTeam(team.ID, team.Name, team.Result, []User{}))
 	}
 	res := newContestDetail(newContest(contest.ID, contest.Name, contest.TimeStart, contest.TimeEnd), contest.Link, contest.Description, contestTeams)
 
@@ -170,7 +174,11 @@
 
 	res := make([]ContestTeam, len(contestTeams))
 	for i, v := range contestTeams {
-		res[i] = newContestTeam(v.ID, v.Name, v.Result)
+		members := make([]User, len(v.Members))
+		for j, ct := range v.Members {
+			members[j] = newUser(ct.ID, ct.Name, ct.RealName())
+		}
+		res[i] = newContestTeam(v.ID, v.Name, v.Result, members)
 	}
 
 	return c.JSON(http.StatusOK, res)
@@ -202,10 +210,9 @@
 	}
 
 	res := newContestTeamDetail(
-		newContestTeam(contestTeam.ID, contestTeam.Name, contestTeam.Result),
+		newContestTeam(contestTeam.ID, contestTeam.Name, contestTeam.Result, members),
 		contestTeam.Link,
 		contestTeam.Description,
-		members,
 	)
 
 	return c.JSON(http.StatusOK, res)
@@ -238,7 +245,7 @@
 		return convertError(err)
 	}
 
-	res := newContestTeam(contestTeam.ID, contestTeam.Name, contestTeam.Result)
+	res := newContestTeam(contestTeam.ID, contestTeam.Name, contestTeam.Result, []User{})
 
 	return c.JSON(http.StatusCreated, res)
 }
@@ -408,20 +415,21 @@
 	}
 }
 
-func newContestTeam(id uuid.UUID, name string, result string) ContestTeam {
+func newContestTeam(id uuid.UUID, name string, result string, members []User) ContestTeam {
 	return ContestTeam{
-		Id:     id,
-		Name:   name,
-		Result: result,
+		Id:      id,
+		Name:    name,
+		Result:  result,
+		Members: members,
 	}
 }
 
-func newContestTeamDetail(team ContestTeam, link string, description string, members []User) ContestTeamDetail {
+func newContestTeamDetail(team ContestTeam, link string, description string) ContestTeamDetail {
 	return ContestTeamDetail{
 		Description: description,
 		Id:          team.Id,
 		Link:        link,
-		Members:     members,
+		Members:     team.Members,
 		Name:        team.Name,
 		Result:      team.Result,
 	}

interfaces/handler/contest_test.go

@@ -127,22 +127,25 @@ func makeContest(t *testing.T) (*domain.ContestDetail, *ContestDetail) {
 				ContestID: getContestID[0],
 				Name:      random.AlphaNumeric(),
 				Result:    random.AlphaNumeric(),
+				Members:   make([]*domain.User, 0),
 			},
 			{
 				ID:        getContestID[2],
 				ContestID: getContestID[0],
 				Name:      random.AlphaNumeric(),
 				Result:    random.AlphaNumeric(),
+				Members:   make([]*domain.User, 0),
 			},
 		},
 	}
 
 	teams := make([]ContestTeam, len(d.ContestTeams))
 	for i, v := range d.ContestTeams {
 		teams[i] = ContestTeam{
-			Id:     v.ID,
-			Name:   v.Name,
-			Result: v.Result,
+			Id:      v.ID,
+			Members: make([]User, 0),
+			Name:    v.Name,
+			Result:  v.Result,
 		}
 	}
 
@@ -510,24 +513,28 @@ func TestContestHandler_GetContestTeams(t *testing.T) {
 						ContestID: contestID,
 						Name:      random.AlphaNumeric(),
 						Result:    random.AlphaNumeric(),
+						Members:   make([]*domain.User, 0),
 					},
 					{
 						ID:        random.UUID(),
 						ContestID: contestID,
 						Name:      random.AlphaNumeric(),
 						Result:    random.AlphaNumeric(),
+						Members:   make([]*domain.User, 0),
 					},
 				}
 				hres = []*ContestTeam{
 					{
-						Id:     repoContestTeams[0].ID,
-						Name:   repoContestTeams[0].Name,
-						Result: repoContestTeams[0].Result,
+						Id:      repoContestTeams[0].ID,
+						Members: make([]User, 0),
+						Name:    repoContestTeams[0].Name,
+						Result:  repoContestTeams[0].Result,
 					},
 					{
-						Id:     repoContestTeams[1].ID,
-						Name:   repoContestTeams[1].Name,
-						Result: repoContestTeams[1].Result,
+						Id:      repoContestTeams[1].ID,
+						Members: make([]User, 0),
+						Name:    repoContestTeams[1].Name,
+						Result:  repoContestTeams[1].Result,
 					},
 				}
 				s.EXPECT().GetContestTeams(anyCtx{}, contestID).Return(repoContestTeams, nil)
@@ -579,13 +586,13 @@ func TestContestHandler_GetContestTeam(t *testing.T) {
 						ContestID: contestID,
 						Name:      random.AlphaNumeric(),
 						Result:    random.AlphaNumeric(),
+						Members: []*domain.User{
+							domain.NewUser(random.UUID(), random.AlphaNumeric(), random.AlphaNumeric(), random.Bool()),
+							domain.NewUser(random.UUID(), random.AlphaNumeric(), random.AlphaNumeric(), random.Bool()),
+						},
 					},
 					Link:        random.AlphaNumeric(),
 					Description: random.AlphaNumeric(),
-					Members: []*domain.User{
-						domain.NewUser(random.UUID(), random.AlphaNumeric(), random.AlphaNumeric(), random.Bool()),
-						domain.NewUser(random.UUID(), random.AlphaNumeric(), random.AlphaNumeric(), random.Bool()),
-					},
 				}
 				members := make([]User, 0, len(repoContestTeamDetail.Members))
 				for _, member := range repoContestTeamDetail.Members {
@@ -683,15 +690,16 @@ func TestContestHandler_AddContestTeam(t *testing.T) {
 						ContestID: contestID,
 						Name:      args.Name,
 						Result:    args.Result.ValueOrZero(),
+						Members:   make([]*domain.User, 0),
 					},
 					Link:        args.Link.ValueOrZero(),
 					Description: args.Description,
-					Members:     nil,
 				}
 				expectedResBody := ContestTeam{
-					Id:     teamID,
-					Name:   want.Name,
-					Result: want.Result,
+					Id:      teamID,
+					Members: make([]User, 0),
+					Name:    want.Name,
+					Result:  want.Result,
 				}
 				s.EXPECT().CreateContestTeam(anyCtx{}, contestID, &args).Return(&want, nil)
 				return reqBody, expectedResBody, fmt.Sprintf("/api/v1/contests/%s/teams", contestID)

interfaces/handler/user.go

@@ -282,7 +282,11 @@
 	for i, c := range contests {
 		teams := make([]ContestTeam, len(c.Teams))
 		for j, ct := range c.Teams {
-			teams[j] = newContestTeam(ct.ID, ct.Name, ct.Result)
+			members := make([]User, len(ct.Members))
+			for k, ctt := range ct.Members {
+				members[k] = newUser(ctt.ID, ctt.Name, ctt.RealName())
+			}
+			teams[j] = newContestTeam(ct.ID, ct.Name, ct.Result, members)
 		}
 		res[i] = newUserContest(
 			newContest(c.ID, c.Name, c.TimeStart, c.TimeEnd),

interfaces/handler/user_test.go

@@ -1184,14 +1184,15 @@ func TestUserHandler_GetUserContests(t *testing.T) {
 						ContestID: random.UUID(),
 						Name:      random.AlphaNumeric(),
 						Result:    random.AlphaNumeric(),
+						Members:   make([]*domain.User, 0),
 					},
 				},
 			}
 
 			hcontest := newUserContest(
 				newContest(rcontest.ID, rcontest.Name, rcontest.TimeStart, rcontest.TimeEnd),
 				[]ContestTeam{
-					newContestTeam(rcontest.Teams[0].ID, rcontest.Teams[0].Name, rcontest.Teams[0].Result),
+					newContestTeam(rcontest.Teams[0].ID, rcontest.Teams[0].Name, rcontest.Teams[0].Result, make([]User, 0)),
 				},
 			)
 

interfaces/repository/contest_impl.go

@@ -261,10 +261,10 @@ func (r *ContestRepository) CreateContestTeam(ctx context.Context, contestID uui
 			ContestID: contestTeam.ContestID,
 			Name:      contestTeam.Name,
 			Result:    contestTeam.Result,
+			Members:   nil,
 		},
 		Link:        contestTeam.Link,
 		Description: contestTeam.Description,
-		Members:     nil,
 	}
 	return result, nil
 }

interfaces/repository/contest_impl_test.go

@@ -722,10 +722,10 @@ func TestContestRepository_CreateContestTeam(t *testing.T) {
 					ContestID: cid,
 					Name:      successArgs.Name,
 					Result:    successArgs.Result.ValueOrZero(),
+					Members:   nil,
 				},
 				Link:        successArgs.Link.ValueOrZero(),
 				Description: successArgs.Description,
-				Members:     nil,
 			},
 			setup: func(f mockContestRepositoryFields, args args, want *domain.ContestTeamDetail) {
 				f.h.Mock.

usecases/service/contest_test.go

@@ -527,12 +527,12 @@ func Test_contestService_GetContestTeam(t *testing.T) {
 					ContestID: cid,
 					Name:      random.AlphaNumeric(),
 					Result:    random.AlphaNumeric(),
+					Members: []*domain.User{
+						domain.NewUser(random.UUID(), random.AlphaNumeric(), random.AlphaNumeric(), random.Bool()),
+					},
 				},
 				Link:        random.RandURLString(),
 				Description: random.AlphaNumeric(),
-				Members: []*domain.User{
-					domain.NewUser(random.UUID(), random.AlphaNumeric(), random.AlphaNumeric(), random.Bool()),
-				},
 			},
 			setup: func(f fields, args args, want *domain.ContestTeamDetail) {
 				repo := f.repo.(*mock_repository.MockContestRepository)
@@ -653,10 +653,10 @@ func TestContestService_CreateContestTeam(t *testing.T) {
 					ContestID: cid,
 					Name:      name,
 					Result:    result,
+					Members:   nil,
 				},
 				Link:        link,
 				Description: description,
-				Members:     nil,
 			},
 			setup: func(f fields, args args, want *domain.ContestTeamDetail) {
 				repo := f.repo.(*mock_repository.MockContestRepository)
@@ -666,10 +666,10 @@ func TestContestService_CreateContestTeam(t *testing.T) {
 						ContestID: args.contestID,
 						Name:      args.args.Name,
 						Result:    args.args.Result.ValueOrZero(),
+						Members:   nil,
 					},
 					Link:        args.args.Link.ValueOrZero(),
 					Description: args.args.Description,
-					Members:     nil,
 				}, nil)
 			},
 			assertion: assert.NoError,

util/mockdata/handler.go

@@ -36,9 +36,10 @@ func CloneHandlerMockContestDetails() []handler.ContestDetail {
 
 	for i, c := range hContestTeams {
 		mContestTeams[i] = handler.ContestTeam{
-			Id:     c.ID,
-			Name:   c.Name,
-			Result: c.Result,
+			Id:      c.ID,
+			Members: make([]handler.User, 0),
+			Name:    c.Name,
+			Result:  c.Result,
 		}
 	}
 
@@ -85,9 +86,10 @@ func CloneHandlerMockContestTeamsByID() map[uuid.UUID][]handler.ContestTeam {
 
 	for _, ct := range mContestTeams {
 		hContestTeamsByID[ct.ContestID] = append(hContestTeamsByID[ct.ContestID], handler.ContestTeam{
-			Id:     ct.ID,
-			Name:   ct.Name,
-			Result: ct.Result,
+			Id:      ct.ID,
+			Members: make([]handler.User, 0),
+			Name:    ct.Name,
+			Result:  ct.Result,
 		})
 	}
 	return hContestTeamsByID
@@ -418,9 +420,10 @@ func CloneHandlerMockUserContestsByID() map[uuid.UUID][]handler.UserContest {
 					}
 
 					userContestTeams[u.ID][c.Id] = append(userContestTeams[u.ID][c.Id], handler.ContestTeam{
-						Id:     ct.ID,
-						Name:   ct.Name,
-						Result: ct.Result,
+						Id:      ct.ID,
+						Members: make([]handler.User, 0),
+						Name:    ct.Name,
+						Result:  ct.Result,
 					})
 				}
 			}