prod (#313)

* 교과목 정렬, 쿠키 secure 옵션 추가 (#308)

* feat: 교과목 정렬

* feat: 쿠키 secure 옵션 추가

* referrer policy 헤더 추가 (#311)

* referrer policy 헤더 추가

* 헤더 수정

* feat: scholarship CRUD (#309)

* feat: scholarship CRUD

* 불필요한 라인 삭제

* 리뷰 반영

* Update deploy_dev.yaml

* 강의실 예약 제한 (#312)

Author: leeeryboy

.github/workflows/deploy_dev.yaml

@@ -12,7 +12,7 @@ on:
             - settings.gradle.kts
             - src/**
             - gradle/**
-            - .github/workflows/deploy.yaml
+            - .github/workflows/deploy_dev.yaml
 
 jobs:
     build-and-deploy:
@@ -63,15 +63,15 @@ jobs:
                     # echo "SLACK_TOKEN=${{secrets.SLACK_TOKEN}}" >> .env
                     # echo "SLACK_CHANNEL=${{secrets.SLACK_CHANNEL}}" >> .env
 
-            -   name: SCP Command to Transfer Files
-                uses: appleboy/[email protected]
-                with:
-                    host: ${{secrets.SSH_HOST_DEV}}
-                    username: ${{secrets.SSH_USER}}
-                    key: ${{secrets.SSH_KEY}}
-                    source: "docker-compose-backend.yml, .env"
-                    target: "~/app"
-                    overwrite: true
+            # -   name: SCP Command to Transfer Files
+            #     uses: appleboy/[email protected]
+            #     with:
+            #         host: ${{secrets.SSH_HOST_DEV}}
+            #         username: ${{secrets.SSH_USER}}
+            #         key: ${{secrets.SSH_KEY}}
+            #         source: "docker-compose-backend.yml, .env"
+            #         target: "~/app"
+            #         overwrite: true
             -   name: SSH Remote Commands
                 uses: appleboy/[email protected]
                 with:

src/main/kotlin/com/wafflestudio/csereal/common/config/SecurityConfig.kt

@@ -15,6 +15,7 @@ import org.springframework.security.core.Authentication
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler
+import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter
 import org.springframework.web.cors.CorsConfiguration
 import org.springframework.web.cors.CorsConfigurationSource
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource
@@ -59,6 +60,11 @@ class SecurityConfig(
                     .requestMatchers("/api/v1/login").authenticated()
                     .anyRequest().permitAll()
             }
+            .headers { header ->
+                header.referrerPolicy {
+                    it.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
+                }
+            }
             .build()
     }
 

src/main/kotlin/com/wafflestudio/csereal/core/academics/api/req/CreateScholarshipReq.kt

@@ -0,0 +1,8 @@
+package com.wafflestudio.csereal.core.academics.api.req
+
+data class CreateScholarshipReq(
+    val koName: String,
+    val koDescription: String,
+    val enName: String,
+    val enDescription: String
+)

src/main/kotlin/com/wafflestudio/csereal/core/academics/api/req/UpdateScholarshipPageReq.kt

@@ -0,0 +1,5 @@
+package com.wafflestudio.csereal.core.academics.api.req
+
+data class UpdateScholarshipPageReq(
+    val description: String
+)

src/main/kotlin/com/wafflestudio/csereal/core/academics/api/req/UpdateScholarshipReq.kt

@@ -0,0 +1,8 @@
+package com.wafflestudio.csereal.core.academics.api.req
+
+import com.wafflestudio.csereal.core.academics.dto.ScholarshipDto
+
+class UpdateScholarshipReq(
+    val ko: ScholarshipDto,
+    val en: ScholarshipDto
+)

src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v1/AcademicsController.kt

@@ -86,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,
@@ -110,16 +110,6 @@ class AcademicsController(
         @RequestPart newAttachments: List<MultipartFile>?
     ) = academicsService.updateDegreeRequirements(language, request, newAttachments)
 
-    @AuthenticatedStaff
-    @PostMapping("/{studentType}/scholarshipDetail")
-    fun createScholarshipDetail(
-        @PathVariable studentType: String,
-        @Valid @RequestBody
-        request: ScholarshipDto
-    ): ResponseEntity<ScholarshipDto> {
-        return ResponseEntity.ok(academicsService.createScholarshipDetail(studentType, request))
-    }
-
     @GetMapping("/{studentType}/scholarship")
     fun readAllScholarship(
         @RequestParam(required = false, defaultValue = "ko") language: String,
@@ -128,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

src/main/kotlin/com/wafflestudio/csereal/core/academics/api/v2/AcademicsController.kt

@@ -1,7 +1,11 @@
 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
 import com.wafflestudio.csereal.core.academics.service.AcademicsService
 import jakarta.validation.Valid
 import org.springframework.web.bind.annotation.*
@@ -20,8 +24,11 @@ class AcademicsController(
     ) = academicsService.createCourse(request)
 
     @GetMapping("/courses")
-    fun readAllGroupedCourses(@RequestParam studentType: String): List<GroupedCourseDto> =
-        academicsService.readAllGroupedCourses(studentType)
+    fun readAllGroupedCourses(
+        @RequestParam studentType: String,
+        @RequestParam(required = false, defaultValue = "ko") sort: String
+    ): List<GroupedCourseDto> =
+        academicsService.readAllGroupedCourses(studentType, sort)
 
     @AuthenticatedStaff
     @PutMapping("/courses")
@@ -30,4 +37,33 @@ class AcademicsController(
     @AuthenticatedStaff
     @DeleteMapping("/courses/{code}")
     fun deleteCourse(@PathVariable code: String) = academicsService.deleteCourse(code)
+
+    @AuthenticatedStaff
+    @PostMapping("/{studentType}/scholarship")
+    fun createScholarship(
+        @PathVariable studentType: String,
+        @Valid @RequestBody
+        request: CreateScholarshipReq
+    ) = academicsService.createScholarship(studentType, request)
+
+    @GetMapping("/scholarship/{scholarshipId}")
+    fun getScholarship(
+        @PathVariable scholarshipId: Long
+    ): Pair<ScholarshipDto, ScholarshipDto> = academicsService.readScholarshipV2(scholarshipId)
+
+    @AuthenticatedStaff
+    @PutMapping("/scholarship")
+    fun updateScholarship(@RequestBody request: UpdateScholarshipReq) = academicsService.updateScholarship(request)
+
+    @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)
 }

src/main/kotlin/com/wafflestudio/csereal/core/academics/database/ScholarshipEntity.kt

@@ -2,7 +2,6 @@ package com.wafflestudio.csereal.core.academics.database
 
 import com.wafflestudio.csereal.common.config.BaseTimeEntity
 import com.wafflestudio.csereal.common.enums.LanguageType
-import com.wafflestudio.csereal.core.academics.dto.ScholarshipDto
 import jakarta.persistence.*
 
 @Entity(name = "scholarship")
@@ -13,10 +12,10 @@ class ScholarshipEntity(
     @Enumerated(EnumType.STRING)
     var language: LanguageType,
 
-    val name: String,
+    var name: String,
 
     @Column(columnDefinition = "text")
-    val description: String,
+    var description: String,
 
     @OneToOne(mappedBy = "scholarship", cascade = [CascadeType.ALL], orphanRemoval = true)
     var academicsSearch: AcademicsSearchEntity? = null
@@ -27,13 +26,14 @@ class ScholarshipEntity(
         fun of(
             languageType: LanguageType,
             studentType: AcademicsStudentType,
-            scholarshipDto: ScholarshipDto
+            name: String,
+            description: String
         ): ScholarshipEntity {
             return ScholarshipEntity(
                 language = languageType,
                 studentType = studentType,
-                name = scholarshipDto.name,
-                description = scholarshipDto.description
+                name = name,
+                description = description
             )
         }
     }

src/main/kotlin/com/wafflestudio/csereal/core/academics/database/ScholarshipLanguageEntity.kt

@@ -0,0 +1,15 @@
+package com.wafflestudio.csereal.core.academics.database
+
+import com.wafflestudio.csereal.common.config.BaseTimeEntity
+import jakarta.persistence.*
+
+@Entity(name = "scholarship_language")
+class ScholarshipLanguageEntity(
+    @OneToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL], orphanRemoval = true)
+    @JoinColumn(name = "korean_id")
+    val koScholarship: ScholarshipEntity,
+
+    @OneToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL], orphanRemoval = true)
+    @JoinColumn(name = "english_id")
+    val enScholarship: ScholarshipEntity
+) : BaseTimeEntity()

src/main/kotlin/com/wafflestudio/csereal/core/academics/database/ScholarshipLanguageRepository.kt

@@ -0,0 +1,8 @@
+package com.wafflestudio.csereal.core.academics.database
+
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface ScholarshipLanguageRepository : JpaRepository<ScholarshipLanguageEntity, Long> {
+    fun findByKoScholarship(koScholarshipEntity: ScholarshipEntity): ScholarshipLanguageEntity?
+    fun findByEnScholarship(enScholarshipEntity: ScholarshipEntity): ScholarshipLanguageEntity?
+}