Merge pull request #111 from softeerbootcamp4th/feature/#109-admin-lo…

…ttery-event-delete Feature/#109 admin lottery event delete
softeerbootcamp4th · Aug 13, 2024 · fd3273c · fd3273c
2 parents 1e87352 + a740121
commit fd3273c
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 9 deletions.
diff --git a/...rc/main/java/JGS/CasperEvent/domain/event/controller/adminController/AdminController.java b/...rc/main/java/JGS/CasperEvent/domain/event/controller/adminController/AdminController.java
@@ -65,19 +65,26 @@ public ResponseEntity<LotteryEventParticipantsListResponseDto> getLotteryEventPa
     @PostMapping("/event/rush")
     public ResponseEntity<RushEventResponseDto> createRushEvent(
             @RequestPart(value = "dto") RushEventRequestDto rushEventRequestDto,
-            @RequestPart(value = "prizeImg")MultipartFile prizeImg,
-            @RequestPart(value = "leftOptionImg")MultipartFile leftOptionImg,
-            @RequestPart(value = "rightOptionImg")MultipartFile rightOptionImg) {
+            @RequestPart(value = "prizeImg") MultipartFile prizeImg,
+            @RequestPart(value = "leftOptionImg") MultipartFile leftOptionImg,
+            @RequestPart(value = "rightOptionImg") MultipartFile rightOptionImg) {
         return ResponseEntity
                 .status(HttpStatus.CREATED)
                 .body(adminService.createRushEvent(rushEventRequestDto, prizeImg, leftOptionImg, rightOptionImg));
     }
 
     // 선착순 이벤트 전체 조회
     @GetMapping("/event/rush")
-    public ResponseEntity<List<AdminRushEventResponseDto>> getRushEvents(){
+    public ResponseEntity<List<AdminRushEventResponseDto>> getRushEvents() {
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(adminService.getRushEvents());
     }
+
+    // 추첨 이벤트 삭제
+    @DeleteMapping("/event/lottery")
+    public ResponseEntity<Void> deleteLotteryEvent() {
+        adminService.deleteLotteryEvent();
+        return ResponseEntity.noContent().build(); // 204 No Content
+    }
 }
diff --git a/Server/src/main/java/JGS/CasperEvent/domain/event/repository/AdminRepository.java b/Server/src/main/java/JGS/CasperEvent/domain/event/repository/AdminRepository.java
@@ -4,6 +4,9 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface AdminRepository extends JpaRepository<Admin, String> {
+    Optional<Admin> findByIdAndPassword(String id, String password);
 }
