2
2
3
3
import com .woowacourse .naepyeon .controller .auth .AuthenticationPrincipal ;
4
4
import com .woowacourse .naepyeon .controller .dto .CreateResponse ;
5
+ import com .woowacourse .naepyeon .controller .dto .InviteCodeResponse ;
5
6
import com .woowacourse .naepyeon .controller .dto .InviteJoinRequest ;
6
- import com .woowacourse .naepyeon .controller .dto .InviteTokenResponse ;
7
7
import com .woowacourse .naepyeon .controller .dto .JoinTeamMemberRequest ;
8
8
import com .woowacourse .naepyeon .controller .dto .LoginMemberRequest ;
9
9
import com .woowacourse .naepyeon .controller .dto .TeamRequest ;
@@ -104,7 +104,7 @@ public ResponseEntity<Void> deleteTeam(@AuthenticationPrincipal @Valid final Log
104
104
@ PostMapping ("/{teamId}" )
105
105
public ResponseEntity <Void > joinMember (@ AuthenticationPrincipal @ Valid final LoginMemberRequest loginMemberRequest ,
106
106
@ PathVariable final Long teamId ,
107
- @ RequestBody final JoinTeamMemberRequest joinTeamMemberRequest ) {
107
+ @ RequestBody @ Valid final JoinTeamMemberRequest joinTeamMemberRequest ) {
108
108
teamService .joinMember (teamId , loginMemberRequest .getId (), joinTeamMemberRequest .getNickname ());
109
109
return ResponseEntity .noContent ().build ();
110
110
}
@@ -121,37 +121,36 @@ public ResponseEntity<TeamMemberResponseDto> getMyInfoInTeam(
121
121
public ResponseEntity <Void > updateMyInfo (
122
122
@ AuthenticationPrincipal @ Valid final LoginMemberRequest loginMemberRequest ,
123
123
@ PathVariable final Long teamId ,
124
- @ RequestBody final UpdateTeamParticipantRequest updateTeamParticipantRequest ) {
124
+ @ RequestBody @ Valid final UpdateTeamParticipantRequest updateTeamParticipantRequest ) {
125
125
teamService .updateMyInfo (teamId , loginMemberRequest .getId (), updateTeamParticipantRequest .getNickname ());
126
126
return ResponseEntity .noContent ().build ();
127
127
}
128
128
129
129
@ PostMapping ("/{teamId}/invite" )
130
- public ResponseEntity <InviteTokenResponse > createInviteToken (
130
+ public ResponseEntity <InviteCodeResponse > createInviteCode (
131
131
@ AuthenticationPrincipal @ Valid final LoginMemberRequest loginMemberRequest ,
132
132
@ PathVariable final Long teamId ) {
133
133
if (!teamService .isJoinedMember (loginMemberRequest .getId (), teamId )) {
134
134
throw new UncertificationTeamMemberException (teamId , loginMemberRequest .getId ());
135
135
}
136
- final String inviteToken = teamService .createInviteToken (teamId );
137
- return ResponseEntity .ok (new InviteTokenResponse ( inviteToken ));
136
+ final String inviteCode = teamService .createInviteCode (teamId );
137
+ return ResponseEntity .ok (new InviteCodeResponse ( inviteCode ));
138
138
}
139
139
140
140
@ GetMapping ("/invite" )
141
- public ResponseEntity <TeamResponseDto > findTeamByInviteToken (
141
+ public ResponseEntity <TeamResponseDto > findTeamByInviteCode (
142
142
@ AuthenticationPrincipal @ Valid final LoginMemberRequest loginMemberRequest ,
143
- @ RequestParam ("inviteToken" ) final String inviteToken ) {
144
-
145
- final TeamResponseDto teamResponseDto = teamService .findTeamByInviteToken (inviteToken ,
146
- loginMemberRequest .getId ());
143
+ @ RequestParam ("inviteCode" ) final String inviteCode ) {
144
+ final TeamResponseDto teamResponseDto =
145
+ teamService .findTeamByInviteCode (inviteCode , loginMemberRequest .getId ());
147
146
return ResponseEntity .ok (teamResponseDto );
148
147
}
149
148
150
149
@ PostMapping ("/invite/join" )
151
150
public ResponseEntity <Void > inviteJoin (@ AuthenticationPrincipal @ Valid final LoginMemberRequest loginMemberRequest ,
152
- @ RequestBody final InviteJoinRequest inviteJoinRequest ) {
151
+ @ RequestBody @ Valid final InviteJoinRequest inviteJoinRequest ) {
153
152
teamService .inviteJoin (
154
- inviteJoinRequest .getInviteToken (),
153
+ inviteJoinRequest .getInviteCode (),
155
154
loginMemberRequest .getId (),
156
155
inviteJoinRequest .getNickname ()
157
156
);
0 commit comments