Fix client and add log to 'EmployeeServiceImpl.getWorkingDays'

octopusden · Feb 1, 2024 · 7fe2cf8 · 7fe2cf8
1 parent 0bbf0dc
commit 7fe2cf8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/client/src/main/kotlin/org/octopusden/employee/client/EmployeeServiceClient.kt b/client/src/main/kotlin/org/octopusden/employee/client/EmployeeServiceClient.kt
@@ -41,7 +41,7 @@ interface EmployeeServiceClient {
     @RequestLine("GET customers")
     fun getCustomers(): Set<CustomerDTO>
 
-    @RequestLine("GET employees/working-days&fromDate={fromDate}&toDate={toDate}")
+    @RequestLine("GET employees/working-days?fromDate={fromDate}&toDate={toDate}")
     fun getWorkingDays(
         @Param("fromDate", expander = LocalDateExpander::class) fromDate: LocalDate,
         @Param("toDate", expander = LocalDateExpander::class) toDate: LocalDate

diff --git a/server/src/main/kotlin/org/octopusden/employee/controller/EmployeesController.kt b/server/src/main/kotlin/org/octopusden/employee/controller/EmployeesController.kt
@@ -1,6 +1,7 @@
 package org.octopusden.employee.controller
 
 import org.octopusden.employee.client.common.dto.Employee
+import org.octopusden.employee.client.common.dto.WorkingDaysDTO
 import org.octopusden.employee.service.EmployeeService
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.GetMapping
@@ -17,8 +18,9 @@ class EmployeesController(private val employeeService: EmployeeService) {
     fun getEmployeeAvailableEarlier(@RequestParam employees: Set<String>): Employee = employeeService.getEmployeeAvailableEarlier(employees)
 
     @GetMapping("working-days")
-    fun getWorkingDaysCount(
+    @PreAuthorize("@employeeServicePermissionEvaluator.hasPermission('ACCESS_EMPLOYEE')")
+    fun getWorkingDays(
         @RequestParam("fromDate", required = true) fromDate: LocalDate,
         @RequestParam("toDate", required = true) toDate: LocalDate
-    ) = employeeService.getWorkingDays(fromDate, toDate)
+    ): WorkingDaysDTO = employeeService.getWorkingDays(fromDate, toDate)
 }
diff --git a/server/src/main/kotlin/org/octopusden/employee/service/impl/EmployeeServiceImpl.kt b/server/src/main/kotlin/org/octopusden/employee/service/impl/EmployeeServiceImpl.kt
@@ -81,6 +81,7 @@ class EmployeeServiceImpl(
 
     override fun getWorkingDays(fromDate: LocalDate, toDate: LocalDate): WorkingDaysDTO {
         return oneCService.getWorkingDays(fromDate, toDate)
+            .also { workingDaysDTO -> log.debug("getWorkingDays($fromDate,$toDate)=$workingDaysDTO") }
     }
 
     data class UserAbsence(val employee: JiraUser, val start: LocalDate, val end: LocalDate)