diff --git a/application/src/main/java/com/comssa/api/login/aspect/LoginAspect.java b/application/src/main/java/com/comssa/api/login/aspect/LoginAspect.java index 043a9bba..ebd70029 100644 --- a/application/src/main/java/com/comssa/api/login/aspect/LoginAspect.java +++ b/application/src/main/java/com/comssa/api/login/aspect/LoginAspect.java @@ -12,33 +12,33 @@ @Aspect @Component public class LoginAspect { - /** - * 특정 메서드에 @AddLoginStatusAttribute 어노테이션이 있으면 - * 메서드 실행 전후에 이 advice가 실행됩니다. - * Model에 login 상태 부여 - */ - @Around("@annotation(com.comssa.api.login.aspect.AddLoginStatusAttributeToView)") - public Object addLoginStatusAttribute(ProceedingJoinPoint joinPoint) throws Throwable { - // 현재 메서드의 파라미터 가져오기 - Object[] args = joinPoint.getArgs(); + /** + * 특정 메서드에 @AddLoginStatusAttribute 어노테이션이 있으면 + * 메서드 실행 전후에 이 advice가 실행됩니다. + * Model에 login 상태 부여 + */ + @Around("@annotation(com.comssa.api.login.aspect.AddLoginStatusAttributeToView)") + public Object addLoginStatusAttribute(ProceedingJoinPoint joinPoint) throws Throwable { + // 현재 메서드의 파라미터 가져오기 + Object[] args = joinPoint.getArgs(); - // Model 파라미터 찾기 - for (Object arg : args) { - if (arg instanceof Model) { - Model model = (Model) arg; - // 인증 상태 확인 및 isLogin 속성 추가 + // Model 파라미터 찾기 + for (Object arg : args) { + if (arg instanceof Model) { + Model model = (Model) arg; + // 인증 상태 확인 및 isLogin 속성 추가 - // cognito 요청을 하면 자동으로 저장 됨. - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + // cognito 요청을 하면 자동으로 저장 됨. + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - // 시큐리티 컨텍스트에 유저 관련 정보가 저장되어있다면 - boolean isAuthenticated = - auth != null && auth.isAuthenticated() && !(auth instanceof AnonymousAuthenticationToken); - model.addAttribute("isLogin", isAuthenticated); - } - } + // 시큐리티 컨텍스트에 유저 관련 정보가 저장되어있다면 + boolean isAuthenticated = + auth != null && auth.isAuthenticated() && !(auth instanceof AnonymousAuthenticationToken); + model.addAttribute("isLogin", isAuthenticated); + } + } - // 메서드 실행 - return joinPoint.proceed(args); - } + // 메서드 실행 + return joinPoint.proceed(args); + } } diff --git a/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionChoiceUpdateController.java b/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionChoiceUpdateController.java index 2c6dd397..2cfe6b44 100644 --- a/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionChoiceUpdateController.java +++ b/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionChoiceUpdateController.java @@ -1,8 +1,8 @@ package com.comssa.api.question.controller.rest.common; import com.comssa.api.question.service.rest.common.implement.QuestionChoiceUpdateService; -import com.comssa.persistence.question.common.dto.request.RequestChangeContentDto; -import com.comssa.persistence.question.common.dto.response.ResponseQuestionChoiceDto; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionContentDto; +import com.comssa.persistence.question.dto.common.response.ResponseQuestionChoiceDto; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -23,19 +23,19 @@ public class QuestionChoiceUpdateController { @PatchMapping(value = "/question/common/choice/{id}") public ResponseEntity changeChoiceContent( @PathVariable("id") Long choiceId, - @RequestBody RequestChangeContentDto requestChangeContentDto) { + @RequestBody RequestChangeQuestionContentDto requestChangeQuestionContentDto) { - return ResponseEntity.ok(ResponseQuestionChoiceDto.of( + return ResponseEntity.ok(ResponseQuestionChoiceDto.from( questionChoiceUpdateService.changeContent( choiceId, - requestChangeContentDto))); + requestChangeQuestionContentDto))); } @ApiOperation("단답형 선택지 업데이트 - 정답 여부 변경") @PatchMapping(value = "/question/common/choice/{id}/toggle") public ResponseEntity changeChoiceContent( @PathVariable("id") Long licenseChoiceId) { - return ResponseEntity.ok(ResponseQuestionChoiceDto.of( + return ResponseEntity.ok(ResponseQuestionChoiceDto.from( questionChoiceUpdateService .toggleAnswerStatus( licenseChoiceId))); diff --git a/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionMakeController.java b/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionMakeController.java deleted file mode 100644 index 0ab5a1dd..00000000 --- a/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionMakeController.java +++ /dev/null @@ -1,14 +0,0 @@ -//package com.comssa.api.question.controller.rest.common; -// -//import io.swagger.annotations.Api; -//import lombok.RequiredArgsConstructor; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -// -//@Controller -//@RequestMapping("/admin") -//@Api(tags = {"문제 생성"}) -//@RequiredArgsConstructor -//public class QuestionMakeController { -// private final -//} diff --git a/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionUpdateController.java b/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionUpdateController.java index dc752131..21f8cb6b 100644 --- a/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionUpdateController.java +++ b/application/src/main/java/com/comssa/api/question/controller/rest/common/QuestionUpdateController.java @@ -2,8 +2,8 @@ import com.comssa.api.question.service.rest.common.implement.QuestionUpdateService; -import com.comssa.persistence.question.common.dto.request.RequestChangeContentDto; -import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionContentDto; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionDescriptionDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -26,7 +26,7 @@ public class QuestionUpdateController { @ApiOperation("문제 개시 허용") @PatchMapping(value = "/question/common/{id}/toggle-approve") - public ResponseEntity toggleApproveNormalQuestion( + public ResponseEntity toggleApproveNormalQuestion( @PathVariable("id") Long questionId ) { questionUpdateService.toggleApprove(questionId); @@ -35,20 +35,20 @@ public ResponseEntity toggleApproveNormalQues @ApiOperation("문제 본문 업데이트") @PatchMapping(value = "/question/common/{id}/content") - public ResponseEntity changeQuestion( + public ResponseEntity changeQuestion( @PathVariable("id") Long questionId, - @RequestBody RequestChangeContentDto requestChangeContentDto) { - questionUpdateService.changeContent(questionId, requestChangeContentDto); + @RequestBody RequestChangeQuestionContentDto requestChangeQuestionContentDto) { + questionUpdateService.changeContent(questionId, requestChangeQuestionContentDto); return ResponseEntity.ok().build(); } @ApiOperation("해설 업데이트") @PatchMapping(value = "/question/common/{id}/description") - public ResponseEntity changeDescription( + public ResponseEntity changeDescription( @PathVariable("id") Long questionId, - @RequestBody RequestChangeContentDto requestChangeContentDto + @RequestBody RequestChangeQuestionDescriptionDto requestChangeQuestionDescriptionDto ) { - questionUpdateService.changeDescription(questionId, requestChangeContentDto); + questionUpdateService.changeDescription(questionId, requestChangeQuestionDescriptionDto); return ResponseEntity.ok().build(); } 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 b314e83e..4e705ef6 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 @@ -1,8 +1,8 @@ package com.comssa.api.question.controller.rest.license; import com.comssa.api.question.service.rest.license.implement.AdminLicenseQuestionMakeService; -import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto; -import com.comssa.persistence.question.license.dto.request.RequestMakeLicenseMultipleChoiceQuestionDto; +import com.comssa.persistence.question.dto.common.response.ResponseMultipleChoiceQuestionDto; +import com.comssa.persistence.question.dto.license.request.RequestMakeLicenseMultipleChoiceQuestionDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/application/src/main/java/com/comssa/api/question/controller/rest/major/AdminMajorQuestionController.java b/application/src/main/java/com/comssa/api/question/controller/rest/major/AdminMajorQuestionController.java index edcf8ffc..ef48a514 100644 --- a/application/src/main/java/com/comssa/api/question/controller/rest/major/AdminMajorQuestionController.java +++ b/application/src/main/java/com/comssa/api/question/controller/rest/major/AdminMajorQuestionController.java @@ -2,11 +2,11 @@ import com.comssa.api.question.service.rest.major.AdminMajorQuestionMakeService; import com.comssa.api.question.service.rest.major.implement.AdminMajorMultipleChoiceQuestionUpdateService; -import com.comssa.persistence.question.common.dto.response.ResponseDescriptiveQuestionDto; -import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorDescriptiveQuestionDto; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; -import com.comssa.persistence.question.major.admin.dto.ResponseMajorMultipleChoiceQuestionForAdminDto; +import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto; +import com.comssa.persistence.question.dto.common.response.ResponseDescriptiveQuestionDto; +import com.comssa.persistence.question.dto.common.response.ResponseMultipleChoiceQuestionDto; +import com.comssa.persistence.question.dto.common.response.ResponseQuestionDto; +import com.comssa.persistence.question.dto.major.request.RequestMakeMajorDescriptiveQuestionDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -33,11 +33,12 @@ public class AdminMajorQuestionController { @ApiOperation("단답형 문제 리스트로 생성") @PostMapping(value = "/question/major/multiple") public ResponseEntity> makeMultiMajorQuestion( - @RequestBody List requestMakeMajorMultipleChoiceQuestionDtos) { + @RequestBody List requestMakeMultipleChoiceQuestionDtos) { return ResponseEntity.ok( - adminMajorQuestionMakeService.makeMultipleChoiceQuestions(requestMakeMajorMultipleChoiceQuestionDtos) + adminMajorQuestionMakeService + .makeMultipleChoiceQuestions(requestMakeMultipleChoiceQuestionDtos) .stream() - .map(ResponseMultipleChoiceQuestionDto::forAdmin) + .map(question -> (ResponseMultipleChoiceQuestionDto) ResponseQuestionDto.from(question)) .collect(Collectors.toList())); } @@ -45,7 +46,7 @@ public ResponseEntity> makeMultiMajorQue @PatchMapping(value = "/question/major/multiple/{id}/toggle-multiple") public ResponseEntity toggleCanBeShortAnswered( @PathVariable("id") Long questionId) { - return ResponseEntity.ok(ResponseMajorMultipleChoiceQuestionForAdminDto.forAdmin( + return ResponseEntity.ok(ResponseQuestionDto.from( adminMajorMultipleChoiceQuestionUpdateService.toggleCanBeShortAnswered(questionId))); } @@ -55,13 +56,11 @@ public ResponseEntity> makeDescriptiveQuest @RequestBody List requestMakeMajorDescriptiveQuestionDtos ) { return ResponseEntity.ok( - adminMajorQuestionMakeService.makeDescriptiveQuestions( - requestMakeMajorDescriptiveQuestionDtos - ) + adminMajorQuestionMakeService + .makeDescriptiveQuestions(requestMakeMajorDescriptiveQuestionDtos) .stream() - .map(ResponseDescriptiveQuestionDto::forMajor) - .collect(Collectors.toList()) - ); + .map(question -> (ResponseDescriptiveQuestionDto) ResponseQuestionDto.from(question)) + .collect(Collectors.toList())); } diff --git a/application/src/main/java/com/comssa/api/question/controller/view/MainViewController.java b/application/src/main/java/com/comssa/api/question/controller/view/MainViewController.java index cb15b543..eea66d05 100644 --- a/application/src/main/java/com/comssa/api/question/controller/view/MainViewController.java +++ b/application/src/main/java/com/comssa/api/question/controller/view/MainViewController.java @@ -3,9 +3,9 @@ import com.comssa.api.login.aspect.AddLoginStatusAttributeToView; import com.comssa.api.question.service.rest.common.QuestionSelectorService; import com.comssa.api.question.service.view.HtmlTagService; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.dto.response.ResponseLicenseSessionDto; -import com.comssa.persistence.question.license.dto.response.ResponseLicensesDto; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.dto.license.response.ResponseLicenseSessionDto; +import com.comssa.persistence.question.dto.license.response.ResponseLicensesDto; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; diff --git a/application/src/main/java/com/comssa/api/question/controller/view/QuestionUpdateViewController.java b/application/src/main/java/com/comssa/api/question/controller/view/QuestionUpdateViewController.java index 41749d17..03181e99 100644 --- a/application/src/main/java/com/comssa/api/question/controller/view/QuestionUpdateViewController.java +++ b/application/src/main/java/com/comssa/api/question/controller/view/QuestionUpdateViewController.java @@ -4,9 +4,9 @@ import com.comssa.api.question.domain.QuestionType; import com.comssa.api.question.service.rest.license.implement.AdminLicenseQuestionGetService; import com.comssa.api.question.service.rest.major.AdminMajorQuestionClassifiedGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.dto.response.ResponseClassifiedQuestionDto; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.dto.common.response.ResponseClassifiedQuestionDto; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; diff --git a/application/src/main/java/com/comssa/api/question/controller/view/QuestionViewController.java b/application/src/main/java/com/comssa/api/question/controller/view/QuestionViewController.java index 8038dc43..0d3fcb2a 100644 --- a/application/src/main/java/com/comssa/api/question/controller/view/QuestionViewController.java +++ b/application/src/main/java/com/comssa/api/question/controller/view/QuestionViewController.java @@ -5,11 +5,11 @@ import com.comssa.api.question.service.rest.license.implement.UserLicenseQuestionGetService; import com.comssa.api.question.service.rest.major.implement.UserMajorQuestionClassifiedGetService; import com.comssa.api.question.service.view.HtmlTagService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.dto.response.ResponseClassifiedQuestionDto; -import com.comssa.persistence.question.license.domain.LicenseSession; -import com.comssa.persistence.question.major.user.dto.request.RequestGetQuestionByCategoryAndLevelDto; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.license.LicenseSession; +import com.comssa.persistence.question.dto.common.response.ResponseClassifiedQuestionDto; +import com.comssa.persistence.question.dto.major.request.RequestGetQuestionByCategoryAndLevelDto; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/ChoiceShuffleService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/ChoiceShuffleService.java index 310efa77..e37c773e 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/ChoiceShuffleService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/ChoiceShuffleService.java @@ -1,7 +1,7 @@ package com.comssa.api.question.service.rest.common; -import com.comssa.persistence.question.major.domain.common.MajorQuestionChoice; +import com.comssa.persistence.question.domain.major.MajorQuestionChoice; import org.springframework.stereotype.Service; import java.util.List; diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionChoiceGradeService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionChoiceGradeService.java index c84c3c81..04ab5147 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionChoiceGradeService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionChoiceGradeService.java @@ -1,7 +1,7 @@ package com.comssa.api.question.service.rest.common; -import com.comssa.persistence.question.common.domain.QuestionChoice; +import com.comssa.persistence.question.domain.common.QuestionChoice; 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/QuestionChoiceUpdateService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionChoiceUpdateService.java index 0c8280e9..d2e413e6 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionChoiceUpdateService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionChoiceUpdateService.java @@ -1,7 +1,7 @@ package com.comssa.api.question.service.rest.common; -import com.comssa.persistence.question.common.domain.QuestionChoice; -import com.comssa.persistence.question.common.dto.request.RequestChangeContentDto; +import com.comssa.persistence.question.domain.common.QuestionChoice; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionContentDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -9,9 +9,9 @@ @Transactional public interface QuestionChoiceUpdateService { - default T changeContent(Long questionChoiceId, RequestChangeContentDto requestChangeContentDto) { + default T changeContent(Long questionChoiceId, RequestChangeQuestionContentDto requestChangeQuestionContentDto) { T questionChoice = findById(questionChoiceId); - questionChoice.changeContent(requestChangeContentDto.getContent()); + questionChoice.changeContent(requestChangeQuestionContentDto.getContent()); return questionChoice; } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionClassifyByCategoryService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionClassifyByCategoryService.java index 0341903b..b76a3795 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionClassifyByCategoryService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionClassifyByCategoryService.java @@ -1,8 +1,8 @@ package com.comssa.api.question.service.rest.common; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; import org.springframework.stereotype.Service; import java.util.List; @@ -10,6 +10,6 @@ @Service public interface QuestionClassifyByCategoryService { - Map> classifyQuestionByCategoryOrdered(List questions); + Map> classifyQuestionByCategoryOrdered(List questions); } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionSelectorService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionSelectorService.java index fecb8f89..ce68665d 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionSelectorService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionSelectorService.java @@ -1,10 +1,10 @@ package com.comssa.api.question.service.rest.common; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseSession; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.domain.license.LicenseSession; import org.springframework.stereotype.Service; import java.util.List; diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionUpdateService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionUpdateService.java index ff74242f..65ae7377 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionUpdateService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/QuestionUpdateService.java @@ -1,8 +1,9 @@ package com.comssa.api.question.service.rest.common; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.dto.request.RequestChangeContentDto; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionContentDto; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionDescriptionDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -13,16 +14,16 @@ public interface QuestionUpdateService { // 기본 구현이 필요한 메서드에 default 사용 - default T changeDescription(Long questionId, RequestChangeContentDto requestChangeContentDto) { + default T changeDescription( + Long questionId, RequestChangeQuestionDescriptionDto requestChangeQuestionDescriptionDto) { T question = findById(questionId); - System.out.println(question); - question.changeDescription(requestChangeContentDto.getContent()); + question.changeDescription(requestChangeQuestionDescriptionDto.getDescription()); return question; } - default T changeContent(Long questionId, RequestChangeContentDto requestChangeContentDto) { + default T changeContent(Long questionId, RequestChangeQuestionContentDto requestChangeQuestionContentDto) { T question = findById(questionId); - question.changeContent(requestChangeContentDto.getContent()); + question.changeContent(requestChangeQuestionContentDto.getContent()); return question; } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionClassifyByCategoryService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionClassifyByCategoryService.java index dae635e2..6a002564 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionClassifyByCategoryService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/BasicQuestionClassifyByCategoryService.java @@ -2,8 +2,8 @@ import com.comssa.api.question.service.rest.common.QuestionClassifyByCategoryService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; import org.springframework.stereotype.Service; import java.util.LinkedHashMap; 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 2ef6f4a1..e480a94a 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 @@ -2,14 +2,14 @@ import com.comssa.api.question.service.rest.common.QuestionSelectorService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseSession; -import com.comssa.persistence.question.license.repository.LicenseMultipleChoiceQuestionRepository; -import com.comssa.persistence.question.license.repository.LicenseSessionRepository; -import com.comssa.persistence.question.major.repository.MajorMultipleChoiceQuestionRepository; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/JavaChoiceShuffleService.java b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/JavaChoiceShuffleService.java index efc05fab..64f7bb86 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/common/implement/JavaChoiceShuffleService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/common/implement/JavaChoiceShuffleService.java @@ -2,7 +2,7 @@ import com.comssa.api.question.service.rest.common.ChoiceShuffleService; -import com.comssa.persistence.question.major.domain.common.MajorQuestionChoice; +import com.comssa.persistence.question.domain.major.MajorQuestionChoice; import org.springframework.stereotype.Service; import java.util.Collections; 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 74dc7ed5..4c1c5ae9 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.common.domain.QuestionChoice; -import com.comssa.persistence.question.common.repository.QuestionChoiceRepository; +import com.comssa.persistence.question.domain.common.QuestionChoice; +import com.comssa.persistence.question.repository.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 79d2b530..723b283b 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 @@ -1,13 +1,13 @@ package com.comssa.api.question.service.rest.common.implement; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.license.domain.LicenseQuestionChoice; -import com.comssa.persistence.question.license.repository.LicenseQuestionChoiceRepository; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.domain.common.MajorQuestionChoice; -import com.comssa.persistence.question.major.repository.MajorQuestionChoiceRepository; +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.license.LicenseQuestionChoice; +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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,7 +22,7 @@ public class QuestionChoiceService { private final LicenseQuestionChoiceRepository licenseQuestionChoiceRepository; public void saveWith( - RequestMakeMajorMultipleChoiceQuestionDto dto, + RequestMakeMultipleChoiceQuestionDto dto, LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion) { licenseQuestionChoiceRepository.saveAll(dto.getQuestionChoices() .stream() @@ -31,7 +31,7 @@ public void saveWith( } public void saveWith( - RequestMakeMajorMultipleChoiceQuestionDto dto, + RequestMakeMultipleChoiceQuestionDto dto, MajorMultipleChoiceQuestion majorMultipleChoiceQuestion) { majorQuestionChoiceRepository.saveAll(dto.getQuestionChoices() .stream() 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 955eb1b6..49810c6c 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.common.domain.QuestionChoice; -import com.comssa.persistence.question.common.repository.QuestionChoiceRepository; +import com.comssa.persistence.question.domain.common.QuestionChoice; +import com.comssa.persistence.question.repository.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 13c4d4f4..20896081 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 @@ -1,8 +1,8 @@ package com.comssa.api.question.service.rest.common.implement; import com.comssa.api.question.service.rest.common.FileUploadService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.service.QuestionRepositoryService; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.service.QuestionRepositoryService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/application/src/main/java/com/comssa/api/question/service/rest/license/LicenseQuestionGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/license/LicenseQuestionGetService.java index 27a5f1f1..8dc2d3c1 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/license/LicenseQuestionGetService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/license/LicenseQuestionGetService.java @@ -1,8 +1,8 @@ package com.comssa.api.question.service.rest.license; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; import org.springframework.stereotype.Service; import java.util.List; @@ -10,6 +10,6 @@ @Service public interface LicenseQuestionGetService { - Map> getClassifiedLicenseMultipleChoiceQuestion( - Long sessionId); + Map> getClassifiedLicenseMultipleChoiceQuestion( + Long sessionId); } 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 f6047c18..5634aff4 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 @@ -3,10 +3,10 @@ import com.comssa.api.question.service.rest.common.QuestionClassifyByCategoryService; import com.comssa.api.question.service.rest.license.LicenseQuestionGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.license.repository.LicenseMultipleChoiceQuestionRepository; +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 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/license/implement/AdminLicenseQuestionMakeService.java b/application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionMakeService.java index 077f7877..bdc05958 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 @@ -2,13 +2,14 @@ import com.comssa.api.question.service.rest.common.implement.QuestionChoiceService; -import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.license.domain.LicenseSession; -import com.comssa.persistence.question.license.dto.request.RequestMakeLicenseMultipleChoiceQuestionDto; -import com.comssa.persistence.question.license.repository.LicenseMultipleChoiceQuestionRepository; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.license.LicenseSession; +import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto; +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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,7 +30,7 @@ public List makeLicenseNormalQuestion( LicenseSession licenseSession = licenseSessionService.getLicenseSession( requestMakeLicenseMultipleChoiceQuestionDto.getLicenseSession(), requestMakeLicenseMultipleChoiceQuestionDto.getLicenseCategory()); - List questions = requestMakeLicenseMultipleChoiceQuestionDto + List questions = requestMakeLicenseMultipleChoiceQuestionDto .getQuestions(); return questions .stream() @@ -39,14 +40,14 @@ public List makeLicenseNormalQuestion( } private ResponseMultipleChoiceQuestionDto saveNormalLicenseQuestion( - RequestMakeMajorMultipleChoiceQuestionDto requestMakeMajorMultipleChoiceQuestionDto, + RequestMakeMultipleChoiceQuestionDto requestMakeMultipleChoiceQuestionDto, LicenseSession licenseSession, LicenseCategory licenseCategory) { LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.makeWithDto( - requestMakeMajorMultipleChoiceQuestionDto, licenseSession, licenseCategory); + requestMakeMultipleChoiceQuestionDto, licenseSession, licenseCategory); licenseMultipleChoiceQuestionRepository.save(licenseMultipleChoiceQuestion); - questionChoiceService.saveWith(requestMakeMajorMultipleChoiceQuestionDto, licenseMultipleChoiceQuestion); - return ResponseMultipleChoiceQuestionDto.forLicense(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 8032dd68..7cd5e2b5 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 @@ -1,9 +1,9 @@ package com.comssa.api.question.service.rest.license.implement; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseSession; -import com.comssa.persistence.question.license.repository.LicenseSessionRepository; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.domain.license.LicenseSession; +import com.comssa.persistence.question.repository.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 42ddeec5..7ceec350 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 @@ -3,10 +3,10 @@ import com.comssa.api.question.service.rest.common.QuestionClassifyByCategoryService; import com.comssa.api.question.service.rest.license.LicenseQuestionGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.license.repository.LicenseMultipleChoiceQuestionRepository; +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 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/major/AdminMajorQuestionClassifiedGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/AdminMajorQuestionClassifiedGetService.java index 05d7c53d..55fc0586 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/AdminMajorQuestionClassifiedGetService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/major/AdminMajorQuestionClassifiedGetService.java @@ -1,14 +1,14 @@ package com.comssa.api.question.service.rest.major; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; import java.util.List; import java.util.Map; public interface AdminMajorQuestionClassifiedGetService { - Map> getClassifiedAllMajorMultipleChoiceQuestions(); + Map> getClassifiedAllMajorMultipleChoiceQuestions(); - Map> getClassifiedAllMajorDescriptiveQuestions(); + Map> getClassifiedAllMajorDescriptiveQuestions(); } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/AdminMajorQuestionMakeService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/AdminMajorQuestionMakeService.java index baaf02ce..1ec53c95 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/AdminMajorQuestionMakeService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/major/AdminMajorQuestionMakeService.java @@ -2,10 +2,10 @@ import com.comssa.api.exception.DuplicateQuestionException; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorDescriptiveQuestionDto; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion; +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 org.springframework.stereotype.Service; import java.util.List; @@ -14,10 +14,10 @@ public interface AdminMajorQuestionMakeService { List makeMultipleChoiceQuestions( - List requestNormalQuestionDto); + List requestNormalQuestionDto); MajorMultipleChoiceQuestion makeMultipleChoiceQuestion( - RequestMakeMajorMultipleChoiceQuestionDto requestNormalQuestionDto) throws DuplicateQuestionException; + RequestMakeMultipleChoiceQuestionDto requestNormalQuestionDto) throws DuplicateQuestionException; List makeDescriptiveQuestions( List requestNormalQuestionDto diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/MajorQuestionClassifiedGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/MajorQuestionClassifiedGetService.java index d67a1ae0..c3cbbbba 100644 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/MajorQuestionClassifiedGetService.java +++ b/application/src/main/java/com/comssa/api/question/service/rest/major/MajorQuestionClassifiedGetService.java @@ -1,9 +1,9 @@ package com.comssa.api.question.service.rest.major; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.major.user.dto.request.RequestGetQuestionByCategoryAndLevelDto; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.dto.major.request.RequestGetQuestionByCategoryAndLevelDto; import org.springframework.stereotype.Service; import java.util.List; @@ -11,16 +11,16 @@ @Service public interface MajorQuestionClassifiedGetService { - /** - * 분류별로 나누어 문제를 반환 - */ - Map> getApprovedClassifiedMajorMultipleChoiceQuestions( - RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto); + /** + * 분류별로 나누어 문제를 반환 + */ + Map> getApprovedClassifiedMajorMultipleChoiceQuestions( + RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto); - Map> getApprovedClassifiedDescriptiveQuestions( - RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto - ); + Map> getApprovedClassifiedDescriptiveQuestions( + RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto + ); } diff --git a/application/src/main/java/com/comssa/api/question/service/rest/major/MajorQuestionCountService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/MajorQuestionCountService.java deleted file mode 100644 index e7500e8d..00000000 --- a/application/src/main/java/com/comssa/api/question/service/rest/major/MajorQuestionCountService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.comssa.api.question.service.rest.major; - -import com.comssa.persistence.question.major.user.dto.response.ResponseMajorQuestionClassCountDto; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public interface MajorQuestionCountService { - List getNormalQuestionCountByClass(); -} 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 52ca3e84..d8d12ec1 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,6 +1,6 @@ package com.comssa.api.question.service.rest.major.implement; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; 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/major/implement/BasicAdminMajorQuestionClassifiedGetService.java b/application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionClassifiedGetService.java index c1e40354..4a08c6f0 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 @@ -3,19 +3,21 @@ import com.comssa.api.question.service.rest.common.QuestionClassifyByCategoryService; import com.comssa.api.question.service.rest.major.AdminMajorQuestionClassifiedGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.repository.MajorDescriptiveQuestionRepository; +import com.comssa.persistence.question.domain.common.Question; +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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @Service @RequiredArgsConstructor +@Transactional public class BasicAdminMajorQuestionClassifiedGetService implements AdminMajorQuestionClassifiedGetService { private final MajorMultipleChoiceQuestionDbService majorMultipleChoiceQuestionDbService; private final MajorDescriptiveQuestionRepository majorDescriptiveQuestionRepository; 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 5b7bb34c..0b7408ec 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 @@ -4,12 +4,12 @@ import com.comssa.api.question.service.rest.common.DuplicateQuestionDetector; import com.comssa.api.question.service.rest.common.implement.QuestionChoiceService; import com.comssa.api.question.service.rest.major.AdminMajorQuestionMakeService; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorDescriptiveQuestionDto; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.repository.MajorDescriptiveQuestionRepository; -import com.comssa.persistence.question.major.repository.MajorMultipleChoiceQuestionRepository; +import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion; +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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +32,7 @@ public class BasicAdminMajorQuestionMakeService implements AdminMajorQuestionMak */ @Override public List makeMultipleChoiceQuestions( - List requestDtos) { + List requestDtos) { // 중복되지 않은 질문을 필터링하여 저장 return requestDtos.stream() .filter(this::isNotDuplicateQuestion) @@ -45,7 +45,7 @@ public List makeMultipleChoiceQuestions( */ @Override public MajorMultipleChoiceQuestion makeMultipleChoiceQuestion( - RequestMakeMajorMultipleChoiceQuestionDto requestDto) throws DuplicateQuestionException { + RequestMakeMultipleChoiceQuestionDto requestDto) throws DuplicateQuestionException { if (!isNotDuplicateQuestion(requestDto)) { throw new DuplicateQuestionException(); } @@ -65,7 +65,7 @@ public List makeDescriptiveQuestions( * 중복되지 않은 질문인지 확인하는 메서드 * 매번 DB에서 새롭게 조회 후 검증한다.(DTO 자체의 중복된 데이터) */ - private boolean isNotDuplicateQuestion(RequestMakeMajorMultipleChoiceQuestionDto requestDto) { + private boolean isNotDuplicateQuestion(RequestMakeMultipleChoiceQuestionDto requestDto) { return majorMultipleChoiceQuestionRepository.findAll().stream() .noneMatch(existingQuestion -> duplicateQuestionDetector.isQuestionDuplicate( existingQuestion.getContent(), requestDto.getContent())); @@ -75,7 +75,7 @@ private boolean isNotDuplicateQuestion(RequestMakeMajorMultipleChoiceQuestionDto * 새로운 질문을 저장하고 선택지를 저장하는 메서드 */ private MajorMultipleChoiceQuestion saveMajorMultipleChoiceQuestion( - RequestMakeMajorMultipleChoiceQuestionDto requestDto) { + RequestMakeMultipleChoiceQuestionDto requestDto) { MajorMultipleChoiceQuestion question = MajorMultipleChoiceQuestion.makeWithDto(requestDto); majorMultipleChoiceQuestionRepository.save(question); questionChoiceService.saveWith(requestDto, 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 index b60c3e0b..de13b095 100644 --- 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 @@ -1,10 +1,10 @@ package com.comssa.api.question.service.rest.major.implement; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.repository.MajorMultipleChoiceQuestionRepository; +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; @@ -16,70 +16,70 @@ @RequiredArgsConstructor @Transactional public class MajorMultipleChoiceQuestionDbService { - private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository; + private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository; - /** - * 허용되지 않은 모든 문제까지 조회 (주로 관리자) - */ - // 기본 개별 조회 - public MajorMultipleChoiceQuestion findById(Long id) { - return majorMultipleChoiceQuestionRepository.findById(id).orElseThrow(NoSuchElementException::new); - } + /** + * 허용되지 않은 모든 문제까지 조회 (주로 관리자) + */ + // 기본 개별 조회 + 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 getFetchChoicesByCategoriesAndLevels( + List categories, + List questionLevels) { + return majorMultipleChoiceQuestionRepository.findFetchChoicesWithCategoriesAndLevels(categories, + questionLevels); + } - // 전체 조회 - 선택지까지, 주관식 가능한 것들만 - public List findAllFetchChoicesShortAnswered() { - return majorMultipleChoiceQuestionRepository.findFetchChoicesShortAnswered(); - } + // 전체 조회 - 선택지까지, 주관식 가능한 것들만 + public List findAllFetchChoicesShortAnswered() { + return majorMultipleChoiceQuestionRepository.findFetchChoicesShortAnswered(); + } - // 전체 조회 -선택지까지 - public List findAllFetchChoices() { - return majorMultipleChoiceQuestionRepository.findFetchChoices(); - } + // 전체 조회 -선택지까지 + public List findAllFetchChoices() { + return majorMultipleChoiceQuestionRepository.findFetchChoices(); + } - //전체 조회 - 선택지까지, 정렬 - public List findAllFetchChoicesSortedByApproveAndShortAnswered() { - return majorMultipleChoiceQuestionRepository.findFetchChoicesSortedByIfApprovedAndCanBeShortAnswered(); - } + //전체 조회 - 선택지까지, 정렬 + public List findAllFetchChoicesSortedByApproveAndShortAnswered() { + return majorMultipleChoiceQuestionRepository.findFetchChoicesSortedByIfApprovedAndCanBeShortAnswered(); + } - // 개별 조회 - 선택지까지 - public MajorMultipleChoiceQuestion findByIdFetchChoices(Long id) { - return majorMultipleChoiceQuestionRepository.findByIdFetchChoices(id).orElseThrow(NoSuchElementException::new); - } + // 개별 조회 - 선택지까지 + public MajorMultipleChoiceQuestion findByIdFetchChoices(Long id) { + return majorMultipleChoiceQuestionRepository.findByIdFetchChoices(id).orElseThrow(NoSuchElementException::new); + } - // id로 삭제 - public void deleteById(Long id) { - majorMultipleChoiceQuestionRepository.deleteById(id); - } + // id로 삭제 + public void deleteById(Long id) { + majorMultipleChoiceQuestionRepository.deleteById(id); + } - // 개별 삭제 - public void deleteNormalQuestion(MajorMultipleChoiceQuestion majorMultipleChoiceQuestion) { - majorMultipleChoiceQuestionRepository.delete(majorMultipleChoiceQuestion); - } + // 개별 삭제 + public void deleteNormalQuestion(MajorMultipleChoiceQuestion majorMultipleChoiceQuestion) { + majorMultipleChoiceQuestionRepository.delete(majorMultipleChoiceQuestion); + } - /** - * 허용된 문제만을 조회 (주로 유저) - */ - // 카테고리, 레벨로 조회 - 선택지까지 - public List findAllFetchChoicesByCategoriesAndLevelsApproved( - List categories, List questionLevels) { - return majorMultipleChoiceQuestionRepository.findFetchChoicesWithCategoriesAndLevelsAndIfApproved(categories, - questionLevels); - } + /** + * 허용된 문제만을 조회 (주로 유저) + */ + // 카테고리, 레벨로 조회 - 선택지까지 + public List findAllFetchChoicesByCategoriesAndLevelsApproved( + List categories, List questionLevels) { + return majorMultipleChoiceQuestionRepository.findFetchChoicesWithCategoriesAndLevelsAndIfApproved(categories, + questionLevels); + } - // 카테고리, 레벨로 조회 - 선택지까지, 주관식만 - public List findAllFetchChoicesByCategoriesAndLevelsApprovedAndShortAnswered( - List categories, List questionLevels) { - return majorMultipleChoiceQuestionRepository - .findFetchChoicesWithCategoriesAndLevelsAndIfApprovedAndCanBeShortAnswered( - 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 ea425d6a..8ae27235 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 @@ -3,12 +3,12 @@ import com.comssa.api.question.service.rest.common.QuestionClassifyByCategoryService; import com.comssa.api.question.service.rest.major.MajorQuestionClassifiedGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.repository.MajorDescriptiveQuestionRepository; -import com.comssa.persistence.question.major.user.dto.request.RequestGetQuestionByCategoryAndLevelDto; +import com.comssa.persistence.question.domain.common.Question; +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.dto.major.request.RequestGetQuestionByCategoryAndLevelDto; +import com.comssa.persistence.question.repository.MajorDescriptiveQuestionRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -19,38 +19,38 @@ @Service @RequiredArgsConstructor public class UserMajorQuestionClassifiedGetService implements MajorQuestionClassifiedGetService { - private final MajorMultipleChoiceQuestionDbService majorMultipleChoiceQuestionDbService; - private final QuestionClassifyByCategoryService questionClassifyByCategoryService; - private final MajorDescriptiveQuestionRepository majorDescriptiveQuestionRepository; + private final MajorMultipleChoiceQuestionDbService majorMultipleChoiceQuestionDbService; + private final QuestionClassifyByCategoryService questionClassifyByCategoryService; + private final MajorDescriptiveQuestionRepository majorDescriptiveQuestionRepository; - /** - * 분야, 난이도 파라미터로 문제를 조회하는 경우 - 객관식. - * 문제 선택지들을 섞어준다. - */ - @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 = majorMultipleChoiceQuestionDbService + .findAllFetchChoicesByCategoriesAndLevelsApproved( + requestGetQuestionByCategoryAndLevelDto.getQuestionCategories(), + requestGetQuestionByCategoryAndLevelDto.getQuestionLevels()); + 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 requestGetQuestionByCategoryAndLevelDto) { + List majorDescriptiveQuestions = majorDescriptiveQuestionRepository + .findWithCategoriesAndLevelsAndIfApproved( + requestGetQuestionByCategoryAndLevelDto.getQuestionCategories(), + requestGetQuestionByCategoryAndLevelDto.getQuestionLevels()); + return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions); + } } diff --git a/application/src/main/java/com/comssa/api/question/service/view/HtmlTagService.java b/application/src/main/java/com/comssa/api/question/service/view/HtmlTagService.java index 5f5bf96f..35a2e8d8 100644 --- a/application/src/main/java/com/comssa/api/question/service/view/HtmlTagService.java +++ b/application/src/main/java/com/comssa/api/question/service/view/HtmlTagService.java @@ -1,9 +1,9 @@ package com.comssa.api.question.service.view; import com.comssa.api.question.domain.HtmlTag; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseSession; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.domain.license.LicenseSession; import org.springframework.stereotype.Service; import org.springframework.ui.Model; diff --git a/application/src/main/kotlin/com/comssa/api/chatbot/controller/ChatbotController.kt b/application/src/main/kotlin/com/comssa/api/chatbot/controller/ChatbotController.kt index 9b2e73e0..31f104d1 100644 --- a/application/src/main/kotlin/com/comssa/api/chatbot/controller/ChatbotController.kt +++ b/application/src/main/kotlin/com/comssa/api/chatbot/controller/ChatbotController.kt @@ -1,9 +1,9 @@ package com.comssa.api.chatbot.controller -import com.comssa.core.chatbot.dto.request.ChatRequestDto -import com.comssa.core.chatbot.dto.response.ChatResponseDto -import com.comssa.core.chatbot.dto.response.ChatResponseDto.Companion.from import com.comssa.core.chatbot.service.ChatbotService +import com.comssa.persistence.chatbot.dto.request.ChatRequestDto +import com.comssa.persistence.chatbot.dto.response.ChatResponseDto +import com.comssa.persistence.chatbot.dto.response.ChatResponseDto.Companion.from import io.swagger.annotations.Api import org.springframework.http.ResponseEntity import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/application/src/main/kotlin/com/comssa/api/chatbot/controller/ExternalQuestionController.kt b/application/src/main/kotlin/com/comssa/api/chatbot/controller/ExternalQuestionController.kt index 3cf5afa2..3b4c7588 100644 --- a/application/src/main/kotlin/com/comssa/api/chatbot/controller/ExternalQuestionController.kt +++ b/application/src/main/kotlin/com/comssa/api/chatbot/controller/ExternalQuestionController.kt @@ -1,10 +1,11 @@ package com.comssa.api.chatbot.controller import com.comssa.api.chatbot.service.ExternalQuestionService -import com.comssa.core.chatbot.dto.response.ChatGptBatchResponseDto -import com.comssa.core.chatbot.dto.response.ChatGptFileUploadResponseDto import com.comssa.core.chatbot.service.implement.ChatGptService -import com.comssa.persistence.question.common.dto.request.RequestQuestionCommandDto +import com.comssa.persistence.chatbot.dto.request.ChatGptBatchRequestDto +import com.comssa.persistence.chatbot.dto.response.ChatGptBatchResponseDto +import com.comssa.persistence.chatbot.dto.response.ChatGptFileUploadResponseDto +import com.comssa.persistence.question.dto.common.request.RequestDoQuestionCommandDto import io.swagger.annotations.Api import lombok.RequiredArgsConstructor import org.springframework.http.ResponseEntity @@ -23,12 +24,12 @@ class ExternalQuestionController( ) { @PostMapping("/chat-gpt/file/question") fun updateQuestionToChatGpt( - @RequestBody requestQuestionCommandDto: RequestQuestionCommandDto, + @RequestBody requestDoQuestionCommandDto: RequestDoQuestionCommandDto, ): ResponseEntity = - ResponseEntity.ok(externalQuestionService.sendQuestionToExternal(requestQuestionCommandDto)) + ResponseEntity.ok(externalQuestionService.sendQuestionToExternal(requestDoQuestionCommandDto)) @PostMapping("/chat-gpt/batch") fun createBatchToChatGpt( - @RequestBody requestBatchDto: com.comssa.core.chatbot.dto.request.ChatGptBatchRequestDto, + @RequestBody requestBatchDto: ChatGptBatchRequestDto, ): ResponseEntity = ResponseEntity.ok(chatGptService.sendBatchMessage(requestBatchDto)) } diff --git a/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalQuestionService.kt b/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalQuestionService.kt index c32ab0f0..9a4e6c39 100644 --- a/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalQuestionService.kt +++ b/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalQuestionService.kt @@ -1,10 +1,10 @@ package com.comssa.api.chatbot.service -import com.comssa.core.chatbot.dto.response.ChatGptFileUploadResponseDto -import com.comssa.persistence.question.common.dto.request.RequestQuestionCommandDto +import com.comssa.persistence.chatbot.dto.response.ChatGptFileUploadResponseDto +import com.comssa.persistence.question.dto.common.request.RequestDoQuestionCommandDto import org.springframework.stereotype.Service @Service interface ExternalQuestionService { - fun sendQuestionToExternal(requestQuestionCommandDto: RequestQuestionCommandDto): ChatGptFileUploadResponseDto? + fun sendQuestionToExternal(requestDoQuestionCommandDto: RequestDoQuestionCommandDto): ChatGptFileUploadResponseDto? } diff --git a/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalSenderQuestion.kt b/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalSenderQuestion.kt index 79ad7591..d8272ed4 100644 --- a/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalSenderQuestion.kt +++ b/application/src/main/kotlin/com/comssa/api/chatbot/service/ExternalSenderQuestion.kt @@ -1,10 +1,10 @@ package com.comssa.api.chatbot.service import com.comssa.api.question.service.rest.common.QuestionSelectorService -import com.comssa.core.chatbot.dto.response.ChatGptFileUploadResponseDto import com.comssa.core.chatbot.service.implement.ChatManageService -import com.comssa.persistence.question.common.domain.Question -import com.comssa.persistence.question.common.dto.request.RequestQuestionCommandDto +import com.comssa.persistence.chatbot.dto.response.ChatGptFileUploadResponseDto +import com.comssa.persistence.question.domain.common.Question +import com.comssa.persistence.question.dto.common.request.RequestDoQuestionCommandDto import org.springframework.stereotype.Service @Service @@ -14,20 +14,20 @@ class ExternalSenderQuestion( private val chatManageService: ChatManageService, ) : ExternalQuestionService { override fun sendQuestionToExternal( - requestQuestionCommandDto: RequestQuestionCommandDto, + requestDoQuestionCommandDto: RequestDoQuestionCommandDto, ): ChatGptFileUploadResponseDto { /** * 카테고리에 해당된 모든 문제를 가져온다. */ val question: List = questionSelectorService.getAllQuestions( - requestQuestionCommandDto + requestDoQuestionCommandDto .questionCategories, - requestQuestionCommandDto.isMultipleChoice, + requestDoQuestionCommandDto.multipleChoice, ) return chatManageService.talkForBatch( questionToChatGptContentMapper.getContentsFromQuestion(question), - requestQuestionCommandDto.command, + requestDoQuestionCommandDto.command, ) } } diff --git a/application/src/main/kotlin/com/comssa/api/chatbot/service/QuestionToChatGptContentMapper.kt b/application/src/main/kotlin/com/comssa/api/chatbot/service/QuestionToChatGptContentMapper.kt index a207b79f..4d876ac2 100644 --- a/application/src/main/kotlin/com/comssa/api/chatbot/service/QuestionToChatGptContentMapper.kt +++ b/application/src/main/kotlin/com/comssa/api/chatbot/service/QuestionToChatGptContentMapper.kt @@ -1,11 +1,11 @@ package com.comssa.api.chatbot.service -import com.comssa.core.chatbot.dto.request.ChatContentDto -import com.comssa.core.chatbot.dto.request.ChatContentDto.Companion.from import com.comssa.persistence.chatbot.ChatContentType -import com.comssa.persistence.question.common.domain.Question -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion +import com.comssa.persistence.chatbot.dto.request.ChatContentDto +import com.comssa.persistence.chatbot.dto.request.ChatContentDto.Companion.from +import com.comssa.persistence.question.domain.common.Question +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion import org.springframework.stereotype.Service @Service diff --git a/application/src/main/kotlin/com/comssa/api/comment/controller/CommentController.kt b/application/src/main/kotlin/com/comssa/api/comment/controller/CommentController.kt index 6e9e6df0..2e427d1e 100644 --- a/application/src/main/kotlin/com/comssa/api/comment/controller/CommentController.kt +++ b/application/src/main/kotlin/com/comssa/api/comment/controller/CommentController.kt @@ -1,11 +1,11 @@ package com.comssa.api.comment.controller import com.comssa.api.login.aspect.AddLoginStatusAttributeToView -import com.comssa.core.comment.dto.RequestMakeCommentDto -import com.comssa.core.comment.dto.ResponseCommentDto import com.comssa.core.comment.service.CommentService -import com.comssa.core.question.common.service.QuestionGetService -import com.comssa.persistence.question.common.dto.response.ResponseQuestionDto +import com.comssa.core.question.service.common.QuestionGetService +import com.comssa.persistence.comment.dto.RequestMakeCommentDto +import com.comssa.persistence.comment.dto.ResponseCommentDto +import com.comssa.persistence.question.dto.common.response.ResponseQuestionDto import io.swagger.annotations.Api import org.springframework.http.ResponseEntity import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/application/src/main/kotlin/com/comssa/api/question/controller/DescriptiveQuestionController.kt b/application/src/main/kotlin/com/comssa/api/question/controller/DescriptiveQuestionController.kt deleted file mode 100644 index bd83bb2c..00000000 --- a/application/src/main/kotlin/com/comssa/api/question/controller/DescriptiveQuestionController.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.comssa.api.question.controller - -import com.comssa.core.question.common.dto.RequestGradeStandardDto -import com.comssa.core.question.common.dto.RequestUserDescriptiveAnswerDto -import com.comssa.core.question.common.service.DescriptiveQuestionService -import com.comssa.persistence.question.common.dto.response.ResponseDescriptiveQuestionDto -import com.comssa.persistence.question.common.dto.response.ResponseQuestionDto -import io.swagger.annotations.Api -import org.springframework.http.ResponseEntity -import org.springframework.web.bind.annotation.PatchMapping -import org.springframework.web.bind.annotation.PathVariable -import org.springframework.web.bind.annotation.PostMapping -import org.springframework.web.bind.annotation.RequestBody -import org.springframework.web.bind.annotation.RestController - -@RestController -@Api(tags = ["서술형 문제"]) -class DescriptiveQuestionController( - private val descriptiveQuestionService: DescriptiveQuestionService, -) { - @PostMapping("/questions/descriptive/{questionId}/grade") - fun gradeDescriptiveQuestion( - @PathVariable("questionId") questionId: Long, - @RequestBody requestUserDescriptiveAnswerDto: RequestUserDescriptiveAnswerDto, - ): ResponseEntity = - ResponseEntity.ok( - descriptiveQuestionService.gradeDescriptiveQuestion(questionId, requestUserDescriptiveAnswerDto), - ) - - @PatchMapping("/questions/descriptive/{questionId}/standard") - fun changeQuestionStandard( - @PathVariable("questionId") questionId: Long, - @RequestBody requestGradeStandardDto: RequestGradeStandardDto, - ): ResponseEntity = - ResponseEntity.ok( - ResponseDescriptiveQuestionDto.forMajor( - descriptiveQuestionService.changeGradeStandard(questionId, requestGradeStandardDto), - ), - ) -// @PostMapping("/questions/major/descriptive") -// fun makeMajorDescriptiveQuestion( -// -// ): -} diff --git a/application/src/main/kotlin/com/comssa/api/question/controller/rest/major/DescriptiveQuestionController.kt b/application/src/main/kotlin/com/comssa/api/question/controller/rest/major/DescriptiveQuestionController.kt new file mode 100644 index 00000000..91b8c947 --- /dev/null +++ b/application/src/main/kotlin/com/comssa/api/question/controller/rest/major/DescriptiveQuestionController.kt @@ -0,0 +1,43 @@ +package com.comssa.api.question.controller.rest.major + +import com.comssa.core.question.service.common.DescriptiveQuestionService +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionGradeStandardDto +import com.comssa.persistence.question.dto.common.request.RequestDoGradeDescriptiveAnswerDto +import com.comssa.persistence.question.dto.common.response.ResponseDescriptiveQuestionDto +import com.comssa.persistence.question.dto.common.response.ResponseQuestionDto +import io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.PatchMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RestController + +@RestController +@Api(tags = ["서술형 문제"]) +class DescriptiveQuestionController( + private val descriptiveQuestionService: DescriptiveQuestionService, +) { + @ApiOperation("서술형 문제 채점") + @PostMapping("/questions/major/descriptive/{questionId}/grade") + fun gradeDescriptiveQuestion( + @PathVariable("questionId") questionId: Long, + @RequestBody requestDoGradeDescriptiveAnswerDto: RequestDoGradeDescriptiveAnswerDto, + ): ResponseEntity = + ResponseEntity.ok( + descriptiveQuestionService.gradeDescriptiveQuestion(questionId, requestDoGradeDescriptiveAnswerDto), + ) + + @ApiOperation("서술형 문제 채점 기준 수정") + @PatchMapping("/questions/major/descriptive/{questionId}/standard") + fun changeQuestionStandard( + @PathVariable("questionId") questionId: Long, + @RequestBody requestChangeQuestionGradeStandardDto: RequestChangeQuestionGradeStandardDto, + ): ResponseEntity = + ResponseEntity.ok( + ResponseQuestionDto.from( + descriptiveQuestionService.changeGradeStandard(questionId, requestChangeQuestionGradeStandardDto), + ), + ) +} diff --git a/application/src/main/resources/static/js/solveDescriptiveQuestion.js b/application/src/main/resources/static/js/solveDescriptiveQuestion.js index 3a757c18..2f7d79c1 100644 --- a/application/src/main/resources/static/js/solveDescriptiveQuestion.js +++ b/application/src/main/resources/static/js/solveDescriptiveQuestion.js @@ -16,7 +16,7 @@ document.addEventListener('DOMContentLoaded', function () { loadingSpinner.style.display = 'block'; aiResponseContent.textContent = ''; // 이전 응답 초기화 - fetch(`/questions/descriptive/${this.getAttribute('data-question-id')}/grade`, { + fetch(`/questions/major/descriptive/${this.getAttribute('data-question-id')}/grade`, { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/application/src/main/resources/templates/question-update.html b/application/src/main/resources/templates/question-update.html index dbdac212..f12b5a44 100644 --- a/application/src/main/resources/templates/question-update.html +++ b/application/src/main/resources/templates/question-update.html @@ -23,7 +23,7 @@

일반 질문 업데이트

-
diff --git a/application/src/main/resources/templates/question.html b/application/src/main/resources/templates/question.html index 43d81248..ebbba93e 100644 --- a/application/src/main/resources/templates/question.html +++ b/application/src/main/resources/templates/question.html @@ -81,7 +81,7 @@
diff --git a/application/src/test/java/com/comssa/api/question/common/controller/QuestionCommonUpdateControllerTest.java b/application/src/test/java/com/comssa/api/question/common/controller/QuestionCommonUpdateControllerTest.java index f91b5820..39bdc212 100644 --- a/application/src/test/java/com/comssa/api/question/common/controller/QuestionCommonUpdateControllerTest.java +++ b/application/src/test/java/com/comssa/api/question/common/controller/QuestionCommonUpdateControllerTest.java @@ -3,9 +3,9 @@ import com.comssa.api.ControllerTest; import com.comssa.api.question.controller.rest.common.QuestionUpdateController; import com.comssa.api.question.service.rest.common.implement.QuestionUpdateService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.dto.request.RequestChangeContentDto; -import com.comssa.persistence.question.common.dto.request.RequestChangeDescriptionDto; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionContentDto; +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionDescriptionDto; import com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper; import com.epages.restdocs.apispec.ResourceSnippetParameters; import org.junit.jupiter.api.BeforeEach; @@ -50,7 +50,7 @@ void updateLicenseQuestionContent() throws Exception { mockMvc.perform(RestDocumentationRequestBuilders.patch(path) .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(RequestChangeContentDto.forTest()))) + .content(objectMapper.writeValueAsString(RequestChangeQuestionContentDto.forTest()))) .andExpect(MockMvcResultMatchers.status().isOk()) .andDo(print()) .andDo(MockMvcRestDocumentation.document( @@ -77,7 +77,7 @@ void updateLicenseQuestionDescription() throws Exception { mockMvc.perform(RestDocumentationRequestBuilders.patch(path) .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(RequestChangeDescriptionDto.forTest()))) + .content(objectMapper.writeValueAsString(RequestChangeQuestionDescriptionDto.forTest()))) .andExpect(MockMvcResultMatchers.status().isOk()) .andDo(print()) .andDo(MockMvcRestDocumentation.document( 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 219943b2..08c40535 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 @@ -4,10 +4,10 @@ import com.comssa.api.question.controller.rest.license.AdminLicenseQuestionController; import com.comssa.api.question.service.rest.common.implement.QuestionChoiceUpdateService; import com.comssa.api.question.service.rest.license.implement.AdminLicenseQuestionMakeService; -import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.license.dto.request.RequestMakeLicenseMultipleChoiceQuestionDto; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion; +import com.comssa.persistence.question.dto.common.response.ResponseMultipleChoiceQuestionDto; +import com.comssa.persistence.question.dto.license.request.RequestMakeLicenseMultipleChoiceQuestionDto; import com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper; import com.epages.restdocs.apispec.ResourceSnippetParameters; import org.junit.jupiter.api.BeforeEach; @@ -67,11 +67,10 @@ void makeLicenseQuestion() throws Exception { mockMvc.perform(RestDocumentationRequestBuilders.post(path) .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(RequestMakeLicenseMultipleChoiceQuestionDto.from( + .content(objectMapper.writeValueAsString(RequestMakeLicenseMultipleChoiceQuestionDto.forTest( "test", LicenseCategory.SQLD, - licenseMultipleChoiceQuestions, - LicenseMultipleChoiceQuestion::getQuestionChoices)))) + licenseMultipleChoiceQuestions)))) .andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers .content() diff --git a/application/src/test/java/com/comssa/api/question/major/admin/controller/AdminMajorQuestionControllerTest.java b/application/src/test/java/com/comssa/api/question/major/admin/controller/AdminMajorQuestionControllerTest.java index 1c63dccd..4211dd05 100644 --- a/application/src/test/java/com/comssa/api/question/major/admin/controller/AdminMajorQuestionControllerTest.java +++ b/application/src/test/java/com/comssa/api/question/major/admin/controller/AdminMajorQuestionControllerTest.java @@ -5,8 +5,7 @@ import com.comssa.api.question.service.rest.major.AdminMajorQuestionClassifiedGetService; import com.comssa.api.question.service.rest.major.AdminMajorQuestionMakeService; import com.comssa.api.question.service.rest.major.implement.AdminMajorMultipleChoiceQuestionUpdateService; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; import com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper; import com.epages.restdocs.apispec.ResourceSnippetParameters; import org.junit.jupiter.api.BeforeEach; @@ -39,14 +38,11 @@ class AdminMajorQuestionControllerTest extends ControllerTest { private AdminMajorMultipleChoiceQuestionUpdateService adminMajorMultipleChoiceQuestionUpdateService; @MockBean private AdminMajorQuestionClassifiedGetService adminMajorQuestionClassifiedGetService; - private MajorMultipleChoiceQuestion majorMultipleChoiceQuestion; - private RequestMakeMajorMultipleChoiceQuestionDto requestMakeMajorMultipleChoiceQuestionDto; @BeforeEach void setUp() { majorMultipleChoiceQuestion = MajorMultipleChoiceQuestion.makeForTest(); - requestMakeMajorMultipleChoiceQuestionDto = new RequestMakeMajorMultipleChoiceQuestionDto(); } @Test @@ -103,6 +99,4 @@ void updateSingleMajorMultipleChoiceQuestionShortAnswered() throws Exception { ) )); } - - } diff --git a/application/src/test/java/com/comssa/api/question/major/admin/controller/QuestionUpdateViewControllerTest.java b/application/src/test/java/com/comssa/api/question/major/admin/controller/QuestionUpdateViewControllerTest.java index e03ec39d..0d431f5e 100644 --- a/application/src/test/java/com/comssa/api/question/major/admin/controller/QuestionUpdateViewControllerTest.java +++ b/application/src/test/java/com/comssa/api/question/major/admin/controller/QuestionUpdateViewControllerTest.java @@ -5,9 +5,9 @@ import com.comssa.api.question.service.rest.license.implement.AdminLicenseQuestionGetService; import com.comssa.api.question.service.rest.license.implement.UserLicenseQuestionGetService; import com.comssa.api.question.service.rest.major.AdminMajorQuestionClassifiedGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; +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 org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; 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 5cc299bc..104ae72b 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 @@ -2,10 +2,10 @@ import com.comssa.api.ServiceIntegrationTest; import com.comssa.api.question.service.rest.major.implement.BasicAdminMajorQuestionClassifiedGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.repository.MajorMultipleChoiceQuestionRepository; +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 org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -27,11 +27,12 @@ class AdminMajorQuestionClassifiedGetServiceTest extends ServiceIntegrationTest @BeforeEach void setUp() { + majorMultipleChoiceQuestionRepository.deleteAll(); majorMultipleChoiceQuestion = MajorMultipleChoiceQuestion.makeForTest(); } @Test - @DisplayName("관리자 조회시 비허용 문제 존재 여부 조회") + @DisplayName("관리자 조회시 허용하지 않은 문제도 존재해야한다.") void checkMajorQuestionIsApproved() { //given majorMultipleChoiceQuestionRepository.save(majorMultipleChoiceQuestion); @@ -42,10 +43,11 @@ void checkMajorQuestionIsApproved() { List selectedCategoryQuestion = questions.get( majorMultipleChoiceQuestion.getQuestionCategory()); - /*then - 문제를 허용하지 않더라도 조회 되어야함 + /* + then + 문제를 허용하기 전이더라도 조회 되어야함 */ - Assertions.assertThat(selectedCategoryQuestion).contains(majorMultipleChoiceQuestion); + Assertions.assertThat(selectedCategoryQuestion.get(0).getId()).isEqualTo(majorMultipleChoiceQuestion.getId()); } @Test 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 3188c398..a82b00e9 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 @@ -3,9 +3,9 @@ import com.comssa.api.ServiceIntegrationTest; import com.comssa.api.question.service.rest.major.implement.BasicAdminMajorQuestionMakeService; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.repository.MajorMultipleChoiceQuestionRepository; +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 org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -32,8 +32,8 @@ void setUp() { @DisplayName("객관식 문제 단체로 생성") void makeMajorMultipleChoiceQuestions() { //given - List makeMultipleChoiceQuestionDtoList = - List.of(RequestMakeMajorMultipleChoiceQuestionDto.from(majorMultipleChoiceQuestion, + List makeMultipleChoiceQuestionDtoList = + List.of(RequestMakeMultipleChoiceQuestionDto.from(majorMultipleChoiceQuestion, majorMultipleChoiceQuestion.getQuestionChoices())); //when @@ -53,10 +53,10 @@ void makeMajorMultipleChoiceQuestions() { @DisplayName("단체로 중복된 본문이 있는 문제 저장 - 한 개만 저장됨") void makeMajorMultipleChoiceQuestionsDuplicateContent() { //given - List makeMultipleChoiceQuestionDtoList = - List.of(RequestMakeMajorMultipleChoiceQuestionDto.from(majorMultipleChoiceQuestion, + List makeMultipleChoiceQuestionDtoList = + List.of(RequestMakeMultipleChoiceQuestionDto.from(majorMultipleChoiceQuestion, majorMultipleChoiceQuestion.getQuestionChoices()), - RequestMakeMajorMultipleChoiceQuestionDto.from(majorMultipleChoiceQuestion, + RequestMakeMultipleChoiceQuestionDto.from(majorMultipleChoiceQuestion, majorMultipleChoiceQuestion.getQuestionChoices()) ); //when diff --git a/application/src/test/java/com/comssa/api/question/major/user/controller/QuestionViewControllerTest.java b/application/src/test/java/com/comssa/api/question/major/user/controller/QuestionViewControllerTest.java index 2e2a754d..cec97190 100644 --- a/application/src/test/java/com/comssa/api/question/major/user/controller/QuestionViewControllerTest.java +++ b/application/src/test/java/com/comssa/api/question/major/user/controller/QuestionViewControllerTest.java @@ -7,14 +7,14 @@ import com.comssa.api.question.service.rest.license.implement.UserLicenseQuestionGetService; import com.comssa.api.question.service.rest.major.implement.UserMajorQuestionClassifiedGetService; import com.comssa.api.question.service.view.HtmlTagService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.common.dto.response.ResponseClassifiedQuestionDto; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.license.domain.LicenseSession; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.common.QuestionLevel; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion; +import com.comssa.persistence.question.domain.license.LicenseSession; +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion; +import com.comssa.persistence.question.dto.common.response.ResponseClassifiedQuestionDto; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; 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 20022ac1..094efaa9 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 @@ -2,12 +2,12 @@ import com.comssa.api.ServiceIntegrationTest; import com.comssa.api.question.service.rest.major.implement.UserMajorQuestionClassifiedGetService; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import com.comssa.persistence.question.major.repository.MajorMultipleChoiceQuestionRepository; -import com.comssa.persistence.question.major.user.dto.request.RequestGetQuestionByCategoryAndLevelDto; +import com.comssa.persistence.question.domain.common.Question; +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.dto.major.request.RequestGetQuestionByCategoryAndLevelDto; +import com.comssa.persistence.question.repository.MajorMultipleChoiceQuestionRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -58,7 +58,7 @@ void getApprovedClassifiedMajorMultipleChoiceQuestions() { majorMultipleChoiceQuestion.getQuestionCategory()); //then - Assertions.assertThat(selectedCategoryQuestions).contains(majorMultipleChoiceQuestion); + Assertions.assertThat(selectedCategoryQuestions.get(0).getId()).isEqualTo(majorMultipleChoiceQuestion.getId()); } } diff --git a/build.gradle b/build.gradle index 3772b703..fae6412d 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ plugins { 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' + id 'org.jetbrains.kotlin.plugin.lombok' version '1.8.0' } @@ -31,12 +32,19 @@ subprojects { * 코틀린 */ apply plugin: 'org.jetbrains.kotlin.jvm' + /** + * 코틀린에서 Java의 롬복 사용 + * (코틀린 클래스의 적용이 아닌 롬복이 적용된 Java 클래스를 사용하기 위함) + */ + apply plugin: 'org.jetbrains.kotlin.kapt' + apply plugin: 'org.jetbrains.kotlin.plugin.lombok' /** * 코드 컨벤션 */ apply plugin: 'org.jlleitschuh.gradle.ktlint' apply plugin: 'checkstyle' + repositories { mavenCentral() } diff --git a/config/naver-checkstyle-rules.xml b/config/naver-checkstyle-rules.xml index 23f2040b..f84b8166 100644 --- a/config/naver-checkstyle-rules.xml +++ b/config/naver-checkstyle-rules.xml @@ -180,11 +180,11 @@ The following rules in the Naver coding convention cannot be checked by this con - - - - - + + + + + diff --git a/core/src/main/kotlin/com/comssa/core/authuser/AuthUserService.kt b/core/src/main/kotlin/com/comssa/core/authuser/service/AuthUserService.kt similarity index 95% rename from core/src/main/kotlin/com/comssa/core/authuser/AuthUserService.kt rename to core/src/main/kotlin/com/comssa/core/authuser/service/AuthUserService.kt index 8955f12a..71ebfb77 100644 --- a/core/src/main/kotlin/com/comssa/core/authuser/AuthUserService.kt +++ b/core/src/main/kotlin/com/comssa/core/authuser/service/AuthUserService.kt @@ -1,4 +1,4 @@ -package com.comssa.core.authuser +package com.comssa.core.authuser.service import com.comssa.core.member.service.MemberService import org.springframework.beans.factory.annotation.Value diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/service/ChatbotService.kt b/core/src/main/kotlin/com/comssa/core/chatbot/service/ChatbotService.kt index 01f90921..3e31740f 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/service/ChatbotService.kt +++ b/core/src/main/kotlin/com/comssa/core/chatbot/service/ChatbotService.kt @@ -1,6 +1,6 @@ package com.comssa.core.chatbot.service -import com.comssa.core.chatbot.dto.request.ChatRequestDto +import com.comssa.persistence.chatbot.dto.request.ChatRequestDto import org.springframework.security.oauth2.core.user.OAuth2User interface ChatbotService { diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatCacheService.kt b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatCacheService.kt index f367d056..234883f4 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatCacheService.kt +++ b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatCacheService.kt @@ -1,6 +1,6 @@ package com.comssa.core.chatbot.service.implement -import com.comssa.core.chatbot.dto.request.ChatGptMessageDto +import com.comssa.persistence.chatbot.dto.request.ChatGptMessageDto import org.springframework.cache.CacheManager import org.springframework.cache.annotation.CacheEvict import org.springframework.cache.annotation.CachePut diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatGptService.kt b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatGptService.kt index 6c6aa8ec..3d70dc83 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatGptService.kt +++ b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatGptService.kt @@ -1,12 +1,13 @@ package com.comssa.core.chatbot.service.implement import com.comssa.core.chatbot.config.RestTemplateService -import com.comssa.core.chatbot.dto.request.ChatGptMessageDto -import com.comssa.core.chatbot.dto.request.ChatGptRequestFileUploadDto -import com.comssa.core.chatbot.dto.request.ChatGptRestRequestDto -import com.comssa.core.chatbot.dto.response.ChatGptBatchResponseDto -import com.comssa.core.chatbot.dto.response.ChatGptFileUploadResponseDto -import com.comssa.core.chatbot.dto.response.ChatGptResponseDto +import com.comssa.persistence.chatbot.dto.request.ChatGptBatchRequestDto +import com.comssa.persistence.chatbot.dto.request.ChatGptMessageDto +import com.comssa.persistence.chatbot.dto.request.ChatGptRequestFileUploadDto +import com.comssa.persistence.chatbot.dto.request.ChatGptRestRequestDto +import com.comssa.persistence.chatbot.dto.response.ChatGptBatchResponseDto +import com.comssa.persistence.chatbot.dto.response.ChatGptFileUploadResponseDto +import com.comssa.persistence.chatbot.dto.response.ChatGptResponseDto import org.springframework.beans.factory.annotation.Value import org.springframework.core.io.ByteArrayResource import org.springframework.http.MediaType @@ -84,9 +85,7 @@ class ChatGptService( return body } - fun sendBatchMessage( - chatGptBatchRequestDto: com.comssa.core.chatbot.dto.request.ChatGptBatchRequestDto, - ): ChatGptBatchResponseDto = + fun sendBatchMessage(chatGptBatchRequestDto: ChatGptBatchRequestDto): ChatGptBatchResponseDto = restTemplateService .sendPostRequest( baseUrl + batchCreateUrl, diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatManageService.kt b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatManageService.kt index 0208ecc4..764804e0 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatManageService.kt +++ b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/ChatManageService.kt @@ -1,10 +1,10 @@ package com.comssa.core.chatbot.service.implement -import com.comssa.core.chatbot.dto.request.ChatContentDto -import com.comssa.core.chatbot.dto.request.ChatGptMessageDto -import com.comssa.core.chatbot.dto.request.ChatRequestDto -import com.comssa.core.chatbot.dto.response.ChatGptFileUploadResponseDto import com.comssa.persistence.chatbot.ChatRole +import com.comssa.persistence.chatbot.dto.request.ChatContentDto +import com.comssa.persistence.chatbot.dto.request.ChatGptMessageDto +import com.comssa.persistence.chatbot.dto.request.ChatRequestDto +import com.comssa.persistence.chatbot.dto.response.ChatGptFileUploadResponseDto import org.springframework.stereotype.Service @Service diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/FileConvertService.kt b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/FileConvertService.kt index 3729c4b1..4ee18b1c 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/FileConvertService.kt +++ b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/FileConvertService.kt @@ -1,6 +1,6 @@ package com.comssa.core.chatbot.service.implement -import com.comssa.core.chatbot.dto.request.ChatGptRequestFileUploadDto +import com.comssa.persistence.chatbot.dto.request.ChatGptRequestFileUploadDto import com.fasterxml.jackson.databind.ObjectMapper import org.springframework.core.io.ByteArrayResource import org.springframework.stereotype.Service diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/LoginChatBotService.kt b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/LoginChatBotService.kt index 346ce6ed..a2d0d992 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/LoginChatBotService.kt +++ b/core/src/main/kotlin/com/comssa/core/chatbot/service/implement/LoginChatBotService.kt @@ -1,8 +1,8 @@ package com.comssa.core.chatbot.service.implement -import com.comssa.core.authuser.AuthUserService -import com.comssa.core.chatbot.dto.request.ChatRequestDto +import com.comssa.core.authuser.service.AuthUserService import com.comssa.core.chatbot.service.ChatbotService +import com.comssa.persistence.chatbot.dto.request.ChatRequestDto import org.springframework.security.oauth2.core.user.OAuth2User import org.springframework.stereotype.Service diff --git a/core/src/main/kotlin/com/comssa/core/comment/dto/RequestMakeCommentDto.kt b/core/src/main/kotlin/com/comssa/core/comment/dto/RequestMakeCommentDto.kt deleted file mode 100644 index 18a39873..00000000 --- a/core/src/main/kotlin/com/comssa/core/comment/dto/RequestMakeCommentDto.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.comssa.core.comment.dto - -import com.fasterxml.jackson.annotation.JsonCreator - -data class RequestMakeCommentDto - @JsonCreator - constructor( - val content: String, - ) 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 bb49fd5c..ae8ab9e9 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 @@ -1,13 +1,13 @@ package com.comssa.core.comment.service -import com.comssa.core.authuser.AuthUserService -import com.comssa.core.comment.dto.RequestMakeCommentDto -import com.comssa.core.comment.dto.ResponseCommentDto +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.exception.NotLoginException import com.comssa.persistence.member.service.MemberRepositoryService -import com.comssa.persistence.question.common.service.QuestionRepositoryService +import com.comssa.persistence.question.service.QuestionRepositoryService import org.springframework.security.oauth2.core.user.OAuth2User import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/core/src/main/kotlin/com/comssa/core/question/common/dto/RequestGradeStandardDto.kt b/core/src/main/kotlin/com/comssa/core/question/common/dto/RequestGradeStandardDto.kt deleted file mode 100644 index 075c6520..00000000 --- a/core/src/main/kotlin/com/comssa/core/question/common/dto/RequestGradeStandardDto.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.comssa.core.question.common.dto - -import com.fasterxml.jackson.annotation.JsonCreator - -class RequestGradeStandardDto - @JsonCreator - constructor( - val gradeStandard: String, - ) diff --git a/core/src/main/kotlin/com/comssa/core/question/common/dto/RequestUserDescriptiveAnswerDto.kt b/core/src/main/kotlin/com/comssa/core/question/common/dto/RequestUserDescriptiveAnswerDto.kt deleted file mode 100644 index 60ce1233..00000000 --- a/core/src/main/kotlin/com/comssa/core/question/common/dto/RequestUserDescriptiveAnswerDto.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.comssa.core.question.common.dto - -import com.fasterxml.jackson.annotation.JsonCreator - -class RequestUserDescriptiveAnswerDto - @JsonCreator - constructor( - val content: String, - ) diff --git a/core/src/main/kotlin/com/comssa/core/question/common/service/DescriptiveQuestionService.kt b/core/src/main/kotlin/com/comssa/core/question/service/common/DescriptiveQuestionService.kt similarity index 55% rename from core/src/main/kotlin/com/comssa/core/question/common/service/DescriptiveQuestionService.kt rename to core/src/main/kotlin/com/comssa/core/question/service/common/DescriptiveQuestionService.kt index 42b1d533..0e7e8e7a 100644 --- a/core/src/main/kotlin/com/comssa/core/question/common/service/DescriptiveQuestionService.kt +++ b/core/src/main/kotlin/com/comssa/core/question/service/common/DescriptiveQuestionService.kt @@ -1,9 +1,9 @@ -package com.comssa.core.question.common.service +package com.comssa.core.question.service.common import com.comssa.core.chatbot.service.implement.ChatManageService -import com.comssa.core.question.common.dto.RequestGradeStandardDto -import com.comssa.core.question.common.dto.RequestUserDescriptiveAnswerDto -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion +import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion +import com.comssa.persistence.question.dto.common.request.RequestChangeQuestionGradeStandardDto +import com.comssa.persistence.question.dto.common.request.RequestDoGradeDescriptiveAnswerDto import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional @@ -15,24 +15,24 @@ class DescriptiveQuestionService( ) { fun gradeDescriptiveQuestion( id: Long, - requestUserDescriptiveAnswerDto: RequestUserDescriptiveAnswerDto, + requestDoGradeDescriptiveAnswerDto: RequestDoGradeDescriptiveAnswerDto, ): String { val question = questionGetService.getMajorDescriptiveQuestion(id) return chatManageService.talkForGradeQuestion( question.gradeStandard, question.content, - requestUserDescriptiveAnswerDto.content, + requestDoGradeDescriptiveAnswerDto.content, ) } fun changeGradeStandard( id: Long, - requestGradeStandardDto: RequestGradeStandardDto, + requestChangeQuestionGradeStandardDto: RequestChangeQuestionGradeStandardDto, ): MajorDescriptiveQuestion { val question = questionGetService.getMajorDescriptiveQuestion(id) - question.changeGradeStandard(requestGradeStandardDto.gradeStandard) + question.changeGradeStandard(requestChangeQuestionGradeStandardDto.gradeStandard) return question } } diff --git a/core/src/main/kotlin/com/comssa/core/question/common/service/QuestionGetService.kt b/core/src/main/kotlin/com/comssa/core/question/service/common/QuestionGetService.kt similarity index 73% rename from core/src/main/kotlin/com/comssa/core/question/common/service/QuestionGetService.kt rename to core/src/main/kotlin/com/comssa/core/question/service/common/QuestionGetService.kt index 2ae17fe4..dc91dde2 100644 --- a/core/src/main/kotlin/com/comssa/core/question/common/service/QuestionGetService.kt +++ b/core/src/main/kotlin/com/comssa/core/question/service/common/QuestionGetService.kt @@ -1,11 +1,11 @@ -package com.comssa.core.question.common.service +package com.comssa.core.question.service.common import com.comssa.persistence.exception.WrongQuestionTypeException -import com.comssa.persistence.question.common.domain.Question -import com.comssa.persistence.question.common.service.QuestionRepositoryService -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion +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 org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/persistence/build.gradle b/persistence/build.gradle index c481b5da..47f6695d 100644 --- a/persistence/build.gradle +++ b/persistence/build.gradle @@ -1,5 +1,9 @@ plugins { id 'java' + /* + 코틀린 전용 linter + */ + id "org.jlleitschuh.gradle.ktlint" version "12.1.0" } diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/domain/BaseEntity.java b/persistence/src/main/java/com/comssa/persistence/BaseEntity.java similarity index 93% rename from persistence/src/main/java/com/comssa/persistence/question/common/domain/BaseEntity.java rename to persistence/src/main/java/com/comssa/persistence/BaseEntity.java index 474c4581..827a8c83 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/common/domain/BaseEntity.java +++ b/persistence/src/main/java/com/comssa/persistence/BaseEntity.java @@ -1,4 +1,4 @@ -package com.comssa.persistence.question.common.domain; +package com.comssa.persistence; import lombok.AccessLevel; diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatContentDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatContentDto.kt similarity index 85% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatContentDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatContentDto.kt index 2437276e..bde2a0af 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatContentDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatContentDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.request +package com.comssa.persistence.chatbot.dto.request import com.comssa.persistence.chatbot.ChatContentType diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptBatchRequestDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptBatchRequestDto.kt similarity index 75% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptBatchRequestDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptBatchRequestDto.kt index 1c4a8f0c..0c1b857b 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptBatchRequestDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptBatchRequestDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.request +package com.comssa.persistence.chatbot.dto.request import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming @@ -15,8 +15,8 @@ data class ChatGptBatchRequestDto( inputFileId: String, endpoint: String, completionWindow: String, - ): com.comssa.core.chatbot.dto.request.ChatGptBatchRequestDto = - com.comssa.core.chatbot.dto.request.ChatGptBatchRequestDto( + ): ChatGptBatchRequestDto = + ChatGptBatchRequestDto( inputFileId = inputFileId, endpoint = endpoint, completionWindow = completionWindow, diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptMessageDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptMessageDto.kt similarity index 92% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptMessageDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptMessageDto.kt index 174165b3..a96ad729 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptMessageDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptMessageDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.request +package com.comssa.persistence.chatbot.dto.request import com.comssa.persistence.chatbot.ChatContentType import com.comssa.persistence.chatbot.ChatRole diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptRequestFileUploadDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptRequestFileUploadDto.kt similarity index 92% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptRequestFileUploadDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptRequestFileUploadDto.kt index efdbdb61..e4d1d981 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptRequestFileUploadDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptRequestFileUploadDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.request +package com.comssa.persistence.chatbot.dto.request import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptRestRequestDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptRestRequestDto.kt similarity index 86% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptRestRequestDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptRestRequestDto.kt index e707109e..03c74c1b 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatGptRestRequestDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatGptRestRequestDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.request +package com.comssa.persistence.chatbot.dto.request data class ChatGptRestRequestDto( val model: String, diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatRequestDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatRequestDto.kt similarity index 88% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatRequestDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatRequestDto.kt index 539807e7..fc628a5d 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/request/ChatRequestDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/request/ChatRequestDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.request +package com.comssa.persistence.chatbot.dto.request import com.fasterxml.jackson.annotation.JsonCreator diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptBatchResponseDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptBatchResponseDto.kt similarity index 93% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptBatchResponseDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptBatchResponseDto.kt index 0ecf9ceb..6fb110e0 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptBatchResponseDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptBatchResponseDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.response +package com.comssa.persistence.chatbot.dto.response data class ChatGptBatchResponseDto( val id: String? = null, diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptFileUploadResponseDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptFileUploadResponseDto.kt similarity index 84% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptFileUploadResponseDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptFileUploadResponseDto.kt index 9d8453ac..82bb5d2e 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptFileUploadResponseDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptFileUploadResponseDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.response +package com.comssa.persistence.chatbot.dto.response data class ChatGptFileUploadResponseDto( val id: String? = null, diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptResponseDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptResponseDto.kt similarity index 92% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptResponseDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptResponseDto.kt index 265c4f64..9013dd10 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatGptResponseDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatGptResponseDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.response +package com.comssa.persistence.chatbot.dto.response data class ChatGptResponseDto( val id: String? = null, diff --git a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatResponseDto.kt b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatResponseDto.kt similarity index 78% rename from core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatResponseDto.kt rename to persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatResponseDto.kt index c254872a..746b79ef 100644 --- a/core/src/main/kotlin/com/comssa/core/chatbot/dto/response/ChatResponseDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/chatbot/dto/response/ChatResponseDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.chatbot.dto.response +package com.comssa.persistence.chatbot.dto.response class ChatResponseDto( val content: String? = null, diff --git a/persistence/src/main/java/com/comssa/persistence/comment/domain/Comment.java b/persistence/src/main/java/com/comssa/persistence/comment/domain/Comment.java index 37141418..94f55af8 100644 --- a/persistence/src/main/java/com/comssa/persistence/comment/domain/Comment.java +++ b/persistence/src/main/java/com/comssa/persistence/comment/domain/Comment.java @@ -1,9 +1,9 @@ package com.comssa.persistence.comment.domain; +import com.comssa.persistence.BaseEntity; import com.comssa.persistence.member.domain.Member; -import com.comssa.persistence.question.common.domain.BaseEntity; -import com.comssa.persistence.question.common.domain.Question; +import com.comssa.persistence.question.domain.common.Question; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -25,32 +25,32 @@ @Builder @ToString(exclude = {"member"}) public class Comment extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) - private Long id; - @ManyToOne - @JoinColumn(name = "member_id") - private Member member; - @ManyToOne - @JoinColumn(name = "question_id") - private Question question; - private String content; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + @ManyToOne + @JoinColumn(name = "member_id") + private Member member; + @ManyToOne + @JoinColumn(name = "question_id") + private Question question; + private String content; - public Comment( - @NotNull Member member, - @NotNull Question question, - @NotNull String content) { - this.member = member; - this.question = question; - this.content = content; - } + public Comment( + @NotNull Member member, + @NotNull Question question, + @NotNull String content) { + this.member = member; + this.question = question; + this.content = content; + } - public static Comment from(String content, Member member, Question question) { - return Comment.builder() - .content(content) - .member(member) - .question(question) - .build(); - } + public static Comment from(String content, Member member, Question question) { + return Comment.builder() + .content(content) + .member(member) + .question(question) + .build(); + } } diff --git a/persistence/src/main/java/com/comssa/persistence/comment/dto/RequestMakeCommentDto.kt b/persistence/src/main/java/com/comssa/persistence/comment/dto/RequestMakeCommentDto.kt new file mode 100644 index 00000000..006c33b6 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/comment/dto/RequestMakeCommentDto.kt @@ -0,0 +1,5 @@ +package com.comssa.persistence.comment.dto + +data class RequestMakeCommentDto( + val content: String, +) diff --git a/core/src/main/kotlin/com/comssa/core/comment/dto/ResponseCommentDto.kt b/persistence/src/main/java/com/comssa/persistence/comment/dto/ResponseCommentDto.kt similarity index 93% rename from core/src/main/kotlin/com/comssa/core/comment/dto/ResponseCommentDto.kt rename to persistence/src/main/java/com/comssa/persistence/comment/dto/ResponseCommentDto.kt index d8d7f8d4..0966b484 100644 --- a/core/src/main/kotlin/com/comssa/core/comment/dto/ResponseCommentDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/comment/dto/ResponseCommentDto.kt @@ -1,4 +1,4 @@ -package com.comssa.core.comment.dto +package com.comssa.persistence.comment.dto import com.comssa.persistence.comment.domain.Comment import com.comssa.persistence.member.domain.Member diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/domain/ChoiceProvider.java b/persistence/src/main/java/com/comssa/persistence/question/common/domain/ChoiceProvider.java deleted file mode 100644 index 6881a7c9..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/domain/ChoiceProvider.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.comssa.persistence.question.common.domain; - -import java.util.List; - -public interface ChoiceProvider { - List getQuestionChoices(); -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/domain/Question.java b/persistence/src/main/java/com/comssa/persistence/question/common/domain/Question.java deleted file mode 100644 index 519765e4..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/domain/Question.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.comssa.persistence.question.common.domain; - -import com.comssa.persistence.comment.domain.Comment; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import java.util.ArrayList; -import java.util.List; - -@Getter -@Entity -@Inheritance(strategy = InheritanceType.JOINED) -@SuperBuilder -@NoArgsConstructor -@DiscriminatorColumn -public abstract class Question extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) - @Column(name = "question_id") - private Long id; - - @OneToMany(mappedBy = "question", cascade = CascadeType.ALL, orphanRemoval = true) - private List comments; - - public boolean ifApproved; - protected String content; - @Enumerated(value = EnumType.STRING) - protected QuestionCategory questionCategory; - @Enumerated(value = EnumType.STRING) - protected QuestionLevel questionLevel; - protected String description; - protected String imageUrl; - - public Question(String content, QuestionCategory questionCategory, QuestionLevel questionLevel, String description, - String imageUrl) { - this.content = content; - this.questionCategory = questionCategory; - this.questionLevel = questionLevel; - this.description = description; - this.imageUrl = imageUrl; - this.comments = new ArrayList<>(); - } - - public void changeDescription(String description) { - this.description = description; - } - - public void changeContent(String content) { - this.content = content; - } - - public void toggleApproved() { - this.ifApproved = !this.ifApproved; - } - - public void updateImage(String imageUrl) { - this.imageUrl = imageUrl; - } - - public abstract void initDefaults(); -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionCategory.java b/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionCategory.java deleted file mode 100644 index 99a98309..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionCategory.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.comssa.persistence.question.common.domain; - -public enum QuestionCategory { - DATABASE("데이터베이스", true), - NETWORK("네트워크", true), - OPERATING_SYSTEM("운영체제", true), - COMPUTER_ARCHITECTURE("컴퓨터 구조", true), - DATA_STRUCTURE("자료 구조", true), - ALGORITHM("알고리즘", false), - OOP("객체 지향", false), - DESIGN_PATTERN("디자인 패턴", false), - JAVA("Java", true), - SOFTWARE_DESIGN("소프트웨어 설계", false), - SOFTWARE_DEVELOPMENT("소프트웨어 개발", false), - DATABASE_DESIGN("데이터베이스 구축", false), - PROGRAMMING_LANGUAGE("프로그래밍 언어 활용", false), - INFORMATION_SECURITY("정보시스템 구축관리", false), - DATA_MODELING("데이터 모델링에 대한 이해", false), - SQL_UTILIZE("SQL 기본 및 활용", false), - DATA_UNDERSTANDING("데이터의 이해", false), - DATA_ANALYSIS_PLANNING("데이터 분석 기회", false), - DATA_ANALYSIS("데이터 분석", false), - AWS_SAA("Solutions Architect Associate", false); - - private final String korean; - private final boolean canBeShownInMajor; - - QuestionCategory(String korean, boolean canBeShownInMajor) { - this.korean = korean; - this.canBeShownInMajor = canBeShownInMajor; - } - - public String getKorean() { - return korean; - } - - public boolean isCanBeShownInMajor() { - return canBeShownInMajor; - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionChoice.java b/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionChoice.java deleted file mode 100644 index 8fdbd66c..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionChoice.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.comssa.persistence.question.common.domain; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; -import lombok.experimental.SuperBuilder; - -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; - -@Getter -@SuperBuilder -@Entity -@Inheritance(strategy = InheritanceType.JOINED) -@NoArgsConstructor -@DiscriminatorColumn -@ToString(exclude = "question") //재귀로 StackOverFlow 발생 -public abstract class QuestionChoice { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - private String content; - private int selectedCount; - private boolean answerStatus; - - public QuestionChoice(String content, int selectedCount, boolean answerStatus) { - this.content = content; - this.selectedCount = selectedCount; - this.answerStatus = answerStatus; - } - - public void changeContent(String content) { - this.content = content; - } - - public void toggleAnswerStatus() { - this.answerStatus = !this.answerStatus; - } - - public void select() { - this.selectedCount++; - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionLevel.java b/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionLevel.java deleted file mode 100644 index 7ab8cc0c..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/domain/QuestionLevel.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.comssa.persistence.question.common.domain; - -public enum QuestionLevel { - - LOW("하"), MEDIUM("중"), HIGH("상"), NONE(""); - private final String korean; - - QuestionLevel(String korean) { - this.korean = korean; - } - - public String getKorean() { - return korean; - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestChangeContentDto.kt b/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestChangeContentDto.kt deleted file mode 100644 index 97280383..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestChangeContentDto.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.comssa.persistence.question.common.dto.request - -data class RequestChangeContentDto( - val content: String? = null, -) { - companion object { - @JvmStatic - fun forTest(): RequestChangeContentDto = - RequestChangeContentDto( - content = "test", - ) - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestChangeDescriptionDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestChangeDescriptionDto.java deleted file mode 100644 index 95c4d655..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestChangeDescriptionDto.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.comssa.persistence.question.common.dto.request; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Getter -public class RequestChangeDescriptionDto { - private String description; - - public static RequestChangeDescriptionDto forTest() { - return RequestChangeDescriptionDto.builder() - .description("test") - .build(); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestMakeQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestMakeQuestionDto.java deleted file mode 100644 index f2f8b2af..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestMakeQuestionDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.comssa.persistence.question.common.dto.request; - -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@NoArgsConstructor -@AllArgsConstructor -@SuperBuilder -@Getter -public class RequestMakeQuestionDto { - private String content; - private QuestionCategory questionCategory; - private QuestionLevel questionLevel; - private String description; -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestQuestionCommandDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestQuestionCommandDto.java deleted file mode 100644 index 7cb63f26..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/request/RequestQuestionCommandDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.comssa.persistence.question.common.dto.request; - -import com.comssa.persistence.question.common.domain.QuestionCategory; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Getter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class RequestQuestionCommandDto { - private String command; - private boolean multipleChoice; - private List questionCategories; -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseClassifiedQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseClassifiedQuestionDto.java deleted file mode 100644 index 6d715a2a..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseClassifiedQuestionDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.comssa.persistence.question.common.dto.response; - -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; -import java.util.stream.Collectors; - -@NoArgsConstructor -@Getter -@SuperBuilder -public class ResponseClassifiedQuestionDto { - private QuestionCategory questionCategory; - private List responseQuestionDtos; - - - public static ResponseClassifiedQuestionDto from( - QuestionCategory questionCategory, - List question) { - return ResponseClassifiedQuestionDto.builder() - .questionCategory(questionCategory) - .responseQuestionDtos( - question.stream() - .map(ResponseQuestionDto::from) - .collect(Collectors.toList()) - ) - .build(); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseDescriptiveQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseDescriptiveQuestionDto.java deleted file mode 100644 index a793b30d..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseDescriptiveQuestionDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.comssa.persistence.question.common.dto.response; - -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@AllArgsConstructor -@NoArgsConstructor -@Getter -@SuperBuilder -public class ResponseDescriptiveQuestionDto extends ResponseQuestionDto { - private String gradeStandard; - - public static ResponseDescriptiveQuestionDto forMajor(MajorDescriptiveQuestion question) { - return ResponseDescriptiveQuestionDto.builder() - .id(question.getId()) - .content(question.getContent()) - .questionCategory(question.getQuestionCategory()) - .questionLevel(question.getQuestionLevel()) - .description(question.getDescription()) - .imageUrl(question.getImageUrl()) - .ifMultipleChoice(false) - .ifApproved(question.isIfApproved()) - .gradeStandard(question.getGradeStandard()) - .build(); - } - -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseMultipleChoiceQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseMultipleChoiceQuestionDto.java deleted file mode 100644 index c0275000..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseMultipleChoiceQuestionDto.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.comssa.persistence.question.common.dto.response; - -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionChoice; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.major.admin.dto.ResponseMajorMultipleChoiceQuestionForAdminDto; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; -import java.util.stream.Collectors; - -@NoArgsConstructor -@AllArgsConstructor -@Getter -@SuperBuilder -public class ResponseMultipleChoiceQuestionDto extends ResponseQuestionDto { - private List questionChoices; - - public static ResponseMultipleChoiceQuestionDto - .ResponseMultipleChoiceQuestionDtoBuilder common( - T question, - List choiceExtractor) { - return ResponseMultipleChoiceQuestionDto.builder() - .id(question.getId()) - .content(question.getContent()) - .questionChoices( - choiceExtractor - .stream() - .map(ResponseQuestionChoiceDto::of) - .collect(Collectors.toList()) - ) - .questionCategory(question.getQuestionCategory()) - .questionLevel(question.getQuestionLevel()) - .description(question.getDescription()) - .imageUrl(question.getImageUrl()) - .ifApproved(question.isIfApproved()) - .ifMultipleChoice(true); - } - - /** - * 유저와 관리자에 따라 다른 정적팩토리 메소드를 사용한다 - */ - public static ResponseMultipleChoiceQuestionDto forUser( - T question, - List choiceExtractor) { - return common(question, choiceExtractor) - .build(); - } - - /** - * 차이점은 NormalQuesiton시 주관식 가능 여부와, 허용됐는지 여부 변수의 존재 여부다 - */ - public static ResponseMajorMultipleChoiceQuestionForAdminDto forAdmin(MajorMultipleChoiceQuestion question) { - return ResponseMajorMultipleChoiceQuestionForAdminDto.builder() - .id(question.getId()) - .content(question.getContent()) - .questionChoices( - question.getQuestionChoices() - .stream() - .map(ResponseQuestionChoiceDto::of) - .collect(Collectors.toList()) - ) - .questionCategory(question.getQuestionCategory()) - .questionLevel(question.getQuestionLevel()) - .description(question.getDescription()) - .imageUrl(question.getImageUrl()) - .ifApproved(question.isIfApproved()) - .canBeShortAnswered(question.isCanBeShortAnswered()) - .build(); - } - - public static ResponseMultipleChoiceQuestionDto forLicense(LicenseMultipleChoiceQuestion question) { - return common(question, question.getQuestionChoices()) - .build(); - } - - public static ResponseMultipleChoiceQuestionDto forMajor(MajorMultipleChoiceQuestion question) { - return common(question, question.getQuestionChoices()) - .build(); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseQuestionChoiceDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseQuestionChoiceDto.java deleted file mode 100644 index 3c948aea..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseQuestionChoiceDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.comssa.persistence.question.common.dto.response; - -import com.comssa.persistence.question.common.domain.QuestionChoice; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@NoArgsConstructor -@Builder -@Getter -public class ResponseQuestionChoiceDto { - - private Long id; - private String content; - private int selectedCount; - private boolean answerStatus; - - @Builder - public ResponseQuestionChoiceDto(Long id, String content, int selectedCount, boolean answerStatus) { - this.id = id; - this.content = content; - this.selectedCount = selectedCount; - this.answerStatus = answerStatus; - } - - public static ResponseQuestionChoiceDto of( - T questionChoice) { - return ResponseQuestionChoiceDto.builder() - .id(questionChoice.getId()) - .content(questionChoice.getContent()) - .selectedCount(questionChoice.getSelectedCount()) - .answerStatus(questionChoice.isAnswerStatus()) - .build(); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseQuestionDto.java deleted file mode 100644 index 15498d3f..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/dto/response/ResponseQuestionDto.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.comssa.persistence.question.common.dto.response; - -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.major.domain.common.MajorDescriptiveQuestion; -import com.comssa.persistence.question.major.domain.common.MajorMultipleChoiceQuestion; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@NoArgsConstructor -@AllArgsConstructor -@Getter -@SuperBuilder -public class ResponseQuestionDto { - private Long id; - private String content; - private String description; - private String imageUrl; - private QuestionCategory questionCategory; - private QuestionLevel questionLevel; - private boolean ifApproved; - private boolean ifMultipleChoice; - - public static ResponseQuestionDto from(Question question) { - if (question instanceof LicenseMultipleChoiceQuestion) { - return ResponseMultipleChoiceQuestionDto.forLicense((LicenseMultipleChoiceQuestion) question); - } - if (question instanceof MajorMultipleChoiceQuestion) { - return ResponseMultipleChoiceQuestionDto.forMajor((MajorMultipleChoiceQuestion) question); - } - if (question instanceof MajorDescriptiveQuestion) { - return ResponseDescriptiveQuestionDto.forMajor((MajorDescriptiveQuestion) question); - } - throw new IllegalArgumentException("Unsupported question type: " + question.getClass().getName()); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/service/QuestionRepositoryService.java b/persistence/src/main/java/com/comssa/persistence/question/common/service/QuestionRepositoryService.java deleted file mode 100644 index 356a82d4..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/common/service/QuestionRepositoryService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.comssa.persistence.question.common.service; - -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.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); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/domain/common/ChoiceProvider.java b/persistence/src/main/java/com/comssa/persistence/question/domain/common/ChoiceProvider.java new file mode 100644 index 00000000..ab4641ba --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/common/ChoiceProvider.java @@ -0,0 +1,7 @@ +package com.comssa.persistence.question.domain.common; + +import java.util.List; + +public interface ChoiceProvider { + List getQuestionChoices(); +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/domain/DescriptiveGrader.java b/persistence/src/main/java/com/comssa/persistence/question/domain/common/DescriptiveGrader.java similarity index 55% rename from persistence/src/main/java/com/comssa/persistence/question/common/domain/DescriptiveGrader.java rename to persistence/src/main/java/com/comssa/persistence/question/domain/common/DescriptiveGrader.java index 96ab113f..bcb602eb 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/common/domain/DescriptiveGrader.java +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/common/DescriptiveGrader.java @@ -1,4 +1,4 @@ -package com.comssa.persistence.question.common.domain; +package com.comssa.persistence.question.domain.common; public interface DescriptiveGrader { diff --git a/persistence/src/main/java/com/comssa/persistence/question/domain/common/Question.java b/persistence/src/main/java/com/comssa/persistence/question/domain/common/Question.java new file mode 100644 index 00000000..dc72c3af --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/common/Question.java @@ -0,0 +1,73 @@ +package com.comssa.persistence.question.domain.common; + +import com.comssa.persistence.BaseEntity; +import com.comssa.persistence.comment.domain.Comment; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.DiscriminatorColumn; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.OneToMany; +import java.util.ArrayList; +import java.util.List; + +@Getter +@Entity +@Inheritance(strategy = InheritanceType.JOINED) +@SuperBuilder +@NoArgsConstructor +@DiscriminatorColumn +public abstract class Question extends BaseEntity { + public boolean ifApproved; + protected String content; + @Enumerated(value = EnumType.STRING) + protected QuestionCategory questionCategory; + @Enumerated(value = EnumType.STRING) + protected QuestionLevel questionLevel; + protected String description; + protected String imageUrl; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + @Column(name = "question_id") + private Long id; + @OneToMany(mappedBy = "question", cascade = CascadeType.ALL, orphanRemoval = true) + private List comments; + + public Question(String content, QuestionCategory questionCategory, QuestionLevel questionLevel, String description, + String imageUrl) { + this.content = content; + this.questionCategory = questionCategory; + this.questionLevel = questionLevel; + this.description = description; + this.imageUrl = imageUrl; + this.comments = new ArrayList<>(); + } + + public void changeDescription(String description) { + this.description = description; + } + + public void changeContent(String content) { + this.content = content; + } + + public void toggleApproved() { + this.ifApproved = !this.ifApproved; + } + + public void updateImage(String imageUrl) { + this.imageUrl = imageUrl; + } + + public abstract void initDefaults(); +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionCategory.java b/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionCategory.java new file mode 100644 index 00000000..df9169b5 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionCategory.java @@ -0,0 +1,40 @@ +package com.comssa.persistence.question.domain.common; + +public enum QuestionCategory { + DATABASE("데이터베이스", true), + NETWORK("네트워크", true), + OPERATING_SYSTEM("운영체제", true), + COMPUTER_ARCHITECTURE("컴퓨터 구조", true), + DATA_STRUCTURE("자료 구조", true), + ALGORITHM("알고리즘", false), + OOP("객체 지향", false), + DESIGN_PATTERN("디자인 패턴", false), + JAVA("Java", true), + SOFTWARE_DESIGN("소프트웨어 설계", false), + SOFTWARE_DEVELOPMENT("소프트웨어 개발", false), + DATABASE_DESIGN("데이터베이스 구축", false), + PROGRAMMING_LANGUAGE("프로그래밍 언어 활용", false), + INFORMATION_SECURITY("정보시스템 구축관리", false), + DATA_MODELING("데이터 모델링에 대한 이해", false), + SQL_UTILIZE("SQL 기본 및 활용", false), + DATA_UNDERSTANDING("데이터의 이해", false), + DATA_ANALYSIS_PLANNING("데이터 분석 기회", false), + DATA_ANALYSIS("데이터 분석", false), + AWS_SAA("Solutions Architect Associate", false); + + private final String korean; + private final boolean canBeShownInMajor; + + QuestionCategory(String korean, boolean canBeShownInMajor) { + this.korean = korean; + this.canBeShownInMajor = canBeShownInMajor; + } + + public String getKorean() { + return korean; + } + + public boolean isCanBeShownInMajor() { + return canBeShownInMajor; + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionChoice.java b/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionChoice.java new file mode 100644 index 00000000..2306fe58 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionChoice.java @@ -0,0 +1,48 @@ +package com.comssa.persistence.question.domain.common; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.SuperBuilder; + +import javax.persistence.DiscriminatorColumn; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; + +@Getter +@SuperBuilder +@Entity +@Inheritance(strategy = InheritanceType.JOINED) +@NoArgsConstructor +@DiscriminatorColumn +@ToString(exclude = "question") //재귀로 StackOverFlow 발생 +public abstract class QuestionChoice { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String content; + private int selectedCount; + private boolean answerStatus; + + public QuestionChoice(String content, int selectedCount, boolean answerStatus) { + this.content = content; + this.selectedCount = selectedCount; + this.answerStatus = answerStatus; + } + + public void changeContent(String content) { + this.content = content; + } + + public void toggleAnswerStatus() { + this.answerStatus = !this.answerStatus; + } + + public void select() { + this.selectedCount++; + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionLevel.java b/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionLevel.java new file mode 100644 index 00000000..8e407258 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/common/QuestionLevel.java @@ -0,0 +1,15 @@ +package com.comssa.persistence.question.domain.common; + +public enum QuestionLevel { + + LOW("하"), MEDIUM("중"), HIGH("상"), NONE(""); + private final String korean; + + QuestionLevel(String korean) { + this.korean = korean; + } + + public String getKorean() { + return korean; + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseCategory.java b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseCategory.java similarity index 90% rename from persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseCategory.java rename to persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseCategory.java index 57103e22..d28b29c5 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseCategory.java +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseCategory.java @@ -1,4 +1,4 @@ -package com.comssa.persistence.question.license.domain; +package com.comssa.persistence.question.domain.license; import java.util.Arrays; import java.util.Optional; diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseMultipleChoiceQuestion.java b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseMultipleChoiceQuestion.java similarity index 82% rename from persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseMultipleChoiceQuestion.java rename to persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseMultipleChoiceQuestion.java index 3d6536ea..db61aefd 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseMultipleChoiceQuestion.java +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseMultipleChoiceQuestion.java @@ -1,10 +1,10 @@ -package com.comssa.persistence.question.license.domain; +package com.comssa.persistence.question.domain.license; -import com.comssa.persistence.question.common.domain.ChoiceProvider; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; +import com.comssa.persistence.question.domain.common.ChoiceProvider; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.common.QuestionLevel; +import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; @@ -38,7 +38,7 @@ public class LicenseMultipleChoiceQuestion extends Question implements ChoicePro private List questionChoices; public static LicenseMultipleChoiceQuestion makeWithDto( - RequestMakeMajorMultipleChoiceQuestionDto dto, + RequestMakeMultipleChoiceQuestionDto dto, LicenseSession licenseSession, LicenseCategory licenseCategory) { LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.builder() @@ -56,6 +56,7 @@ public static LicenseMultipleChoiceQuestion makeWithDto( public static LicenseMultipleChoiceQuestion makeForTest(String test) { LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.builder() + .id(1L) .content(test) .questionCategory(QuestionCategory.ALGORITHM) .questionLevel(QuestionLevel.LOW) diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseQuestionChoice.java b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseQuestionChoice.java similarity index 82% rename from persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseQuestionChoice.java rename to persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseQuestionChoice.java index bf546415..07c29bf6 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseQuestionChoice.java +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseQuestionChoice.java @@ -1,7 +1,7 @@ -package com.comssa.persistence.question.license.domain; +package com.comssa.persistence.question.domain.license; -import com.comssa.persistence.question.common.domain.QuestionChoice; -import com.comssa.persistence.question.major.admin.dto.RequestMakeQuestionChoiceDto; +import com.comssa.persistence.question.domain.common.QuestionChoice; +import com.comssa.persistence.question.dto.common.request.RequestMakeQuestionChoiceDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -35,7 +35,7 @@ public static LicenseQuestionChoice from( LicenseQuestionChoice questionChoice = LicenseQuestionChoice.builder() .content(dto.getText()) .selectedCount(0) - .answerStatus(dto.isAnswerStatus()) + .answerStatus(dto.getAnswerStatus()) .question(licenseMultipleChoiceQuestion) .build(); licenseMultipleChoiceQuestion.getQuestionChoices().add(questionChoice); diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseSession.java b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseSession.java similarity index 90% rename from persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseSession.java rename to persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseSession.java index a9ebfd2a..1ee456d6 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseSession.java +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseSession.java @@ -1,6 +1,6 @@ -package com.comssa.persistence.question.license.domain; +package com.comssa.persistence.question.domain.license; -import com.comssa.persistence.question.common.domain.BaseEntity; +import com.comssa.persistence.BaseEntity; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseSubjectiveQuestion.java b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseSubjectiveQuestion.java new file mode 100644 index 00000000..6706597f --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseSubjectiveQuestion.java @@ -0,0 +1,4 @@ +package com.comssa.persistence.question.domain.license; + +public class LicenseSubjectiveQuestion { +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorDescriptiveQuestion.java b/persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorDescriptiveQuestion.java new file mode 100644 index 00000000..58b11708 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorDescriptiveQuestion.java @@ -0,0 +1,44 @@ +package com.comssa.persistence.question.domain.major; + +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.dto.major.request.RequestMakeMajorDescriptiveQuestionDto; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.SuperBuilder; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; + +@Entity +@Getter +@SuperBuilder +@NoArgsConstructor +@ToString +@DiscriminatorValue("MD") +public class MajorDescriptiveQuestion extends Question { + private String gradeStandard; + + public static MajorDescriptiveQuestion makeWithDto( + RequestMakeMajorDescriptiveQuestionDto dto) { + MajorDescriptiveQuestion question = MajorDescriptiveQuestion.builder() + .content(dto.getContent()) + .questionCategory(dto.getQuestionCategory()) + .questionLevel(dto.getQuestionLevel()) + .description(dto.getDescription()) + .gradeStandard(dto.getGradeStandard()) + .imageUrl(null) + .build(); + question.initDefaults(); + return question; + } + + @Override + public void initDefaults() { + + } + + public void changeGradeStandard(String gradeStandard) { + this.gradeStandard = gradeStandard; + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorMultipleChoiceQuestion.java b/persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorMultipleChoiceQuestion.java similarity index 80% rename from persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorMultipleChoiceQuestion.java rename to persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorMultipleChoiceQuestion.java index 8c56b639..1c17668a 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorMultipleChoiceQuestion.java +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorMultipleChoiceQuestion.java @@ -1,10 +1,10 @@ -package com.comssa.persistence.question.major.domain.common; +package com.comssa.persistence.question.domain.major; -import com.comssa.persistence.question.common.domain.ChoiceProvider; -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; +import com.comssa.persistence.question.domain.common.ChoiceProvider; +import com.comssa.persistence.question.domain.common.Question; +import com.comssa.persistence.question.domain.common.QuestionCategory; +import com.comssa.persistence.question.domain.common.QuestionLevel; +import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; @@ -29,7 +29,7 @@ public class MajorMultipleChoiceQuestion extends Question implements ChoiceProvi @OneToMany(mappedBy = "question", cascade = CascadeType.ALL, orphanRemoval = true) private List questionChoices; - public static MajorMultipleChoiceQuestion makeWithDto(RequestMakeMajorMultipleChoiceQuestionDto dto) { + public static MajorMultipleChoiceQuestion makeWithDto(RequestMakeMultipleChoiceQuestionDto dto) { MajorMultipleChoiceQuestion majorMultipleChoiceQuestion = MajorMultipleChoiceQuestion.builder() .content(dto.getContent()) .questionCategory(dto.getQuestionCategory()) @@ -43,6 +43,7 @@ public static MajorMultipleChoiceQuestion makeWithDto(RequestMakeMajorMultipleCh public static MajorMultipleChoiceQuestion makeForTest() { return MajorMultipleChoiceQuestion.builder() + .id(1L) .content("testQuest") .questionCategory(QuestionCategory.COMPUTER_ARCHITECTURE) .questionLevel(QuestionLevel.LOW) diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorQuestionChoice.java b/persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorQuestionChoice.java similarity index 82% rename from persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorQuestionChoice.java rename to persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorQuestionChoice.java index 65974b5a..f9e50f8a 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorQuestionChoice.java +++ b/persistence/src/main/java/com/comssa/persistence/question/domain/major/MajorQuestionChoice.java @@ -1,7 +1,7 @@ -package com.comssa.persistence.question.major.domain.common; +package com.comssa.persistence.question.domain.major; -import com.comssa.persistence.question.common.domain.QuestionChoice; -import com.comssa.persistence.question.major.admin.dto.RequestMakeQuestionChoiceDto; +import com.comssa.persistence.question.domain.common.QuestionChoice; +import com.comssa.persistence.question.dto.common.request.RequestMakeQuestionChoiceDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -34,7 +34,7 @@ public static MajorQuestionChoice fromMajorQuestion(RequestMakeQuestionChoiceDto MajorQuestionChoice majorQuestionChoice = MajorQuestionChoice.builder() .content(dto.getText()) .selectedCount(0) - .answerStatus(dto.isAnswerStatus()) + .answerStatus(dto.getAnswerStatus()) .question(majorMultipleChoiceQuestion) .build(); majorMultipleChoiceQuestion.getQuestionChoices().add(majorQuestionChoice); diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionContentDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionContentDto.kt new file mode 100644 index 00000000..2743dda4 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionContentDto.kt @@ -0,0 +1,13 @@ +package com.comssa.persistence.question.dto.common.request + +data class RequestChangeQuestionContentDto( + val content: String, +) { + companion object { + @JvmStatic + fun forTest(): RequestChangeQuestionContentDto = + RequestChangeQuestionContentDto( + content = "test", + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionDescriptionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionDescriptionDto.kt new file mode 100644 index 00000000..1f44b3c7 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionDescriptionDto.kt @@ -0,0 +1,13 @@ +package com.comssa.persistence.question.dto.common.request + +data class RequestChangeQuestionDescriptionDto( + val description: String, +) { + companion object { + @JvmStatic + fun forTest(): RequestChangeQuestionDescriptionDto = + RequestChangeQuestionDescriptionDto( + description = "test", + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionGradeStandardDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionGradeStandardDto.kt new file mode 100644 index 00000000..8f1db3f9 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestChangeQuestionGradeStandardDto.kt @@ -0,0 +1,5 @@ +package com.comssa.persistence.question.dto.common.request + +data class RequestChangeQuestionGradeStandardDto( + val gradeStandard: String, +) diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestDoGradeDescriptiveAnswerDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestDoGradeDescriptiveAnswerDto.kt new file mode 100644 index 00000000..496aa555 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestDoGradeDescriptiveAnswerDto.kt @@ -0,0 +1,5 @@ +package com.comssa.persistence.question.dto.common.request + +data class RequestDoGradeDescriptiveAnswerDto( + val content: String, +) diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestDoQuestionCommandDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestDoQuestionCommandDto.kt new file mode 100644 index 00000000..3bba2fa6 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestDoQuestionCommandDto.kt @@ -0,0 +1,9 @@ +package com.comssa.persistence.question.dto.common.request + +import com.comssa.persistence.question.domain.common.QuestionCategory + +data class RequestDoQuestionCommandDto( + val command: String, + val multipleChoice: Boolean, + val questionCategories: List, +) diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeMultipleChoiceQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeMultipleChoiceQuestionDto.kt new file mode 100644 index 00000000..5c212e2c --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeMultipleChoiceQuestionDto.kt @@ -0,0 +1,39 @@ +package com.comssa.persistence.question.dto.common.request + +import com.comssa.persistence.question.domain.common.Question +import com.comssa.persistence.question.domain.common.QuestionCategory +import com.comssa.persistence.question.domain.common.QuestionChoice +import com.comssa.persistence.question.domain.common.QuestionLevel + +class RequestMakeMultipleChoiceQuestionDto( + val questionChoices: List, + content: String, + questionCategory: QuestionCategory, + questionLevel: QuestionLevel, + description: String, +) : RequestMakeQuestionDto( + content = content, + questionCategory = questionCategory, + questionLevel = questionLevel, + description = description, + ) { + companion object { + @JvmStatic + fun from( + question: Question, + questionChoices: List, + ): RequestMakeMultipleChoiceQuestionDto { + val mappedChoices = + questionChoices.map { questionChoice -> + RequestMakeQuestionChoiceDto.from(questionChoice) + } + return RequestMakeMultipleChoiceQuestionDto( + questionChoices = mappedChoices, + content = question.content, + description = question.description, + questionCategory = question.questionCategory, + questionLevel = question.questionLevel, + ) + } + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeQuestionChoiceDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeQuestionChoiceDto.kt new file mode 100644 index 00000000..3a087dcc --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeQuestionChoiceDto.kt @@ -0,0 +1,16 @@ +package com.comssa.persistence.question.dto.common.request + +import com.comssa.persistence.question.domain.common.QuestionChoice + +data class RequestMakeQuestionChoiceDto( + val text: String, + val answerStatus: Boolean, +) { + companion object { + fun from(questionChoice: QuestionChoice): RequestMakeQuestionChoiceDto = + RequestMakeQuestionChoiceDto( + text = questionChoice.content, + answerStatus = questionChoice.isAnswerStatus, + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeQuestionDto.kt new file mode 100644 index 00000000..bf73abc9 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/request/RequestMakeQuestionDto.kt @@ -0,0 +1,11 @@ +package com.comssa.persistence.question.dto.common.request + +import com.comssa.persistence.question.domain.common.QuestionCategory +import com.comssa.persistence.question.domain.common.QuestionLevel + +abstract class RequestMakeQuestionDto( + val content: String = "", + val questionCategory: QuestionCategory = QuestionCategory.OOP, + val questionLevel: QuestionLevel = QuestionLevel.LOW, + val description: String = "", +) diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseClassifiedQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseClassifiedQuestionDto.kt new file mode 100644 index 00000000..d59c57db --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseClassifiedQuestionDto.kt @@ -0,0 +1,27 @@ +package com.comssa.persistence.question.dto.common.response + +import com.comssa.persistence.question.domain.common.Question +import com.comssa.persistence.question.domain.common.QuestionCategory +import lombok.Getter +import lombok.NoArgsConstructor +import lombok.experimental.SuperBuilder + +@NoArgsConstructor +@Getter +@SuperBuilder +class ResponseClassifiedQuestionDto( + val questionCategory: QuestionCategory, + val responseQuestions: List, +) { + companion object { + @JvmStatic + fun from( + questionCategory: QuestionCategory, + questions: List, + ): ResponseClassifiedQuestionDto = + ResponseClassifiedQuestionDto( + questionCategory = questionCategory, + responseQuestions = questions.map { ResponseQuestionDto.from(it) }, + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseDescriptiveQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseDescriptiveQuestionDto.kt new file mode 100644 index 00000000..80af7f39 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseDescriptiveQuestionDto.kt @@ -0,0 +1,20 @@ +package com.comssa.persistence.question.dto.common.response + +import com.comssa.persistence.question.domain.common.Question +import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion + +class ResponseDescriptiveQuestionDto( + question: Question, + val gradeStandard: String, +) : ResponseQuestionDto( + question, + ifMultipleChoice = false, + ) { + companion object { + fun forMajor(question: MajorDescriptiveQuestion): ResponseDescriptiveQuestionDto = + ResponseDescriptiveQuestionDto( + question = question, + gradeStandard = question.gradeStandard, + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseMultipleChoiceQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseMultipleChoiceQuestionDto.kt new file mode 100644 index 00000000..629af565 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseMultipleChoiceQuestionDto.kt @@ -0,0 +1,29 @@ +package com.comssa.persistence.question.dto.common.response + +import com.comssa.persistence.question.domain.common.Question +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion + +open class ResponseMultipleChoiceQuestionDto( + val questionChoices: List, + question: Question, +) : ResponseQuestionDto( + question = question, + ifMultipleChoice = true, + ) { + companion object { + @JvmStatic + fun forLicense(question: LicenseMultipleChoiceQuestion): ResponseMultipleChoiceQuestionDto = + ResponseMultipleChoiceQuestionDto( + question = question, + questionChoices = question.questionChoices.map { ResponseQuestionChoiceDto.from(it) }, + ) + + @JvmStatic + fun forMajor(question: MajorMultipleChoiceQuestion): ResponseMultipleChoiceQuestionDto = + ResponseMultipleChoiceQuestionDto( + question = question, + questionChoices = question.questionChoices.map { ResponseQuestionChoiceDto.from(it) }, + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseQuestionChoiceDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseQuestionChoiceDto.kt new file mode 100644 index 00000000..52e35d4f --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseQuestionChoiceDto.kt @@ -0,0 +1,21 @@ +package com.comssa.persistence.question.dto.common.response + +import com.comssa.persistence.question.domain.common.QuestionChoice + +data class ResponseQuestionChoiceDto( + val id: Long, + val content: String, + val selectedCount: Int, + val answerStatus: Boolean, +) { + companion object { + @JvmStatic + fun from(questionChoice: T): ResponseQuestionChoiceDto = + ResponseQuestionChoiceDto( + id = questionChoice.id, + content = questionChoice.content, + selectedCount = questionChoice.selectedCount, + answerStatus = questionChoice.isAnswerStatus, + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseQuestionDto.kt new file mode 100644 index 00000000..904dba12 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/common/response/ResponseQuestionDto.kt @@ -0,0 +1,32 @@ +package com.comssa.persistence.question.dto.common.response + +import com.comssa.persistence.question.domain.common.Question +import com.comssa.persistence.question.domain.common.QuestionCategory +import com.comssa.persistence.question.domain.common.QuestionLevel +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion +import com.comssa.persistence.question.domain.major.MajorDescriptiveQuestion +import com.comssa.persistence.question.domain.major.MajorMultipleChoiceQuestion + +abstract class ResponseQuestionDto( + question: Question, + val ifMultipleChoice: Boolean, +) { + val id: Long = question.id + val content: String = question.content + val description: String = question.description + val imageUrl: String? = question.imageUrl + val questionCategory: QuestionCategory = question.questionCategory + val questionLevel: QuestionLevel = question.questionLevel + val ifApproved: Boolean = question.ifApproved + + companion object { + @JvmStatic + fun from(question: Question): R = + when (question) { + is LicenseMultipleChoiceQuestion -> ResponseMultipleChoiceQuestionDto.forLicense(question) as R + is MajorMultipleChoiceQuestion -> ResponseMultipleChoiceQuestionDto.forMajor(question) as R + is MajorDescriptiveQuestion -> ResponseDescriptiveQuestionDto.forMajor(question) as R + else -> throw IllegalArgumentException("Unsupported question type: ${question.javaClass.name}") + } + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/license/request/RequestMakeLicenseMultipleChoiceQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/license/request/RequestMakeLicenseMultipleChoiceQuestionDto.kt new file mode 100644 index 00000000..92955bab --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/license/request/RequestMakeLicenseMultipleChoiceQuestionDto.kt @@ -0,0 +1,25 @@ +package com.comssa.persistence.question.dto.license.request + +import com.comssa.persistence.question.domain.license.LicenseCategory +import com.comssa.persistence.question.domain.license.LicenseMultipleChoiceQuestion +import com.comssa.persistence.question.dto.common.request.RequestMakeMultipleChoiceQuestionDto + +data class RequestMakeLicenseMultipleChoiceQuestionDto( + val questions: List, + val licenseSession: String, + val licenseCategory: LicenseCategory, +) { + companion object { + @JvmStatic + fun forTest( + licenseSession: String, + licenseCategory: LicenseCategory, + questions: List, + ): RequestMakeLicenseMultipleChoiceQuestionDto = + RequestMakeLicenseMultipleChoiceQuestionDto( + questions.map { q -> RequestMakeMultipleChoiceQuestionDto.from(q, q.questionChoices) }, + licenseSession, + licenseCategory, + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/license/response/ResponseLicenseSessionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/license/response/ResponseLicenseSessionDto.kt new file mode 100644 index 00000000..c486791a --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/license/response/ResponseLicenseSessionDto.kt @@ -0,0 +1,20 @@ +package com.comssa.persistence.question.dto.license.response + +import com.comssa.persistence.question.domain.license.LicenseCategory +import com.comssa.persistence.question.domain.license.LicenseSession + +data class ResponseLicenseSessionDto( + val id: Long, + val content: String, + val licenseCategory: LicenseCategory, +) { + companion object { + @JvmStatic + fun from(licenseSession: LicenseSession): ResponseLicenseSessionDto = + ResponseLicenseSessionDto( + id = licenseSession.id, + content = licenseSession.content, + licenseCategory = licenseSession.licenseCategory, + ) + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/dto/response/ResponseLicensesDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/license/response/ResponseLicensesDto.kt similarity index 70% rename from persistence/src/main/java/com/comssa/persistence/question/license/dto/response/ResponseLicensesDto.kt rename to persistence/src/main/java/com/comssa/persistence/question/dto/license/response/ResponseLicensesDto.kt index 68d58ce5..417581bd 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/license/dto/response/ResponseLicensesDto.kt +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/license/response/ResponseLicensesDto.kt @@ -1,6 +1,6 @@ -package com.comssa.persistence.question.license.dto.response +package com.comssa.persistence.question.dto.license.response -import com.comssa.persistence.question.license.domain.LicenseCategory +import com.comssa.persistence.question.domain.license.LicenseCategory data class ResponseLicensesDto( val korean: String, diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/major/request/RequestGetQuestionByCategoryAndLevelDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/major/request/RequestGetQuestionByCategoryAndLevelDto.kt new file mode 100644 index 00000000..3fac90c1 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/major/request/RequestGetQuestionByCategoryAndLevelDto.kt @@ -0,0 +1,51 @@ +package com.comssa.persistence.question.dto.major.request + +import com.comssa.persistence.question.domain.common.QuestionCategory +import com.comssa.persistence.question.domain.common.QuestionLevel + +data class RequestGetQuestionByCategoryAndLevelDto( + val questionLevels: List, + val questionCategories: List, +) { + companion object { + @JvmStatic + fun fromKorean( + questionCategories: List?, + questionLevels: List?, + ): RequestGetQuestionByCategoryAndLevelDto = + RequestGetQuestionByCategoryAndLevelDto( + questionCategories = + mapOrGetAllEnumValues( + questionCategories, + QuestionCategory::class.java, + QuestionCategory::getKorean, + ), + questionLevels = + mapOrGetAllEnumValues( + questionLevels, + QuestionLevel::class.java, + QuestionLevel::getKorean, + ), + ) + + private fun > mapOrGetAllEnumValues( + values: List?, + enumClass: Class, + getKorean: (T) -> String, + /* + Enum(T)을 입력받고, + ->는 함수 임을 의미 + String을 반환 + Java의. Function 과 동일 + */ + ): List { + if (values.isNullOrEmpty()) { + return enumClass.enumConstants.toList() + } + return values.map { value -> + enumClass.enumConstants.firstOrNull { getKorean(it) == value } + ?: throw IllegalArgumentException("Unknown enum value: $value") + } + } + } +} diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/major/request/RequestMakeMajorDescriptiveQuestionDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/major/request/RequestMakeMajorDescriptiveQuestionDto.kt new file mode 100644 index 00000000..764cc0f9 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/major/request/RequestMakeMajorDescriptiveQuestionDto.kt @@ -0,0 +1,7 @@ +package com.comssa.persistence.question.dto.major.request + +import com.comssa.persistence.question.dto.common.request.RequestMakeQuestionDto + +data class RequestMakeMajorDescriptiveQuestionDto( + val gradeStandard: String, +) : RequestMakeQuestionDto() diff --git a/persistence/src/main/java/com/comssa/persistence/question/dto/major/response/ResponseMajorQuestionClassCountDto.kt b/persistence/src/main/java/com/comssa/persistence/question/dto/major/response/ResponseMajorQuestionClassCountDto.kt new file mode 100644 index 00000000..a3cf1eca --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/dto/major/response/ResponseMajorQuestionClassCountDto.kt @@ -0,0 +1,10 @@ +package com.comssa.persistence.question.dto.major.response + +import com.comssa.persistence.question.domain.common.QuestionCategory +import com.comssa.persistence.question.domain.common.QuestionLevel + +data class ResponseMajorQuestionClassCountDto( + val questionCategory: QuestionCategory, + val questionLevel: QuestionLevel, + val count: Int, +) diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseSubjectiveQuestion.java b/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseSubjectiveQuestion.java deleted file mode 100644 index 88a2e490..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/license/domain/LicenseSubjectiveQuestion.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.comssa.persistence.question.license.domain; - -public class LicenseSubjectiveQuestion { -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/dto/request/RequestMakeLicenseMultipleChoiceQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/license/dto/request/RequestMakeLicenseMultipleChoiceQuestionDto.java deleted file mode 100644 index 01e6c19f..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/license/dto/request/RequestMakeLicenseMultipleChoiceQuestionDto.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.comssa.persistence.question.license.dto.request; - -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion; -import com.comssa.persistence.question.license.domain.LicenseQuestionChoice; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorMultipleChoiceQuestionDto; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; - -@NoArgsConstructor -@AllArgsConstructor -@SuperBuilder -@Getter -public class RequestMakeLicenseMultipleChoiceQuestionDto { - private List questions; - private String licenseSession; - private LicenseCategory licenseCategory; - - public static RequestMakeLicenseMultipleChoiceQuestionDto from( - String licenseSession, - LicenseCategory licenseCategory, - List questions, - Function> questionChoiceExtractor) { - return RequestMakeLicenseMultipleChoiceQuestionDto.builder() - .questions( - questions.stream() - .map( - q -> RequestMakeMajorMultipleChoiceQuestionDto.from(q, questionChoiceExtractor.apply(q)) - ) - .collect(Collectors.toList()) - - ) - .licenseSession(licenseSession) - .licenseCategory(licenseCategory) - .build(); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/dto/response/ResponseLicenseSessionDto.java b/persistence/src/main/java/com/comssa/persistence/question/license/dto/response/ResponseLicenseSessionDto.java deleted file mode 100644 index 11960e73..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/license/dto/response/ResponseLicenseSessionDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.comssa.persistence.question.license.dto.response; - -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseSession; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - -@Getter -@NoArgsConstructor -@ToString -public class ResponseLicenseSessionDto { - private Long id; - private String content; - private LicenseCategory licenseCategory; - - @Builder - public ResponseLicenseSessionDto(Long id, String content, LicenseCategory licenseCategory) { - this.id = id; - this.content = content; - this.licenseCategory = licenseCategory; - } - - public static ResponseLicenseSessionDto from(LicenseSession licenseSession) { - return ResponseLicenseSessionDto.builder() - .id(licenseSession.getId()) - .content(licenseSession.getContent()) - .licenseCategory(licenseSession.getLicenseCategory()) - .build(); - } - -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseMultipleChoiceQuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseMultipleChoiceQuestionRepository.java deleted file mode 100644 index fe85ad77..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseMultipleChoiceQuestionRepository.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.comssa.persistence.question.license.repository; - - -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.license.domain.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/major/admin/dto/RequestMakeMajorDescriptiveQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeMajorDescriptiveQuestionDto.java deleted file mode 100644 index e5f3f8d9..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeMajorDescriptiveQuestionDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.comssa.persistence.question.major.admin.dto; - -import com.comssa.persistence.question.common.dto.request.RequestMakeQuestionDto; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@NoArgsConstructor -@AllArgsConstructor -@SuperBuilder -@Getter -public class RequestMakeMajorDescriptiveQuestionDto extends RequestMakeQuestionDto { - private String gradeStandard; -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeMajorMultipleChoiceQuestionDto.java b/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeMajorMultipleChoiceQuestionDto.java deleted file mode 100644 index a15b837f..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeMajorMultipleChoiceQuestionDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.comssa.persistence.question.major.admin.dto; - -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.common.domain.QuestionChoice; -import com.comssa.persistence.question.common.dto.request.RequestMakeQuestionDto; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; -import java.util.stream.Collectors; - -@NoArgsConstructor -@AllArgsConstructor -@SuperBuilder -@Getter -public class RequestMakeMajorMultipleChoiceQuestionDto extends RequestMakeQuestionDto { - private List questionChoices; - - public static RequestMakeMajorMultipleChoiceQuestionDto from( - Question question, - List questionChoices) { - return RequestMakeMajorMultipleChoiceQuestionDto.builder() - .content(question.getContent()) - .description(question.getDescription()) - .questionCategory(question.getQuestionCategory()) - .questionLevel(question.getQuestionLevel()) - .questionChoices(questionChoices - .stream() - .map(RequestMakeQuestionChoiceDto::from) - .collect(Collectors.toList())) - .build(); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeQuestionChoiceDto.java b/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeQuestionChoiceDto.java deleted file mode 100644 index 98c2ad03..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/RequestMakeQuestionChoiceDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.comssa.persistence.question.major.admin.dto; - -import com.comssa.persistence.question.common.domain.QuestionChoice; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Getter -public class RequestMakeQuestionChoiceDto { - private String text; - private boolean answerStatus; - - public static RequestMakeQuestionChoiceDto from(QuestionChoice questionChoice) { - return RequestMakeQuestionChoiceDto.builder() - .answerStatus(questionChoice.isAnswerStatus()) - .text(questionChoice.getContent()) - .build(); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/ResponseMajorMultipleChoiceQuestionForAdminDto.java b/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/ResponseMajorMultipleChoiceQuestionForAdminDto.java deleted file mode 100644 index 4eb644ea..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/admin/dto/ResponseMajorMultipleChoiceQuestionForAdminDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.comssa.persistence.question.major.admin.dto; - -import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.experimental.SuperBuilder; - -@NoArgsConstructor -@AllArgsConstructor -@Getter -@Setter -@SuperBuilder -public class ResponseMajorMultipleChoiceQuestionForAdminDto extends ResponseMultipleChoiceQuestionDto { - private boolean canBeShortAnswered; -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorDescriptiveQuestion.java b/persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorDescriptiveQuestion.java deleted file mode 100644 index 9ed2b816..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/domain/common/MajorDescriptiveQuestion.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.comssa.persistence.question.major.domain.common; - -import com.comssa.persistence.question.common.domain.Question; -import com.comssa.persistence.question.major.admin.dto.RequestMakeMajorDescriptiveQuestionDto; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; -import lombok.experimental.SuperBuilder; - -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; - -@Entity -@Getter -@SuperBuilder -@NoArgsConstructor -@ToString -@DiscriminatorValue("MD") -public class MajorDescriptiveQuestion extends Question { - private String gradeStandard; - - @Override - public void initDefaults() { - - } - - public void changeGradeStandard(String gradeStandard) { - this.gradeStandard = gradeStandard; - } - - public static MajorDescriptiveQuestion makeWithDto( - RequestMakeMajorDescriptiveQuestionDto dto) { - MajorDescriptiveQuestion question = MajorDescriptiveQuestion.builder() - .content(dto.getContent()) - .questionCategory(dto.getQuestionCategory()) - .questionLevel(dto.getQuestionLevel()) - .description(dto.getDescription()) - .gradeStandard(dto.getGradeStandard()) - .imageUrl(null) - .build(); - question.initDefaults(); - return question; - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/repository/MajorDescriptiveQuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/major/repository/MajorDescriptiveQuestionRepository.java deleted file mode 100644 index cf38a89f..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/repository/MajorDescriptiveQuestionRepository.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.comssa.persistence.question.major.repository; - -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.major.domain.common.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/major/repository/MajorMultipleChoiceQuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/major/repository/MajorMultipleChoiceQuestionRepository.java deleted file mode 100644 index 120335c0..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/repository/MajorMultipleChoiceQuestionRepository.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.comssa.persistence.question.major.repository; - - -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import com.comssa.persistence.question.major.domain.common.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/major/user/dto/request/RequestGetQuestionByCategoryAndLevelDto.java b/persistence/src/main/java/com/comssa/persistence/question/major/user/dto/request/RequestGetQuestionByCategoryAndLevelDto.java deleted file mode 100644 index e3cf7e13..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/user/dto/request/RequestGetQuestionByCategoryAndLevelDto.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.comssa.persistence.question.major.user.dto.request; - -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.util.Arrays; -import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; - -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Getter -public class RequestGetQuestionByCategoryAndLevelDto { - private List questionCategories; - private List questionLevels; - - public static RequestGetQuestionByCategoryAndLevelDto from( - List questionCategories, - List questionLevels) { - return RequestGetQuestionByCategoryAndLevelDto.builder() - .questionCategories(questionCategories) - .questionLevels(questionLevels) - .build(); - } - - /** - * @param questionCategories - * @param questionLevels 한글로 된 문제 카테고리와 레벨을 받고 Enum으로 전환한 후에 반환. - */ - public static RequestGetQuestionByCategoryAndLevelDto fromKorean( - List questionCategories, - List questionLevels) { - List categories = mapOrGetAllEnumValues(questionCategories, QuestionCategory.class, - QuestionCategory::getKorean); - List levels = mapOrGetAllEnumValues(questionLevels, QuestionLevel.class, - QuestionLevel::getKorean); - // DTO 빌드 - return RequestGetQuestionByCategoryAndLevelDto.builder() - .questionCategories(categories) - .questionLevels(levels) - .build(); - } - - /* - 리스트에 아무 것도 포함되어있지 않다면, Enum의 모든 값을 포함하여 반환한다. - */ - private static > List mapOrGetAllEnumValues( - List values, Class enumClass, - Function getKorean) { - if (values == null || values.isEmpty()) { - return Arrays.asList(enumClass.getEnumConstants()); - } - return values.stream() - .map(value -> Arrays.stream(enumClass.getEnumConstants()) - .filter(e -> getKorean.apply(e).equals(value)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("Invalid " + enumClass.getSimpleName() + ": " + value))) - .collect(Collectors.toList()); - } -} diff --git a/persistence/src/main/java/com/comssa/persistence/question/major/user/dto/response/ResponseMajorQuestionClassCountDto.java b/persistence/src/main/java/com/comssa/persistence/question/major/user/dto/response/ResponseMajorQuestionClassCountDto.java deleted file mode 100644 index ca235590..00000000 --- a/persistence/src/main/java/com/comssa/persistence/question/major/user/dto/response/ResponseMajorQuestionClassCountDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.comssa.persistence.question.major.user.dto.response; - -import com.comssa.persistence.question.common.domain.QuestionCategory; -import com.comssa.persistence.question.common.domain.QuestionLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@NoArgsConstructor -@Getter -public class ResponseMajorQuestionClassCountDto { - private QuestionCategory questionCategory; - private QuestionLevel questionLevel; - private int count; - - @Builder - public ResponseMajorQuestionClassCountDto( - QuestionCategory questionCategory, - QuestionLevel questionLevel, - int count) { - this.questionCategory = questionCategory; - this.questionLevel = questionLevel; - this.count = count; - } - - public static ResponseMajorQuestionClassCountDto of(QuestionCategory questionCategory, QuestionLevel questionLevel, - int count) { - return ResponseMajorQuestionClassCountDto.builder() - .questionLevel(questionLevel) - .questionCategory(questionCategory) - .count(count) - .build(); - } -} 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 new file mode 100644 index 00000000..1dde9b0a --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseMultipleChoiceQuestionRepository.java @@ -0,0 +1,42 @@ +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/license/repository/LicenseQuestionChoiceRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseQuestionChoiceRepository.java similarity index 66% rename from persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseQuestionChoiceRepository.java rename to persistence/src/main/java/com/comssa/persistence/question/repository/LicenseQuestionChoiceRepository.java index c818fbe2..c63b0648 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseQuestionChoiceRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseQuestionChoiceRepository.java @@ -1,7 +1,7 @@ -package com.comssa.persistence.question.license.repository; +package com.comssa.persistence.question.repository; -import com.comssa.persistence.question.license.domain.LicenseQuestionChoice; +import com.comssa.persistence.question.domain.license.LicenseQuestionChoice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseSessionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseSessionRepository.java similarity index 71% rename from persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseSessionRepository.java rename to persistence/src/main/java/com/comssa/persistence/question/repository/LicenseSessionRepository.java index 0cf7e93c..3cf311f8 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/license/repository/LicenseSessionRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/LicenseSessionRepository.java @@ -1,8 +1,8 @@ -package com.comssa.persistence.question.license.repository; +package com.comssa.persistence.question.repository; -import com.comssa.persistence.question.license.domain.LicenseCategory; -import com.comssa.persistence.question.license.domain.LicenseSession; +import com.comssa.persistence.question.domain.license.LicenseCategory; +import com.comssa.persistence.question.domain.license.LicenseSession; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -15,7 +15,8 @@ public interface LicenseSessionRepository extends JpaRepository { @Query( - "SELECT ls FROM LicenseSession ls " + "WHERE ls.content = :session AND ls.licenseCategory = :licenseCategory") + "SELECT ls FROM LicenseSession ls " + + "WHERE ls.content = :session AND ls.licenseCategory = :licenseCategory") Optional findLicenseSessionByContent( @Param("session") String content, @Param("licenseCategory") LicenseCategory licenseCategory); 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 new file mode 100644 index 00000000..807b67e5 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/MajorDescriptiveQuestionRepository.java @@ -0,0 +1,29 @@ +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 new file mode 100644 index 00000000..42bfd9a8 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/MajorMultipleChoiceQuestionRepository.java @@ -0,0 +1,75 @@ +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/major/repository/MajorQuestionChoiceRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/MajorQuestionChoiceRepository.java similarity index 62% rename from persistence/src/main/java/com/comssa/persistence/question/major/repository/MajorQuestionChoiceRepository.java rename to persistence/src/main/java/com/comssa/persistence/question/repository/MajorQuestionChoiceRepository.java index fd41b867..e9e176fc 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/major/repository/MajorQuestionChoiceRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/MajorQuestionChoiceRepository.java @@ -1,7 +1,7 @@ -package com.comssa.persistence.question.major.repository; +package com.comssa.persistence.question.repository; -import com.comssa.persistence.question.major.domain.common.MajorQuestionChoice; +import com.comssa.persistence.question.domain.major.MajorQuestionChoice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/repository/QuestionChoiceRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionChoiceRepository.java similarity index 64% rename from persistence/src/main/java/com/comssa/persistence/question/common/repository/QuestionChoiceRepository.java rename to persistence/src/main/java/com/comssa/persistence/question/repository/QuestionChoiceRepository.java index 91e15c9c..c67678e8 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/common/repository/QuestionChoiceRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionChoiceRepository.java @@ -1,6 +1,6 @@ -package com.comssa.persistence.question.common.repository; +package com.comssa.persistence.question.repository; -import com.comssa.persistence.question.common.domain.QuestionChoice; +import com.comssa.persistence.question.domain.common.QuestionChoice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/persistence/src/main/java/com/comssa/persistence/question/common/repository/QuestionRepository.java b/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionRepository.java similarity index 83% rename from persistence/src/main/java/com/comssa/persistence/question/common/repository/QuestionRepository.java rename to persistence/src/main/java/com/comssa/persistence/question/repository/QuestionRepository.java index 94649ec4..59611ae5 100644 --- a/persistence/src/main/java/com/comssa/persistence/question/common/repository/QuestionRepository.java +++ b/persistence/src/main/java/com/comssa/persistence/question/repository/QuestionRepository.java @@ -1,6 +1,6 @@ -package com.comssa.persistence.question.common.repository; +package com.comssa.persistence.question.repository; -import com.comssa.persistence.question.common.domain.Question; +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; 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 new file mode 100644 index 00000000..0f115916 --- /dev/null +++ b/persistence/src/main/java/com/comssa/persistence/question/service/QuestionRepositoryService.java @@ -0,0 +1,32 @@ +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); + } +}