Enable cronjob after TLS turned on in MQ

README.md

@@ -4,7 +4,9 @@
 
 Applikasjon for håndtering av dialogmeldinger i SYFO-domenet. Funksjonalitet:
 
-* Deling av oppfølgingsplan
+* Deling av oppfølgingsplan 
+* Sending av dialogmøterelaterte dialogmeldinger
+* Sending av andre dialogmeldinger
 * API med informasjon om behandlere (fastlege) som kan motta dialogmelding
 
 ## Technologies used
@@ -95,6 +97,17 @@ This application owns and consumes from the following topic:
 
 * isdialogmelding-behandler-dialogmelding-bestilling
 
+### MQ config
+
+This application uses an encrypted channel when reading av sending messages to MQ. The certificate and password for 
+the jks-file can be found in Fasit. The resources must be stored in GCP as secrets:
+
+`kubectl create secret generic isdialogmelding-keystore-pwd --from-literal MQ_KEYSTORE_PASSWORD=xxxxxxxx`
+
+and
+
+`kubectl create secret generic isdialogmelding-keystore --from-file isdialogmelding-keystore.jks=./srvisdialogmelding_p.jks`
+
 ## Contact
 
 ### For NAV employees

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

@@ -22,6 +22,8 @@ import no.nav.syfo.client.pdl.PdlClient
 import no.nav.syfo.client.veiledertilgang.VeilederTilgangskontrollClient
 import no.nav.syfo.cronjob.cronjobModule
 import no.nav.syfo.dialogmelding.DialogmeldingService
+import no.nav.syfo.dialogmelding.apprec.ApprecService
+import no.nav.syfo.dialogmelding.apprec.consumer.ApprecConsumer
 import no.nav.syfo.dialogmelding.status.DialogmeldingStatusService
 import no.nav.syfo.dialogmelding.status.kafka.*
 import no.nav.syfo.identhendelse.IdenthendelseService
@@ -30,6 +32,7 @@ import no.nav.syfo.identhendelse.kafka.launchKafkaTaskIdenthendelse
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.slf4j.LoggerFactory
 import java.util.concurrent.TimeUnit
+import javax.jms.Session
 
 const val applicationPort = 8080
 
