Feature/#34 문항 ID PK를 자연키에서 대체키로 변경 및 변경사항 반영

src/main/generated/com/moplus/moplus_server/domain/problem/domain/childProblem/QChildProblem.java

@@ -26,6 +26,8 @@ public class QChildProblem extends EntityPathBase<ChildProblem> {
 
     public final com.moplus.moplus_server.domain.problem.domain.QAnswer answer;
 
+    public final EnumPath<com.moplus.moplus_server.domain.problem.domain.problem.AnswerType> answerType = createEnum("answerType", com.moplus.moplus_server.domain.problem.domain.problem.AnswerType.class);
+
     public final SetPath<Long, NumberPath<Long>> conceptTagIds = this.<Long, NumberPath<Long>>createSet("conceptTagIds", Long.class, NumberPath.class, PathInits.DIRECT2);
 
     //inherited
@@ -35,8 +37,6 @@ public class QChildProblem extends EntityPathBase<ChildProblem> {
 
     public final StringPath imageUrl = createString("imageUrl");
 
-    public final EnumPath<com.moplus.moplus_server.domain.problem.domain.problem.ProblemType> problemType = createEnum("problemType", com.moplus.moplus_server.domain.problem.domain.problem.ProblemType.class);
-
     public final NumberPath<Integer> sequence = createNumber("sequence", Integer.class);
 
     //inherited

src/main/generated/com/moplus/moplus_server/domain/problem/domain/problem/QDifficulty.java

@@ -0,0 +1,37 @@
+package com.moplus.moplus_server.domain.problem.domain.problem;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QDifficulty is a Querydsl query type for Difficulty
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QDifficulty extends BeanPath<Difficulty> {
+
+    private static final long serialVersionUID = 175172936L;
+
+    public static final QDifficulty difficulty1 = new QDifficulty("difficulty1");
+
+    public final NumberPath<Integer> difficulty = createNumber("difficulty", Integer.class);
+
+    public QDifficulty(String variable) {
+        super(Difficulty.class, forVariable(variable));
+    }
+
+    public QDifficulty(Path<? extends Difficulty> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QDifficulty(PathMetadata metadata) {
+        super(Difficulty.class, metadata);
+    }
+
+}
+

src/main/generated/com/moplus/moplus_server/domain/problem/domain/problem/QProblem.java

@@ -26,37 +26,45 @@ public class QProblem extends EntityPathBase<Problem> {
 
     public final com.moplus.moplus_server.domain.problem.domain.QAnswer answer;
 
-    public final ListPath<com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem, com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem> childProblems = this.<com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem, com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem>createList("childProblems", com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem.class, com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem.class, PathInits.DIRECT2);
+    public final EnumPath<AnswerType> answerType = createEnum("answerType", AnswerType.class);
 
-    public final StringPath comment = createString("comment");
+    public final ListPath<com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem, com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem> childProblems = this.<com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem, com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem>createList("childProblems", com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem.class, com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem.class, PathInits.DIRECT2);
 
     public final SetPath<Long, NumberPath<Long>> conceptTagIds = this.<Long, NumberPath<Long>>createSet("conceptTagIds", Long.class, NumberPath.class, PathInits.DIRECT2);
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
 
-    public final QProblemId id;
+    public final QDifficulty difficulty;
 
-    public final BooleanPath isPublished = createBoolean("isPublished");
+    public final NumberPath<Long> id = createNumber("id", Long.class);
 
-    public final BooleanPath isVariation = createBoolean("isVariation");
+    public final BooleanPath isConfirmed = createBoolean("isConfirmed");
 
     public final StringPath mainAnalysisImageUrl = createString("mainAnalysisImageUrl");
 
+    public final StringPath mainHandwritingExplanationImageUrl = createString("mainHandwritingExplanationImageUrl");
+
     public final StringPath mainProblemImageUrl = createString("mainProblemImageUrl");
 
+    public final StringPath memo = createString("memo");
+
     public final NumberPath<Integer> number = createNumber("number", Integer.class);
 
     public final NumberPath<Long> practiceTestId = createNumber("practiceTestId", Long.class);
 
-    public final StringPath prescriptionImageUrl = createString("prescriptionImageUrl");
+    public final ListPath<String, StringPath> prescriptionImageUrls = this.<String, StringPath>createList("prescriptionImageUrls", String.class, StringPath.class, PathInits.DIRECT2);
+
+    public final QProblemAdminId problemAdminId;
 
     public final EnumPath<ProblemType> problemType = createEnum("problemType", ProblemType.class);
 
     public final StringPath readingTipImageUrl = createString("readingTipImageUrl");
 
     public final StringPath seniorTipImageUrl = createString("seniorTipImageUrl");
 
+    public final QTitle title;
+
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
 
@@ -79,7 +87,9 @@ public QProblem(PathMetadata metadata, PathInits inits) {
     public QProblem(Class<? extends Problem> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.answer = inits.isInitialized("answer") ? new com.moplus.moplus_server.domain.problem.domain.QAnswer(forProperty("answer")) : null;
-        this.id = inits.isInitialized("id") ? new QProblemId(forProperty("id")) : null;
+        this.difficulty = inits.isInitialized("difficulty") ? new QDifficulty(forProperty("difficulty")) : null;
+        this.problemAdminId = inits.isInitialized("problemAdminId") ? new QProblemAdminId(forProperty("problemAdminId")) : null;
+        this.title = inits.isInitialized("title") ? new QTitle(forProperty("title")) : null;
     }
 
 }

src/main/generated/com/moplus/moplus_server/domain/problem/domain/problem/QProblemAdminId.java

@@ -0,0 +1,37 @@
+package com.moplus.moplus_server.domain.problem.domain.problem;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QProblemAdminId is a Querydsl query type for ProblemAdminId
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QProblemAdminId extends BeanPath<ProblemAdminId> {
+
+    private static final long serialVersionUID = 348147768L;
+
+    public static final QProblemAdminId problemAdminId = new QProblemAdminId("problemAdminId");
+
+    public final StringPath id = createString("id");
+
+    public QProblemAdminId(String variable) {
+        super(ProblemAdminId.class, forVariable(variable));
+    }
+
+    public QProblemAdminId(Path<? extends ProblemAdminId> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QProblemAdminId(PathMetadata metadata) {
+        super(ProblemAdminId.class, metadata);
+    }
+
+}
+

src/main/generated/com/moplus/moplus_server/domain/problem/domain/problem/QTitle.java

@@ -0,0 +1,37 @@
+package com.moplus.moplus_server.domain.problem.domain.problem;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QTitle is a Querydsl query type for Title
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QTitle extends BeanPath<Title> {
+
+    private static final long serialVersionUID = 42281131L;
+
+    public static final QTitle title1 = new QTitle("title1");
+
+    public final StringPath title = createString("title");
+
+    public QTitle(String variable) {
+        super(Title.class, forVariable(variable));
+    }
+
+    public QTitle(Path<? extends Title> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QTitle(PathMetadata metadata) {
+        super(Title.class, metadata);
+    }
+
+}
+

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

@@ -10,7 +10,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-02-08T16:27:45+0900",
+    date = "2025-02-12T02:55:03+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component
@@ -25,7 +25,7 @@ public ChildProblem from(ChildProblemPostRequest request) {
         ChildProblem.ChildProblemBuilder childProblem = ChildProblem.builder();
 
         childProblem.imageUrl( request.imageUrl() );
-        childProblem.problemType( request.problemType() );
+        childProblem.answerType( request.answerType() );
         childProblem.answer( request.answer() );
         Set<Long> set = request.conceptTagIds();
         if ( set != null ) {
@@ -45,7 +45,7 @@ public ChildProblem from(ChildProblemUpdateRequest request) {
         ChildProblem.ChildProblemBuilder childProblem = ChildProblem.builder();
 
         childProblem.imageUrl( request.imageUrl() );
-        childProblem.problemType( request.problemType() );
+        childProblem.answerType( request.answerType() );
         childProblem.answer( request.answer() );
         Set<Long> set = request.conceptTagIds();
         if ( set != null ) {

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

@@ -2,72 +2,73 @@
 
 import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
 import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
-import com.moplus.moplus_server.domain.problem.domain.problem.ProblemId;
+import com.moplus.moplus_server.domain.problem.domain.problem.ProblemAdminId;
 import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
 import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest;
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 import javax.annotation.processing.Generated;
 import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-02-08T16:27:45+0900",
+    date = "2025-02-13T05:08:28+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component
 public class ProblemMapperImpl implements ProblemMapper {
 
     @Override
-    public Problem from(ProblemPostRequest request, ProblemId problemId, PracticeTestTag practiceTestTag) {
-        if ( request == null && problemId == null && practiceTestTag == null ) {
+    public Problem from(ProblemPostRequest request, ProblemAdminId problemAdminId, PracticeTestTag practiceTestTag) {
+        if ( request == null && problemAdminId == null && practiceTestTag == null ) {
             return null;
         }
 
         Problem.ProblemBuilder problem = Problem.builder();
 
         if ( request != null ) {
+            problem.problemType( request.problemType() );
             problem.number( request.number() );
-            problem.answer( request.answer() );
-            problem.comment( request.comment() );
-            problem.mainProblemImageUrl( request.mainProblemImageUrl() );
-            problem.mainAnalysisImageUrl( request.mainAnalysisImageUrl() );
-            problem.readingTipImageUrl( request.readingTipImageUrl() );
-            problem.seniorTipImageUrl( request.seniorTipImageUrl() );
-            problem.prescriptionImageUrl( request.prescriptionImageUrl() );
-            Set<Long> set = request.conceptTagIds();
-            if ( set != null ) {
-                problem.conceptTagIds( new LinkedHashSet<Long>( set ) );
-            }
         }
-        problem.id( problemId );
+        problem.problemAdminId( problemAdminId );
         problem.practiceTestTag( practiceTestTag );
 
         return problem.build();
     }
 
     @Override
-    public Problem from(ProblemUpdateRequest request, ProblemId problemId, PracticeTestTag practiceTestTag) {
-        if ( request == null && problemId == null && practiceTestTag == null ) {
+    public Problem from(ProblemUpdateRequest request, ProblemAdminId problemAdminId, PracticeTestTag practiceTestTag) {
+        if ( request == null && problemAdminId == null && practiceTestTag == null ) {
             return null;
         }
 
         Problem.ProblemBuilder problem = Problem.builder();
 
         if ( request != null ) {
-            problem.answer( String.valueOf( request.answer() ) );
-            problem.comment( request.comment() );
-            problem.mainProblemImageUrl( request.mainProblemImageUrl() );
-            problem.mainAnalysisImageUrl( request.mainAnalysisImageUrl() );
-            problem.readingTipImageUrl( request.readingTipImageUrl() );
-            problem.seniorTipImageUrl( request.seniorTipImageUrl() );
-            problem.prescriptionImageUrl( request.prescriptionImageUrl() );
+            problem.answerType( request.answerType() );
             Set<Long> set = request.conceptTagIds();
             if ( set != null ) {
                 problem.conceptTagIds( new LinkedHashSet<Long>( set ) );
             }
+            problem.difficulty( request.difficulty() );
+            problem.mainHandwritingExplanationImageUrl( request.mainHandwritingExplanationImageUrl() );
+            List<String> list = request.prescriptionImageUrls();
+            if ( list != null ) {
+                problem.prescriptionImageUrls( new ArrayList<String>( list ) );
+            }
+            problem.seniorTipImageUrl( request.seniorTipImageUrl() );
+            problem.readingTipImageUrl( request.readingTipImageUrl() );
+            problem.mainAnalysisImageUrl( request.mainAnalysisImageUrl() );
+            problem.mainProblemImageUrl( request.mainProblemImageUrl() );
+            problem.memo( request.memo() );
+            problem.answer( request.answer() );
+            problem.title( request.title() );
+            problem.problemType( request.problemType() );
+            problem.number( request.number() );
         }
-        problem.id( problemId );
+        problem.problemAdminId( problemAdminId );
         problem.practiceTestTag( practiceTestTag );
 
         return problem.build();

src/main/generated/com/moplus/moplus_server/domain/problemset/domain/QProblemSet.java

@@ -33,7 +33,7 @@ public class QProblemSet extends EntityPathBase<ProblemSet> {
 
     public final BooleanPath isDeleted = createBoolean("isDeleted");
 
-    public final ListPath<com.moplus.moplus_server.domain.problem.domain.problem.ProblemId, com.moplus.moplus_server.domain.problem.domain.problem.QProblemId> problemIds = this.<com.moplus.moplus_server.domain.problem.domain.problem.ProblemId, com.moplus.moplus_server.domain.problem.domain.problem.QProblemId>createList("problemIds", com.moplus.moplus_server.domain.problem.domain.problem.ProblemId.class, com.moplus.moplus_server.domain.problem.domain.problem.QProblemId.class, PathInits.DIRECT2);
+    public final ListPath<Long, NumberPath<Long>> problemIds = this.<Long, NumberPath<Long>>createList("problemIds", Long.class, NumberPath.class, PathInits.DIRECT2);
 
     public final QTitle title;