Skip to content

[feat/#58] 사용자 문항/새끼문항 제출, 통계 도메인 설계 및 구현 #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seokbeom00 merged 7 commits into from
Mar 11, 2025
Merged

[feat/#58] 사용자 문항/새끼문항 제출, 통계 도메인 설계 및 구현 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e359a3c
[feat/#58] 사용자 세트 제출 통계 도메인 설계
seokbeom00 Mar 2, 2025
b729d40
[file/#58] 패키징 변경
seokbeom00 Mar 9, 2025
e0af8aa
[fix/#58] 충돌 해결
seokbeom00 Mar 9, 2025
b2c0971
[fix/#58] 컴파일 에러 수정
seokbeom00 Mar 9, 2025
9df4564
[fix/#58] 도메인 변경사항 반영
seokbeom00 Mar 11, 2025
e4e754f
[fix/#58] ArrayList 초기화 제거
seokbeom00 Mar 11, 2025
f87590f
[fix/#58] 사용자 통계 테이블 제거
seokbeom00 Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...cept/controller/ConceptTagController.java → ...cept/controller/ConceptTagController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...cept/dto/response/ConceptTagResponse.java → ...cept/dto/response/ConceptTagResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...lem/controller/ImageUploadController.java → ...lem/controller/ImageUploadController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...controller/PracticeTestTagController.java → ...controller/PracticeTestTagController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...problem/controller/ProblemController.java → ...problem/controller/ProblemController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...m/controller/ProblemSearchController.java → ...m/controller/ProblemSearchController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/request/ChildProblemDeleteRequest.java → ...to/request/ChildProblemDeleteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../dto/request/ChildProblemPostRequest.java → .../dto/request/ChildProblemPostRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/request/ChildProblemUpdateRequest.java → ...to/request/ChildProblemUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...oblem/dto/request/ProblemPostRequest.java → ...oblem/dto/request/ProblemPostRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lem/dto/request/ProblemUpdateRequest.java → ...lem/dto/request/ProblemUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...dto/response/ChildProblemGetResponse.java → ...dto/response/ChildProblemGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/response/ConceptTagSearchResponse.java → ...to/response/ConceptTagSearchResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...dto/response/PracticeTestTagResponse.java → ...dto/response/PracticeTestTagResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...em/dto/response/PresignedUrlResponse.java → ...em/dto/response/PresignedUrlResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...blem/dto/response/ProblemGetResponse.java → ...blem/dto/response/ProblemGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lem/dto/response/ProblemPostResponse.java → ...lem/dto/response/ProblemPostResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/response/ProblemSearchGetResponse.java → ...to/response/ProblemSearchGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...mset/controller/ProblemSetController.java → ...mset/controller/ProblemSetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ontroller/ProblemSetSearchController.java → ...ontroller/ProblemSetSearchController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...et/dto/request/ProblemReorderRequest.java → ...et/dto/request/ProblemReorderRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...et/dto/request/ProblemSetPostRequest.java → ...et/dto/request/ProblemSetPostRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../dto/request/ProblemSetUpdateRequest.java → .../dto/request/ProblemSetUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...t/dto/response/ProblemSetGetResponse.java → ...t/dto/response/ProblemSetGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...response/ProblemSetSearchGetResponse.java → ...response/ProblemSetSearchGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../dto/response/ProblemSummaryResponse.java → .../dto/response/ProblemSummaryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/response/ProblemThumbnailResponse.java → ...to/response/ProblemThumbnailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...publish/controller/PublishController.java → ...publish/controller/PublishController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...server/domain/publish/domain/Publish.java → ..._server/admin/publish/domain/Publish.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...blish/dto/request/PublishPostRequest.java → ...blish/dto/request/PublishPostRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...dto/response/PublishMonthGetResponse.java → ...dto/response/PublishMonthGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...o/response/PublishProblemSetResponse.java → ...o/response/PublishProblemSetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...publish/service/PublishDeleteService.java → ...publish/service/PublishDeleteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...in/publish/service/PublishGetService.java → ...in/publish/service/PublishGetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...n/publish/service/PublishSaveService.java → ...n/publish/service/PublishSaveService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Empty file added src/main/java/com/moplus/moplus_server/client/submit/controller/.gitkeep
View file
Open in desktop
Empty file.
40 changes: 40 additions & 0 deletions src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
7 changes: 7 additions & 0 deletions src/main/java/com/moplus/moplus_server/client/submit/domain/ChildProblemSubmitStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.moplus.moplus_server.client.submit.domain;

public enum ChildProblemSubmitStatus {
CORRECT,
INCORRECT,
RETRY_CORRECT
}
40 changes: 40 additions & 0 deletions src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
8 changes: 8 additions & 0 deletions src/main/java/com/moplus/moplus_server/client/submit/domain/ProblemSubmitStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.moplus.moplus_server.client.submit.domain;

public enum ProblemSubmitStatus {
CORRECT,
INCORRECT,
IN_PROGRESS,
RETRY_CORRECT
}
Empty file added src/main/java/com/moplus/moplus_server/client/submit/dto/.gitkeep
View file
Open in desktop
Empty file.
Empty file added src/main/java/com/moplus/moplus_server/client/submit/repository/.gitkeep
View file
Open in desktop
Empty file.
Empty file added src/main/java/com/moplus/moplus_server/client/submit/service/.gitkeep
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions src/main/java/com/moplus/moplus_server/domain/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading