TeamDetail.MembersをTeamに移した

docs/swagger/traPortfolio.v1.yaml

@@ -1148,10 +1148,10 @@ components:
             - link
             - description
             - teams
-    ContestTeam:
-      title: ContestTeam
+    ContestTeamWithoutMembers:
+      title: ContestTeamWithoutMembers
       type: object
-      description: コンテストチーム情報
+      description: コンテストチーム情報(チームメンバーなし)
       properties:
         id:
           type: string
@@ -1168,6 +1168,21 @@ components:
         - id
         - name
         - result
+    ContestTeam:
+      title: ContestTeam
+      type: object
+      description: コンテストチーム情報
+      allOf:
+        - $ref: "#/components/schemas/ContestTeamWithoutMembers"
+        - type: object
+          properties:
+            members:
+              type: array
+              description: チームメンバーのユーザー情報
+              items:
+                $ref: '#/components/schemas/User'
+          required:
+            - members
     ContestTeamDetail:
       title: ContestTeamDetail
       type: object
@@ -1191,7 +1206,6 @@ components:
           required:
             - link
             - description
-            - members
     PrPermitted:
       title: PrPermitted
       type: boolean

domain/contest.go

@@ -20,16 +20,20 @@ type ContestDetail struct {
 	ContestTeams []*ContestTeam
 }
 
