payloadservice + ende navn på payload modulen

navikt · Oct 23, 2023 · 3ed6686 · 3ed6686
1 parent 87a2c4b
commit 3ed6686
Show file tree

Hide file tree

Showing 30 changed files with 5 additions and 881 deletions.
diff --git a/.nais/payload-processor-dev.yaml b/.nais/payload-processor-dev.yaml
@@ -1,7 +1,7 @@
 apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
-  name: "emottak-payload-processor"
+  name: "ebms-payload"
   namespace: "team-emottak"
   labels:
     "team": "team-emottak"
@@ -31,7 +31,7 @@ spec:
       cpu: "200m"
       memory: "256Mi"
   ingresses:
-    - "https://emottak-payload-processor.intern.dev.nav.no"
+    - "https://ebms-payload.intern.dev.nav.no"
   accessPolicy:
     outbound:
       rules:

diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/App.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/App.kt
@@ -14,6 +14,7 @@ import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import no.nav.emottak.ebms.model.*
+import no.nav.emottak.ebms.processing.ProcessingService
 import no.nav.emottak.ebms.validation.DokumentValidator
 import no.nav.emottak.ebms.validation.MimeValidationException
 import no.nav.emottak.ebms.validation.asParseAsSoapFault
@@ -77,16 +78,7 @@ fun Application.myApplicationModule() {
 
             val message = ebMSDocument.buildEbmMessage()
             try {
-                when (message) {
-                    is EbmsAcknowledgment ->  message.process()
-                    is EbMSMessageError -> message.process()
-                    is EbMSPayloadMessage -> {
-                        when (val response = message.process()) {
-                            is EbmsAcknowledgment -> response.toEbmsDokument().sendResponse(response.messageHeader)
-                            is EbMSMessageError -> response.toEbmsDokument().sendErrorResponse(response.messageHeader)
-                        }
-                    }
-                }
+                ProcessingService().process(message)
             } catch (e: Exception) {
                 call.application.environment.log.error(message.messageHeader.marker(), "Feil ved prosessering av melding", e)
                 call.respond(HttpStatusCode.InternalServerError, "Feil ved prosessering av melding")

diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSDocument.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSDocument.kt
@@ -66,10 +66,3 @@ fun EbMSDocument.buildEbmMessage(): EbMSBaseMessage {
         EbMSPayloadMessage(this.dokument,header.messageHeader(),header.ackRequested(),this.attachments, LocalDateTime.now())
     }
 }
-
-fun EbMSDocument.sendResponse(messageHeader: MessageHeader) {
-    log.info(messageHeader.marker(), "TODO return response message")
-}
-fun EbMSDocument.sendErrorResponse(messageHeader: MessageHeader) {
-    log.warn(messageHeader.marker(), "TODO return error response message")
-}
diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/PayloadProcessor.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/PayloadProcessor.kt
diff --git a/payload-processor/build.gradle.kts b/payload-processor/build.gradle.kts
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/App.kt b/payload-processor/src/main/kotlin/no/nav/emottak/App.kt
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/HealthRouting.kt b/payload-processor/src/main/kotlin/no/nav/emottak/HealthRouting.kt
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/melding/Processor.kt b/payload-processor/src/main/kotlin/no/nav/emottak/melding/Processor.kt