FIX: 더미 데이터 판별 시 status, category가 아닌 user로 판별

backend/src/main/java/org/ftclub/cabinet/presentation/domain/Presentation.java

@@ -62,24 +62,21 @@ public class Presentation {
 	private User user;
 
 	protected Presentation(Category category, LocalDateTime dateTime,
-			PresentationTime presentationTime, String subject, String summary, String detail,
-			PresentationStatus status) {
+			PresentationTime presentationTime, String subject, String summary, String detail) {
 		this.category = category;
 		this.dateTime = dateTime;
 		this.presentationTime = presentationTime;
 		this.subject = subject;
 		this.detail = detail;
 		this.summary = summary;
-		this.presentationStatus = status;
+		this.presentationStatus = PresentationStatus.EXPECTED;
 		this.presentationLocation = PresentationLocation.BASEMENT;
 	}
 
 	public static Presentation of(Category category, LocalDateTime dateTime,
-			PresentationTime presentationTime, String subject, String summary, String detail,
-			PresentationStatus status) {
+			PresentationTime presentationTime, String subject, String summary, String detail) {
 
-		return new Presentation(category, dateTime, presentationTime, subject, summary, detail,
-				status);
+		return new Presentation(category, dateTime, presentationTime, subject, summary, detail);
 	}
 
 	public void adminUpdate(PresentationStatus newStatus, LocalDateTime newDateTime,

backend/src/main/java/org/ftclub/cabinet/presentation/domain/PresentationStatus.java

@@ -1,5 +1,5 @@
 package org.ftclub.cabinet.presentation.domain;
 
 public enum PresentationStatus {
-	CANCEL, DONE, EXPECTED, DUMMY
+	CANCEL, DONE, EXPECTED
 }

backend/src/main/java/org/ftclub/cabinet/presentation/service/PresentationQueryService.java

@@ -29,9 +29,8 @@ public List<Presentation> getRegisteredPresentations(LocalDateTime start, LocalD
 
 		return presentations.stream()
 				.filter(presentation ->
-						!presentation.getPresentationStatus().equals(PresentationStatus.CANCEL)
-								&& !presentation.getPresentationStatus()
-								.equals(PresentationStatus.DUMMY)
+						presentation.getPresentationStatus().equals(PresentationStatus.EXPECTED)
+								&& presentation.getUser() != null
 				)
 				.collect(Collectors.toList());
 	}
@@ -49,7 +48,7 @@ public Presentation getOneDummyByDate(LocalDateTime dateTime) {
 		LocalDateTime endOfDate = dateTime.withHour(23).withMinute(59).withSecond(59);
 		return presentationRepository.findAllByDateTimeBetween(startOfDate, endOfDate)
 				.stream()
-				.filter(p -> p.getPresentationStatus() == PresentationStatus.DUMMY)
+				.filter(p -> p.getCategory() == Category.DUMMY)
 				.findFirst()
 				.orElseThrow(ExceptionStatus.INVALID_PRESENTATION_DATE::asServiceException);
 	}
@@ -63,11 +62,10 @@ public List<Presentation> getDummyDateBetweenMonth(
 			LocalDateTime localDateTime) {
 
 		List<Presentation> presentations =
-				presentationRepository.findAllByDateTimeBetween(now, localDateTime);
+				presentationRepository.findAllByDateTimeBetweenOrderByDateTime(now, localDateTime);
 
 		return presentations.stream()
-				.filter(presentation ->
-						presentation.getCategory().equals(Category.DUMMY))
+				.filter(presentation -> presentation.getUser() == null)
 				.collect(Collectors.toList());
 	}
 

backend/src/main/java/org/ftclub/cabinet/presentation/service/PresentationService.java

@@ -210,8 +210,7 @@ public void updatePresentationByFormId(Long formId, PresentationUpdateDto dto) {
 							PresentationTime.HALF,
 							"dummy",
 							"dummy",
-							"dummy",
-							PresentationStatus.DUMMY);
+							"dummy");
 			presentationRepository.save(presentation);
 		}
 
@@ -251,8 +250,7 @@ public void generatePresentationFormsEveryThreeMonth(LocalDate nowDate) {
 						PresentationTime.HALF,
 						"dummy",
 						"dummy",
-						"dummy",
-						PresentationStatus.DUMMY
+						"dummy"
 				))
 				.collect(Collectors.toList());