fix: admissions 프론트에 맞게 협의

wafflestudio · Sep 5, 2023 · 2079186 · 2079186
1 parent a3e803f
commit 2079186
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/files/1693921307331_image.png b/files/1693921307331_image.png
diff --git a/files/1693921307940_pdf하나.pdf.pdf b/files/1693921307940_pdf하나.pdf.pdf
diff --git a/files/1693921308012_pdf둘.pdf.pdf b/files/1693921308012_pdf둘.pdf.pdf
diff --git a/files/thumbnail_1693921307331_image.png b/files/thumbnail_1693921307331_image.png
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/admissions/api/AdmissionsController.kt b/src/main/kotlin/com/wafflestudio/csereal/core/admissions/api/AdmissionsController.kt
@@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RestController
 class AdmissionsController(
     private val admissionsService: AdmissionsService
 ) {
-    @PostMapping("/undergraduate")
+    @PostMapping("/undergraduate/{postType}")
     fun createUndergraduateAdmissions(
-        @RequestParam postType: String,
+        @PathVariable postType: String,
         @Valid @RequestBody request: AdmissionsDto
     ) : AdmissionsDto {
         return admissionsService.createUndergraduateAdmissions(postType, request)
@@ -32,9 +32,9 @@ class AdmissionsController(
         return admissionsService.createGraduateAdmissions(request)
     }
 
-    @GetMapping("/undergraduate")
+    @GetMapping("/undergraduate/{postType}")
     fun readUndergraduateAdmissions(
-        @RequestParam postType: String
+        @PathVariable postType: String
     ) : ResponseEntity<AdmissionsDto> {
         return ResponseEntity.ok(admissionsService.readUndergraduateAdmissions(postType))
     }

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/admissions/database/AdmissionsEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/admissions/database/AdmissionsEntity.kt
@@ -10,14 +10,14 @@ import jakarta.persistence.Enumerated
 class AdmissionsEntity(
     @Enumerated(EnumType.STRING)
     val postType: AdmissionsPostType,
-    val title: String,
+    val pageName: String,
     val description: String,
 ): BaseTimeEntity() {
     companion object {
         fun of(postType: AdmissionsPostType, admissionsDto: AdmissionsDto) : AdmissionsEntity {
             return AdmissionsEntity(
                 postType = postType,
-                title = admissionsDto.title,
+                pageName = admissionsDto.pageName,
                 description = admissionsDto.description,
             )
         }

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/admissions/dto/AdmissionsDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/admissions/dto/AdmissionsDto.kt
@@ -5,7 +5,7 @@ import java.time.LocalDateTime
 
 data class AdmissionsDto(
     val id: Long,
-    val title: String,
+    val pageName: String,
     val description: String,
     val createdAt: LocalDateTime?,
     val modifiedAt: LocalDateTime?,
@@ -14,7 +14,7 @@ data class AdmissionsDto(
         fun of(entity: AdmissionsEntity) : AdmissionsDto = entity.run {
             AdmissionsDto(
                 id = this.id,
-                title = this.title,
+                pageName = this.pageName,
                 description = this.description,
                 createdAt = this.createdAt,
                 modifiedAt = this.modifiedAt,