[fix] : 유저 초대 기능 수정

src/main/java/com/example/jolvre/group/api/GroupInviteController.java

@@ -1,9 +1,9 @@
 package com.example.jolvre.group.api;
 
 import com.example.jolvre.auth.PrincipalDetails;
-import com.example.jolvre.group.dto.GroupInviteDTO.InviteCheckRequest;
 import com.example.jolvre.group.dto.GroupInviteDTO.InviteRequest;
 import com.example.jolvre.group.dto.GroupInviteDTO.InviteResponses;
+import com.example.jolvre.group.entity.InviteState;
 import com.example.jolvre.group.service.GroupInviteService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,11 +43,12 @@ public ResponseEntity<InviteResponses> getAllInvite(@AuthenticationPrincipal Pri
         return ResponseEntity.ok().body(responses);
     }
 
-    @Operation(summary = "자신의 초대 확인")
-    @PostMapping("/user/{inviteId}")
+    @Operation(summary = "자신의 초대 수락 Or 거절")
+    @PostMapping("/user/{inviteId}/{inviteState}")
     public ResponseEntity<?> checkInvite(@PathVariable Long inviteId,
-                                         @RequestBody InviteCheckRequest request) {
-        groupInviteService.checkInviteStatus(inviteId, request.getInviteState());
+                                         @PathVariable InviteState inviteState,
+                                         @AuthenticationPrincipal PrincipalDetails principalDetails) {
+        groupInviteService.checkInviteStatus(inviteId, inviteState, principalDetails.getId());
 
         return ResponseEntity.ok().build();
     }

src/main/java/com/example/jolvre/group/dto/GroupInviteDTO.java

@@ -1,6 +1,7 @@
 package com.example.jolvre.group.dto;
 
 import com.example.jolvre.group.entity.GroupInviteState;
+import com.example.jolvre.group.entity.InviteState;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AllArgsConstructor;
@@ -23,19 +24,20 @@ public static class InviteRequest {
     @Builder
     @NoArgsConstructor
     public static class InviteCheckRequest {
-        private String inviteState;
+        private InviteState inviteState;
     }
 
     @Getter
     @AllArgsConstructor
     @Builder
     @NoArgsConstructor
     public static class InviteResponse {
-        private String exhibit;
+        private Long id;
+        private String groupName;
         private String inviteState;
 
         public static InviteResponse toDTO(GroupInviteState inviteState) {
-            return new InviteResponse(inviteState.getGroupExhibit().getName(),
+            return new InviteResponse(inviteState.getId(), inviteState.getGroupExhibit().getName(),
                     inviteState.getInviteState().toString());
         }
     }

src/main/java/com/example/jolvre/group/entity/GroupExhibit.java

@@ -48,6 +48,7 @@ public class GroupExhibit extends BaseTimeEntity {
     @OneToMany(mappedBy = "groupExhibit", orphanRemoval = true)
     private List<Manager> managers = new ArrayList<>(); //todo : 멤버 매니저 통합 , 멤버 Role 컬럼 생성
 
+
     @OneToMany(mappedBy = "groupExhibit", orphanRemoval = true)
     private List<RegisteredExhibit> registeredExhibits = new ArrayList<>();
 

src/main/java/com/example/jolvre/group/repository/GroupInviteStateRepository.java

@@ -2,10 +2,13 @@
 
 import com.example.jolvre.group.entity.GroupInviteState;
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface GroupInviteStateRepository extends JpaRepository<GroupInviteState, Long> {
 
     List<GroupInviteState> findAllByUserId(Long userId);
 
+    Optional<GroupInviteState> findByIdAndUserId(Long Id, Long userId);
+
 }

src/main/java/com/example/jolvre/group/service/GroupInviteService.java

@@ -55,11 +55,11 @@ public InviteResponses getAllInvite(Long userId) {
     }
 
     @Transactional //초대 상태 체크 (수락 OR 거절)
-    public void checkInviteStatus(Long inviteId, String inviteState) {
-        GroupInviteState invite = groupInviteStateRepository.findById(inviteId)
+    public void checkInviteStatus(Long inviteId, InviteState inviteState, Long loginUserId) {
+        GroupInviteState invite = groupInviteStateRepository.findByIdAndUserId(inviteId, loginUserId)
                 .orElseThrow(GroupExhibitNotFoundException::new);
 
-        if (InviteState.ACCEPT.toString().equals(inviteState)) {
+        if (InviteState.ACCEPT.equals(inviteState)) {
             User user = invite.getUser();
             GroupExhibit group = invite.getGroupExhibit();