필수 교양 과목 get api 연도별 api로 통합

wafflestudio · Dec 6, 2024 · 33a3ab7 · 33a3ab7
1 parent 731abc9
commit 33a3ab7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 47 deletions.
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v1/AcademicsController.kt b/src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v1/AcademicsController.kt
@@ -39,13 +39,6 @@ class AcademicsController(
         @RequestPart newAttachments: List<MultipartFile>?
     ) = academicsService.updateGuide(language, studentType, request, newAttachments)
 
-    @GetMapping("/undergraduate/general-studies-requirements")
-    fun readGeneralStudiesRequirements(
-        @RequestParam(required = false, defaultValue = "ko") language: String
-    ): ResponseEntity<GeneralStudiesRequirementsPageResponse> {
-        return ResponseEntity.ok(academicsService.readGeneralStudiesRequirements(language))
-    }
-
     @GetMapping("/{studentType}/{postType}")
     fun readAcademicsYearResponses(
         @RequestParam(required = false, defaultValue = "ko") language: String,

diff --git a/...lin/com/wafflestudio/csereal/core/academics/dto/GeneralStudiesRequirementsPageResponse.kt b/...lin/com/wafflestudio/csereal/core/academics/dto/GeneralStudiesRequirementsPageResponse.kt
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/academics/service/AcademicsService.kt b/src/main/kotlin/com/wafflestudio/csereal/core/academics/service/AcademicsService.kt
@@ -21,7 +21,6 @@ interface AcademicsService {
         postType: String
     ): List<AcademicsYearResponse>
 
-    fun readGeneralStudiesRequirements(language: String): GeneralStudiesRequirementsPageResponse
     fun readDegreeRequirements(language: String): DegreeRequirementsPageResponse
     fun updateDegreeRequirements(language: String, request: UpdateSingleReq, newAttachments: List<MultipartFile>?)
     fun createCourse(request: GroupedCourseDto)
@@ -214,25 +213,6 @@ class AcademicsServiceImpl(
         return academicsYearResponses
     }
 
-    @Transactional(readOnly = true)
-    override fun readGeneralStudiesRequirements(language: String): GeneralStudiesRequirementsPageResponse {
-        val enumLanguageType = LanguageType.makeStringToLanguageType(language)
-        val overview =
-            academicsRepository.findByLanguageAndStudentTypeAndPostTypeAndYear(
-                enumLanguageType,
-                AcademicsStudentType.UNDERGRADUATE,
-                AcademicsPostType.GENERAL_STUDIES_REQUIREMENTS,
-                null
-            ) ?: throw CserealException.Csereal404("General Studies Requirements Not Found")
-        val generalStudiesEntity =
-            academicsRepository.findAllByLanguageAndStudentTypeAndPostTypeOrderByYearDesc(
-                enumLanguageType,
-                AcademicsStudentType.UNDERGRADUATE,
-                AcademicsPostType.GENERAL_STUDIES_REQUIREMENTS
-            ).filter { academicsEntity -> academicsEntity.year != null }
-        return GeneralStudiesRequirementsPageResponse.of(overview, generalStudiesEntity)
-    }
-
     @Transactional(readOnly = true)
     override fun readDegreeRequirements(language: String): DegreeRequirementsPageResponse {
         val enumLanguageType = LanguageType.makeStringToLanguageType(language)