[feat] 약속 조회 관련 API 수정

src/main/java/org/kkumulkkum/server/controller/PromiseController.java

@@ -7,10 +7,7 @@
 import org.kkumulkkum.server.annotation.IsParticipant;
 import org.kkumulkkum.server.annotation.UserId;
 import org.kkumulkkum.server.dto.promise.PromiseCreateDto;
-import org.kkumulkkum.server.dto.promise.response.MainPromiseDto;
-import org.kkumulkkum.server.dto.promise.response.MainPromisesDto;
-import org.kkumulkkum.server.dto.promise.response.PromiseDto;
-import org.kkumulkkum.server.dto.promise.response.PromisesDto;
+import org.kkumulkkum.server.dto.promise.response.*;
 import org.kkumulkkum.server.service.promise.PromiseService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -24,7 +21,7 @@ public class PromiseController {
 
     @IsMemberByMeetingId(meetingIdParamIndex = 1)
     @PostMapping("/v1/meetings/{meetingId}/promises")
-    public ResponseEntity<PromiseDto> createPromise(
+    public ResponseEntity<PromiseAddDto> createPromise(
             @UserId final Long userId,
             @PathVariable final Long meetingId,
             @Valid @RequestBody final PromiseCreateDto createPromiseDto
@@ -42,21 +39,24 @@ public ResponseEntity<Void> completePromise(
         return ResponseEntity.ok().build();
     }
 
-    @IsMemberByMeetingId(meetingIdParamIndex = 0)
+    @IsMemberByMeetingId(meetingIdParamIndex = 1)
     @GetMapping("/v1/meetings/{meetingId}/promises")
     public ResponseEntity<PromisesDto> getPromises(
+            @UserId final Long userId,
             @PathVariable("meetingId") final Long meetingId,
-            @RequestParam(required = false) final Boolean done
+            @RequestParam(required = false) final Boolean done,
+            @RequestParam(required = false) final Boolean isParticipant
     ) {
-        return ResponseEntity.ok().body(promiseService.getPromises(meetingId, done));
+        return ResponseEntity.ok().body(promiseService.getPromises(userId, meetingId, done, isParticipant));
     }
 
-    @IsMemberByPromiseId(promiseIdParamIndex = 0)
+    @IsMemberByPromiseId(promiseIdParamIndex = 1)
     @GetMapping("/v1/promises/{promiseId}")
-    public ResponseEntity<PromiseDto> getPromise(
+    public ResponseEntity<PromiseDetailDto> getPromise(
+            @UserId final Long userId,
             @PathVariable("promiseId") final Long promiseId
     ) {
-        return ResponseEntity.ok().body(promiseService.getPromise(promiseId));
+        return ResponseEntity.ok().body(promiseService.getPromise(userId, promiseId));
     }
 
     @GetMapping("/v1/promises/today/next")

src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java

@@ -8,7 +8,7 @@
 public record MeetingDto (
         Long meetingId,
         String name,
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         LocalDateTime createdAt,
         Long metCount,
         String invitationCode

src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java

@@ -12,23 +12,19 @@ public record MainPromiseDto(
         String meetingName,
         String dressUpLevel,
         int dDay,
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd")
-        LocalDateTime date,
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "a h:mm", locale = "en")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         LocalDateTime time,
         String placeName
 ) {
     public static MainPromiseDto from(Promise promise) {
-        int dday = (int) ChronoUnit.DAYS.between(LocalDateTime.now().toLocalDate(), promise.getTime().toLocalDate());
-        if (dday < 0) dday = 0;
+        int dday = (int) ChronoUnit.DAYS.between(promise.getTime().toLocalDate(), LocalDateTime.now().toLocalDate());
         return new MainPromiseDto(
                 promise.getId(),
                 promise.getName(),
                 promise.getMeeting().getName(),
                 promise.getDressUpLevel().getContent(),
                 dday,
                 promise.getTime(),
-                promise.getTime(),
                 promise.getPlaceName()
         );
     }

src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDto.java → src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java

@@ -5,19 +5,19 @@
 
 import java.time.LocalDateTime;
 
-public record PromiseDto(
+public record PromiseAddDto(
         Long promiseId,
         String promiseName,
         String placeName,
         String address,
         String roadAddress,
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "M월 d일 HH:mm")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         LocalDateTime time,
         String dressUpLevel,
         String penalty
 ) {
-    public static PromiseDto from(Promise promise) {
-        return new PromiseDto(
+    public static PromiseAddDto from(Promise promise) {
+        return new PromiseAddDto(
                 promise.getId(),
                 promise.getName(),
                 promise.getPlaceName(),

src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java

@@ -0,0 +1,33 @@
+package org.kkumulkkum.server.dto.promise.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.kkumulkkum.server.domain.Promise;
+
+import java.time.LocalDateTime;
+
+public record PromiseDetailDto(
+        boolean isParticipant,
+        Long promiseId,
+        String promiseName,
+        String placeName,
+        String address,
+        String roadAddress,
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        LocalDateTime time,
+        String dressUpLevel,
+        String penalty
+) {
+    public static PromiseDetailDto from(Promise promise, boolean isParticipant) {
+        return new PromiseDetailDto(
+                isParticipant,
+                promise.getId(),
+                promise.getName(),
+                promise.getPlaceName(),
+                promise.getAddress(),
+                promise.getRoadAddress(),
+                promise.getTime(),
+                promise.getDressUpLevel().getContent(),
+                promise.getPenalty()
+        );
+    }
+}

src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java

@@ -23,21 +23,17 @@ public record PromiseDto(
             Long promiseId,
             String name,
             int dDay,
-            @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd")
-            LocalDateTime date,
-            @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "a h:mm", locale = "en")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
             LocalDateTime time,
             String placeName
     ) {
         public static PromiseDto from(Promise promise) {
-            int dday = (int) ChronoUnit.DAYS.between(LocalDateTime.now().toLocalDate(), promise.getTime().toLocalDate());
-            if (dday < 0) dday = 0;
+            int dday = (int) ChronoUnit.DAYS.between(promise.getTime().toLocalDate(), LocalDateTime.now().toLocalDate());
             return new PromiseDto(
                     promise.getId(),
                     promise.getName(),
                     dday,
                     promise.getTime(),
-                    promise.getTime(),
                     promise.getPlaceName()
             );
         }

src/main/java/org/kkumulkkum/server/repository/PromiseRepository.java

@@ -52,4 +52,20 @@ public interface PromiseRepository extends JpaRepository<Promise, Long> {
             THEN TRUE ELSE FALSE END FROM Participant p""")
     boolean existsByArrivedAtIsNull(Long promiseId);
 
+    @Query("""
+            SELECT p FROM Participant pt
+            JOIN pt.member m
+            JOIN pt.promise p
+            WHERE p.meeting.id = :meetingId
+            AND m.user.id = :userId
+            ORDER BY p.time ASC, p.createdAt ASC""")
+    List<Promise> findPromiseByUserIdAndMeetingId(Long userId, Long meetingId);
+
+    @Query("""
+            SELECT p FROM Participant pt
+            JOIN pt.member m
+            JOIN pt.promise p
+            WHERE pt.promise.id = :promiseId
+            AND m.user.id = :userId""")
+    Promise findByUserIdAndPromiseId(Long userId, Long promiseId);
 }

src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java

@@ -68,6 +68,13 @@ public List<Promise> findUpcomingPromises(
 
     public boolean existsByArrivedAtIsNull(final Long promiseId) {
         return promiseRepository.existsByArrivedAtIsNull(promiseId);
+    }
+
+    public List<Promise> findPromiseByUserIdAndMeetingId(final Long userId, final Long meetingId) {
+        return promiseRepository.findPromiseByUserIdAndMeetingId(userId, meetingId);
+    }
 
+    public Promise findByUserIdAndPromiseId(final Long userId, final Long promiseId) {
+        return promiseRepository.findByUserIdAndPromiseId(userId, promiseId);
     }
 }

src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java

@@ -4,10 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import org.kkumulkkum.server.domain.*;
 import org.kkumulkkum.server.dto.promise.PromiseCreateDto;
-import org.kkumulkkum.server.dto.promise.response.MainPromiseDto;
-import org.kkumulkkum.server.dto.promise.response.MainPromisesDto;
-import org.kkumulkkum.server.dto.promise.response.PromiseDto;
-import org.kkumulkkum.server.dto.promise.response.PromisesDto;
+import org.kkumulkkum.server.dto.promise.response.*;
 import org.kkumulkkum.server.exception.PromiseException;
 import org.kkumulkkum.server.exception.code.PromiseErrorCode;
 import org.kkumulkkum.server.service.member.MemberRetreiver;
@@ -21,6 +18,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -36,7 +34,7 @@ public class PromiseService {
     private final MemberRetreiver memberRetreiver;
 
     @Transactional
-    public PromiseDto createPromise(
+    public PromiseAddDto createPromise(
             final Long userId,
             final Long meetingId,
             final PromiseCreateDto createPromiseDto
@@ -65,7 +63,7 @@ public PromiseDto createPromise(
                         .member(entityManager.getReference(Member.class, participantId))
                         .build()).toList()
         );
-        return PromiseDto.from(promise);
+        return PromiseAddDto.from(promise);
     }
 
     @Transactional
@@ -86,19 +84,39 @@ public void completePromise(final Long promiseId) {
 
     @Transactional(readOnly = true)
     public PromisesDto getPromises(
+            final Long userId,
             final Long meetingId,
-            final Boolean done
+            final Boolean done,
+            final Boolean isParticipant
     ) {
-        List<Promise> promises = promiseRetriever.findAllByMeetingId(meetingId);
+        List<Promise> allPromises = promiseRetriever.findAllByMeetingId(meetingId);
+        List<Promise> userPromises = promiseRetriever.findPromiseByUserIdAndMeetingId(userId, meetingId);
+        List<Promise> promises;
+
+        if (Boolean.TRUE.equals(isParticipant)) {
+            promises = userPromises;
+        } else if (Boolean.FALSE.equals(isParticipant)) {
+            promises = allPromises.stream()
+                    .filter(promise -> !userPromises.contains(promise))
+                    .collect(Collectors.toList());
+        } else {
+            promises = allPromises;
+        }
+
         return PromisesDto.of(promises, done);
     }
 
     @Transactional(readOnly = true)
-    public PromiseDto getPromise(
+    public PromiseDetailDto getPromise(
+            final Long userId,
             final Long promiseId
     ) {
         Promise promise = promiseRetriever.findById(promiseId);
-        return PromiseDto.from(promise);
+        Promise userPromise = promiseRetriever.findByUserIdAndPromiseId(userId, promiseId);
+
+        boolean isParticipant = userPromise != null;
+
+        return PromiseDetailDto.from(promise, isParticipant);
     }
 
     @Transactional(readOnly = true)