create new hendelse topic and consume new and old topic

Author: luantr

.github/workflows/topic.yaml

@@ -17,7 +17,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: nais/topics/dinesykmeldte-lest-topic.yaml
+          RESOURCE: nais/topics/dinesykmeldte-hendelser-v2.yaml
           VAR: kafka-pool=nav-dev
 
   deploy-topic-to-prod:
@@ -33,5 +33,5 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
-          RESOURCE: nais/topics/dinesykmeldte-lest-topic.yaml
+          RESOURCE: nais/topics/dinesykmeldte-hendelser-v2.yaml
           VAR: kafka-pool=nav-prod

nais/topics/dinesykmeldte-hendelser-v2.yaml

@@ -0,0 +1,32 @@
+apiVersion: kafka.nais.io/v1
+kind: Topic
+metadata:
+  name: dinesykmeldte-hendelser-v2
+  namespace: team-esyfo
+  labels:
+    team: team-esyfo
+spec:
+  pool: {{kafka-pool}}
+  config:  # optional; all fields are optional too; defaults shown
+    cleanupPolicy: delete  # delete, compact
+    minimumInSyncReplicas: 3
+    partitions: 3
+    replication: 3  # see min/max requirements
+    retentionBytes: -1  # -1 means unlimited
+    retentionHours: 2952  # 4 months
+  acl:
+    - team: flex
+      application: sykepengesoknad-narmesteleder-varsler
+      access: write
+    - team: team-esyfo
+      application: esyfovarsel
+      access: write
+    - team: teamsykefravr
+      application: isdialogmote
+      access: write
+    - team: team-esyfo
+      application: syfomotebehov
+      access: write
+    - team: team-esyfo
+      application: dinesykmeldte-backend
+      access: read

src/main/kotlin/no/nav/syfo/Environment.kt

@@ -15,7 +15,8 @@ data class Environment(
     val narmestelederLeesahTopic: String = "teamsykmelding.syfo-narmesteleder-leesah",
     val sendtSykmeldingTopic: String = "teamsykmelding.syfo-sendt-sykmelding",
     val sykepengesoknadTopic: String = "flex.sykepengesoknad",
-    val hendelserTopic: String = "teamsykmelding.dinesykmeldte-hendelser-v2",
+    val hendelserTopic: String = "esyfo.dinesykmeldte-hendelser-v2",
+    val hendelserTopicLegacy: String = "teamsykmelding.dinesykmeldte-hendelser-v2",
     val syketilfelleEndpointURL: String =
         getEnvVar("SYKETILLFELLE_ENDPOINT_URL", "http://flex-syketilfelle.flex"),
     val syketilfelleScope: String = getEnvVar("SYKETILLFELLE_SCOPE"),

src/main/kotlin/no/nav/syfo/common/kafka/CommonKafkaService.kt

@@ -38,6 +38,7 @@ class CommonKafkaService(
                         environment.sendtSykmeldingTopic,
                         environment.sykepengesoknadTopic,
                         environment.hendelserTopic,
+                        environment.hendelserTopicLegacy,
                     ),
                 )
                 start()
@@ -64,6 +65,7 @@ class CommonKafkaService(
                             sykmeldingService.handleSendtSykmeldingKafkaMessage(it)
                         environment.sykepengesoknadTopic -> soknadService.handleSykepengesoknad(it)
                         environment.hendelserTopic -> hendelserService.handleHendelse(it)
+                        environment.hendelserTopicLegacy -> hendelserService.handleHendelse(it)
                         else ->
                             throw IllegalStateException(
                                 "Har mottatt melding på ukjent topic: ${it.topic()}",