Merge pull request #141 from Next-Room/feature/image-upload

[FEAT] 구독 상태 검증 로직 추가

src/main/java/com/nextroom/nextRoomServer/domain/Shop.java

@@ -3,7 +3,11 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
+import com.nextroom.nextRoomServer.enums.UserStatus;
+import com.nextroom.nextRoomServer.exceptions.CustomException;
+import com.nextroom.nextRoomServer.security.SecurityUtil;
 import org.hibernate.annotations.Comment;
 
 import com.nextroom.nextRoomServer.util.Timestamped;
@@ -23,6 +27,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import static com.nextroom.nextRoomServer.exceptions.StatusCode.NOT_PERMITTED;
+import static com.nextroom.nextRoomServer.exceptions.StatusCode.SUBSCRIPTION_NOT_PERMITTED;
+
 @Entity
 @Builder
 @Getter
@@ -75,4 +82,16 @@ public class Shop extends Timestamped {
     public void updateLastLoginAt() {
         this.lastLoginAt = LocalDateTime.now();
     }
+
+    public void checkAuthorized() {
+        if (!Objects.equals(this.id, SecurityUtil.getCurrentShopId())) {
+            throw new CustomException(NOT_PERMITTED);
+        }
+    }
+
+    public void validateSubscription() {
+        if (this.subscription == null || this.subscription.getStatus() != UserStatus.SUBSCRIPTION) {
+            throw new CustomException(SUBSCRIPTION_NOT_PERMITTED);
+        }
+    }
 }

src/main/java/com/nextroom/nextRoomServer/dto/HintDto.java

@@ -34,6 +34,13 @@ public static class AddHintRequest {
         private final int progress;
         private final List<String> hintImageList;
         private final List<String> answerImageList;
+
+        public boolean hasImages() {
+            boolean hasHintImages = this.hintImageList != null && !this.hintImageList.isEmpty();
+            boolean hasAnswerImages = this.answerImageList != null && !this.answerImageList.isEmpty();
+
+            return hasHintImages || hasAnswerImages;
+        }
     }
 
     @Getter

src/main/java/com/nextroom/nextRoomServer/dto/SubscriptionDto.java

