diff --git a/.gitignore b/.gitignore index 5ff171b9..d7395efb 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ out/ ### VS Code ### .vscode/ + +### QClass +**/build/generated/sources/annotationProcessor/** diff --git a/application/build.gradle b/application/build.gradle index 13fca76a..cfcb4c41 100644 --- a/application/build.gradle +++ b/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 { diff --git a/application/src/main/java/com/comssa/api/config/JpaConfig.java b/application/src/main/java/com/comssa/api/config/JpaConfig.java deleted file mode 100644 index 1e4c8131..00000000 --- a/application/src/main/java/com/comssa/api/config/JpaConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.comssa.api.config; - -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -@Configuration -@EnableJpaAuditing -@EntityScan(basePackages = "com.comssa.persistence") -@EnableJpaRepositories(basePackages = "com.comssa.persistence") -public class JpaConfig { -} diff --git a/application/src/main/java/com/comssa/api/question/controller/rest/license/AdminLicenseQuestionController.java b/application/src/main/java/com/comssa/api/question/controller/rest/license/AdminLicenseQuestionController.java index 4e705ef6..a5eebf75 100644 --- a/application/src/main/java/com/comssa/api/question/controller/rest/license/AdminLicenseQuestionController.java +++ b/application/src/main/java/com/comssa/api/question/controller/rest/license/AdminLicenseQuestionController.java @@ -26,6 +26,7 @@ public class AdminLicenseQuestionController { public ResponseEntity> makeLicenseQuestionOfSession( @RequestBody RequestMakeLicenseMultipleChoiceQuestionDto requestMakeLicenseMultipleChoiceQuestionDto) { return ResponseEntity.ok( - adminLicenseQuestionMakeService.makeLicenseNormalQuestion(requestMakeLicenseMultipleChoiceQuestionDto)); + adminLicenseQuestionMakeService + .makeLicenseMultipleChoiceQuestion(requestMakeLicenseMultipleChoiceQuestionDto)); } } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionSelectorService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionSelectorService.java index e480a94a..a0b298f4 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionSelectorService.java +++ b/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 getCategories() { @@ -56,10 +56,11 @@ public List getLicenseSessions(LicenseCategory licenseCategory) public List getAllQuestions(List questionCategories, boolean multipleChoice) { List 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; } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceGradeService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceGradeService.java index 4c1c5ae9..d0445b46 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceGradeService.java +++ b/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; diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceService.java index 723b283b..21ce900e 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceService.java +++ b/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())); diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceUpdateService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceUpdateService.java index 49810c6c..4b9c862e 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionChoiceUpdateService.java +++ b/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; diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionUpdateService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionUpdateService.java index 20896081..e2568a6e 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/QuestionUpdateService.java +++ b/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 { - 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(); } } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionGetService.java index 5634aff4..dfee0911 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionGetService.java +++ b/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> getClassifiedLicenseMultipleChoiceQuestion( Long sessionId) { - List licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionRepository - .findAllByLicenseSessionIdFetchChoicesOrderByApproved(sessionId); + List licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionDslRepository + .findAllWhereLicenseSessionId(sessionId); return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(licenseMultipleChoiceQuestions); } } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionMakeService.java b/application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionMakeService.java index bdc05958..e88e5d13 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionMakeService.java +++ b/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 makeLicenseNormalQuestion( + public List makeLicenseMultipleChoiceQuestion( RequestMakeLicenseMultipleChoiceQuestionDto requestMakeLicenseMultipleChoiceQuestionDto) { LicenseSession licenseSession = licenseSessionService.getLicenseSession( requestMakeLicenseMultipleChoiceQuestionDto.getLicenseSession(), @@ -34,18 +34,18 @@ public List 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); } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/LicenseSessionService.java b/application/src/main/java/com/comssa/api/question/service/rest/license/implement/LicenseSessionService.java index 7cd5e2b5..6c13e921 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/LicenseSessionService.java +++ b/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 = 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 = 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); + } } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/UserLicenseQuestionGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/license/implement/UserLicenseQuestionGetService.java index 7ceec350..30e7d069 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/license/implement/UserLicenseQuestionGetService.java +++ b/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> getClassifiedLicenseMultipleChoiceQuestion( Long sessionId) { - List licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionRepository - .findAllByLicenseSessionIdFetchChoicesAndIfApproved( - sessionId); + List licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionDslRepository + .findAllWhereLicenseSessionIdAndIfApproved( + sessionId, true); for (LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion : licenseMultipleChoiceQuestions) { Collections.shuffle(licenseMultipleChoiceQuestion.getQuestionChoices()); } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/AdminMajorMultipleChoiceQuestionUpdateService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/AdminMajorMultipleChoiceQuestionUpdateService.java index d8d12ec1..fa67d2f5 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/AdminMajorMultipleChoiceQuestionUpdateService.java +++ b/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; } - } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionClassifiedGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionClassifiedGetService.java index 4a08c6f0..670f3edc 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionClassifiedGetService.java +++ b/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> getClassifiedAllMajorMultipleChoiceQuestions() { - List majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDbService - .findAllFetchChoicesSortedByApproveAndShortAnswered(); + List majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDslRepository + .findAllOrderByIfApprovedAsc(); return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions); } @Override public Map> getClassifiedAllMajorDescriptiveQuestions() { List majorDescriptiveQuestions = - majorDescriptiveQuestionRepository.findAllSortedByIfApproved(); + majorDescriptiveQuestionChooseRepository.findAllOrderByIfApprovedAsc(); return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions); } } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionMakeService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionMakeService.java index 0b7408ec..a5ef280e 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionMakeService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionMakeService.java @@ -8,8 +8,8 @@ import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto; import com.comssa.persistence.question.dto.major.request.RequestMakeMajorDescriptiveQuestionDto; -import com.comssa.persistence.question.repository.MajorDescriptiveQuestionRepository; -import com.comssa.persistence.question.repository.MajorMultipleChoiceQuestionRepository; +import com.comssa.persistence.question.repository.jpa.MajorMultipleChoiceQuestionRepository; +import com.comssa.persistence.question.repository.jpa.QuestionRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,8 +22,8 @@ @Transactional public class BasicAdminMajorQuestionMakeService implements AdminMajorQuestionMakeService { + private final QuestionRepository questionRepository; private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository; - private final MajorDescriptiveQuestionRepository majorDescriptiveQuestionRepository; private final QuestionChoiceService questionChoiceService; private final DuplicateQuestionDetector duplicateQuestionDetector; @@ -77,7 +77,7 @@ private boolean isNotDuplicateQuestion(RequestMakeMultipleChoiceQuestionDto requ private MajorMultipleChoiceQuestion saveMajorMultipleChoiceQuestion( RequestMakeMultipleChoiceQuestionDto requestDto) { MajorMultipleChoiceQuestion question = MajorMultipleChoiceQuestion.makeWithDto(requestDto); - majorMultipleChoiceQuestionRepository.save(question); + questionRepository.save(question); questionChoiceService.saveWith(requestDto, question); return question; } @@ -88,7 +88,7 @@ private MajorDescriptiveQuestion saveMajorDescriptiveQuestion( MajorDescriptiveQuestion question = MajorDescriptiveQuestion.makeWithDto( requestDto ); - majorDescriptiveQuestionRepository.save(question); + questionRepository.save(question); return question; } } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/MajorMultipleChoiceQuestionDbService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/MajorMultipleChoiceQuestionDbService.java deleted file mode 100644 index de13b095..00000000 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/MajorMultipleChoiceQuestionDbService.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.comssa.api.question.service.rest.major.implement; - - -import com.comssa.persistence.question.domain.common.QuestionCategory; -import com.comssa.persistence.question.domain.common.QuestionLevel; -import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.repository.MajorMultipleChoiceQuestionRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.NoSuchElementException; - -@Service -@RequiredArgsConstructor -@Transactional -public class MajorMultipleChoiceQuestionDbService { - private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository; - - /** - * 허용되지 않은 모든 문제까지 조회 (주로 관리자) - */ - // 기본 개별 조회 - public MajorMultipleChoiceQuestion findById(Long id) { - return majorMultipleChoiceQuestionRepository.findById(id).orElseThrow(NoSuchElementException::new); - } - - // 카테고리, 레벨로 조회 - 선택지까지 - public List getFetchChoicesByCategoriesAndLevels( - List categories, - List questionLevels) { - return majorMultipleChoiceQuestionRepository.findFetchChoicesWithCategoriesAndLevels(categories, - questionLevels); - } - - // 전체 조회 - 선택지까지, 주관식 가능한 것들만 - public List findAllFetchChoicesShortAnswered() { - return majorMultipleChoiceQuestionRepository.findFetchChoicesShortAnswered(); - } - - // 전체 조회 -선택지까지 - public List findAllFetchChoices() { - return majorMultipleChoiceQuestionRepository.findFetchChoices(); - } - - //전체 조회 - 선택지까지, 정렬 - public List findAllFetchChoicesSortedByApproveAndShortAnswered() { - return majorMultipleChoiceQuestionRepository.findFetchChoicesSortedByIfApprovedAndCanBeShortAnswered(); - } - - // 개별 조회 - 선택지까지 - public MajorMultipleChoiceQuestion findByIdFetchChoices(Long id) { - return majorMultipleChoiceQuestionRepository.findByIdFetchChoices(id).orElseThrow(NoSuchElementException::new); - } - - // id로 삭제 - public void deleteById(Long id) { - majorMultipleChoiceQuestionRepository.deleteById(id); - } - - // 개별 삭제 - public void deleteNormalQuestion(MajorMultipleChoiceQuestion majorMultipleChoiceQuestion) { - majorMultipleChoiceQuestionRepository.delete(majorMultipleChoiceQuestion); - } - - /** - * 허용된 문제만을 조회 (주로 유저) - */ - // 카테고리, 레벨로 조회 - 선택지까지 - public List findAllFetchChoicesByCategoriesAndLevelsApproved( - List categories, List questionLevels) { - return majorMultipleChoiceQuestionRepository.findFetchChoicesWithCategoriesAndLevelsAndIfApproved(categories, - questionLevels); - } - - // 카테고리, 레벨로 조회 - 선택지까지, 주관식만 - public List findAllFetchChoicesByCategoriesAndLevelsApprovedAndShortAnswered( - List categories, List questionLevels) { - return majorMultipleChoiceQuestionRepository - .findFetchChoicesWithCategoriesAndLevelsAndIfApprovedAndCanBeShortAnswered( - categories, questionLevels); - } - -} diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/UserMajorQuestionClassifiedGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/UserMajorQuestionClassifiedGetService.java index 8ae27235..2573dddb 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/implement/UserMajorQuestionClassifiedGetService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/UserMajorQuestionClassifiedGetService.java @@ -8,7 +8,8 @@ import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion; import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; import com.comssa.persistence.question.dto.major.request.RequestGetQuestionByCategoryAndLevelDto; -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; @@ -19,38 +20,41 @@ @Service @RequiredArgsConstructor public class UserMajorQuestionClassifiedGetService implements MajorQuestionClassifiedGetService { - private final MajorMultipleChoiceQuestionDbService majorMultipleChoiceQuestionDbService; - private final QuestionClassifyByCategoryService questionClassifyByCategoryService; - private final MajorDescriptiveQuestionRepository majorDescriptiveQuestionRepository; + private final MajorMultipleChoiceQuestionDslRepository majorMultipleChoiceQuestionDslRepository; + private final QuestionClassifyByCategoryService questionClassifyByCategoryService; + private final MajorDescriptiveDslRepository majorDescriptiveQuestionDslRepository; - /** - * 분야, 난이도 파라미터로 문제를 조회하는 경우 - 객관식. - * 문제 선택지들을 섞어준다. - */ - @Override - public Map> getApprovedClassifiedMajorMultipleChoiceQuestions( - RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto) { - List majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDbService - .findAllFetchChoicesByCategoriesAndLevelsApproved( - requestGetQuestionByCategoryAndLevelDto.getQuestionCategories(), - requestGetQuestionByCategoryAndLevelDto.getQuestionLevels()); - for (MajorMultipleChoiceQuestion question : majorMultipleChoiceQuestions) { - Collections.shuffle(question.getQuestionChoices()); - } - return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions); - } + /** + * 분야, 난이도 파라미터로 문제를 조회하는 경우 - 객관식. + * 문제 선택지들을 섞어준다. + */ + @Override + public Map> getApprovedClassifiedMajorMultipleChoiceQuestions( + RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto) { + List majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDslRepository + .findAllWhereCategoriesAndLevelsAndIfApproved( + requestGetQuestionByCategoryAndLevelDto.getQuestionCategories(), + requestGetQuestionByCategoryAndLevelDto.getQuestionLevels(), + true); + for (MajorMultipleChoiceQuestion question : majorMultipleChoiceQuestions) { + Collections.shuffle(question.getQuestionChoices()); + } + return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions); + } - /** - * 분야, 난이도 파라미터로 문제를 조회하는 경우 - 서술형 - */ - @Override - public Map> getApprovedClassifiedDescriptiveQuestions( - RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto) { - List majorDescriptiveQuestions = majorDescriptiveQuestionRepository - .findWithCategoriesAndLevelsAndIfApproved( - requestGetQuestionByCategoryAndLevelDto.getQuestionCategories(), - requestGetQuestionByCategoryAndLevelDto.getQuestionLevels()); - return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions); - } + /** + * 분야, 난이도 파라미터로 문제를 조회하는 경우 - 서술형 + */ + @Override + public Map> getApprovedClassifiedDescriptiveQuestions( + RequestGetQuestionByCategoryAndLevelDto dto) { + List majorDescriptiveQuestions = majorDescriptiveQuestionDslRepository + .findWithCategoriesAndLevelsAndIfApproved( + dto.getQuestionCategories(), + dto.getQuestionLevels(), + true + ); + return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions); + } } diff --git a/application/src/main/resources/templates/descriptiveQuestion.html b/application/src/main/resources/templates/descriptiveQuestion.html index f2315dc1..b26de80d 100644 --- a/application/src/main/resources/templates/descriptiveQuestion.html +++ b/application/src/main/resources/templates/descriptiveQuestion.html @@ -79,7 +79,7 @@
diff --git a/application/src/test/java/com/comssa/api/ServiceIntegrationTest.java b/application/src/test/java/com/comssa/api/ServiceIntegrationTest.java index cfdeac8c..e0dd48ca 100644 --- a/application/src/test/java/com/comssa/api/ServiceIntegrationTest.java +++ b/application/src/test/java/com/comssa/api/ServiceIntegrationTest.java @@ -1,6 +1,6 @@ package com.comssa.api; -import com.comssa.api.config.JpaConfig; +import com.comssa.persistence.config.JpaConfig; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.transaction.annotation.Transactional; diff --git a/application/src/test/java/com/comssa/api/question/license/AdminLicenseQuestionControllerTest.java b/application/src/test/java/com/comssa/api/question/license/AdminLicenseQuestionControllerTest.java index 08c40535..81088f18 100644 --- a/application/src/test/java/com/comssa/api/question/license/AdminLicenseQuestionControllerTest.java +++ b/application/src/test/java/com/comssa/api/question/license/AdminLicenseQuestionControllerTest.java @@ -63,7 +63,7 @@ void makeLicenseQuestion() throws Exception { final String path = baseApiUrl; final String document_Name = "성공"; Mockito.when(adminLicenseQuestionMakeService - .makeLicenseNormalQuestion(any())).thenReturn(responseMultipleChoiceQuestionDtos); + .makeLicenseMultipleChoiceQuestion(any())).thenReturn(responseMultipleChoiceQuestionDtos); mockMvc.perform(RestDocumentationRequestBuilders.post(path) .contentType(MediaType.APPLICATION_JSON) diff --git a/application/src/test/java/com/comssa/api/question/major/admin/service/implement/AdminMajorQuestionClassifiedGetServiceTest.java b/application/src/test/java/com/comssa/api/question/major/admin/service/implement/AdminMajorQuestionClassifiedGetServiceTest.java index 104ae72b..7a699f5a 100644 --- a/application/src/test/java/com/comssa/api/question/major/admin/service/implement/AdminMajorQuestionClassifiedGetServiceTest.java +++ b/application/src/test/java/com/comssa/api/question/major/admin/service/implement/AdminMajorQuestionClassifiedGetServiceTest.java @@ -5,7 +5,7 @@ import com.comssa.persistence.question.domain.common.Question; import com.comssa.persistence.question.domain.common.QuestionCategory; import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.repository.MajorMultipleChoiceQuestionRepository; +import com.comssa.persistence.question.repository.jpa.MajorMultipleChoiceQuestionRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/application/src/test/java/com/comssa/api/question/major/admin/service/implement/BasicAdminMajorQuestionMakeServiceTest.java b/application/src/test/java/com/comssa/api/question/major/admin/service/implement/BasicAdminMajorQuestionMakeServiceTest.java index a82b00e9..8ed27051 100644 --- a/application/src/test/java/com/comssa/api/question/major/admin/service/implement/BasicAdminMajorQuestionMakeServiceTest.java +++ b/application/src/test/java/com/comssa/api/question/major/admin/service/implement/BasicAdminMajorQuestionMakeServiceTest.java @@ -5,7 +5,7 @@ import com.comssa.api.question.service.rest.major.implement.BasicAdminMajorQuestionMakeService; import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto; -import com.comssa.persistence.question.repository.MajorMultipleChoiceQuestionRepository; +import com.comssa.persistence.question.repository.jpa.MajorMultipleChoiceQuestionRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/application/src/test/java/com/comssa/api/question/major/user/service/implement/MajorQuestionClassifiedGetServiceTest.java b/application/src/test/java/com/comssa/api/question/major/user/service/implement/MajorQuestionClassifiedGetServiceTest.java index 094efaa9..2fd81d99 100644 --- a/application/src/test/java/com/comssa/api/question/major/user/service/implement/MajorQuestionClassifiedGetServiceTest.java +++ b/application/src/test/java/com/comssa/api/question/major/user/service/implement/MajorQuestionClassifiedGetServiceTest.java @@ -7,7 +7,7 @@ import com.comssa.persistence.question.domain.common.QuestionLevel; import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; import com.comssa.persistence.question.dto.major.request.RequestGetQuestionByCategoryAndLevelDto; -import com.comssa.persistence.question.repository.MajorMultipleChoiceQuestionRepository; +import com.comssa.persistence.question.repository.jpa.MajorMultipleChoiceQuestionRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/build.gradle b/build.gradle index fae6412d..5b93bec3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'org.springframework.boot' version '2.7.10' id 'io.spring.dependency-management' version '1.1.6' id "org.asciidoctor.jvm.convert" version "3.3.2" id 'com.epages.restdocs-api-spec' version '0.16.2' @@ -7,7 +8,6 @@ plugins { id 'jacoco' id 'org.ec4j.editorconfig' version '0.0.3' id 'checkstyle' - id 'org.springframework.boot' version '2.7.10' id 'org.jetbrains.kotlin.jvm' version '1.8.0' id 'org.jlleitschuh.gradle.ktlint' version '12.1.0' id 'org.jetbrains.kotlin.kapt' version '1.8.0' @@ -31,6 +31,7 @@ subprojects { /** * 코틀린 */ + apply plugin: 'kotlin' apply plugin: 'org.jetbrains.kotlin.jvm' /** * 코틀린에서 Java의 롬복 사용 @@ -50,6 +51,7 @@ subprojects { } kapt { keepJavacAnnotationProcessors = true + showProcessorStats = true } dependencies { @@ -90,6 +92,11 @@ subprojects { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.security:spring-security-oauth2-jose' implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + + /** + * jpa + **/ + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' } println("root Directory : ${rootDir}") diff --git a/config/naver-checkstyle-suppressions.xml b/config/naver-checkstyle-suppressions.xml index a7b6fd1d..5ab4c241 100644 --- a/config/naver-checkstyle-suppressions.xml +++ b/config/naver-checkstyle-suppressions.xml @@ -4,4 +4,5 @@ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> + diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 04b176e3..b3228b9c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("jvm") version "1.8.0" kotlin("kapt") version "1.8.0" kotlin("plugin.spring") version "1.8.0" + kotlin("plugin.jpa") version "1.8.0" /* 코틀린 전용 linter */ @@ -14,7 +15,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - // Jpa를 제외한 @Transactional만 사용 implementation("org.springframework:spring-tx") } diff --git a/core/src/main/kotlin/com/comssa/core/authuser/service/AuthUserService.kt b/core/src/main/kotlin/com/comssa/core/authuser/service/AuthUserService.kt index 71ebfb77..e61ea319 100644 --- a/core/src/main/kotlin/com/comssa/core/authuser/service/AuthUserService.kt +++ b/core/src/main/kotlin/com/comssa/core/authuser/service/AuthUserService.kt @@ -22,6 +22,9 @@ class AuthUserService( if (user == null) { return null } + /* + 로그인 되어있지 않은 상태라면 NULL + */ val userId = user.attributes[userIdentifier] as? String ?: return null // DB에 저장되었는지 확인 memberService.findAndSaveMember(userId) diff --git a/core/src/main/kotlin/com/comssa/core/comment/service/CommentService.kt b/core/src/main/kotlin/com/comssa/core/comment/service/CommentService.kt index ae8ab9e9..6c454fff 100644 --- a/core/src/main/kotlin/com/comssa/core/comment/service/CommentService.kt +++ b/core/src/main/kotlin/com/comssa/core/comment/service/CommentService.kt @@ -4,10 +4,10 @@ import com.comssa.core.authuser.service.AuthUserService import com.comssa.persistence.comment.domain.Comment import com.comssa.persistence.comment.dto.RequestMakeCommentDto import com.comssa.persistence.comment.dto.ResponseCommentDto -import com.comssa.persistence.comment.service.CommentRepositoryService +import com.comssa.persistence.comment.repository.CommentRepository import com.comssa.persistence.exception.NotLoginException -import com.comssa.persistence.member.service.MemberRepositoryService -import com.comssa.persistence.question.service.QuestionRepositoryService +import com.comssa.persistence.member.repository.MemberRepository +import com.comssa.persistence.question.repository.jpa.QuestionRepository import org.springframework.security.oauth2.core.user.OAuth2User import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional @@ -16,9 +16,9 @@ import org.springframework.transaction.annotation.Transactional @Service class CommentService( private val authUserService: AuthUserService, - private val commentRepositoryService: CommentRepositoryService, - private val memberRepositoryService: MemberRepositoryService, - private val questionRepositoryService: QuestionRepositoryService, + private val commentRepository: CommentRepository, + private val memberRepository: MemberRepository, + private val questionRepository: QuestionRepository, ) { fun makeComment( requestMakeCommentDto: RequestMakeCommentDto, @@ -26,17 +26,20 @@ class CommentService( user: OAuth2User?, ): ResponseCommentDto { val member = - authUserService.getCognitoId(user)?.let { memberRepositoryService.findByCognitoId(it) } + authUserService + .getCognitoId(user) + ?.let { memberRepository.findByCognitoId(it).orElseThrow { NotLoginException() } } ?: throw NotLoginException() val question = - questionRepositoryService.findById(questionId) ?: throw NoSuchElementException() + questionRepository.findById(questionId).orElseThrow { NoSuchElementException() } + ?: throw NoSuchElementException() val newComment = Comment.from( requestMakeCommentDto.content, member, question, ) - commentRepositoryService.save(newComment) + commentRepository.save(newComment) return ResponseCommentDto.from(newComment, member) } @@ -48,21 +51,22 @@ class CommentService( cognitoId로 유저 조회 */ val member = - authUserService.getCognitoId(user)?.let { memberRepositoryService.findByCognitoId(it) } + authUserService + .getCognitoId(user) + ?.let { memberRepository.findByCognitoId(it).orElseThrow { NotLoginException() } } /** * 없는 문제라면 에러 발생 */ val question = - questionRepositoryService.findByIdFetchCommentsOrderByCreatedAtDesc(questionId) + questionRepository.findByIdFetchCommentsOrderByCreatedAtDesc(questionId) ?: throw NoSuchElementException("Question $questionId not found") - val comments = question.comments - return comments.map { comment -> ResponseCommentDto.from(comment, member) } + return question.get().comments.map { comment -> ResponseCommentDto.from(comment, member) } } fun deleteComment(commentId: Long) { authUserService - commentRepositoryService.deleteById(commentId) + commentRepository.deleteById(commentId) } } diff --git a/core/src/main/kotlin/com/comssa/core/member/service/MemberService.kt b/core/src/main/kotlin/com/comssa/core/member/service/MemberService.kt index 311e5592..4b8b2405 100644 --- a/core/src/main/kotlin/com/comssa/core/member/service/MemberService.kt +++ b/core/src/main/kotlin/com/comssa/core/member/service/MemberService.kt @@ -1,19 +1,20 @@ package com.comssa.core.member.service import com.comssa.persistence.member.domain.Member -import com.comssa.persistence.member.service.MemberRepositoryService +import com.comssa.persistence.member.repository.MemberRepository import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional @Service @Transactional class MemberService( - private val memberRepositoryService: MemberRepositoryService, + private val memberRepository: MemberRepository, ) { fun findAndSaveMember(cognitoId: String): Member { - val existingMember = memberRepositoryService.findByCognitoId(cognitoId) - return existingMember ?: memberRepositoryService.save( - Member.from(cognitoId), - ) + val existingMember = memberRepository.findByCognitoId(cognitoId) + if (!existingMember.isPresent) { + return memberRepository.save(Member.from(cognitoId)) + } + return existingMember.get() } } diff --git a/core/src/main/kotlin/com/comssa/core/question/service/common/QuestionGetService.kt b/core/src/main/kotlin/com/comssa/core/question/service/common/QuestionGetService.kt index dc91dde2..88af31bf 100644 --- a/core/src/main/kotlin/com/comssa/core/question/service/common/QuestionGetService.kt +++ b/core/src/main/kotlin/com/comssa/core/question/service/common/QuestionGetService.kt @@ -5,18 +5,18 @@ import com.comssa.persistence.question.domain.common.Question import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion -import com.comssa.persistence.question.service.QuestionRepositoryService +import com.comssa.persistence.question.repository.jpa.QuestionRepository import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional @Service @Transactional class QuestionGetService( - private val questionRepositoryService: QuestionRepositoryService, + private val questionRepository: QuestionRepository, ) { fun getQuestionByIdFetchChoiceIfShould(questionId: Long): Question { val question = - questionRepositoryService.findById(questionId) + questionRepository.findById(questionId).orElseThrow { NoSuchElementException() } ?: throw NoSuchElementException("Question with ID $questionId not found") // MajorMultipleChoiceQuestion 타입이면 choices를 지연 로딩 when (question) { @@ -33,7 +33,7 @@ class QuestionGetService( fun getMajorDescriptiveQuestion(questionId: Long): MajorDescriptiveQuestion { val question = - questionRepositoryService.findById(questionId) + questionRepository.findById(questionId).orElseThrow { NoSuchElementException() } ?: throw NoSuchElementException("Question with ID $questionId not found") return question as? MajorDescriptiveQuestion ?: throw WrongQuestionTypeException() diff --git a/persistence/build.gradle b/persistence/build.gradle index 47f6695d..f29e883f 100644 --- a/persistence/build.gradle +++ b/persistence/build.gradle @@ -1,22 +1,65 @@ +buildscript { + ext { + queryDslVersion = "5.0.0" + } +} + plugins { id 'java' - /* - 코틀린 전용 linter - */ - id "org.jlleitschuh.gradle.ktlint" version "12.1.0" } - -repositories { - mavenCentral() +configurations { + compileOnly { + extendsFrom annotationProcessor + } } + dependencies { - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' -} + /** + QueryDsl + QueryDsl 관련 플러그인을 실행한다면, compileQueryDsl이 두 번 실행되며 오류 발생 + */ + implementation "com.querydsl:querydsl-jpa:${queryDslVersion}" + implementation "com.querydsl:querydsl-apt:${queryDslVersion}" + + + // QueryDsl 관련 어노테이션들을 처리하고, 쿼리 타입 클래스들을 생성 + annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jpa" + // querydsl JPAAnnotationProcessor 사용 지정 + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + // java.lang.NoClassDefFoundError (javax.annotation.Generated) + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + // java.lang.NoClassDefFoundError (javax.annotation.Entity, Id,GeneratedValue등 ) 대응 코드 + +// kapt "org.springframework.boot:spring-boot-configuration-processor" -test { - useJUnitPlatform() } + bootJar.enabled = false; + +/* +QueryDsl + */ +//gitIgnore에 자동으로 등록되기 위한 경로 설정 +/* +QueryDsl + */ +//gitIgnore에 자동으로 등록되기 위한 경로 설정 +//querydsl 추가 시작 +def querydslDir = "$buildDir/generated/querydsl" + +// java source set 에 querydsl QClass 위치 추가 +sourceSets { + main.java.srcDirs += [querydslDir] +} + +// gradle clean 시에 QClass 디렉토리 삭제 +clean { + delete file(querydslDir) +} +//querydsl 추가 끝 + + + diff --git a/persistence/src/main/java/com/comssa/persistence/comment/service/CommentRepositoryService.java b/persistence/src/main/java/com/comssa/persistence/comment/service/CommentRepositoryService.java deleted file mode 100644 index 0f39d9ae..00000000 --- a/persistence/src/main/java/com/comssa/persistence/comment/service/CommentRepositoryService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.comssa.persistence.comment.service; - -import com.comssa.persistence.comment.domain.Comment; -import com.comssa.persistence.comment.repository.CommentRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@RequiredArgsConstructor -public class CommentRepositoryService { - private final CommentRepository commentRepository; - - public Comment save(Comment comment) { - return commentRepository.save(comment); - } - - public List findAll() { - return commentRepository.findAll(); - } - - public void deleteById(Long commentId) { - commentRepository.deleteById(commentId); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/config/JpaConfig.java b/persistence/src/main/java/com/comssa/persistence/config/JpaConfig.java new file mode 100644 index 00000000..f86ed404 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/config/JpaConfig.java @@ -0,0 +1,64 @@ +package com.comssa.persistence.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +@Configuration +@EnableJpaAuditing +@EntityScan(basePackages = "com.comssa.persistence") +@EnableJpaRepositories(basePackages = "com.comssa.persistence") +public class JpaConfig { + + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } + + +// @Bean +// public QuestionCustomRepositoryImpl majorDescriptiveQuestionCustomRepository( +// JPAQueryFactory queryFactory) { +// return new QuestionCustomRepositoryImpl<>(queryFactory, majorDescriptiveChoiceEntityPath()); +// } +// +// @Bean +// public QuestionCustomRepositoryImpl majorMultipleChoiceQuestionCustomRepository( +// JPAQueryFactory queryFactory) { +// return new QuestionCustomRepositoryImpl<>(queryFactory, majorMultipleChoiceEntityPath()); +// } +// +// @Bean +// public QuestionCustomRepositoryImpl licenseMultipleChoiceQuestionCustomRepository( +// JPAQueryFactory queryFactory) { +// return new QuestionCustomRepositoryImpl<>(queryFactory, licenseMultipleChoiceEntityPath()); +// } +// +// +// @Bean +// public EntityPathBase majorDescriptiveChoiceEntityPath() { +// return QMajorDescriptiveQuestion.majorDescriptiveQuestion; +// } +// +// @Bean +// public EntityPathBase majorMultipleChoiceEntityPath() { +// return QMajorMultipleChoiceQuestion.majorMultipleChoiceQuestion; +// } +// +// @Bean +// public EntityPathBase licenseMultipleChoiceEntityPath() { +// return QLicenseMultipleChoiceQuestion.licenseMultipleChoiceQuestion; +// } + + +} + diff --git a/persistence/src/main/java/com/comssa/persistence/member/repository/MemberRepository.java b/persistence/src/main/java/com/comssa/persistence/member/repository/MemberRepository.java index 1a5010c4..e661d779 100644 --- a/persistence/src/main/java/com/comssa/persistence/member/repository/MemberRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/member/repository/MemberRepository.java @@ -2,8 +2,6 @@ import com.comssa.persistence.member.domain.Member; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.Optional; @@ -13,8 +11,8 @@ public interface MemberRepository extends JpaRepository { Optional findByCognitoId(String cognitoId); - @Query("SELECT m FROM Member m LEFT JOIN FETCH m.comments " - + "WHERE m.cognitoId = :cognitoId") - Optional findByCognitoIdFetchJoinComments(@Param("cognitoId") String cognitoId); +// @Query("SELECT m FROM Member m LEFT JOIN FETCH m.comments " +// + "WHERE m.cognitoId = :cognitoId") +// Optional findByCognitoIdFetchJoinComments(@Param("cognitoId") String cognitoId); } diff --git a/persistence/src/main/java/com/comssa/persistence/member/service/MemberRepositoryService.java b/persistence/src/main/java/com/comssa/persistence/member/service/MemberRepositoryService.java deleted file mode 100644 index 606e06fb..00000000 --- a/persistence/src/main/java/com/comssa/persistence/member/service/MemberRepositoryService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.comssa.persistence.member.service; - - -import com.comssa.persistence.member.domain.Member; -import com.comssa.persistence.member.repository.MemberRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.lang.Nullable; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class MemberRepositoryService { - private final MemberRepository memberRepository; - - @Nullable - public Member findByCognitoId(String cognitoId) { - return memberRepository.findByCognitoId(cognitoId).orElse(null); - } - - @Nullable - public Member findByCognitoIdFetchJoinComments(String cognitoId) { - return memberRepository.findByCognitoIdFetchJoinComments(cognitoId).orElse(null); - } - - public Member save(Member member) { - return memberRepository.save(member); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseMultipleChoiceQuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseMultipleChoiceQuestionRepository.java deleted file mode 100644 index 1dde9b0a..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseMultipleChoiceQuestionRepository.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.comssa.persistence.question.repository; - - -import com.comssa.persistence.question.domain.common.QuestionCategory; -import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -@Repository -public interface LicenseMultipleChoiceQuestionRepository extends JpaRepository { - - @Query("SELECT DISTINCT lnq FROM LicenseMultipleChoiceQuestion lnq " - + "LEFT JOIN FETCH lnq.questionChoices " - + "WHERE lnq.licenseSession.id = :licenseSessionId " - + "ORDER BY lnq.ifApproved") - List findAllByLicenseSessionIdFetchChoicesOrderByApproved( - @Param("licenseSessionId") Long licenseSessionId); - - @Query("SELECT DISTINCT lnq FROM LicenseMultipleChoiceQuestion lnq " - + "LEFT JOIN FETCH lnq.questionChoices " - + "WHERE lnq.licenseSession.id = :licenseSessionId " - + "AND lnq.ifApproved = true") - List findAllByLicenseSessionIdFetchChoicesAndIfApproved( - @Param("licenseSessionId") Long licenseSessionId); - - @Query("SELECT lnq FROM LicenseMultipleChoiceQuestion lnq " - + "LEFT JOIN FETCH lnq.questionChoices " - + "WHERE lnq.id = :questionId ") - Optional findByIdFetchChoices(@Param("questionId") Long questionId); - - @Query("SELECT DISTINCT lnq FROM LicenseMultipleChoiceQuestion lnq " - + "LEFT JOIN FETCH lnq.questionChoices " - + "WHERE lnq.questionCategory IN :questionCategories ") - List findAllByQuestionCategoriesFetchChoices( - @Param("questionCategories") List questionCategories); - -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseQuestionChoiceRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseQuestionChoiceRepository.java deleted file mode 100644 index c63b0648..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseQuestionChoiceRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.comssa.persistence.question.repository; - - -import com.comssa.persistence.question.domain.license.LicenseQuestionChoice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface LicenseQuestionChoiceRepository extends JpaRepository { -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/MajorDescriptiveQuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/MajorDescriptiveQuestionRepository.java deleted file mode 100644 index 807b67e5..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/MajorDescriptiveQuestionRepository.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.comssa.persistence.question.repository; - -import com.comssa.persistence.question.domain.common.QuestionCategory; -import com.comssa.persistence.question.domain.common.QuestionLevel; -import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface MajorDescriptiveQuestionRepository extends JpaRepository { - /** - * 허용된 문제들만 조회 (ifApproved가 true인 경우) - */ - @Query("SELECT DISTINCT md FROM MajorDescriptiveQuestion md " - + "WHERE md.questionCategory IN :questionCategories " - + "AND md.questionLevel IN :questionLevels " - + "AND md.ifApproved = true") - List findWithCategoriesAndLevelsAndIfApproved( - @Param("questionCategories") List questionCategories, - @Param("questionLevels") List questionLevels); - - @Query("SELECT DISTINCT md FROM MajorDescriptiveQuestion md " - + "ORDER BY md.ifApproved") - List findAllSortedByIfApproved(); -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/MajorMultipleChoiceQuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/MajorMultipleChoiceQuestionRepository.java deleted file mode 100644 index 42bfd9a8..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/MajorMultipleChoiceQuestionRepository.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.comssa.persistence.question.repository; - - -import com.comssa.persistence.question.domain.common.QuestionCategory; -import com.comssa.persistence.question.domain.common.QuestionLevel; -import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -@Repository -public interface MajorMultipleChoiceQuestionRepository extends JpaRepository { - /** - * 허용되지 않은 문제까지 조회 - */ - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices " - + "WHERE nq.questionCategory IN :questionCategories " - + "AND nq.questionLevel IN :questionLevels") - List findFetchChoicesWithCategoriesAndLevels( - @Param("questionCategories") List questionCategories, - @Param("questionLevels") List questionLevels); - - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices " - + "ORDER BY nq.ifApproved, nq.canBeShortAnswered") - List findFetchChoicesSortedByIfApprovedAndCanBeShortAnswered(); - - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices ") - List findFetchChoices(); - - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices " - + "WHERE nq.id = :id") - Optional findByIdFetchChoices(@Param("id") Long id); - - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices " - + "WHERE nq.canBeShortAnswered = true") - List findFetchChoicesShortAnswered(); - - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices " - + "WHERE nq.questionCategory IN :questionCategories ") - List findAllByQuestionCategoriesFetchChoices( - @Param("questionCategories") List questionCategories - ); - - /** - * 허용된 문제들만 조회 (ifApproved가 true인 경우) - */ - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices " - + "WHERE nq.questionCategory IN :questionCategories " - + "AND nq.questionLevel IN :questionLevels " - + "AND nq.ifApproved = true") - List findFetchChoicesWithCategoriesAndLevelsAndIfApproved( - @Param("questionCategories") List questionCategories, - @Param("questionLevels") List questionLevels); - - @Query("SELECT DISTINCT nq FROM MajorMultipleChoiceQuestion nq " - + "LEFT JOIN FETCH nq.questionChoices " - + "WHERE nq.questionCategory IN :questionCategories " - + "AND nq.questionLevel IN :questionLevels " - + "AND nq.ifApproved = true " - + "AND nq.canBeShortAnswered = true") - List findFetchChoicesWithCategoriesAndLevelsAndIfApprovedAndCanBeShortAnswered( - @Param("questionCategories") List questionCategories, - @Param("questionLevels") List questionLevels); -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/MajorQuestionChoiceRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/MajorQuestionChoiceRepository.java deleted file mode 100644 index e9e176fc..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/MajorQuestionChoiceRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.comssa.persistence.question.repository; - - -import com.comssa.persistence.question.domain.major.MajorQuestionChoice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface MajorQuestionChoiceRepository extends JpaRepository { -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionRepository.java deleted file mode 100644 index 59611ae5..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.comssa.persistence.question.repository; - -import com.comssa.persistence.question.domain.common.Question; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -@Repository -public interface QuestionRepository extends JpaRepository { - - @Query("SELECT DISTINCT q " - + "FROM Question q " - + "LEFT JOIN FETCH q.comments c " - + "WHERE q.id = :questionId " - + "ORDER BY c.createdAt DESC") - Optional findByIdFetchCommentsOrderByCreatedAtDesc(@Param("questionId") Long questionId); -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseSessionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/LicenseSessionRepository.java similarity index 94% rename from persistence/src/main/java/com/comssa/persistence/question/repository/LicenseSessionRepository.java rename to persistence/src/main/java/com/comssa/persistence/question/repository/jpa/LicenseSessionRepository.java index 3cf311f8..14a85f56 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseSessionRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/LicenseSessionRepository.java @@ -1,4 +1,4 @@ -package com.comssa.persistence.question.repository; +package com.comssa.persistence.question.repository.jpa; import com.comssa.persistence.question.domain.license.LicenseCategory; diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/MajorMultipleChoiceQuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/MajorMultipleChoiceQuestionRepository.java new file mode 100644 index 00000000..2fdfdd6d --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/MajorMultipleChoiceQuestionRepository.java @@ -0,0 +1,11 @@ +package com.comssa.persistence.question.repository.jpa; + + +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MajorMultipleChoiceQuestionRepository extends JpaRepository { + +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionChoiceRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/QuestionChoiceRepository.java similarity index 83% rename from persistence/src/main/java/com/comssa/persistence/question/repository/QuestionChoiceRepository.java rename to persistence/src/main/java/com/comssa/persistence/question/repository/jpa/QuestionChoiceRepository.java index c67678e8..3ebc2459 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionChoiceRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/QuestionChoiceRepository.java @@ -1,4 +1,4 @@ -package com.comssa.persistence.question.repository; +package com.comssa.persistence.question.repository.jpa; import com.comssa.persistence.question.domain.common.QuestionChoice; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/QuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/QuestionRepository.java new file mode 100644 index 00000000..7968d0ab --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/jpa/QuestionRepository.java @@ -0,0 +1,24 @@ +package com.comssa.persistence.question.repository.jpa; + +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.repository.querydsl.QuestionCustomRepository; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +/** + * 이 인터페이스는 Question 테이블과 관련된 모든 작업을 처리하는 JpaRepository 기반의 인터페이스입니다. + * - 삭제, 수정, 전체 Question 중 댓글 조회 등 전체 Question 테이블에 공통적으로 적용되는 작업을 수행합니다. (전체 테이블에서 ID기준으로 조회) + *

+ * - Question을 조회할 때도 JPA의 기본 메소드(findAll, findById)가 아니라 + * 직접 쿼리를 구현해야하는 부분(Jpa가 변수 이름으로 자동 생성되는 메소드 포함)은 QueryDsl(QuestionCustomRepository)을 extends하여 사용합니다 + *

+ *

+ *

+ * 하지만, + * 1) Question이 아닌 서브타입을 2) JPA 기본 메소드가 아니라 특정 조건을 통해 (fetch Join 등이 추가됨)조회하거나 처리하는 작업은 + * JpaRepository에 아예 의존하지않고 QueryDSL을 활용한 별도 구현체를 통해 처리합니다. + */ +@Repository +public interface QuestionRepository extends JpaRepository, QuestionCustomRepository { + +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/LicenseMultipleChoiceQuestionDslRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/LicenseMultipleChoiceQuestionDslRepository.java new file mode 100644 index 00000000..18df7fc5 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/LicenseMultipleChoiceQuestionDslRepository.java @@ -0,0 +1,62 @@ +package com.comssa.persistence.question.repository.querydsl; + + +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.license.QLicenseMultipleChoiceQuestion; +import com.comssa.persistence.question.repository.querydsl.booleanbuilder.LevelsAndCategoryBooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public class LicenseMultipleChoiceQuestionDslRepository + extends QueryDslJpaQueryMaker + implements LevelsAndCategoryBooleanBuilder { + + public LicenseMultipleChoiceQuestionDslRepository(JPAQueryFactory jpaQueryFactory) { + super(jpaQueryFactory); + } + + private final QLicenseMultipleChoiceQuestion question = QLicenseMultipleChoiceQuestion + .licenseMultipleChoiceQuestion; + + public List findAllWhereLicenseSessionId( + Long licenseId + ) { + return getQuery(question) + .where( + question.licenseSession.id.eq(licenseId) + ) + .distinct() + .leftJoin(question.questionChoices).fetchJoin() + .orderBy(question.ifApproved.asc()) + .fetch(); + } + + public List findAllWhereLicenseSessionIdAndIfApproved( + Long licenseId, + boolean ifApproved + ) { + return getQuery(question) + .where( + question.licenseSession.id.eq(licenseId) + .and(question.ifApproved.eq(ifApproved)) + ) + .distinct() + .leftJoin(question.questionChoices).fetchJoin() + .fetch(); + } + + public List findAllWhereQuestionCategories( + List questionCategories + ) { + return getQuery( + question, + whereCategoriesAndLevels(question._super, questionCategories, null)) + .distinct() + .leftJoin(question.questionChoices).fetchJoin() + .fetch(); + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/MajorDescriptiveDslRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/MajorDescriptiveDslRepository.java new file mode 100644 index 00000000..5a1c8686 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/MajorDescriptiveDslRepository.java @@ -0,0 +1,43 @@ +package com.comssa.persistence.question.repository.querydsl; + +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.common.QuestionLevel; +import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion; +import com.comssa.persistence.question.domain.major.QMajorDescriptiveQuestion; +import com.comssa.persistence.question.repository.querydsl.booleanbuilder.LevelsAndCategoryBooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MajorDescriptiveDslRepository + extends QueryDslJpaQueryMaker + implements LevelsAndCategoryBooleanBuilder { + private final QMajorDescriptiveQuestion question = QMajorDescriptiveQuestion.majorDescriptiveQuestion; + + public MajorDescriptiveDslRepository(JPAQueryFactory jpaQueryFactory) { + super(jpaQueryFactory); + } + + public List findWithCategoriesAndLevelsAndIfApproved( + List questionCategories, + List questionLevels, + boolean approved) { + + return getQuery(question, whereCategoriesAndLevels( + question._super, + questionCategories, + questionLevels) + .and(question.ifApproved.eq(approved))) + .fetch(); + } + + public List findAllOrderByIfApprovedAsc() { + return getQuery(question) + // 정렬 기준 + .orderBy(question.ifApproved.asc()) + .fetch(); + } + +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/MajorMultipleChoiceQuestionDslRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/MajorMultipleChoiceQuestionDslRepository.java new file mode 100644 index 00000000..123ceccd --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/MajorMultipleChoiceQuestionDslRepository.java @@ -0,0 +1,61 @@ +package com.comssa.persistence.question.repository.querydsl; + + +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.common.QuestionLevel; +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.major.QMajorMultipleChoiceQuestion; +import com.comssa.persistence.question.repository.querydsl.booleanbuilder.LevelsAndCategoryBooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public class MajorMultipleChoiceQuestionDslRepository + extends QueryDslJpaQueryMaker + implements LevelsAndCategoryBooleanBuilder { + + public MajorMultipleChoiceQuestionDslRepository(JPAQueryFactory jpaQueryFactory) { + super(jpaQueryFactory); + } + + private final QMajorMultipleChoiceQuestion question = QMajorMultipleChoiceQuestion.majorMultipleChoiceQuestion; + + public List findAllWhereCategoriesAndLevelsAndIfApproved( + List questionCategories, + List questionLevels, + boolean approved + ) { + + return getQuery(question, whereCategoriesAndLevels( + question._super, + questionCategories, + questionLevels + ).and(question.ifApproved.eq(approved))) + .distinct() + .leftJoin(question.questionChoices).fetchJoin() + .fetch(); + } + + public List findAllWhereQuestionCategories( + List questionCategories + ) { + return getQuery( + question, + whereCategoriesAndLevels(question._super, questionCategories, null)) + .distinct() + .leftJoin(question.questionChoices).fetchJoin() + .fetch(); + } + + public List findAllOrderByIfApprovedAsc() { + return getQuery(question) + .distinct() + .leftJoin(question.questionChoices).fetchJoin() + .orderBy(question.ifApproved.asc()) + .fetch(); + } + + +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QueryDslJpaQueryMaker.java b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QueryDslJpaQueryMaker.java new file mode 100644 index 00000000..c75e545b --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QueryDslJpaQueryMaker.java @@ -0,0 +1,35 @@ +package com.comssa.persistence.question.repository.querydsl; + + +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.EntityPathBase; +import com.querydsl.jpa.impl.JPAQuery; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; + + +/** + * select 기준 테이블과 where 조건을 통해 JpaQuery를 만들어준다. + * EntityPathBase 제네릭을 사용함으로 특정 Q클래스에 국한되지 않고 + * 자유롭게 Table과 where조건 문을 통해 JpaQuery를 생성할 수 있습니다. + *

+ * 현재 주된 사용이유는 Qquestion, QMajorQuestion등을 조회할 때 + * 1. 특정 테이블만 조회해야함 (select from 할 테이블을 선택할 수 있어야함) + * 2. 재사용하기 위함 + * 이다. + */ +@RequiredArgsConstructor +public abstract class QueryDslJpaQueryMaker { + protected final JPAQueryFactory jpaQueryFactory; + + + public JPAQuery getQuery(EntityPathBase entityPathBase, + Predicate condition) { + return jpaQueryFactory.selectFrom(entityPathBase) + .where(condition); + } + + public JPAQuery getQuery(EntityPathBase entityPathBase) { + return jpaQueryFactory.selectFrom(entityPathBase); + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QuestionCustomRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QuestionCustomRepository.java new file mode 100644 index 00000000..d67b6758 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QuestionCustomRepository.java @@ -0,0 +1,10 @@ +package com.comssa.persistence.question.repository.querydsl; + + +import com.comssa.persistence.question.domain.common.Question; + +import java.util.Optional; + +public interface QuestionCustomRepository { + Optional findByIdFetchCommentsOrderByCreatedAtDesc(Long questionId); +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QuestionCustomRepositoryImpl.java b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QuestionCustomRepositoryImpl.java new file mode 100644 index 00000000..ea8a0c20 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/QuestionCustomRepositoryImpl.java @@ -0,0 +1,40 @@ +package com.comssa.persistence.question.repository.querydsl; + + +import com.comssa.persistence.comment.domain.QComment; +import com.comssa.persistence.question.domain.common.QQuestion; +import com.comssa.persistence.question.domain.common.Question; +import com.querydsl.jpa.impl.JPAQueryFactory; + +import java.util.Optional; + +/** + * Impl을 자동으로 주입해주기 위해선 QuestionCustomRepository와 같은 패키지내에 있어야함 + */ +public class QuestionCustomRepositoryImpl implements QuestionCustomRepository { + private final JPAQueryFactory queryFactory; + private final QComment comment; + + public QuestionCustomRepositoryImpl(JPAQueryFactory queryFactory) { + this.queryFactory = queryFactory; + + comment = QComment.comment; + } + + /* + 댓글을 위해 문제를 가져올 땐 + 생성 순서에 맞게 가져온다. + */ + @Override + public Optional findByIdFetchCommentsOrderByCreatedAtDesc(Long questionId) { + QQuestion question = QQuestion.question; + Question result = queryFactory + .selectFrom(question) + .leftJoin(question.comments, comment).fetchJoin() // 동적 경로 사용 + .where(question.id.eq(questionId)) // 동적 경로 사용 + .orderBy(comment.createdAt.desc()) + .fetchOne(); + + return Optional.ofNullable(result); + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/booleanbuilder/LevelsAndCategoryBooleanBuilder.java b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/booleanbuilder/LevelsAndCategoryBooleanBuilder.java new file mode 100644 index 00000000..b489e257 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/querydsl/booleanbuilder/LevelsAndCategoryBooleanBuilder.java @@ -0,0 +1,33 @@ +package com.comssa.persistence.question.repository.querydsl.booleanbuilder; + +import com.comssa.persistence.question.domain.common.QQuestion; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.common.QuestionLevel; +import com.querydsl.core.BooleanBuilder; + +import java.util.List; + + +public interface LevelsAndCategoryBooleanBuilder { + /** + * @param question 호출부에선 QQuestion 그대로 삽입하거나 + * 실제 상속받는 관계일 떄는 Q*Question._super를 인자로 넣어 호출한다 + */ + default BooleanBuilder whereCategoriesAndLevels( + QQuestion question, + List questionCategories, + List questionLevels + ) { + BooleanBuilder condition = new BooleanBuilder(); + // 카테고리 조건 + if (questionCategories != null && !questionCategories.isEmpty()) { + condition.and(question.questionCategory.in(questionCategories)); + } + // 레벨 조건 + if (questionLevels != null && !questionLevels.isEmpty()) { + condition.and(question.questionLevel.in(questionLevels)); + } + + return condition; + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/service/QuestionRepositoryService.java b/persistence/src/main/java/com/comssa/persistence/question/service/QuestionRepositoryService.java deleted file mode 100644 index 0f115916..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/service/QuestionRepositoryService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.comssa.persistence.question.service; - -import com.comssa.persistence.question.domain.common.Question; -import com.comssa.persistence.question.repository.QuestionRepository; -import lombok.RequiredArgsConstructor; -import org.jetbrains.annotations.Nullable; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class QuestionRepositoryService { - private final QuestionRepository questionRepository; - - @Nullable - public Question findById(Long id) { - return questionRepository.findById(id).orElse(null); - } - - @Nullable - public Question findByIdFetchChoices(Long id) { - return questionRepository.findById(id).orElse(null); - } - - @Nullable - public Question findByIdFetchCommentsOrderByCreatedAtDesc(Long id) { - return questionRepository.findByIdFetchCommentsOrderByCreatedAtDesc(id).orElse(null); - } - - public void delete(Long id) { - questionRepository.deleteById(id); - } -}