Merge pull request #54 from MEME-UMC/refactor/#53

[Refactor/#53] Service 조회 API 성능 개선

Author: daeun084

MEME-DOMAIN/src/main/java/org/meme/domain/entity/Artist.java

@@ -55,16 +55,5 @@ public void updatePortfolioList(Portfolio portfolio){
         this.portfolioList.add(portfolio);
     }
 
-
-//    public void tempMethod(){
-//        this.username = "name";
-//        this.email="";
-//        this.password="";
-//        this.workExperience=WorkExperience.FIVE;
-//        this.role="ARTIST";
-//        this.userStatus = UserStatus.ACTIVE;
-//        this.provider = Provider.KAKAO;
-//        this.details = false;
-//    }
 }
 

MEME-DOMAIN/src/main/java/org/meme/domain/entity/Model.java

@@ -42,39 +42,4 @@ public class Model extends User {
     @OneToMany(mappedBy = "model")
     private List<Reservation> reservations;
 
-    public void updateFavoriteArtistList(FavoriteArtist artist){
-        this.favoriteArtistList.add(artist);
-    }
-
-    public void updateFavoritePortfolioList(FavoritePortfolio portfolio){
-        this.favoritePortfolioList.add(portfolio);
-    }
-    public void updateReservationList(Reservation reservation){
-        this.reservationList.add(reservation);
-    }
-
-    public void updateReviewList(Review review){
-        this.reviewList.add(review);
-    }
-
-
-    //temp create model builder
-//    public static Model from(ModelProfileDto dto){
-//        return Model.builder()
-//                .profileImg(dto.getProfileImg())
-//                .nickname(dto.getNickname())
-//                .gender(dto.getGender())
-//                .skinType(dto.getSkinType())
-//                .personalColor(dto.getPersonalColor())
-//                .build();
-//    }
-
-//    public void tempMethod(){
-//        this.username = "name";
-//        this.email="";
-//        this.password="";
-//        this.role="MODEL";
-//        this.userStatus = UserStatus.ACTIVE;
-//        this.provider = Provider.KAKAO;
-//    }
 }

MEME-DOMAIN/src/main/java/org/meme/domain/entity/User.java

@@ -73,24 +73,4 @@ public class User {
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
     protected List<Inquiry> inquiryList;
-
-    public boolean getDetails() {
-        return details;
-    }
-
-    public void updateInquiryList(Inquiry inquiry){
-        this.inquiryList.add(inquiry);
-    }
-
-    public void updateProfileImg(String profileimg){
-        this.profileImg = profileimg;
-    }
-
-    public void updateNickname(String nickname){
-        this.nickname = nickname;
-    }
-
-    public void updateGender(Gender gender){
-        this.gender = gender;
-    }
 }

MEME-SERVICE/src/main/java/org/meme/service/common/status/ErrorStatus.java

