v1.1.4-be 배포

Dockerfile

@@ -2,10 +2,7 @@ FROM amazoncorretto:25-alpine3.21
 
 WORKDIR /app
 
-RUN apk add --no-cache curl tzdata && \
-    cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime && \
-    echo "Asia/Seoul" > /etc/timezone && \
-    apk del tzdata
+RUN apk add --no-cache curl
 
 RUN addgroup -g 1001 appgroup && adduser -u 1001 -G appgroup -D appuser
 RUN mkdir -p /app/log && chown -R appuser:appgroup /app
@@ -16,4 +13,4 @@ USER appuser
 
 EXPOSE 8080
 
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-Duser.timezone=UTC", "-jar", "app.jar"]

src/main/java/com/recyclestudy/common/config/TimeConfig.java

@@ -9,6 +9,6 @@ public class TimeConfig {
 
     @Bean
     public Clock clock() {
-        return Clock.systemDefaultZone();
+        return Clock.systemUTC();
     }
 }

src/main/java/com/recyclestudy/email/ReviewEmailSender.java

@@ -22,7 +22,7 @@ public class ReviewEmailSender {
     private final ReviewCycleService reviewCycleService;
     private final Clock clock;
 
-    @Scheduled(cron = "${schedule.review-mail.cron}", zone = "Asia/Seoul")
+    @Scheduled(cron = "${schedule.review-mail.cron}", zone = "UTC")
     public void sendReviewMail() {
         final LocalDateTime targetDateTime = LocalDateTime.now(clock).truncatedTo(ChronoUnit.MINUTES);
 

src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java

@@ -1,7 +1,7 @@
 package com.recyclestudy.member.controller.response;
 
 import com.recyclestudy.member.service.output.MemberFindOutput;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.List;
 
 public record MemberFindResponse(String email, List<MemberFindElement> devices) {
@@ -14,6 +14,6 @@ public static MemberFindResponse from(final MemberFindOutput output) {
         return new MemberFindResponse(output.email().getValue(), memberFindElements);
     }
 
-    private record MemberFindElement(String identifier, LocalDateTime createdAt) {
+    private record MemberFindElement(String identifier, Instant createdAt) {
     }
 }

src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java

@@ -3,7 +3,8 @@
 import com.recyclestudy.member.domain.Device;
 import com.recyclestudy.member.domain.DeviceIdentifier;
 import com.recyclestudy.member.domain.Email;
-import java.time.LocalDateTime;
+import java.time.Instant;
+import java.time.ZoneOffset;
 import java.util.List;
 
 public record MemberFindOutput(Email email, List<MemberFindElement> elements) {
@@ -13,11 +14,12 @@ public static MemberFindOutput of(
             final List<Device> devices
     ) {
         final List<MemberFindElement> memberFindElements = devices.stream()
-                .map(device -> new MemberFindElement(device.getIdentifier(), device.getCreatedAt()))
+                .map(device -> new MemberFindElement(device.getIdentifier(),
+                        device.getCreatedAt() != null ? device.getCreatedAt().toInstant(ZoneOffset.UTC) : null))
                 .toList();
         return new MemberFindOutput(email, memberFindElements);
     }
 
-    public record MemberFindElement(DeviceIdentifier identifier, LocalDateTime createdAt) {
+    public record MemberFindElement(DeviceIdentifier identifier, Instant createdAt) {
     }
 }

src/main/java/com/recyclestudy/review/controller/ReviewController.java

@@ -35,7 +35,7 @@ public ResponseEntity<ReviewSaveResponse> saveReview(
     ) {
         final ReviewSaveInput input = ReviewSaveInput.of(identifier, request.targetUrl(), request.cycle());
         final ReviewSaveOutput output = reviewService.saveReview(input);
-        ReviewSaveResponse response = ReviewSaveResponse.of(output.url(), output.scheduledAts());
+        ReviewSaveResponse response = ReviewSaveResponse.from(output);
         return ResponseEntity.status(HttpStatus.CREATED).body(response);
     }
 

src/main/java/com/recyclestudy/review/controller/response/NextReviewResponse.java

@@ -1,9 +1,9 @@
 package com.recyclestudy.review.controller.response;
 
 import com.recyclestudy.review.service.output.NextReviewOutput;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
-public record NextReviewResponse(LocalDateTime scheduledAt, int count) {
+public record NextReviewResponse(Instant scheduledAt, int count) {
 
     public static NextReviewResponse of(final NextReviewOutput output) {
         return new NextReviewResponse(output.scheduledAt(), output.count());

src/main/java/com/recyclestudy/review/controller/response/ReviewSaveResponse.java

@@ -1,12 +1,12 @@
 package com.recyclestudy.review.controller.response;
 
-import com.recyclestudy.review.domain.ReviewURL;
-import java.time.LocalDateTime;
+import com.recyclestudy.review.service.output.ReviewSaveOutput;
+import java.time.Instant;
 import java.util.List;
 
-public record ReviewSaveResponse(String url, List<LocalDateTime> scheduledAts) {
+public record ReviewSaveResponse(String url, List<Instant> scheduledAts) {
 
-    public static ReviewSaveResponse of(ReviewURL url, List<LocalDateTime> scheduledAts) {
-        return new ReviewSaveResponse(url.getValue(), scheduledAts);
+    public static ReviewSaveResponse from(final ReviewSaveOutput output) {
+        return new ReviewSaveResponse(output.url().getValue(), output.scheduledAts());
     }
 }

src/main/java/com/recyclestudy/review/service/output/NextReviewOutput.java

@@ -1,14 +1,16 @@
 package com.recyclestudy.review.service.output;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
-public record NextReviewOutput(LocalDateTime scheduledAt, int count) {
+public record NextReviewOutput(Instant scheduledAt, int count) {
 
     public static NextReviewOutput empty() {
         return new NextReviewOutput(null, 0);
     }
 
     public static NextReviewOutput of(final LocalDateTime scheduledAt, final int count) {
-        return new NextReviewOutput(scheduledAt, count);
+        return new NextReviewOutput(scheduledAt.toInstant(ZoneOffset.UTC), count);
     }
 }

src/main/java/com/recyclestudy/review/service/output/ReviewSaveOutput.java

@@ -1,12 +1,15 @@
 package com.recyclestudy.review.service.output;
 
 import com.recyclestudy.review.domain.ReviewURL;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 
-public record ReviewSaveOutput(ReviewURL url, List<LocalDateTime> scheduledAts) {
+public record ReviewSaveOutput(ReviewURL url, List<Instant> scheduledAts) {
 
     public static ReviewSaveOutput of(ReviewURL url, List<LocalDateTime> scheduledAts) {
-        return new ReviewSaveOutput(url, scheduledAts);
+        return new ReviewSaveOutput(url,
+                scheduledAts.stream().map(scheduledAt -> scheduledAt.toInstant(ZoneOffset.UTC)).toList());
     }
 }

src/main/resources/application.yaml

@@ -21,11 +21,19 @@ spring:
   flyway:
     enabled: true
 
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    time-zone: UTC
+
   jpa:
     hibernate:
       ddl-auto: validate
-
     open-in-view: false
+    properties:
+      hibernate:
+        jdbc:
+          time_zone: UTC
 
 
 server:

src/main/resources/db/migration/V20260310_1__convert_time_data_to_utc.sql

@@ -0,0 +1,23 @@
+-- review_cycle.scheduled_at 보정: PENDING 상태 + 미래 주기만 (-9h)
+UPDATE review_cycle rc
+    INNER JOIN notification_history nh ON nh.review_cycle_id = rc.id
+SET rc.scheduled_at = DATE_SUB(rc.scheduled_at, INTERVAL 9 HOUR)
+WHERE nh.status = 'PENDING'
+  AND rc.scheduled_at > NOW();
+
+-- notification_history.deadline 보정: PENDING 상태만 (-9h)
+UPDATE notification_history nh
+SET nh.deadline = DATE_SUB(nh.deadline, INTERVAL 9 HOUR)
+WHERE nh.status = 'PENDING';
+
+-- member.notification_time 보정: Seoul 기준 -> UTC (-9h)
+-- LocalTime은 날짜가 없으므로 자정을 넘는 케이스 처리 필요
+-- 예: 01:00 Seoul -> UTC 전날 16:00 → LocalTime으로 16:00 저장
+UPDATE member
+SET notification_time = CASE
+    WHEN notification_time >= '09:00:00'
+        THEN SUBTIME(notification_time, '09:00:00')
+    ELSE
+        ADDTIME(notification_time, '15:00:00')
+END
+WHERE notification_time IS NOT NULL;

src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java

@@ -17,6 +17,7 @@
 import com.recyclestudy.member.service.output.MemberNotificationTimeFindOutput;
 import com.recyclestudy.member.service.output.MemberSaveOutput;
 import com.recyclestudy.restdocs.APIBaseTest;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
@@ -114,11 +115,11 @@ void findAllMemberDevices() {
 
         final MemberFindOutput.MemberFindElement device1 = new MemberFindOutput.MemberFindElement(
                 DeviceIdentifier.from(headerIdentifier),
-                LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).minusDays(1)
+                Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.MINUTES)
         );
         final MemberFindOutput.MemberFindElement device2 = new MemberFindOutput.MemberFindElement(
                 DeviceIdentifier.from("device-id-2"),
-                LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES)
+                Instant.now().truncatedTo(ChronoUnit.MINUTES)
         );
 
         final MemberFindOutput output = new MemberFindOutput(
@@ -145,7 +146,7 @@ void findAllMemberDevices() {
                                         fieldWithPath("devices[].identifier").type(JsonFieldType.STRING)
                                                 .description("디바이스 식별자 값"),
                                         fieldWithPath("devices[].createdAt").type(JsonFieldType.STRING)
-                                                .description("디바이스 생성일")
+                                                .description("디바이스 생성일 (UTC, ISO 8601)")
                                 )
                 ))
                 .header("X-Device-Id", headerIdentifier)
@@ -337,7 +338,7 @@ void findAllMemberDevices_NullEmail() {
                 Email.from("test@test.com"),
                 List.of(new MemberFindOutput.MemberFindElement(
                         DeviceIdentifier.from(headerIdentifier),
-                        LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES)
+                        Instant.now().truncatedTo(ChronoUnit.MINUTES)
                 ))
         );
         given(memberService.findAllMemberDevices(any())).willReturn(output);
@@ -362,11 +363,11 @@ void findAllMemberDevices_WithHeader() {
 
         final MemberFindOutput.MemberFindElement device1 = new MemberFindOutput.MemberFindElement(
                 DeviceIdentifier.from(headerIdentifier),
-                LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).minusDays(1)
+                Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.MINUTES)
         );
         final MemberFindOutput.MemberFindElement device2 = new MemberFindOutput.MemberFindElement(
                 DeviceIdentifier.from("device-id-2"),
-                LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES)
+                Instant.now().truncatedTo(ChronoUnit.MINUTES)
         );
 
         final MemberFindOutput output = new MemberFindOutput(
@@ -396,7 +397,7 @@ void findAllMemberDevices_WithHeader() {
                                         fieldWithPath("devices[].identifier").type(JsonFieldType.STRING)
                                                 .description("디바이스 식별자 값"),
                                         fieldWithPath("devices[].createdAt").type(JsonFieldType.STRING)
-                                                .description("디바이스 생성일")
+                                                .description("디바이스 생성일 (UTC, ISO 8601)")
                                 ),
                         queryParameters(
                                 parameterWithName("email").description("이메일 (다음 버전에서 제거 예정)")
@@ -434,7 +435,7 @@ void findNotificationTime() {
                                 )
                                 .responseFields(
                                         fieldWithPath("notificationTime").type(JsonFieldType.STRING)
-                                                .description("알림 시간 (HH:mm:ss)")
+                                                .description("알림 시간 (HH:mm:ss, UTC 기준)")
                                 )
                 ))
                 .header("X-Device-Id", headerIdentifier)
@@ -531,7 +532,7 @@ void updateNotificationTime() {
                                 )
                                 .requestFields(
                                         fieldWithPath("notificationTime").type(JsonFieldType.STRING)
-                                                .description("알림 시간 (HH:mm:ss)")
+                                                .description("알림 시간 (HH:mm:ss, UTC 기준)")
                                 )
                 ))
                 .contentType(MediaType.APPLICATION_JSON_VALUE)

src/test/java/com/recyclestudy/review/controller/ReviewControllerTest.java

@@ -96,7 +96,7 @@ void saveReview_withDefaultCycle() {
                                 .responseFields(
                                         fieldWithPath("url").type(JsonFieldType.STRING).description("리뷰할 URL"),
                                         fieldWithPath("scheduledAts").type(JsonFieldType.ARRAY)
-                                                .description("복습 예정 일시 목록")
+                                                .description("복습 예정 일시 목록 (UTC, ISO 8601)")
                                 )
                 ))
                 .contentType(MediaType.APPLICATION_JSON_VALUE)
@@ -146,7 +146,7 @@ void saveReview_withCustomCycle() {
                                 .responseFields(
                                         fieldWithPath("url").type(JsonFieldType.STRING).description("리뷰할 URL"),
                                         fieldWithPath("scheduledAts").type(JsonFieldType.ARRAY)
-                                                .description("복습 예정 일시 목록")
+                                                .description("복습 예정 일시 목록 (UTC, ISO 8601)")
                                 )
                 ))
                 .contentType(MediaType.APPLICATION_JSON_VALUE)
@@ -274,7 +274,7 @@ void findNextReview_success() {
                                 )
                                 .responseFields(
                                         fieldWithPath("scheduledAt").type(JsonFieldType.STRING)
-                                                .description("다음 발송 예정 시간 (PENDING 없을 시 null)"),
+                                                .description("다음 발송 예정 시간, UTC ISO 8601 형식 (PENDING 없을 시 null)"),
                                         fieldWithPath("count").type(JsonFieldType.NUMBER)
                                                 .description("해당 시간에 발송될 URL 개수")
                                 )
@@ -284,6 +284,7 @@ void findNextReview_success() {
                 .get("/api/v1/reviews/next")
                 .then()
                 .statusCode(HttpStatus.OK.value())
+                .body("scheduledAt", equalTo("2026-03-06T09:00:00Z"))
                 .body("count", equalTo(3));
     }
 
@@ -309,7 +310,7 @@ void findNextReview_empty() {
                                 )
                                 .responseFields(
                                         fieldWithPath("scheduledAt").type(JsonFieldType.NULL)
-                                                .description("다음 발송 예정 시간 (PENDING 없을 시 null)"),
+                                                .description("다음 발송 예정 시간, UTC ISO 8601 형식 (PENDING 없을 시 null)"),
                                         fieldWithPath("count").type(JsonFieldType.NUMBER)
                                                 .description("해당 시간에 발송될 URL 개수")
                                 )

src/test/java/com/recyclestudy/review/service/ReviewCycleServiceTest.java

@@ -17,7 +17,9 @@
 import com.recyclestudy.review.service.output.NextReviewOutput;
 import com.recyclestudy.review.service.output.ReviewSendOutput;
 import com.recyclestudy.review.service.output.ReviewSendOutput.ReviewSendElement;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.DisplayName;
@@ -200,7 +202,7 @@ void findNextReview_returnsEarliestGroup() {
 
         // then
         assertSoftly(softly -> {
-            softly.assertThat(result.scheduledAt()).isEqualTo(t1);
+            softly.assertThat(result.scheduledAt()).isEqualTo(t1.toInstant(ZoneOffset.UTC));
             softly.assertThat(result.count()).isEqualTo(1);
         });
     }
@@ -231,7 +233,7 @@ void findNextReview_countsSameScheduledAt() {
 
         // then
         assertSoftly(softly -> {
-            softly.assertThat(result.scheduledAt()).isEqualTo(t1);
+            softly.assertThat(result.scheduledAt()).isEqualTo(t1.toInstant(ZoneOffset.UTC));
             softly.assertThat(result.count()).isEqualTo(3);
         });
     }

src/test/java/com/recyclestudy/review/service/ReviewServiceTest.java

@@ -154,7 +154,7 @@ void saveReview_withPreferredNotificationTime() {
 
         final Email email = Email.from("test@test.com");
         final Member member = Member.withoutId(email);
-        final LocalTime preferredTime = LocalTime.of(9, 0);
+        final LocalTime preferredTime = LocalTime.of(0, 0);
         member.updateNotificationTime(preferredTime);
 
         final Review review = Review.withoutId(member, ReviewURL.from(urlValue));