[MERGE/#124] 후배의 나의 약속 조회 시 응답 값에 약속 별로 선배 Id 추가

[FEAT] #124 - 후배의 나의 약속 조회 시 응답 값에 약속 별로 선배 Id 추가
TEAM-SEONYAK · Jul 19, 2024 · 59f3fc9 · 59f3fc9
2 parents 0d3d560 + cb8d37d
commit 59f3fc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/org/sopt/seonyakServer/domain/appointment/model/AppointmentCard.java b/src/main/java/org/sopt/seonyakServer/domain/appointment/model/AppointmentCard.java
@@ -16,6 +16,7 @@ public class AppointmentCard implements Comparable<AppointmentCard> {
 
     private Long appointmentId;
     private AppointmentStatus appointmentStatus;
+    private Long seniorId;
     private String nickname;
     private String image;
     private String field;
@@ -40,6 +41,7 @@ public class AppointmentCard implements Comparable<AppointmentCard> {
     private AppointmentCard(
             Long appointmentId,
             AppointmentStatus appointmentStatus,
+            Long seniorId,
             String nickname,
             String image,
             String field,
@@ -58,6 +60,7 @@ private AppointmentCard(
     ) {
         this.appointmentId = appointmentId;
         this.appointmentStatus = appointmentStatus;
+        this.seniorId = seniorId;
         this.nickname = nickname;
         this.image = image;
         this.field = field;
@@ -99,6 +102,7 @@ public int compareTo(AppointmentCard other) {
     public static AppointmentCard create(
             Long appointmentId,
             AppointmentStatus appointmentStatus,
+            Long seniorId,
             String nickname,
             String image,
             String field,
@@ -118,6 +122,7 @@ public static AppointmentCard create(
         return AppointmentCard.builder()
                 .appointmentId(appointmentId)
                 .appointmentStatus(appointmentStatus)
+                .seniorId(seniorId)
                 .nickname(nickname)
                 .image(image)
                 .field(field)

diff --git a/src/main/java/org/sopt/seonyakServer/domain/appointment/service/AppointmentService.java b/src/main/java/org/sopt/seonyakServer/domain/appointment/service/AppointmentService.java
@@ -200,6 +200,7 @@ public AppointmentResponse getAppointment() {
 
     private AppointmentCard createAppointmentCard(Member user, Appointment appointment) {
         // init
+        Long seniorId = null;
         String nickname, image, field, department = null;
         List<String> topic = null;
         String personalTopic = null;
@@ -212,6 +213,7 @@ private AppointmentCard createAppointmentCard(Member user, Appointment appointme
         if (user.getSenior() == null) {
             Senior senior = appointment.getSenior();
             Member seniorMember = senior.getMember();
+            seniorId = senior.getId();
             nickname = seniorMember.getNickname();
             image = seniorMember.getImage();
             field = seniorMember.getField();
@@ -245,6 +247,7 @@ private AppointmentCard createAppointmentCard(Member user, Appointment appointme
         return AppointmentCard.create(
                 appointment.getId(),
                 appointment.getAppointmentStatus(),
+                seniorId,
                 nickname,
                 image,
                 field,