#201 fix:관리자 경험 선물 등록, 수정 api 변경 / thumnail컬럼 삭제

ShallWeProject · Jan 6, 2024 · 8030426 · 8030426
1 parent ca65d57
commit 8030426
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 69 deletions.
diff --git a/src/main/java/com/shallwe/domain/experiencegift/application/ExperienceGiftServiceImpl.java b/src/main/java/com/shallwe/domain/experiencegift/application/ExperienceGiftServiceImpl.java
@@ -77,26 +77,14 @@ public void registerExperienceGift(UserPrincipal userPrincipal, ShopOwnerExperie
                 .orElseGet(() -> subtitleRepository.save(new Subtitle(shopOwnerExperienceReq.getSubtitle())));
 
         ExperienceCategory experienceCategory = null;
-        SituationCategory situationCategory = null;
 
         // 경험 카테고리가 주어졌는지 확인하고 처리
         if (StringUtils.hasText(shopOwnerExperienceReq.getExpCategory())) {
             experienceCategory = experienceCategoryRepository.findByExpCategory(shopOwnerExperienceReq.getExpCategory())
                     .orElseThrow(ExpCategoryAlreadyExist::new);
         }
 
-        // 상황 카테고리가 주어졌는지 확인하고 처리
-        if (StringUtils.hasText(shopOwnerExperienceReq.getSttCategory())) {
-            situationCategory = situationCategoryRepository.findBySttCategory(shopOwnerExperienceReq.getSttCategory())
-                    .orElseThrow(SttCategoryAlreadyExist::new);
-        }
-
-        // 두 카테고리가 동시에 주어진 경우 오류 처리
-        if (experienceCategory != null && situationCategory != null) {
-            throw new ChooseOnlyOneCategory();
-        }
-
-        ExperienceGift experienceGift = experienceGiftRepository.save(ExperienceGift.toDto(shopOwnerExperienceReq, subtitle, experienceCategory, situationCategory, shopOwner));
+        ExperienceGift experienceGift = experienceGiftRepository.save(ExperienceGift.toDto(shopOwnerExperienceReq, subtitle, experienceCategory, shopOwner));
 
         List<Explanation> explanations = shopOwnerExperienceReq.getExplanation().stream()
                 .map(explanationReq -> Explanation.toDto(explanationReq, experienceGift))
@@ -155,21 +143,14 @@ public void modifyExperienceGift(Long experienceGiftId, UserPrincipal userPrinci
 
 
         ExperienceCategory experienceCategory = null;
-        SituationCategory situationCategory = null;
 
         // 경험 카테고리가 주어졌는지 확인하고 처리
         if (StringUtils.hasText(shopOwnerExperienceReq.getExpCategory())) {
             experienceCategory = experienceCategoryRepository.findByExpCategory(shopOwnerExperienceReq.getExpCategory())
                     .orElseThrow(ExpCategoryAlreadyExist::new);
         }
 
-        // 상황 카테고리가 주어졌는지 확인하고 처리
-        if (StringUtils.hasText(shopOwnerExperienceReq.getSttCategory())) {
-            situationCategory = situationCategoryRepository.findBySttCategory(shopOwnerExperienceReq.getSttCategory())
-                    .orElseThrow(SttCategoryAlreadyExist::new);
-        }
-
-        experienceGift.update(shopOwnerExperienceReq, subtitle, experienceCategory, situationCategory, shopOwner);
+        experienceGift.update(shopOwnerExperienceReq, subtitle, experienceCategory, shopOwner);
 
         if (shopOwnerExperienceReq.getExplanation() != null && !shopOwnerExperienceReq.getExplanation().isEmpty()) {
             explanationRepository.deleteByExperienceGift(experienceGift);

diff --git a/src/main/java/com/shallwe/domain/experiencegift/domain/ExperienceGift.java b/src/main/java/com/shallwe/domain/experiencegift/domain/ExperienceGift.java
@@ -25,8 +25,6 @@ public class ExperienceGift extends BaseEntity {
     @JoinColumn(name = "subtitle_id")
     private Subtitle subtitle;
 
-    private String thumbnail;
-
     private Long price;
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -52,36 +50,34 @@ public class ExperienceGift extends BaseEntity {
     @OneToMany(mappedBy = "experienceGift")
     private List<ExperienceGiftImage> imgList = new ArrayList<>();
 
-    public static ExperienceGift toDto(ShopOwnerExperienceReq req, Subtitle subtitle, ExperienceCategory experienceCategory, SituationCategory situationCategory, ShopOwner shopOwner) {
+    public static ExperienceGift toDto(ShopOwnerExperienceReq req, Subtitle subtitle, ExperienceCategory experienceCategory, ShopOwner shopOwner) {
         return ExperienceGift.builder()
                 .title(req.getTitle())
                 .subtitle(subtitle)
                 .price(req.getPrice())
                 .experienceCategory(experienceCategory)
-                .situationCategory(situationCategory)
                 .description(req.getDescription())
                 .shopOwner(shopOwner)
                 .location(req.getLocation())
                 .note(req.getNote())
                 .build();
     }
 
-    public void update(ShopOwnerExperienceReq shopOwnerExperienceReq, Subtitle subtitle, ExperienceCategory experienceCategory, SituationCategory situationCategory, ShopOwner shopOwner) {
+    public void update(ShopOwnerExperienceReq shopOwnerExperienceReq, Subtitle subtitle, ExperienceCategory experienceCategory, ShopOwner shopOwner) {
         this.title = shopOwnerExperienceReq.getTitle();
         this.description = shopOwnerExperienceReq.getDescription();
         this.location = shopOwnerExperienceReq.getLocation();
         this.price = shopOwnerExperienceReq.getPrice();
         this.subtitle = subtitle;
         this.experienceCategory = experienceCategory;
-        this.situationCategory = situationCategory;
         this.shopOwner = shopOwner;
+        this.note=shopOwnerExperienceReq.getNote();
     }
 
     @Builder
-    public ExperienceGift(String title, Subtitle subtitle, String thumbnail, Long price, ExperienceCategory experienceCategory, SituationCategory situationCategory, String description, String giftImgKey, ShopOwner shopOwner, String location, String note, List<ExperienceGiftImage> imgList) {
+    public ExperienceGift(String title, Subtitle subtitle, Long price, ExperienceCategory experienceCategory, SituationCategory situationCategory, String description, String giftImgKey, ShopOwner shopOwner, String location, String note, List<ExperienceGiftImage> imgList) {
         this.title = title;
         this.subtitle = subtitle;
-        this.thumbnail = thumbnail;
         this.price = price;
         this.experienceCategory = experienceCategory;
         this.situationCategory = situationCategory;

diff --git a/src/main/java/com/shallwe/domain/experiencegift/dto/request/ExperienceReq.java b/src/main/java/com/shallwe/domain/experiencegift/dto/request/ExperienceReq.java
diff --git a/src/main/java/com/shallwe/domain/experiencegift/dto/request/ShopOwnerExperienceReq.java b/src/main/java/com/shallwe/domain/experiencegift/dto/request/ShopOwnerExperienceReq.java
@@ -22,9 +22,6 @@ public class ShopOwnerExperienceReq {
     @Schema(type = "String", description = "경험 카테고리")
     private String expCategory;
 
-    @Schema(type = "String", description = "상황 카테고리")
-    private String sttCategory;
-
     @Schema(type = "String", description = "상품명", maxLength = 100)
     @NotBlank(message = "상품명은 필수 입력 값입니다.")
     private String title;

diff --git a/src/main/java/com/shallwe/domain/experiencegift/dto/response/ExperienceRes.java b/src/main/java/com/shallwe/domain/experiencegift/dto/response/ExperienceRes.java
@@ -15,7 +15,6 @@
 public class ExperienceRes {
 
     private Long ExperienceGiftId;
-    private String thumbnail;
     private String subtitle;
     private String title;
     private Long price;
@@ -24,7 +23,6 @@ public class ExperienceRes {
     public static ExperienceRes toDto(ExperienceGift experienceGift, List<String> experienceGiftImgs){
         return ExperienceRes.builder()
                 .ExperienceGiftId(experienceGift.getId())
-                .thumbnail(experienceGift.getThumbnail())
                 .subtitle(experienceGift.getSubtitle().getTitle())
                 .title(experienceGift.getTitle())
                 .price(experienceGift.getPrice())