fix: 응답 필드 누락 (#70)

SOPT-all · Jan 23, 2025 · db16949 · db16949
1 parent eecdf5c
commit db16949
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 19 deletions.
diff --git a/src/main/java/be/dash/dashserver/api/core/member/MemberController.java b/src/main/java/be/dash/dashserver/api/core/member/MemberController.java
@@ -10,7 +10,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import be.dash.dashserver.api.core.member.dto.MemberResponse;
-import be.dash.dashserver.api.core.member.dto.MyLessonDetailedResponse;
 import be.dash.dashserver.api.core.member.dto.MyLessonsResponse;
 import be.dash.dashserver.api.core.member.dto.OnBoardRequest;
 import be.dash.dashserver.api.core.member.dto.ReservationDetailedResponse;

diff --git a/src/main/java/be/dash/dashserver/api/core/member/MemberFacade.java b/src/main/java/be/dash/dashserver/api/core/member/MemberFacade.java
@@ -1,9 +1,10 @@
 package be.dash.dashserver.api.core.member;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import be.dash.dashserver.api.core.member.dto.MyLessonDetailedResponse;
+
 import be.dash.dashserver.api.core.member.dto.MyLessonResponse;
 import be.dash.dashserver.api.core.member.dto.MyLessonsResponse;
 import be.dash.dashserver.api.core.member.dto.ReservationDetailedResponse;
@@ -16,8 +17,8 @@
 import be.dash.dashserver.core.domain.reservation.Reservation;
 import be.dash.dashserver.core.domain.reservation.Reservations;
 import be.dash.dashserver.core.domain.reservation.service.ReservationService;
-import be.dash.dashserver.core.log.annotation.Trace;
 import be.dash.dashserver.core.domain.teacher.Teacher;
+import be.dash.dashserver.core.log.annotation.Trace;
 import lombok.RequiredArgsConstructor;
 
 @Trace
@@ -50,8 +51,11 @@ public MyLessonDetailedResponse getMyLesson(long memberId, long lessonId) {
         lessonService.validateOwner(teacher.getId(), lessonId);
         Lesson lesson = lessonService.findById(lessonId);
         Reservations reservations = reservationService.findAllByLessonIdOrderByCreatedAtDesc(lessonId);
-        List<Long> memberIds = studentsService.findAllByIds(reservations.getStudentIds()).stream().map(Student::getId).toList();
-        List<Member> members = memberService.findAllByIds(memberIds);
-        return MyLessonDetailedResponse.from(lesson, members);
+        List<Long> studentIds = studentsService.findAllByIds(reservations.getStudentIds()).stream()
+                .map(Student::getId)
+                .toList();
+        List<LocalDateTime> reservationDateTimes = reservations.getCreatedAt();
+        List<Member> members = memberService.findAllByIds(studentIds);
+        return MyLessonDetailedResponse.from(lesson, members, reservationDateTimes);
     }
 }
diff --git a/src/main/java/be/dash/dashserver/api/core/member/MyLessonDetailedResponse.java b/src/main/java/be/dash/dashserver/api/core/member/MyLessonDetailedResponse.java
@@ -1,7 +1,10 @@
-package be.dash.dashserver.api.core.member.dto;
+package be.dash.dashserver.api.core.member;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.IntStream;
+import be.dash.dashserver.api.core.member.dto.ApplyStatus;
+import be.dash.dashserver.api.core.member.dto.MemberReservationResponse;
 import be.dash.dashserver.core.domain.common.Genre;
 import be.dash.dashserver.core.domain.common.Level;
 import be.dash.dashserver.core.domain.lesson.Lesson;