-type ContestTeam struct {
+type ContestTeamWithoutMembers struct {
 	ID        uuid.UUID
 	ContestID uuid.UUID
 	Name      string
 	Result    string
 }
 
+type ContestTeam struct {
+	ContestTeamWithoutMembers
+	Members []*User
+}
+
 type ContestTeamDetail struct {
 	ContestTeam
 	Link        string
 	Description string
-	Members     []*User
 }

domain/user.go

@@ -65,7 +65,7 @@ type UserContest struct {
 	Name      string    // コンテスト名
 	TimeStart time.Time
 	TimeEnd   time.Time
-	Teams     []*ContestTeam // ユーザーが所属するチームのリスト
+	Teams     []*ContestTeamWithoutMembers // ユーザーが所属するチームのリスト
 }
 
 type UserGroup struct {

integration_tests/repository/user_test.go

@@ -543,12 +543,17 @@ func TestUserRepository_GetContests(t *testing.T) {
 	mustAddContestTeamMembers(t, contestRepo, team1.ID, []uuid.UUID{user1.ID, user2.ID})
 	mustAddContestTeamMembers(t, contestRepo, team2.ID, []uuid.UUID{user1.ID})
 
-	expected1 := []*domain.UserContest{newUserContest(&contest1.Contest, []*domain.ContestTeam{&team1.ContestTeam}), newUserContest(&contest2.Contest, []*domain.ContestTeam{&team2.ContestTeam})}
+	expected1 := []*domain.UserContest{
+		newUserContest(&contest1.Contest, []*domain.ContestTeamWithoutMembers{&team1.ContestTeam.ContestTeamWithoutMembers}),
+		newUserContest(&contest2.Contest, []*domain.ContestTeamWithoutMembers{&team2.ContestTeam.ContestTeamWithoutMembers}),
+	}
 	contests1, err := userRepo.GetContests(context.Background(), user1.ID)
 	assert.NoError(t, err)
 	assert.ElementsMatch(t, expected1, contests1)
 
-	expected2 := []*domain.UserContest{newUserContest(&contest1.Contest, []*domain.ContestTeam{&team1.ContestTeam})}
+	expected2 := []*domain.UserContest{
+		newUserContest(&contest1.Contest, []*domain.ContestTeamWithoutMembers{&team1.ContestTeam.ContestTeamWithoutMembers}),
+	}
 	contests2, err := userRepo.GetContests(context.Background(), user2.ID)
 	assert.NoError(t, err)
 	assert.ElementsMatch(t, expected2, contests2)
@@ -575,7 +580,7 @@ func newUserProject(args *urepository.CreateProjectMemberArgs, project *domain.P
 	}
 }
 
-func newUserContest(contest *domain.Contest, teams []*domain.ContestTeam) *domain.UserContest {
+func newUserContest(contest *domain.Contest, teams []*domain.ContestTeamWithoutMembers) *domain.UserContest {
 	return &domain.UserContest{
 		ID:        contest.ID,
 		Name:      contest.Name,

interfaces/handler/contest.go

@@ -58,7 +58,11 @@ func (h *ContestHandler) GetContest(_c echo.Context) error {
 
 	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 @@ func (h *ContestHandler) CreateContest(_c echo.Context) error {
 
 	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 @@ func (h *ContestHandler) GetContestTeams(_c echo.Context) error {
 
 	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 @@ func (h *ContestHandler) GetContestTeam(_c echo.Context) error {
 	}
 
 	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 @@ func (h *ContestHandler) AddContestTeam(_c echo.Context) error {
 		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,29 @@ func newContestDetail(contest Contest, link string, description string, teams []
 	}
 }
 
-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,
+		Members: members,
+	}
+}
+
+func newContestTeamWithoutMembers(id uuid.UUID, name string, result string) ContestTeamWithoutMembers {
+	return ContestTeamWithoutMembers{
 		Id:     id,
 		Name:   name,
 		Result: result,
 	}
 }
 
-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

@@ -123,26 +123,33 @@ func makeContest(t *testing.T) (*domain.ContestDetail, *ContestDetail) {
 		Description: random.AlphaNumeric(),
 		ContestTeams: []*domain.ContestTeam{
 			{
-				ID:        getContestID[1],
-				ContestID: getContestID[0],
-				Name:      random.AlphaNumeric(),
-				Result:    random.AlphaNumeric(),
+				ContestTeamWithoutMembers: domain.ContestTeamWithoutMembers{
+					ID:        getContestID[1],
+					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(),
+				ContestTeamWithoutMembers: domain.ContestTeamWithoutMembers{
+					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,
 		}
 	}
 
@@ -506,28 +513,36 @@ func TestContestHandler_GetContestTeams(t *testing.T) {
 				contestID := random.UUID()
 				repoContestTeams := []*domain.ContestTeam{
 					{
-						ID:        random.UUID(),
-						ContestID: contestID,
-						Name:      random.AlphaNumeric(),
-						Result:    random.AlphaNumeric(),
+						ContestTeamWithoutMembers: domain.ContestTeamWithoutMembers{
+							ID:        random.UUID(),
+							ContestID: contestID,
+							Name:      random.AlphaNumeric(),
+							Result:    random.AlphaNumeric(),
+						},
+						Members: make([]*domain.User, 0),
 					},
 					{
-						ID:        random.UUID(),
-						ContestID: contestID,
-						Name:      random.AlphaNumeric(),
-						Result:    random.AlphaNumeric(),
+						ContestTeamWithoutMembers: domain.ContestTeamWithoutMembers{
+							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)
@@ -575,17 +590,19 @@ func TestContestHandler_GetContestTeam(t *testing.T) {
 				contestID := random.UUID()
 				repoContestTeamDetail := domain.ContestTeamDetail{
 					ContestTeam: domain.ContestTeam{
-						ID:        teamID,
-						ContestID: contestID,
-						Name:      random.AlphaNumeric(),
-						Result:    random.AlphaNumeric(),
+						ContestTeamWithoutMembers: domain.ContestTeamWithoutMembers{
+							ID:        teamID,
+							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 {
@@ -679,19 +696,22 @@ func TestContestHandler_AddContestTeam(t *testing.T) {
 				}
 				want := domain.ContestTeamDetail{
 					ContestTeam: domain.ContestTeam{
-						ID:        teamID,
-						ContestID: contestID,
-						Name:      args.Name,
-						Result:    args.Result.ValueOrZero(),
+						ContestTeamWithoutMembers: domain.ContestTeamWithoutMembers{
+							ID:        teamID,
+							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)