@@ -19,6 +19,8 @@ public enum ErrorStatus implements BaseErrorCode {
      * Code : 400
      * Bad Request
      */
+    OVERFLOW_ARTIST_INTRODUCTION(HttpStatus.BAD_REQUEST, 400, "아티스트의 소개글은 500자 이하여야 합니다."),
+
     INVALID_REQUEST(HttpStatus.BAD_REQUEST, 400,  "유효하지 않은 요청입니다."),
     ALREADY_EXIST_FAVORITE_ARTIST(HttpStatus.BAD_REQUEST, 400, "해당 아티스트는 이미 관심 아티스트로 등록되어있습니다."),
     ALREADY_EXIST_FAVORITE_PORTFOLIO(HttpStatus.BAD_REQUEST, 400, "해당 포트폴리오는 이미 관심 포트폴리오로 등록되어있습니다."),

MEME-SERVICE/src/main/java/org/meme/service/domain/converter/ArtistConverter.java

@@ -33,12 +33,14 @@ public static ArtistResponse.ArtistDto toArtistDto(Artist artist, boolean isFavo
     }
 
     public static ArtistResponse.ArtistSimpleDto toArtistSimpleDto(Artist artist, Long modelCount) {
+         String region = artist.getRegion().isEmpty() ? null : artist.getRegion().get(0).getValue();
+
         return ArtistResponse.ArtistSimpleDto.builder()
                 .artistId(artist.getUserId())
                 .profileImg(artist.getUser().getProfileImg())
                 .artistNickName(artist.getUser().getNickname())
                 .email(artist.getUser().getEmail())
-                .region(artist.getRegion().get(0).getValue())
+                .region(region)
                 .modelCount(modelCount)
                 .build();
     }

MEME-SERVICE/src/main/java/org/meme/service/domain/converter/PortfolioConverter.java

@@ -21,6 +21,7 @@ public static Portfolio toPortfolio(Artist artist, PortfolioRequest.CreatePortfo
                 .price(dto.getPrice())
                 .portfolioImgList(new ArrayList<PortfolioImg>())
                 .averageStars("0.00")
+                .reviewCount(0L)
                 .durationTime(dto.getDurationTime())
                 .isBlock(false)
                 .build();
@@ -48,7 +49,7 @@ public static PortfolioResponse.PortfolioDto toPortfolioDto(Portfolio portfolio)
                 .isBlock(portfolio.isBlock())
                 .portfolioImgDtoList(portfolioImgDtoList)
                 .averageStars(portfolio.getAverageStars())
-                .reviewCount(portfolio.getReviewList().size())
+                .reviewCount(portfolio.getReviewCount())
                 .build();
     }
 
@@ -77,7 +78,7 @@ public static PortfolioResponse.PortfolioDetailDto toPortfolioDetailDto(Portfoli
                     .isBlock(portfolio.isBlock())
                     .portfolioImgDtoList(portfolioImgDtoList)
                     .averageStars(portfolio.getAverageStars())
-                    .reviewCount(portfolio.getReviewList().size())
+                    .reviewCount(portfolio.getReviewCount())
                     .durationTime(portfolio.getDurationTime())
                     .build();
     }
@@ -128,18 +129,6 @@ public static PortfolioResponse.PortfolioSimpleDto toPortfolioSimpleDto(Portfoli
 
     public static PortfolioResponse.PortfolioSimpleDto toPortfolioSimpleDto(FavoritePortfolio favoritePortfolio){
         Portfolio portfolio = favoritePortfolio.getPortfolio();
-        Artist artist = portfolio.getArtist();
-
-        return PortfolioResponse.PortfolioSimpleDto.builder()
-                .portfolioId(portfolio.getPortfolioId())
-                .portfolioImg(portfolio.getPortfolioImgList().get(0).getSrc())
-                .category(portfolio.getCategory())
-                .makeupName(portfolio.getMakeupName())
-                .artistName(artist.getUser().getNickname())
-                .artistEmail(artist.getUser().getEmail())
-                .price(portfolio.getPrice())
-                .makeupLocation(artist.getMakeupLocation())
-                .averageStars(portfolio.getAverageStars())
-                .build();
+        return toPortfolioSimpleDto(portfolio);
     }
 }

MEME-SERVICE/src/main/java/org/meme/service/domain/dto/response/PortfolioResponse.java

@@ -29,7 +29,7 @@ public static class PortfolioDto {
         private List<Region> region; //활동 가능 지역
         private Boolean isBlock;
         private String averageStars;
-        private int reviewCount; //리뷰 개수
+        private Long reviewCount; //리뷰 개수
         private List<PortfolioImgDto> portfolioImgDtoList;
     }
 
@@ -51,7 +51,7 @@ public static class PortfolioDetailDto{
         private List<Region> region; //활동 가능 지역
         private Boolean isBlock;
         private String averageStars;
-        private int reviewCount; //리뷰 개수
+        private Long reviewCount; //리뷰 개수
         private String durationTime; //소요 시간
         private List<PortfolioImgDto> portfolioImgDtoList;
     }

MEME-SERVICE/src/main/java/org/meme/service/domain/entity/Artist.java

@@ -4,17 +4,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.SuperBuilder;
-import org.meme.service.domain.entity.Portfolio;
 import org.meme.service.domain.enums.*;
 
 import java.util.List;
 
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Getter @Setter
+@Getter
 @Entity
 public class Artist {
 
@@ -63,15 +60,40 @@ public void updatePortfolioList(Portfolio portfolio){
         this.portfolioList.add(portfolio);
     }
 
-    public void updateProfileImg(String profileimg){
-        this.user.updateProfileImg(profileimg);
+    public void updateIntroduction(String introduction) {
+        if (!introduction.isEmpty()) {
+            this.introduction = introduction;
+        }
     }
 
-    public void updateNickname(String nickname){
-        this.user.updateNickname(nickname);
+    public void updateWorkExperience(WorkExperience workExperience) {
+        if (workExperience != null) {
+            this.workExperience = workExperience;
+        }
     }
 
-    public void updateGender(Gender gender){
-        this.user.updateGender(gender);
+    public void updateRegion(List<Region> region) {
+        if (!region.isEmpty()) {
+            this.region = region;
+        }
     }
+
+    public void updateSpecialization(List<Category> specialization) {
+        if (!specialization.isEmpty()) {
+            this.specialization = specialization;
+        }
+    }
+
+    public void updateMakeupLocation(MakeupLocation makeupLocation) {
+        if (makeupLocation != null) {
+            this.makeupLocation = makeupLocation;
+        }
+    }
+
+    public void updateShopLocation(String shopLocation) {
+        if (!shopLocation.isEmpty()) {
+            this.shopLocation = shopLocation;
+        }
+    }
+
 }

MEME-SERVICE/src/main/java/org/meme/service/domain/entity/FavoriteArtist.java

@@ -19,10 +19,11 @@ public class FavoriteArtist extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long favoriteArtistId;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="user_id", nullable = false)
     private Model model;
 
+    // TODO:
     @OneToOne
     private Artist artist;
 

MEME-SERVICE/src/main/java/org/meme/service/domain/entity/FavoritePortfolio.java

@@ -21,11 +21,11 @@ public class FavoritePortfolio extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long favoritePortfolioId;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="user_id", nullable = false)
     private Model model;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="portfolio_id", nullable = false)
     private Portfolio portfolio;
 

MEME-SERVICE/src/main/java/org/meme/service/domain/entity/Inquiry.java

@@ -28,7 +28,7 @@ public class Inquiry extends BaseEntity {
     @Column(nullable = false)
     private String email;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 

MEME-SERVICE/src/main/java/org/meme/service/domain/entity/Model.java

@@ -4,15 +4,12 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.meme.service.domain.entity.*;
-import org.meme.service.domain.enums.Gender;
 import org.meme.service.domain.enums.PersonalColor;
 import org.meme.service.domain.enums.SkinType;
 
 import java.util.List;
 
-@Getter @Setter
+@Getter
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
@@ -58,16 +55,14 @@ public void updateReviewList(Review review){
         this.reviewList.add(review);
     }
 
-    public void updateProfileImg(String profileimg){
-        this.user.updateProfileImg(profileimg);
+    public void updateSkinType(SkinType skinType) {
+        if (skinType != null)
+            this.skinType = skinType;
     }
 
-    public void updateNickname(String nickname){
-        this.user.updateNickname(nickname);
+    public void updatePersonalColor(PersonalColor personalColor) {
+        if (personalColor != null) {
+            this.personalColor = personalColor;
+        }
     }
-
-    public void updateGender(Gender gender){
-        this.user.updateGender(gender);
-    }
-
 }