@@ -57,8 +57,7 @@ public static class SubscriptionInfoResponse {
         public SubscriptionInfoResponse(Subscription subscription) {
             this.id = subscription.getId();
             this.name = subscription.getShop().getName();
-            this.status = UserStatus.SUBSCRIPTION_EXPIRATION.equals(subscription.getStatus()) ?
-                UserStatus.FREE : subscription.getStatus();
+            this.status = subscription.getStatus();
             this.startDate = subscription.getStartDate();
             this.expiryDate = subscription.getExpiryDate();
             this.createdAt = Timestamped.dateTimeFormatter(subscription.getCreatedAt());
@@ -72,8 +71,7 @@ public static class UserStatusResponse {
 
         public UserStatusResponse(Subscription subscription) {
             this.id = subscription.getId();
-            this.status = UserStatus.SUBSCRIPTION_EXPIRATION.equals(subscription.getStatus()) ?
-                UserStatus.FREE : subscription.getStatus();
+            this.status = subscription.getStatus();
         }
     }
 

src/main/java/com/nextroom/nextRoomServer/exceptions/StatusCode.java

@@ -34,6 +34,8 @@ public enum StatusCode {
      * 403 FORBIDDEN
      */
     NOT_PERMITTED(HttpStatus.FORBIDDEN, "접근 권한이 없습니다."),
+    SUBSCRIPTION_NOT_PERMITTED(HttpStatus.FORBIDDEN, "구독 권한이 없습니다."),
+
 
     /**
      * 404 Not Found

src/main/java/com/nextroom/nextRoomServer/service/HintService.java

@@ -3,8 +3,8 @@
 import static com.nextroom.nextRoomServer.exceptions.StatusCode.*;
 
 import java.util.List;
-import java.util.Objects;
 
+import com.nextroom.nextRoomServer.domain.Shop;
 import com.nextroom.nextRoomServer.util.aws.S3Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,7 +15,6 @@
 import com.nextroom.nextRoomServer.exceptions.CustomException;
 import com.nextroom.nextRoomServer.repository.HintRepository;
 import com.nextroom.nextRoomServer.repository.ThemeRepository;
-import com.nextroom.nextRoomServer.security.SecurityUtil;
 
 import lombok.RequiredArgsConstructor;
 
@@ -32,10 +31,13 @@ public class HintService {
 
     @Transactional
     public HintDto.UrlResponse getPresignedUrl(HintDto.UrlRequest request) {
-        Long themeId = request.getThemeId();
-        this.validateThemeAndShop(themeId);
+        Theme theme = this.validateThemeAndShop(request.getThemeId());
+        Shop shop = theme.getShop();
+
+        shop.validateSubscription();
 
-        Long shopId = SecurityUtil.getCurrentShopId();
+        Long themeId = theme.getId();
+        Long shopId = shop.getId();
         List<String> hintImageUrlList = s3Component.generatePresignedUrlsForUpload(shopId, themeId, TYPE_HINT, request.getHintImageCount());
         List<String> answerImageUrlList = s3Component.generatePresignedUrlsForUpload(shopId, themeId, TYPE_ANSWER, request.getAnswerImageCount());
 
@@ -45,6 +47,7 @@ public HintDto.UrlResponse getPresignedUrl(HintDto.UrlRequest request) {
     @Transactional
     public void addHint(HintDto.AddHintRequest request) {
         Theme theme = this.validateThemeAndShop(request.getThemeId());
+        this.validateSubscriptionWithImageRequest(theme.getShop(), request);
         this.validateHintCodeConflict(theme, request.getHintCode());
 
         Hint hint = Hint.builder()
@@ -62,11 +65,11 @@ public void addHint(HintDto.AddHintRequest request) {
 
     @Transactional(readOnly = true)
     public List<HintDto.HintListResponse> getHintList(Long themeId) {
-        this.validateThemeAndShop(themeId);
+        Theme theme = this.validateThemeAndShop(themeId);
 
         List<Hint> hints = hintRepository.findAllByThemeIdOrderByProgress(themeId);
 
-        Long shopId = SecurityUtil.getCurrentShopId();
+        Long shopId = theme.getShop().getId();
         return hints.stream().map(hint ->
                 new HintDto.HintListResponse(
                         hint,
@@ -95,23 +98,24 @@ public void removeHint(HintDto.RemoveHintRequest request) {
     }
 
     private void deleteHintAndAnswerImages(Hint hint) {
-        Long shopId = SecurityUtil.getCurrentShopId();
+        Long shopId = hint.getTheme().getShop().getId();
         Long themeId = hint.getTheme().getId();
+
         s3Component.deleteObjects(shopId, themeId, TYPE_HINT, hint.getHintImageList());
         s3Component.deleteObjects(shopId, themeId, TYPE_ANSWER, hint.getAnswerImageList());
     }
 
-    private void checkShopAuthorization(Long shopId) {
-        if (!Objects.equals(shopId, SecurityUtil.getCurrentShopId())) {
-            throw new CustomException(NOT_PERMITTED);
+    private void validateSubscriptionWithImageRequest(Shop shop, HintDto.AddHintRequest request) {
+        if (request.hasImages()) {
+            shop.validateSubscription();
         }
     }
 
     private Theme validateThemeAndShop(Long themeId) {
         Theme theme = themeRepository.findById(themeId)
                 .orElseThrow(() -> new CustomException(THEME_NOT_FOUND));
 
-        this.checkShopAuthorization(theme.getShop().getId());
+        theme.getShop().checkAuthorized();
 
         return theme;
     }
@@ -120,7 +124,7 @@ private Hint validateHintAndShop(Long hintId) {
         Hint hint = hintRepository.findById(hintId)
                 .orElseThrow(() -> new CustomException(HINT_NOT_FOUND));
 
-        checkShopAuthorization(hint.getTheme().getShop().getId());
+        hint.getTheme().getShop().checkAuthorized();
 
         return hint;
     }