feat: QA

Author: Ho-Tea

src/main/java/be/dash/dashserver/api/core/member/dto/MemberReservationResponse.java

@@ -1,8 +1,6 @@
 package be.dash.dashserver.api.core.member.dto;
 
 import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import be.dash.dashserver.core.domain.member.Member;
 import be.dash.dashserver.core.domain.reservation.Reservation;
 import be.dash.dashserver.core.domain.reservation.ReservationStatus;
@@ -12,31 +10,22 @@ public record MemberReservationResponse(long reservationId,
                                         String phoneNumber,
                                         LocalDateTime reservationDateTime,
                                         ReservationStatus reservationStatus) {
-    
-    private static final ZoneId UTC = ZoneId.of("UTC");
-    private static final ZoneId KST = ZoneId.of("Asia/Seoul");
-    
+
     public static MemberReservationResponse fromApprove(Member member, Reservation reservation) {
         return new MemberReservationResponse(
-                reservation.getId(), 
-                member.getName(), 
-                member.getPhoneNumber(), 
-                toKst(reservation.getCreatedAt()), 
+                reservation.getId(),
+                member.getName(),
+                member.getPhoneNumber(),
+                reservation.getCreatedAt(),
                 reservation.getReservationStatus());
     }
 
     public static MemberReservationResponse fromCancel(Member member, Reservation reservation) {
         return new MemberReservationResponse(
-                reservation.getId(), 
-                member.getName(), 
-                member.getPhoneNumber(), 
-                toKst(reservation.getUpdatedAt()), 
+                reservation.getId(),
+                member.getName(),
+                member.getPhoneNumber(),
+                reservation.getUpdatedAt(),
                 reservation.getReservationStatus());
     }
-    
-    private static LocalDateTime toKst(LocalDateTime utcTime) {
-        if (utcTime == null) return null;
-        ZonedDateTime utcZoned = utcTime.atZone(UTC);
-        return utcZoned.withZoneSameInstant(KST).toLocalDateTime();
-    }
 }

src/main/java/be/dash/dashserver/database/core/reservation/ReservationJpaRepository.java

@@ -60,7 +60,7 @@ SELECT COUNT(r)
 
     List<ReservationJpaEntity> findByStatusAndCreatedAtBetween(ReservationStatus status, LocalDateTime start, LocalDateTime end);
 
-    ReservationJpaEntity findByMemberIdAndLessonId(Long memberId, Long lessonId);
+    List<ReservationJpaEntity> findAllByMemberIdAndLessonIdOrderByCreatedAtDesc(Long memberId, Long lessonId);
 
     List<ReservationJpaEntity> findAllByMemberId(Long memberId);
 

src/main/java/be/dash/dashserver/database/core/reservation/ReservationRepositoryAdapter.java

@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Objects;
 import org.springframework.stereotype.Repository;
 import be.dash.dashserver.core.domain.reservation.Reservation;
 import be.dash.dashserver.core.domain.reservation.ReservationStatus;
@@ -19,11 +18,9 @@ public class ReservationRepositoryAdapter implements ReservationRepository {
 
     @Override
     public boolean existsApproveReservation(long memberId, long lessonId) {
-        ReservationJpaEntity reservationJpaEntity = reservationJpaRepository.findByMemberIdAndLessonId(memberId, lessonId);
-        if(Objects.isNull(reservationJpaEntity) || !reservationJpaEntity.isStatusApprove()){
-            return false;
-        }
-        return true;
+        List<ReservationJpaEntity> reservations = reservationJpaRepository.findAllByMemberIdAndLessonIdOrderByCreatedAtDesc(memberId, lessonId);
+        return reservations.stream()
+                .anyMatch(ReservationJpaEntity::isStatusApprove);
     }
 
     @Override
@@ -116,13 +113,6 @@ public Reservations findAllByLessonIds(List<Long> teacherLessonIds) {
 
     @Override
     public long save(long memberId, long lessonId) {
-//       if (reservationJpaRepository.existsByMemberIdAndLessonId(memberId, lessonId)) {
-//           ReservationJpaEntity reservationJpaEntity = reservationJpaRepository.findByMemberIdAndLessonId(memberId, lessonId);
-//           reservationJpaEntity.changeStatus(ReservationStatus.PENDING_APPROVAL);
-//           reservationJpaRepository.save(reservationJpaEntity);
-//           return reservationJpaEntity.getId();
-//       }
-       
         ReservationJpaEntity reservationJpaEntity = new ReservationJpaEntity(lessonId, memberId, ReservationStatus.PENDING_APPROVAL);
         reservationJpaRepository.save(reservationJpaEntity);
         return reservationJpaEntity.getId();