Synchronize getEmployeeAvailableEarlier between the server and client

octopusden · Oct 31, 2023 · cd32543 · cd32543
1 parent 02ab42e
commit cd32543
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 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
@@ -36,7 +36,7 @@ interface EmployeeServiceClient {
 
     @Throws(NotFoundException::class)
     @RequestLine("GET employees/available-earlier?employees={employees}", collectionFormat = CollectionFormat.CSV)
-    fun getEmployeeAvailableEarlier(@Param("employees") @QueryMap employees: List<String>): Employee
+    fun getEmployeeAvailableEarlier(@Param("employees") employees: Set<String>): Employee
 
     @RequestLine("GET customers")
     fun getCustomers(): Set<CustomerDTO>

diff --git a/client/src/main/kotlin/org/octopusden/employee/client/impl/ClassicEmployeeServiceClient.kt b/client/src/main/kotlin/org/octopusden/employee/client/impl/ClassicEmployeeServiceClient.kt
@@ -45,7 +45,7 @@ class ClassicEmployeeServiceClient(
 
     override fun getEmployee(employee: String): Employee = client.getEmployee(employee)
 
-    override fun getEmployeeAvailableEarlier(employees: List<String>): Employee =
+    override fun getEmployeeAvailableEarlier(employees: Set<String>): Employee =
         client.getEmployeeAvailableEarlier(employees)
 
     override fun getCustomers(): Set<CustomerDTO> = client.getCustomers()

diff --git a/ft/src/ft/kotlin/org/octopusden/employee/EmployeesControllerTest.kt b/ft/src/ft/kotlin/org/octopusden/employee/EmployeesControllerTest.kt
@@ -3,7 +3,7 @@ package org.octopusden.employee
 import org.octopusden.employee.client.common.dto.Employee
 
 class EmployeesControllerTest : BaseEmployeesControllerTest() {
-    override fun getEmployeeAvailableEarlier(employees: List<String>): Employee {
+    override fun getEmployeeAvailableEarlier(employees: Set<String>): Employee {
         return client.getEmployeeAvailableEarlier(employees)
     }
 

diff --git a/server/src/test/kotlin/org/octopusden/employee/EmployeesControllerTest.kt b/server/src/test/kotlin/org/octopusden/employee/EmployeesControllerTest.kt
@@ -40,7 +40,7 @@ class EmployeesControllerTest : BaseEmployeesControllerTest() {
         mapper.setLocale(Locale.ENGLISH)
     }
 
-    override fun getEmployeeAvailableEarlier(employees: List<String>): Employee = mvc.perform(
+    override fun getEmployeeAvailableEarlier(employees: Set<String>): Employee = mvc.perform(
         MockMvcRequestBuilders.get("/employees/available-earlier")
             .param("employees", *employees.toTypedArray())
             .accept(MediaType.APPLICATION_JSON)

diff --git a/test-common/src/main/kotlin/org/octopusden/employee/BaseEmployeesControllerTest.kt b/test-common/src/main/kotlin/org/octopusden/employee/BaseEmployeesControllerTest.kt
@@ -12,20 +12,20 @@ import java.util.stream.Stream
 abstract class BaseEmployeesControllerTest : BaseTest() {
     @ParameterizedTest
     @MethodSource("availableEarlier")
-    fun getEmployeeAvailableEarlierTest(employees: List<String>, expectedEmployee: Employee) {
+    fun getEmployeeAvailableEarlierTest(employees: Set<String>, expectedEmployee: Employee) {
         val employeeAvailableEarlier = getEmployeeAvailableEarlier(employees)
         Assertions.assertEquals(expectedEmployee, employeeAvailableEarlier)
     }
 
-    protected abstract fun getEmployeeAvailableEarlier(employees: List<String>): Employee
+    protected abstract fun getEmployeeAvailableEarlier(employees: Set<String>): Employee
 
     //<editor-fold defaultstate="collapsed" desc="test data">
     private fun availableEarlier(): Stream<Arguments> = Stream.of(
         Arguments.of(
-            listOf("absent1", "absent2"), Employee("absent2", true)
+            setOf("absent1", "absent2"), Employee("absent2", true)
         ),
         Arguments.of(
-            listOf("absent1", "absent2", "employee"), Employee("employee", true)
+            setOf("absent1", "absent2", "employee"), Employee("employee", true)
         )
     )
     //</editor-fold>