[chore] 운영서버로 배포 - 25/08/21

src/main/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentQueryRepositoryImpl.java

@@ -7,7 +7,6 @@
 import konkuk.thip.comment.application.port.out.dto.CommentQueryDto;
 import konkuk.thip.comment.application.port.out.dto.QCommentQueryDto;
 import konkuk.thip.common.entity.StatusType;
-import konkuk.thip.user.adapter.out.jpa.QAliasJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.QUserJpaEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -24,7 +23,6 @@ public class CommentQueryRepositoryImpl implements CommentQueryRepository {
 
     private final QCommentJpaEntity comment = QCommentJpaEntity.commentJpaEntity;
     private final QUserJpaEntity commentCreator = QUserJpaEntity.userJpaEntity;
-    private final QAliasJpaEntity aliasOfCommentCreator = QAliasJpaEntity.aliasJpaEntity;
     private final QCommentJpaEntity parentComment = new QCommentJpaEntity("parentComment");
     private final QUserJpaEntity parentCommentCreator = new QUserJpaEntity("parentCommentCreator");
 
@@ -34,10 +32,8 @@ public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long pos
         QCommentQueryDto proj = new QCommentQueryDto(
                 comment.commentId,
                 commentCreator.userId,
-                aliasOfCommentCreator.imageUrl,
+                commentCreator.alias,
                 commentCreator.nickname,
-                aliasOfCommentCreator.value,
-                aliasOfCommentCreator.color,
                 comment.createdAt,
                 comment.content,
                 comment.likeCount,
@@ -58,7 +54,6 @@ public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long pos
                 .select(proj)
                 .from(comment)
                 .leftJoin(comment.userJpaEntity, commentCreator)
-                .leftJoin(commentCreator.aliasForUserJpaEntity, aliasOfCommentCreator)
                 .where(whereClause)
                 .orderBy(comment.createdAt.desc())
                 .limit(size + 1)        // size + 1 개 조회
@@ -79,10 +74,8 @@ public List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootC
                 comment.parent.commentId,
                 parentCommentCreator.nickname,
                 commentCreator.userId,
-                aliasOfCommentCreator.imageUrl,
+                commentCreator.alias,
                 commentCreator.nickname,
-                aliasOfCommentCreator.value,
-                aliasOfCommentCreator.color,
                 comment.createdAt,
                 comment.content,
                 comment.likeCount,
@@ -97,7 +90,6 @@ public List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootC
                     .leftJoin(comment.parent, parentComment)
                     .leftJoin(parentComment.userJpaEntity, parentCommentCreator)
                     .leftJoin(comment.userJpaEntity, commentCreator)
-                    .leftJoin(commentCreator.aliasForUserJpaEntity, aliasOfCommentCreator)
                     .where(
                             comment.parent.commentId.in(parentIds),     // parentIds 하위의 모든 자식 댓글 조회
                             comment.status.eq(StatusType.ACTIVE)        // 자식 댓글은 ACTIVE인 것만 조회
@@ -141,10 +133,8 @@ public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc
                 comment.parent.commentId,
                 parentCommentCreator.nickname,
                 commentCreator.userId,
-                aliasOfCommentCreator.imageUrl,
+                commentCreator.alias,
                 commentCreator.nickname,
-                aliasOfCommentCreator.value,
-                aliasOfCommentCreator.color,
                 comment.createdAt,
                 comment.content,
                 comment.likeCount,
@@ -159,7 +149,6 @@ public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc
                     .leftJoin(comment.parent, parentComment)
                     .leftJoin(parentComment.userJpaEntity, parentCommentCreator)
                     .leftJoin(comment.userJpaEntity, commentCreator)
-                    .leftJoin(commentCreator.aliasForUserJpaEntity, aliasOfCommentCreator)
                     .where(
                             comment.parent.commentId.in(parentIds),     // parentIds 하위의 모든 자식 댓글 조회
                             comment.status.eq(StatusType.ACTIVE)        // 자식 댓글은 ACTIVE인 것만 조회
@@ -193,10 +182,8 @@ public CommentQueryDto findRootCommentId(Long rootCommentId) {
         QCommentQueryDto proj = new QCommentQueryDto(
                 comment.commentId,
                 commentCreator.userId,
-                aliasOfCommentCreator.imageUrl,
+                commentCreator.alias,
                 commentCreator.nickname,
-                aliasOfCommentCreator.value,
-                aliasOfCommentCreator.color,
                 comment.createdAt,
                 comment.content,
                 comment.likeCount,
@@ -207,7 +194,6 @@ public CommentQueryDto findRootCommentId(Long rootCommentId) {
                 .select(proj)
                 .from(comment)
                 .join(comment.userJpaEntity, commentCreator)
-                .join(commentCreator.aliasForUserJpaEntity, aliasOfCommentCreator)
                 .where(
                         comment.commentId.eq(rootCommentId),
                         comment.status.eq(StatusType.ACTIVE)
@@ -223,10 +209,8 @@ public CommentQueryDto findChildCommentId(Long rootCommentId, Long replyCommentI
                 comment.parent.commentId,
                 parentCommentCreator.nickname,
                 commentCreator.userId,
-                aliasOfCommentCreator.imageUrl,
+                commentCreator.alias,
                 commentCreator.nickname,
-                aliasOfCommentCreator.value,
-                aliasOfCommentCreator.color,
                 comment.createdAt,
                 comment.content,
                 comment.likeCount,
@@ -239,7 +223,6 @@ public CommentQueryDto findChildCommentId(Long rootCommentId, Long replyCommentI
                 .join(comment.parent, parentComment)
                 .join(parentComment.userJpaEntity, parentCommentCreator)
                 .join(comment.userJpaEntity, commentCreator)
-                .join(commentCreator.aliasForUserJpaEntity, aliasOfCommentCreator)
                 .where(
                         comment.parent.commentId.eq(rootCommentId),
                         parentComment.status.eq(StatusType.ACTIVE),

src/main/java/konkuk/thip/comment/application/port/out/dto/CommentQueryDto.java

@@ -2,6 +2,7 @@
 
 import com.querydsl.core.annotations.QueryProjection;
 import jakarta.annotation.Nullable;
+import konkuk.thip.user.domain.value.Alias;
 
 import java.time.LocalDateTime;
 
@@ -23,7 +24,22 @@ public record CommentQueryDto(
      * child comment
      */
     @QueryProjection
-    public CommentQueryDto {}
+    public CommentQueryDto (
+            Long commentId,
+            Long parentCommentId,
+            String parentCommentCreatorNickname,
+            Long creatorId,
+            Alias creatorAlias,
+            String creatorNickname,
+            LocalDateTime createdAt,    // 댓글 작성 시각
+            String content,
+            int likeCount,
+            Boolean isDeleted
+    ) {
+        this(commentId, parentCommentId, parentCommentCreatorNickname, creatorId, creatorAlias.getImageUrl(),
+                creatorNickname, creatorAlias.getValue(), creatorAlias.getColor(),
+                createdAt, content, likeCount, isDeleted);
+    }
 
     /**
      * root comment
@@ -32,16 +48,15 @@ public record CommentQueryDto(
     public CommentQueryDto (
             Long commentId,
             Long creatorId,
-            String creatorProfileImageUrl,
+            Alias creatorAlias,
             String creatorNickname,
-            String alias,
-            String aliasColor,
             LocalDateTime createdAt,    // 댓글 작성 시각
             String content,
             int likeCount,
             boolean isDeleted
     ) {
-        this(commentId, null, null, creatorId, creatorProfileImageUrl, creatorNickname,
-                alias, aliasColor, createdAt, content, likeCount, isDeleted);
+        this(commentId, null, null, creatorId, creatorAlias.getImageUrl(),
+                creatorNickname, creatorAlias.getValue(), creatorAlias.getColor(),
+                createdAt, content, likeCount, isDeleted);
     }
 }

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -159,6 +159,15 @@ public enum ErrorCode implements ResponseCode {
     FEED_ALREADY_SAVED(HttpStatus.BAD_REQUEST, 160006, "사용자가 이미 저장한 피드입니다."),
     FEED_NOT_SAVED_CANNOT_DELETE(HttpStatus.BAD_REQUEST, 160007, "사용자가 저장하지 않은 피드는 저장삭제 할 수 없습니다."),
     FEED_CAN_NOT_SHOW_PRIVATE_ONE(HttpStatus.BAD_REQUEST, 160008, "비공개 피드는 피드 작성자 이외에는 조회할 수 없습니다."),
+    TAG_SHOULD_BE_UNIQUE(HttpStatus.BAD_REQUEST, 160009, "피드에 등록된 태그는 중복될 수 없습니다."),
+    TAG_LIST_SIZE_OVERFLOW(HttpStatus.BAD_REQUEST, 160010, "등록 가능한 태그 개수를 초과하였습니다."),
+
+
+    /**
+     * 165000: ContentList error
+     */
+    CONTENT_LIST_SIZE_OVERFLOW(HttpStatus.BAD_REQUEST, 165000, "컨텐츠 리스트의 크기가 초과되었습니다. 최대 3개까지 가능합니다."),
+    CONTENT_NOT_FOUND(HttpStatus.BAD_REQUEST, 165001, "해당 이미지는 이 피드에 존재하지 않습니다:"),
 
     /**
      * 170000 : Image File error

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -180,7 +180,9 @@ public enum SwaggerResponseDescription {
             BOOK_NOT_FOUND,
             TAG_NOT_FOUND,
             TAG_NAME_NOT_MATCH,
-            INVALID_FEED_COMMAND,
+            CONTENT_LIST_SIZE_OVERFLOW,
+            TAG_SHOULD_BE_UNIQUE,
+            TAG_LIST_SIZE_OVERFLOW,
             BOOK_NAVER_API_PARSING_ERROR,
             BOOK_NAVER_API_ISBN_NOT_FOUND,
             EMPTY_FILE_EXCEPTION,
@@ -193,7 +195,9 @@ public enum SwaggerResponseDescription {
             BOOK_NOT_FOUND,
             TAG_NOT_FOUND,
             TAG_NAME_NOT_MATCH,
-            INVALID_FEED_COMMAND,
+            CONTENT_LIST_SIZE_OVERFLOW,
+            TAG_SHOULD_BE_UNIQUE,
+            TAG_LIST_SIZE_OVERFLOW,
             FEED_ACCESS_FORBIDDEN
     ))),
     CHANGE_FEED_SAVED_STATE(new LinkedHashSet<>(Set.of(

src/main/java/konkuk/thip/common/util/EnumMappings.java

@@ -0,0 +1,117 @@
+package konkuk.thip.common.util;
+
+import konkuk.thip.feed.domain.value.Tag;
+import konkuk.thip.room.domain.value.Category;
+import konkuk.thip.user.domain.value.Alias;
+
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+public final class EnumMappings {
+
+    private EnumMappings() {}
+
+    private static final Map<Alias, Category> aliasToCategory;
+    private static final Map<Category, List<Tag>> categoryToTags;
+
+    // 역방향 인덱스
+    private static final Map<Category, Alias> categoryToAlias;
+    private static final Map<Tag, Category> tagToCategory;
+
+    static {
+        // Alias -> Category
+        EnumMap<Alias, Category> a2c = new EnumMap<>(Alias.class);
+        a2c.put(Alias.WRITER,      Category.LITERATURE);        // 문학가
+        a2c.put(Alias.SCIENTIST,   Category.SCIENCE_IT);        // 과학자
+        a2c.put(Alias.SOCIOLOGIST, Category.SOCIAL_SCIENCE);    // 사회학
+        a2c.put(Alias.ARTIST,      Category.ART);               // 예술가
+        a2c.put(Alias.PHILOSOPHER, Category.HUMANITY);          // 철학자
+        aliasToCategory = Collections.unmodifiableMap(a2c);
+
+        // Category -> Tags
+        EnumMap<Category, List<Tag>> c2t = new EnumMap<>(Category.class);
+        c2t.put(Category.LITERATURE, List.of(                   // 문학
+                Tag.KOREAN_NOVEL, Tag.FOREIGN_NOVEL, Tag.CLASSIC_LITERATURE, Tag.ESSAY, Tag.POETRY,
+                Tag.PLAY, Tag.DETECTIVE_NOVEL, Tag.FANTASY_NOVEL, Tag.ROMANCE_NOVEL, Tag.LITERARY_THEORY
+        ));
+        c2t.put(Category.SCIENCE_IT, List.of(                   // 과학·IT
+                Tag.GENERAL_SCIENCE, Tag.PHYSICS, Tag.CHEMISTRY, Tag.BIOLOGY, Tag.ASTRONOMY,
+                Tag.EARTH_SCIENCE, Tag.MATHEMATICS, Tag.GENERAL_ENGINEERING,
+                Tag.COMPUTER_ENGINEERING, Tag.PROGRAMMING, Tag.IT_GENERAL
+        ));
+        c2t.put(Category.SOCIAL_SCIENCE, List.of(               // 사회과학
+                Tag.SOCIOLOGY, Tag.LAW, Tag.GENERAL_POLITICS, Tag.POLITICAL_SCIENCE,
+                Tag.ECONOMICS, Tag.BUSINESS_ADMIN, Tag.JURISPRUDENCE, Tag.EDUCATION,
+                Tag.PSYCHOLOGY, Tag.MEDIA, Tag.INTERNATIONAL_RELATIONS, Tag.SOCIAL_ISSUES,
+                Tag.MARKETING, Tag.INVESTMENT, Tag.STARTUP, Tag.GENERAL_ECONOMY
+        ));
+        c2t.put(Category.HUMANITY, List.of(                      // 인문학
+                Tag.PHILOSOPHY, Tag.HISTORY, Tag.RELIGION, Tag.CLASSICS, Tag.LINGUISTICS,
+                Tag.CULTURAL_ANTHROPOLOGY, Tag.HUMANISTIC_ESSAY, Tag.EASTERN_PHILOSOPHY,
+                Tag.WESTERN_PHILOSOPHY, Tag.WORLD_HISTORY, Tag.KOREAN_HISTORY,
+                Tag.HISTORICAL_ESSAY, Tag.ANCIENT_HISTORY, Tag.MODERN_HISTORY
+        ));
+        c2t.put(Category.ART, List.of(
+                Tag.ART, Tag.MUSIC, Tag.MOVIE, Tag.PHOTO, Tag.DANCE,
+                Tag.THEATER, Tag.DESIGN, Tag.ARCHITECTURE, Tag.GENERAL_ART
+        ));
+        categoryToTags = Collections.unmodifiableMap(c2t);
+
+        // ------------역방향 인덱스------------
+        // Category -> Alias
+        EnumMap<Category, Alias> c2a = new EnumMap<>(Category.class);
+        aliasToCategory.forEach((alias, category) -> {
+            Alias prev = c2a.put(category, alias);
+            if (prev != null && prev != alias) {
+                throw new IllegalStateException("Category에 두 개 이상의 Alias 매핑: " + category);
+            }
+        });
+        categoryToAlias = Collections.unmodifiableMap(c2a);
+
+        // Tag -> Category (각 Tag는 정확히 하나의 Category)
+        EnumMap<Tag, Category> t2c = new EnumMap<>(Tag.class);
+        categoryToTags.forEach((category, tags) -> {
+            for (Tag tag : tags) {
+                Category prev = t2c.put(tag, category);
+                if (prev != null && prev != category) {
+                    throw new IllegalStateException(
+                            "Tag가 둘 이상의 Category에 매핑됨: " + tag + " (" + prev + " vs " + category + ")"
+                    );
+                }
+            }
+        });
+        tagToCategory = Collections.unmodifiableMap(t2c);
+    }
+
+    // ----------- Public API -----------
+
+    /** Alias -> Category */
+    public static Category categoryFrom(Alias alias) {
+        return aliasToCategory.get(alias);
+    }
+
+    /** Category -> Tags */
+    public static List<Tag> tagsFrom(Category category) {
+        return categoryToTags.getOrDefault(category, List.of());
+    }
+
+    /** Category -> Alias */
+    public static Alias aliasFrom(Category category) {
+        return categoryToAlias.get(category);
+    }
+
+    /** Tag -> Category */
+    public static Category categoryFrom(Tag tag) {
+        return tagToCategory.get(tag);
+    }
+
+    public static Map<Category, List<Tag>> getCategoryToTags() {
+        return Collections.unmodifiableMap(categoryToTags);
+    }
+
+    public static Map<Alias, Category> getAliasToCategory() {
+        return Collections.unmodifiableMap(aliasToCategory);
+    }
+}

src/main/java/konkuk/thip/config/AwsS3ImageUrlInitializer.java

@@ -3,8 +3,8 @@
 import jakarta.annotation.PostConstruct;
 import konkuk.thip.common.exception.BusinessException;
 import konkuk.thip.config.properties.AwsS3Properties;
-import konkuk.thip.room.domain.Category;
-import konkuk.thip.user.domain.Alias;
+import konkuk.thip.room.domain.value.Category;
+import konkuk.thip.user.domain.value.Alias;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;