✨ [Feature] Agenda 조회 전체 정렬 기준 수정 #998 (#999)

42organization · Sep 3, 2024 · c82ebca · c82ebca
1 parent 0d56342
commit c82ebca
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/controller/AgendaController.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/controller/AgendaController.java
@@ -93,7 +93,7 @@ public ResponseEntity<PageResponseDto<AgendaSimpleResDto>> agendaListHistory(
 		@ModelAttribute @Valid PageRequestDto pageRequest) {
 		int page = pageRequest.getPage();
 		int size = pageRequest.getSize();
-		Pageable pageable = PageRequest.of(page - 1, size, Sort.by("startTime").descending());
+		Pageable pageable = PageRequest.of(page - 1, size, Sort.by("startTime").ascending());
 
 		Page<Agenda> agendas = agendaService.findHistoryAgendaList(pageable);
 

diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/service/AgendaService.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/service/AgendaService.java
@@ -70,13 +70,13 @@ public Agenda findAgendaByAgendaKey(UUID agendaKey) {
 	public List<Agenda> findOpenAgendaList() {
 		return agendaRepository.findAllByStatusIs(AgendaStatus.OPEN).stream()
 			.filter(agenda -> agenda.getDeadline().isAfter(LocalDateTime.now()))
-			.sorted(agendaComparatorWithIsOfficialThenDeadline())
+			.sorted(agendaComparatorWithDeadlineThenIsOfficial())
 			.collect(Collectors.toList());
 	}
 
-	private Comparator<Agenda> agendaComparatorWithIsOfficialThenDeadline() {
-		return Comparator.comparing(Agenda::getIsOfficial, Comparator.reverseOrder())
-			.thenComparing(Agenda::getDeadline, Comparator.reverseOrder());
+	private Comparator<Agenda> agendaComparatorWithDeadlineThenIsOfficial() {
+		return Comparator.comparing(Agenda::getDeadline)
+			.thenComparing(Agenda::getIsOfficial);
 	}
 
 	/**
@@ -87,13 +87,13 @@ public List<Agenda> findConfirmAgendaList() {
 		return agendaRepository.findAllByStatusIs(AgendaStatus.OPEN, AgendaStatus.CONFIRM).stream()
 			.filter(agenda -> agenda.getDeadline().isBefore(LocalDateTime.now())
 				|| agenda.getStatus() == AgendaStatus.CONFIRM)
-			.sorted(agendaComparatorWithIsOfficialThenStartTime())
+			.sorted(agendaComparatorWithStartTimeThenIsOfficial())
 			.collect(Collectors.toList());
 	}
 
-	private Comparator<Agenda> agendaComparatorWithIsOfficialThenStartTime() {
-		return Comparator.comparing(Agenda::getIsOfficial, Comparator.reverseOrder())
-			.thenComparing(Agenda::getStartTime, Comparator.reverseOrder());
+	private Comparator<Agenda> agendaComparatorWithStartTimeThenIsOfficial() {
+		return Comparator.comparing(Agenda::getDeadline)
+			.thenComparing(Agenda::getIsOfficial);
 	}
 
 	@Transactional

diff --git a/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/controller/AgendaControllerTest.java b/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/controller/AgendaControllerTest.java
@@ -239,11 +239,10 @@ void getAgendaListOpenSuccess() throws Exception {
 			// then
 			assertThat(result.length).isEqualTo(officialAgendaList.size() + nonOfficialAgendaList.size());
 			for (int i = 0; i < result.length; i++) {
-				assertThat(result[i].getIsOfficial()).isEqualTo(i < officialAgendaList.size());
 				if (i == 0 || i == officialAgendaList.size()) {
 					continue;
 				}
-				assertThat(result[i].getAgendaDeadLine()).isBefore(result[i - 1].getAgendaDeadLine());
+				assertThat(result[i].getAgendaDeadLine()).isAfter(result[i - 1].getAgendaDeadLine());
 			}
 		}
 
@@ -300,11 +299,10 @@ void getAgendaListConfirmSuccess() throws Exception {
 			// then
 			assertThat(result.length).isEqualTo(totalSize);
 			for (int i = 0; i < result.length; i++) {
-				assertThat(result[i].getIsOfficial()).isEqualTo(i < officialAgendaList.size());
 				if (i == 0 || i == officialAgendaList.size()) {
 					continue;
 				}
-				assertThat(result[i].getAgendaStartTime()).isBefore(result[i - 1].getAgendaStartTime());
+				assertThat(result[i].getAgendaStartTime()).isAfter(result[i - 1].getAgendaDeadLine());
 			}
 		}
 
@@ -587,12 +585,10 @@ void getAgendaListHistorySuccess(int page) throws Exception {
 			// then
 			assertThat(result.size()).isEqualTo(size * page < totalCount ? size : totalCount % size);
 			for (int i = 0; i < result.size(); i++) {
-				assertThat(result.get(i).getAgendaTitle())
-					.isEqualTo(agendaHistory.get(size * (page - 1) + i).getTitle());
 				if (i == 0) {
 					continue;
 				}
-				assertThat(result.get(i).getAgendaStartTime()).isBefore(result.get(i - 1).getAgendaStartTime());
+				assertThat(result.get(i).getAgendaStartTime()).isAfter(result.get(i - 1).getAgendaStartTime());
 			}
 		}
 
@@ -711,11 +707,10 @@ void getAgendaListHistoryWithoutSize() throws Exception {
 			// then
 			assertThat(result.size()).isEqualTo(20);
 			for (int i = 0; i < result.size(); i++) {
-				assertThat(result.get(i).getAgendaTitle()).isEqualTo(agendaHistory.get(i).getTitle());
 				if (i == 0) {
 					continue;
 				}
-				assertThat(result.get(i).getAgendaStartTime()).isBefore(result.get(i - 1).getAgendaStartTime());
+				assertThat(result.get(i).getAgendaStartTime()).isAfter(result.get(i - 1).getAgendaStartTime());
 			}
 		}
 	}

diff --git a/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/service/AgendaServiceTest.java b/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/service/AgendaServiceTest.java
@@ -127,11 +127,10 @@ void getAgendaListSuccess() {
 			// then
 			verify(agendaRepository, times(1)).findAllByStatusIs(any());
 			for (int i = 0; i < result.size(); i++) {
-				assertThat(result.get(i).getIsOfficial()).isEqualTo(i < officialSize);
 				if (i == 0 || i == officialSize) {
 					continue;
 				}
-				assertThat(result.get(i).getDeadline()).isBefore(result.get(i - 1).getDeadline());
+				assertThat(result.get(i).getDeadline()).isAfter(result.get(i - 1).getDeadline());
 			}
 		}