Merge branch 'development' into feature/change-kotlin-logging-dependency

# Conflicts:
#	gradle.properties
#	product/src/main/kotlin/nl/nlportal/product/service/ProductService.kt

Author: flinden68

app/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     implementation(project(":form"))
     implementation(project(":zgw:berichten"))
     implementation(project(":zgw:taak"))
+    implementation(project(":zgw:openklant"))
     implementation(project(":zgw:zaken-api"))
     implementation(project(":zgw:catalogi-api"))
     implementation(project(":zgw:documenten-api"))

app/src/main/resources/config/application.yml

@@ -38,7 +38,7 @@ spring:
     jpa:
         database-platform: org.hibernate.dialect.PostgreSQLDialect
         database: postgresql
-        show_sql: true
+        show_sql: false
         open-in-view: false
         properties:
             hibernate:
@@ -69,9 +69,15 @@ graphql:
 
 logging:
     level:
-        org.springframework.amqp: DEBUG
+        root: INFO
 
 nl-portal:
+    config:
+        openklant:
+            enabled: true
+            properties:
+                klantinteracties-api-url: http://localhost:8007/klantinteracties/api/v1
+                token: ac045222c9e7cde8120b48735560f9b920bb58cd
     zgw:
         besluiten:
             url: http://localhost:8001
