Merge pull request #74 from cake-way/dev

Dev

Author: jiminnimij

src/main/java/com/example/cake_way/cakeshop/dto/CakeShopCakelogGetResponseDto.java

@@ -20,6 +20,8 @@ public class CakeShopCakelogGetResponseDto {
     private String instagram;
     private boolean isScraped;
     private int scrapCount;
+    private String notice;
+    private String cautions;
 
     private OperatingHoursResponseDto operatingHour;
 
@@ -39,6 +41,8 @@ public static CakeShopCakelogGetResponseDto of(
                 .contact(cakeShop.getContact())
                 .instagram(cakeShop.getInstagram())
                 .scrapCount(cakeShop.getScrapCount())
+                .notice(cakeShop.getNotice())
+                .cautions(cakeShop.getCautions())
                 .operatingHour(operatingHour)
                 .isScraped(isScraped)
                 .build();

src/main/java/com/example/cake_way/cakeshop/dto/CakeShopMenuGetResponseDto.java

@@ -21,6 +21,8 @@ public class CakeShopMenuGetResponseDto {
     private String instagram;
     private boolean isScraped;
     private int scrapCount;
+    private String notice;
+    private String cautions;
 
     private OperatingHoursResponseDto operatingHour;
     private CategoryCakeResponseDto cakes;
@@ -33,6 +35,8 @@ public static CakeShopMenuGetResponseDto of(CakeShop cakeShop, boolean isScraped
                 .contact(cakeShop.getContact())
                 .instagram(cakeShop.getInstagram())
                 .scrapCount(cakeShop.getScrapCount())
+                .notice(cakeShop.getNotice())
+                .cautions(cakeShop.getCautions())
                 .operatingHour(operatingHour)
                 .isScraped(isScraped)
                 .cakes(cakes)

src/main/java/com/example/cake_way/main/dto/HomeCakeResponseDto.java

@@ -35,7 +35,7 @@ public static HomeCakeResponseDto from(CakeShop cakeShop, OperatingHoursResponse
         return HomeCakeResponseDto.builder()
                 .shopId(cakeShop.getShopId())
                 .shopName(cakeShop.getName())
-                .shopImg(cakeShop.getName())
+                .shopImg(cakeShop.getThumbnailImage())
                 .operatingHours(operatingHoursResponseDto)
                 .isSameDay(cakeShop.getIsSameDay())
                 .region(getRegion(cakeShop.getAddress()))