Merge pull request #392 from mash-up-kr/feature/add-team-api

Feature/add team api
mash-up-kr · Jan 27, 2024 · c409561 · c409561
2 parents 2a7febc + 61d425d
commit c409561
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/...recruit/src/main/java/kr/mashup/branding/facade/application/ApplicationFacadeService.java b/...recruit/src/main/java/kr/mashup/branding/facade/application/ApplicationFacadeService.java
@@ -1,5 +1,8 @@
 package kr.mashup.branding.facade.application;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/mashup-recruit/src/main/java/kr/mashup/branding/ui/application/ApplicationController.java b/mashup-recruit/src/main/java/kr/mashup/branding/ui/application/ApplicationController.java
@@ -16,7 +16,9 @@
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/api/v1/applications")
@@ -127,7 +129,12 @@ public ApiResponse<ApplicationResponse> updateConfirmation(
     public ApiResponse<List<RecruitScheduleResponse>> getRecruitSchedule(
         @PathVariable Integer generationNumber
     ){
-        final List<RecruitScheduleResponse> response = applicationFacadeService.getRecruitSchedule(generationNumber);
+        final List<RecruitScheduleResponse> response =
+                applicationFacadeService
+                        .getRecruitSchedule(generationNumber)
+                        .stream()
+                        .sorted(Comparator.comparing(RecruitScheduleResponse::getEventOccurredAt))
+                        .collect(Collectors.toList());
 
         return ApiResponse.success(response);
     }

diff --git a/...p-recruit/src/main/java/kr/mashup/branding/ui/application/vo/RecruitScheduleResponse.java b/...p-recruit/src/main/java/kr/mashup/branding/ui/application/vo/RecruitScheduleResponse.java
@@ -7,17 +7,29 @@
 import lombok.Getter;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 
 @Getter
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class RecruitScheduleResponse {
 
     private Long recruitScheduleId;
     private RecruitmentScheduleEventName eventName;
-
-    private LocalDateTime eventOccurredAt;
+    private ZonedDateTime eventOccurredAt;
 
     public static RecruitScheduleResponse of(final RecruitmentSchedule schedule){
-        return new RecruitScheduleResponse(schedule.getRecruitmentScheduleId(), schedule.getEventName(), schedule.getEventOccurredAt());
+        return new RecruitScheduleResponse(
+                schedule.getRecruitmentScheduleId(),
+                schedule.getEventName(),
+                convertToZonedDateTime(schedule.getEventOccurredAt()));
+    }
+
+
+    private static ZonedDateTime convertToZonedDateTime(LocalDateTime localDateTime) {
+        if (localDateTime == null) {
+            return null;
+        }
+        return ZonedDateTime.of(localDateTime, ZoneId.of("Asia/Seoul"));
     }
 }