Merge pull request #140 from TrainingDiary/fix/pt-contract-dto-only-u…

…se-date PT 계약에서 직접 날짜 시간 포맷팅을 하지 않고, 전역 옵션을 사용
TrainingDiary · Jul 25, 2024 · 5652ba3 · 5652ba3
2 parents 30cea92 + 5cde18c
commit 5652ba3
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 12 deletions.
diff --git a/src/main/java/com/project/trainingdiary/dto/response/ptcontract/PtContractResponseDto.java b/src/main/java/com/project/trainingdiary/dto/response/ptcontract/PtContractResponseDto.java
@@ -1,7 +1,6 @@
 package com.project.trainingdiary.dto.response.ptcontract;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.time.ZonedDateTime;
+import java.time.LocalDate;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,9 +11,7 @@
 public class PtContractResponseDto {
 
   private Long ptContractId;
-
-  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "Asia/Seoul")
-  private ZonedDateTime totalSessionUpdatedAt;
+  private LocalDate totalSessionUpdatedAt;
   private int remainingSession;
   private Long trainerId;
   private String trainerName;

diff --git a/src/main/java/com/project/trainingdiary/entity/PtContractEntity.java b/src/main/java/com/project/trainingdiary/entity/PtContractEntity.java
@@ -10,7 +10,6 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -86,7 +85,7 @@ public PtContractResponseDto toResponseDto() {
         .traineeId(trainee.getId())
         .traineeName(trainee.getName())
         .remainingSession(getRemainingSession())
-        .totalSessionUpdatedAt(totalSessionUpdatedAt.atZone(ZoneId.of("Asia/Seoul")))
+        .totalSessionUpdatedAt(totalSessionUpdatedAt.toLocalDate())
         .build();
   }
 }
diff --git a/src/main/java/com/project/trainingdiary/service/ScheduleTraineeService.java b/src/main/java/com/project/trainingdiary/service/ScheduleTraineeService.java
@@ -14,7 +14,6 @@
 import com.project.trainingdiary.exception.notification.UnsupportedNotificationTypeException;
 import com.project.trainingdiary.exception.ptcontract.PtContractNotEnoughSessionException;
 import com.project.trainingdiary.exception.ptcontract.PtContractNotExistException;
-import com.project.trainingdiary.exception.ptcontract.UsedSessionExceededTotalSessionException;
 import com.project.trainingdiary.exception.schedule.ScheduleNotFoundException;
 import com.project.trainingdiary.exception.schedule.ScheduleRangeTooLongException;
 import com.project.trainingdiary.exception.schedule.ScheduleStartIsPastException;

diff --git a/src/main/java/com/project/trainingdiary/service/ScheduleTrainerService.java b/src/main/java/com/project/trainingdiary/service/ScheduleTrainerService.java
@@ -14,7 +14,6 @@
 import com.project.trainingdiary.entity.TrainerEntity;
 import com.project.trainingdiary.exception.notification.UnsupportedNotificationTypeException;
 import com.project.trainingdiary.exception.ptcontract.PtContractNotExistException;
-import com.project.trainingdiary.exception.ptcontract.UsedSessionExceededTotalSessionException;
 import com.project.trainingdiary.exception.schedule.ScheduleNotFoundException;
 import com.project.trainingdiary.exception.schedule.ScheduleRangeTooLongException;
 import com.project.trainingdiary.exception.schedule.ScheduleStatusNotReserveAppliedException;

diff --git a/src/test/java/com/project/trainingdiary/service/ScheduleTraineeServiceTest.java b/src/test/java/com/project/trainingdiary/service/ScheduleTraineeServiceTest.java
@@ -10,7 +10,6 @@
 import static org.mockito.Mockito.when;
 
 import com.project.trainingdiary.component.FcmPushNotification;
-import com.project.trainingdiary.dto.request.schedule.AcceptScheduleRequestDto;
 import com.project.trainingdiary.dto.request.schedule.ApplyScheduleRequestDto;
 import com.project.trainingdiary.dto.request.schedule.CancelScheduleByTraineeRequestDto;
 import com.project.trainingdiary.dto.response.schedule.CancelScheduleByTraineeResponseDto;
@@ -22,7 +21,6 @@
 import com.project.trainingdiary.entity.TrainerEntity;
 import com.project.trainingdiary.exception.ptcontract.PtContractNotEnoughSessionException;
 import com.project.trainingdiary.exception.ptcontract.PtContractNotExistException;
-import com.project.trainingdiary.exception.ptcontract.UsedSessionExceededTotalSessionException;
 import com.project.trainingdiary.exception.schedule.ScheduleNotFoundException;
 import com.project.trainingdiary.exception.schedule.ScheduleStartIsPastException;
 import com.project.trainingdiary.exception.schedule.ScheduleStartTooSoonException;

diff --git a/src/test/java/com/project/trainingdiary/service/ScheduleTrainerServiceTest.java b/src/test/java/com/project/trainingdiary/service/ScheduleTrainerServiceTest.java
@@ -22,7 +22,6 @@
 import com.project.trainingdiary.entity.TraineeEntity;
 import com.project.trainingdiary.entity.TrainerEntity;
 import com.project.trainingdiary.exception.ptcontract.PtContractNotExistException;
-import com.project.trainingdiary.exception.ptcontract.UsedSessionExceededTotalSessionException;
 import com.project.trainingdiary.exception.schedule.ScheduleNotFoundException;
 import com.project.trainingdiary.exception.schedule.ScheduleRangeTooLongException;
 import com.project.trainingdiary.exception.schedule.ScheduleStatusNotReserveAppliedException;