Merge pull request #61 from team-MoPlus/hotfix/#54

sejoon00 · web-flow · commit c661ad0aa50e · 2025-02-18T20:04:30.000+09:00
[fix/#54] 문항 생성 오류 해결
diff --git a/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java b/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java
@@ -3,6 +3,7 @@
 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.ProblemCustomId;
+import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;
 import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
 import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest;
 import java.util.ArrayList;
@@ -14,7 +15,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-02-18T15:29:27+0900",
+    date = "2025-02-18T19:54:34+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component
@@ -73,4 +74,18 @@ public Problem from(ProblemUpdateRequest request, ProblemCustomId problemCustomI
 
         return problem.build();
     }
+
+    @Override
+    public Problem from(ProblemType problemType, ProblemCustomId problemCustomId) {
+        if ( problemType == null && problemCustomId == null ) {
+            return null;
+        }
+
+        Problem.ProblemBuilder problem = Problem.builder();
+
+        problem.problemType( problemType );
+        problem.problemCustomId( problemCustomId );
+
+        return problem.build();
+    }
 }
diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/Problem.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/Problem.java
@@ -103,7 +103,7 @@ public Problem(List<ChildProblem> childProblems, boolean isConfirmed, AnswerType
         this.title = new Title(title);
         this.problemType = problemType;
         this.number = number;
-        this.practiceTestId = practiceTestTag.getId();
+        this.practiceTestId = practiceTestTag != null ? practiceTestTag.getId() : null;
         this.problemCustomId = problemCustomId;
     }
 
@@ -112,7 +112,7 @@ public String getAnswer() {
     }
 
     public void update(Problem inputProblem) {
-        this.problemCustomId = inputProblem.getProblemCustomId();
+        this.problemCustomId = new ProblemCustomId(inputProblem.getProblemCustomId());
         this.practiceTestId = inputProblem.getPracticeTestId();
         this.number = inputProblem.getNumber();
         this.problemType = inputProblem.getProblemType();
@@ -166,4 +166,9 @@ public String getTitle() {
     public Integer getDifficulty() {
         return difficulty != null ? difficulty.getDifficulty() : null;
     }
+
+    public String getProblemCustomId() {
+        return problemCustomId.getId();
+    }
+
 }
diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/ProblemAdminIdService.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/ProblemAdminIdService.java
@@ -41,4 +41,21 @@ public ProblemCustomId nextId(int number, PracticeTestTag practiceTestTag, Probl
 
         return new ProblemCustomId(generatedId);
     }
+
+    public ProblemCustomId nextId(ProblemType problemType) {
+
+        int problemTypeCode = problemType.getCode(); // C (문제 타입)
+
+        String generatedId;
+        int sequence;
+
+        // 중복되지 않는 ID 찾을 때까지 반복
+        do {
+            sequence = SEQUENCE.getAndIncrement() % 100; // 000~999 순환
+            generatedId = String.format("%d%09d",
+                    problemTypeCode, sequence);
+        } while (problemRepository.existsByProblemCustomId(new ProblemCustomId(generatedId))); // ID가 이미 존재하면 재생성
+
+        return new ProblemCustomId(generatedId);
+    }
 }
diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java
@@ -36,7 +36,7 @@ public static ProblemGetResponse of(Problem problem) {
 
         return ProblemGetResponse.builder()
                 .id(problem.getId())
-                .problemCustomId(problem.getProblemCustomId().getId())
+                .problemCustomId(problem.getProblemCustomId())
                 .conceptTagIds(problem.getConceptTagIds())
                 .practiceTestId(problem.getPracticeTestId())
                 .number(problem.getNumber())
diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemPostResponse.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemPostResponse.java
@@ -7,9 +7,9 @@ public record ProblemPostResponse(
         @NotNull(message = "문항 ID는 필수입니다")
         Long id,
         @NotNull(message = "문항 custom ID는 필수입니다")
-        Long problemCustomId
+        String problemCustomId
 ) {
     public static ProblemPostResponse of(Problem problem) {
-        return new ProblemPostResponse(problem.getId(), problem.getPracticeTestId());
+        return new ProblemPostResponse(problem.getId(), problem.getProblemCustomId());
     }
 }
diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveService.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveService.java
@@ -4,6 +4,7 @@
 import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
 import com.moplus.moplus_server.domain.problem.domain.problem.ProblemAdminIdService;
 import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId;
+import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;
 import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
 import com.moplus.moplus_server.domain.problem.dto.response.ProblemPostResponse;
 import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository;
@@ -24,11 +25,19 @@ public class ProblemSaveService {
 
     @Transactional
     public ProblemPostResponse createProblem(ProblemPostRequest request) {
-        PracticeTestTag practiceTestTag = practiceTestRepository.findByIdElseThrow(request.practiceTestId());
-        ProblemCustomId problemCustomId = problemAdminIdService.nextId(request.number(), practiceTestTag,
-                request.problemType());
+        Problem problem;
+        if (request.problemType() != ProblemType.CREATION_PROBLEM) {
+            PracticeTestTag practiceTestTag = practiceTestRepository.findByIdElseThrow(request.practiceTestId());
+            ProblemCustomId problemCustomId = problemAdminIdService.nextId(request.number(), practiceTestTag,
+                    request.problemType());
+
+            problem = problemMapper.from(request, problemCustomId, practiceTestTag);
+        } else {
+            ProblemCustomId problemCustomId = problemAdminIdService.nextId(request.problemType());
+            problem = problemMapper.from(request.problemType(), problemCustomId);
+        }
 
-        Problem problem = problemMapper.from(request, problemCustomId, practiceTestTag);
         return ProblemPostResponse.of(problemRepository.save(problem));
     }
+
 }
diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapper.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapper.java
@@ -3,6 +3,7 @@
 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.ProblemCustomId;
+import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;
 import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
 import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest;
 import org.mapstruct.Mapper;
@@ -23,4 +24,9 @@ public interface ProblemMapper {
             @Mapping(target = "practiceTestTag", source = "practiceTestTag"),
     })
     Problem from(ProblemUpdateRequest request, ProblemCustomId problemCustomId, PracticeTestTag practiceTestTag);
