[refac] exception 세분화 및 validation 정리 (#89)

* [refac] archiving, content 소유자 response에 추가 #88 * [refac] archiving api validation exception 세분화 #88 * [refac] content api validation exception 세분화 #88 * [refac] recycle api validation exception 세분화 #88 * [refac] search api validation exception 세분화 #88 * [refac] user api validation exception 세분화 #88 * [refac] validation 정리 #88 * [chore] spotless 적용 #88
ALL-CHIVE · Aug 4, 2023 · 971da20 · 971da20
1 parent 56a2cc1
commit 971da20
Show file tree

Hide file tree

Showing 18 changed files with 79 additions and 67 deletions.
diff --git a/...main/java/allchive/server/api/archiving/model/dto/response/ArchivingContentsResponse.java b/...main/java/allchive/server/api/archiving/model/dto/response/ArchivingContentsResponse.java
@@ -21,6 +21,9 @@ public class ArchivingContentsResponse {
     @Schema(description = "아카이빙의 총 컨텐츠 개수")
     private Long totalContentsCount;
 
+    @Schema(description = "아카이빙 소유자 고유번호")
+    private Long ownerId;
+
     @Schema(description = "유저 소유 여부")
     private Boolean isMine;
 
@@ -30,11 +33,13 @@ private ArchivingContentsResponse(
             String archivingTitle,
             Long archivingId,
             Long totalContentsCount,
+            Long ownerId,
             Boolean isMine) {
         this.contents = contents;
         this.archivingTitle = archivingTitle;
         this.archivingId = archivingId;
         this.totalContentsCount = totalContentsCount;
+        this.ownerId = ownerId;
         this.isMine = isMine;
     }
 
@@ -47,6 +52,7 @@ public static ArchivingContentsResponse of(
                 .archivingTitle(archiving.getTitle())
                 .totalContentsCount(archiving.getScrapCnt() + archiving.getImgCnt())
                 .contents(contentResponseSlice)
+                .ownerId(archiving.getUserId())
                 .isMine(isMine)
                 .build();
     }

diff --git a/Api/src/main/java/allchive/server/api/archiving/service/GetArchivingContentsUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/GetArchivingContentsUseCase.java
@@ -43,8 +43,8 @@ public ArchivingContentsResponse execute(Long archivingId, Pageable pageable) {
     }
 
     private void validateExecution(Long archivingId, Long userId) {
-        archivingValidator.validatePublicStatus(archivingId, userId);
-        archivingValidator.validateDeleteStatus(archivingId, userId);
+        archivingValidator.validatePublic(archivingId, userId);
+        archivingValidator.validateNotDeleteExceptUser(archivingId, userId);
     }
 
     private Slice<ContentResponse> getContentResponseSlice(Long archivingId, Pageable pageable) {

diff --git a/Api/src/main/java/allchive/server/api/archiving/service/GetArchivingInfoUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/GetArchivingInfoUseCase.java
@@ -15,11 +15,14 @@ public class GetArchivingInfoUseCase {
     private final ArchivingValidator archivingValidator;
     private final ArchivingAdaptor archivingAdaptor;
 
-    @Transactional
+    @Transactional(readOnly = true)
     public ArchivingResponse execute(Long archivingId) {
-        archivingValidator.validateExistById(archivingId);
-
+        validateExecution(archivingId);
         Archiving archiving = archivingAdaptor.findById(archivingId);
         return ArchivingResponse.of(archiving, Boolean.FALSE);
     }
+
+    private void validateExecution(Long archivingId) {
+        archivingValidator.validateExistById(archivingId);
+    }
 }
diff --git a/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingPinUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingPinUseCase.java
@@ -18,16 +18,11 @@ public class UpdateArchivingPinUseCase {
     public void execute(Long archivingId, Boolean cancel) {
         Long userId = SecurityUtil.getCurrentUserId();
         validateExecution(archivingId, userId, cancel);
-        if (cancel) {
-            archivingDomainService.updatePin(archivingId, userId, false);
-        } else {
-            archivingDomainService.updatePin(archivingId, userId, true);
-        }
+        archivingDomainService.updatePin(archivingId, userId, !cancel);
     }
 
     private void validateExecution(Long archivingId, Long userId, Boolean cancel) {
-        archivingValidator.validateExistById(archivingId);
-        archivingValidator.validateDeleteStatus(archivingId, userId);
+        archivingValidator.validateNotDeleteExceptUser(archivingId, userId);
         if (cancel) {
             archivingValidator.validateNotPinStatus(archivingId, userId);
         } else {

diff --git a/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingScrapUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingScrapUseCase.java
@@ -38,8 +38,7 @@ public void execute(Long archivingId, Boolean cancel) {
     }
 
     private void validateExecution(Long archivingId, Long userId, Boolean cancel) {
-        archivingValidator.validateExistById(archivingId);
-        archivingValidator.validateDeleteStatus(archivingId, userId);
+        archivingValidator.validateNotDeleteExceptUser(archivingId, userId);
         if (cancel) {
             scrapValidator.validateExistScrap(userId, archivingId);
         } else {

diff --git a/Api/src/main/java/allchive/server/api/content/model/dto/response/ContentTagResponse.java b/Api/src/main/java/allchive/server/api/content/model/dto/response/ContentTagResponse.java
@@ -42,6 +42,10 @@ public class ContentTagResponse {
 
     private List<TagResponse> tagList;
 
+    @Schema(description = "컨텐츠 소유자 고유번호")
+    private Long ownerId;
+
+    @Schema(description = "유저 소유 여부")
     private Boolean isMine;
 
     @Builder
@@ -54,6 +58,7 @@ private ContentTagResponse(
             String imgUrl,
             LocalDateTime contentCreatedAt,
             List<TagResponse> tagList,
+            Long ownerId,
             Boolean isMine) {
         this.contentId = contentId;
         this.contentTitle = contentTitle;
@@ -63,11 +68,12 @@ private ContentTagResponse(
         this.imgUrl = imgUrl;
         this.contentCreatedAt = contentCreatedAt;
         this.tagList = tagList;
+        this.ownerId = ownerId;
         this.isMine = isMine;
     }
 
     public static ContentTagResponse of(
-            Content content, List<TagResponse> tagList, Boolean isMine) {
+            Content content, List<TagResponse> tagList, Boolean isMine, Long ownerId) {
         return ContentTagResponse.builder()
                 .contentId(content.getId())
                 .contentTitle(content.getTitle())
@@ -77,6 +83,7 @@ public static ContentTagResponse of(
                 .imgUrl(UrlUtil.toAssetUrl(content.getImageUrl()))
                 .contentCreatedAt(content.getCreatedAt())
                 .tagList(tagList)
+                .ownerId(ownerId)
                 .isMine(isMine)
                 .build();
     }

diff --git a/Api/src/main/java/allchive/server/api/content/model/mapper/ContentMapper.java b/Api/src/main/java/allchive/server/api/content/model/mapper/ContentMapper.java
@@ -38,12 +38,15 @@ public Content toEntity(CreateContentRequest request) {
     }
 
     public ContentTagResponse toContentTagResponse(
-            Content content, List<ContentTagGroup> contentTagGroupList, Boolean isMine) {
+            Content content,
+            List<ContentTagGroup> contentTagGroupList,
+            Boolean isMine,
+            Long ownerId) {
         List<TagResponse> tagResponseList =
                 contentTagGroupList.stream()
                         .map(contentTagGroup -> TagResponse.from(contentTagGroup.getTag()))
                         .toList();
-        return ContentTagResponse.of(content, tagResponseList, isMine);
+        return ContentTagResponse.of(content, tagResponseList, isMine, ownerId);
     }
 
     public List<ContentTagGroup> toContentTagGroupEntityList(Content content, List<Tag> tags) {

diff --git a/Api/src/main/java/allchive/server/api/content/service/CreateContentUseCase.java b/Api/src/main/java/allchive/server/api/content/service/CreateContentUseCase.java
@@ -40,8 +40,7 @@ public void execute(CreateContentRequest request) {
 
     private void validateExecution(CreateContentRequest request) {
         Long userId = SecurityUtil.getCurrentUserId();
-        archivingValidator.validateExistById(request.getArchivingId());
-        archivingValidator.verifyUser(request.getArchivingId(), userId);
+        archivingValidator.verifyUser(userId, request.getArchivingId());
         tagValidator.validateExistTagsAndUser(request.getTagIds(), userId);
     }
 

diff --git a/Api/src/main/java/allchive/server/api/content/service/GetContentUseCase.java b/Api/src/main/java/allchive/server/api/content/service/GetContentUseCase.java
@@ -30,10 +30,11 @@ public ContentTagResponse execute(Long contentId) {
         Long userId = SecurityUtil.getCurrentUserId();
         validateExecution(contentId, userId);
         Content content = contentAdaptor.findById(contentId);
+        Long ownerId = archivingAdaptor.findById(content.getArchivingId()).getUserId();
         List<ContentTagGroup> contentTagGroupList =
                 contentTagGroupAdaptor.queryContentTagGroupByContentWithTag(content);
         Boolean isMine = calculateIsMine(content.getArchivingId(), userId);
-        return contentMapper.toContentTagResponse(content, contentTagGroupList, isMine);
+        return contentMapper.toContentTagResponse(content, contentTagGroupList, isMine, ownerId);
     }
 
     private void validateExecution(Long contentId, Long userId) {

diff --git a/Domain/src/main/java/allchive/server/domain/domains/archiving/domain/Archiving.java b/Domain/src/main/java/allchive/server/domain/domains/archiving/domain/Archiving.java
@@ -3,9 +3,7 @@
 
 import allchive.server.domain.common.model.BaseTimeEntity;
 import allchive.server.domain.domains.archiving.domain.enums.Category;
-import allchive.server.domain.domains.archiving.exception.exceptions.DeletedArchivingException;
-import allchive.server.domain.domains.archiving.exception.exceptions.NoAuthurityUpdateArchivingException;
-import allchive.server.domain.domains.archiving.exception.exceptions.NotPublicArchivingException;
+import allchive.server.domain.domains.archiving.exception.exceptions.*;
 import java.util.ArrayList;
 import java.util.List;
 import javax.persistence.*;
@@ -85,13 +83,13 @@ public void validateUser(Long userId) {
         }
     }
 
-    public void validatePublicStatus(Long userId) {
+    public void validatePublic(Long userId) {
         if (!this.publicStatus && !this.userId.equals(userId)) {
             throw NotPublicArchivingException.EXCEPTION;
         }
     }
 
-    public void validateDeleteStatus(Long userId) {
+    public void validateNotDeleteExceptUser(Long userId) {
         if (this.deleteStatus && !this.userId.equals(userId)) {
             throw DeletedArchivingException.EXCEPTION;
         }
@@ -130,4 +128,16 @@ public void validateNotDelete() {
             throw DeletedArchivingException.EXCEPTION;
         }
     }
+
+    public void validateAlreadyPinStatus(Long userId) {
+        if (this.pinUserId.contains(userId)) {
+            throw AlreadyPinnedArchivingException.EXCEPTION;
+        }
+    }
+
+    public void validateNotPinStatus(Long userId) {
+        if (!this.pinUserId.contains(userId)) {
+            throw NotPinnedArchivingException.EXCEPTION;
+        }
+    }
 }
diff --git a/.../src/main/java/allchive/server/domain/domains/archiving/validator/ArchivingValidator.java b/.../src/main/java/allchive/server/domain/domains/archiving/validator/ArchivingValidator.java
@@ -4,10 +4,7 @@
 import allchive.server.core.annotation.Validator;
 import allchive.server.domain.domains.archiving.adaptor.ArchivingAdaptor;
 import allchive.server.domain.domains.archiving.domain.Archiving;
-import allchive.server.domain.domains.archiving.exception.exceptions.AlreadyPinnedArchivingException;
 import allchive.server.domain.domains.archiving.exception.exceptions.ArchivingNotFoundException;
-import allchive.server.domain.domains.archiving.exception.exceptions.NoAuthurityUpdateArchivingException;
-import allchive.server.domain.domains.archiving.exception.exceptions.NotPinnedArchivingException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 
@@ -20,12 +17,12 @@ public void verifyUser(Long userId, Long archivingId) {
         archivingAdaptor.findById(archivingId).validateUser(userId);
     }
 
-    public void validatePublicStatus(Long archivingId, Long userId) {
-        archivingAdaptor.findById(archivingId).validatePublicStatus(userId);
+    public void validatePublic(Long archivingId, Long userId) {
+        archivingAdaptor.findById(archivingId).validatePublic(userId);
     }
 
-    public void validateDeleteStatus(Long archivingId, Long userId) {
-        archivingAdaptor.findById(archivingId).validateDeleteStatus(userId);
+    public void validateNotDeleteExceptUser(Long archivingId, Long userId) {
+        archivingAdaptor.findById(archivingId).validateNotDeleteExceptUser(userId);
     }
 
     public void validateExistById(Long archivingId) {
@@ -35,15 +32,11 @@ public void validateExistById(Long archivingId) {
     }
 
     public void validateAlreadyPinStatus(Long archivingId, Long userId) {
-        if (archivingAdaptor.findById(archivingId).getPinUserId().contains(userId)) {
-            throw AlreadyPinnedArchivingException.EXCEPTION;
-        }
+        archivingAdaptor.findById(archivingId).validateAlreadyPinStatus(userId);
     }
 
     public void validateNotPinStatus(Long archivingId, Long userId) {
-        if (!archivingAdaptor.findById(archivingId).getPinUserId().contains(userId)) {
-            throw NotPinnedArchivingException.EXCEPTION;
-        }
+        archivingAdaptor.findById(archivingId).validateNotPinStatus(userId);
     }
 
     public void validateExistInIdList(List<Long> archivingIdList) {
@@ -55,12 +48,7 @@ public void validateExistInIdList(List<Long> archivingIdList) {
 
     public void verifyUserInIdList(Long userId, List<Long> archivingIds) {
         List<Archiving> archivingList = archivingAdaptor.findAllByIdIn(archivingIds);
-        archivingList.forEach(
-                archiving -> {
-                    if (!archiving.getUserId().equals(userId)) {
-                        throw NoAuthurityUpdateArchivingException.EXCEPTION;
-                    }
-                });
+        archivingList.forEach(archiving -> archiving.validateUser(userId));
     }
 
     public void validateNotDeleted(Long archivingId) {

diff --git a/Domain/src/main/java/allchive/server/domain/domains/content/domain/Content.java b/Domain/src/main/java/allchive/server/domain/domains/content/domain/Content.java
@@ -3,6 +3,7 @@
 
 import allchive.server.domain.common.model.BaseTimeEntity;
 import allchive.server.domain.domains.content.domain.enums.ContentType;
+import allchive.server.domain.domains.content.exception.exceptions.AlreadyDeletedContentException;
 import javax.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -89,4 +90,10 @@ public void updateImageContent(Long archivingId, String imgUrl, String title, St
         this.title = title;
         this.memo = memo;
     }
+
+    public void validateNotDelete() {
+        if (this.isDeleteStatus()) {
+            throw AlreadyDeletedContentException.EXCEPTION;
+        }
+    }
 }
diff --git a/Domain/src/main/java/allchive/server/domain/domains/content/validator/ContentValidator.java b/Domain/src/main/java/allchive/server/domain/domains/content/validator/ContentValidator.java
@@ -6,7 +6,6 @@
 import allchive.server.domain.domains.archiving.domain.Archiving;
 import allchive.server.domain.domains.content.adaptor.ContentAdaptor;
 import allchive.server.domain.domains.content.domain.Content;
-import allchive.server.domain.domains.content.exception.exceptions.AlreadyDeletedContentException;
 import allchive.server.domain.domains.content.exception.exceptions.ContentNotFoundException;
 import allchive.server.domain.domains.content.exception.exceptions.NoAuthorityUpdateContentException;
 import allchive.server.domain.domains.content.exception.exceptions.NotPublicContentException;
@@ -56,9 +55,7 @@ public void verifyUser(Long contentId, Long userId) {
     }
 
     public void validateNotDelete(Long contentId) {
-        if (contentAdaptor.findById(contentId).isDeleteStatus()) {
-            throw AlreadyDeletedContentException.EXCEPTION;
-        }
+        contentAdaptor.findById(contentId).validateNotDelete();
     }
 
     public void validatePublic(Long contentId, Long userId) {

diff --git a/Domain/src/main/java/allchive/server/domain/domains/content/validator/TagValidator.java b/Domain/src/main/java/allchive/server/domain/domains/content/validator/TagValidator.java
@@ -4,7 +4,6 @@
 import allchive.server.core.annotation.Validator;
 import allchive.server.domain.domains.content.adaptor.TagAdaptor;
 import allchive.server.domain.domains.content.domain.Tag;
-import allchive.server.domain.domains.content.exception.exceptions.NoAuthorityUpdateTagException;
 import allchive.server.domain.domains.content.exception.exceptions.TagNotFoundException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -23,11 +22,6 @@ public void validateExistTagsAndUser(List<Long> tagIds, Long userId) {
         if (tagIds.size() != tags.size()) {
             throw TagNotFoundException.EXCEPTION;
         }
-        tags.forEach(
-                tag -> {
-                    if (!tag.getUserId().equals(userId)) {
-                        throw NoAuthorityUpdateTagException.EXCEPTION;
-                    }
-                });
+        tags.forEach(tag -> tag.validateUser(userId));
     }
 }
diff --git a/Domain/src/main/java/allchive/server/domain/domains/search/domain/LatestSearch.java b/Domain/src/main/java/allchive/server/domain/domains/search/domain/LatestSearch.java
@@ -2,6 +2,7 @@
 
 
 import allchive.server.domain.common.model.BaseTimeEntity;
+import allchive.server.domain.domains.search.exception.exceptions.NoAuthorityUpdateLatestSearchException;
 import javax.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -30,4 +31,10 @@ private LatestSearch(String keyword, Long userId) {
     public static LatestSearch of(String keyword, Long userId) {
         return LatestSearch.builder().keyword(keyword).userId(userId).build();
     }
+
+    public void validateUser(Long userId) {
+        if (!this.userId.equals(userId)) {
+            throw NoAuthorityUpdateLatestSearchException.EXCEPTION;
+        }
+    }
 }
diff --git a/.../src/main/java/allchive/server/domain/domains/search/validator/LatestSearchValidator.java b/.../src/main/java/allchive/server/domain/domains/search/validator/LatestSearchValidator.java
@@ -5,7 +5,6 @@
 import allchive.server.domain.domains.search.adaptor.LatestSearchAdaptor;
 import allchive.server.domain.domains.search.domain.LatestSearch;
 import allchive.server.domain.domains.search.exception.exceptions.LatestSearchNotFoundException;
-import allchive.server.domain.domains.search.exception.exceptions.NoAuthorityUpdateLatestSearchException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 
@@ -23,11 +22,6 @@ public void validateExistByIdIn(List<Long> ids) {
 
     public void verifyUserByIdIn(List<Long> ids, Long userId) {
         List<LatestSearch> searches = latestSearchAdaptor.findAllByIdIn(ids);
-        searches.forEach(
-                search -> {
-                    if (!search.getUserId().equals(userId)) {
-                        throw NoAuthorityUpdateLatestSearchException.EXCEPTION;
-                    }
-                });
+        searches.forEach(search -> search.validateUser(userId));
     }
 }
diff --git a/Domain/src/main/java/allchive/server/domain/domains/user/domain/User.java b/Domain/src/main/java/allchive/server/domain/domains/user/domain/User.java
@@ -112,4 +112,10 @@ public void updateInfo(String name, String email, String nickname, String imgUrl
         this.nickname = nickname;
         this.profileImgUrl = imgUrl;
     }
+
+    public void validateUserStateNormal() {
+        if (!this.userState.equals(UserState.NORMAL)) {
+            throw ForbiddenUserException.EXCEPTION;
+        }
+    }
 }