fix: 루틴 삭제 기능 수정 (#60)

* feat: 몇가지 소소한 수정

* refactor: ♻️ user 디렉토리 구조 수정 (#53)

* hotfix: conflict solve (#55)

* refactor: ♻️ user 디렉토리 구조 수정

* hotfix: conflict solve

* hotfix: 🚑 build error 해결 (#57)

* refactor: ♻️ user 디렉토리 구조 수정

* hotfix: conflict solve

* hotfix: 🚑 sever restart

* fix: 루틴 삭제 기능 수정

* fix: 루틴 삭제 기능 수정

---------

Co-authored-by: LEEJaeHyeok97 <[email protected]>

Author: gzhan0226

src/main/java/com/goormdari/domain/routine/application/RoutineService.java

@@ -1,5 +1,6 @@
 package com.goormdari.domain.routine.application;
 
+import com.amazonaws.services.kms.model.AlreadyExistsException;
 import com.amazonaws.services.kms.model.NotFoundException;
 import com.goormdari.domain.routine.domain.Routine;
 import com.goormdari.domain.routine.dto.request.CompleteRoutineRequest;
@@ -21,10 +22,17 @@ public class RoutineService {
 
     private final RoutineRepository routineRepository;
     private final UserRepository userRepository;
+
+    private final S3Service s3Service;
     @Transactional
     public Message completeRoutine (Long userId, CompleteRoutineRequest completeRoutineRequest, String imgURL) {
         User user = userRepository.findById(userId)
                 .orElseThrow(()->new NotFoundException("User Not Found"));
+
+        if(routineRepository.findByRoutineIndexAndUserId(userId, completeRoutineRequest.routineIndex())!= null) {
+            throw new IllegalStateException("Routine already completed for given index");
+        }
+
         Routine routine = Routine.builder()
                 .user(user)
                 .routineImg(imgURL)
@@ -46,6 +54,7 @@ public Message deleteRoutineByUserIdAndRoutineIndex (Long userId, Long routineIn
                 .orElseThrow(()->new NotFoundException("User Not Found"));
         Routine routine = routineRepository.findByRoutineIndexAndUserId(userId,routineIndex);
         routineRepository.deleteById(routine.getId());
+        s3Service.deleteImageOnS3(routine.getRoutineImg());
         user.updateCurrentStep(user.getCurrentStep()-1);
         return Message.builder()
                 .message("루틴 삭제 성공")

src/main/java/com/goormdari/domain/routine/domain/Routine.java

@@ -35,7 +35,6 @@ public class Routine extends BaseEntity {
     @Column(name = "routine_name")
     private String routineName;
 
-
     @Builder
     public Routine(User user, String routineImg, Long routineIndex, String routineName) {
         this.user=user;

src/main/java/com/goormdari/domain/routine/presentation/RoutineController.java

@@ -67,7 +67,6 @@ public ResponseCustom<Message> uploadRoutine(
     @DeleteMapping("/upload")
     public ResponseCustom<Message> deleteRoutine(
             @Parameter(description = "Accesstoken을 입력해주세요.", required = true) @RequestHeader("Authorization") String token,
-            @Parameter(description = "이미지 url", required = true) @Valid @RequestParam("imgURL") String imgURL,
             @Parameter(description = "루틴 Index", required = true) @Valid @RequestParam("routineIndex") Long routineIndex
     ) {
         if (token == null) {
@@ -79,7 +78,6 @@ public ResponseCustom<Message> deleteRoutine(
             throw new IllegalArgumentException("Invalid token");
         }
         Long userId = jwtUtil.extractId(jwt);
-        s3Service.deleteImageOnS3(imgURL);
         return ResponseCustom.OK(routineService.deleteRoutineByUserIdAndRoutineIndex(userId, routineIndex));
     }