feat: (#251) 휴무표 작성 기간 설정 API 추가

Team-ComIT · Dec 22, 2022 · 0301a82 · 0301a82
1 parent 34896b0
commit 0301a82
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/global/security/SecurityConfig.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/global/security/SecurityConfig.kt
@@ -101,6 +101,7 @@ class SecurityConfig(
             .antMatchers(HttpMethod.GET, "/holidays/annual/count").hasRole(ROLE_COMMON.role)
             .antMatchers(HttpMethod.GET, "/holidays/verification-period").hasRole(ROLE_COMMON.role)
             .antMatchers(HttpMethod.GET, "/holidays/employee").hasRole(ROLE_ADMIN.role)
+            .antMatchers(HttpMethod.PUT, "/holidays/period").hasRole(ROLE_ADMIN.role)
 
             // admins
             .antMatchers(HttpMethod.POST, "/admins/tokens").permitAll()

diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/WebHolidayAdapter.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/WebHolidayAdapter.kt
@@ -9,17 +9,20 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.ResponseStatus
 import org.springframework.web.bind.annotation.RestController
+import team.comit.simtong.domain.holiday.dto.AppointHolidayPeriodRequest
 import team.comit.simtong.domain.holiday.dto.QueryEmployeeHolidayResponse
 import team.comit.simtong.domain.holiday.dto.QueryIndividualHolidaysResponse
 import team.comit.simtong.domain.holiday.dto.QueryIndividualRequest
 import team.comit.simtong.domain.holiday.dto.request.AppointAnnualWebRequest
+import team.comit.simtong.domain.holiday.dto.request.AppointHolidayPeriodWebRequest
 import team.comit.simtong.domain.holiday.dto.request.AppointHolidayWebRequest
-import team.comit.simtong.domain.holiday.dto.request.CancelHolidayRequest
+import team.comit.simtong.domain.holiday.dto.request.CancelHolidayWebRequest
 import team.comit.simtong.domain.holiday.dto.request.ShareHolidayWebRequest
 import team.comit.simtong.domain.holiday.dto.request.WebHolidayQueryType
 import team.comit.simtong.domain.holiday.dto.request.WebHolidayStatus
 import team.comit.simtong.domain.holiday.dto.response.QueryRemainAnnualWebResponse
 import team.comit.simtong.domain.holiday.usecase.AppointAnnualUseCase
+import team.comit.simtong.domain.holiday.usecase.AppointHolidayPeriodUseCase
 import team.comit.simtong.domain.holiday.usecase.AppointHolidayUseCase
 import team.comit.simtong.domain.holiday.usecase.CancelHolidayUseCase
 import team.comit.simtong.domain.holiday.usecase.CheckHolidayPeriodUseCase
@@ -42,6 +45,7 @@ import javax.validation.Valid
 @RestController
 @RequestMapping("/holidays")
 class WebHolidayAdapter(
+    private val appointHolidayPeriodUseCase: AppointHolidayPeriodUseCase,
     private val checkHolidayPeriodUseCase: CheckHolidayPeriodUseCase,
     private val queryRemainAnnualUseCase: QueryRemainAnnualUseCase,
     private val appointAnnualUseCase: AppointAnnualUseCase,
@@ -72,7 +76,7 @@ class WebHolidayAdapter(
     }
 
     @PutMapping("/work")
-    fun cancelHoliday(@RequestBody request: CancelHolidayRequest) {
+    fun cancelHoliday(@RequestBody request: CancelHolidayWebRequest) {
         cancelHolidayUseCase.execute(request.date)
     }
 
@@ -119,4 +123,16 @@ class WebHolidayAdapter(
             teamId = teamId
         )
     }
+
+    @PutMapping("/period")
+    fun appointHolidayPeriod(@Valid @RequestBody request: AppointHolidayPeriodWebRequest) {
+        appointHolidayPeriodUseCase.execute(
+            AppointHolidayPeriodRequest(
+                year = request.year,
+                month = request.month,
+                startAt = request.startAt,
+                endAt = request.endAt
+            )
+        )
+    }
 }
diff --git a/...in/kotlin/team/comit/simtong/domain/holiday/dto/request/AppointHolidayPeriodWebRequest.kt b/...in/kotlin/team/comit/simtong/domain/holiday/dto/request/AppointHolidayPeriodWebRequest.kt
@@ -0,0 +1,29 @@
+package team.comit.simtong.domain.holiday.dto.request
+
+import org.hibernate.validator.constraints.Range
+import java.time.LocalDate
+import javax.validation.constraints.NotNull
+
+/**
+ *
+ * 휴무표 작성 기간 설정을 요청하는 AppointHolidayPeriodWebRequest
+ *
+ * @author Chokyunghyeon
+ * @date 2022/12/22
+ * @version 1.0.0
+ **/
+data class AppointHolidayPeriodWebRequest(
+    @field:NotNull
+    val year: Int,
+
+    @field:NotNull
+    @field:Range(
+        min = 1,
+        max = 12
+    )
+    val month: Int,
+
+    val startAt: LocalDate,
+
+    val endAt: LocalDate
+)