@@ -164,6 +170,8 @@ nl-portal:
                   allowedMethods: "*"
         endpoints:
             unsecured: /api/public/**
+        machtingsdienst:
+            #resource-url: classpath:machtigingsdiensten.json
     product:
         product-type-url: http://host.docker.internal:8011/api/v1/objecttypes/972e92ce-b964-4ca8-ad4d-ddc43dd7b244
         product-instantie-type-url: http://host.docker.internal:8011/api/v1/objecttypes/3e852115-277a-4570-873a-9a64be3aeb34
@@ -185,4 +193,4 @@ nl-portal:
                     shaInKey: de14f0e3-2ff0-45eb-95a6-1cdc35ca7a00
                     shaOutKey: de14f0e3-2ff0-45eb-95a6-1cdc35ca7a00
                     failureUrl: http://localhost:3000
-                    successUrl: http://localhost:3000
+                    successUrl: http://localhost:3000

app/src/main/resources/machtigingsdiensten.json

@@ -0,0 +1,12 @@
+[
+  {
+    "uuid":"dd95bdee-c493-4757-bae3-fe0a5b5063f8",
+    "naam":"Uitvoeren WMO-dienstverlening",
+    "zaakTypes": [
+      "dd95bdee-c493-4757-bae3-fe0a5b5063f8"
+    ],
+    "taakTypes": [
+      "RMWA"
+    ]
+  }
+]

build.gradle.kts

@@ -1,4 +1,6 @@
 import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
+import io.spring.gradle.dependencymanagement.org.codehaus.plexus.interpolation.os.Os.FAMILY_MAC
+import org.apache.tools.ant.taskdefs.condition.Os
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import java.net.URI
@@ -44,7 +46,7 @@ plugins {
 
     id("org.jetbrains.dokka")
 
-    id("org.owasp.dependencycheck") version "11.1.1"
+    id("org.owasp.dependencycheck") version "12.0.0"
 
     `maven-publish`
     `signing`
@@ -122,6 +124,10 @@ subprojects {
             freeCompilerArgs.add("-Xjsr305=strict")
             freeCompilerArgs.add("-Xemit-jvm-type-annotations")
         }
+        val ktlintFormat: Task? by tasks
+        if (ktlintFormat != null) {
+            dependsOn(ktlintFormat)
+        }
     }
 
     println("Enabling Spring Boot Dependency Management in project ${project.name}...")
@@ -134,10 +140,6 @@ subprojects {
         }
     }
 
-    tasks.withType<Test> {
-        useJUnitPlatform()
-    }
-
     publishing {
         repositories {
             maven {
@@ -208,6 +210,16 @@ subprojects {
             sign(publishing.publications["default"])
         }
     }
+
+    apply(from = "${rootProject.projectDir}/gradle/testing.gradle.kts")
+
+    if (Os.isFamily(FAMILY_MAC)) {
+        println("Configure docker compose for macOs")
+        dockerCompose {
+            executable = "/usr/local/bin/docker-compose"
+            dockerExecutable = "/usr/local/bin/docker"
+        }
+    }
 }
 
 tasks.register<HtmlDependencyReportTask>("htmlDependencyReport")

case/build.gradle.kts

@@ -1,6 +1,3 @@
-import io.spring.gradle.dependencymanagement.org.codehaus.plexus.interpolation.os.Os.FAMILY_MAC
-import org.apache.tools.ant.taskdefs.condition.Os
-
 /*
  * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
@@ -21,12 +18,8 @@ plugins {
 }
 
 dockerCompose {
-    if (Os.isFamily(FAMILY_MAC)) {
-        executable = "/usr/local/bin/docker-compose"
-        dockerExecutable = "/usr/local/bin/docker"
-    }
-    projectNamePrefix = "case"
-    isRequiredBy(tasks.getByName("test"))
+    setProjectName("$name-test")
+    isRequiredBy(tasks.getByName("integrationTest"))
     useComposeFiles.addAll("../docker-resources/docker-compose-base-test.yml", "docker-compose-override.yml")
 }
 

docker-resources/docker-compose-base-test.yml

@@ -1,7 +1,6 @@
-version: '3.9'
 services:
     db:
-        image: "postgres"
+        image: postgres:15
         environment:
             - POSTGRES_USER=postgres
             - POSTGRES_PASSWORD=test

docker-resources/imports/openklant-2/database/init.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo ">>>>  Starting Open Klant data import script  <<<<"
+
+sh /docker-entrypoint-initdb.d/sql/fill-data-on-startup.sh  &

docker-resources/imports/openklant-2/database/sql/1-add-authtoken.sql

@@ -0,0 +1 @@
+INSERT INTO public.token_tokenauth (id, token, contact_person, email, organization, last_modified, created, application, administration) VALUES (1, 'ac045222c9e7cde8120b48735560f9b920bb58cd', 'Admin', '[email protected]', '', '2024-09-06 07:26:53.703312 +00:00', '2024-09-06 07:26:53.703384 +00:00', '', '');

docker-resources/imports/openklant-2/database/sql/fill-data-on-startup.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+echo ">>>>  Waiting until Open Klant has initialized the database <<<<"
+while true
+do
+    initiated=$(psql -U openklant -d openklant -t -A -c "SELECT EXISTS (SELECT table_name FROM information_schema.tables WHERE table_name = 'accounts_user');")
+    if [ "t" = "${initiated}" ]
+        then
+            echo "Running database setup scripts"
+            for file in /docker-entrypoint-initdb.d/sql/*.sql
+            do
+                echo "Running $file"
+                psql -U openklant -d openklant -f $file
+            done
+            break
+        else
+            echo "Open Klanten is not initiated yet"
+            sleep 5
+    fi
+done

docker-resources/imports/openklant-2/init/init.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Apply database migrations
+>&2 echo "Apply database migrations"
+python src/manage.py migrate
+
+exists=$(echo "from django.contrib.auth import get_user_model; User = get_user_model(); print(User.objects.filter(username='admin').exists())" | python src/manage.py shell)
+if [ "False" = "${exists}" ]
+then
+  echo "Creating user 'admin'"
+  python src/manage.py createsuperuser --username=admin [email protected] --noinput
+else
+  echo "User 'admin' already exists"
+fi
+echo "Setting 'admin' password."
+echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username='admin'); user.set_password('admin'); user.save()" | python src/manage.py shell
+echo "Loading fixtures"
+python src/manage.py loaddata klantinteracties contactgegevens
+echo "Finished setup"
+
+sh /start.sh

form/build.gradle.kts

@@ -1,6 +1,3 @@
-import io.spring.gradle.dependencymanagement.org.codehaus.plexus.interpolation.os.Os.FAMILY_MAC
-import org.apache.tools.ant.taskdefs.condition.Os
-
 /*
  * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
@@ -21,12 +18,8 @@ plugins {
 }
 
 dockerCompose {
-    if (Os.isFamily(FAMILY_MAC)) {
-        executable = "/usr/local/bin/docker-compose"
-        dockerExecutable = "/usr/local/bin/docker"
-    }
-    projectNamePrefix = "form"
-    isRequiredBy(tasks.getByName("test"))
+    setProjectName("$name-test")
+    isRequiredBy(tasks.getByName("integrationTest"))
     useComposeFiles.addAll("../docker-resources/docker-compose-base-test.yml", "docker-compose-override.yml")
 }
 

gradle.properties

@@ -8,10 +8,10 @@ springBootVersion=3.4.1
 springDependencyManagementVersion=1.1.7
 benManesVersionsVersion=0.51.0
 ktlintVersion=12.1.2
-spotlessVersion=7.0.1
+spotlessVersion=7.0.2
 gradleDockerComposeVersion=0.17.12
 dokkaVersion=2.0.0
 
 org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2048m
 org.gradle.workers.max=10
-version=1.4.36-SNAPSHOT
+version=1.4.37-SNAPSHOT

gradle/testing.gradle.kts

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015-2024 Ritense BV, the Netherlands.
+ *
+ * Licensed under EUPL, Version 1.2 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+tasks.register<Test>("integrationTest") {
+    group = "verification"
+    description =
+        """
+        Composes docker containers and runs Tests tagged with "integration".
+        NB! Project root must contain a docker compose file with the following name: docker-compose-override.yml
+        """.trimIndent()
+    useJUnitPlatform {
+        includeTags("integration")
+    }
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform {
+        excludeTags("integration")
+    }
+}
+
+tasks.named("check") {
+    dependsOn(tasks.getByName("integrationTest"))
+}

product/src/main/kotlin/nl/nlportal/product/autoconfiguration/ProductAutoConfiguration.kt

@@ -15,6 +15,7 @@
  */
 package nl.nlportal.product.autoconfiguration
 
