From e207ae095f0a7c70790eea9c20b0a9e67c04c201 Mon Sep 17 00:00:00 2001 From: sohyundoh Date: Fri, 12 Jan 2024 01:06:55 +0900 Subject: [PATCH] =?UTF-8?q?#69=20[feat]=20conflict=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mile/controller/moim/MoimController.java | 14 +++++++------- .../controller/moim/MoimControllerSwagger.java | 12 ++++++------ .../com/mile/exception/message/ErrorMessage.java | 1 + .../java/com/mile/moim/service/MoimService.java | 16 +++++++--------- .../{ => service}/dto/CategoryListResponse.java | 2 +- .../{ => service}/dto/ContentListResponse.java | 2 +- .../dto/MoimAuthenticateResponse.java | 2 +- .../dto/MoimCuriousPostListResponse.java | 2 +- .../moim/{ => service}/dto/MoimInfoResponse.java | 2 +- .../dto/MoimMostCuriousPostResponse.java | 4 +--- .../{ => service}/dto/MoimTopicResponse.java | 2 +- .../com/mile/post/repository/PostRepository.java | 3 ++- .../mile/post/service/PostCuriousService.java | 4 ++-- 13 files changed, 32 insertions(+), 34 deletions(-) rename module-domain/src/main/java/com/mile/moim/{ => service}/dto/CategoryListResponse.java (89%) rename module-domain/src/main/java/com/mile/moim/{ => service}/dto/ContentListResponse.java (89%) rename module-domain/src/main/java/com/mile/moim/{ => service}/dto/MoimAuthenticateResponse.java (86%) rename module-domain/src/main/java/com/mile/moim/{ => service}/dto/MoimCuriousPostListResponse.java (89%) rename module-domain/src/main/java/com/mile/moim/{ => service}/dto/MoimInfoResponse.java (94%) rename module-domain/src/main/java/com/mile/moim/{ => service}/dto/MoimMostCuriousPostResponse.java (84%) rename module-domain/src/main/java/com/mile/moim/{ => service}/dto/MoimTopicResponse.java (84%) diff --git a/module-api/src/main/java/com/mile/controller/moim/MoimController.java b/module-api/src/main/java/com/mile/controller/moim/MoimController.java index 0e5297d8..73e65591 100644 --- a/module-api/src/main/java/com/mile/controller/moim/MoimController.java +++ b/module-api/src/main/java/com/mile/controller/moim/MoimController.java @@ -2,13 +2,13 @@ import com.mile.dto.SuccessResponse; import com.mile.exception.message.SuccessMessage; -import com.mile.moim.serivce.MoimService; -import com.mile.moim.serivce.dto.CategoryListResponse; -import com.mile.moim.serivce.dto.ContentListResponse; -import com.mile.writerName.serivce.dto.PopularWriterListResponse; -import com.mile.moim.serivce.dto.MoimCuriousPostListResponse; -import com.mile.moim.serivce.dto.MoimInfoResponse; -import com.mile.moim.serivce.dto.MoimTopicResponse; +import com.mile.moim.service.MoimService; +import com.mile.moim.service.dto.CategoryListResponse; +import com.mile.moim.service.dto.ContentListResponse; +import com.mile.moim.service.dto.MoimCuriousPostListResponse; +import com.mile.moim.service.dto.MoimInfoResponse; +import com.mile.moim.service.dto.MoimTopicResponse; +import com.mile.writerName.service.dto.PopularWriterListResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/module-api/src/main/java/com/mile/controller/moim/MoimControllerSwagger.java b/module-api/src/main/java/com/mile/controller/moim/MoimControllerSwagger.java index 93e72154..23f4a9ce 100644 --- a/module-api/src/main/java/com/mile/controller/moim/MoimControllerSwagger.java +++ b/module-api/src/main/java/com/mile/controller/moim/MoimControllerSwagger.java @@ -2,12 +2,12 @@ import com.mile.dto.ErrorResponse; import com.mile.dto.SuccessResponse; -import com.mile.moim.serivce.dto.CategoryListResponse; -import com.mile.moim.serivce.dto.ContentListResponse; -import com.mile.moim.serivce.dto.MoimCuriousPostListResponse; -import com.mile.writerName.serivce.dto.PopularWriterListResponse; -import com.mile.moim.serivce.dto.MoimTopicResponse; -import com.mile.moim.serivce.dto.MoimInfoResponse; +import com.mile.moim.service.dto.CategoryListResponse; +import com.mile.moim.service.dto.ContentListResponse; +import com.mile.moim.service.dto.MoimCuriousPostListResponse; +import com.mile.moim.service.dto.MoimInfoResponse; +import com.mile.moim.service.dto.MoimTopicResponse; +import com.mile.writerName.service.dto.PopularWriterListResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/module-common/src/main/java/com/mile/exception/message/ErrorMessage.java b/module-common/src/main/java/com/mile/exception/message/ErrorMessage.java index 8b75b83f..012820ba 100644 --- a/module-common/src/main/java/com/mile/exception/message/ErrorMessage.java +++ b/module-common/src/main/java/com/mile/exception/message/ErrorMessage.java @@ -28,6 +28,7 @@ public enum ErrorMessage { RECCOMEND_NOT_FOUND(HttpStatus.NOT_FOUND.value(), "추천 글감을 받아오는데 실패했습니다."), MOIM_TOPIC_NOT_FOUND(HttpStatus.NOT_FOUND.value(), "해당 모임의 글감이 존재하지 않습니다."), TOPIC_POST_NOT_FOUND(HttpStatus.NOT_FOUND.value(), "해당 글감의 글이 존재하지 않습니다."), + MOIM_POST_NOT_FOUND(HttpStatus.NOT_FOUND.value(), "해당 모임의 글이 존재하지 않습니다."), /* Bad Request */ diff --git a/module-domain/src/main/java/com/mile/moim/service/MoimService.java b/module-domain/src/main/java/com/mile/moim/service/MoimService.java index f8187e13..282fc7fd 100644 --- a/module-domain/src/main/java/com/mile/moim/service/MoimService.java +++ b/module-domain/src/main/java/com/mile/moim/service/MoimService.java @@ -4,17 +4,15 @@ import com.mile.exception.model.ForbiddenException; import com.mile.exception.model.NotFoundException; import com.mile.moim.domain.Moim; -import com.mile.moim.dto.CategoryListResponse; -import com.mile.moim.dto.MoimAuthenticateResponse; +import com.mile.moim.service.dto.CategoryListResponse; +import com.mile.moim.service.dto.ContentListResponse; +import com.mile.moim.service.dto.MoimAuthenticateResponse; import com.mile.moim.repository.MoimRepository; -import com.mile.moim.serivce.dto.CategoryListResponse; -import com.mile.moim.serivce.dto.ContentListResponse; -import com.mile.moim.serivce.dto.MoimAuthenticateResponse; -import com.mile.moim.serivce.dto.MoimCuriousPostListResponse; -import com.mile.moim.serivce.dto.MoimInfoResponse; -import com.mile.moim.serivce.dto.MoimTopicResponse; +import com.mile.moim.service.dto.MoimCuriousPostListResponse; +import com.mile.moim.service.dto.MoimInfoResponse; +import com.mile.moim.service.dto.MoimTopicResponse; import com.mile.post.service.PostCuriousService; -import com.mile.topic.serivce.TopicService; +import com.mile.topic.service.TopicService; import com.mile.utils.DateUtil; import com.mile.writerName.domain.WriterName; import java.util.List; diff --git a/module-domain/src/main/java/com/mile/moim/dto/CategoryListResponse.java b/module-domain/src/main/java/com/mile/moim/service/dto/CategoryListResponse.java similarity index 89% rename from module-domain/src/main/java/com/mile/moim/dto/CategoryListResponse.java rename to module-domain/src/main/java/com/mile/moim/service/dto/CategoryListResponse.java index faafa5e0..166de965 100644 --- a/module-domain/src/main/java/com/mile/moim/dto/CategoryListResponse.java +++ b/module-domain/src/main/java/com/mile/moim/service/dto/CategoryListResponse.java @@ -1,4 +1,4 @@ -package com.mile.moim.dto; +package com.mile.moim.service.dto; import com.mile.topic.service.dto.CategoryResponse; import java.util.List; diff --git a/module-domain/src/main/java/com/mile/moim/dto/ContentListResponse.java b/module-domain/src/main/java/com/mile/moim/service/dto/ContentListResponse.java similarity index 89% rename from module-domain/src/main/java/com/mile/moim/dto/ContentListResponse.java rename to module-domain/src/main/java/com/mile/moim/service/dto/ContentListResponse.java index e5428a7d..343eb0d4 100644 --- a/module-domain/src/main/java/com/mile/moim/dto/ContentListResponse.java +++ b/module-domain/src/main/java/com/mile/moim/service/dto/ContentListResponse.java @@ -1,4 +1,4 @@ -package com.mile.moim.dto; +package com.mile.moim.service.dto; import com.mile.topic.service.dto.ContentResponse; diff --git a/module-domain/src/main/java/com/mile/moim/dto/MoimAuthenticateResponse.java b/module-domain/src/main/java/com/mile/moim/service/dto/MoimAuthenticateResponse.java similarity index 86% rename from module-domain/src/main/java/com/mile/moim/dto/MoimAuthenticateResponse.java rename to module-domain/src/main/java/com/mile/moim/service/dto/MoimAuthenticateResponse.java index d1744beb..d6c3f595 100644 --- a/module-domain/src/main/java/com/mile/moim/dto/MoimAuthenticateResponse.java +++ b/module-domain/src/main/java/com/mile/moim/service/dto/MoimAuthenticateResponse.java @@ -1,4 +1,4 @@ -package com.mile.moim.dto; +package com.mile.moim.service.dto; public record MoimAuthenticateResponse( boolean isMember diff --git a/module-domain/src/main/java/com/mile/moim/dto/MoimCuriousPostListResponse.java b/module-domain/src/main/java/com/mile/moim/service/dto/MoimCuriousPostListResponse.java similarity index 89% rename from module-domain/src/main/java/com/mile/moim/dto/MoimCuriousPostListResponse.java rename to module-domain/src/main/java/com/mile/moim/service/dto/MoimCuriousPostListResponse.java index 27cdc57a..1d84386e 100644 --- a/module-domain/src/main/java/com/mile/moim/dto/MoimCuriousPostListResponse.java +++ b/module-domain/src/main/java/com/mile/moim/service/dto/MoimCuriousPostListResponse.java @@ -1,4 +1,4 @@ -package com.mile.moim.serivce.dto; +package com.mile.moim.service.dto; import java.util.List; diff --git a/module-domain/src/main/java/com/mile/moim/dto/MoimInfoResponse.java b/module-domain/src/main/java/com/mile/moim/service/dto/MoimInfoResponse.java similarity index 94% rename from module-domain/src/main/java/com/mile/moim/dto/MoimInfoResponse.java rename to module-domain/src/main/java/com/mile/moim/service/dto/MoimInfoResponse.java index 7ae7f39c..cae95b55 100644 --- a/module-domain/src/main/java/com/mile/moim/dto/MoimInfoResponse.java +++ b/module-domain/src/main/java/com/mile/moim/service/dto/MoimInfoResponse.java @@ -1,4 +1,4 @@ -package com.mile.moim.dto; +package com.mile.moim.service.dto; public record MoimInfoResponse( diff --git a/module-domain/src/main/java/com/mile/moim/dto/MoimMostCuriousPostResponse.java b/module-domain/src/main/java/com/mile/moim/service/dto/MoimMostCuriousPostResponse.java similarity index 84% rename from module-domain/src/main/java/com/mile/moim/dto/MoimMostCuriousPostResponse.java rename to module-domain/src/main/java/com/mile/moim/service/dto/MoimMostCuriousPostResponse.java index 388704b9..b2a5c5da 100644 --- a/module-domain/src/main/java/com/mile/moim/dto/MoimMostCuriousPostResponse.java +++ b/module-domain/src/main/java/com/mile/moim/service/dto/MoimMostCuriousPostResponse.java @@ -1,6 +1,4 @@ -package com.mile.moim.serivce.dto; - -import com.mile.post.domain.Post; +package com.mile.moim.service.dto; public record MoimMostCuriousPostResponse( String imageUrl, diff --git a/module-domain/src/main/java/com/mile/moim/dto/MoimTopicResponse.java b/module-domain/src/main/java/com/mile/moim/service/dto/MoimTopicResponse.java similarity index 84% rename from module-domain/src/main/java/com/mile/moim/dto/MoimTopicResponse.java rename to module-domain/src/main/java/com/mile/moim/service/dto/MoimTopicResponse.java index 9d348a3d..9bc404de 100644 --- a/module-domain/src/main/java/com/mile/moim/dto/MoimTopicResponse.java +++ b/module-domain/src/main/java/com/mile/moim/service/dto/MoimTopicResponse.java @@ -1,4 +1,4 @@ -package com.mile.moim.dto; +package com.mile.moim.service.dto; public record MoimTopicResponse( String content diff --git a/module-domain/src/main/java/com/mile/post/repository/PostRepository.java b/module-domain/src/main/java/com/mile/post/repository/PostRepository.java index 1f5c63d2..7622b686 100644 --- a/module-domain/src/main/java/com/mile/post/repository/PostRepository.java +++ b/module-domain/src/main/java/com/mile/post/repository/PostRepository.java @@ -6,7 +6,8 @@ import java.util.List; -public interface PostRepository extends JpaRepository { +public interface PostRepository extends JpaRepository, PostRepositoryCustom { boolean existsPostByIdAndWriterNameId(final Long postId, final Long userId); + List findByTopic(final Topic topic); } diff --git a/module-domain/src/main/java/com/mile/post/service/PostCuriousService.java b/module-domain/src/main/java/com/mile/post/service/PostCuriousService.java index b72a83f1..3b67237b 100644 --- a/module-domain/src/main/java/com/mile/post/service/PostCuriousService.java +++ b/module-domain/src/main/java/com/mile/post/service/PostCuriousService.java @@ -3,8 +3,8 @@ import com.mile.exception.message.ErrorMessage; import com.mile.exception.model.NotFoundException; import com.mile.moim.domain.Moim; -import com.mile.moim.serivce.dto.MoimCuriousPostListResponse; -import com.mile.moim.serivce.dto.MoimMostCuriousPostResponse; +import com.mile.moim.service.dto.MoimCuriousPostListResponse; +import com.mile.moim.service.dto.MoimMostCuriousPostResponse; import com.mile.post.domain.Post; import com.mile.post.repository.PostRepository; import lombok.RequiredArgsConstructor;