Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: EVSIM-437 add message id in request metadata #70

Merged
merged 3 commits into from
Apr 26, 2024
Merged

feat: EVSIM-437 add message id in request metadata #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b819d3
feat: EVSIM-437 add messageId field in RequestMetadata
DeborahPereira4sh Apr 25, 2024
39b57d7
feat: EVSIM-437 add messageId in RequestMetadata server side
DeborahPereira4sh Apr 25, 2024
7b5aa5c
feat: EVSIM-437 fix wrong parameter value for chargingStationId
DeborahPereira4sh Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocpp-transport-soap/src/main/kotlin/com/izivia/ocpp/http/OcppSoapServerTransport.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class OcppSoapServerTransport private constructor(
msg.action?.lowercase() == action.lowercase()
) {
val message = ocppSoapParser.parseRequestFromSoap(msg.payload, clazz)
val response = onAction(RequestMetadata(message.messageId), message.payload)
val response = onAction(RequestMetadata(message.chargingStationId, message.messageId), message.payload)
val payload = ocppSoapParser.mapResponseToSoap(
ResponseSoapMessage(
messageId = "urn:uuid:${newMessageId()}",
Expand Down
5 changes: 4 additions & 1 deletion ocpp-transport-websocket/src/main/kotlin/com/izivia/ocpp/websocket/WebsocketServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ class WebsocketServer(
val parser = getJsonMapper(OcppVersionWamp.valueOf(ocppVersion.name))
try {
val response =
onAction(RequestMetadata(meta.ocppId), parser.parsePayloadFromJson(msg.payload, clazz))
onAction(
RequestMetadata(meta.ocppId, msg.msgId),
parser.parsePayloadFromJson(msg.payload, clazz)
)
val payload = parser.mapPayloadToString(response)
WampMessage.CallResult(msg.msgId, payload)
} catch (e: Exception) { // TODO Better mapping of exceptions https://izivia.atlassian.net/browse/IDEV-497
Expand Down
3 changes: 2 additions & 1 deletion ...tion-information/src/main/kotlin/com/izivia/ocpp/operation/information/RequestMetadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.izivia.ocpp.operation.information

data class RequestMetadata(
val chargingStationId: String
val chargingStationId: String,
val messageId: String? = null
)
Loading