feat: Add ChargingProfiles module

IZIVIA · Mar 11, 2024 · a8e1200 · a8e1200
1 parent bbd5fb5
commit a8e1200
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/...main/kotlin/com/izivia/ocpi/toolkit/modules/chargingProfiles/ChargingProfilesCpoServer.kt b/...main/kotlin/com/izivia/ocpi/toolkit/modules/chargingProfiles/ChargingProfilesCpoServer.kt
@@ -29,14 +29,15 @@ class ChargingProfilesCpoServer(
             method = HttpMethod.GET,
             path = basePathSegments + listOf(
                 VariablePathSegment("sessionId")
-            )
+            ),
+            queryParams = listOf("duration", "response_url")
         ) { req ->
             req.httpResponse {
                 service
                     .getActiveChargingProfile(
                         sessionId = req.pathParams["sessionId"]!!,
                         duration = req.queryParams["duration"]!!.toInt(),
-                        responseUrl = req.queryParams["responseUrl"]!!
+                        responseUrl = req.queryParams["response_url"]!!
                     )
             }
         }

diff --git a/...ain/kotlin/com/izivia/ocpi/toolkit/modules/chargingProfiles/ChargingProfilesScspServer.kt b/...ain/kotlin/com/izivia/ocpi/toolkit/modules/chargingProfiles/ChargingProfilesScspServer.kt
@@ -46,7 +46,7 @@ class ChargingProfilesScspServer(
             req.httpResponse {
                 service
                     .postCallbackActiveChargingProfile(
-                        requestId = req.queryParams["requestId"] ?: "",
+                        requestId = req.pathParams["requestId"].orEmpty(),
                         result = mapper.readValue(req.body, ActiveChargingProfileResult::class.java)
                     )
             }
@@ -62,7 +62,7 @@ class ChargingProfilesScspServer(
             req.httpResponse {
                 service
                     .postCallbackChargingProfile(
-                        requestId = req.queryParams["requestId"] ?: "",
+                        requestId = req.pathParams["requestId"].orEmpty(),
                         result = mapper.readValue(req.body, ChargingProfileResult::class.java)
                     )
             }
@@ -78,7 +78,7 @@ class ChargingProfilesScspServer(
             req.httpResponse {
                 service
                     .postCallbackClearProfile(
-                        requestId = req.queryParams["requestId"] ?: "",
+                        requestId = req.pathParams["requestId"].orEmpty(),
                         result = mapper.readValue(req.body, ClearProfileResult::class.java)
                     )
             }
@@ -94,7 +94,7 @@ class ChargingProfilesScspServer(
             req.httpResponse {
                 service
                     .putActiveChargingProfile(
-                        sessionId = req.queryParams["sessionId"] ?: "",
+                        sessionId = req.pathParams["sessionId"].orEmpty(),
                         activeChargingProfile = mapper.readValue(req.body, ActiveChargingProfile::class.java)
                     )
             }

diff --git a/...it-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/CredentialsClient.kt b/...it-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/CredentialsClient.kt
@@ -27,7 +27,7 @@ class CredentialsClient(
             .parseBody()
 
     override suspend fun post(
-        tokenA: String,
+        token: String,
         credentials: Credentials,
         debugHeaders: Map<String, String>
     ): OcpiResponseBody<Credentials> =
@@ -41,7 +41,7 @@ class CredentialsClient(
                         requestId = transportClient.generateRequestId(),
                         correlationId = transportClient.generateCorrelationId()
                     )
-                    .authenticate(token = tokenA)
+                    .authenticate(token = token)
             )
             .parseBody()
 

diff --git a/...n/kotlin/com/izivia/ocpi/toolkit/modules/credentials/services/CredentialsClientService.kt b/...n/kotlin/com/izivia/ocpi/toolkit/modules/credentials/services/CredentialsClientService.kt
@@ -95,7 +95,7 @@ open class CredentialsClientService(
 
         // Initiate registration process
         val credentials = buildCredentialClient().post(
-            tokenA = credentialsTokenA,
+            token = credentialsTokenA,
             credentials = Credentials(
                 token = serverToken,
                 url = clientVersionsEndpointUrl,