+
+    @Mappings({
+            @Mapping(target = "problemCustomId", source = "problemCustomId")
+    })
+    Problem from(ProblemType problemType, ProblemCustomId problemCustomId);
 }
diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/domain/ProblemSet.java b/src/main/java/com/moplus/moplus_server/domain/problemset/domain/ProblemSet.java
@@ -69,7 +69,7 @@ public void toggleConfirm(List<Problem> problems) {
         if (this.confirmStatus == ProblemSetConfirmStatus.NOT_CONFIRMED) {
             List<String> invalidProblemIds = problems.stream()
                     .filter(problem -> !problem.isValid())
-                    .map(problem -> problem.getProblemCustomId().getId())
+                    .map(Problem::getProblemCustomId)
                     .toList();
             if (!invalidProblemIds.isEmpty()) {
                 String message = ErrorCode.INVALID_CONFIRM_PROBLEM.getMessage() +
diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java
@@ -16,7 +16,7 @@ public record ProblemSummaryResponse(
     public static ProblemSummaryResponse of(Problem problem, String practiceTestName, List<String> tagNames) {
 
         return ProblemSummaryResponse.builder()
-                .problemId(problem.getProblemCustomId().getId())
+                .problemId(problem.getProblemCustomId())
                 .number(problem.getNumber())
                 .memo(problem.getMemo())
                 .mainProblemImageUrl(problem.getMainProblemImageUrl())

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public Problem(List<ChildProblem> childProblems, boolean isConfirmed, AnswerType`
`103`	`103`	`this.title = new Title(title);`
`104`	`104`	`this.problemType = problemType;`
`105`	`105`	`this.number = number;`
`106`		`- this.practiceTestId = practiceTestTag.getId();`
	`106`	`+ this.practiceTestId = practiceTestTag != null ? practiceTestTag.getId() : null;`
`107`	`107`	`this.problemCustomId = problemCustomId;`
`108`	`108`	`}`
`109`	`109`
`@@ -112,7 +112,7 @@ public String getAnswer() {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`public void update(Problem inputProblem) {`
`115`		`- this.problemCustomId = inputProblem.getProblemCustomId();`
	`115`	`+ this.problemCustomId = new ProblemCustomId(inputProblem.getProblemCustomId());`
`116`	`116`	`this.practiceTestId = inputProblem.getPracticeTestId();`
`117`	`117`	`this.number = inputProblem.getNumber();`
`118`	`118`	`this.problemType = inputProblem.getProblemType();`
`@@ -166,4 +166,9 @@ public String getTitle() {`
`166`	`166`	`public Integer getDifficulty() {`
`167`	`167`	`return difficulty != null ? difficulty.getDifficulty() : null;`
`168`	`168`	`}`
	`169`	`+`
	`170`	`+ public String getProblemCustomId() {`
	`171`	`+ return problemCustomId.getId();`
	`172`	`+ }`
	`173`	`+`
`169`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ public record ProblemPostResponse(`
`7`	`7`	`@NotNull(message = "문항 ID는 필수입니다")`
`8`	`8`	`Long id,`
`9`	`9`	`@NotNull(message = "문항 custom ID는 필수입니다")`
`10`		`- Long problemCustomId`
	`10`	`+ String problemCustomId`
`11`	`11`	`) {`
`12`	`12`	`public static ProblemPostResponse of(Problem problem) {`
`13`		`- return new ProblemPostResponse(problem.getId(), problem.getPracticeTestId());`
	`13`	`+ return new ProblemPostResponse(problem.getId(), problem.getProblemCustomId());`
`14`	`14`	`}`
`15`	`15`	`}`