🔨 [Refactoring] 반환 순서 역순으로 오도록 JPA쿼리문 수정

gg-admin-repo/src/main/java/gg/admin/repo/calendar/PublicScheduleAdminRepository.java

@@ -15,7 +15,7 @@ public interface PublicScheduleAdminRepository extends JpaRepository<PublicSched
 
 	List<PublicSchedule> findByAuthor(String author);
 
-	List<PublicSchedule> findAllByClassification(DetailClassification detailClassification);
+	List<PublicSchedule> findAllByClassificationOrderByIdDesc(DetailClassification detailClassification);
 
 	List<PublicSchedule> findAll();
 }

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/privateschedule/controller/PrivateScheduleAdminController.java

@@ -15,7 +15,7 @@
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/admin/calendar/private")
+@RequestMapping("/calendar/admin/private")
 public class PrivateScheduleAdminController {
 
 	private final PrivateScheduleAdminService privateScheduleAdminService;

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/publicschedule/controller/PublicScheduleAdminController.java

@@ -23,7 +23,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/admin/calendar/public")
+@RequestMapping("/calendar/admin/public")
 public class PublicScheduleAdminController {
 
 	private final PublicScheduleAdminService publicScheduleAdminService;

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/publicschedule/controller/request/PublicScheduleAdminCreateEventReqDto.java

@@ -31,6 +31,7 @@ public class PublicScheduleAdminCreateEventReqDto {
 	@Size(max = 2000, message = "내용은 2000자이하로 입력해주세요.")
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/publicschedule/controller/request/PublicScheduleAdminCreateJobReqDto.java

@@ -35,6 +35,7 @@ public class PublicScheduleAdminCreateJobReqDto {
 	@Size(max = 2000, message = "내용은 2000자이하로 입력해주세요.")
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/publicschedule/controller/request/PublicScheduleAdminUpdateReqDto.java

@@ -37,6 +37,7 @@ public class PublicScheduleAdminUpdateReqDto {
 	@Size(max = 2000, message = "내용은 2000자이하로 입력해주세요.")
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/totalschedule/controller/TotalScheduleAdminController.java

@@ -20,26 +20,24 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/admin/calendar")
+@RequestMapping("/calendar/admin")
 public class TotalScheduleAdminController {
 
 	private final TotalScheduleAdminService totalScheduleAdminService;
 
 	@GetMapping("/list/{detailClassification}")
 	public ResponseEntity<TotalScheduleAdminSearchListResDto> totalScheduleAdminClassificationList(
 		@PathVariable DetailClassification detailClassification) {
-
 		TotalScheduleAdminSearchListResDto scheduleList = totalScheduleAdminService.findAllByClassification(
 			detailClassification);
-
 		return ResponseEntity.ok(scheduleList);
 	}
 
 	@GetMapping("/search")
 	public ResponseEntity<TotalScheduleAdminSearchListResDto> totalScheduleAdminSearchList(
 		@ModelAttribute @Valid TotalScheduleAdminSearchReqDto totalScheduleAdminSearchReqDto) {
-		TotalScheduleAdminSearchListResDto scheduleList = totalScheduleAdminService
-			.searchTotalScheduleAdminList(totalScheduleAdminSearchReqDto);
+		TotalScheduleAdminSearchListResDto scheduleList = totalScheduleAdminService.searchTotalScheduleAdminList(
+			totalScheduleAdminSearchReqDto);
 
 		return ResponseEntity.ok(scheduleList);
 	}

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/totalschedule/service/TotalScheduleAdminService.java

@@ -35,7 +35,7 @@ public class TotalScheduleAdminService {
 
 	public TotalScheduleAdminSearchListResDto findAllByClassification(DetailClassification detailClassification) {
 
-		List<PublicSchedule> scheduleList = publicScheduleAdminRepository.findAllByClassification(
+		List<PublicSchedule> scheduleList = publicScheduleAdminRepository.findAllByClassificationOrderByIdDesc(
 			detailClassification);
 
 		return TotalScheduleAdminSearchListResDto.builder()

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/controller/request/PrivateScheduleCreateReqDto.java

@@ -25,6 +25,7 @@ public class PrivateScheduleCreateReqDto {
 	@Size(max = 2000)
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/controller/request/PrivateScheduleUpdateReqDto.java

@@ -21,6 +21,7 @@ public class PrivateScheduleUpdateReqDto {
 	@Size(max = 2000)
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

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

@@ -32,6 +32,7 @@ public class PublicScheduleCreateEventReqDto {
 	@Size(max = 2000, message = "내용은 2000자이하로 입력해주세요.")
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

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

@@ -35,6 +35,7 @@ public class PublicScheduleCreateJobReqDto {
 	@Size(max = 2000, message = "내용은 2000자이하로 입력해주세요.")
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

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

@@ -43,6 +43,7 @@ public class PublicScheduleUpdateReqDto {
 	@Size(max = 2000, message = "내용은 2000자이하로 입력해주세요.")
 	private String content;
 
+	@Size(max = 255, message = "링크는 255자 이하로 입력해주세요.")
 	private String link;
 
 	@NotNull

gg-calendar-api/src/main/java/gg/calendar/api/user/utils/service/FortyTwoEventService.java

@@ -40,9 +40,6 @@ private void saveEventsToPublicSchedule(List<FortyTwoEventResponse> events) {
 
 	private void convertAndSaveEvent(FortyTwoEventResponse event) {
 		String description = event.getDescription();
-		if (description != null && description.length() > 255) {
-			description = description.substring(0, 255);
-		}
 		PublicSchedule publicSchedule = PublicSchedule.builder()
 			.classification(DetailClassification.EVENT)
 			.eventTag(determineEventTag(event))

gg-calendar-api/src/main/java/gg/calendar/api/user/utils/service/ScheduleNotiService.java

@@ -7,7 +7,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import gg.data.calendar.PrivateSchedule;
-import gg.data.calendar.type.DetailClassification;
 import gg.data.calendar.type.ScheduleStatus;
 import gg.repo.calendar.PrivateScheduleRepository;
 import gg.repo.calendar.PublicScheduleRepository;
@@ -21,10 +20,10 @@
 	private final PublicScheduleRepository publicScheduleRepository;
 	private final PrivateScheduleRepository privateScheduleRepository;
 	private final MessageSender messageSender;
-	private static final String SCHEDULE_MESSAGE_D_DAY = "📆일정요정🧚으로부터 알림이 도착했습니다.\n"
-		+ "📧42gg캘린더📧와 <<오늘>>의 일정을 확인해보세요!\n";
-	private static final String SCHEDULE_MESSAGE_BEFORE_D_DAY = "📅일정요정🧚으로부터 알림이 도착했습니다.\n\n"
-		+ "📧42gg캘린더📧와 >>내일<<의 일정을 확인해보세요!\n";
+	private static final String SCHEDULE_MESSAGE_D_DAY =
+		"📆일정요정🧚으로부터 알림이 도착했습니다.\n" + "📧42gg캘린더📧와 <<오늘>>의 일정을 확인해보세요!\n";
+	private static final String SCHEDULE_MESSAGE_BEFORE_D_DAY =
+		"📅일정요정🧚으로부터 알림이 도착했습니다.\n\n" + "📧42gg캘린더📧와 >>내일<<의 일정을 확인해보세요!\n";
 
 	@Transactional
 	public void sendScheduleNotifications() {
@@ -37,19 +36,18 @@
 		List<PrivateSchedule> alarmSchedule = privateScheduleRepository.findSchedulesWithAlarmForBothDays(startOfDay,
 			endOfDay, startDday, endDday, ScheduleStatus.ACTIVATE);
 		for (PrivateSchedule schedule : alarmSchedule) {
-			String message = schedule.getPublicSchedule().getStartTime()
-				.isBefore(currentTime.plusDays(1))
-				? SCHEDULE_MESSAGE_D_DAY : SCHEDULE_MESSAGE_BEFORE_D_DAY;
+			String message =
+				schedule.getPublicSchedule().getStartTime().isBefore(currentTime.plusDays(1)) ? SCHEDULE_MESSAGE_D_DAY :
+					SCHEDULE_MESSAGE_BEFORE_D_DAY;
 			messageSender.send(schedule.getUser().getIntraId(),
-				message + "printf('일정: " + schedule.getPublicSchedule().getTitle() + "');\n"
-					+ "System.out.println(" + makeLink(schedule) + ");\n\n");
+				message + "printf('일정: " + schedule.getPublicSchedule().getTitle() + "');\n");
 		}
 	}
 
-	public String makeLink(PrivateSchedule schedule) {
-		boolean flag = schedule.getPublicSchedule().getClassification() == DetailClassification.JOB_NOTICE;
-		return flag ? schedule.getPublicSchedule().getLink() :
-			"https://gg.42seoul.kr/calendar/detail/" + schedule.getId();
-	}
+	// public String makeLink(PrivateSchedule schedule) {
+	// 	boolean flag = schedule.getPublicSchedule().getClassification() == DetailClassification.JOB_NOTICE;
+	// 	return flag ? schedule.getPublicSchedule().getLink() :
+	// 		"https://gg.42seoul.kr/calendar/detail/" + schedule.getId();
+	// }
 }
 

gg-calendar-api/src/test/java/gg/calendar/api/admin/schedule/privateschedule/controller/PrivateScheduleAdminControllerTest.java

@@ -81,7 +81,7 @@ void getPrivateScheduleAdminDetailTestSuccess() throws Exception {
 
 			// when
 			String response = mockMvc.perform(
-					get("/admin/calendar/private/{id}", privateSchedule.getId()).header("Authorization",
+					get("/calendar/admin/private/{id}", privateSchedule.getId()).header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
@@ -111,7 +111,7 @@ void getPrivateScheduleAdminDetailTestFailNotCorrectType() throws Exception {
 
 			// when
 			String response = mockMvc.perform(
-					get("/admin/calendar/private/qweksd").header("Authorization",
+					get("/calendar/admin/private/qweksd").header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isBadRequest()).andReturn().getResponse().getContentAsString();
@@ -130,7 +130,7 @@ void getPrivateScheduleAdminDetailTestFailNotFound() throws Exception {
 
 			// when
 			String response = mockMvc.perform(
-					get("/admin/calendar/private/500123").header("Authorization",
+					get("/calendar/admin/private/500123").header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isNotFound()).andReturn().getResponse().getContentAsString();
@@ -149,7 +149,7 @@ void getPrivateScheduleAdminDetailTestFailNotFoundGroupId() throws Exception {
 
 			// when
 			String response = mockMvc.perform(
-					get("/admin/calendar/private/{id}", privateSchedule.getId()).header("Authorization",
+					get("/calendar/admin/private/{id}", privateSchedule.getId()).header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isNotFound()).andReturn().getResponse().getContentAsString();
@@ -173,7 +173,7 @@ void deletePrivateScheduleAdminTestSuccess() throws Exception {
 
 			// when
 			mockMvc.perform(
-					patch("/admin/calendar/private/{id}", privateSchedule.getId()).header("Authorization",
+					patch("/calendar/admin/private/{id}", privateSchedule.getId()).header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isOk());
@@ -193,7 +193,7 @@ void deletePrivateScheduleAdminTestFailNotCorrectType() throws Exception {
 
 			// when
 			String response = mockMvc.perform(
-					patch("/admin/calendar/private/qweksd").header("Authorization",
+					patch("/calendar/admin/private/qweksd").header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isBadRequest()).andReturn().getResponse().getContentAsString();
@@ -212,7 +212,7 @@ void deletePrivateScheduleAdminTestFailNotFound() throws Exception {
 
 			// when
 			String response = mockMvc.perform(
-					patch("/admin/calendar/private/500123").header("Authorization",
+					patch("/calendar/admin/private/500123").header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isNotFound()).andReturn().getResponse().getContentAsString();
@@ -232,7 +232,7 @@ void deletePrivateScheduleAdminTestFailNotPrivateSchedule() throws Exception {
 
 			// when
 			String response = mockMvc.perform(
-					patch("/admin/calendar/private/{id}", privateSchedule.getId()).header("Authorization",
+					patch("/calendar/admin/private/{id}", privateSchedule.getId()).header("Authorization",
 						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isForbidden()).andReturn().getResponse().getContentAsString();