#69 [feat] conflict 해결

Mile-Writings · Jan 11, 2024 · e207ae0 · e207ae0
1 parent 0ab58c3
commit e207ae0
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 34 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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/...m/mile/moim/dto/CategoryListResponse.java → ...oim/service/dto/CategoryListResponse.java b/...m/mile/moim/dto/CategoryListResponse.java → ...oim/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/...om/mile/moim/dto/ContentListResponse.java → ...moim/service/dto/ContentListResponse.java b/...om/mile/moim/dto/ContentListResponse.java → ...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/...le/moim/dto/MoimAuthenticateResponse.java → ...service/dto/MoimAuthenticateResponse.java b/...le/moim/dto/MoimAuthenticateResponse.java → ...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/...moim/dto/MoimCuriousPostListResponse.java → ...vice/dto/MoimCuriousPostListResponse.java b/...moim/dto/MoimCuriousPostListResponse.java → ...vice/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/...a/com/mile/moim/dto/MoimInfoResponse.java → ...le/moim/service/dto/MoimInfoResponse.java b/...a/com/mile/moim/dto/MoimInfoResponse.java → ...le/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/...moim/dto/MoimMostCuriousPostResponse.java → ...vice/dto/MoimMostCuriousPostResponse.java b/...moim/dto/MoimMostCuriousPostResponse.java → ...vice/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/.../com/mile/moim/dto/MoimTopicResponse.java → ...e/moim/service/dto/MoimTopicResponse.java b/.../com/mile/moim/dto/MoimTopicResponse.java → ...e/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
@@ -6,7 +6,8 @@
 
 import java.util.List;
 
-public interface PostRepository extends JpaRepository<Post, Long> {
+public interface PostRepository extends JpaRepository<Post, Long>, PostRepositoryCustom {
     boolean existsPostByIdAndWriterNameId(final Long postId, final Long userId);
+
     List<Post> 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
@@ -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;