Merge pull request #390 from Podo-Store/develop

[FIX] 6차 QA 반영

Author: pipi-shortstocking

src/main/java/PodoeMarket/podoemarket/product/dto/response/ScriptDetailResponseDTO.java

@@ -52,6 +52,8 @@ public class ScriptDetailResponseDTO {
 
     private Boolean isReviewWritten; // 후기 작성 여부
 
+    private Boolean isMine; // 본인 작품 여부
+
     // 후기
     private ReviewStatisticsDTO reviewStatistics;
 

src/main/java/PodoeMarket/podoemarket/product/service/ProductService.java

@@ -109,8 +109,12 @@ public ScriptDetailResponseDTO getScriptDetailInfo(UserEntity userInfo, UUID pro
             final ProductEntity script = productRepo.findById(productId);
             final String scriptImage = generateScriptImgURL(script);
             boolean isReviewWritten = false;
+            boolean isMine = false;
 
             if (userInfo != null) {
+                if (script.getUser().getId().equals(userInfo.getId()))
+                    isMine = true;
+
                 final ReviewEntity review = reviewRepo.findByProductAndUserId(script, userInfo.getId());
 
                 if (review != null)
@@ -146,6 +150,7 @@ public ScriptDetailResponseDTO getScriptDetailInfo(UserEntity userInfo, UUID pro
                     .likeCount(script.getLikeCount()) // 총 좋아요 수
                     .isReviewWritten(isReviewWritten)
                     .viewCount(viewCountService.getProductViewCount(productId)) // 총 조회수
+                    .isMine(isMine)
                     .reviewStatistics(reviewStatistics)
                     .reviews(reviewList)
                     .build();
@@ -279,6 +284,9 @@ public void writeReview(final UserEntity userInfo, final ReviewRequestDTO dto) {
             if(product == null)
                 throw new RuntimeException("상품을 찾을 수 없습니다.");
 
+            if (userInfo.getId().equals(product.getUser().getId()))
+                throw new RuntimeException("본인 작품의 후기는 작성할 수 없습니다.");
+
             ReviewEntity review = ReviewEntity.builder()
                     .rating(dto.getRating())
                     .standardType(dto.getStandardType())

src/main/java/PodoeMarket/podoemarket/profile/service/MypageService.java

@@ -74,29 +74,31 @@ public class MypageService {
     @Transactional
     public UserInfoResponseDTO updateUserAccount(UserEntity userInfo, ProfileUpdateRequestDTO dto) {
         try {
-            if (!dto.getPassword().isBlank() && !dto.getPassword().equals(dto.getConfirmPassword()))
+            if(!dto.getPassword().isBlank() && !dto.getPassword().equals(dto.getConfirmPassword()))
                 throw new RuntimeException("비밀번호가 일치하지 않음");
 
-            isValidPw(dto.getPassword());
-            userInfo.setPassword(pwdEncoder.encode(dto.getPassword()));
-
-            isValidNickname(dto.getNickname());
-            userInfo.setNickname(dto.getNickname());
-
             UserEntity user = userRepo.findById(userInfo.getId());
 
-            if (user == null)
+            if(user == null)
                 throw new RuntimeException("로그인이 필요한 서비스입니다.");
 
-            if (userInfo.getPassword() != null && !userInfo.getPassword().isBlank())
+            if(userInfo.getPassword() != null && !userInfo.getPassword().isBlank())
                 user.setPassword(userInfo.getPassword());
 
+            isValidPw(dto.getPassword());
+            user.setPassword(pwdEncoder.encode(dto.getPassword()));
+
+            if(!dto.getNickname().isBlank()) {
+                isValidNickname(dto.getNickname());
+                user.setNickname(dto.getNickname());
+            }
+
             // 모든 작품의 작가명 변경
             List<ProductEntity> products = productRepo.findAllByUserId(userInfo.getId());
 
-            for (ProductEntity product : productRepo.findAllByUserId(userInfo.getId())) {
+            for(ProductEntity product : productRepo.findAllByUserId(userInfo.getId()))
                 product.setWriter(userInfo.getNickname());
-            }
+
             productRepo.saveAll(products);
             userRepo.save(user);