chore: user field 수정

MEME-UMC · Feb 3, 2024 · 8541b02 · 8541b02
1 parent 9a108e9
commit 8541b02
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 14 deletions.
diff --git a/src/main/java/umc/meme/shop/domain/artist/entity/Artist.java b/src/main/java/umc/meme/shop/domain/artist/entity/Artist.java
@@ -101,6 +101,6 @@ public void updatePortfolioList(Portfolio portfolio){
 
     public void tempMethod(String email, String name){
         this.email = email;
-        this.name = name;
+        this.userName = name;
     }
 }
diff --git a/src/main/java/umc/meme/shop/domain/model/service/ModelService.java b/src/main/java/umc/meme/shop/domain/model/service/ModelService.java
@@ -47,7 +47,7 @@ public void createModel(ModelProfileDto dto){
                 .nickname(dto.getNickname())
                 .introduction("")
                 .email("")
-                .name("")
+                .userName("")
                 .gender(dto.getGender())
                 .skinType(dto.getSkinType())
                 .personalColor(dto.getPersonalColor())

diff --git a/src/main/java/umc/meme/shop/domain/mypage/service/MypageService.java b/src/main/java/umc/meme/shop/domain/mypage/service/MypageService.java
@@ -35,7 +35,7 @@ public MypageDetailDto getProfile(Long userId) {
         return MypageDetailDto.builder()
                 .profileImg(user.getProfileImg())
                 .nickname(user.getNickname())
-                .name(user.getName())
+                .name(user.getUserName())
                 .gender(user.getGender())
                 .email(user.getEmail())
                 .build();

diff --git a/src/main/java/umc/meme/shop/domain/portfolio/dto/response/PortfolioDto.java b/src/main/java/umc/meme/shop/domain/portfolio/dto/response/PortfolioDto.java
@@ -22,7 +22,7 @@ public class PortfolioDto {
 
     private Category category;
 
-    private String artistName;
+    private String artistNickName;
 
     private String makeupName;
 
@@ -57,7 +57,7 @@ public static PortfolioDto from(Portfolio portfolio) {
         return PortfolioDto.builder()
                 .portfolioId(portfolio.getPortfolioId())
                 .category(portfolio.getCategory())
-                .artistName(artist.getName())
+                .artistNickName(artist.getNickname())
                 .makeupName(portfolio.getMakeupName())
                 .price(portfolio.getPrice())
                 .info(portfolio.getInfo())

diff --git a/src/main/java/umc/meme/shop/domain/reservation/dto/response/ReservationCompleteDto.java b/src/main/java/umc/meme/shop/domain/reservation/dto/response/ReservationCompleteDto.java
@@ -17,7 +17,7 @@
 @AllArgsConstructor
 public class ReservationCompleteDto {
     private String makeupName;
-    private String artist;
+    private String artistNickName;
     private String location; //장소
     private Date reservationDate; //날짜
     private Map<DayOfWeek, Times> reservationDayOfWeekAndTime; //요일과 시간

diff --git a/src/main/java/umc/meme/shop/domain/reservation/dto/response/ReservationResponseDto.java b/src/main/java/umc/meme/shop/domain/reservation/dto/response/ReservationResponseDto.java
@@ -23,8 +23,8 @@
 public class ReservationResponseDto {
     private Long reservationId ;
     private Long portfolioId;
-    private String modelName;
-    private String artistName;
+    private String modelNickName;
+    private String artistNickName;
     private String makeupName;
     private int price;
 
@@ -43,8 +43,8 @@ public static ReservationResponseDto from(Reservation reservation){
         return ReservationResponseDto.builder()
                 .reservationId(reservation.getReservationId())
                 .portfolioId(portfolio.getPortfolioId())
-                .modelName(reservation.getModel().getName())
-                .artistName(artist.getName())
+                .modelNickName(reservation.getModel().getNickname())
+                .artistNickName(artist.getNickname())
                 .makeupName(portfolio.getMakeupName())
                 .price(portfolio.getPrice())
                 .reservationDayOfWeekAndTime(reservation.getReservationDayOfWeekAndTime())

diff --git a/src/main/java/umc/meme/shop/domain/reservation/service/ReservationService.java b/src/main/java/umc/meme/shop/domain/reservation/service/ReservationService.java
@@ -102,7 +102,7 @@ public ReservationCompleteDto createReservation(ReservationRequestDto reservatio
 
         return ReservationCompleteDto.builder()
                 .makeupName(portfolio.getMakeupName())
-                .artist(portfolio.getArtist().getName())
+                .artistNickName(portfolio.getArtist().getNickname())
                 .location(reservation.getLocation())
                 .reservationDate(reservation.getReservationDate())
                 .reservationDayOfWeekAndTime(reservation.getReservationDayOfWeekAndTime())

diff --git a/src/main/java/umc/meme/shop/domain/review/dto/response/ReviewResponseDto.java b/src/main/java/umc/meme/shop/domain/review/dto/response/ReviewResponseDto.java
@@ -13,7 +13,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class ReviewResponseDto {
-    private String modelName;
+    private String modelNickName;
     private int star;
     private String comment;
     private List<ReviewImgDto> reviewImgDtoList;
@@ -25,7 +25,7 @@ public static ReviewResponseDto from(Review review){
                 .toList();
 
         return ReviewResponseDto.builder()
-                .modelName(review.getModel().getName())
+                .modelNickName(review.getModel().getNickname())
                 .star(review.getStar())
                 .comment(review.getComment())
                 .reviewImgDtoList(reviewImgDtoList)

diff --git a/src/main/java/umc/meme/shop/domain/user/User.java b/src/main/java/umc/meme/shop/domain/user/User.java
@@ -7,6 +7,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import umc.meme.shop.domain.artist.entity.enums.Gender;
+import umc.meme.shop.global.enums.Provider;
 
 @SuperBuilder
 @Getter
@@ -27,12 +28,16 @@ public class User {
     protected String nickname;
 
     @Column(nullable = false, length = 20)
-    protected String name;
+    protected String userName;
 
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     protected Gender gender;
 
     @Column(nullable = false, length = 40)
     protected String email;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    protected Provider provider;
 }
diff --git a/src/main/java/umc/meme/shop/global/enums/Provider.java b/src/main/java/umc/meme/shop/global/enums/Provider.java
@@ -0,0 +1,5 @@
+package umc.meme.shop.global.enums;
+
+public enum Provider {
+    KAKAO, APPLE
+}