+import nl.nlportal.commonground.authentication.AuthenticationMachtigingsDienstService
 import nl.nlportal.core.ssl.ClientSslContextResolver
 import nl.nlportal.product.client.DmnClient
 import nl.nlportal.product.client.DmnConfig
@@ -58,6 +59,7 @@ class ProductAutoConfiguration {
         taakObjectConfig: TaakObjectConfig,
         objectsApiTaskConfig: TaakObjectConfig,
         dmnClient: DmnClient,
+        authenticationMachtigingsDienstService: AuthenticationMachtigingsDienstService,
     ): ProductService {
         return ProductService(
             productConfig,
@@ -66,6 +68,7 @@ class ProductAutoConfiguration {
             taakObjectConfig,
             objectsApiTaskConfig,
             dmnClient,
+            authenticationMachtigingsDienstService,
         )
     }
 

product/src/main/kotlin/nl/nlportal/product/graphql/ProductQuery.kt

@@ -86,7 +86,7 @@ class ProductQuery(
         dfe: DataFetchingEnvironment,
         productTypeId: UUID? = null,
         productName: String,
-        pageSize: Int? = 20,
+        pageSize: Int? = null,
         isOpen: Boolean? = null,
     ): List<Zaak> {
         return productService.getProductZaken(

product/src/main/kotlin/nl/nlportal/product/service/ProductService.kt

@@ -17,6 +17,7 @@ package nl.nlportal.product.service
 
 import com.fasterxml.jackson.databind.node.ObjectNode
 import io.github.oshai.kotlinlogging.KotlinLogging
+import nl.nlportal.commonground.authentication.AuthenticationMachtigingsDienstService
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
 import nl.nlportal.core.util.Mapper
 import nl.nlportal.product.client.DmnClient
@@ -50,6 +51,7 @@ class ProductService(
     val taakObjectConfig: TaakObjectConfig,
     val objectsApiTaskConfig: TaakObjectConfig,
     val dmnClient: DmnClient,
+    val authenticationMachtigingsDienstService: AuthenticationMachtigingsDienstService,
 ) {
     suspend fun getProduct(
         authentication: CommonGroundAuthentication,
@@ -154,17 +156,30 @@ class ProductService(
             return emptyList()
         }
 
+        // val zaakTypes = mutableSetOf<UUID>()
+        val zaakTypes = productType.zaaktypen
         val request =
             zakenApiClient.zoeken()
                 .search()
                 .page(pageNumber)
                 .withAuthentication(authentication)
-                .ofZaakTypes(productType.zaaktypen.map { it })
         pageSize?.let { request.pageSize(it) }
         isOpen?.let {
             request.isOpen(isOpen)
         }
 
+        /*authenticationMachtigingsDienstService.zaakTypes(authentication)?.let {
+            zaakTypes.addAll(it)
+        }*/
+
+        if (!authenticationMachtigingsDienstService.isAllowedZaakTypes(authentication, zaakTypes)) {
+            return emptyList()
+        }
+
+        if (zaakTypes.isNotEmpty()) {
+            request.ofZaakTypes(zaakTypes.toList())
+        }
+
         authentication.getVestigingsNummer()?.let {
             request.ofVestigingsNummer(it)
         }
@@ -346,12 +361,16 @@ class ProductService(
         pageSize: Int,
     ): List<TaakV2> {
         val objectSearchParameters =
-            listOf(
+            mutableListOf(
                 ObjectSearchParameter("identificatie__type", Comparator.EQUAL_TO, authentication.userType),
                 ObjectSearchParameter("identificatie__value", Comparator.EQUAL_TO, authentication.userId),
                 ObjectSearchParameter("status", Comparator.EQUAL_TO, "open"),
             )
 
+        authenticationMachtigingsDienstService.taakTypes(authentication)?.let {
+            objectSearchParameters.add(ObjectSearchParameter("eigenaar", Comparator.IN_LIST, it.joinToString("|")))
+        }
+
         return getObjectsApiObjectResultPage<TaakObjectV2>(
             objectsApiTaskConfig.typeUrlV2,
             objectSearchParameters,
@@ -442,4 +461,4 @@ class ProductService(
 
         val logger = KotlinLogging.logger {}
     }
-}
+}