TeamDetail.MembersをTeamに移した #484

0214sh7 · 2023-03-07T13:46:11Z

#470

ras0q

一部レビューしました
テストがコンパイルに失敗してそうです

interfaces/handler/contest.go

interfaces/handler/user_test.go

…o breaking/move_members_into_team

codecov · 2023-03-21T14:36:32Z

Codecov Report

Attention: 12 lines in your changes are missing coverage. Please review.

Files	Coverage Δ
domain/user.go	`71.73% <ø> (ø)`
interfaces/handler/contest.go	`99.00% <100.00%> (+1.04%)`	⬆️
interfaces/handler/user.go	`100.00% <100.00%> (ø)`
interfaces/repository/user_impl.go	`97.36% <100.00%> (ø)`
util/mockdata/handler.go	`99.33% <100.00%> (+0.04%)`	⬆️
interfaces/repository/contest_impl.go	`96.86% <82.60%> (-2.43%)`	⬇️

... and 2 files with indirect coverage changes

📢 Thoughts on this report? Let us know!.

ras0q

感謝🙌
codecov見るとGetのどのテストもメンバーが入ってなさそうなので適宜メンバー入れてくれると助かります🙏
あとlintの修正もお願いします！

…o breaking/move_members_into_team

util/mockdata/handler.go

ras0q · 2023-04-18T12:33:08Z

失敗してるテスト見るとわかるんですが、membersがnilになってるとこは空配列にして欲しいです🙏

…o breaking/move_members_into_team

ras0q · 2023-07-20T12:55:16Z

@0214sh7 ここMembers追加し忘れてます

traPortfolio/interfaces/repository/user_impl.go

Lines 541 to 551 in 2c359ca

    
           for _, v := range contestTeamUserBelongings { 
        
           	if userID == v.UserID { 
        
           		ct := v.ContestTeam 
        
           		contestsMap[ct.ContestID].Teams = append(contestsMap[ct.ContestID].Teams, &domain.ContestTeam{ 
        
           			ID:        ct.ID, 
        
           			ContestID: ct.ContestID, 
        
           			Name:      ct.Name, 
        
           			Result:    ct.Result, 
        
           		}) 
        
           	} 
        
           }

domain/contest.go

docs/swagger/traPortfolio.v1.yaml

integration_tests/repository/user_test.go

interfaces/repository/contest_impl.go

interfaces/repository/contest_impl_test.go

util/mockdata/handler.go

ras0q

見ました
いくつか書きました

interfaces/handler/oapi_types_gen.go

util/mockdata/handler.go

interfaces/handler/user.go

ras0q

いくつか🙏

interfaces/repository/contest_impl.go

interfaces/repository/contest_impl_test.go

interfaces/repository/contest_impl.go

interfaces/repository/contest_impl_test.go

…o breaking/move_members_into_team

0214sh7 · 2023-08-20T19:58:48Z

マージまじでしんどすぎてマージ・マジ・マジーロ

0214sh7 · 2023-09-26T16:38:45Z

makeUserNameMapくんが何者なのかよくわかってません、何を引数とするmapですかこれ

traPortfolio/interfaces/repository/contest_impl.go

Line 224 in 2ab1502

nameMap, err := r.makeUserNameMap()

traPortfolio/interfaces/repository/contest_impl.go

Lines 585 to 597 in 2ab1502

    
           func (r *ContestRepository) makeUserNameMap() (map[string]string, error) { 
        
           	users, err := r.portal.GetAll() 
        
           	if err != nil { 
        
           		return nil, err 
        
           	} 
        
           	mp := make(map[string]string, len(users)) 
        
           	for _, v := range users { 
        
           		mp[v.TraQID] = v.RealName 
        
           	} 
        
           	return mp, nil 
        
           }

ras0q · 2023-09-29T14:54:26Z

makeUserNameMapくんが何者なのかよくわかってません、何を引数とするmapですかこれ

traPortfolio/interfaces/repository/contest_impl.go

Line 224 in 2ab1502

nameMap, err := r.makeUserNameMap()

traPortfolio/interfaces/repository/contest_impl.go

