[feat] 약속 나가기, 약속 삭제하기 API 구현 (#97)

* [feat] #96 implement leave promise logic * [feat] #96 implement delete promise logic * [fix] #96 fix errorCode in ParticipantCheckAspect
OMZigak · Aug 20, 2024 · a1a551e · a1a551e
1 parent 1f092ae
commit a1a551e
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 3 deletions.
diff --git a/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java b/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java
@@ -5,8 +5,8 @@
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.kkumulkkum.server.annotation.IsParticipant;
-import org.kkumulkkum.server.exception.MemberException;
-import org.kkumulkkum.server.exception.code.MemberErrorCode;
+import org.kkumulkkum.server.exception.ParticipantException;
+import org.kkumulkkum.server.exception.code.ParticipantErrorCode;
 import org.kkumulkkum.server.service.participant.ParticipantRetriever;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@ public void checkUserInMeeting(JoinPoint joinPoint, IsParticipant checkUserInPro
         Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
 
         if (!participantRetriever.existsByPromiseIdAndUserId(promiseId, userId)) {
-            throw new MemberException(MemberErrorCode.NOT_JOINED_MEMBER);
+            throw new ParticipantException(ParticipantErrorCode.NOT_JOINED_PROMISE);
         }
     }
 }
diff --git a/src/main/java/org/kkumulkkum/server/controller/ParticipantController.java b/src/main/java/org/kkumulkkum/server/controller/ParticipantController.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.kkumulkkum.server.annotation.IsMemberByPromiseId;
+import org.kkumulkkum.server.annotation.IsParticipant;
 import org.kkumulkkum.server.annotation.UserId;
 import org.kkumulkkum.server.dto.participant.request.PreparationInfoDto;
 import org.kkumulkkum.server.dto.participant.response.LateComersDto;
@@ -77,4 +78,14 @@ public ResponseEntity<LateComersDto> getLateComers(
     ) {
         return ResponseEntity.ok().body(participantService.getLateComers(promiseId));
     }
+
+    @IsParticipant(promiseIdParamIndex = 1)
+    @DeleteMapping("/v1/promises/{promiseId}/leave")
+    public ResponseEntity<Void> leavePromise(
+            @UserId final Long userId,
+            @PathVariable("promiseId") final Long promiseId
+    ) {
+        participantService.leavePromise(userId, promiseId);
+        return ResponseEntity.ok().build();
+    }
 }
diff --git a/src/main/java/org/kkumulkkum/server/controller/PromiseController.java b/src/main/java/org/kkumulkkum/server/controller/PromiseController.java
@@ -72,4 +72,13 @@ public ResponseEntity<MainPromisesDto> getUpcomingPromise(
     ) {
         return ResponseEntity.ok().body(promiseService.getUpcomingPromises(userId));
     }
+
+    @IsParticipant(promiseIdParamIndex = 0)
+    @DeleteMapping("/v1/promises/{promiseId}")
+    public ResponseEntity<Void> deletePromise(
+            @PathVariable("promiseId") final Long promiseId
+    ) {
+        promiseService.deletePromise(promiseId);
+        return ResponseEntity.ok().build();
+    }
 }
diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java
@@ -1,9 +1,12 @@
 package org.kkumulkkum.server.service.participant;
 
 import lombok.RequiredArgsConstructor;
+import org.kkumulkkum.server.domain.Participant;
 import org.kkumulkkum.server.repository.ParticipantRepository;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 @RequiredArgsConstructor
 public class ParticipantRemover {
@@ -13,4 +16,12 @@ public class ParticipantRemover {
     public void deleteByMemberId(final Long memberId) {
         participantRepository.deleteByMemberId(memberId);
     }
+
+    public void deleteById(final Long id) {
+        participantRepository.deleteById(id);
+    }
+
+    public void deleteAll(List<Participant> participants) {
+        participantRepository.deleteAllInBatch(participants);
+    }
 }
diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java
@@ -30,6 +30,7 @@ public class ParticipantService {
     private final ParticipantRetriever participantRetriever;
     private final ParticipantEditor participantEditor;
     private final PromiseRetriever promiseRetriever;
+    private final ParticipantRemover participantRemover;
     private final FcmService fcmService;
 
     @Transactional
@@ -138,6 +139,15 @@ public LateComersDto getLateComers(final Long promiseId) {
         );
     }
 
+    @Transactional
+    public void leavePromise(
+            final Long userId,
+            final Long promiseId
+    ) {
+        Participant participant = participantRetriever.findByPromiseIdAndUserId(promiseId, userId);
+        participantRemover.deleteById(participant.getId());
+    }
+
     private boolean validateState(
             final Participant participant,
             final String status

diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java b/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java
@@ -0,0 +1,16 @@
+package org.kkumulkkum.server.service.promise;
+
+import lombok.RequiredArgsConstructor;
+import org.kkumulkkum.server.repository.PromiseRepository;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class PromiseRemover {
+
+    private final PromiseRepository promiseRepository;
+
+    public void deleteById(final Long promiseId) {
+        promiseRepository.deleteById(promiseId);
+    }
+}
diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java b/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java
@@ -8,6 +8,7 @@
 import org.kkumulkkum.server.exception.PromiseException;
 import org.kkumulkkum.server.exception.code.PromiseErrorCode;
 import org.kkumulkkum.server.service.member.MemberRetreiver;
+import org.kkumulkkum.server.service.participant.ParticipantRemover;
 import org.kkumulkkum.server.service.participant.ParticipantRetriever;
 import org.kkumulkkum.server.service.participant.ParticipantSaver;
 import org.kkumulkkum.server.service.userInfo.UserInfoRetriever;
@@ -32,6 +33,8 @@ public class PromiseService {
     private final UserInfoRetriever userInfoRetriever;
     private final EntityManager entityManager;
     private final MemberRetreiver memberRetreiver;
+    private final PromiseRemover promiseRemover;
+    private final ParticipantRemover participantRemover;
 
     @Transactional
     public PromiseAddDto createPromise(
@@ -144,6 +147,18 @@ public MainPromisesDto getUpcomingPromises(final Long userId) {
         return MainPromisesDto.from(promiseRetriever.findUpcomingPromises(userId, 4));
     }
 
+    @Transactional
+    public void deletePromise(final Long promiseId) {
+        Promise promise = promiseRetriever.findById(promiseId);
+
+        List<Participant> participants = participantRetriever.findAllByPromiseId(promise.getId());
+        // 약속에 속한 모든 참가자 삭제
+        participantRemover.deleteAll(participants);
+
+        // 약속 삭제
+        promiseRemover.deleteById(promise.getId());
+    }
+
     private void updateUserInfo(
             final Participant participant,
             final LocalDateTime promiseTime