Skip to content

Commit a97334b

Browse files
committed
Merge branch 'development' into feature/remove-empty-dmn-rules
2 parents 9820224 + eb841a4 commit a97334b

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ springDependencyManagementVersion=1.1.7
99
benManesVersionsVersion=0.51.0
1010
ktlintVersion=12.1.2
1111
spotlessVersion=6.25.0
12-
gradleDockerComposeVersion=0.17.11
12+
gradleDockerComposeVersion=0.17.12
1313
dokkaVersion=1.9.20
1414

1515
org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2048m

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,23 @@ class BerichtenQuery(
3737
)
3838
}
3939

40-
@GraphQLDescription("Returns a paginated list of all Berichten")
40+
@GraphQLDescription(
41+
"""
42+
Returns a paginated list of all Berichten
43+
Could partial search on 'onderwerp'
44+
""",
45+
)
4146
suspend fun getBerichten(
4247
dfe: DataFetchingEnvironment,
4348
pageNumber: Int? = 1,
4449
pageSize: Int? = 20,
50+
onderwerp: String? = null,
4551
): BerichtenPage {
4652
return berichtenService.getBerichtenPage(
4753
authentication = dfe.graphQlContext[AUTHENTICATION_KEY],
4854
pageNumber = pageNumber ?: 1,
4955
pageSize = pageSize ?: 20,
56+
onderwerp = onderwerp,
5057
)
5158
}
5259

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

+13-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import nl.nlportal.berichten.autoconfigure.BerichtenConfigurationProperties
2020
import nl.nlportal.berichten.domain.Bericht
2121
import nl.nlportal.berichten.graphql.BerichtenPage
2222
import nl.nlportal.commonground.authentication.CommonGroundAuthentication
23+
import nl.nlportal.zgw.objectenapi.domain.Comparator
2324
import nl.nlportal.zgw.objectenapi.domain.Comparator.EQUAL_TO
2425
import nl.nlportal.zgw.objectenapi.domain.Comparator.LOWER_THAN_OR_EQUAL_TO
2526
import nl.nlportal.zgw.objectenapi.domain.Comparator.STRING_CONTAINS
@@ -83,15 +84,26 @@ class BerichtenService(
8384
authentication: CommonGroundAuthentication,
8485
pageNumber: Int,
8586
pageSize: Int,
87+
onderwerp: String?,
8688
): BerichtenPage {
8789
// fix because ObjectsAPI filter LTE only accept dates, not date-time
8890
val filterPublicationDate = LocalDate.now().plusDays(1)
8991
val searchParameters =
90-
listOf(
92+
mutableListOf(
9193
ObjectSearchParameter("identificatie__type", EQUAL_TO, authentication.userType),
9294
ObjectSearchParameter("identificatie__value", EQUAL_TO, authentication.userId),
9395
ObjectSearchParameter("publicatiedatum", LOWER_THAN_OR_EQUAL_TO, filterPublicationDate.toString()),
9496
)
97+
98+
onderwerp?.let {
99+
searchParameters.add(
100+
ObjectSearchParameter(
101+
"onderwerp",
102+
Comparator.STRING_CONTAINS,
103+
it.toString(),
104+
),
105+
)
106+
}
95107
val results = getBerichten(pageNumber, pageSize, searchParameters)
96108

97109
return results.toBerichtenPage(pageNumber, pageSize)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import org.junit.jupiter.api.extension.ExtendWith
3333
import org.springframework.beans.factory.annotation.Autowired
3434
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
3535
import org.springframework.boot.test.context.SpringBootTest
36-
import org.springframework.boot.test.mock.mockito.SpyBean
3736
import org.springframework.http.HttpHeaders
3837
import org.springframework.http.MediaType
38+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean
3939
import org.springframework.test.context.junit.jupiter.SpringExtension
4040
import org.springframework.test.web.reactive.server.WebTestClient
4141
import org.springframework.web.reactive.function.BodyInserters
@@ -49,7 +49,7 @@ class BerichtenQueryIT(
4949
@Autowired private val berichtenConfigurationProperties: BerichtenConfigurationProperties,
5050
@Autowired private val objectsApiClientConfig: ObjectsApiClientConfig,
5151
) {
52-
@SpyBean lateinit var berichtenService: BerichtenService
52+
@MockitoSpyBean lateinit var berichtenService: BerichtenService
5353

5454
lateinit var mockObjectenApi: MockWebServer
5555

0 commit comments

Comments
 (0)