Lines 585 to 597 in 2ab1502

func (r *ContestRepository) makeUserNameMap() (map[string]string, error) {

users, err := r.portal.GetAll()

if err != nil {

return nil, err

}

mp := make(map[string]string, len(users))

for _, v := range users {

mp[v.TraQID] = v.RealName

}

return mp, nil

}

traQ ID = user.Nameですね

go.mod

interfaces/repository/contest_impl.go

…o breaking/move_members_into_team

ras0q · 2023-10-26T13:51:10Z

interfaces/handler/contest_test.go

+					Name:      random.AlphaNumeric(),
+					Result:    random.AlphaNumeric(),
+				},
+				Members: make([]*domain.User, 0),


ここメンバー1つでもいいので入れ他方がよさそう

ras0q · 2023-10-26T13:51:20Z

interfaces/handler/contest_test.go

+					Name:      random.AlphaNumeric(),
+					Result:    random.AlphaNumeric(),
+				},
+				Members: make([]*domain.User, 0),


ras0q · 2023-10-26T13:52:32Z

interfaces/handler/contest.go

 	contestTeams := make([]schema.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, []schema.User{}))
 	}
 	res := newContestDetail(newContest(contest.ID, contest.Name, contest.TimeStart, contest.TimeEnd), contest.Link, contest.Description, contestTeams)


作成時はチームがないのでここら辺の記述はいらないかも

ras0q · 2023-10-26T13:53:44Z

interfaces/handler/contest_test.go

+							Name:      random.AlphaNumeric(),
+							Result:    random.AlphaNumeric(),
+						},
+						Members: make([]*domain.User, 0),


ここらへんも

ras0q

いいと思います！感謝

TeamDetail.MembersをTeamに移した

876769e

ras0q requested changes Mar 7, 2023

View reviewed changes

interfaces/handler/contest.go Outdated Show resolved Hide resolved

interfaces/handler/contest.go Outdated Show resolved Hide resolved

0214sh7 added 2 commits March 7, 2023 23:44

Membersの箇所を修正

171a9c0

メンバーが空になるケースでの処理を変更

b637650

ras0q reviewed Mar 8, 2023

View reviewed changes

interfaces/handler/user_test.go Outdated Show resolved Hide resolved

0214sh7 added 3 commits March 21, 2023 21:28

Merge branch 'main' of https://github.com/traPtitech/traPortfolio int…

916b896

…o breaking/move_members_into_team

単体/結合テストにおいてmembersがnilになっている箇所を修正

8704e2e

rcontest.Teams[0].Membersが空であることを明示

e86e891

ras0q requested changes Mar 22, 2023

View reviewed changes

Merge branch 'main' of https://github.com/traPtitech/traPortfolio int…

484ed10

…o breaking/move_members_into_team

ras0q reviewed Apr 11, 2023

View reviewed changes

util/mockdata/handler.go Outdated Show resolved Hide resolved

mockのユーザー情報をMembersに入れる

26314d6

ras0q reviewed Apr 11, 2023

View reviewed changes

util/mockdata/handler.go Outdated Show resolved Hide resolved

ras0q reviewed Apr 11, 2023

View reviewed changes

util/mockdata/handler.go Outdated Show resolved Hide resolved

ras0q reviewed Apr 11, 2023

View reviewed changes

util/mockdata/handler.go Outdated Show resolved Hide resolved

0214sh7 added 2 commits April 11, 2023 22:33

HMockContestTeamMembersByIDを作成

5d9eccd

HMockContestTeamMembersByIDを使ったID指定を残りの箇所にも反映

6129f5d

0214sh7 added 3 commits April 25, 2023 22:13

Merge branch 'main' of https://github.com/traPtitech/traPortfolio int…

dfd2fdd

…o breaking/move_members_into_team

mapがnilを返すときの場合分け

4f6f677

Merge branch 'main' of https://github.com/traPtitech/traPortfolio int…

816841a

…o breaking/move_members_into_team

ContestTeamWithoutMembersを追加しUserContestのメンバを変更

8ee9ed2