merge :: (#28) 주간 업무 보고, 주간 행사 일정 생성 api

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/event_schedule/dto/CreateWeeklyEventScheduleRequest.kt

@@ -0,0 +1,8 @@
+package com.kodomo.juganbbojjak.domain.event_schedule.dto
+
+import java.time.LocalDate
+
+data class CreateWeeklyEventScheduleRequest(
+    val startDate: LocalDate,
+    val endDate: LocalDate,
+)

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/event_schedule/model/WeeklyEventSchedule.kt

@@ -6,7 +6,7 @@ import java.util.UUID
 
 @Aggregate
 data class WeeklyEventSchedule(
-   val id: UUID,
+   val id: UUID = UUID.randomUUID(),
     val startDate: LocalDate,
     val endDate: LocalDate,
 )

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/event_schedule/spi/EventSchedulePort.kt

@@ -19,4 +19,5 @@ interface QueryEventSchedulePort {
 interface CommandEventSchedulePort {
     fun saveAllEventSchedule(eventSchedule: List<EventSchedule>)
     fun saveEventSchedule(eventSchedule: EventSchedule)
+    fun saveWeeklyEventSchedule(weeklyEventSchedule: WeeklyEventSchedule): WeeklyEventSchedule
 }

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/event_schedule/usecase/CreateWeeklyEventScheduleUseCase.kt

@@ -0,0 +1,21 @@
+package com.kodomo.juganbbojjak.domain.event_schedule.usecase
+
+import com.kodomo.juganbbojjak.common.annotation.UseCase
+import com.kodomo.juganbbojjak.domain.event_schedule.dto.CreateWeeklyEventScheduleRequest
+import com.kodomo.juganbbojjak.domain.event_schedule.model.WeeklyEventSchedule
+import com.kodomo.juganbbojjak.domain.event_schedule.spi.CommandEventSchedulePort
+
+@UseCase
+class CreateWeeklyEventScheduleUseCase(
+    private val commandEventSchedulePort: CommandEventSchedulePort,
+) {
+
+    fun execute(request: CreateWeeklyEventScheduleRequest) {
+        commandEventSchedulePort.saveWeeklyEventSchedule(
+            WeeklyEventSchedule(
+                startDate = request.startDate,
+                endDate = request.endDate,
+            )
+        )
+    }
+}

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/dto/CreateWeeklyWorkReportRequest.kt

@@ -0,0 +1,8 @@
+package com.kodomo.juganbbojjak.domain.work_report.dto
+
+import java.time.LocalDate
+
+data class CreateWeeklyWorkReportRequest(
+    val startDate: LocalDate,
+    val endDate: LocalDate,
+)

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/spi/WeeklyWorkReportPort.kt

@@ -6,7 +6,7 @@ import java.util.UUID
 interface WeeklyWorkReportPort : CommandWeeklyWorkReportPort, QueryWeeklyWorkReportPort
 
 interface CommandWeeklyWorkReportPort {
-
+    fun saveWeeklyWorkReport(weeklyWorkReport: WeeklyWorkReport)
 }
 
 interface QueryWeeklyWorkReportPort {

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/spi/WorkReportPort.kt

@@ -1,5 +1,6 @@
 package com.kodomo.juganbbojjak.domain.work_report.spi
 
+import com.kodomo.juganbbojjak.domain.work_report.model.WeeklyWorkReport
 import com.kodomo.juganbbojjak.domain.work_report.model.WorkReport
 import java.util.UUID
 

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/usecase/CreateWeeklyWorkReportUseCase.kt

@@ -0,0 +1,21 @@
+package com.kodomo.juganbbojjak.domain.work_report.usecase
+
+import com.kodomo.juganbbojjak.common.annotation.UseCase
+import com.kodomo.juganbbojjak.domain.work_report.dto.CreateWeeklyWorkReportRequest
+import com.kodomo.juganbbojjak.domain.work_report.model.WeeklyWorkReport
+import com.kodomo.juganbbojjak.domain.work_report.spi.CommandWeeklyWorkReportPort
+
+@UseCase
+class CreateWeeklyWorkReportUseCase(
+    private val commandWorkReportPort: CommandWeeklyWorkReportPort,
+) {
+
+    fun execute(request: CreateWeeklyWorkReportRequest) {
+        commandWorkReportPort.saveWeeklyWorkReport(
+            WeeklyWorkReport(
+                startDate = request.startDate,
+                endDate = request.endDate,
+            )
+        )
+    }
+}

JuGanBbojjak-infrastructure/src/main/kotlin/com/kodomo/juganbbojjak/domain/event_schedule/persistence/EvenSchedulePersistenceAdapter.kt

@@ -56,12 +56,17 @@ class EvenSchedulePersistenceAdapter(
         eventScheduleJpaRepository.save(eventScheduleMapper.toEntity(eventSchedule))
     }
 
+    override fun saveWeeklyEventSchedule(weeklyEventSchedule: WeeklyEventSchedule): WeeklyEventSchedule = weeklyEventScheduleMapper.toDomain(
+            weeklyEventScheduleJpaRepository.save(weeklyEventScheduleMapper.toEntity(weeklyEventSchedule))
+    )!!
+
     //==condition==//
 
     private fun eqUserId(userId: UUID?): BooleanExpression? =
         if (userId != null)
             eventScheduleEntity.userEntity.id.eq(userId)
         else null
+
     override fun queryAllEventScheduleList(): List<WeeklyEventSchedule> {
         val weeklyEventScheduleEntity = weeklyEventScheduleJpaRepository.findAllByOrderByEndDateDesc()
 

JuGanBbojjak-infrastructure/src/main/kotlin/com/kodomo/juganbbojjak/domain/event_schedule/presentation/EventScheduleWebAdapter.kt

@@ -2,8 +2,10 @@ package com.kodomo.juganbbojjak.domain.event_schedule.presentation
 
 import com.kodomo.juganbbojjak.domain.event_schedule.dto.response.QueryEventScheduleDetailResponse
 import com.kodomo.juganbbojjak.domain.event_schedule.presentation.dto.CreateEvenScheduleWebRequest
+import com.kodomo.juganbbojjak.domain.event_schedule.presentation.dto.CreateWeeklyEventScheduleWebRequest
 import com.kodomo.juganbbojjak.domain.event_schedule.presentation.dto.UpdateEventScheduleWebRequest
 import com.kodomo.juganbbojjak.domain.event_schedule.usecase.CreateEvenScheduleUseCase
+import com.kodomo.juganbbojjak.domain.event_schedule.usecase.CreateWeeklyEventScheduleUseCase
 import com.kodomo.juganbbojjak.domain.event_schedule.usecase.QueryEventScheduleDetailUseCase
 import com.kodomo.juganbbojjak.domain.event_schedule.usecase.UpdateEventScheduleUseCase
 import jakarta.validation.Valid
@@ -24,6 +26,7 @@ class EventScheduleWebAdapter(
     private val createEvenScheduleUseCase: CreateEvenScheduleUseCase,
     private val queryEventScheduleDetailUseCase: QueryEventScheduleDetailUseCase,
     private val updateEventScheduleUseCase: UpdateEventScheduleUseCase,
+    private val createWeeklyEventScheduleUseCase: CreateWeeklyEventScheduleUseCase,
 ) {
 
     @ResponseStatus(HttpStatus.CREATED)
@@ -48,4 +51,12 @@ class EventScheduleWebAdapter(
     ) {
         updateEventScheduleUseCase.execute(eventScheduleId, request.toDomainRequest())
     }
+
+    @ResponseStatus(HttpStatus.CREATED)
+    @PostMapping
+    fun createWeeklyEventSchedule(
+        @RequestBody @Valid request: CreateWeeklyEventScheduleWebRequest,
+    ) {
+        createWeeklyEventScheduleUseCase.execute(request.toDomainRequest())
+    }
 }

JuGanBbojjak-infrastructure/src/main/kotlin/com/kodomo/juganbbojjak/domain/event_schedule/presentation/dto/CreateWeeklyEventScheduleWebRequest.kt

@@ -0,0 +1,20 @@
+package com.kodomo.juganbbojjak.domain.event_schedule.presentation.dto
+
+import com.kodomo.juganbbojjak.domain.event_schedule.dto.CreateWeeklyEventScheduleRequest
+import org.jetbrains.annotations.NotNull
+import java.time.LocalDate
+
+data class CreateWeeklyEventScheduleWebRequest(
+
+    @field:NotNull
+    val startDate: LocalDate,
+
+    @field:NotNull
+    val endDate: LocalDate,
+) {
+
+    fun toDomainRequest() = CreateWeeklyEventScheduleRequest(
+        startDate = startDate,
+        endDate = endDate,
+    )
+}

JuGanBbojjak-infrastructure/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/persistence/WeeklyWorkReportPersistenceAdapter.kt

@@ -15,6 +15,10 @@ class WeeklyWorkReportPersistenceAdapter(
     private val weeklyWorkReportMapper: WeeklyWorkReportMapper
 ) : WeeklyWorkReportPort {
 
+    override fun saveWeeklyWorkReport(weeklyWorkReport: WeeklyWorkReport) {
+        weeklyWorkReportRepository.save(weeklyWorkReportMapper.toEntity(weeklyWorkReport))
+    }
+
     override fun queryWeeklyWorkReportById(weeklyWorkReportId: UUID): WeeklyWorkReport =
         weeklyWorkReportMapper.toDomain(
             weeklyWorkReportRepository.findByIdOrNull(weeklyWorkReportId)

JuGanBbojjak-infrastructure/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/presentation/WorkReportWebAdapter.kt

@@ -1,8 +1,10 @@
 package com.kodomo.juganbbojjak.domain.work_report.presentation
 
 import com.kodomo.juganbbojjak.domain.work_report.dto.response.QueryWorkReportDetailsResponse
+import com.kodomo.juganbbojjak.domain.work_report.presentation.dto.CreateWeeklyWorkReportWebRequest
 import com.kodomo.juganbbojjak.domain.work_report.presentation.dto.CreateWorkReportWebRequest
 import com.kodomo.juganbbojjak.domain.work_report.presentation.dto.UpdateWorkReportWebRequest
+import com.kodomo.juganbbojjak.domain.work_report.usecase.CreateWeeklyWorkReportUseCase
 import com.kodomo.juganbbojjak.domain.work_report.usecase.CreateWorkReportUseCase
 import com.kodomo.juganbbojjak.domain.work_report.usecase.QueryWorkReportDetailsUseCase
 import com.kodomo.juganbbojjak.domain.work_report.usecase.UpdateWorkReportUseCase
@@ -23,7 +25,8 @@ import java.util.UUID
 class WorkReportWebAdapter(
     private val createWorkReportUseCase: CreateWorkReportUseCase,
     private val queryWorkReportDetailsUseCase: QueryWorkReportDetailsUseCase,
-    private val updateWorkReportUseCase: UpdateWorkReportUseCase
+    private val updateWorkReportUseCase: UpdateWorkReportUseCase,
+    private val createWeeklyWorkReportUseCase: CreateWeeklyWorkReportUseCase,
 ) {
 
     @ResponseStatus(HttpStatus.CREATED)
@@ -45,4 +48,11 @@ class WorkReportWebAdapter(
         updateWorkReportUseCase.execute(request.toDomainRequest())
     }
 
+    @ResponseStatus(HttpStatus.CREATED)
+    @PostMapping
+    fun createWeeklyWorkReport(
+        @RequestBody @Valid request: CreateWeeklyWorkReportWebRequest
+    ) {
+        createWeeklyWorkReportUseCase.execute(request.toDomainRequest())
+    }
 }

JuGanBbojjak-infrastructure/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/presentation/dto/CreateWeeklyWorkReportWebRequest.kt

@@ -0,0 +1,20 @@
+package com.kodomo.juganbbojjak.domain.work_report.presentation.dto
+
+import com.kodomo.juganbbojjak.domain.work_report.dto.CreateWeeklyWorkReportRequest
+import org.jetbrains.annotations.NotNull
+import java.time.LocalDate
+
+data class CreateWeeklyWorkReportWebRequest(
+
+    @field:NotNull
+    val startDate: LocalDate,
+
+    @field:NotNull
+    val endDate: LocalDate,
+) {
+
+    fun toDomainRequest() = CreateWeeklyWorkReportRequest(
+        startDate = startDate,
+        endDate = endDate,
+    )
+}

JuGanBbojjak-infrastructure/src/main/kotlin/com/kodomo/juganbbojjak/global/security/SecurityConfig.kt

@@ -34,9 +34,11 @@ class SecurityConfig(
                     .requestMatchers(HttpMethod.POST, "/event_schedules/{weekly-event-schedule-id}").hasAuthority(USER.name)
                     .requestMatchers(HttpMethod.GET, "/event_schedules/{weekly-event-schedule-id}").hasAnyAuthority(ADMIN.name, USER.name)
                     .requestMatchers(HttpMethod.PUT, "/event_schedules/{event-schedule-id}").hasAnyAuthority(ADMIN.name, USER.name)
+                    .requestMatchers(HttpMethod.POST, "/event_schedules").hasAuthority(ADMIN.name)
 
                     .requestMatchers(HttpMethod.POST, "/work_report/{weekly-work-report-id}").hasAuthority(USER.name)
                     .requestMatchers(HttpMethod.GET, "/work_report/{weekly-work-report-id}").hasAnyAuthority(USER.name, ADMIN.name)
+                    .requestMatchers(HttpMethod.POST, "/work_report").hasAuthority(ADMIN.name)
 
                     .requestMatchers(HttpMethod.GET, "/main").hasAnyAuthority(USER.name, ADMIN.name)
                     .requestMatchers(HttpMethod.GET, "/main/latest_work").hasAuthority(USER.name)