Skip to content

Commit 4f2ab0c

Browse files
seokbeom00seokbeom00
authored
Merge pull request #80 from team-MoPlus/feature/#58
[feat/#58] �사용자 문항/새끼문항 제출, 통계 도메인 설계 및 구현
2 parents be41c7f + f87590f commit 4f2ab0c

File tree

75 files changed

+284
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+284
-118
lines changed

‎src/main/java/com/moplus/moplus_server/domain/concept/controller/ConceptTagController.java ‎src/main/java/com/moplus/moplus_server/admin/concept/controller/ConceptTagController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.concept.controller;
1+
package com.moplus.moplus_server.admin.concept.controller;
22

3-
import com.moplus.moplus_server.domain.concept.dto.response.ConceptTagResponse;
3+
import com.moplus.moplus_server.admin.concept.dto.response.ConceptTagResponse;
44
import com.moplus.moplus_server.domain.concept.repository.ConceptTagRepository;
55
import io.swagger.v3.oas.annotations.Operation;
66
import io.swagger.v3.oas.annotations.tags.Tag;

‎src/main/java/com/moplus/moplus_server/domain/concept/dto/response/ConceptTagResponse.java ‎src/main/java/com/moplus/moplus_server/admin/concept/dto/response/ConceptTagResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.concept.dto.response;
1+
package com.moplus.moplus_server.admin.concept.dto.response;
22

33
import com.moplus.moplus_server.domain.concept.domain.ConceptTag;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java ‎src/main/java/com/moplus/moplus_server/admin/problem/controller/ImageUploadController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.ProblemImageType;
4-
import com.moplus.moplus_server.domain.problem.dto.response.PresignedUrlResponse;
4+
import com.moplus.moplus_server.admin.problem.dto.response.PresignedUrlResponse;
55
import com.moplus.moplus_server.domain.problem.service.ImageUploadService;
66
import io.swagger.v3.oas.annotations.Operation;
77
import io.swagger.v3.oas.annotations.tags.Tag;

‎src/main/java/com/moplus/moplus_server/domain/problem/controller/PracticeTestTagController.java ‎src/main/java/com/moplus/moplus_server/admin/problem/controller/PracticeTestTagController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

3-
import com.moplus.moplus_server.domain.problem.dto.response.PracticeTestTagResponse;
3+
import com.moplus.moplus_server.admin.problem.dto.response.PracticeTestTagResponse;
44
import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository;
55
import io.swagger.v3.oas.annotations.Operation;
66
import io.swagger.v3.oas.annotations.tags.Tag;

‎src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemController.java ‎src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemController.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

3-
import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
4-
import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest;
5-
import com.moplus.moplus_server.domain.problem.dto.response.ProblemGetResponse;
6-
import com.moplus.moplus_server.domain.problem.dto.response.ProblemPostResponse;
3+
import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest;
4+
import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest;
5+
import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse;
6+
import com.moplus.moplus_server.admin.problem.dto.response.ProblemPostResponse;
77
import com.moplus.moplus_server.domain.problem.service.ChildProblemService;
88
import com.moplus.moplus_server.domain.problem.service.ProblemDeleteService;
99
import com.moplus.moplus_server.domain.problem.service.ProblemGetService;

‎src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemSearchController.java ‎src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemSearchController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

3-
import com.moplus.moplus_server.domain.problem.dto.response.ProblemSearchGetResponse;
3+
import com.moplus.moplus_server.admin.problem.dto.response.ProblemSearchGetResponse;
44
import com.moplus.moplus_server.domain.problem.repository.ProblemSearchRepositoryCustom;
55
import io.swagger.v3.oas.annotations.Operation;
66
import io.swagger.v3.oas.annotations.tags.Tag;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemDeleteRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemDeleteRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
public record ChildProblemDeleteRequest(
44
Long childProblemId

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemPostRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemUpdateRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemPostRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemPostRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
44
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemUpdateRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ChildProblemGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem;
44
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ConceptTagSearchResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ConceptTagSearchResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import jakarta.validation.constraints.NotNull;
44
import lombok.Getter;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PracticeTestTagResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PracticeTestTagResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PresignedUrlResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PresignedUrlResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import jakarta.validation.constraints.NotNull;
44

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemPostResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemPostResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemSearchGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import jakarta.validation.constraints.NotNull;
44
import java.util.Set;

‎src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetController.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetController.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.moplus.moplus_server.domain.problemset.controller;
1+
package com.moplus.moplus_server.admin.problemset.controller;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus;
4-
import com.moplus.moplus_server.domain.problemset.dto.request.ProblemReorderRequest;
5-
import com.moplus.moplus_server.domain.problemset.dto.request.ProblemSetUpdateRequest;
6-
import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetGetResponse;
4+
import com.moplus.moplus_server.admin.problemset.dto.request.ProblemReorderRequest;
5+
import com.moplus.moplus_server.admin.problemset.dto.request.ProblemSetUpdateRequest;
6+
import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetGetResponse;
77
import com.moplus.moplus_server.domain.problemset.service.ProblemSetDeleteService;
88
import com.moplus.moplus_server.domain.problemset.service.ProblemSetGetService;
99
import com.moplus.moplus_server.domain.problemset.service.ProblemSetSaveService;

‎src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetSearchController.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetSearchController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.moplus.moplus_server.domain.problemset.controller;
1+
package com.moplus.moplus_server.admin.problemset.controller;
22

33

4-
import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetSearchGetResponse;
4+
import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetSearchGetResponse;
55
import com.moplus.moplus_server.domain.problemset.repository.ProblemSetSearchRepositoryCustom;
66
import io.swagger.v3.oas.annotations.Operation;
77
import io.swagger.v3.oas.annotations.tags.Tag;

‎src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemReorderRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.request;
1+
package com.moplus.moplus_server.admin.problemset.dto.request;
22

33
import jakarta.validation.constraints.NotNull;
44
import java.util.List;

‎src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetPostRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.request;
1+
package com.moplus.moplus_server.admin.problemset.dto.request;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetUpdateRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.request;
1+
package com.moplus.moplus_server.admin.problemset.dto.request;
22

33
import jakarta.validation.constraints.NotNull;
44
import java.util.List;

‎src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus;

‎src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetSearchGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSummaryResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
44
import jakarta.validation.constraints.NotNull;

‎src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemThumbnailResponse.java ‎src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemThumbnailResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import lombok.Getter;
44
import lombok.NoArgsConstructor;

‎src/main/java/com/moplus/moplus_server/domain/publish/controller/PublishController.java ‎src/main/java/com/moplus/moplus_server/admin/publish/controller/PublishController.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.moplus.moplus_server.domain.publish.controller;
1+
package com.moplus.moplus_server.admin.publish.controller;
22

3-
import com.moplus.moplus_server.domain.publish.dto.request.PublishPostRequest;
4-
import com.moplus.moplus_server.domain.publish.dto.response.PublishMonthGetResponse;
5-
import com.moplus.moplus_server.domain.publish.service.PublishDeleteService;
6-
import com.moplus.moplus_server.domain.publish.service.PublishGetService;
7-
import com.moplus.moplus_server.domain.publish.service.PublishSaveService;
3+
import com.moplus.moplus_server.admin.publish.dto.request.PublishPostRequest;
4+
import com.moplus.moplus_server.admin.publish.dto.response.PublishMonthGetResponse;
5+
import com.moplus.moplus_server.admin.publish.service.PublishDeleteService;
6+
import com.moplus.moplus_server.admin.publish.service.PublishGetService;
7+
import com.moplus.moplus_server.admin.publish.service.PublishSaveService;
88
import com.moplus.moplus_server.global.response.IdResponse;
99
import io.swagger.v3.oas.annotations.Operation;
1010
import io.swagger.v3.oas.annotations.tags.Tag;

‎src/main/java/com/moplus/moplus_server/domain/publish/domain/Publish.java ‎src/main/java/com/moplus/moplus_server/admin/publish/domain/Publish.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.publish.domain;
1+
package com.moplus.moplus_server.admin.publish.domain;
22

33
import com.moplus.moplus_server.global.common.BaseEntity;
44
import com.moplus.moplus_server.global.error.exception.ErrorCode;

‎src/main/java/com/moplus/moplus_server/domain/publish/dto/request/PublishPostRequest.java ‎src/main/java/com/moplus/moplus_server/admin/publish/dto/request/PublishPostRequest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.publish.dto.request;
1+
package com.moplus.moplus_server.admin.publish.dto.request;
22

3-
import com.moplus.moplus_server.domain.publish.domain.Publish;
3+
import com.moplus.moplus_server.admin.publish.domain.Publish;
44
import jakarta.validation.constraints.NotNull;
55
import java.time.LocalDate;
66

‎src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishMonthGetResponse.java ‎src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishMonthGetResponse.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.publish.dto.response;
1+
package com.moplus.moplus_server.admin.publish.dto.response;
22

3-
import com.moplus.moplus_server.domain.publish.domain.Publish;
3+
import com.moplus.moplus_server.admin.publish.domain.Publish;
44
import java.time.LocalDate;
55
import lombok.Builder;
66

‎src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishProblemSetResponse.java ‎src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishProblemSetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.publish.dto.response;
1+
package com.moplus.moplus_server.admin.publish.dto.response;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import lombok.Builder;

‎src/main/java/com/moplus/moplus_server/domain/publish/service/PublishDeleteService.java ‎src/main/java/com/moplus/moplus_server/admin/publish/service/PublishDeleteService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.publish.service;
1+
package com.moplus.moplus_server.admin.publish.service;
22

3-
import com.moplus.moplus_server.domain.publish.domain.Publish;
3+
import com.moplus.moplus_server.admin.publish.domain.Publish;
44
import com.moplus.moplus_server.domain.publish.repository.PublishRepository;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.stereotype.Service;

‎src/main/java/com/moplus/moplus_server/domain/publish/service/PublishGetService.java ‎src/main/java/com/moplus/moplus_server/admin/publish/service/PublishGetService.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.moplus.moplus_server.domain.publish.service;
1+
package com.moplus.moplus_server.admin.publish.service;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository;
5-
import com.moplus.moplus_server.domain.publish.domain.Publish;
6-
import com.moplus.moplus_server.domain.publish.dto.response.PublishMonthGetResponse;
7-
import com.moplus.moplus_server.domain.publish.dto.response.PublishProblemSetResponse;
5+
import com.moplus.moplus_server.admin.publish.domain.Publish;
6+
import com.moplus.moplus_server.admin.publish.dto.response.PublishMonthGetResponse;
7+
import com.moplus.moplus_server.admin.publish.dto.response.PublishProblemSetResponse;
88
import com.moplus.moplus_server.domain.publish.repository.PublishRepository;
99
import com.moplus.moplus_server.global.error.exception.ErrorCode;
1010
import com.moplus.moplus_server.global.error.exception.InvalidValueException;

‎src/main/java/com/moplus/moplus_server/domain/publish/service/PublishSaveService.java ‎src/main/java/com/moplus/moplus_server/admin/publish/service/PublishSaveService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.moplus.moplus_server.domain.publish.service;
1+
package com.moplus.moplus_server.admin.publish.service;
22

33
import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository;
4-
import com.moplus.moplus_server.domain.publish.domain.Publish;
5-
import com.moplus.moplus_server.domain.publish.dto.request.PublishPostRequest;
4+
import com.moplus.moplus_server.admin.publish.domain.Publish;
5+
import com.moplus.moplus_server.admin.publish.dto.request.PublishPostRequest;
66
import com.moplus.moplus_server.domain.publish.repository.PublishRepository;
77
import lombok.RequiredArgsConstructor;
88
import org.springframework.stereotype.Service;

‎src/main/java/com/moplus/moplus_server/client/submit/controller/.gitkeep

Whitespace-only changes.

‎src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmit.java

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.moplus.moplus_server.client.submit.domain;
2+
3+
import com.moplus.moplus_server.global.common.BaseEntity;
4+
import jakarta.persistence.*;
5+
import lombok.AccessLevel;
6+
import lombok.Builder;
7+
import lombok.Getter;
8+
import lombok.NoArgsConstructor;
9+
10+
@Getter
11+
@Entity
12+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
13+
public class ChildProblemSubmit extends BaseEntity {
14+
15+
@Id
16+
@GeneratedValue(strategy = GenerationType.IDENTITY)
17+
@Column(name = "child_problem_submit_id")
18+
private Long id;
19+
20+
@Column(name = "member_id", nullable = false)
21+
private Long memberId;
22+
23+
@Column(name = "publish_id", nullable = false)
24+
private Long publishId;
25+
26+
@Column(name = "child_problem_id", nullable = false)
27+
private Long childProblemId;
28+
29+
@Enumerated(EnumType.STRING)
30+
@Column(nullable = false)
31+
private ChildProblemSubmitStatus status;
32+
33+
@Builder
34+
public ChildProblemSubmit(Long memberId, Long publishId, Long childProblemId, ChildProblemSubmitStatus status) {
35+
this.memberId = memberId;
36+
this.publishId = publishId;
37+
this.childProblemId = childProblemId;
38+
this.status = status;
39+
}
40+
}

‎src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmitStatus.java

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.moplus.moplus_server.client.submit.domain;
2+
3+
public enum ChildProblemSubmitStatus {
4+
CORRECT,
5+
INCORRECT,
6+
RETRY_CORRECT
7+
}

‎src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmit.java

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.moplus.moplus_server.client.submit.domain;
2+
3+
import com.moplus.moplus_server.global.common.BaseEntity;
4+
import jakarta.persistence.*;
5+
import lombok.AccessLevel;
6+
import lombok.Builder;
7+
import lombok.Getter;
8+
import lombok.NoArgsConstructor;
9+
10+
@Getter
11+
@Entity
12+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
13+
public class ProblemSubmit extends BaseEntity {
14+
15+
@Id
16+
@GeneratedValue(strategy = GenerationType.IDENTITY)
17+
@Column(name = "problem_submit_id")
18+
private Long id;
19+
20+
@Column(name = "member_id", nullable = false)
21+
private Long memberId;
22+
23+
@Column(name = "publish_id", nullable = false)
24+
private Long publishId;
25+
26+
@Column(name = "problem_id", nullable = false)
27+
private Long problemId;
28+
29+
@Enumerated(EnumType.STRING)
30+
@Column(nullable = false)
31+
private ProblemSubmitStatus status;
32+
33+
@Builder
34+
public ProblemSubmit(Long memberId, Long publishId, Long problemId, ProblemSubmitStatus status) {
35+
this.memberId = memberId;
36+
this.publishId = publishId;
37+
this.problemId = problemId;
38+
this.status = status;
39+
}
40+
}

‎src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmitStatus.java

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.moplus.moplus_server.client.submit.domain;
2+
3+
public enum ProblemSubmitStatus {
4+
CORRECT,
5+
INCORRECT,
6+
IN_PROGRESS,
7+
RETRY_CORRECT
8+
}

‎src/main/java/com/moplus/moplus_server/client/submit/dto/.gitkeep

Whitespace-only changes.

‎src/main/java/com/moplus/moplus_server/client/submit/repository/.gitkeep

Whitespace-only changes.

‎src/main/java/com/moplus/moplus_server/client/submit/service/.gitkeep

Whitespace-only changes.

‎src/main/java/com/moplus/moplus_server/domain/auth/service/AuthService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.moplus.moplus_server.domain.auth.service;
22

33
import com.moplus.moplus_server.domain.auth.dto.response.TokenResponse;
4-
import com.moplus.moplus_server.domain.member.domain.Member;
5-
import com.moplus.moplus_server.domain.member.service.MemberService;
4+
import com.moplus.moplus_server.member.domain.Member;
5+
import com.moplus.moplus_server.member.service.MemberService;
66
import com.moplus.moplus_server.global.error.exception.ErrorCode;
77
import com.moplus.moplus_server.global.error.exception.InvalidValueException;
88
import com.moplus.moplus_server.global.security.exception.JwtInvalidException;

‎src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import static com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem.childProblem;
55
import static com.moplus.moplus_server.domain.problem.domain.problem.QProblem.problem;
66

7-
import com.moplus.moplus_server.domain.problem.dto.response.ConceptTagSearchResponse;
8-
import com.moplus.moplus_server.domain.problem.dto.response.ProblemSearchGetResponse;
7+
import com.moplus.moplus_server.admin.problem.dto.response.ConceptTagSearchResponse;
8+
import com.moplus.moplus_server.admin.problem.dto.response.ProblemSearchGetResponse;
99
import com.querydsl.core.group.GroupBy;
1010
import com.querydsl.core.types.Projections;
1111
import com.querydsl.core.types.dsl.BooleanExpression;

0 commit comments

Comments
 (0)