[fix] 이벤트 유저 검색에 페이징 동작하지 않는 현상 수정(#147)

src/main/java/hyundai/softeer/orange/admin/controller/AdminEventController.java

@@ -94,7 +94,6 @@ public ResponseEntity<EventDto> getEvent(
     /**
      *
      * @param eventId 이벤트 ID. HD000000~로 시작하는 그것
-     * @return 해당 이벤트에 대한 정보
      */
     @DeleteMapping("{eventId}")
     @Operation(summary = "이벤트 제거", description = "이벤트를 제거한다. 시작 전의 이벤트만 삭제할 수 있다.", responses = {
@@ -109,6 +108,17 @@ public ResponseEntity<Void> deleteEvent(
         return ResponseEntity.ok().build();
     }
 
+    @DeleteMapping
+    @Operation(summary = "이벤트 목록 제거", description = "이벤트 목록을 제거한다. 시작 전의 이벤트만 삭제할 수 있다.", responses = {
+            @ApiResponse(responseCode = "200", description = "이벤트를 정상적으로 삭제",content = @Content(schema = @Schema(implementation = Void.class))),
+            @ApiResponse(responseCode = "400", description = "삭제하지 못한 이벤트 존재", content = @Content(schema = @Schema(implementation = DeleteEventNotAllowedReasonDto[].class)))
+    })
+    public ResponseEntity<List<DeleteEventNotAllowedReasonDto>> deleteEvents(@Valid @RequestBody DeleteEventsDto dto) {
+        var result = eventService.deleteEvents(dto.getEventIds());
+        if(result == null) return ResponseEntity.ok().build();
+        return ResponseEntity.badRequest().body(result);
+    }
+
     /**
      * @param eventDto 수정된 이벤트 정보
      */

src/main/java/hyundai/softeer/orange/event/common/repository/EventMetadataRepository.java

@@ -7,12 +7,15 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface EventMetadataRepository extends JpaRepository<EventMetadata, Long>, JpaSpecificationExecutor<EventMetadata> {
     Optional<EventMetadata> findFirstByEventId(String eventId);
 
+    List<EventMetadata> findByEventIdIn(List<String> eventIds);
+
     @Query("SELECT e from EventMetadata e join fetch e.eventFrame WHERE e.eventId = :eventId")
     Optional<EventMetadata> findByEventIdWithEventFrame(@Param("eventId") String eventId);
 }

src/main/java/hyundai/softeer/orange/event/common/service/EventService.java

@@ -16,18 +16,14 @@
 import hyundai.softeer.orange.event.common.repository.EventMetadataRepository;
 import hyundai.softeer.orange.event.common.repository.EventSpecification;
 import hyundai.softeer.orange.event.component.EventKeyGenerator;
-import hyundai.softeer.orange.event.dto.BriefEventDto;
-import hyundai.softeer.orange.event.dto.BriefEventPageDto;
-import hyundai.softeer.orange.event.dto.EventDto;
-import hyundai.softeer.orange.event.dto.EventSearchHintDto;
+import hyundai.softeer.orange.event.dto.*;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -232,6 +228,47 @@ public void deleteEvent(String eventId) {
         emRepository.delete(metadata);
     }
 
+    /**
+     * 이벤트를 제거한다. 존재하지 않거나, 시작된 이벤트는 제거할 수 없다.
+     * @param eventIds 이벤트의 ID 값
+     * @return  삭제 안된 이벤트에 대한 정보
+     */
+    @Transactional
+    public List<DeleteEventNotAllowedReasonDto> deleteEvents(List<String> eventIds) {
+        List<EventMetadata> metadataList = emRepository.findByEventIdIn(eventIds);
+        List<DeleteEventNotAllowedReasonDto> errorResponse = new ArrayList<>();
+
+        List<EventMetadata> deleteList = new ArrayList<>();
+
+        for(var metadata: metadataList) {
+            Instant startTime = metadata.getStartTime();
+            Instant endTime = metadata.getEndTime();
+            Instant now = Instant.now();
+
+            if(startTime.isBefore(now)) {
+                // 이벤트 중
+                if (endTime.isAfter(now)) {
+                    errorResponse.add(new DeleteEventNotAllowedReasonDto(
+                            metadata.getEventId(),
+                            ErrorCode.CANNOT_DELETE_EVENT_RUNNING.getMessage())
+                    );
+                    continue;
+                }
+                else {
+                    errorResponse.add(new DeleteEventNotAllowedReasonDto(
+                            metadata.getEventId(),
+                            ErrorCode.CANNOT_DELETE_EVENT_ENDED.getMessage()
+                    ));
+                    continue;
+                }
+            }
+            deleteList.add(metadata);
+        }
+
+        emRepository.deleteAllInBatch(deleteList);
+        return errorResponse;
+    }
+
     private Set<EventType> parseTypes(String typeQuery) {
         Set<EventType> result = new HashSet<>();
         if(typeQuery == null) return result;

src/main/java/hyundai/softeer/orange/event/draw/service/DrawEventDrawMachine.java

@@ -33,6 +33,12 @@ public class DrawEventDrawMachine {
     @Async
     @Transactional
     public CompletableFuture<Void> draw(DrawEvent drawEvent) {
+        try{
+            Thread.sleep(1000 * 60 * 1);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
         long drawEventRawId = drawEvent.getId();
         // 점수 계산. 추후 추첨 과정과 분리될 수도 있음.
         List<DrawEventScorePolicy> policies = drawEvent.getPolicyList();

src/main/java/hyundai/softeer/orange/event/dto/DeleteEventNotAllowedReasonDto.java

@@ -0,0 +1,3 @@
+package hyundai.softeer.orange.event.dto;
+
+public record DeleteEventNotAllowedReasonDto(String id, String reason) {}

src/main/java/hyundai/softeer/orange/event/dto/DeleteEventsDto.java

@@ -0,0 +1,12 @@
+package hyundai.softeer.orange.event.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class DeleteEventsDto {
+    @NotEmpty
+    List<String> eventIds;
+}

src/main/java/hyundai/softeer/orange/eventuser/repository/CustomEventUserRepositoryImpl.java

@@ -1,5 +1,6 @@
 package hyundai.softeer.orange.eventuser.repository;
 
+import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import hyundai.softeer.orange.event.common.entity.QEventFrame;
 import hyundai.softeer.orange.eventuser.dto.EventUserScoreDto;
@@ -47,16 +48,29 @@ public Page<EventUser> findBySearch(String search, String field, Pageable pageab
         QEventUser user = QEventUser.eventUser;
         QEventFrame eventFrame = QEventFrame.eventFrame;
 
-        var query =  queryFactory.select(user)
+        BooleanExpression condition = null;
+
+        if("userName".equals(field)) condition = user.userName.contains(search);
+        else if("phoneNumber".equals(field)) condition = user.phoneNumber.contains(search);
+        else if("frameId".equals(field)) condition = user.eventFrame.frameId.contains(search);
+
+        var data =  queryFactory.select(user)
+                .from(user)
+                .leftJoin(user.eventFrame, eventFrame)
+                .fetchJoin()
+                .where(condition)
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+
+        var count = queryFactory.select(user.count())
                 .from(user)
                 .leftJoin(user.eventFrame, eventFrame)
-                .fetchJoin();
+                .where(condition)
+                .fetchOne();
 
-        if("userName".equals(field)) query.where(user.userName.contains(search));
-        else if("phoneNumber".equals(field))query.where(user.phoneNumber.contains(search));
-        else if("frameId".equals(field)) query.where(user.eventFrame.frameId.contains(search));
+        assert count != null;
 
-        var data = query.offset(pageable.getOffset()).limit(pageable.getPageSize()).fetch();
-        return new PageImpl<>(data, pageable, data.size());
+        return new PageImpl<>(data, pageable, count);
     }
 }