Merge pull request #143 from andacata/fix/#142-tokens-cpo-repository-…

…optional-return
IZIVIA · Nov 18, 2024 · 210ff9d · 210ff9d
2 parents 6050bab + 4988e75
commit 210ff9d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/...oolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensCpoInterface.kt b/...oolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensCpoInterface.kt
@@ -39,7 +39,7 @@ interface TokensCpoInterface {
         partyId: CiString,
         tokenUid: CiString,
         type: TokenType? = TokenType.RFID,
-    ): OcpiResponseBody<Token>
+    ): OcpiResponseBody<Token?>
 
     /**
      * PUT Method

diff --git a/...-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensEmspClient.kt b/...-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensEmspClient.kt
@@ -35,7 +35,7 @@ class TokensEmspClient(
         partyId: CiString,
         tokenUid: CiString,
         type: TokenType?,
-    ): OcpiResponseBody<Token> =
+    ): OcpiResponseBody<Token?> =
         with(buildTransport()) {
             send(
                 HttpRequest(

diff --git a/...rc/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/repositories/TokensCpoRepository.kt b/...rc/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/repositories/TokensCpoRepository.kt
@@ -38,14 +38,13 @@ interface TokensCpoRepository {
         partyId: CiString,
         tokenUid: CiString,
         type: TokenType? = TokenType.RFID,
-    ): Token
+    ): Token?
 
     /**
      * PUT Method
      *
      * New or updated Token objects are pushed from the eMSP to the CPO
      *
-     * @param token (Request Body) New or updated Token object
      * @param countryCode (Request parameter) Country code of the eMSP sending this PUT request to the CPO system. This
      * SHALL be the same value as the country_code in the Token object being
      * pushed. max-length = 36
@@ -55,13 +54,14 @@ interface TokensCpoRepository {
      * @param tokenUid (Request parameter) Token.uid of the (new) Token object (to replace). max-length = 36
      * @param type (Request parameter) Token.type of the Token of the (new) Token object (to replace). Default if omitted:
      * RFID
+     * @param token (Request Body) New or updated Token object
      */
     suspend fun putToken(
-        token: Token,
         countryCode: CiString,
         partyId: CiString,
         tokenUid: CiString,
         type: TokenType? = TokenType.RFID,
+        token: Token,
     ): Token
 
     /**
@@ -72,7 +72,6 @@ interface TokensCpoRepository {
      *
      * Any request to the PATCH method SHALL contain the last_updated field.
      *
-     * @param token (Request Body) New or updated Token object
      * @param countryCode (Request parameter) Country code of the eMSP sending this PUT request to the CPO system. This
      * SHALL be the same value as the country_code in the Token object being
      * pushed. max-length = 36
@@ -82,12 +81,13 @@ interface TokensCpoRepository {
      * @param tokenUid (Request parameter) Token.uid of the (new) Token object (to replace). max-length = 36
      * @param type (Request parameter) Token.type of the Token of the (new) Token object (to replace). Default if omitted:
      * RFID
+     * @param token (Request Body) New or updated Token object
      */
     suspend fun patchToken(
-        token: TokenPartial,
         countryCode: CiString,
         partyId: CiString,
         tokenUid: CiString,
         type: TokenType? = TokenType.RFID,
+        token: TokenPartial,
     ): Token?
 }
diff --git a/...2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/services/TokensCpoService.kt b/...2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/services/TokensCpoService.kt
@@ -19,14 +19,14 @@ open class TokensCpoService(
         partyId: CiString,
         tokenUid: CiString,
         type: TokenType?,
-    ): OcpiResponseBody<Token> = OcpiResponseBody.of {
+    ): OcpiResponseBody<Token?> = OcpiResponseBody.of {
         validate {
             validateLength("countryCode", countryCode, 2)
             validateLength("partyId", partyId, 3)
             validateLength("tokenUid", tokenUid, 36)
         }
 
-        service.getToken(countryCode, partyId, tokenUid, type).validate()
+        service.getToken(countryCode, partyId, tokenUid, type)?.validate()
     }
 
     override suspend fun putToken(
@@ -46,7 +46,7 @@ open class TokensCpoService(
             validateSame("tokenUid", tokenUid, token.uid)
         }
 
-        service.putToken(token, countryCode, partyId, tokenUid, type).validate()
+        service.putToken(countryCode, partyId, tokenUid, type, token).validate()
     }
 
     override suspend fun patchToken(
@@ -63,6 +63,6 @@ open class TokensCpoService(
             validateLength("tokenUid", tokenUid, 36)
         }
 
-        service.patchToken(token, countryCode, partyId, tokenUid, type)?.validate()
+        service.patchToken(countryCode, partyId, tokenUid, type, token)?.validate()
     }
 }
diff --git a/...est/kotlin/com/izivia/ocpi/toolkit/modules/tokens/http/cpo/TokensCpoHttpPatchTokenTest.kt b/...est/kotlin/com/izivia/ocpi/toolkit/modules/tokens/http/cpo/TokensCpoHttpPatchTokenTest.kt
@@ -56,11 +56,11 @@ class TokensCpoHttpPatchTokenTest {
         val srv = mockk<TokensCpoRepository> {
             coEvery {
                 patchToken(
-                    capture(slots.token),
                     capture(slots.countryCode),
                     capture(slots.partyId),
                     capture(slots.tokenUID),
                     capture(slots.type),
+                    capture(slots.token),
                 )
             } coAnswers { token }
         }.buildServer()
@@ -146,11 +146,11 @@ class TokensCpoHttpPatchTokenTest {
         val srv = mockk<TokensCpoRepository> {
             coEvery {
                 patchToken(
-                    capture(slots.token),
                     capture(slots.countryCode),
                     capture(slots.partyId),
                     capture(slots.tokenUID),
                     capture(slots.type),
+                    capture(slots.token),
                 )
             } coAnswers { token }
         }.buildServer()

diff --git a/.../test/kotlin/com/izivia/ocpi/toolkit/modules/tokens/http/cpo/TokensCpoHttpPutTokenTest.kt b/.../test/kotlin/com/izivia/ocpi/toolkit/modules/tokens/http/cpo/TokensCpoHttpPutTokenTest.kt
@@ -59,11 +59,11 @@ class TokensCpoHttpPutTokenTest {
         val srv = mockk<TokensCpoRepository> {
             coEvery {
                 putToken(
-                    capture(slots.token),
                     capture(slots.countryCode),
                     capture(slots.partyId),
                     capture(slots.tokenUID),
                     capture(slots.type),
+                    capture(slots.token),
                 )
             } coAnswers { token }
         }.buildServer()