@@ -41,7 +44,7 @@ fun main() {
     val logger = LoggerFactory.getLogger("ktor.application")
     val environment = Environment()
     setMQTlsProperties(environment)
-    // val mqSender = MQSender(environment)
+    val mqSender = MQSender(environment)
     val wellKnownInternalAzureAD = getWellKnown(environment.azureAppWellKnownUrl)
     val wellKnownInternalIdportenTokenX = getWellKnown(environment.idportenTokenXWellKnownUrl)
     val azureAdClient = AzureAdClient(
@@ -128,7 +131,7 @@ fun main() {
         )
         val dialogmeldingService = DialogmeldingService(
             pdlClient = pdlClient,
-            // mqSender = mqSender,
+            mqSender = mqSender,
         )
         cronjobModule(
             applicationState = applicationState,
@@ -147,7 +150,6 @@ fun main() {
             applicationEnvironmentKafka = environment.kafka,
             database = applicationDatabase,
         )
-        /*
         launchBackgroundTask(
             applicationState = applicationState,
         ) {
@@ -173,7 +175,6 @@ fun main() {
                 blockingApplicationRunner.run()
             }
         }
-        */
         val identhendelseService = IdenthendelseService(
             database = applicationDatabase,
             pdlClient = pdlClient,

src/main/kotlin/no/nav/syfo/application/mq/MQUtils.kt

@@ -26,3 +26,5 @@ fun connectionFactory(env: Environment): ConnectionFactory {
         setStringProperty(CommonConstants.PASSWORD, env.serviceuserPassword)
     }
 }
+
+fun Session.consumerForQueue(queueName: String): MessageConsumer = createConsumer(createQueue(queueName))

src/main/kotlin/no/nav/syfo/cronjob/CronjobModule.kt

@@ -21,18 +21,15 @@ fun cronjobModule(
         applicationState = applicationState,
         leaderPodClient = leaderPodClient,
     )
-    /*
     val dialogmeldingSendCronjob = DialogmeldingSendCronjob(
         dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
         dialogmeldingService = dialogmeldingService,
         dialogmeldingStatusService = dialogmeldingStatusService,
     )
-    */
     val dialogmeldingStatusCronjob =
         DialogmeldingStatusCronjob(dialogmeldingStatusService = dialogmeldingStatusService)
 
-    // listOf(dialogmeldingSendCronjob, dialogmeldingStatusCronjob).forEach {
-    listOf(dialogmeldingStatusCronjob).forEach {
+    listOf(dialogmeldingSendCronjob, dialogmeldingStatusCronjob).forEach {
         launchBackgroundTask(
             applicationState = applicationState,
         ) {

src/main/kotlin/no/nav/syfo/dialogmelding/DialogmeldingService.kt

@@ -1,5 +1,6 @@
 package no.nav.syfo.dialogmelding
 
+import no.nav.syfo.application.mq.MQSender
 import no.nav.syfo.behandler.domain.*
 import no.nav.syfo.client.pdl.PdlClient
 import no.nav.syfo.dialogmelding.bestilling.domain.DialogmeldingToBehandlerBestilling
@@ -14,13 +15,13 @@ private val log = LoggerFactory.getLogger("no.nav.syfo.dialogmelding")
 
 class DialogmeldingService(
     val pdlClient: PdlClient,
-    // val mqSender: MQSender,
+    val mqSender: MQSender,
 ) {
     suspend fun sendMelding(melding: DialogmeldingToBehandlerBestilling) {
         log.info("Sending dialogmelding med type ${melding.type} to behandler with partnerId: ${melding.behandler.kontor.partnerId}")
         val arbeidstaker = getArbeidstaker(melding.arbeidstakerPersonident)
         val fellesformat: Fellesformat = opprettDialogmelding(melding, arbeidstaker)
-        // mqSender.sendMessageToEmottak(fellesformat.message!!)
+        mqSender.sendMessageToEmottak(fellesformat.message!!)
     }
 
     private suspend fun getArbeidstaker(

src/test/kotlin/no/nav/syfo/cronjob/DialogmeldingCronjobSpek.kt

@@ -65,7 +65,7 @@ class DialogmeldingCronjobSpek : Spek({
             )
             val dialogmeldingService = DialogmeldingService(
                 pdlClient = pdlClient,
-                // mqSender = mqSenderMock,
+                mqSender = mqSenderMock,
             )
             val dialogmeldingSendCronjob = DialogmeldingSendCronjob(
                 dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
@@ -80,7 +80,7 @@ class DialogmeldingCronjobSpek : Spek({
             }
 
             describe("Cronjob sender bestilte dialogmeldinger") {
-                xit("Sender bestilt dialogmelding") {
+                it("Sender bestilt dialogmelding") {
                     val behandlerRef = UUID.randomUUID()
                     val partnerId = PartnerId(random.nextInt())
                     val behandler = generateBehandler(behandlerRef, partnerId)
@@ -127,7 +127,7 @@ class DialogmeldingCronjobSpek : Spek({
                     }
                     verify(exactly = 0) { mqSenderMock.sendMessageToEmottak(any()) }
                 }
-                xit("Sender bestilt dialogmelding uten relasjon mellom arbeidstaker og behandler") {
+                it("Sender bestilt dialogmelding uten relasjon mellom arbeidstaker og behandler") {
                     val behandlerRef = UUID.randomUUID()
                     val partnerId = PartnerId(random.nextInt())
                     val behandler = generateBehandler(behandlerRef, partnerId)
@@ -167,7 +167,7 @@ class DialogmeldingCronjobSpek : Spek({
                     pBehandlerDialogmeldingBestillingAfter!!.sendt shouldNotBeEqualTo null
                     pBehandlerDialogmeldingBestillingAfter.sendtTries shouldBeEqualTo 1
                 }
-                xit("Sender bestilt oppfølgingsplan") {
+                it("Sender bestilt oppfølgingsplan") {
                     clearAllMocks()
                     val messageSlot = slot<String>()
                     justRun { mqSenderMock.sendMessageToEmottak(capture(messageSlot)) }

src/test/kotlin/no/nav/syfo/dialogmelding/DialogmeldingServiceSpek.kt

@@ -35,7 +35,7 @@ object DialogmeldingServiceSpek : Spek({
 
     val dialogmeldingService = DialogmeldingService(
         pdlClient = pdlClient,
-        // mqSender = mqSender,
+        mqSender = mqSender,
     )
 
     val arbeidstakerPersonident = Personident("01010112345")
@@ -67,7 +67,7 @@ object DialogmeldingServiceSpek : Spek({
         database.dropData()
     }
     describe("DialogmeldingService") {
-        xit("Sends correct message on MQ when foresporsel dialogmote-innkalling") {
+        it("Sends correct message on MQ when foresporsel dialogmote-innkalling") {
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
 
@@ -91,7 +91,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when foresporsel dialogmote-innkalling for behandler and arbeidstaker with dnr") {
+        it("Sends correct message on MQ when foresporsel dialogmote-innkalling for behandler and arbeidstaker with dnr") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -116,7 +116,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when foresporsel dialogmote-innkalling to behandler without orgnr") {
+        it("Sends correct message on MQ when foresporsel dialogmote-innkalling to behandler without orgnr") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -134,7 +134,7 @@ object DialogmeldingServiceSpek : Spek({
             }
             verify(exactly = 1) { mqSender.sendMessageToEmottak(any()) }
         }
-        xit("Sends correct message on MQ when foresporsel endre tid-sted") {
+        it("Sends correct message on MQ when foresporsel endre tid-sted") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -159,7 +159,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when referat") {
+        it("Sends correct message on MQ when referat") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -184,7 +184,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when avlysning") {
+        it("Sends correct message on MQ when avlysning") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -209,7 +209,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when foresporsel") {
+        it("Sends correct message on MQ when foresporsel") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -233,7 +233,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when purring foresporsel") {
+        it("Sends correct message on MQ when purring foresporsel") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -257,7 +257,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when foresporsel om legeerklæring") {
+        it("Sends correct message on MQ when foresporsel om legeerklæring") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -281,7 +281,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when retur av legeerklæring") {
+        it("Sends correct message on MQ when retur av legeerklæring") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }
@@ -305,7 +305,7 @@ object DialogmeldingServiceSpek : Spek({
                 expectedFellesformatMessageAsRegex.matches(actualFellesformatMessage),
             )
         }
-        xit("Sends correct message on MQ when melding fra NAV") {
+        it("Sends correct message on MQ when melding fra NAV") {
             clearAllMocks()
             val messageSlot = slot<String>()
             justRun { mqSender.sendMessageToEmottak(capture(messageSlot)) }