Merge pull request #117 from sumbisori/release/1.11.1

release: 1.11.1

Author: junest66

src/main/java/com/groom/sumbisori/common/config/CloudfrontConfig.java

@@ -0,0 +1,19 @@
+package com.groom.sumbisori.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "cloud.aws.cloudfront")
+public class CloudfrontConfig {
+
+    private String domain;
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+}

src/main/java/com/groom/sumbisori/domain/place/dto/FacilityItem.java

@@ -6,10 +6,10 @@ public record FacilityItem(
         String title,
         String iconUrl
 ) {
-    public static FacilityItem from(PlaceDescription placeDescription) {
+    public static FacilityItem from(PlaceDescription placeDescription, String cloudfrontDomain) {
         return new FacilityItem(
                 placeDescription.getTitle(),
-                placeDescription.getIcon().getUrl()
+                cloudfrontDomain + placeDescription.getIcon().getUrl()
         );
     }
 }

src/main/java/com/groom/sumbisori/domain/place/dto/InquiryItem.java

@@ -7,11 +7,11 @@ public record InquiryItem(
         String content,
         String iconUrl
 ) {
-    public static InquiryItem from(PlaceDescription placeDescription) {
+    public static InquiryItem from(PlaceDescription placeDescription, String cloudfrontDomain) {
         return new InquiryItem(
                 placeDescription.getTitle(),
                 placeDescription.getContent(),
-                placeDescription.getIcon().getUrl()
+                cloudfrontDomain + placeDescription.getIcon().getUrl()
         );
     }
 }

src/main/java/com/groom/sumbisori/domain/place/dto/OperationInfoItem.java

@@ -8,12 +8,12 @@ public record OperationInfoItem(
         String description,
         String iconUrl
 ) {
-    public static OperationInfoItem from(PlaceDescription placeDescription) {
+    public static OperationInfoItem from(PlaceDescription placeDescription, String cloudfrontDomain) {
         return new OperationInfoItem(
                 placeDescription.getTitle(),
                 placeDescription.getContent(),
                 placeDescription.getDescription(),
-                placeDescription.getIcon().getUrl()
+                cloudfrontDomain + placeDescription.getIcon().getUrl()
         );
     }
 }

src/main/java/com/groom/sumbisori/domain/place/dto/PlaceDescriptionResponse.java

@@ -11,16 +11,16 @@ public record PlaceDescriptionResponse(
         List<FacilityItem> facilities,
         List<InquiryItem> inquiries
 ) {
-    public static PlaceDescriptionResponse from(List<PlaceDescription> descriptions) {
+    public static PlaceDescriptionResponse from(List<PlaceDescription> descriptions, String cloudfrontDomain) {
         Map<Type, List<PlaceDescription>> grouped = descriptions.stream()
                 .collect(Collectors.groupingBy(PlaceDescription::getType));
 
         return new PlaceDescriptionResponse(
                 grouped.getOrDefault(Type.INFO, List.of()).stream()
-                        .map(OperationInfoItem::from).toList(),
+                        .map(desc -> OperationInfoItem.from(desc, cloudfrontDomain)).toList(),
                 grouped.getOrDefault(Type.FACILITY, List.of()).stream()
-                        .map(FacilityItem::from).toList(),
+                        .map(desc -> FacilityItem.from(desc, cloudfrontDomain)).toList(),
                 grouped.getOrDefault(Type.INQUIRY, List.of()).stream()
-                        .map(InquiryItem::from).toList());
+                        .map(desc -> InquiryItem.from(desc, cloudfrontDomain)).toList());
     }
 }

src/main/java/com/groom/sumbisori/domain/place/dto/PlaceResponse.java

@@ -6,15 +6,15 @@ public record PlaceResponse(Long placeId, String name, String address,
                             int minPrice, int maxPrice, PlaceDescriptionResponse details, String imageUrl,
                             double latitude, double longitude, String phoneNumber,
                             String link, String reservationLink) {
-    public static PlaceResponse from(Place place) {
+    public static PlaceResponse from(Place place, String cloudfrontDomain) {
         return new PlaceResponse(
                 place.getId(),
                 place.getName(),
                 place.getAddress(),
                 place.getMinPrice(),
                 place.getMaxPrice(),
-                PlaceDescriptionResponse.from(place.getDescriptions()),
-                place.getImageUrl(),
+                PlaceDescriptionResponse.from(place.getDescriptions(), cloudfrontDomain),
+                cloudfrontDomain + place.getImageUrl(),
                 place.getLatitude(),
                 place.getLongitude(),
                 place.getPhoneNumber(),

src/main/java/com/groom/sumbisori/domain/place/dto/SimplePlaceResponse.java

@@ -5,12 +5,12 @@
 public record SimplePlaceResponse(Long placeId, String name, String city, String imageUrl) {
     private static final int CITY_INDEX = 1;
 
-    public static SimplePlaceResponse from(Place place) {
+    public static SimplePlaceResponse from(Place place, String cloudfrontDomain) {
         return new SimplePlaceResponse(
                 place.getId(),
                 place.getName(),
                 getCityFromAddress(place.getAddress()),
-                place.getImageUrl()
+                cloudfrontDomain + place.getImageUrl()
         );
     }
 

src/main/java/com/groom/sumbisori/domain/place/service/PlaceService.java

@@ -1,5 +1,6 @@
 package com.groom.sumbisori.domain.place.service;
 
+import com.groom.sumbisori.common.config.CloudfrontConfig;
 import com.groom.sumbisori.domain.place.dto.PlaceLocationResponse;
 import com.groom.sumbisori.domain.place.dto.PlaceResponse;
 import com.groom.sumbisori.domain.place.dto.SimplePlaceResponse;
@@ -20,19 +21,20 @@
 public class PlaceService {
     private final PlaceRepository placeRepository;
     private final PlaceQueryRepository placeQueryRepository;
+    private final CloudfrontConfig cloudfrontConfig;
 
     @Cacheable(cacheNames = "places")
     public List<SimplePlaceResponse> getAllPlaces() {
         return placeQueryRepository.findAll().stream()
-                .map(place -> SimplePlaceResponse.from(place))
+                .map(place -> SimplePlaceResponse.from(place, cloudfrontConfig.getDomain()))
                 .toList();
     }
 
     @Cacheable(cacheNames = "placeDetails", key = "#placeId")
     public PlaceResponse getPlaceById(Long placeId) {
         Place place = placeQueryRepository.findById(placeId)
                 .orElseThrow(() -> new PlaceException(PlaceErrorcode.PLACE_NOT_FOUND));
-        return PlaceResponse.from(place);
+        return PlaceResponse.from(place, cloudfrontConfig.getDomain());
     }
 
     @Cacheable(cacheNames = "placeLocations")

src/main/resources/db/migration/V33__alter_place_image_cloudfront.sql

@@ -0,0 +1,7 @@
+UPDATE place
+SET image_url = REPLACE(image_url, 'https://d35m5peyvblzpd.cloudfront.net', '')
+WHERE image_url LIKE 'https://d35m5peyvblzpd.cloudfront.net/%';
+
+UPDATE icon
+SET url = REPLACE(url, 'https://d35m5peyvblzpd.cloudfront.net', '')
+WHERE url LIKE 'https://d35m5peyvblzpd.cloudfront.net/%';