From 9307479e776f5dd7aa8072718c45aa159ba5ba16 Mon Sep 17 00:00:00 2001 From: leeeryboy Date: Fri, 16 Aug 2024 19:11:01 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/academics/api/v1/AcademicsController.kt | 12 ++---------- .../core/academics/api/v2/AcademicsController.kt | 9 +++++++++ 2 files changed, 11 insertions(+), 10 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 index 268febdb..e2614712 100644 --- 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 @@ -3,7 +3,6 @@ package com.wafflestudio.csereal.core.academics.api.v1 import com.wafflestudio.csereal.common.aop.AuthenticatedStaff import com.wafflestudio.csereal.common.enums.LanguageType import com.wafflestudio.csereal.core.academics.api.req.CreateYearReq -import com.wafflestudio.csereal.core.academics.api.req.UpdateScholarshipPageReq import com.wafflestudio.csereal.core.academics.api.req.UpdateSingleReq import com.wafflestudio.csereal.core.academics.api.req.UpdateYearReq import com.wafflestudio.csereal.core.academics.dto.* @@ -87,7 +86,7 @@ class AcademicsController( ) = academicsService.deleteAcademicsYearResponse(language, studentType, postType, year) //교과목 정보 - + @Deprecated(message = "Use V2 API") @GetMapping("/{studentType}/courses") fun readAllCourses( @RequestParam(required = false, defaultValue = "ko") language: String, @@ -111,14 +110,6 @@ class AcademicsController( @RequestPart newAttachments: List? ) = academicsService.updateDegreeRequirements(language, request, newAttachments) - @AuthenticatedStaff - @PutMapping("/{studentType}/scholarship") - fun updateScholarshipPage( - @RequestParam(required = false, defaultValue = "ko") language: String, - @PathVariable studentType: String, - @RequestBody request: UpdateScholarshipPageReq - ) = academicsService.updateScholarshipPage(language, studentType, request) - @GetMapping("/{studentType}/scholarship") fun readAllScholarship( @RequestParam(required = false, defaultValue = "ko") language: String, @@ -127,6 +118,7 @@ class AcademicsController( return ResponseEntity.ok(academicsService.readAllScholarship(language, studentType)) } + @Deprecated(message = "Use V2 API") @GetMapping("/scholarship/{scholarshipId}") fun getScholarship( @PathVariable scholarshipId: Long diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v2/AcademicsController.kt b/src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v2/AcademicsController.kt index 63415cf9..9b49555f 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v2/AcademicsController.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v2/AcademicsController.kt @@ -2,6 +2,7 @@ package com.wafflestudio.csereal.core.academics.api.v2 import com.wafflestudio.csereal.common.aop.AuthenticatedStaff import com.wafflestudio.csereal.core.academics.api.req.CreateScholarshipReq +import com.wafflestudio.csereal.core.academics.api.req.UpdateScholarshipPageReq import com.wafflestudio.csereal.core.academics.api.req.UpdateScholarshipReq import com.wafflestudio.csereal.core.academics.dto.GroupedCourseDto import com.wafflestudio.csereal.core.academics.dto.ScholarshipDto @@ -57,4 +58,12 @@ class AcademicsController( @AuthenticatedStaff @DeleteMapping("/scholarship/{scholarshipId}") fun deleteScholarship(@PathVariable scholarshipId: Long) = academicsService.deleteScholarship(scholarshipId) + + @AuthenticatedStaff + @PutMapping("/{studentType}/scholarship") + fun updateScholarshipPage( + @RequestParam(required = false, defaultValue = "ko") language: String, + @PathVariable studentType: String, + @RequestBody request: UpdateScholarshipPageReq + ) = academicsService.updateScholarshipPage(language, studentType, request) }