🔀 [Merge] Merge 8th to dev

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/controller/response/PrivateSchedulePeriodResDto.java

@@ -47,10 +47,13 @@
 
 	private String groupColor;
 
+	private Long groupId;
+
 	@Builder
 	private PrivateSchedulePeriodResDto(Long id, DetailClassification classification, EventTag eventTag, JobTag jobTag,
 		TechTag techTag, String author, String title, String content, String link, ScheduleStatus status,
-		LocalDateTime startTime, LocalDateTime endTime, boolean alarm, String groupTitle, String groupColor) {
+		LocalDateTime startTime, LocalDateTime endTime, boolean alarm, String groupTitle, String groupColor,
+		Long groupId) {
 		this.id = id;
 		this.classification = classification;
 		this.eventTag = eventTag;
@@ -66,6 +69,7 @@
 		this.alarm = alarm;
 		this.groupTitle = groupTitle;
 		this.groupColor = groupColor;
+		this.groupId = groupId;
 	}
 
 	public static PrivateSchedulePeriodResDto toDto(PrivateSchedule privateSchedule, ScheduleGroup scheduleGroup) {
@@ -85,6 +89,7 @@
 			.alarm(privateSchedule.isAlarm())
 			.groupTitle(scheduleGroup.getTitle())
 			.groupColor(scheduleGroup.getBackgroundColor())
+			.groupId(scheduleGroup.getId())
 			.build();
 	}
 }

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/publicschedule/controller/PublicScheduleController.java

@@ -30,7 +30,6 @@
 import gg.calendar.api.user.schedule.publicschedule.controller.response.PublicScheduleUpdateResDto;
 import gg.calendar.api.user.schedule.publicschedule.service.PublicScheduleService;
 import gg.data.calendar.PublicSchedule;
-import gg.data.calendar.type.DetailClassification;
 import gg.utils.dto.ListResponseDto;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
@@ -76,15 +75,14 @@
 		return ResponseEntity.ok(PublicScheduleDetailRetrieveResDto.toDto(publicSchedule));
 	}
 
-	@GetMapping("/period/{detailClassification}")
+	@GetMapping
 	public ResponseEntity<ListResponseDto<PublicSchedulePeriodRetrieveResDto>> publicSchedulePeriodRetrieveGet(
-		@PathVariable DetailClassification detailClassification,
 		@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate start,
 		@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate end) {
 		LocalDateTime startTime = start.atStartOfDay();
 		LocalDateTime endTime = end.atTime(LocalTime.MAX);
-		List<PublicSchedulePeriodRetrieveResDto> res = publicScheduleService.retrievePublicSchedulePeriod(
-			startTime, endTime, detailClassification);
+		List<PublicSchedulePeriodRetrieveResDto> res = publicScheduleService.retrieveNonPrivateSchedulePeriod(
+			startTime, endTime);
 		return ResponseEntity.ok(ListResponseDto.toDto(res));
 	}
 

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/publicschedule/service/PublicScheduleService.java

@@ -94,13 +94,13 @@
 		return publicRetrieveSchedule;
 	}
 
