Fix/update abonnement to next minor (#1649)

Author: Klaas-Ritense

zgw/notificaties-api/src/main/kotlin/com/ritense/notificatiesapi/NotificatiesApiPlugin.kt

@@ -99,7 +99,7 @@ class NotificatiesApiPlugin(
                     client.deleteAbonnement(
                         authenticationPluginConfiguration,
                         url,
-                        it.url.substringAfterLast("/")
+                        it.getAbonnementId()
                     )
                     logger.info { "Abonnement with url '${it.url}' successfully deleted for Notificaties API configuration with id '${notificatiesApiConfigurationId.id}'" }
                 } catch (e: Exception) {
@@ -118,8 +118,31 @@ class NotificatiesApiPlugin(
         PluginConfiguration::class.java.canonicalName to notificatiesApiConfigurationId.toString()
     ) {
         logger.debug { "Updating abonnement for Notificaties API configuration with id '${notificatiesApiConfigurationId.id}'" }
-        deleteAbonnement()
-        createAbonnement()
+        val dbAbonnement = notificatiesApiAbonnementLinkRepository.findByIdOrNull(notificatiesApiConfigurationId)
+        if (dbAbonnement == null) {
+            createAbonnement()
+        } else {
+            val abonnement = client.getAbonnement(
+                authenticationPluginConfiguration,
+                url,
+                dbAbonnement.getAbonnementId(),
+            )
+            if (abonnement.equals(dbAbonnement.url, callbackUrl.toASCIIString(), DEFAULT_KANALEN_NAMES)) {
+                logger.debug { "Skipping abonnement update. No change to abonnement detected for Notificaties API configuration with id '${notificatiesApiConfigurationId.id}'" }
+            } else {
+                client.updateAbonnement(
+                    authenticationPluginConfiguration,
+                    url,
+                    dbAbonnement.getAbonnementId(),
+                    Abonnement(
+                        callbackUrl = callbackUrl.toASCIIString(),
+                        auth = dbAbonnement.auth,
+                        kanalen = DEFAULT_KANALEN_NAMES.map { Abonnement.Kanaal(naam = it) }
+                    )
+                )
+                logger.info { "Abonnement with url '${dbAbonnement.url}' successfully updated for Notificaties API configuration with id '${notificatiesApiConfigurationId.id}'" }
+            }
+        }
     }
 
     fun ensureKanalenExist(kanalen: Set<String>) {

zgw/notificaties-api/src/main/kotlin/com/ritense/notificatiesapi/client/NotificatiesApiClient.kt

@@ -28,6 +28,33 @@ class NotificatiesApiClient(
     private val restClientBuilder: RestClient.Builder
 ) {
 
+    fun getAbonnement(
+        authentication: NotificatiesApiAuthentication,
+        baseUrl: URI,
+        abonnementId: String,
+    ): Abonnement {
+        return buildNotificatiesRestClient(authentication, baseUrl)
+            .get()
+            .uri("abonnement/$abonnementId")
+            .retrieve()
+            .body<Abonnement>()!!
+    }
+
+    fun updateAbonnement(
+        authentication: NotificatiesApiAuthentication,
+        baseUrl: URI,
+        abonnementId: String,
+        abonnement: Abonnement
+    ): Abonnement {
+        return buildNotificatiesRestClient(authentication, baseUrl)
+            .put()
+            .uri("abonnement/$abonnementId")
+            .contentType(MediaType.APPLICATION_JSON)
+            .body(abonnement)
+            .retrieve()
+            .body<Abonnement>()!!
+    }
+
     fun createAbonnement(
         authentication: NotificatiesApiAuthentication,
         baseUrl: URI,

zgw/notificaties-api/src/main/kotlin/com/ritense/notificatiesapi/domain/Abonnement.kt

@@ -29,4 +29,10 @@ data class Abonnement(
         val filters: Map<String, String> = mapOf(),
         val naam: String
     )
+
+    fun equals(url: String, callbackUrl: String, kanalen: Set<String>): Boolean {
+        return this.url == url
+            && this.callbackUrl == callbackUrl
+            && this.kanalen == kanalen.map { Kanaal(naam = it) }
+    }
 }

zgw/notificaties-api/src/main/kotlin/com/ritense/notificatiesapi/domain/NotificatiesApiAbonnementLink.kt

@@ -32,4 +32,6 @@ class NotificatiesApiAbonnementLink(
 
     @Column(name = "abonnement_auth_key")
     val auth: String
-)
+) {
+    fun getAbonnementId() = url.substringAfterLast("/")
+}

zgw/notificaties-api/src/test/kotlin/com/ritense/notificatiesapi/NotificatiesApiPluginTest.kt

@@ -27,6 +27,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.times
@@ -128,6 +129,60 @@ internal class NotificatiesApiPluginTest {
         assertEquals("some-key", linkCaptor.value.auth)
     }
 
+    @Test
+    fun `updateAbonnement should update abonnement when abonnement changed`() {
+
+        val abonnementId = UUID.randomUUID()
+        val abonnement = Abonnement(
+            url = "http://example.com/abonnement/$abonnementId",
+            callbackUrl = "http://example.com/changed-callback-url",
+            auth = "some-key",
+            kanalen = listOf(Abonnement.Kanaal(naam = "objecten"))
+        )
+        val abonnementLink = NotificatiesApiAbonnementLink(
+            notificatiesApiConfigurationId = notificatiesApiConfigurationId,
+            url = "http://example.com/abonnement/$abonnementId",
+            auth = "some-key"
+        )
+        whenever(abonnementLinkRepository.findById(any()))
+            .thenReturn(Optional.of(abonnementLink))
+        whenever(notificatiesApiClient.getAbonnement(any(), any(), any()))
+            .thenReturn(abonnement)
+        whenever(notificatiesApiClient.updateAbonnement(any(), any(), any(), eq(abonnement)))
+            .thenReturn(abonnement)
+
+        plugin.updateAbonnement()
+
+        verify(notificatiesApiClient, times(1)).updateAbonnement(any(), any(), any(), any())
+    }
+
+    @Test
+    fun `updateAbonnement should not update abonnement when abonnement didnt change`() {
+
+        val abonnementId = UUID.randomUUID()
+        val abonnement = Abonnement(
+            url = "http://example.com/abonnement/$abonnementId",
+            callbackUrl = "http://example.com/callback",
+            auth = "some-key",
+            kanalen = listOf(Abonnement.Kanaal(naam = "objecten"))
+        )
+        val abonnementLink = NotificatiesApiAbonnementLink(
+            notificatiesApiConfigurationId = notificatiesApiConfigurationId,
+            url = "http://example.com/abonnement/$abonnementId",
+            auth = "some-key"
+        )
+        whenever(abonnementLinkRepository.findById(any()))
+            .thenReturn(Optional.of(abonnementLink))
+        whenever(notificatiesApiClient.getAbonnement(any(), any(), any()))
+            .thenReturn(abonnement)
+        whenever(notificatiesApiClient.updateAbonnement(any(), any(), any(), eq(abonnement)))
+            .thenReturn(abonnement)
+
+        plugin.updateAbonnement()
+
+        verify(notificatiesApiClient, times(0)).updateAbonnement(any(), any(), any(), any())
+    }
+
     @Test
     fun `deleteAbonnement should delete abonnement in Notificaties API and repository`() {
 

zgw/verzoek/src/main/kotlin/com/ritense/verzoek/VerzoekPluginEventListener.kt

@@ -79,6 +79,7 @@ open class VerzoekPluginEventListener(
         }?.run {
             val verzoekObjectData = getVerzoekObjectData(objectManagement, event)
             val verzoekTypeProperties = getVerzoekTypeProperties(verzoekObjectData, event) ?: return
+            logger.info { "Received verzoek notification. Verzoek objectUrl: ${event.resourceUrl}" }
             val document = createDocument(verzoekTypeProperties, verzoekObjectData)
             withLoggingContext(JsonSchemaDocument::class, document.id()) {
                 val zaakTypeUrl = zaaktypeUrlProvider.getZaaktypeUrl(document.definitionId().name())