Merge pull request #90 from TeamPINGLE/feat/80

[feat] 수정 pr입니다
TeamPINGLE · Jan 17, 2024 · 78c3b4b · 78c3b4b
2 parents 3f61ee4 + a7131d2
commit 78c3b4b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/org/pingle/pingleserver/domain/Pin.java b/src/main/java/org/pingle/pingleserver/domain/Pin.java
@@ -21,7 +21,7 @@ public class Pin extends BaseTimeEntity {
     private Team team;
 
     @OneToMany(mappedBy = "pin")
-    private List<Meeting> meetings;
+    private List<Meeting> meetingList;
 
     @Embedded
     private Point point;

diff --git a/src/main/java/org/pingle/pingleserver/dto/reponse/PinResponse.java b/src/main/java/org/pingle/pingleserver/dto/reponse/PinResponse.java
@@ -23,17 +23,17 @@ public static PinResponse ofWithFilter(Pin pin, MCategory mCategory) {
     }
     private static MCategory getMostRecentMeetingCategoryOfPin (Pin pin) {
         Comparator<Meeting> comparator = Comparator.comparing(Meeting::getStartAt);
-        List<Meeting> meetingList = pin.getMeetings();
+        List<Meeting> meetingList = pin.getMeetingList();
         meetingList.sort(comparator);
         return meetingList.get(0).getCategory();
     }
 
     private static int getMeetingCount(Pin pin) {
-        return pin.getMeetings().size();
+        return pin.getMeetingList().size();
     }
     private static int getMeetingCountWithFilter(Pin pin, MCategory category) {
         int count = 0;
-        List<Meeting> meetings = pin.getMeetings();
+        List<Meeting> meetings = pin.getMeetingList();
         for(Meeting meeting : meetings) {
             if(meeting.getCategory().getValue().equals(category.getValue()))
                 count++;

diff --git a/src/main/java/org/pingle/pingleserver/dto/response/MyPingleResponse.java b/src/main/java/org/pingle/pingleserver/dto/response/MyPingleResponse.java
@@ -13,7 +13,7 @@
 @Builder(access = AccessLevel.PRIVATE)
 public record MyPingleResponse(Long id, MCategory category, String name, String ownerName, String location,
                                String dDay, String date, String startAt, String endAt, int maxParticipants,
-                               int curParticipants, boolean isOwner) {
+                               int curParticipants, boolean isOwner, String chatLink) {
 
     private static final String DDAYPREFIX = "D";
     private static final String DDAY = "D-Day";
@@ -33,6 +33,7 @@ public static MyPingleResponse of(Meeting meeting, String ownerName, boolean isO
                 .maxParticipants(meeting.getMaxParticipants())
                 .curParticipants(meeting.getUserMeetingList().size())
                 .isOwner(isOwner)
+                .chatLink(meeting.getChatLink())
                 .build();
     }
 

diff --git a/src/main/java/org/pingle/pingleserver/service/PinService.java b/src/main/java/org/pingle/pingleserver/service/PinService.java
@@ -23,6 +23,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -141,7 +142,7 @@ public List<MeetingResponse> getMeetings(Long pinId, Long userId, MCategory cate
     }
 
     private boolean checkMeetingsCategoryOfPin(Pin pin, MCategory category) {
-        List<Meeting> meetingList = pin.getMeetings();
+        List<Meeting> meetingList = pin.getMeetingList();
         for(Meeting meeting : meetingList) {
             if(meeting.getCategory().getValue().equals(category.getValue()))
                 return true;