feat: 기록 상세 API 응답 수정 (#94)

depromeet · Jul 31, 2024 · afac4e3 · afac4e3
1 parent 9d10d89
commit afac4e3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/module-domain/src/main/java/com/depromeet/image/service/ImageUploadService.java b/module-domain/src/main/java/com/depromeet/image/service/ImageUploadService.java
@@ -79,7 +79,7 @@ private ImagePresignedUrlVo getImageUploadResponseDto(
 
     @Override
     public void changeImageStatusAndAddMemoryIdToImages(Memory memory, List<Long> imageIds) {
-        if (imageIds.isEmpty()) return;
+        if (imageIds == null || imageIds.isEmpty()) return;
         List<Image> images = imagePersistencePort.findImageByIds(imageIds);
         for (Image image : images) {
             image.addMemoryToImage(memory);

diff --git a/...re/persistence-database/src/main/java/com/depromeet/image/repository/ImageRepository.java b/...re/persistence-database/src/main/java/com/depromeet/image/repository/ImageRepository.java
@@ -78,8 +78,6 @@ public List<Image> findImageByIds(List<Long> ids) {
         List<ImageEntity> imageEntities =
                 queryFactory
                         .selectFrom(imageEntity)
-                        .join(imageEntity.memory, memoryEntity)
-                        .fetchJoin()
                         .where(imageEntity.id.in(ids))
                         .fetch();
 

diff --git a/module-presentation/src/main/java/com/depromeet/image/dto/response/ImageSimpleResponse.java b/module-presentation/src/main/java/com/depromeet/image/dto/response/ImageSimpleResponse.java
@@ -0,0 +1,17 @@
+package com.depromeet.image.dto.response;
+
+import com.depromeet.image.domain.Image;
+import lombok.Builder;
+
+public record ImageSimpleResponse(Long imageId, String imageName, String url) {
+    @Builder
+    public ImageSimpleResponse {}
+
+    public static ImageSimpleResponse of(Image image) {
+        return ImageSimpleResponse.builder()
+                .imageId(image.getId())
+                .imageName(image.getImageName())
+                .url(image.getImageUrl())
+                .build();
+    }
+}
diff --git a/...le-presentation/src/main/java/com/depromeet/memory/dto/response/MemoryDetailResponse.java b/...le-presentation/src/main/java/com/depromeet/memory/dto/response/MemoryDetailResponse.java
@@ -7,13 +7,12 @@
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record MemoryDetailResponse(
-        Long memoryDetailId, String item, Short heartRate, LocalTime pace, Integer kcal) {
+        String item, Short heartRate, LocalTime pace, Integer kcal) {
     @Builder
     public MemoryDetailResponse {}
 
     public static MemoryDetailResponse of(MemoryDetail memoryDetail) {
         return MemoryDetailResponse.builder()
-                .memoryDetailId(memoryDetail.getId())
                 .item(memoryDetail.getItem())
                 .heartRate(memoryDetail.getHeartRate())
                 .pace(memoryDetail.getPace())

diff --git a/module-presentation/src/main/java/com/depromeet/memory/dto/response/MemoryResponse.java b/module-presentation/src/main/java/com/depromeet/memory/dto/response/MemoryResponse.java
@@ -2,6 +2,7 @@
 
 import com.depromeet.image.domain.Image;
 import com.depromeet.image.dto.response.ImageResponse;
+import com.depromeet.image.dto.response.ImageSimpleResponse;
 import com.depromeet.member.dto.response.MemberSimpleResponse;
 import com.depromeet.memory.domain.Memory;
 import com.depromeet.memory.domain.MemoryDetail;
@@ -24,7 +25,7 @@ public class MemoryResponse {
     private Pool pool;
     private MemoryDetailResponse memoryDetail;
     private List<StrokeResponse> strokes;
-    private List<ImageResponse> images;
+    private List<ImageSimpleResponse> images;
     private LocalDate recordAt;
     private LocalTime startTime;
     private LocalTime endTime;
@@ -86,8 +87,8 @@ private static LocalTime getDuration(LocalTime startTime, LocalTime endTime) {
                 0);
     }
 
-    private static List<ImageResponse> getImageSource(List<Image> images) {
-        return images.stream().map(ImageResponse::of).toList();
+    private static List<ImageSimpleResponse> getImageSource(List<Image> images) {
+        return images.stream().map(ImageSimpleResponse::of).toList();
     }
 
     private static List<StrokeResponse> getResultStrokes(List<Stroke> strokes, Short lane) {