[feat/CK-242] 로드맵 관련 부분 의존성 리팩토링을 한다

backend/kirikiri/build.gradle

@@ -73,6 +73,7 @@ jacocoTestReport {
                     fileTree(dir: it, excludes: [
                             "co/kirikiri/persistence/QuerydslRepositorySupporter",
                             "co/kirikiri/domain/**",
+                            "co/kirikiri/**/domain/**",
                             "co/kirikiri/persistence/goalroom/dto/**",
                             "**/*Application*",
                             "**/*Config*",
@@ -115,7 +116,8 @@ jacocoTestCoverageVerification {
 
             excludes = [
                     "co.kirikiri.persistence.QuerydslRepositorySupporter",
-                    "co.kirikiri.domain.**.**",
+                    "co.kirikiri.domain.**",
+                    "co.kirikiri.**.domain.**",
                     "co.kirikiri.persistence.goalroom.dto.**",
                     "**.*Application*",
                     "**.*Config*",

backend/kirikiri/src/main/java/co/kirikiri/common/resolver/RoadmapSaveArgumentResolver.java

@@ -1,98 +1,6 @@
 package co.kirikiri.common.resolver;
 
-import co.kirikiri.service.dto.roadmap.request.RoadmapNodeSaveRequest;
-import co.kirikiri.service.dto.roadmap.request.RoadmapSaveRequest;
-import co.kirikiri.service.exception.BadRequestException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
-import lombok.RequiredArgsConstructor;
-import org.springframework.core.MethodParameter;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.DataBinder;
-import org.springframework.validation.Validator;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.support.WebDataBinderFactory;
-import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.method.support.ModelAndViewContainer;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.support.StandardServletMultipartResolver;
 
-@Component
-@RequiredArgsConstructor
-public class RoadmapSaveArgumentResolver implements HandlerMethodArgumentResolver {
-
-    private final ObjectMapper objectMapper;
-    private final Validator validator;
-
-    @Override
-    public boolean supportsParameter(final MethodParameter parameter) {
-        return parameter.getParameterType().equals(RoadmapSaveRequest.class);
-    }
-
-    @Override
-    public Object resolveArgument(final MethodParameter parameter, final ModelAndViewContainer mavContainer,
-                                  final NativeWebRequest nativeWebRequest, final WebDataBinderFactory binderFactory)
-            throws MethodArgumentNotValidException {
-        final HttpServletRequest request = (HttpServletRequest) nativeWebRequest.getNativeRequest();
-        checkMultipart(request);
-        final MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        final RoadmapSaveRequest roadmapSaveRequestNotIncludeImage = makeRoadmapSaveRequestNotIncludeImage(
-                multipartRequest);
-        validateRequest(parameter, roadmapSaveRequestNotIncludeImage);
-        return makeRoadmapSaveRequestIncludeImage(roadmapSaveRequestNotIncludeImage, multipartRequest);
-    }
-
-    private void checkMultipart(final HttpServletRequest request) {
-        final MultipartResolver multipartResolver = new StandardServletMultipartResolver();
-        if (!multipartResolver.isMultipart(request)) {
-            throw new BadRequestException("multipart/form-data 형식으로 들어와야합니다.");
-        }
-    }
-
-    private RoadmapSaveRequest makeRoadmapSaveRequestNotIncludeImage(
-            final MultipartHttpServletRequest multipartRequest) {
-        final String jsonData = getJsonData(multipartRequest);
-        return bindRoadmapSaveRequest(jsonData);
-    }
-
-    private void validateRequest(final MethodParameter parameter, final RoadmapSaveRequest roadmapSaveRequest)
-            throws MethodArgumentNotValidException {
-        final DataBinder binder = new DataBinder(roadmapSaveRequest);
-        binder.setValidator(validator);
-        binder.validate();
-
-        if (binder.getBindingResult().hasErrors()) {
-            throw new MethodArgumentNotValidException(parameter, binder.getBindingResult());
-        }
-    }
-
-    private RoadmapSaveRequest makeRoadmapSaveRequestIncludeImage(final RoadmapSaveRequest roadmapSaveRequest,
-                                                                  final MultipartHttpServletRequest multipartRequest) {
-        for (final RoadmapNodeSaveRequest roadmapNode : roadmapSaveRequest.roadmapNodes()) {
-            final List<MultipartFile> images = multipartRequest.getFiles(roadmapNode.getTitle());
-            roadmapNode.setImages(images);
-        }
-        return roadmapSaveRequest;
-    }
-
-    private String getJsonData(final MultipartHttpServletRequest multipartRequest) {
-        final String jsonData = multipartRequest.getParameter("jsonData");
-        if (jsonData == null) {
-            throw new BadRequestException("로드맵 생성 시 jsonData는 필수입니다.");
-        }
-        return multipartRequest.getParameter("jsonData");
-    }
-
-    private RoadmapSaveRequest bindRoadmapSaveRequest(final String jsonData) {
-        try {
-            return objectMapper.readValue(jsonData, RoadmapSaveRequest.class);
-        } catch (final JsonProcessingException exception) {
-            throw new BadRequestException("로드맵 생성 요청 형식이 틀렸습니다.");
-        }
-    }
+public interface RoadmapSaveArgumentResolver extends HandlerMethodArgumentResolver {
 }

backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoom.java

@@ -5,7 +5,7 @@
 import co.kirikiri.domain.goalroom.vo.GoalRoomName;
 import co.kirikiri.domain.goalroom.vo.LimitedMemberCount;
 import co.kirikiri.domain.member.Member;
-import co.kirikiri.domain.roadmap.RoadmapContent;
+import co.kirikiri.roadmap.domain.RoadmapContent;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoomRoadmapNode.java

@@ -3,7 +3,7 @@
 import co.kirikiri.domain.BaseEntity;
 import co.kirikiri.domain.goalroom.exception.GoalRoomException;
 import co.kirikiri.domain.goalroom.vo.Period;
-import co.kirikiri.domain.roadmap.RoadmapNode;
+import co.kirikiri.roadmap.domain.RoadmapNode;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

backend/kirikiri/src/main/java/co/kirikiri/persistence/goalroom/GoalRoomMemberQueryRepositoryImpl.java

@@ -1,23 +1,24 @@
 package co.kirikiri.persistence.goalroom;
 
-import static co.kirikiri.domain.goalroom.QGoalRoom.goalRoom;
-import static co.kirikiri.domain.goalroom.QGoalRoomMember.goalRoomMember;
-import static co.kirikiri.domain.member.QMember.member;
-import static co.kirikiri.domain.member.QMemberImage.memberImage;
-import static co.kirikiri.domain.roadmap.QRoadmapContent.roadmapContent;
-import static co.kirikiri.persistence.goalroom.dto.GoalRoomMemberSortType.ACCOMPLISHMENT_RATE;
-import static co.kirikiri.persistence.goalroom.dto.GoalRoomMemberSortType.JOINED_ASC;
-
 import co.kirikiri.domain.goalroom.GoalRoomMember;
 import co.kirikiri.domain.goalroom.GoalRoomStatus;
 import co.kirikiri.domain.member.vo.Identifier;
 import co.kirikiri.persistence.QuerydslRepositorySupporter;
 import co.kirikiri.persistence.goalroom.dto.GoalRoomMemberSortType;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.dsl.BooleanExpression;
+
 import java.util.List;
 import java.util.Optional;
 
+import static co.kirikiri.domain.goalroom.QGoalRoom.goalRoom;
+import static co.kirikiri.domain.goalroom.QGoalRoomMember.goalRoomMember;
+import static co.kirikiri.domain.member.QMember.member;
+import static co.kirikiri.domain.member.QMemberImage.memberImage;
+import static co.kirikiri.persistence.goalroom.dto.GoalRoomMemberSortType.ACCOMPLISHMENT_RATE;
+import static co.kirikiri.persistence.goalroom.dto.GoalRoomMemberSortType.JOINED_ASC;
+import static co.kirikiri.roadmap.domain.QRoadmapContent.roadmapContent;
+
 public class GoalRoomMemberQueryRepositoryImpl extends QuerydslRepositorySupporter implements
         GoalRoomMemberQueryRepository {
 

backend/kirikiri/src/main/java/co/kirikiri/persistence/goalroom/GoalRoomQueryRepository.java

@@ -3,7 +3,7 @@
 import co.kirikiri.domain.goalroom.GoalRoom;
 import co.kirikiri.domain.goalroom.GoalRoomStatus;
 import co.kirikiri.domain.member.Member;
-import co.kirikiri.domain.roadmap.Roadmap;
+import co.kirikiri.roadmap.domain.Roadmap;
 import co.kirikiri.persistence.goalroom.dto.RoadmapGoalRoomsOrderType;
 import java.time.LocalDate;
 import java.util.List;

backend/kirikiri/src/main/java/co/kirikiri/persistence/goalroom/GoalRoomQueryRepositoryImpl.java

@@ -1,25 +1,26 @@
 package co.kirikiri.persistence.goalroom;
 
-import static co.kirikiri.domain.goalroom.QGoalRoom.goalRoom;
-import static co.kirikiri.domain.goalroom.QGoalRoomMember.goalRoomMember;
-import static co.kirikiri.domain.goalroom.QGoalRoomPendingMember.goalRoomPendingMember;
-import static co.kirikiri.domain.goalroom.QGoalRoomRoadmapNode.goalRoomRoadmapNode;
-import static co.kirikiri.domain.goalroom.QGoalRoomToDo.goalRoomToDo;
-import static co.kirikiri.domain.roadmap.QRoadmapContent.roadmapContent;
-
 import co.kirikiri.domain.goalroom.GoalRoom;
 import co.kirikiri.domain.goalroom.GoalRoomStatus;
 import co.kirikiri.domain.member.Member;
-import co.kirikiri.domain.roadmap.Roadmap;
 import co.kirikiri.persistence.QuerydslRepositorySupporter;
 import co.kirikiri.persistence.goalroom.dto.RoadmapGoalRoomsOrderType;
+import co.kirikiri.roadmap.domain.Roadmap;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import jakarta.persistence.LockModeType;
+
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
+import static co.kirikiri.domain.goalroom.QGoalRoom.goalRoom;
+import static co.kirikiri.domain.goalroom.QGoalRoomMember.goalRoomMember;
+import static co.kirikiri.domain.goalroom.QGoalRoomPendingMember.goalRoomPendingMember;
+import static co.kirikiri.domain.goalroom.QGoalRoomRoadmapNode.goalRoomRoadmapNode;
+import static co.kirikiri.domain.goalroom.QGoalRoomToDo.goalRoomToDo;
+import static co.kirikiri.roadmap.domain.QRoadmapContent.roadmapContent;
+
 public class GoalRoomQueryRepositoryImpl extends QuerydslRepositorySupporter implements GoalRoomQueryRepository {
 
     private static final int LIMIT_OFFSET = 1;

backend/kirikiri/src/main/java/co/kirikiri/persistence/goalroom/GoalRoomRepository.java

@@ -1,13 +1,14 @@
 package co.kirikiri.persistence.goalroom;
 
 import co.kirikiri.domain.goalroom.GoalRoom;
+import org.springframework.data.jpa.repository.JpaRepository;
+
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
-import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface GoalRoomRepository extends JpaRepository<GoalRoom, Long>, GoalRoomQueryRepository {
-    
+
     Optional<GoalRoom> findById(final Long goalRoomId);
 
     List<GoalRoom> findAllByEndDate(final LocalDate endDate);

backend/kirikiri/src/main/java/co/kirikiri/controller/RoadmapController.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/controller/RoadmapController.java

@@ -1,25 +1,23 @@
-package co.kirikiri.controller;
+package co.kirikiri.roadmap.controller;
 
 import co.kirikiri.common.interceptor.Authenticated;
 import co.kirikiri.common.resolver.MemberIdentifier;
+import co.kirikiri.roadmap.service.RoadmapCreateService;
+import co.kirikiri.roadmap.service.RoadmapReadService;
+import co.kirikiri.roadmap.service.dto.RoadmapGoalRoomsOrderTypeDto;
+import co.kirikiri.roadmap.service.dto.request.RoadmapCategorySaveRequest;
+import co.kirikiri.roadmap.service.dto.request.RoadmapOrderTypeRequest;
+import co.kirikiri.roadmap.service.dto.request.RoadmapReviewSaveRequest;
+import co.kirikiri.roadmap.service.dto.request.RoadmapSaveRequest;
+import co.kirikiri.roadmap.service.dto.request.RoadmapSearchRequest;
+import co.kirikiri.roadmap.service.dto.response.MemberRoadmapResponses;
+import co.kirikiri.roadmap.service.dto.response.RoadmapCategoryResponse;
+import co.kirikiri.roadmap.service.dto.response.RoadmapForListResponses;
+import co.kirikiri.roadmap.service.dto.response.RoadmapGoalRoomResponses;
+import co.kirikiri.roadmap.service.dto.response.RoadmapResponse;
+import co.kirikiri.roadmap.service.dto.response.RoadmapReviewResponse;
 import co.kirikiri.service.dto.CustomScrollRequest;
-import co.kirikiri.service.dto.roadmap.RoadmapGoalRoomsOrderTypeDto;
-import co.kirikiri.service.dto.roadmap.request.RoadmapCategorySaveRequest;
-import co.kirikiri.service.dto.roadmap.request.RoadmapOrderTypeRequest;
-import co.kirikiri.service.dto.roadmap.request.RoadmapReviewSaveRequest;
-import co.kirikiri.service.dto.roadmap.request.RoadmapSaveRequest;
-import co.kirikiri.service.dto.roadmap.request.RoadmapSearchRequest;
-import co.kirikiri.service.dto.roadmap.response.MemberRoadmapResponses;
-import co.kirikiri.service.dto.roadmap.response.RoadmapCategoryResponse;
-import co.kirikiri.service.dto.roadmap.response.RoadmapForListResponses;
-import co.kirikiri.service.dto.roadmap.response.RoadmapGoalRoomResponses;
-import co.kirikiri.service.dto.roadmap.response.RoadmapResponse;
-import co.kirikiri.service.dto.roadmap.response.RoadmapReviewResponse;
-import co.kirikiri.service.roadmap.RoadmapCreateService;
-import co.kirikiri.service.roadmap.RoadmapReadService;
 import jakarta.validation.Valid;
-import java.net.URI;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -34,6 +32,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.net.URI;
+import java.util.List;
+
 @RestController
 @RequestMapping("/roadmaps")
 @RequiredArgsConstructor

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/Roadmap.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/Roadmap.java

@@ -1,8 +1,8 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import co.kirikiri.domain.BaseCreatedTimeEntity;
 import co.kirikiri.domain.member.Member;
-import co.kirikiri.domain.roadmap.exception.RoadmapException;
+import co.kirikiri.roadmap.domain.exception.RoadmapException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapCategory.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapCategory.java

@@ -1,7 +1,7 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import co.kirikiri.domain.BaseEntity;
-import co.kirikiri.domain.roadmap.exception.RoadmapException;
+import co.kirikiri.roadmap.domain.exception.RoadmapException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import lombok.AccessLevel;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapContent.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapContent.java

@@ -1,7 +1,7 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import co.kirikiri.domain.BaseUpdatedTimeEntity;
-import co.kirikiri.domain.roadmap.exception.RoadmapException;
+import co.kirikiri.roadmap.domain.exception.RoadmapException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapContents.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapContents.java

@@ -1,4 +1,4 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapDifficulty.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapDifficulty.java

@@ -1,4 +1,4 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 public enum RoadmapDifficulty {
 

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapNode.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapNode.java

@@ -1,7 +1,7 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import co.kirikiri.domain.BaseEntity;
-import co.kirikiri.domain.roadmap.exception.RoadmapException;
+import co.kirikiri.roadmap.domain.exception.RoadmapException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapNodeImage.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapNodeImage.java

@@ -1,4 +1,4 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import co.kirikiri.domain.BaseEntity;
 import co.kirikiri.domain.ImageContentType;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapNodeImages.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapNodeImages.java

@@ -1,6 +1,6 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
-import co.kirikiri.domain.roadmap.exception.RoadmapException;
+import co.kirikiri.roadmap.domain.exception.RoadmapException;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.FetchType;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapNodes.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapNodes.java

@@ -1,6 +1,6 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
-import co.kirikiri.domain.roadmap.exception.RoadmapException;
+import co.kirikiri.roadmap.domain.exception.RoadmapException;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.FetchType;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapReview.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapReview.java

@@ -1,8 +1,8 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import co.kirikiri.domain.BaseUpdatedTimeEntity;
 import co.kirikiri.domain.member.Member;
-import co.kirikiri.domain.roadmap.exception.RoadmapException;
+import co.kirikiri.roadmap.domain.exception.RoadmapException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapReviews.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapReviews.java

@@ -1,4 +1,4 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapStatus.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapStatus.java

@@ -1,4 +1,4 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 public enum RoadmapStatus {
 

backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/RoadmapTag.java → backend/kirikiri/src/main/java/co/kirikiri/roadmap/domain/RoadmapTag.java

@@ -1,7 +1,7 @@
-package co.kirikiri.domain.roadmap;
+package co.kirikiri.roadmap.domain;
 
 import co.kirikiri.domain.BaseEntity;
-import co.kirikiri.domain.roadmap.vo.RoadmapTagName;
+import co.kirikiri.roadmap.domain.vo.RoadmapTagName;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import lombok.AccessLevel;