Merge remote-tracking branch 'origin/dev/hente-epostAdresser-fra-CPAe…

…r' into dev/hente-epostAdresser-fra-CPAer
navikt · Nov 29, 2024 · dd91731 · dd91731
2 parents daf3260 + 04da08a
commit dd91731
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/Routes.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/Routes.kt
@@ -226,6 +226,7 @@ fun Route.postEbmsSync(
             signingCertificate?.let { signatureDetails ->
                 it.signer(signatureDetails)
             }
+            log.info(ebmsMessage.marker(), "Created MessageError response")
             call.respondEbmsDokument(it)
             return@post
         }
@@ -282,7 +283,7 @@ fun Route.postEbmsAsync(validator: DokumentValidator, processingService: Process
                     processingService.processAsync(ebmsMessage, it.payloadProcessing)
                 }
             if (ebmsMessage !is PayloadMessage) {
-                log.info(ebMSDocument.messageHeader().marker(), "Successfuly processed Signal Message")
+                log.info(ebMSDocument.messageHeader().marker(), "Successfully processed Signal Message")
                 call.respondText("Processed")
                 return@post
             }
@@ -293,6 +294,7 @@ fun Route.postEbmsAsync(validator: DokumentValidator, processingService: Process
             }
         } catch (ex: EbmsException) {
             ebmsMessage.createFail(ex.feil).toEbmsDokument().also {
+                log.info(ebmsMessage.marker(), "Created MessageError response")
                 call.respondEbmsDokument(it)
                 return@post
             }

diff --git a/ebxml-processing-model/src/main/kotlin/no/nav/emottak/message/ebxml/MessageHeaderExt.kt b/ebxml-processing-model/src/main/kotlin/no/nav/emottak/message/ebxml/MessageHeaderExt.kt
@@ -37,9 +37,13 @@ fun MessageHeader.createResponseHeader(newAction: String?, newService: String?):
     return messageHeader
 }
 
-fun MessageHeader.addressing() = Addressing(
-    Party(this.to.partyId.map { PartyId(it.type!!, it.value!!) }, this.to.role!!),
-    Party(this.from.partyId.map { PartyId(it.type!!, it.value!!) }, this.from.role!!),
+fun MessageHeader.addressing(isRoleApplicable: Boolean = true) = Addressing(
+    Party(
+        this.to.partyId.map { PartyId(it.type!!, it.value!!) },
+        if (isRoleApplicable) this.to.role!! else "Not applicable"),
+    Party(
+        this.from.partyId.map { PartyId(it.type!!, it.value!!) },
+        if (isRoleApplicable) this.from.role!! else "Not applicable"),
     this.service.value!!,
     this.action
 )

diff --git a/ebxml-processing-model/src/main/kotlin/no/nav/emottak/message/model/EbmsDocument.kt b/ebxml-processing-model/src/main/kotlin/no/nav/emottak/message/model/EbmsDocument.kt
@@ -81,7 +81,7 @@ data class EbMSDocument(val requestId: String, val dokument: Document, val attac
                     messageHeader.messageData.refToMessageId!!,
                     messageHeader.conversationId,
                     messageHeader.cpaId!!,
-                    messageHeader.addressing(),
+                    messageHeader.addressing(isRoleApplicable = false),
                     errorList,
                     dokument
 
@@ -95,7 +95,7 @@ data class EbMSDocument(val requestId: String, val dokument: Document, val attac
                     header.acknowledgment()!!.refToMessageId,
                     messageHeader.conversationId,
                     messageHeader.cpaId!!,
-                    messageHeader.addressing(),
+                    messageHeader.addressing(isRoleApplicable = false),
                     dokument
                 )
             }

diff --git a/ebxml-processing-model/src/main/kotlin/no/nav/emottak/message/model/EbmsFail.kt b/ebxml-processing-model/src/main/kotlin/no/nav/emottak/message/model/EbmsFail.kt
@@ -21,7 +21,6 @@ data class EbmsFail(
 
     override fun toEbmsDokument(): EbMSDocument {
         val header = this.createMessageHeader(this.addressing.copy(action = EbXMLConstants.MESSAGE_ERROR_ACTION, service = EbXMLConstants.EBMS_SERVICE_URI))
-     //   log.warn(this.marker(), "Oppretter ErrorList")
         return ObjectFactory().createEnvelope()!!.also {
             it.header = header.also {
                 it.any.add(this.feil.asErrorList())