From cd32543f182ebe0ab2b26d1b95e4b637163b78e4 Mon Sep 17 00:00:00 2001
From: Alexey Zverev <ozonophore@gmail.com>
Date: Tue, 31 Oct 2023 16:32:10 +0200
Subject: [PATCH] Synchronize getEmployeeAvailableEarlier between the server
 and client

---
 .../octopusden/employee/client/EmployeeServiceClient.kt   | 2 +-
 .../employee/client/impl/ClassicEmployeeServiceClient.kt  | 2 +-
 .../org/octopusden/employee/EmployeesControllerTest.kt    | 2 +-
 .../org/octopusden/employee/EmployeesControllerTest.kt    | 2 +-
 .../octopusden/employee/BaseEmployeesControllerTest.kt    | 8 ++++----
 5 files changed, 8 insertions(+), 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
index 920c058..a726517 100644
--- 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
index b334a59..99480ab 100644
--- 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
index dcbe02c..97d68aa 100644
--- 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
index 3bcaafe..0ef64e1 100644
--- 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
index 5193a19..0529f56 100644
--- 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>