@@ -16,11 +19,11 @@ public record MyLessonDetailedResponse(long id,
                                        String detailedAddress,
                                        LocalDateTime startDateTime,
                                        LocalDateTime endDateTime,
-                                       APPLYSTATUS applyStatus,
+                                       ApplyStatus applyStatus,
                                        List<MemberReservationResponse> students,
                                        int studentCount
-                                       ) {
-    public static MyLessonDetailedResponse from(Lesson lesson, List<Member> members) {
+) {
+    public static MyLessonDetailedResponse from(Lesson lesson, List<Member> members, List<LocalDateTime> reservationDateTimes) {
         return new MyLessonDetailedResponse(
                 lesson.getId(),
                 lesson.getName(),
@@ -31,8 +34,10 @@ public static MyLessonDetailedResponse from(Lesson lesson, List<Member> members)
                 lesson.getDetailedAddress(),
                 lesson.getRounds().getStartTime(),
                 lesson.getRounds().getEndTime(),
-                APPLYSTATUS.calculate(lesson.getStartTime(), lesson.getReservationCount(), lesson.getMaxReservationCount()),
-                members.stream().map(MemberReservationResponse::from).toList(),
+                ApplyStatus.calculate(lesson.getStartTime(), lesson.getReservationCount(), lesson.getMaxReservationCount()),
+                IntStream.range(0, members.size())
+                        .mapToObj(i -> MemberReservationResponse.from(members.get(i), reservationDateTimes.get(i)))
+                        .toList(),
                 members.size()
         );
     }

diff --git a/...rver/api/core/member/dto/APPLYSTATUS.java → ...rver/api/core/member/dto/ApplyStatus.java b/...rver/api/core/member/dto/APPLYSTATUS.java → ...rver/api/core/member/dto/ApplyStatus.java
@@ -2,10 +2,10 @@
 
 import java.time.LocalDateTime;
 
-public enum APPLYSTATUS {
+public enum ApplyStatus {
     APPLYING, FINISHED;
 
-    public static APPLYSTATUS calculate(LocalDateTime startTime,
+    public static ApplyStatus calculate(LocalDateTime startTime,
                                         long currentReservationCount,
                                         long maxReservationCount) {
         if (LocalDateTime.now().isAfter(startTime)) return FINISHED;

diff --git a/src/main/java/be/dash/dashserver/api/core/member/dto/MemberReservationResponse.java b/src/main/java/be/dash/dashserver/api/core/member/dto/MemberReservationResponse.java
@@ -1,10 +1,12 @@
 package be.dash.dashserver.api.core.member.dto;
 
+import java.time.LocalDateTime;
 import be.dash.dashserver.core.domain.member.Member;
 
 public record MemberReservationResponse(String name,
-                                        String phoneNumber) {
-    public static MemberReservationResponse from(Member member) {
-        return new MemberReservationResponse(member.getName(), member.getPhoneNumber());
+                                        String phoneNumber,
+                                        LocalDateTime createdAt) {
+    public static MemberReservationResponse from(Member member, LocalDateTime createdAt) {
+        return new MemberReservationResponse(member.getName(), member.getPhoneNumber(), createdAt);
     }
 }
diff --git a/src/main/java/be/dash/dashserver/api/core/member/dto/MyLessonResponse.java b/src/main/java/be/dash/dashserver/api/core/member/dto/MyLessonResponse.java
@@ -14,7 +14,7 @@ public record MyLessonResponse(long id,
                                String detailedAddress,
                                LocalDateTime startDateTime,
                                LocalDateTime endDateTime,
-                               APPLYSTATUS applyStatus) {
+                               ApplyStatus applyStatus) {
     public static MyLessonResponse from(Lesson lesson) {
         return new MyLessonResponse(
                 lesson.getId(),
@@ -26,7 +26,7 @@ public static MyLessonResponse from(Lesson lesson) {
                 lesson.getDetailedAddress(),
                 lesson.getRounds().getStartTime(),
                 lesson.getRounds().getEndTime(),
-                APPLYSTATUS.calculate(lesson.getStartTime(), lesson.getReservationCount(), lesson.getMaxReservationCount()
+                ApplyStatus.calculate(lesson.getStartTime(), lesson.getReservationCount(), lesson.getMaxReservationCount()
                 ));
     }
 }
diff --git a/src/main/java/be/dash/dashserver/core/domain/reservation/Reservations.java b/src/main/java/be/dash/dashserver/core/domain/reservation/Reservations.java
@@ -1,5 +1,6 @@
 package be.dash.dashserver.core.domain.reservation;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -27,4 +28,10 @@ public Set<Long> getLessonIds() {
     public List<Long> getStudentIds() {
         return reservations.stream().map(Reservation::getStudentId).toList();
     }
+
+    public List<LocalDateTime> getCreatedAt() {
+        return reservations.stream()
+                .map(Reservation::getCreatedAt)
+                .toList();
+    }
 }
diff --git a/src/main/java/be/dash/dashserver/core/domain/reservation/service/ReservationService.java b/src/main/java/be/dash/dashserver/core/domain/reservation/service/ReservationService.java
@@ -25,7 +25,9 @@ public boolean isBooked(long memberId, long lessonId) {
         return reservationRepository.existsByMemberIdAndLessonId(memberId, lessonId);
     }
 
+    @Transactional
     public long reserve(long memberId, long lessonId) {
+
         return reservationRepository.save(memberId, lessonId);
     }