Merge pull request #131 from navikt/feature/pakkeoppdateringer

Feature/pakkeoppdateringer
navikt · Nov 8, 2024 · 62d0533 · 62d0533
2 parents c417fa3 + 99c40e3
commit 62d0533
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/...r/src/main/kotlin/no/nav/soknad/arkivering/soknadsmottaker/service/NotificationService.kt b/...r/src/main/kotlin/no/nav/soknad/arkivering/soknadsmottaker/service/NotificationService.kt
@@ -178,21 +178,20 @@ class NotificationService(
 			)
 			link = notificationInfo.lenke
 			aktivFremTil = ZonedDateTime.now(ZoneId.of("Z")).plusDays(notificationInfo.antallAktiveDager.toLong())
-			eksternVarsling = externalNotification(notificationInfo.eksternVarsling)
+			if (notificationInfo.eksternVarsling.isNotEmpty()) {
+				eksternVarsling {
+					preferertKanal =
+						notificationInfo.eksternVarsling.map { if (it.kanal == Varsel.Kanal.sms) EksternKanal.SMS else EksternKanal.EPOST }
+							.first()
+					smsVarslingstekst = notificationInfo.eksternVarsling.firstOrNull { it.kanal == Varsel.Kanal.sms }?.tekst
+					epostVarslingstittel =
+						notificationInfo.eksternVarsling.firstOrNull { it.kanal == Varsel.Kanal.epost }?.tittel
+					epostVarslingstekst = notificationInfo.eksternVarsling.firstOrNull { it.kanal == Varsel.Kanal.epost }?.tekst
+				}
+			}
 		}
 
 	private fun createDeleteNotification(eventId: String): String =
 		VarselActionBuilder.inaktiver { varselId = eventId }
 
-
-	private fun externalNotification(eksternVarsling: List<Varsel>?): EksternVarslingBestilling? =
-		if (eksternVarsling == null || eksternVarsling.isEmpty())
-			null
-		else
-			EksternVarslingBestilling(
-				prefererteKanaler = eksternVarsling.map{ if (it.kanal == Varsel.Kanal.sms) EksternKanal.SMS else EksternKanal.EPOST },
-				smsVarslingstekst =  eksternVarsling.firstOrNull{it.kanal == Varsel.Kanal.sms}?.tekst,
-				epostVarslingstittel = eksternVarsling.firstOrNull{it.kanal == Varsel.Kanal.epost}?.tittel,
-				epostVarslingstekst = eksternVarsling.firstOrNull{it.kanal == Varsel.Kanal.epost}?.tekst
-			)
 	}
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 		<relativePath/>
 	</parent>
 
@@ -17,9 +17,9 @@
 	<description>Receives benefit applications</description>
 
 	<properties>
-		<spring-boot.version>3.3.4</spring-boot.version>
+		<spring-boot.version>3.3.5</spring-boot.version>
 		<java.version>21</java.version>
-		<kotlin.version>2.0.20</kotlin.version>
+		<kotlin.version>2.0.21</kotlin.version>
 		<maven.version>3.8.8</maven.version>
 
 		<!--Kotlin-->
@@ -28,26 +28,26 @@
 
 		<!--Spring-->
 		<springdoc-openapi.version>2.6.0</springdoc-openapi.version>
-		<spring-web.version>6.1.13</spring-web.version>
+		<spring-web.version>6.1.14</spring-web.version>
 
 		<!--Serialization-->
-		<jackson.version>2.18.0</jackson.version>
+		<jackson.version>2.18.1</jackson.version>
 		<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
 		<gson.version>2.11.0</gson.version>
 
 		<!--NAV-->
-		<token-support.version>5.0.5</token-support.version>
+		<token-support.version>5.0.8</token-support.version>
 
 		<!--Kafka-->
 		<confluent.version>7.7.1</confluent.version>
 		<brukernotifikasjon-schemas.version>2.5.2</brukernotifikasjon-schemas.version>
 		<utkast-schema.version>20230829114432-d23aa9a</utkast-schema.version>
 		<arkivering-schemas.version>f52ace8dcc</arkivering-schemas.version>
-		<tms-varsel.version>1.1.0</tms-varsel.version>
+		<tms-varsel.version>2.0.0</tms-varsel.version>
 
 		<!--Logging-->
 		<logstash.version>8.0</logstash.version>
-		<prometheus.version>1.3.1</prometheus.version>
+		<prometheus.version>1.3.2</prometheus.version>
 
 		<!--Jakarta-->
 		<jakarta-servlet-api.version>6.1.0</jakarta-servlet-api.version>
@@ -56,16 +56,16 @@
 
 		<!--Other -->
 		<okhttp3.version>4.12.0</okhttp3.version>
-		<swagger-annotations.version>2.2.24</swagger-annotations.version>
+		<swagger-annotations.version>2.2.25</swagger-annotations.version>
 
 		<!--Test-->
-		<mockk.version>1.13.12</mockk.version>
+		<mockk.version>1.13.13</mockk.version>
 
 		<!--Plugins-->
 		<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
-		<cyclonedx-maven-plugin.version>2.8.2</cyclonedx-maven-plugin.version>
+		<cyclonedx-maven-plugin.version>2.9.0</cyclonedx-maven-plugin.version>
 		<maven-enforcer.version>3.5.0</maven-enforcer.version>
-		<openapi-generator-maven-plugin.version>7.8.0</openapi-generator-maven-plugin.version>
+		<openapi-generator-maven-plugin.version>7.9.0</openapi-generator-maven-plugin.version>
 	</properties>
 
 	<modules>