-	public List<PublicSchedulePeriodRetrieveResDto> retrievePublicSchedulePeriod(LocalDateTime start, LocalDateTime end,
-		DetailClassification classification) {
+	public List<PublicSchedulePeriodRetrieveResDto> retrieveNonPrivateSchedulePeriod(LocalDateTime start,
+		LocalDateTime end) {
 		validateTimeRange(start, end);
-		List<PublicSchedule> classSchedules = publicScheduleRepository
-			.findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassification(
-				start, end, classification);
-		return classSchedules.stream().map(PublicSchedulePeriodRetrieveResDto::toDto).collect(Collectors.toList());
+		List<PublicSchedule> nonPrivateSchedules = publicScheduleRepository
+			.findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassificationNot(
+				start, end, DetailClassification.PRIVATE_SCHEDULE);
+		return nonPrivateSchedules.stream().map(PublicSchedulePeriodRetrieveResDto::toDto).collect(Collectors.toList());
 	}
 
 	@Transactional

gg-calendar-api/src/test/java/gg/calendar/api/user/schedule/publicschedule/controller/PublicScheduleControllerTest.java

@@ -885,7 +885,7 @@ void retrievePublicScheduleDetailFailNotExist() throws Exception {
 	@DisplayName("공유일정기간조회")
 	class RetrievePublicScheduleByPeriod {
 		@Test
-		@DisplayName("[200]공개일정 event 기간조회성공")
+		@DisplayName("[200]공개일정 기간조회성공 (비공개일정 제외)")
 		void retrievePublicScheduleByEventPeriodSuccess() throws Exception {
 			//given
 			mockData.createPublicScheduleEvent(7);
@@ -894,16 +894,19 @@ void retrievePublicScheduleByEventPeriodSuccess() throws Exception {
 			LocalDateTime end = LocalDateTime.now().plusDays(7);
 			//when
 			mockMvc.perform(
-					get("/calendar/public/period/{detail_classification}", detailClassification).header("Authorization",
+					get("/calendar/public", detailClassification).header("Authorization",
 							"Bearer " + accessToken)
 						.param("start", start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
 						.param("end", end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))))
 				.andExpect(status().isOk())
 				.andDo(print());
 
 			//then
-			assertThat(publicScheduleRepository.findAll()).hasSize(7);
-			assertThat(publicScheduleRepository.findAll()).extracting("classification")
+			List<PublicSchedule> allSchedules = publicScheduleRepository.findAll();
+			assertThat(allSchedules).hasSize(7); // Total of 5 EVENT + 2 OTHER_TYPE
+
+			// Verify classifications of returned schedules
+			assertThat(allSchedules).extracting("classification")
 				.containsOnly(DetailClassification.EVENT);
 		}
 
@@ -917,7 +920,7 @@ void retrievePublicScheduleByJobPeriodSuccess() throws Exception {
 			LocalDateTime end = LocalDateTime.now().plusDays(7);
 			//when
 			mockMvc.perform(
-					get("/calendar/public/period/{detail_classification}",
+					get("/calendar/public",
 						detailClassification).header("Authorization",
 							"Bearer " + accessToken).param("start",
 							start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
@@ -940,7 +943,7 @@ void retrievePublicScheduleFailFaultPeriod() throws Exception {
 			LocalDateTime end = LocalDateTime.now().minusDays(7);
 			//when & then
 			mockMvc.perform(
-					get("/calendar/public/period/{detail_classification}",
+					get("/calendar/public",
 						detailClassification).header("Authorization",
 							"Bearer " + accessToken).param("start",
 							start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
@@ -949,27 +952,6 @@ void retrievePublicScheduleFailFaultPeriod() throws Exception {
 				.andDo(print());
 		}
 
-		@Test
-		@DisplayName("[400]공개일정 조회실패 - 잘못된 detail_classification 이 들어왔을 때")
-		void retrievePublicScheduleFaultDetailClassification() throws Exception {
-			// given
-			mockData.createPublicScheduleEvent(7);
-			LocalDateTime start = LocalDateTime.now().plusDays(0);
-			LocalDateTime end = LocalDateTime.now().plusDays(7);
-			//when & then
-			mockMvc.perform(get("/calendar/public/period/{detail_classification}", "wrong")
-					.header("Authorization",
-						"Bearer " + accessToken).param("start", start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-					.param("end", end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))))
-				.andExpect(status().isBadRequest())
-				.andExpect(result -> {
-					// 에러 응답의 세부 내용 출력
-					System.out.println("Response Body: " + result.getResponse().getContentAsString());
-					System.out.println("Status Code: " + result.getResponse().getStatus());
-				})
-				.andDo(print());
-		}
-
 		@Test
 		@DisplayName("[400]공개일정 조회실패 - 날짜형식이 잘못된 경우")
 		void retrievePublicScheduleFaultDateFormat() throws Exception {
@@ -980,7 +962,7 @@ void retrievePublicScheduleFaultDateFormat() throws Exception {
 			LocalDateTime end = LocalDateTime.now().plusDays(7);
 			//when & then
 			mockMvc.perform(
-					get("/calendar/public/period/{detail_classification}",
+					get("/calendar/public/",
 						detailClassification).header("Authorization",
 							"Bearer " + accessToken).param("start",
 							start.format(DateTimeFormatter.ofPattern("yyyy/MM/dd")))

gg-pingpong-api/src/test/resources/application.yml

@@ -75,7 +75,7 @@ info:
   web:
     coalitionUrl: 'https://api.intra.42.fr/v2/users/{id}/coalitions'
     pointHistoryUrl: 'https://api.intra.42.fr/v2/users/{id}/correction_point_historics?sort=-id'
-    
+
 constant:
   allowedMinimalStartDays: 2
   tournamentSchedule: "0 0 0 * * *"

gg-repo/src/main/java/gg/repo/calendar/PublicScheduleRepository.java

@@ -25,6 +25,9 @@ List<PublicSchedule> findByEndTimeGreaterThanEqualAndStartTimeLessThanEqual(Loca
 	List<PublicSchedule> findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassification(
 		LocalDateTime startTime, LocalDateTime endTime, DetailClassification classification);
 
+	List<PublicSchedule> findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassificationNot(
+		LocalDateTime start, LocalDateTime end, DetailClassification classification);
+
 	boolean existsByTitleAndStartTime(String title, LocalDateTime beginAt);
 
 	@Modifying(clearAutomatically = true)