event type fra header?

navikt · May 25, 2023 · 399d82c · 399d82c
1 parent 0cb696b
commit 399d82c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 78 deletions.
diff --git a/src/main/kotlin/no/nav/aap/api/søknad/mellomlagring/GCPBucketEventTransformer.kt b/src/main/kotlin/no/nav/aap/api/søknad/mellomlagring/GCPBucketEventTransformer.kt
@@ -3,10 +3,8 @@ package no.nav.aap.api.søknad.mellomlagring
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.cloud.spring.pubsub.support.BasicAcknowledgeablePubsubMessage
 import com.google.cloud.spring.pubsub.support.GcpPubSubHeaders.*
-import com.google.cloud.storage.NotificationInfo.EventType
 import com.google.cloud.storage.NotificationInfo.EventType.OBJECT_DELETE
 import com.google.cloud.storage.NotificationInfo.EventType.OBJECT_FINALIZE
-import com.nimbusds.openid.connect.sdk.claims.LogoutTokenClaimsSet.EVENT_TYPE
 import org.springframework.integration.annotation.Transformer
 import org.springframework.messaging.handler.annotation.Header
 import no.nav.aap.api.søknad.mellomlagring.GCPBucketEventTransformer.GCPEventType.ENDELIG_SLETTET
@@ -26,12 +24,13 @@ class GCPBucketEventTransformer(private val mapper: ObjectMapper) {
 
     @Transformer
     fun payload(@Header(ORIGINAL_MESSAGE) msg : BasicAcknowledgeablePubsubMessage)  =
-             msg.pubsubMessage.let {
-                 val md = it.metadata(mapper)
-                 log.trace("Metadata er {}", md)
-                 when (it.eventType()) {
-                     OBJECT_FINALIZE -> if (it.førstegangsOpprettelse()) MellomlagringsHendelse(OPPRETTET, md) else MellomlagringsHendelse(OPPDATERT, md)
-                     OBJECT_DELETE -> if (it.endeligSlettet()) MellomlagringsHendelse(ENDELIG_SLETTET, md) else MellomlagringsHendelse(IGNORERT, md)
+             msg.pubsubMessage.let { m ->
+                 val md = m.metadata(mapper).also {
+                     log.trace("Metadata er {}", it)
+                 }
+                 when (m.eventType()) {
+                     OBJECT_FINALIZE -> if (m.førstegangsOpprettelse()) MellomlagringsHendelse(OPPRETTET, md) else MellomlagringsHendelse(OPPDATERT, md)
+                     OBJECT_DELETE -> if (m.endeligSlettet()) MellomlagringsHendelse(ENDELIG_SLETTET, md) else MellomlagringsHendelse(IGNORERT, md)
                      else -> MellomlagringsHendelse(IGNORERT)
                  }.also {
                      log.trace("Event oversatt til {}", it)

diff --git a/src/main/kotlin/no/nav/aap/api/søknad/mellomlagring/GammelMellomlagringHendelseHåndterer.kt b/src/main/kotlin/no/nav/aap/api/søknad/mellomlagring/GammelMellomlagringHendelseHåndterer.kt