Skip to content

Commit 77adb3b

Browse files
sejoon00sejoon00
committed
[feat/#92] 컨플릭트 해결
2 parents 91cdcb3 + 0883a17 commit 77adb3b

File tree

53 files changed

+1226
-68
lines changed

Some content is hidden

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

53 files changed

+1226
-68
lines changed

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

+2-2
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 static com.querydsl.core.types.PathMetadataFactory.*;
44

@@ -15,7 +15,7 @@
1515
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
1616
public class QPublish extends EntityPathBase<Publish> {
1717

18-
private static final long serialVersionUID = 1565569153L;
18+
private static final long serialVersionUID = 1641302032L;
1919

2020
public static final QPublish publish = new QPublish("publish");
2121

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

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.moplus.moplus_server.client.submit.domain;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
11+
12+
/**
13+
* QChildProblemSubmit is a Querydsl query type for ChildProblemSubmit
14+
*/
15+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
16+
public class QChildProblemSubmit extends EntityPathBase<ChildProblemSubmit> {
17+
18+
private static final long serialVersionUID = -1656142683L;
19+
20+
public static final QChildProblemSubmit childProblemSubmit = new QChildProblemSubmit("childProblemSubmit");
21+
22+
public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
23+
24+
public final NumberPath<Long> childProblemId = createNumber("childProblemId", Long.class);
25+
26+
//inherited
27+
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
28+
29+
public final NumberPath<Long> id = createNumber("id", Long.class);
30+
31+
public final NumberPath<Long> memberId = createNumber("memberId", Long.class);
32+
33+
public final NumberPath<Long> publishId = createNumber("publishId", Long.class);
34+
35+
public final EnumPath<ChildProblemSubmitStatus> status = createEnum("status", ChildProblemSubmitStatus.class);
36+
37+
//inherited
38+
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
39+
40+
public QChildProblemSubmit(String variable) {
41+
super(ChildProblemSubmit.class, forVariable(variable));
42+
}
43+
44+
public QChildProblemSubmit(Path<? extends ChildProblemSubmit> path) {
45+
super(path.getType(), path.getMetadata());
46+
}
47+
48+
public QChildProblemSubmit(PathMetadata metadata) {
49+
super(ChildProblemSubmit.class, metadata);
50+
}
51+
52+
}
53+

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

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.moplus.moplus_server.client.submit.domain;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
11+
12+
/**
13+
* QProblemSubmit is a Querydsl query type for ProblemSubmit
14+
*/
15+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
16+
public class QProblemSubmit extends EntityPathBase<ProblemSubmit> {
17+
18+
private static final long serialVersionUID = 1682818189L;
19+
20+
public static final QProblemSubmit problemSubmit = new QProblemSubmit("problemSubmit");
21+
22+
public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
23+
24+
//inherited
25+
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
26+
27+
public final NumberPath<Long> id = createNumber("id", Long.class);
28+
29+
public final NumberPath<Long> memberId = createNumber("memberId", Long.class);
30+
31+
public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
32+
33+
public final NumberPath<Long> publishId = createNumber("publishId", Long.class);
34+
35+
public final EnumPath<ProblemSubmitStatus> status = createEnum("status", ProblemSubmitStatus.class);
36+
37+
//inherited
38+
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
39+
40+
public QProblemSubmit(String variable) {
41+
super(ProblemSubmit.class, forVariable(variable));
42+
}
43+
44+
public QProblemSubmit(Path<? extends ProblemSubmit> path) {
45+
super(path.getType(), path.getMetadata());
46+
}
47+
48+
public QProblemSubmit(PathMetadata metadata) {
49+
super(ProblemSubmit.class, metadata);
50+
}
51+
52+
}
53+

‎src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java

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

3+
import com.moplus.moplus_server.admin.problem.dto.request.ChildProblemUpdateRequest;
34
import com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem;
4-
import com.moplus.moplus_server.domain.problem.dto.request.ChildProblemUpdateRequest;
55
import java.util.ArrayList;
66
import java.util.LinkedHashSet;
77
import java.util.List;
@@ -11,7 +11,7 @@
1111

1212
@Generated(
1313
value = "org.mapstruct.ap.MappingProcessor",
14-
date = "2025-03-03T17:28:35+0900",
14+
date = "2025-03-14T20:25:51+0900",
1515
comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
1616
)
1717
@Component

‎src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.moplus.moplus_server.domain.problem.service.mapper;
22

3+
import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest;
4+
import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest;
35
import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
46
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
57
import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId;
68
import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;
7-
import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
8-
import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest;
99
import java.util.ArrayList;
1010
import java.util.LinkedHashSet;
1111
import java.util.List;
@@ -15,7 +15,7 @@
1515

1616
@Generated(
1717
value = "org.mapstruct.ap.MappingProcessor",
18-
date = "2025-03-03T17:28:35+0900",
18+
date = "2025-03-15T21:23:23+0900",
1919
comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
2020
)
2121
@Component

‎src/main/generated/com/moplus/moplus_server/domain/v0/TestResult/entity/QIncorrectProblem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class QIncorrectProblem extends EntityPathBase<IncorrectProblem> {
3737

3838
public final NumberPath<Long> practiceTestId = createNumber("practiceTestId", Long.class);
3939

40-
public final NumberPath<Long> problemId = createNumber("problemCustomId", Long.class);
40+
public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
4141

4242
public final StringPath problemNumber = createString("problemNumber");
4343

‎src/main/generated/com/moplus/moplus_server/domain/v0/practiceTest/domain/QProblemImageForTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class QProblemImageForTest extends EntityPathBase<ProblemImageForTest> {
2525

2626
public final StringPath imageUrl = createString("imageUrl");
2727

28-
public final NumberPath<Long> problemId = createNumber("problemCustomId", Long.class);
28+
public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
2929

3030
public QProblemImageForTest(String variable) {
3131
super(ProblemImageForTest.class, forVariable(variable));

‎src/main/generated/com/moplus/moplus_server/domain/member/domain/QMember.java ‎src/main/generated/com/moplus/moplus_server/member/domain/QMember.java

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

33
import static com.querydsl.core.types.PathMetadataFactory.*;
44

@@ -15,7 +15,7 @@
1515
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
1616
public class QMember extends EntityPathBase<Member> {
1717

18-
private static final long serialVersionUID = -705761779L;
18+
private static final long serialVersionUID = -1541748259L;
1919

2020
public static final QMember member = new QMember("member1");
2121

‎src/main/generated/com/moplus/moplus_server/statistic/member/QCorrectConceptTagStatistics.java

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.moplus.moplus_server.statistic.member;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
11+
12+
/**
13+
* QCorrectConceptTagStatistics is a Querydsl query type for CorrectConceptTagStatistics
14+
*/
15+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
16+
public class QCorrectConceptTagStatistics extends EntityPathBase<CorrectConceptTagStatistics> {
17+
18+
private static final long serialVersionUID = -313521578L;
19+
20+
public static final QCorrectConceptTagStatistics correctConceptTagStatistics = new QCorrectConceptTagStatistics("correctConceptTagStatistics");
21+
22+
public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
23+
24+
public final NumberPath<Long> conceptTagId = createNumber("conceptTagId", Long.class);
25+
26+
public final NumberPath<Integer> correctCount = createNumber("correctCount", Integer.class);
27+
28+
//inherited
29+
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
30+
31+
public final NumberPath<Long> id = createNumber("id", Long.class);
32+
33+
//inherited
34+
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
35+
36+
public QCorrectConceptTagStatistics(String variable) {
37+
super(CorrectConceptTagStatistics.class, forVariable(variable));
38+
}
39+
40+
public QCorrectConceptTagStatistics(Path<? extends CorrectConceptTagStatistics> path) {
41+
super(path.getType(), path.getMetadata());
42+
}
43+
44+
public QCorrectConceptTagStatistics(PathMetadata metadata) {
45+
super(CorrectConceptTagStatistics.class, metadata);
46+
}
47+
48+
}
49+

‎src/main/generated/com/moplus/moplus_server/statistic/member/QIncorrectConceptTagStatistics.java

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.moplus.moplus_server.statistic.member;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
11+
12+
/**
13+
* QIncorrectConceptTagStatistics is a Querydsl query type for IncorrectConceptTagStatistics
14+
*/
15+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
16+
public class QIncorrectConceptTagStatistics extends EntityPathBase<IncorrectConceptTagStatistics> {
17+
18+
private static final long serialVersionUID = 1288752209L;
19+
20+
public static final QIncorrectConceptTagStatistics incorrectConceptTagStatistics = new QIncorrectConceptTagStatistics("incorrectConceptTagStatistics");
21+
22+
public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
23+
24+
public final NumberPath<Long> conceptTagId = createNumber("conceptTagId", Long.class);
25+
26+
//inherited
27+
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
28+
29+
public final NumberPath<Long> id = createNumber("id", Long.class);
30+
31+
public final NumberPath<Integer> incorrectCount = createNumber("incorrectCount", Integer.class);
32+
33+
//inherited
34+
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
35+
36+
public QIncorrectConceptTagStatistics(String variable) {
37+
super(IncorrectConceptTagStatistics.class, forVariable(variable));
38+
}
39+
40+
public QIncorrectConceptTagStatistics(Path<? extends IncorrectConceptTagStatistics> path) {
41+
super(path.getType(), path.getMetadata());
42+
}
43+
44+
public QIncorrectConceptTagStatistics(PathMetadata metadata) {
45+
super(IncorrectConceptTagStatistics.class, metadata);
46+
}
47+
48+
}
49+

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

Whitespace-only changes.

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

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package com.moplus.moplus_server.client.submit.controller;
2+
3+
import com.moplus.moplus_server.client.submit.domain.ChildProblemSubmitStatus;
4+
import com.moplus.moplus_server.client.submit.domain.ProblemSubmitStatus;
5+
import com.moplus.moplus_server.client.submit.dto.request.ChildProblemSubmitCreateRequest;
6+
import com.moplus.moplus_server.client.submit.dto.request.ChildProblemSubmitUpdateIncorrectRequest;
7+
import com.moplus.moplus_server.client.submit.dto.request.ChildProblemSubmitUpdateRequest;
8+
import com.moplus.moplus_server.client.submit.dto.request.ProblemSubmitCreateRequest;
9+
import com.moplus.moplus_server.client.submit.dto.request.ProblemSubmitUpdateRequest;
10+
import com.moplus.moplus_server.client.submit.service.ClientSubmitService;
11+
import io.swagger.v3.oas.annotations.Operation;
12+
import io.swagger.v3.oas.annotations.tags.Tag;
13+
import lombok.RequiredArgsConstructor;
14+
import org.springframework.http.ResponseEntity;
15+
import org.springframework.web.bind.annotation.PostMapping;
16+
import org.springframework.web.bind.annotation.PutMapping;
17+
import org.springframework.web.bind.annotation.RequestBody;
18+
import org.springframework.web.bind.annotation.RequestMapping;
19+
import org.springframework.web.bind.annotation.RestController;
20+
21+
@Tag(name = "클라이언트 제출", description = "클라이언트 제출 관련 API")
22+
@RestController
23+
@RequestMapping("/api/v1/client")
24+
@RequiredArgsConstructor
25+
public class ClientSubmitController {
26+
27+
private final ClientSubmitService clientSubmitService;
28+
29+
@PostMapping("problemSubmit")
30+
@Operation(summary = "문항 제출 생성", description = "문항 제출을 '진행중'으로 생성합니다.")
31+
public ResponseEntity<Void> createProblemSubmit(
32+
@RequestBody ProblemSubmitCreateRequest request
33+
) {
34+
clientSubmitService.createProblemSubmit(request);
35+
return ResponseEntity.ok(null);
36+
}
37+
38+
@PutMapping("problemSubmit")
39+
@Operation(summary = "문항 제출 업데이트", description = "제출한 답안을 바탕으로 문항 제출의 상태를 업데이트합니다.")
40+
public ResponseEntity<ProblemSubmitStatus> updateProblemSubmit(
41+
@RequestBody ProblemSubmitUpdateRequest request
42+
) {
43+
return ResponseEntity.ok(clientSubmitService.updateProblemSubmit(request));
44+
}
45+
46+
@PostMapping("childProblemSubmit")
47+
@Operation(summary = "새끼문항 제출 생성", description = "문항에 속한 새끼문항들을 '시작전'으로 생성합니다.")
48+
public ResponseEntity<Void> createProblemSubmit(
49+
@RequestBody ChildProblemSubmitCreateRequest request
50+
) {
51+
clientSubmitService.createChildProblemSubmit(request);
52+
return ResponseEntity.ok(null);
53+
}
54+
55+
@PutMapping("childProblemSubmit")
56+
@Operation(summary = "새끼문항 제출 업데이트", description = "제출한 답안을 바탕으로 문항 제출의 상태를 업데이트합니다.")
57+
public ResponseEntity<ChildProblemSubmitStatus> updateChildProblemSubmit(
58+
@RequestBody ChildProblemSubmitUpdateRequest request
59+
) {
60+
return ResponseEntity.ok(clientSubmitService.updateChildProblemSubmit(request));
61+
}
62+
63+
@PutMapping("childProblemSubmit/incorrect")
64+
@Operation(summary = "새끼문항 제출 틀림 업데이트", description = "새끼문항 제출의 상태를 틀림으로 업데이트합니다.")
65+
public ResponseEntity<Void> updateChildProblemSubmitIncorrect(
66+
@RequestBody ChildProblemSubmitUpdateIncorrectRequest request
67+
) {
68+
clientSubmitService.updateChildProblemSubmitIncorrect(request);
69+
return ResponseEntity.ok(null);
70+
}
71+
}

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

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.moplus.moplus_server.client.submit.controller;
2+
3+
import com.moplus.moplus_server.client.submit.dto.response.CommentaryGetResponse;
4+
import com.moplus.moplus_server.client.submit.service.CommentaryGetService;
5+
import io.swagger.v3.oas.annotations.Operation;
6+
import io.swagger.v3.oas.annotations.tags.Tag;
7+
import lombok.RequiredArgsConstructor;
8+
import org.springframework.http.ResponseEntity;
9+
import org.springframework.web.bind.annotation.GetMapping;
10+
import org.springframework.web.bind.annotation.RequestMapping;
11+
import org.springframework.web.bind.annotation.RequestParam;
12+
import org.springframework.web.bind.annotation.RestController;
13+
14+
@Tag(name = "클라이언트 해설 조회", description = "클라이언트 해설 조회 관련 API")
15+
@RestController
16+
@RequestMapping("/api/v1/client")
17+
@RequiredArgsConstructor
18+
public class CommentaryGetController {
19+
20+
private final CommentaryGetService commentaryGetService;
21+
22+
@GetMapping("commentary")
23+
@Operation(summary = "해설 조회", description = "문항 별 해설/처방을 조회합니다.")
24+
public ResponseEntity<CommentaryGetResponse> getCommentary(
25+
@RequestParam(value = "publishId", required = false) Long publishId,
26+
@RequestParam(value = "problemId", required = false) Long problemId
27+
) {
28+
return ResponseEntity.ok(commentaryGetService.getCommentary(publishId, problemId));
29+
}
30+
}

0 commit comments

Comments
 (0)