feat :: (#22) 주간 업무 보고 수정 api

feat :: (#22) 주간 업무 보고 수정 api

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

@@ -0,0 +1,15 @@
+package com.kodomo.juganbbojjak.domain.work_report.dto.request
+
+import java.util.UUID
+
+data class UpdateWorkReportRequest(
+    val workReportId: UUID,
+    val title: String,
+    val workReportDetails: List<UpdateWorkReportDetailsRequest>
+)
+
+data class UpdateWorkReportDetailsRequest(
+    val workDetailId: UUID,
+    val contentKey: String,
+    val contentValue: String
+)

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/exception/WorkDetailNotFoundException.kt

@@ -0,0 +1,8 @@
+package com.kodomo.juganbbojjak.domain.work_report.exception
+
+import com.kodomo.juganbbojjak.common.error.JuGanBbojjakException
+import com.kodomo.juganbbojjak.domain.work_report.exception.error.WorkReportErrorCode
+
+object WorkDetailNotFoundException : JuGanBbojjakException(
+    WorkReportErrorCode.WORK_DETAIL_NOT_FOUND
+)

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/exception/error/WorkReportErrorCode.kt

@@ -8,5 +8,6 @@ enum class WorkReportErrorCode(
 ) : ErrorProperty {
 
     WEEKLY_WORK_REPORT_NOT_FOUND(404, "Weekly Work Report Not Found"),
-    WORK_REPORT_NOT_FOUND(404, "Work Report Not Found")
+    WORK_REPORT_NOT_FOUND(404, "Work Report Not Found"),
+    WORK_DETAIL_NOT_FOUND(404, "Work Detail Not Found")
 }

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/model/WorkDetail.kt

@@ -1,10 +1,11 @@
 package com.kodomo.juganbbojjak.domain.work_report.model
 
 import com.kodomo.juganbbojjak.common.annotation.Aggregate
+import com.kodomo.juganbbojjak.domain.work_report.dto.request.UpdateWorkReportDetailsRequest
 import java.util.UUID
 
 @Aggregate
-class WorkDetail(
+data class WorkDetail(
 
     val id: UUID = UUID.randomUUID(),
 
@@ -15,4 +16,14 @@ class WorkDetail(
     val type: WorkDetailType,
 
     val workReportId: UUID
-)
+) {
+
+    fun updateWorkDetail(updateWorkReportDetails: UpdateWorkReportDetailsRequest): WorkDetail =
+        WorkDetail(
+            id = id,
+            title = updateWorkReportDetails.contentKey,
+            content = updateWorkReportDetails.contentValue,
+            workReportId = workReportId,
+            type = type
+        )
+}

JuGanBbojjak-application/src/main/kotlin/com/kodomo/juganbbojjak/domain/work_report/model/WorkReport.kt

@@ -4,7 +4,7 @@ import com.kodomo.juganbbojjak.common.annotation.Aggregate
 import java.util.UUID
 
 @Aggregate
-class WorkReport (
+data class WorkReport(
 
     val id: UUID = UUID.randomUUID(),
 
@@ -13,4 +13,9 @@ class WorkReport (
     val weeklyWorkReportId: UUID,
 
     val userId: UUID
-)
+) {
+
+    fun updateWorkReport(title: String) = this.copy(
+        title = title
+    )
+}

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

@@ -8,8 +8,10 @@ interface WorkDetailPort : CommandWorkDetailPort, QueryWorkDetailPort
 
 interface CommandWorkDetailPort{
     fun saveAllWorkDetails(workDetails: List<WorkDetail>)
+    fun saveWorkDetail(workDetail: WorkDetail)
 }
 
 interface QueryWorkDetailPort{
     fun queryWorkDetailByWeeklyWorkReportId(weeklyWorkReportId: UUID, userId: UUID?): List<WorkReportDetailsVO>
+    fun queryWorkDetailById(workDetailIdList: UUID): WorkDetail
 }

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

@@ -10,5 +10,5 @@ interface CommandWorkReportPort {
 }
 
 interface QueryWorkReportPort {
-
+    fun queryWorkReportById(workReportId: UUID): WorkReport
 }

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

@@ -0,0 +1,32 @@
+package com.kodomo.juganbbojjak.domain.work_report.usecase
+
+import com.kodomo.juganbbojjak.common.annotation.UseCase
+import com.kodomo.juganbbojjak.domain.work_report.dto.request.UpdateWorkReportRequest
+import com.kodomo.juganbbojjak.domain.work_report.spi.CommandWorkDetailPort
+import com.kodomo.juganbbojjak.domain.work_report.spi.CommandWorkReportPort
+import com.kodomo.juganbbojjak.domain.work_report.spi.QueryWorkDetailPort
+import com.kodomo.juganbbojjak.domain.work_report.spi.QueryWorkReportPort
+
+@UseCase
+class UpdateWorkReportUseCase(
+    private val queryWorkReportPort: QueryWorkReportPort,
+    private val commandWorkReportPort: CommandWorkReportPort,
+    private val queryWorkDetailPort: QueryWorkDetailPort,
+    private val commandWorkDetailPort: CommandWorkDetailPort
+) {
+
+    fun execute(request: UpdateWorkReportRequest) {
+        val workReportEntity = queryWorkReportPort.queryWorkReportById(request.workReportId)
+
+        commandWorkReportPort.saveWorkReport(workReportEntity.updateWorkReport(request.title))
+
+        request.workReportDetails.forEach { workReportDetails ->
+            val workDetailList =
+                queryWorkDetailPort.queryWorkDetailById(workReportDetails.workDetailId)
+
+            commandWorkDetailPort.saveWorkDetail(
+                workDetailList.updateWorkDetail(workReportDetails)
+            )
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.kodomo.juganbbojjak.domain.work_report.persistence
 
+import com.kodomo.juganbbojjak.domain.work_report.exception.WorkDetailNotFoundException
 import com.kodomo.juganbbojjak.domain.work_report.model.WorkDetail
 import com.kodomo.juganbbojjak.domain.work_report.persistence.entity.QWorkDetailEntity.workDetailEntity
 import com.kodomo.juganbbojjak.domain.work_report.persistence.entity.QWorkReportEntity.workReportEntity
@@ -9,11 +10,11 @@ import com.kodomo.juganbbojjak.domain.work_report.persistence.vo.QQueryWorkRepor
 import com.kodomo.juganbbojjak.domain.work_report.spi.WorkDetailPort
 import com.kodomo.juganbbojjak.domain.work_report.spi.vo.WorkReportDetailsVO
 import com.kodomo.juganbbojjak.global.annotation.Adapter
-import com.querydsl.core.group.GroupBy
 import com.querydsl.core.group.GroupBy.groupBy
 import com.querydsl.core.group.GroupBy.list
 import com.querydsl.core.types.dsl.BooleanExpression
 import com.querydsl.jpa.impl.JPAQueryFactory
+import org.springframework.data.repository.findByIdOrNull
 import java.util.*
 
 @Adapter
@@ -57,5 +58,17 @@ class WorkDetailPersistenceAdapter(
             workReportEntity.userEntity.id.eq(userId)
         else null
 
+    override fun queryWorkDetailById(workDetailIdList: UUID): WorkDetail {
+        return workDetailMapper.toDomain(
+            workDetailRepository.findByIdOrNull(workDetailIdList)
+                ?: throw WorkDetailNotFoundException
+        )
+
+    }
 
+    override fun saveWorkDetail(workDetail: WorkDetail) {
+        workDetailRepository.save(
+            workDetailMapper.toEntity(workDetail)
+        )
+    }
 }

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

@@ -1,23 +1,18 @@
 package com.kodomo.juganbbojjak.domain.work_report.persistence
 
+import com.kodomo.juganbbojjak.domain.work_report.exception.WorkReportNotFoundException
 import com.kodomo.juganbbojjak.domain.work_report.model.WorkReport
-import com.kodomo.juganbbojjak.domain.work_report.persistence.entity.QWorkReportEntity.workReportEntity
 import com.kodomo.juganbbojjak.domain.work_report.persistence.mapper.WorkReportMapper
 import com.kodomo.juganbbojjak.domain.work_report.persistence.repository.WorkReportRepository
-import com.kodomo.juganbbojjak.domain.work_report.persistence.vo.QQueryWorkReportDetailsVO
 import com.kodomo.juganbbojjak.domain.work_report.spi.WorkReportPort
-import com.kodomo.juganbbojjak.domain.work_report.spi.vo.WorkReportDetailsVO
 import com.kodomo.juganbbojjak.global.annotation.Adapter
-import com.querydsl.core.types.dsl.BooleanExpression
-import com.querydsl.jpa.impl.JPAQueryFactory
+import org.springframework.data.repository.findByIdOrNull
 import java.util.*
-import kotlin.collections.List
 
 @Adapter
 class WorkReportPersistenceAdapter(
     private val workReportRepository: WorkReportRepository,
     private val workReportMapper: WorkReportMapper,
-    private val queryFactory: JPAQueryFactory
 ) : WorkReportPort {
 
     override fun saveWorkReport(workReport: WorkReport): WorkReport =
@@ -27,4 +22,10 @@ class WorkReportPersistenceAdapter(
             )
         )
 
+    override fun queryWorkReportById(workReportId: UUID): WorkReport =
+        workReportMapper.toDomain(
+            workReportRepository.findByIdOrNull(workReportId)
+                ?: throw WorkReportNotFoundException
+        )
+
 }

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

@@ -5,5 +5,5 @@ import org.springframework.data.jpa.repository.JpaRepository
 import java.util.UUID
 
 interface WorkReportRepository : JpaRepository<WorkReportEntity, UUID> {
-    fun findByWeeklyWorkReportEntityId(weeklyWorkReportId: UUID): WorkReportEntity
+
 }

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

@@ -2,13 +2,16 @@ 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.CreateWorkReportWebRequest
+import com.kodomo.juganbbojjak.domain.work_report.presentation.dto.UpdateWorkReportWebRequest
 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
 import jakarta.validation.Valid
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.PutMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.ResponseStatus
@@ -19,7 +22,8 @@ import java.util.UUID
 @RestController
 class WorkReportWebAdapter(
     private val createWorkReportUseCase: CreateWorkReportUseCase,
-    private val queryWorkReportDetailsUseCase: QueryWorkReportDetailsUseCase
+    private val queryWorkReportDetailsUseCase: QueryWorkReportDetailsUseCase,
+    private val updateWorkReportUseCase: UpdateWorkReportUseCase
 ) {
 
     @ResponseStatus(HttpStatus.CREATED)
@@ -35,4 +39,10 @@ class WorkReportWebAdapter(
     fun queryWorkDetails(@PathVariable("weekly-work-report-id") weeklyWorkReportId: UUID): QueryWorkReportDetailsResponse =
         queryWorkReportDetailsUseCase.execute(weeklyWorkReportId)
 
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @PutMapping
+    fun updateWorkReport(@RequestBody request: UpdateWorkReportWebRequest) {
+        updateWorkReportUseCase.execute(request.toDomainRequest())
+    }
+
 }

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

@@ -0,0 +1,42 @@
+package com.kodomo.juganbbojjak.domain.work_report.presentation.dto
+
+import com.kodomo.juganbbojjak.domain.work_report.dto.request.UpdateWorkReportDetailsRequest
+import com.kodomo.juganbbojjak.domain.work_report.dto.request.UpdateWorkReportRequest
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
+import java.util.*
+
+data class UpdateWorkReportWebRequest(
+
+    @NotBlank
+    val workReportId: UUID,
+
+    @NotBlank
+    val title: String,
+
+    val workReportDetails: List<@NotNull UpdateWorkReportDetailsWebRequest>
+) {
+    fun toDomainRequest() = UpdateWorkReportRequest(
+        workReportId = workReportId,
+        title = title,
+        workReportDetails = workReportDetails.map {
+            UpdateWorkReportDetailsRequest(
+                workDetailId = it.workDetailId,
+                contentKey = it.contentKey,
+                contentValue = it.contentValue
+            )
+        }
+    )
+}
+
+data class UpdateWorkReportDetailsWebRequest(
+
+    @NotBlank
+    val workDetailId: UUID,
+
+    @NotBlank
+    val contentKey: String,
+
+    @NotBlank
+    val contentValue: String
+)