Merge branch 'development' into feature/remove-empty-dmn-rules

Author: flinden68

gradle.properties

@@ -9,7 +9,7 @@ springDependencyManagementVersion=1.1.7
 benManesVersionsVersion=0.51.0
 ktlintVersion=12.1.2
 spotlessVersion=6.25.0
-gradleDockerComposeVersion=0.17.11
+gradleDockerComposeVersion=0.17.12
 dokkaVersion=1.9.20
 
 org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2048m

zgw/berichten/src/main/kotlin/nl/nlportal/berichten/graphql/BerichtenQuery.kt

@@ -37,16 +37,23 @@ class BerichtenQuery(
         )
     }
 
-    @GraphQLDescription("Returns a paginated list of all Berichten")
+    @GraphQLDescription(
+        """
+        Returns a paginated list of all Berichten
+        Could partial search on 'onderwerp'
+    """,
+    )
     suspend fun getBerichten(
         dfe: DataFetchingEnvironment,
         pageNumber: Int? = 1,
         pageSize: Int? = 20,
+        onderwerp: String? = null,
     ): BerichtenPage {
         return berichtenService.getBerichtenPage(
             authentication = dfe.graphQlContext[AUTHENTICATION_KEY],
             pageNumber = pageNumber ?: 1,
             pageSize = pageSize ?: 20,
+            onderwerp = onderwerp,
         )
     }
 

zgw/berichten/src/main/kotlin/nl/nlportal/berichten/service/BerichtenService.kt

@@ -20,6 +20,7 @@ import nl.nlportal.berichten.autoconfigure.BerichtenConfigurationProperties
 import nl.nlportal.berichten.domain.Bericht
 import nl.nlportal.berichten.graphql.BerichtenPage
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
+import nl.nlportal.zgw.objectenapi.domain.Comparator
 import nl.nlportal.zgw.objectenapi.domain.Comparator.EQUAL_TO
 import nl.nlportal.zgw.objectenapi.domain.Comparator.LOWER_THAN_OR_EQUAL_TO
 import nl.nlportal.zgw.objectenapi.domain.Comparator.STRING_CONTAINS
@@ -83,15 +84,26 @@ class BerichtenService(
         authentication: CommonGroundAuthentication,
         pageNumber: Int,
         pageSize: Int,
+        onderwerp: String?,
     ): BerichtenPage {
         // fix because ObjectsAPI filter LTE only accept dates, not date-time
         val filterPublicationDate = LocalDate.now().plusDays(1)
         val searchParameters =
-            listOf(
+            mutableListOf(
                 ObjectSearchParameter("identificatie__type", EQUAL_TO, authentication.userType),
                 ObjectSearchParameter("identificatie__value", EQUAL_TO, authentication.userId),
                 ObjectSearchParameter("publicatiedatum", LOWER_THAN_OR_EQUAL_TO, filterPublicationDate.toString()),
             )
+
+        onderwerp?.let {
+            searchParameters.add(
+                ObjectSearchParameter(
+                    "onderwerp",
+                    Comparator.STRING_CONTAINS,
+                    it.toString(),
+                ),
+            )
+        }
         val results = getBerichten(pageNumber, pageSize, searchParameters)
 
         return results.toBerichtenPage(pageNumber, pageSize)

zgw/berichten/src/test/kotlin/nl/nlportal/berichten/graphql/BerichtenQueryIT.kt

@@ -33,9 +33,9 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.SpyBean
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.web.reactive.function.BodyInserters
@@ -49,7 +49,7 @@ class BerichtenQueryIT(
     @Autowired private val berichtenConfigurationProperties: BerichtenConfigurationProperties,
     @Autowired private val objectsApiClientConfig: ObjectsApiClientConfig,
 ) {
-    @SpyBean lateinit var berichtenService: BerichtenService
+    @MockitoSpyBean lateinit var berichtenService: BerichtenService
 
     lateinit var mockObjectenApi: MockWebServer