Merge pull request #243 from QASTUDIODEV/feature/#224-invite-valid-check

🔨 Refactor: 토큰 값 입력으로 변경

Author: 7beunseo

src/main/java/qastudio/backend/domain/project/controller/TeamMemberController.java

@@ -225,9 +225,9 @@ public ApiResponse<TeamMemberResponse.AcceptInvitation> acceptInvitation(@Reques
     )
     @PostMapping("/team-members/email-invite")
     public ApiResponse<TeamMemberResponse.AcceptInvitation> acceptInvitation(@RequestBody @Valid TeamMemberRequest.InviteWithEmail inviteWithEmail) {
-        teamMemberCommandService.inviteMemberWithEmailAndProjectId(
+        teamMemberCommandService.inviteMemberWithEmailAndToken(
                 inviteWithEmail.getEmail(),
-                inviteWithEmail.getProjectId()
+                inviteWithEmail.getToken()
         );
         return ApiResponse.onSuccess(null);
     }

src/main/java/qastudio/backend/domain/project/dto/request/TeamMemberRequest.java

@@ -37,8 +37,8 @@ public static class InviteWithEmail {
         @NotBlank(message = "이메일은 필수 입력 값입니다.")
         private String email;
         // projectId
-        @NotNull(message = "projectId는 필수 입력 값입니다.")
-        private Long projectId;
+        @NotBlank(message = "token은 필수 입력 값입니다.")
+        private String token;
     }
 
 }

src/main/java/qastudio/backend/domain/project/service/TeamMemberCommandService.java

@@ -7,5 +7,5 @@
 public interface TeamMemberCommandService {
     void deleteMembers(Long projectId, TeamMemberRequest.MemberEmail deleteMember);
     TeamMemberResponse.AcceptInvitation inviteMemberWithToken(String token);
-    void inviteMemberWithEmailAndProjectId(String email, Long projectId);
+    void inviteMemberWithEmailAndToken(String email, String token);
 }

src/main/java/qastudio/backend/domain/project/service/TeamMemberCommandServiceImpl.java

@@ -109,13 +109,23 @@ public TeamMemberResponse.AcceptInvitation inviteMemberWithToken(String token) {
     }
 
     @Override
-    public void inviteMemberWithEmailAndProjectId(String email, Long projectId) {
-        // 초대하고자 하는 유저
-        Long userId = accountTableRepository.findByEmail(email).stream()
-                .map(AccountTable::getUser)
-                .map(User::getId)
-                .findFirst()
-                .orElseThrow(() -> new BadRequestException(ErrorStatus.USER_NOT_FOUND));
+    public void inviteMemberWithEmailAndToken(String email, String token) {
+        if (token == null || token.trim().isEmpty()) {
+            throw new TeamMemberException(ErrorStatus.TOKEN_MISSING);
+        }
+
+        Claims claims = inviteTokenProvider.validateToken(token);
+        Long projectId = claims.get("projectId", Long.class);
+        Long userId = claims.get("userId", Long.class);
+
+        if (userId == -1) {
+            // 초대하고자 하는 유저
+            userId = accountTableRepository.findByEmail(email).stream()
+                    .map(AccountTable::getUser)
+                    .map(User::getId)
+                    .findFirst()
+                    .orElseThrow(() -> new BadRequestException(ErrorStatus.USER_NOT_FOUND));
+        }
 
         // 중복 초대되었는지 확인
         boolean isAlreadyInvited = userProjectRepository.existsByUserIdAndProjectId(userId, projectId);