diff --git a/src/main/java/com/moplus/moplus_server/domain/concept/controller/ConceptTagController.java b/src/main/java/com/moplus/moplus_server/admin/concept/controller/ConceptTagController.java similarity index 88% rename from src/main/java/com/moplus/moplus_server/domain/concept/controller/ConceptTagController.java rename to src/main/java/com/moplus/moplus_server/admin/concept/controller/ConceptTagController.java index 9670ed7..66de3fd 100644 --- a/src/main/java/com/moplus/moplus_server/domain/concept/controller/ConceptTagController.java +++ b/src/main/java/com/moplus/moplus_server/admin/concept/controller/ConceptTagController.java @@ -1,6 +1,6 @@ -package com.moplus.moplus_server.domain.concept.controller; +package com.moplus.moplus_server.admin.concept.controller; -import com.moplus.moplus_server.domain.concept.dto.response.ConceptTagResponse; +import com.moplus.moplus_server.admin.concept.dto.response.ConceptTagResponse; import com.moplus.moplus_server.domain.concept.repository.ConceptTagRepository; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/moplus/moplus_server/domain/concept/dto/response/ConceptTagResponse.java b/src/main/java/com/moplus/moplus_server/admin/concept/dto/response/ConceptTagResponse.java similarity index 89% rename from src/main/java/com/moplus/moplus_server/domain/concept/dto/response/ConceptTagResponse.java rename to src/main/java/com/moplus/moplus_server/admin/concept/dto/response/ConceptTagResponse.java index 0f5e5cd..a1616d5 100644 --- a/src/main/java/com/moplus/moplus_server/domain/concept/dto/response/ConceptTagResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/concept/dto/response/ConceptTagResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.concept.dto.response; +package com.moplus.moplus_server.admin.concept.dto.response; import com.moplus.moplus_server.domain.concept.domain.ConceptTag; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java b/src/main/java/com/moplus/moplus_server/admin/problem/controller/ImageUploadController.java similarity index 92% rename from src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java rename to src/main/java/com/moplus/moplus_server/admin/problem/controller/ImageUploadController.java index 9afcfc1..269bafe 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/controller/ImageUploadController.java @@ -1,7 +1,7 @@ -package com.moplus.moplus_server.domain.problem.controller; +package com.moplus.moplus_server.admin.problem.controller; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemImageType; -import com.moplus.moplus_server.domain.problem.dto.response.PresignedUrlResponse; +import com.moplus.moplus_server.admin.problem.dto.response.PresignedUrlResponse; import com.moplus.moplus_server.domain.problem.service.ImageUploadService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/controller/PracticeTestTagController.java b/src/main/java/com/moplus/moplus_server/admin/problem/controller/PracticeTestTagController.java similarity index 88% rename from src/main/java/com/moplus/moplus_server/domain/problem/controller/PracticeTestTagController.java rename to src/main/java/com/moplus/moplus_server/admin/problem/controller/PracticeTestTagController.java index ba0703c..cb28ae5 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/controller/PracticeTestTagController.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/controller/PracticeTestTagController.java @@ -1,6 +1,6 @@ -package com.moplus.moplus_server.domain.problem.controller; +package com.moplus.moplus_server.admin.problem.controller; -import com.moplus.moplus_server.domain.problem.dto.response.PracticeTestTagResponse; +import com.moplus.moplus_server.admin.problem.dto.response.PracticeTestTagResponse; import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemController.java b/src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemController.java similarity index 91% rename from src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemController.java rename to src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemController.java index bf72756..ca0f89f 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemController.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemController.java @@ -1,9 +1,9 @@ -package com.moplus.moplus_server.domain.problem.controller; +package com.moplus.moplus_server.admin.problem.controller; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemGetResponse; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemPostResponse; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemPostResponse; import com.moplus.moplus_server.domain.problem.service.ChildProblemService; import com.moplus.moplus_server.domain.problem.service.ProblemDeleteService; import com.moplus.moplus_server.domain.problem.service.ProblemGetService; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemSearchController.java b/src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemSearchController.java similarity index 91% rename from src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemSearchController.java rename to src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemSearchController.java index 1ddf542..493a5b1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemSearchController.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemSearchController.java @@ -1,6 +1,6 @@ -package com.moplus.moplus_server.domain.problem.controller; +package com.moplus.moplus_server.admin.problem.controller; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemSearchGetResponse; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemSearchGetResponse; import com.moplus.moplus_server.domain.problem.repository.ProblemSearchRepositoryCustom; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemDeleteRequest.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemDeleteRequest.java similarity index 55% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemDeleteRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemDeleteRequest.java index 07615cb..e905b29 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemDeleteRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemDeleteRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.request; +package com.moplus.moplus_server.admin.problem.dto.request; public record ChildProblemDeleteRequest( Long childProblemId diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemPostRequest.java similarity index 86% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemPostRequest.java index 7df4684..93b9c3f 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemPostRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.request; +package com.moplus.moplus_server.admin.problem.dto.request; import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemUpdateRequest.java similarity index 90% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemUpdateRequest.java index 0d4e088..bc3b5e3 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemUpdateRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.request; +package com.moplus.moplus_server.admin.problem.dto.request; import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemPostRequest.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemPostRequest.java similarity index 93% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemPostRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemPostRequest.java index 94f597f..1819bd1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemPostRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemPostRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.request; +package com.moplus.moplus_server.admin.problem.dto.request; import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag; import com.moplus.moplus_server.domain.problem.domain.problem.Problem; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemUpdateRequest.java similarity index 94% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemUpdateRequest.java index a5aa604..e7e4194 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemUpdateRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.request; +package com.moplus.moplus_server.admin.problem.dto.request; import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ChildProblemGetResponse.java similarity index 95% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ChildProblemGetResponse.java index c2ad8f4..3d4467e 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ChildProblemGetResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.response; +package com.moplus.moplus_server.admin.problem.dto.response; import com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem; import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ConceptTagSearchResponse.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ConceptTagSearchResponse.java similarity index 88% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ConceptTagSearchResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ConceptTagSearchResponse.java index 1229df6..db28863 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ConceptTagSearchResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ConceptTagSearchResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.response; +package com.moplus.moplus_server.admin.problem.dto.response; import jakarta.validation.constraints.NotNull; import lombok.Getter; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PracticeTestTagResponse.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PracticeTestTagResponse.java similarity index 90% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PracticeTestTagResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PracticeTestTagResponse.java index 3f2a344..81406f2 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PracticeTestTagResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PracticeTestTagResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.response; +package com.moplus.moplus_server.admin.problem.dto.response; import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PresignedUrlResponse.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PresignedUrlResponse.java similarity index 84% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PresignedUrlResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PresignedUrlResponse.java index 56a2d2e..0943be9 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PresignedUrlResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PresignedUrlResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.response; +package com.moplus.moplus_server.admin.problem.dto.response; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemGetResponse.java similarity index 97% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemGetResponse.java index 805d018..4bbf43c 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemGetResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.response; +package com.moplus.moplus_server.admin.problem.dto.response; import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType; import com.moplus.moplus_server.domain.problem.domain.problem.Problem; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemPostResponse.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemPostResponse.java similarity index 88% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemPostResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemPostResponse.java index 5715c5c..59a80ae 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemPostResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemPostResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.response; +package com.moplus.moplus_server.admin.problem.dto.response; import com.moplus.moplus_server.domain.problem.domain.problem.Problem; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemSearchGetResponse.java similarity index 95% rename from src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemSearchGetResponse.java index b2a47ef..f4a1564 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemSearchGetResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problem.dto.response; +package com.moplus.moplus_server.admin.problem.dto.response; import jakarta.validation.constraints.NotNull; import java.util.Set; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetController.java b/src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetController.java similarity index 92% rename from src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetController.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetController.java index 80aaffb..5d653ba 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetController.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetController.java @@ -1,9 +1,9 @@ -package com.moplus.moplus_server.domain.problemset.controller; +package com.moplus.moplus_server.admin.problemset.controller; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; -import com.moplus.moplus_server.domain.problemset.dto.request.ProblemReorderRequest; -import com.moplus.moplus_server.domain.problemset.dto.request.ProblemSetUpdateRequest; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetGetResponse; +import com.moplus.moplus_server.admin.problemset.dto.request.ProblemReorderRequest; +import com.moplus.moplus_server.admin.problemset.dto.request.ProblemSetUpdateRequest; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetGetResponse; import com.moplus.moplus_server.domain.problemset.service.ProblemSetDeleteService; import com.moplus.moplus_server.domain.problemset.service.ProblemSetGetService; import com.moplus.moplus_server.domain.problemset.service.ProblemSetSaveService; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetSearchController.java b/src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetSearchController.java similarity index 94% rename from src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetSearchController.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetSearchController.java index 0b65a47..62e187f 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetSearchController.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetSearchController.java @@ -1,7 +1,7 @@ -package com.moplus.moplus_server.domain.problemset.controller; +package com.moplus.moplus_server.admin.problemset.controller; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetSearchGetResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetSearchGetResponse; import com.moplus.moplus_server.domain.problemset.repository.ProblemSetSearchRepositoryCustom; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemReorderRequest.java similarity index 76% rename from src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemReorderRequest.java index bd4e0fa..8751792 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemReorderRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problemset.dto.request; +package com.moplus.moplus_server.admin.problemset.dto.request; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetPostRequest.java similarity index 89% rename from src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetPostRequest.java index 4b8a872..3011ba3 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetPostRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problemset.dto.request; +package com.moplus.moplus_server.admin.problemset.dto.request; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetUpdateRequest.java similarity index 79% rename from src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetUpdateRequest.java index 97d6d48..77cd72a 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetUpdateRequest.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problemset.dto.request; +package com.moplus.moplus_server.admin.problemset.dto.request; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetGetResponse.java similarity index 94% rename from src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetGetResponse.java index c4c47fa..4acf20f 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetGetResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problemset.dto.response; +package com.moplus.moplus_server.admin.problemset.dto.response; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetSearchGetResponse.java similarity index 93% rename from src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetSearchGetResponse.java index dd2eef1..616e22c 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetSearchGetResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problemset.dto.response; +package com.moplus.moplus_server.admin.problemset.dto.response; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSummaryResponse.java similarity index 94% rename from src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSummaryResponse.java index c366b6a..a3c0df1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSummaryResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problemset.dto.response; +package com.moplus.moplus_server.admin.problemset.dto.response; import com.moplus.moplus_server.domain.problem.domain.problem.Problem; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemThumbnailResponse.java b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemThumbnailResponse.java similarity index 88% rename from src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemThumbnailResponse.java rename to src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemThumbnailResponse.java index 2cbef8f..4410a7d 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemThumbnailResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemThumbnailResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.problemset.dto.response; +package com.moplus.moplus_server.admin.problemset.dto.response; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/controller/PublishController.java b/src/main/java/com/moplus/moplus_server/admin/publish/controller/PublishController.java similarity index 82% rename from src/main/java/com/moplus/moplus_server/domain/publish/controller/PublishController.java rename to src/main/java/com/moplus/moplus_server/admin/publish/controller/PublishController.java index 7a53f8d..ae1b1a6 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/controller/PublishController.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/controller/PublishController.java @@ -1,10 +1,10 @@ -package com.moplus.moplus_server.domain.publish.controller; +package com.moplus.moplus_server.admin.publish.controller; -import com.moplus.moplus_server.domain.publish.dto.request.PublishPostRequest; -import com.moplus.moplus_server.domain.publish.dto.response.PublishMonthGetResponse; -import com.moplus.moplus_server.domain.publish.service.PublishDeleteService; -import com.moplus.moplus_server.domain.publish.service.PublishGetService; -import com.moplus.moplus_server.domain.publish.service.PublishSaveService; +import com.moplus.moplus_server.admin.publish.dto.request.PublishPostRequest; +import com.moplus.moplus_server.admin.publish.dto.response.PublishMonthGetResponse; +import com.moplus.moplus_server.admin.publish.service.PublishDeleteService; +import com.moplus.moplus_server.admin.publish.service.PublishGetService; +import com.moplus.moplus_server.admin.publish.service.PublishSaveService; import com.moplus.moplus_server.global.response.IdResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/domain/Publish.java b/src/main/java/com/moplus/moplus_server/admin/publish/domain/Publish.java similarity index 96% rename from src/main/java/com/moplus/moplus_server/domain/publish/domain/Publish.java rename to src/main/java/com/moplus/moplus_server/admin/publish/domain/Publish.java index 6c8c844..5a60f3e 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/domain/Publish.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/domain/Publish.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.publish.domain; +package com.moplus.moplus_server.admin.publish.domain; import com.moplus.moplus_server.global.common.BaseEntity; import com.moplus.moplus_server.global.error.exception.ErrorCode; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/dto/request/PublishPostRequest.java b/src/main/java/com/moplus/moplus_server/admin/publish/dto/request/PublishPostRequest.java similarity index 76% rename from src/main/java/com/moplus/moplus_server/domain/publish/dto/request/PublishPostRequest.java rename to src/main/java/com/moplus/moplus_server/admin/publish/dto/request/PublishPostRequest.java index 7d3960e..6ea83bc 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/dto/request/PublishPostRequest.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/dto/request/PublishPostRequest.java @@ -1,6 +1,6 @@ -package com.moplus.moplus_server.domain.publish.dto.request; +package com.moplus.moplus_server.admin.publish.dto.request; -import com.moplus.moplus_server.domain.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.domain.Publish; import jakarta.validation.constraints.NotNull; import java.time.LocalDate; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishMonthGetResponse.java b/src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishMonthGetResponse.java similarity index 81% rename from src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishMonthGetResponse.java rename to src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishMonthGetResponse.java index 8f86220..00e3e25 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishMonthGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishMonthGetResponse.java @@ -1,6 +1,6 @@ -package com.moplus.moplus_server.domain.publish.dto.response; +package com.moplus.moplus_server.admin.publish.dto.response; -import com.moplus.moplus_server.domain.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.domain.Publish; import java.time.LocalDate; import lombok.Builder; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishProblemSetResponse.java b/src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishProblemSetResponse.java similarity index 87% rename from src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishProblemSetResponse.java rename to src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishProblemSetResponse.java index 1afc053..9a80ef0 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishProblemSetResponse.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishProblemSetResponse.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.publish.dto.response; +package com.moplus.moplus_server.admin.publish.dto.response; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; import lombok.Builder; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/service/PublishDeleteService.java b/src/main/java/com/moplus/moplus_server/admin/publish/service/PublishDeleteService.java similarity index 83% rename from src/main/java/com/moplus/moplus_server/domain/publish/service/PublishDeleteService.java rename to src/main/java/com/moplus/moplus_server/admin/publish/service/PublishDeleteService.java index 039ac00..0dbe8a2 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/service/PublishDeleteService.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/service/PublishDeleteService.java @@ -1,6 +1,6 @@ -package com.moplus.moplus_server.domain.publish.service; +package com.moplus.moplus_server.admin.publish.service; -import com.moplus.moplus_server.domain.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.domain.Publish; import com.moplus.moplus_server.domain.publish.repository.PublishRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/service/PublishGetService.java b/src/main/java/com/moplus/moplus_server/admin/publish/service/PublishGetService.java similarity index 89% rename from src/main/java/com/moplus/moplus_server/domain/publish/service/PublishGetService.java rename to src/main/java/com/moplus/moplus_server/admin/publish/service/PublishGetService.java index bca2511..d15f2c2 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/service/PublishGetService.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/service/PublishGetService.java @@ -1,10 +1,10 @@ -package com.moplus.moplus_server.domain.publish.service; +package com.moplus.moplus_server.admin.publish.service; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository; -import com.moplus.moplus_server.domain.publish.domain.Publish; -import com.moplus.moplus_server.domain.publish.dto.response.PublishMonthGetResponse; -import com.moplus.moplus_server.domain.publish.dto.response.PublishProblemSetResponse; +import com.moplus.moplus_server.admin.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.dto.response.PublishMonthGetResponse; +import com.moplus.moplus_server.admin.publish.dto.response.PublishProblemSetResponse; import com.moplus.moplus_server.domain.publish.repository.PublishRepository; import com.moplus.moplus_server.global.error.exception.ErrorCode; import com.moplus.moplus_server.global.error.exception.InvalidValueException; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/service/PublishSaveService.java b/src/main/java/com/moplus/moplus_server/admin/publish/service/PublishSaveService.java similarity index 81% rename from src/main/java/com/moplus/moplus_server/domain/publish/service/PublishSaveService.java rename to src/main/java/com/moplus/moplus_server/admin/publish/service/PublishSaveService.java index 8d0dbd8..92b80aa 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/service/PublishSaveService.java +++ b/src/main/java/com/moplus/moplus_server/admin/publish/service/PublishSaveService.java @@ -1,8 +1,8 @@ -package com.moplus.moplus_server.domain.publish.service; +package com.moplus.moplus_server.admin.publish.service; import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository; -import com.moplus.moplus_server.domain.publish.domain.Publish; -import com.moplus.moplus_server.domain.publish.dto.request.PublishPostRequest; +import com.moplus.moplus_server.admin.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.dto.request.PublishPostRequest; import com.moplus.moplus_server.domain.publish.repository.PublishRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/moplus/moplus_server/client/submit/controller/.gitkeep b/src/main/java/com/moplus/moplus_server/client/submit/controller/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmit.java b/src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmit.java new file mode 100644 index 0000000..c7bb92c --- /dev/null +++ b/src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmit.java @@ -0,0 +1,40 @@ +package com.moplus.moplus_server.client.submit.domain; + +import com.moplus.moplus_server.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ChildProblemSubmit extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "child_problem_submit_id") + private Long id; + + @Column(name = "member_id", nullable = false) + private Long memberId; + + @Column(name = "publish_id", nullable = false) + private Long publishId; + + @Column(name = "child_problem_id", nullable = false) + private Long childProblemId; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private ChildProblemSubmitStatus status; + + @Builder + public ChildProblemSubmit(Long memberId, Long publishId, Long childProblemId, ChildProblemSubmitStatus status) { + this.memberId = memberId; + this.publishId = publishId; + this.childProblemId = childProblemId; + this.status = status; + } +} diff --git a/src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmitStatus.java b/src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmitStatus.java new file mode 100644 index 0000000..541c308 --- /dev/null +++ b/src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmitStatus.java @@ -0,0 +1,7 @@ +package com.moplus.moplus_server.client.submit.domain; + +public enum ChildProblemSubmitStatus { + CORRECT, + INCORRECT, + RETRY_CORRECT +} diff --git a/src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmit.java b/src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmit.java new file mode 100644 index 0000000..63ae280 --- /dev/null +++ b/src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmit.java @@ -0,0 +1,40 @@ +package com.moplus.moplus_server.client.submit.domain; + +import com.moplus.moplus_server.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ProblemSubmit extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "problem_submit_id") + private Long id; + + @Column(name = "member_id", nullable = false) + private Long memberId; + + @Column(name = "publish_id", nullable = false) + private Long publishId; + + @Column(name = "problem_id", nullable = false) + private Long problemId; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private ProblemSubmitStatus status; + + @Builder + public ProblemSubmit(Long memberId, Long publishId, Long problemId, ProblemSubmitStatus status) { + this.memberId = memberId; + this.publishId = publishId; + this.problemId = problemId; + this.status = status; + } +} diff --git a/src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmitStatus.java b/src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmitStatus.java new file mode 100644 index 0000000..e42b77d --- /dev/null +++ b/src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmitStatus.java @@ -0,0 +1,8 @@ +package com.moplus.moplus_server.client.submit.domain; + +public enum ProblemSubmitStatus { + CORRECT, + INCORRECT, + IN_PROGRESS, + RETRY_CORRECT +} diff --git a/src/main/java/com/moplus/moplus_server/client/submit/dto/.gitkeep b/src/main/java/com/moplus/moplus_server/client/submit/dto/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/moplus/moplus_server/client/submit/repository/.gitkeep b/src/main/java/com/moplus/moplus_server/client/submit/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/moplus/moplus_server/client/submit/service/.gitkeep b/src/main/java/com/moplus/moplus_server/client/submit/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/moplus/moplus_server/domain/auth/service/AuthService.java b/src/main/java/com/moplus/moplus_server/domain/auth/service/AuthService.java index b11bac9..8d215b1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/auth/service/AuthService.java +++ b/src/main/java/com/moplus/moplus_server/domain/auth/service/AuthService.java @@ -1,8 +1,8 @@ package com.moplus.moplus_server.domain.auth.service; import com.moplus.moplus_server.domain.auth.dto.response.TokenResponse; -import com.moplus.moplus_server.domain.member.domain.Member; -import com.moplus.moplus_server.domain.member.service.MemberService; +import com.moplus.moplus_server.member.domain.Member; +import com.moplus.moplus_server.member.service.MemberService; import com.moplus.moplus_server.global.error.exception.ErrorCode; import com.moplus.moplus_server.global.error.exception.InvalidValueException; import com.moplus.moplus_server.global.security.exception.JwtInvalidException; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java b/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java index 803ef2e..896ab78 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java @@ -4,8 +4,8 @@ import static com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem.childProblem; import static com.moplus.moplus_server.domain.problem.domain.problem.QProblem.problem; -import com.moplus.moplus_server.domain.problem.dto.response.ConceptTagSearchResponse; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemSearchGetResponse; +import com.moplus.moplus_server.admin.problem.dto.response.ConceptTagSearchResponse; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemSearchGetResponse; import com.querydsl.core.group.GroupBy; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemGetService.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemGetService.java index a3b0fa1..762fc2a 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemGetService.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemGetService.java @@ -1,7 +1,7 @@ package com.moplus.moplus_server.domain.problem.service; import com.moplus.moplus_server.domain.problem.domain.problem.Problem; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemGetResponse; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveService.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveService.java index 668233a..71dc0fd 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveService.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveService.java @@ -5,8 +5,8 @@ import com.moplus.moplus_server.domain.problem.domain.problem.ProblemAdminIdService; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemPostResponse; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemPostResponse; import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.domain.problem.service.mapper.ProblemMapper; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateService.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateService.java index 9fb950b..248bf11 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateService.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateService.java @@ -6,9 +6,9 @@ import com.moplus.moplus_server.domain.problem.domain.problem.Problem; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemAdminIdService; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemGetResponse; import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.domain.problem.service.mapper.ChildProblemMapper; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapper.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapper.java index 836f761..5d5eda9 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapper.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapper.java @@ -1,7 +1,7 @@ package com.moplus.moplus_server.domain.problem.service.mapper; import com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem; -import com.moplus.moplus_server.domain.problem.dto.request.ChildProblemUpdateRequest; +import com.moplus.moplus_server.admin.problem.dto.request.ChildProblemUpdateRequest; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapper.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapper.java index 2f67b1d..d527b95 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapper.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapper.java @@ -4,8 +4,8 @@ import com.moplus.moplus_server.domain.problem.domain.problem.Problem; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustom.java b/src/main/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustom.java index 7e8557a..7abd8a2 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustom.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustom.java @@ -4,8 +4,8 @@ import static com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus.CONFIRMED; import static com.moplus.moplus_server.domain.problemset.domain.QProblemSet.problemSet; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetSearchGetResponse; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemThumbnailResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetSearchGetResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemThumbnailResponse; import com.querydsl.core.group.GroupBy; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetService.java b/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetService.java index aea8091..ef66f46 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetService.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetService.java @@ -5,10 +5,10 @@ import com.moplus.moplus_server.domain.problem.domain.problem.Problem; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetGetResponse; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSummaryResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetGetResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSummaryResponse; import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository; -import com.moplus.moplus_server.domain.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.domain.Publish; import com.moplus.moplus_server.domain.publish.repository.PublishRepository; import com.moplus.moplus_server.global.error.exception.BusinessException; import com.moplus.moplus_server.global.error.exception.ErrorCode; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetUpdateService.java b/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetUpdateService.java index a82727d..4642d5b 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetUpdateService.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetUpdateService.java @@ -4,10 +4,10 @@ import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; -import com.moplus.moplus_server.domain.problemset.dto.request.ProblemReorderRequest; -import com.moplus.moplus_server.domain.problemset.dto.request.ProblemSetUpdateRequest; +import com.moplus.moplus_server.admin.problemset.dto.request.ProblemReorderRequest; +import com.moplus.moplus_server.admin.problemset.dto.request.ProblemSetUpdateRequest; import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository; -import com.moplus.moplus_server.domain.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.domain.Publish; import com.moplus.moplus_server.domain.publish.repository.PublishRepository; import com.moplus.moplus_server.global.error.exception.BusinessException; import com.moplus.moplus_server.global.error.exception.ErrorCode; diff --git a/src/main/java/com/moplus/moplus_server/domain/publish/repository/PublishRepository.java b/src/main/java/com/moplus/moplus_server/domain/publish/repository/PublishRepository.java index 9168947..d7422a1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/publish/repository/PublishRepository.java +++ b/src/main/java/com/moplus/moplus_server/domain/publish/repository/PublishRepository.java @@ -1,6 +1,6 @@ package com.moplus.moplus_server.domain.publish.repository; -import com.moplus.moplus_server.domain.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.domain.Publish; import com.moplus.moplus_server.global.error.exception.ErrorCode; import com.moplus.moplus_server.global.error.exception.NotFoundException; import java.time.LocalDate; diff --git a/src/main/java/com/moplus/moplus_server/global/annotation/AuthenticationArgumentResolver.java b/src/main/java/com/moplus/moplus_server/global/annotation/AuthenticationArgumentResolver.java index 3952759..d689a8c 100644 --- a/src/main/java/com/moplus/moplus_server/global/annotation/AuthenticationArgumentResolver.java +++ b/src/main/java/com/moplus/moplus_server/global/annotation/AuthenticationArgumentResolver.java @@ -1,7 +1,7 @@ package com.moplus.moplus_server.global.annotation; -import com.moplus.moplus_server.domain.member.domain.Member; -import com.moplus.moplus_server.domain.member.repository.MemberRepository; +import com.moplus.moplus_server.member.domain.Member; +import com.moplus.moplus_server.member.repository.MemberRepository; import com.moplus.moplus_server.global.error.exception.BusinessException; import com.moplus.moplus_server.global.error.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java b/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java index 62928cd..8d563b2 100644 --- a/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java +++ b/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java @@ -1,6 +1,6 @@ package com.moplus.moplus_server.global.config.security; -import com.moplus.moplus_server.domain.member.service.MemberService; +import com.moplus.moplus_server.member.service.MemberService; import com.moplus.moplus_server.global.security.filter.EmailPasswordAuthenticationFilter; import com.moplus.moplus_server.global.security.filter.JwtAuthenticationFilter; import com.moplus.moplus_server.global.security.handler.EmailPasswordSuccessHandler; diff --git a/src/main/java/com/moplus/moplus_server/global/security/handler/EmailPasswordSuccessHandler.java b/src/main/java/com/moplus/moplus_server/global/security/handler/EmailPasswordSuccessHandler.java index 403e8ea..ddb7688 100644 --- a/src/main/java/com/moplus/moplus_server/global/security/handler/EmailPasswordSuccessHandler.java +++ b/src/main/java/com/moplus/moplus_server/global/security/handler/EmailPasswordSuccessHandler.java @@ -1,7 +1,7 @@ package com.moplus.moplus_server.global.security.handler; import com.fasterxml.jackson.databind.ObjectMapper; -import com.moplus.moplus_server.domain.member.domain.Member; +import com.moplus.moplus_server.member.domain.Member; import com.moplus.moplus_server.global.security.utils.CookieUtil; import com.moplus.moplus_server.global.security.utils.JwtUtil; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/moplus/moplus_server/global/security/provider/EmailPasswordAuthenticationProvider.java b/src/main/java/com/moplus/moplus_server/global/security/provider/EmailPasswordAuthenticationProvider.java index a284656..fab158e 100644 --- a/src/main/java/com/moplus/moplus_server/global/security/provider/EmailPasswordAuthenticationProvider.java +++ b/src/main/java/com/moplus/moplus_server/global/security/provider/EmailPasswordAuthenticationProvider.java @@ -1,7 +1,7 @@ package com.moplus.moplus_server.global.security.provider; -import com.moplus.moplus_server.domain.member.domain.Member; -import com.moplus.moplus_server.domain.member.service.MemberService; +import com.moplus.moplus_server.member.domain.Member; +import com.moplus.moplus_server.member.service.MemberService; import com.moplus.moplus_server.global.error.exception.ErrorCode; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/moplus/moplus_server/global/security/provider/JwtTokenProvider.java b/src/main/java/com/moplus/moplus_server/global/security/provider/JwtTokenProvider.java index 7d8a608..9c43da7 100644 --- a/src/main/java/com/moplus/moplus_server/global/security/provider/JwtTokenProvider.java +++ b/src/main/java/com/moplus/moplus_server/global/security/provider/JwtTokenProvider.java @@ -1,7 +1,7 @@ package com.moplus.moplus_server.global.security.provider; -import com.moplus.moplus_server.domain.member.domain.Member; -import com.moplus.moplus_server.domain.member.service.MemberService; +import com.moplus.moplus_server.member.domain.Member; +import com.moplus.moplus_server.member.service.MemberService; import com.moplus.moplus_server.global.error.exception.ErrorCode; import com.moplus.moplus_server.global.security.exception.JwtInvalidException; import com.moplus.moplus_server.global.security.token.JwtAuthenticationToken; diff --git a/src/main/java/com/moplus/moplus_server/global/security/utils/JwtUtil.java b/src/main/java/com/moplus/moplus_server/global/security/utils/JwtUtil.java index cc80237..73bf72e 100644 --- a/src/main/java/com/moplus/moplus_server/global/security/utils/JwtUtil.java +++ b/src/main/java/com/moplus/moplus_server/global/security/utils/JwtUtil.java @@ -1,6 +1,6 @@ package com.moplus.moplus_server.global.security.utils; -import com.moplus.moplus_server.domain.member.domain.Member; +import com.moplus.moplus_server.member.domain.Member; import com.moplus.moplus_server.global.properties.jwt.JwtProperties; import com.moplus.moplus_server.global.security.token.JwtAuthenticationToken; import io.jsonwebtoken.Claims; diff --git a/src/main/java/com/moplus/moplus_server/domain/member/controller/MemberController.java b/src/main/java/com/moplus/moplus_server/member/controller/MemberController.java similarity index 82% rename from src/main/java/com/moplus/moplus_server/domain/member/controller/MemberController.java rename to src/main/java/com/moplus/moplus_server/member/controller/MemberController.java index 43a0cb2..aec545c 100644 --- a/src/main/java/com/moplus/moplus_server/domain/member/controller/MemberController.java +++ b/src/main/java/com/moplus/moplus_server/member/controller/MemberController.java @@ -1,7 +1,7 @@ -package com.moplus.moplus_server.domain.member.controller; +package com.moplus.moplus_server.member.controller; -import com.moplus.moplus_server.domain.member.domain.Member; -import com.moplus.moplus_server.domain.member.dto.response.MemberGetResponse; +import com.moplus.moplus_server.member.domain.Member; +import com.moplus.moplus_server.member.dto.response.MemberGetResponse; import com.moplus.moplus_server.global.annotation.AuthUser; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/moplus/moplus_server/domain/member/domain/Member.java b/src/main/java/com/moplus/moplus_server/member/domain/Member.java similarity index 95% rename from src/main/java/com/moplus/moplus_server/domain/member/domain/Member.java rename to src/main/java/com/moplus/moplus_server/member/domain/Member.java index fb000bd..09a0018 100644 --- a/src/main/java/com/moplus/moplus_server/domain/member/domain/Member.java +++ b/src/main/java/com/moplus/moplus_server/member/domain/Member.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.member.domain; +package com.moplus.moplus_server.member.domain; import com.moplus.moplus_server.global.common.BaseEntity; import jakarta.persistence.Column; diff --git a/src/main/java/com/moplus/moplus_server/domain/member/domain/MemberRole.java b/src/main/java/com/moplus/moplus_server/member/domain/MemberRole.java similarity index 90% rename from src/main/java/com/moplus/moplus_server/domain/member/domain/MemberRole.java rename to src/main/java/com/moplus/moplus_server/member/domain/MemberRole.java index 3f38166..a7bb583 100644 --- a/src/main/java/com/moplus/moplus_server/domain/member/domain/MemberRole.java +++ b/src/main/java/com/moplus/moplus_server/member/domain/MemberRole.java @@ -1,4 +1,4 @@ -package com.moplus.moplus_server.domain.member.domain; +package com.moplus.moplus_server.member.domain; import java.util.Arrays; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/moplus/moplus_server/domain/member/dto/response/MemberGetResponse.java b/src/main/java/com/moplus/moplus_server/member/dto/response/MemberGetResponse.java similarity index 71% rename from src/main/java/com/moplus/moplus_server/domain/member/dto/response/MemberGetResponse.java rename to src/main/java/com/moplus/moplus_server/member/dto/response/MemberGetResponse.java index 0585dac..240ccb8 100644 --- a/src/main/java/com/moplus/moplus_server/domain/member/dto/response/MemberGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/member/dto/response/MemberGetResponse.java @@ -1,7 +1,7 @@ -package com.moplus.moplus_server.domain.member.dto.response; +package com.moplus.moplus_server.member.dto.response; -import com.moplus.moplus_server.domain.member.domain.Member; +import com.moplus.moplus_server.member.domain.Member; public record MemberGetResponse( Long id, diff --git a/src/main/java/com/moplus/moplus_server/domain/member/repository/MemberRepository.java b/src/main/java/com/moplus/moplus_server/member/repository/MemberRepository.java similarity index 81% rename from src/main/java/com/moplus/moplus_server/domain/member/repository/MemberRepository.java rename to src/main/java/com/moplus/moplus_server/member/repository/MemberRepository.java index 9eb0168..bebed81 100644 --- a/src/main/java/com/moplus/moplus_server/domain/member/repository/MemberRepository.java +++ b/src/main/java/com/moplus/moplus_server/member/repository/MemberRepository.java @@ -1,6 +1,6 @@ -package com.moplus.moplus_server.domain.member.repository; +package com.moplus.moplus_server.member.repository; -import com.moplus.moplus_server.domain.member.domain.Member; +import com.moplus.moplus_server.member.domain.Member; import com.moplus.moplus_server.global.error.exception.ErrorCode; import com.moplus.moplus_server.global.error.exception.NotFoundException; import java.util.Optional; diff --git a/src/main/java/com/moplus/moplus_server/domain/member/service/MemberService.java b/src/main/java/com/moplus/moplus_server/member/service/MemberService.java similarity index 74% rename from src/main/java/com/moplus/moplus_server/domain/member/service/MemberService.java rename to src/main/java/com/moplus/moplus_server/member/service/MemberService.java index 0940f76..d045121 100644 --- a/src/main/java/com/moplus/moplus_server/domain/member/service/MemberService.java +++ b/src/main/java/com/moplus/moplus_server/member/service/MemberService.java @@ -1,7 +1,7 @@ -package com.moplus.moplus_server.domain.member.service; +package com.moplus.moplus_server.member.service; -import com.moplus.moplus_server.domain.member.domain.Member; -import com.moplus.moplus_server.domain.member.repository.MemberRepository; +import com.moplus.moplus_server.member.domain.Member; +import com.moplus.moplus_server.member.repository.MemberRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/moplus/moplus_server/statistic/member/CorrectConceptTagStatistics.java b/src/main/java/com/moplus/moplus_server/statistic/member/CorrectConceptTagStatistics.java new file mode 100644 index 0000000..68e06fd --- /dev/null +++ b/src/main/java/com/moplus/moplus_server/statistic/member/CorrectConceptTagStatistics.java @@ -0,0 +1,34 @@ +package com.moplus.moplus_server.statistic.member; + +import com.moplus.moplus_server.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class CorrectConceptTagStatistics extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "correct_concept_tag_statistics_id") + private Long id; + + @Column(name = "concept_tag_id", nullable = false) + private Long conceptTagId; + + private int correctCount; + + @Builder + public CorrectConceptTagStatistics(Long conceptTagId, int correctCount) { + this.conceptTagId = conceptTagId; + this.correctCount = correctCount; + } + + public void incrementCorrectCount() { + this.correctCount++; + } +} \ No newline at end of file diff --git a/src/main/java/com/moplus/moplus_server/statistic/member/IncorrectConceptTagStatistics.java b/src/main/java/com/moplus/moplus_server/statistic/member/IncorrectConceptTagStatistics.java new file mode 100644 index 0000000..671a0b1 --- /dev/null +++ b/src/main/java/com/moplus/moplus_server/statistic/member/IncorrectConceptTagStatistics.java @@ -0,0 +1,34 @@ +package com.moplus.moplus_server.statistic.member; + +import com.moplus.moplus_server.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class IncorrectConceptTagStatistics extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "incorrect_concept_tag_statistics_id") + private Long id; + + @Column(name = "concept_tag_id", nullable = false) + private Long conceptTagId; + + private int incorrectCount; + + @Builder + public IncorrectConceptTagStatistics(Long conceptTagId, int incorrectCount) { + this.conceptTagId = conceptTagId; + this.incorrectCount = incorrectCount; + } + + public void incrementIncorrectCount() { + this.incorrectCount++; + } +} diff --git a/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java b/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java index b4857b9..7d73970 100644 --- a/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemSearchGetResponse; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemSearchGetResponse; import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveServiceTest.java b/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveServiceTest.java index e6d5ae2..1e4d1e0 100644 --- a/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveServiceTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveServiceTest.java @@ -5,8 +5,8 @@ import com.moplus.moplus_server.domain.problem.domain.problem.Problem; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemPostResponse; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemPostResponse; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.global.error.exception.NotFoundException; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateServiceTest.java b/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateServiceTest.java index e27e494..9155d32 100644 --- a/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateServiceTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateServiceTest.java @@ -8,9 +8,9 @@ import com.moplus.moplus_server.domain.problem.domain.problem.Problem; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType; -import com.moplus.moplus_server.domain.problem.dto.request.ChildProblemUpdateRequest; -import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest; -import com.moplus.moplus_server.domain.problem.dto.response.ProblemGetResponse; +import com.moplus.moplus_server.admin.problem.dto.request.ChildProblemUpdateRequest; +import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest; +import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.global.error.exception.NotFoundException; import java.util.List; diff --git a/src/test/java/com/moplus/moplus_server/domain/problemset/ProblemSetServiceTest.java b/src/test/java/com/moplus/moplus_server/domain/problemset/ProblemSetServiceTest.java index 8e12c70..5f27d55 100644 --- a/src/test/java/com/moplus/moplus_server/domain/problemset/ProblemSetServiceTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/problemset/ProblemSetServiceTest.java @@ -5,8 +5,8 @@ import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; -import com.moplus.moplus_server.domain.problemset.dto.request.ProblemReorderRequest; -import com.moplus.moplus_server.domain.problemset.dto.request.ProblemSetUpdateRequest; +import com.moplus.moplus_server.admin.problemset.dto.request.ProblemReorderRequest; +import com.moplus.moplus_server.admin.problemset.dto.request.ProblemSetUpdateRequest; import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository; import com.moplus.moplus_server.domain.problemset.service.ProblemSetSaveService; import com.moplus.moplus_server.domain.problemset.service.ProblemSetUpdateService; diff --git a/src/test/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustomTest.java b/src/test/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustomTest.java index 8158ee0..961cd90 100644 --- a/src/test/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustomTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustomTest.java @@ -3,11 +3,11 @@ import static org.assertj.core.api.Assertions.assertThat; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetSearchGetResponse; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemThumbnailResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetSearchGetResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemThumbnailResponse; import com.moplus.moplus_server.domain.problemset.service.ProblemSetUpdateService; -import com.moplus.moplus_server.domain.publish.dto.request.PublishPostRequest; -import com.moplus.moplus_server.domain.publish.service.PublishSaveService; +import com.moplus.moplus_server.admin.publish.dto.request.PublishPostRequest; +import com.moplus.moplus_server.admin.publish.service.PublishSaveService; import java.time.LocalDate; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetServiceTest.java b/src/test/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetServiceTest.java index f148055..ec49a76 100644 --- a/src/test/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetServiceTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/problemset/service/ProblemSetGetServiceTest.java @@ -7,7 +7,7 @@ import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; -import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetGetResponse; +import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetGetResponse; import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository; import com.moplus.moplus_server.global.error.exception.NotFoundException; import java.util.List; diff --git a/src/test/java/com/moplus/moplus_server/domain/publish/service/PublishServiceTest.java b/src/test/java/com/moplus/moplus_server/domain/publish/service/PublishServiceTest.java index 9393dfb..6b48e8a 100644 --- a/src/test/java/com/moplus/moplus_server/domain/publish/service/PublishServiceTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/publish/service/PublishServiceTest.java @@ -3,9 +3,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import com.moplus.moplus_server.domain.publish.domain.Publish; -import com.moplus.moplus_server.domain.publish.dto.request.PublishPostRequest; -import com.moplus.moplus_server.domain.publish.dto.response.PublishMonthGetResponse; +import com.moplus.moplus_server.admin.publish.domain.Publish; +import com.moplus.moplus_server.admin.publish.dto.request.PublishPostRequest; +import com.moplus.moplus_server.admin.publish.dto.response.PublishMonthGetResponse; +import com.moplus.moplus_server.admin.publish.service.PublishDeleteService; +import com.moplus.moplus_server.admin.publish.service.PublishGetService; +import com.moplus.moplus_server.admin.publish.service.PublishSaveService; import com.moplus.moplus_server.domain.publish.repository.PublishRepository; import com.moplus.moplus_server.global.error.exception.ErrorCode; import com.moplus.moplus_server.global.error.exception.InvalidValueException;