diff --git a/Server/src/main/java/JGS/CasperEvent/domain/event/service/adminService/AdminService.java b/Server/src/main/java/JGS/CasperEvent/domain/event/service/adminService/AdminService.java
@@ -52,7 +52,7 @@ public class AdminService {
     private final S3Service s3Service;
 
     public Admin verifyAdmin(AdminRequestDto adminRequestDto) {
-        return adminRepository.findById(adminRequestDto.getAdminId()).orElseThrow(NoSuchElementException::new);
+        return adminRepository.findByIdAndPassword(adminRequestDto.getAdminId(), adminRequestDto.getPassword()).orElseThrow(NoSuchElementException::new);
     }
 
     public ResponseDto postAdmin(AdminRequestDto adminRequestDto) {
@@ -153,4 +153,18 @@ public List<AdminRushEventResponseDto> getRushEvents(){
         List<RushEvent> rushEvents = rushEventRepository.findAll();
         return AdminRushEventResponseDto.of(rushEvents);
     }
+
+    public void deleteLotteryEvent() {
+        List<LotteryEvent> lotteryEventList = lotteryEventRepository.findAll();
+
+        if (lotteryEventList.isEmpty()) {
+            throw new CustomException("현재 진행중인 lotteryEvent가 존재하지 않습니다.", CustomErrorCode.NO_LOTTERY_EVENT);
+        }
+
+        if (lotteryEventList.size() > 1) {
+            throw new CustomException("현재 진행중인 lotteryEvent가 2개 이상입니다.", CustomErrorCode.TOO_MANY_LOTTERY_EVENT);
+        }
+
+        lotteryEventRepository.deleteAll();
+    }
 }
diff --git a/.../src/main/java/JGS/CasperEvent/domain/event/service/eventService/LotteryEventService.java b/.../src/main/java/JGS/CasperEvent/domain/event/service/eventService/LotteryEventService.java
@@ -29,6 +29,7 @@
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -45,7 +46,18 @@ public class LotteryEventService {
 
     public CasperBotResponseDto postCasperBot(BaseUser user, CasperBotRequestDto casperBotRequestDto) throws CustomException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException {
         LotteryParticipants participants = registerUserIfNeed(user, casperBotRequestDto);
-        LotteryEvent lotteryEvent = lotteryEventRepository.findById(1L).orElseThrow(LotteryEventNotExists::new);
+
+        List<LotteryEvent> lotteryEventList = lotteryEventRepository.findAll();
+
+        if (lotteryEventList.isEmpty()) {
+            throw new CustomException("현재 진행중인 lotteryEvent가 존재하지 않습니다.", CustomErrorCode.NO_LOTTERY_EVENT);
+        }
+
+        if (lotteryEventList.size() > 1) {
+            throw new CustomException("현재 진행중인 lotteryEvent가 2개 이상입니다.", CustomErrorCode.TOO_MANY_LOTTERY_EVENT);
+        }
+
+        LotteryEvent lotteryEvent = lotteryEventList.get(0);
 
         CasperBot casperBot = casperBotRepository.save(new CasperBot(casperBotRequestDto, user.getId()));
         lotteryEvent.addAppliedCount();
@@ -100,8 +112,17 @@ public LotteryParticipants registerUserIfNeed(BaseUser user, CasperBotRequestDto
     }
 
     public LotteryEventResponseDto getLotteryEvent() {
-        LotteryEvent lotteryEvent = lotteryEventRepository.findById(1L).orElseThrow(LotteryEventNotExists::new);
+        List<LotteryEvent> lotteryEventList = lotteryEventRepository.findAll();
+
+        if (lotteryEventList.isEmpty()) {
+            throw new CustomException("현재 진행중인 lotteryEvent가 존재하지 않습니다.", CustomErrorCode.NO_LOTTERY_EVENT);
+        }
+
+        if (lotteryEventList.size() > 1) {
+            throw new CustomException("현재 진행중인 lotteryEvent가 2개 이상입니다.", CustomErrorCode.TOO_MANY_LOTTERY_EVENT);
+        }
+
+        LotteryEvent lotteryEvent = lotteryEventList.get(0);
         return LotteryEventResponseDto.of(lotteryEvent, LocalDateTime.now());
     }
-
 }
diff --git a/Server/src/main/java/JGS/CasperEvent/global/enums/CustomErrorCode.java b/Server/src/main/java/JGS/CasperEvent/global/enums/CustomErrorCode.java
@@ -22,7 +22,8 @@ public enum CustomErrorCode {
     LOTTERY_EVENT_ALREADY_EXISTS("추첨 이벤트가 이미 존재합니다.", 409),
     INVALID_RUSH_EVENT_OPTIONS_COUNT("이벤트의 옵션 수가 올바르지 않습니다.", 500),
     INVALID_RUSH_EVENT_OPTION_ID("옵션 ID는 1 또는 2여야 합니다.", 400),
-    EMPTY_FILE("유효하지 않은 파일입니다.", 422);
+    EMPTY_FILE("유효하지 않은 파일입니다.", 422),
+    TOO_MANY_LOTTERY_EVENT("현재 진행중인 추첨 이벤트가 2개 이상입니다.", 409);
 
     private final String message;
     private int status;