Question 도메인에 QueryDsl 적용

.gitignore

@@ -44,3 +44,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### QClass
+**/build/generated/sources/annotationProcessor/**

application/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     implementation(project(":persistence"))
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.springfox:springfox-boot-starter:3.0.0'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
 }
 
 test {

application/src/main/java/com/comssa/api/question/controller/rest/license/AdminLicenseQuestionController.java

@@ -26,6 +26,7 @@ public class AdminLicenseQuestionController {
 	public ResponseEntity<List<ResponseMultipleChoiceQuestionDto>> makeLicenseQuestionOfSession(
 		@RequestBody RequestMakeLicenseMultipleChoiceQuestionDto requestMakeLicenseMultipleChoiceQuestionDto) {
 		return ResponseEntity.ok(
-			adminLicenseQuestionMakeService.makeLicenseNormalQuestion(requestMakeLicenseMultipleChoiceQuestionDto));
+			adminLicenseQuestionMakeService
+				.makeLicenseMultipleChoiceQuestion(requestMakeLicenseMultipleChoiceQuestionDto));
 	}
 }

application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionSelectorService.java

@@ -7,9 +7,9 @@
 import com.comssa.persistence.question.domain.common.QuestionLevel;
 import com.comssa.persistence.question.domain.license.LicenseCategory;
 import com.comssa.persistence.question.domain.license.LicenseSession;
-import com.comssa.persistence.question.repository.LicenseMultipleChoiceQuestionRepository;
-import com.comssa.persistence.question.repository.LicenseSessionRepository;
-import com.comssa.persistence.question.repository.MajorMultipleChoiceQuestionRepository;
+import com.comssa.persistence.question.repository.jpa.LicenseSessionRepository;
+import com.comssa.persistence.question.repository.querydsl.LicenseMultipleChoiceQuestionDslRepository;
+import com.comssa.persistence.question.repository.querydsl.MajorMultipleChoiceQuestionDslRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -22,8 +22,8 @@
 @RequiredArgsConstructor
 public class BasicQuestionSelectorService implements QuestionSelectorService {
 	private final LicenseSessionRepository licenseSessionRepository;
-	private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository;
-	private final LicenseMultipleChoiceQuestionRepository licenseMultipleChoiceQuestionRepository;
+	private final MajorMultipleChoiceQuestionDslRepository majorMultipleChoiceQuestionDslRepository;
+	private final LicenseMultipleChoiceQuestionDslRepository licenseMultipleChoiceQuestionDslRepository;
 
 	@Override
 	public List<String> getCategories() {
@@ -56,10 +56,11 @@ public List<LicenseSession> getLicenseSessions(LicenseCategory licenseCategory)
 	public List<? extends Question> getAllQuestions(List<QuestionCategory> questionCategories, boolean multipleChoice) {
 		List<Question> questions = new ArrayList<>();
 		if (multipleChoice) {
-			questions.addAll(licenseMultipleChoiceQuestionRepository.findAllByQuestionCategoriesFetchChoices(
-				questionCategories));
-			questions.addAll(majorMultipleChoiceQuestionRepository.findAllByQuestionCategoriesFetchChoices(
+			questions.addAll(licenseMultipleChoiceQuestionDslRepository.findAllWhereQuestionCategories(
 				questionCategories));
+			questions.addAll(majorMultipleChoiceQuestionDslRepository
+				.findAllWhereQuestionCategories(
+					questionCategories));
 		}
 		return questions;
 	}

application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceGradeService.java

@@ -1,7 +1,7 @@
 package com.comssa.api.question.service.rest.common.implement;
 
 import com.comssa.persistence.question.domain.common.QuestionChoice;
-import com.comssa.persistence.question.repository.QuestionChoiceRepository;
+import com.comssa.persistence.question.repository.jpa.QuestionChoiceRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceService.java

@@ -6,8 +6,7 @@
 import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion;
 import com.comssa.persistence.question.domain.major.MajorQuestionChoice;
 import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto;
-import com.comssa.persistence.question.repository.LicenseQuestionChoiceRepository;
-import com.comssa.persistence.question.repository.MajorQuestionChoiceRepository;
+import com.comssa.persistence.question.repository.jpa.QuestionChoiceRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,13 +17,12 @@
 @RequiredArgsConstructor
 @Transactional
 public class QuestionChoiceService {
-	private final MajorQuestionChoiceRepository majorQuestionChoiceRepository;
-	private final LicenseQuestionChoiceRepository licenseQuestionChoiceRepository;
+	private final QuestionChoiceRepository questionChoiceRepository;
 
 	public void saveWith(
 		RequestMakeMultipleChoiceQuestionDto dto,
 		LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion) {
-		licenseQuestionChoiceRepository.saveAll(dto.getQuestionChoices()
+		questionChoiceRepository.saveAll(dto.getQuestionChoices()
 			.stream()
 			.map(qc -> LicenseQuestionChoice.from(qc, licenseMultipleChoiceQuestion))
 			.collect(Collectors.toList()));
@@ -33,7 +31,7 @@ public void saveWith(
 	public void saveWith(
 		RequestMakeMultipleChoiceQuestionDto dto,
 		MajorMultipleChoiceQuestion majorMultipleChoiceQuestion) {
-		majorQuestionChoiceRepository.saveAll(dto.getQuestionChoices()
+		questionChoiceRepository.saveAll(dto.getQuestionChoices()
 			.stream()
 			.map(qc -> MajorQuestionChoice.fromMajorQuestion(qc, majorMultipleChoiceQuestion))
 			.collect(Collectors.toList()));

application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceUpdateService.java

@@ -1,7 +1,7 @@
 package com.comssa.api.question.service.rest.common.implement;
 
 import com.comssa.persistence.question.domain.common.QuestionChoice;
-import com.comssa.persistence.question.repository.QuestionChoiceRepository;
+import com.comssa.persistence.question.repository.jpa.QuestionChoiceRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionUpdateService.java

@@ -2,7 +2,7 @@
 
 import com.comssa.api.question.service.rest.common.FileUploadService;
 import com.comssa.persistence.question.domain.common.Question;
-import com.comssa.persistence.question.service.QuestionRepositoryService;
+import com.comssa.persistence.question.repository.jpa.QuestionRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -13,7 +13,7 @@
 @RequiredArgsConstructor
 public class QuestionUpdateService
 	implements com.comssa.api.question.service.rest.common.QuestionUpdateService<Question> {
-	private final QuestionRepositoryService questionRepositoryService;
+	private final QuestionRepository questionRepository;
 	private final FileUploadService fileUploadService;
 
 	@Override
@@ -32,11 +32,11 @@ public String updateImage(Long questionId, MultipartFile image) {
 
 	@Override
 	public void deleteQuestion(Long questionId) {
-		questionRepositoryService.delete(questionId);
+		questionRepository.deleteById(questionId);
 	}
 
 	@Override
 	public Question findById(Long questionId) {
-		return questionRepositoryService.findById(questionId);
+		return questionRepository.findById(questionId).get();
 	}
 }

application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionGetService.java

@@ -6,7 +6,7 @@
 import com.comssa.persistence.question.domain.common.Question;
 import com.comssa.persistence.question.domain.common.QuestionCategory;
 import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion;
-import com.comssa.persistence.question.repository.LicenseMultipleChoiceQuestionRepository;
+import com.comssa.persistence.question.repository.querydsl.LicenseMultipleChoiceQuestionDslRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +18,8 @@
 @Transactional
 @RequiredArgsConstructor
 public class AdminLicenseQuestionGetService implements LicenseQuestionGetService {
-	private final LicenseMultipleChoiceQuestionRepository licenseMultipleChoiceQuestionRepository;
+
+	private final LicenseMultipleChoiceQuestionDslRepository licenseMultipleChoiceQuestionDslRepository;
 	private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
 
 	/**
@@ -29,8 +30,8 @@ public class AdminLicenseQuestionGetService implements LicenseQuestionGetService
 	@Override
 	public Map<QuestionCategory, List<Question>> getClassifiedLicenseMultipleChoiceQuestion(
 		Long sessionId) {
-		List<LicenseMultipleChoiceQuestion> licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionRepository
-			.findAllByLicenseSessionIdFetchChoicesOrderByApproved(sessionId);
+		List<LicenseMultipleChoiceQuestion> licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionDslRepository
+			.findAllWhereLicenseSessionId(sessionId);
 		return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(licenseMultipleChoiceQuestions);
 	}
 }

application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionMakeService.java

@@ -9,7 +9,7 @@
 import com.comssa.persistence.question.dto.common.response.ResponseMultipleChoiceQuestionDto;
 import com.comssa.persistence.question.dto.common.response.ResponseQuestionDto;
 import com.comssa.persistence.question.dto.license.request.RequestMakeLicenseMultipleChoiceQuestionDto;
-import com.comssa.persistence.question.repository.LicenseMultipleChoiceQuestionRepository;
+import com.comssa.persistence.question.repository.jpa.QuestionRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,10 +22,10 @@
 @RequiredArgsConstructor
 public class AdminLicenseQuestionMakeService {
 	private final LicenseSessionService licenseSessionService;
-	private final LicenseMultipleChoiceQuestionRepository licenseMultipleChoiceQuestionRepository;
+	private final QuestionRepository questionRepository;
 	private final QuestionChoiceService questionChoiceService;
 
-	public List<ResponseMultipleChoiceQuestionDto> makeLicenseNormalQuestion(
+	public List<ResponseMultipleChoiceQuestionDto> makeLicenseMultipleChoiceQuestion(
 		RequestMakeLicenseMultipleChoiceQuestionDto requestMakeLicenseMultipleChoiceQuestionDto) {
 		LicenseSession licenseSession = licenseSessionService.getLicenseSession(
 			requestMakeLicenseMultipleChoiceQuestionDto.getLicenseSession(),
@@ -34,18 +34,18 @@ public List<ResponseMultipleChoiceQuestionDto> makeLicenseNormalQuestion(
 			.getQuestions();
 		return questions
 			.stream()
-			.map(q -> saveNormalLicenseQuestion(q, licenseSession,
+			.map(q -> saveLicenseMultipleChoiceQuestion(q, licenseSession,
 				requestMakeLicenseMultipleChoiceQuestionDto.getLicenseCategory()))
 			.collect(Collectors.toList());
 	}
 
-	private ResponseMultipleChoiceQuestionDto saveNormalLicenseQuestion(
+	private ResponseMultipleChoiceQuestionDto saveLicenseMultipleChoiceQuestion(
 		RequestMakeMultipleChoiceQuestionDto requestMakeMultipleChoiceQuestionDto,
 		LicenseSession licenseSession,
 		LicenseCategory licenseCategory) {
 		LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.makeWithDto(
 			requestMakeMultipleChoiceQuestionDto, licenseSession, licenseCategory);
-		licenseMultipleChoiceQuestionRepository.save(licenseMultipleChoiceQuestion);
+		questionRepository.save(licenseMultipleChoiceQuestion);
 		questionChoiceService.saveWith(requestMakeMultipleChoiceQuestionDto, licenseMultipleChoiceQuestion);
 		return ResponseQuestionDto.from(licenseMultipleChoiceQuestion);
 	}

application/src/main/java/com/comssa/api/question/service/rest/license/implement/LicenseSessionService.java

@@ -3,7 +3,7 @@
 
 import com.comssa.persistence.question.domain.license.LicenseCategory;
 import com.comssa.persistence.question.domain.license.LicenseSession;
-import com.comssa.persistence.question.repository.LicenseSessionRepository;
+import com.comssa.persistence.question.repository.jpa.LicenseSessionRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,20 +14,20 @@
 @RequiredArgsConstructor
 @Transactional
 public class LicenseSessionService {
-    private final LicenseSessionRepository licenseSessionRepository;
+	private final LicenseSessionRepository licenseSessionRepository;
 
-    public LicenseSession getLicenseSession(String session, LicenseCategory licenseCategory) {
-        Optional<LicenseSession> licenseSession = licenseSessionRepository.findLicenseSessionByContent(session,
-                licenseCategory);
-        if (licenseSession.isPresent()) {
-            return licenseSession.get();
-        }
-        LicenseSession newLicenseSession = LicenseSession.from(session, licenseCategory);
-        licenseSessionRepository.save(newLicenseSession);
-        return newLicenseSession;
-    }
+	public LicenseSession getLicenseSession(String session, LicenseCategory licenseCategory) {
+		Optional<LicenseSession> licenseSession = licenseSessionRepository.findLicenseSessionByContent(session,
+			licenseCategory);
+		if (licenseSession.isPresent()) {
+			return licenseSession.get();
+		}
+		LicenseSession newLicenseSession = LicenseSession.from(session, licenseCategory);
+		licenseSessionRepository.save(newLicenseSession);
+		return newLicenseSession;
+	}
 
-    public LicenseSession getLicenseSessionById(Long licenseSessionId) {
-        return licenseSessionRepository.findById(licenseSessionId).orElse(null);
-    }
+	public LicenseSession getLicenseSessionById(Long licenseSessionId) {
+		return licenseSessionRepository.findById(licenseSessionId).orElse(null);
+	}
 }

application/src/main/java/com/comssa/api/question/service/rest/license/implement/UserLicenseQuestionGetService.java

@@ -6,7 +6,7 @@
 import com.comssa.persistence.question.domain.common.Question;
 import com.comssa.persistence.question.domain.common.QuestionCategory;
 import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion;
-import com.comssa.persistence.question.repository.LicenseMultipleChoiceQuestionRepository;
+import com.comssa.persistence.question.repository.querydsl.LicenseMultipleChoiceQuestionDslRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,14 +19,14 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class UserLicenseQuestionGetService implements LicenseQuestionGetService {
-	private final LicenseMultipleChoiceQuestionRepository licenseMultipleChoiceQuestionRepository;
+	private final LicenseMultipleChoiceQuestionDslRepository licenseMultipleChoiceQuestionDslRepository;
 	private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
 
 	public Map<QuestionCategory, List<Question>> getClassifiedLicenseMultipleChoiceQuestion(
 		Long sessionId) {
-		List<LicenseMultipleChoiceQuestion> licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionRepository
-			.findAllByLicenseSessionIdFetchChoicesAndIfApproved(
-				sessionId);
+		List<LicenseMultipleChoiceQuestion> licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionDslRepository
+			.findAllWhereLicenseSessionIdAndIfApproved(
+				sessionId, true);
 		for (LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion : licenseMultipleChoiceQuestions) {
 			Collections.shuffle(licenseMultipleChoiceQuestion.getQuestionChoices());
 		}

application/src/main/java/com/comssa/api/question/service/rest/major/implement/AdminMajorMultipleChoiceQuestionUpdateService.java

@@ -1,22 +1,24 @@
 package com.comssa.api.question.service.rest.major.implement;
 
 import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion;
+import com.comssa.persistence.question.repository.jpa.MajorMultipleChoiceQuestionRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.NoSuchElementException;
+
 @Service
 @RequiredArgsConstructor
 @Transactional
 public class AdminMajorMultipleChoiceQuestionUpdateService {
-	private final MajorMultipleChoiceQuestionDbService majorMultipleChoiceQuestionDBService;
+	private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository;
 
 	public MajorMultipleChoiceQuestion toggleCanBeShortAnswered(Long questionId) {
-		MajorMultipleChoiceQuestion majorMultipleChoiceQuestion = majorMultipleChoiceQuestionDBService
-			.findById(
-				questionId);
+		MajorMultipleChoiceQuestion majorMultipleChoiceQuestion = majorMultipleChoiceQuestionRepository
+			.findById(questionId)
+			.orElseThrow(NoSuchElementException::new);
 		majorMultipleChoiceQuestion.toggleCanBeShortAnswered();
 		return majorMultipleChoiceQuestion;
 	}
-
 }

application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionClassifiedGetService.java

@@ -7,7 +7,8 @@
 import com.comssa.persistence.question.domain.common.QuestionCategory;
 import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion;
 import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion;
-import com.comssa.persistence.question.repository.MajorDescriptiveQuestionRepository;
+import com.comssa.persistence.question.repository.querydsl.MajorDescriptiveDslRepository;
+import com.comssa.persistence.question.repository.querydsl.MajorMultipleChoiceQuestionDslRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,9 +20,9 @@
 @RequiredArgsConstructor
 @Transactional
 public class BasicAdminMajorQuestionClassifiedGetService implements AdminMajorQuestionClassifiedGetService {
-	private final MajorMultipleChoiceQuestionDbService majorMultipleChoiceQuestionDbService;
-	private final MajorDescriptiveQuestionRepository majorDescriptiveQuestionRepository;
 	private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
+	private final MajorDescriptiveDslRepository majorDescriptiveQuestionChooseRepository;
+	private final MajorMultipleChoiceQuestionDslRepository majorMultipleChoiceQuestionDslRepository;
 
 	/**
 	 * 관리자가 조회시 Approve됐는지 기준으로 정렬되며(false인 것부터),
@@ -31,15 +32,15 @@ public class BasicAdminMajorQuestionClassifiedGetService implements AdminMajorQu
 	 */
 	@Override
 	public Map<QuestionCategory, List<Question>> getClassifiedAllMajorMultipleChoiceQuestions() {
-		List<MajorMultipleChoiceQuestion> majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDbService
-			.findAllFetchChoicesSortedByApproveAndShortAnswered();
+		List<MajorMultipleChoiceQuestion> majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDslRepository
+			.findAllOrderByIfApprovedAsc();
 		return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions);
 	}
 
 	@Override
 	public Map<QuestionCategory, List<Question>> getClassifiedAllMajorDescriptiveQuestions() {
 		List<MajorDescriptiveQuestion> majorDescriptiveQuestions =
-			majorDescriptiveQuestionRepository.findAllSortedByIfApproved();
+			majorDescriptiveQuestionChooseRepository.findAllOrderByIfApprovedAsc();
 		return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions);
 	}
 }