Merge pull request #28 from Central-MakeUs/14-필터를-조회한다

Feat(#27): 필터 상세 조회 시 원본 사진 추가
Central-MakeUs · Aug 5, 2024 · bb0560e · bb0560e
2 parents 42ded66 + f56dfd9
commit bb0560e
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 10 deletions.
diff --git a/purithm/src/main/java/com/example/purithm/domain/filter/controller/FilterController.java b/purithm/src/main/java/com/example/purithm/domain/filter/controller/FilterController.java
@@ -1,10 +1,10 @@
 package com.example.purithm.domain.filter.controller;
 
-import com.example.purithm.domain.filter.dto.response.AOSFilterDetailDto;
+import com.example.purithm.domain.filter.dto.response.filterDetailValue.AOSFilterDetailDto;
 import com.example.purithm.domain.filter.dto.response.FilterDetailDto;
 import com.example.purithm.domain.filter.dto.response.FilterListDto;
 import com.example.purithm.domain.filter.dto.response.FilterReviewDto;
-import com.example.purithm.domain.filter.dto.response.IOSFilterDetailDto;
+import com.example.purithm.domain.filter.dto.response.filterDetailValue.IOSFilterDetailDto;
 import com.example.purithm.domain.filter.entity.OS;
 import com.example.purithm.domain.filter.service.FilterService;
 import com.example.purithm.global.response.SuccessResponse;

diff --git a/purithm/src/main/java/com/example/purithm/domain/filter/controller/FilterControllerDocs.java b/purithm/src/main/java/com/example/purithm/domain/filter/controller/FilterControllerDocs.java
@@ -1,10 +1,10 @@
 package com.example.purithm.domain.filter.controller;
 
-import com.example.purithm.domain.filter.dto.response.AOSFilterDetailDto;
+import com.example.purithm.domain.filter.dto.response.filterDetailValue.AOSFilterDetailDto;
 import com.example.purithm.domain.filter.dto.response.FilterDetailDto;
 import com.example.purithm.domain.filter.dto.response.FilterListDto;
 import com.example.purithm.domain.filter.dto.response.FilterReviewDto;
-import com.example.purithm.domain.filter.dto.response.IOSFilterDetailDto;
+import com.example.purithm.domain.filter.dto.response.filterDetailValue.IOSFilterDetailDto;
 import com.example.purithm.domain.filter.entity.OS;
 import com.example.purithm.global.auth.annotation.LoginInfo;
 import com.example.purithm.global.response.SuccessResponse;

diff --git a/purithm/src/main/java/com/example/purithm/domain/filter/dto/response/FilterDetailDto.java b/purithm/src/main/java/com/example/purithm/domain/filter/dto/response/FilterDetailDto.java
@@ -17,7 +17,7 @@ public class FilterDetailDto {
     @Schema(description = "퓨어 지수")
     int pureDegree;
     @Schema(description = "필터 사진")
-    List<String> pictures;
+    List<FilterPictureDto> pictures;
     @Schema(description = "좋아요 여부")
     boolean liked;
 }
diff --git a/purithm/src/main/java/com/example/purithm/domain/filter/dto/response/FilterPictureDto.java b/purithm/src/main/java/com/example/purithm/domain/filter/dto/response/FilterPictureDto.java
@@ -0,0 +1,13 @@
+package com.example.purithm.domain.filter.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+
+@Builder
+public record FilterPictureDto(
+	@Schema(description = "보정 사진")
+	String picture,
+	@Schema(description = "원본 사진")
+	String originalPicture
+) {
+}
diff --git a/...lter/dto/response/AOSFilterDetailDto.java → ...filterDetailValue/AOSFilterDetailDto.java b/...lter/dto/response/AOSFilterDetailDto.java → ...filterDetailValue/AOSFilterDetailDto.java
@@ -1,4 +1,4 @@
-package com.example.purithm.domain.filter.dto.response;
+package com.example.purithm.domain.filter.dto.response.filterDetailValue;
 
 import com.example.purithm.domain.filter.entity.AOSFilterDetail;
 

diff --git a/...lter/dto/response/IOSFilterDetailDto.java → ...filterDetailValue/IOSFilterDetailDto.java b/...lter/dto/response/IOSFilterDetailDto.java → ...filterDetailValue/IOSFilterDetailDto.java
@@ -1,4 +1,4 @@
-package com.example.purithm.domain.filter.dto.response;
+package com.example.purithm.domain.filter.dto.response.filterDetailValue;
 
 import com.example.purithm.domain.filter.entity.IOSFilterDetail;
 

diff --git a/purithm/src/main/java/com/example/purithm/domain/filter/entity/Filter.java b/purithm/src/main/java/com/example/purithm/domain/filter/entity/Filter.java
@@ -27,20 +27,33 @@ public class Filter {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
+
   private String name;
+
   private String thumbnail;
+
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "photographer_id", nullable = false)
   private Photographer photographer;
+
   private int likes;
+
   private int price;
+
   @Temporal(TemporalType.TIMESTAMP)
   @CreatedDate
   @Column(updatable = false)
   private Date createdAt;
+
   int pureDegree;
+
   @Convert(converter = StringListConverter.class)
   private List<String> pictures;
+
+  @Convert(converter = StringListConverter.class)
+  private List<String> originalPictures;
+
   private Membership membership;
+
   private OS os;
 }
diff --git a/purithm/src/main/java/com/example/purithm/domain/filter/service/FilterService.java b/purithm/src/main/java/com/example/purithm/domain/filter/service/FilterService.java
@@ -1,5 +1,6 @@
 package com.example.purithm.domain.filter.service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.data.domain.Page;
@@ -8,12 +9,13 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.example.purithm.domain.filter.dto.response.AOSFilterDetailDto;
+import com.example.purithm.domain.filter.dto.response.FilterPictureDto;
+import com.example.purithm.domain.filter.dto.response.filterDetailValue.AOSFilterDetailDto;
 import com.example.purithm.domain.filter.dto.response.FilterDetailDto;
 import com.example.purithm.domain.filter.dto.response.FilterDto;
 import com.example.purithm.domain.filter.dto.response.FilterListDto;
 import com.example.purithm.domain.filter.dto.response.FilterReviewDto;
-import com.example.purithm.domain.filter.dto.response.IOSFilterDetailDto;
+import com.example.purithm.domain.filter.dto.response.filterDetailValue.IOSFilterDetailDto;
 import com.example.purithm.domain.filter.dto.response.ReviewDto;
 import com.example.purithm.domain.filter.entity.AOSFilterDetail;
 import com.example.purithm.domain.filter.entity.Filter;
@@ -88,11 +90,21 @@ public FilterDetailDto getFilterDetail(Long id, Long filterId) {
 		Filter filter = filterRepository.findById(filterId)
 			.orElseThrow(() -> CustomException.of(Error.NOT_FOUND_ERROR));
 
+		List<String> pictures = filter.getPictures();
+		List<String> originalPictures = filter.getOriginalPictures();
+		List<FilterPictureDto> filters = new ArrayList<>();
+
+		for (int i=0; i< pictures.size(); i++) {
+			filters.add(FilterPictureDto.builder()
+				.picture(pictures.get(i))
+				.originalPicture(originalPictures.get(i)).build());
+		}
+
 		return FilterDetailDto.builder()
 			.name(filter.getName())
 			.likes(filter.getLikes())
 			.pureDegree(filter.getPureDegree())
-			.pictures(filter.getPictures())
+			.pictures(filters)
 			.liked(isLike(filterId, id))
 			.build();
 	}