Skip to content

Commit

Permalink
chore: convert rest of app zoeken package to kotlin (#2434)
Browse files Browse the repository at this point in the history 
Convert rest of app zoeken package to Kotlin and improved code.

Solves PZ-5096
  • Loading branch information
@edgarvonk
edgarvonk authored Jan 17, 2025
1 parent e338152 commit 51202a6
Show file tree
Hide file tree
Showing 33 changed files with 724 additions and 688 deletions.
177 changes: 177 additions & 0 deletions src/itest/kotlin/nl/info/zac/itest/ZoekenRESTServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ import nl.info.zac.itest.client.ItestHttpClient
import nl.info.zac.itest.config.ItestConfiguration.COMMUNICATIEKANAAL_TEST_1
import nl.info.zac.itest.config.ItestConfiguration.COMMUNICATIEKANAAL_TEST_2
import nl.info.zac.itest.config.ItestConfiguration.DATE_2024_01_01
import nl.info.zac.itest.config.ItestConfiguration.DOCUMENT_STATUS_DEFINITIEF
import nl.info.zac.itest.config.ItestConfiguration.DOCUMENT_STATUS_IN_BEWERKING
import nl.info.zac.itest.config.ItestConfiguration.DOCUMENT_VERTROUWELIJKHEIDS_AANDUIDING_OPENBAAR
import nl.info.zac.itest.config.ItestConfiguration.DOCUMENT_VERTROUWELIJKHEIDS_AANDUIDING_VERTROUWELIJK
import nl.info.zac.itest.config.ItestConfiguration.HUMAN_TASK_AANVULLENDE_INFORMATIE_NAAM
import nl.info.zac.itest.config.ItestConfiguration.INFORMATIE_OBJECT_TYPE_BIJLAGE_OMSCHRIJVING
import nl.info.zac.itest.config.ItestConfiguration.INFORMATIE_OBJECT_TYPE_EMAIL_OMSCHRIJVING
import nl.info.zac.itest.config.ItestConfiguration.OBJECT_PRODUCTAANVRAAG_1_BRON_KENMERK
import nl.info.zac.itest.config.ItestConfiguration.OPEN_FORMULIEREN_FORMULIER_BRON_NAAM
import nl.info.zac.itest.config.ItestConfiguration.TAAK_1_FATAL_DATE
Expand All @@ -27,14 +32,21 @@ import nl.info.zac.itest.config.ItestConfiguration.TOTAL_COUNT_TASKS
import nl.info.zac.itest.config.ItestConfiguration.TOTAL_COUNT_ZAKEN
import nl.info.zac.itest.config.ItestConfiguration.ZAAKTYPE_INDIENEN_AANSPRAKELIJKSTELLING_DOOR_DERDEN_BEHANDELEN_DESCRIPTION
import nl.info.zac.itest.config.ItestConfiguration.ZAAKTYPE_MELDING_KLEIN_EVENEMENT_DESCRIPTION
import nl.info.zac.itest.config.ItestConfiguration.ZAAKTYPE_MELDING_KLEIN_EVENEMENT_IDENTIFICATIE
import nl.info.zac.itest.config.ItestConfiguration.ZAAKTYPE_MELDING_KLEIN_EVENEMENT_UUID
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_DESCRIPTION_1
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_MANUAL_2_IDENTIFICATION
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_PRODUCTAANVRAAG_1_IDENTIFICATION
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_PRODUCTAANVRAAG_1_OMSCHRIJVING
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_PRODUCTAANVRAAG_1_TOELICHTING
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_CREATION_DATE
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_FILE_NAME
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_TITEL
import nl.info.zac.itest.config.ItestConfiguration.ZAAK_PRODUCTAANVRAAG_2_IDENTIFICATION
import nl.info.zac.itest.config.ItestConfiguration.ZAC_API_URI
import nl.info.zac.itest.config.ItestConfiguration.zaakManual2Identification
import nl.info.zac.itest.util.shouldEqualJsonIgnoringOrderAndExtraneousFields
import org.json.JSONObject

// Run this test last so that all the required data is available in the Solr index
@Order(TEST_SPEC_ORDER_LAST)
Expand Down Expand Up @@ -518,4 +530,169 @@ class ZoekenRESTServiceTest : BehaviorSpec({
}
}
}
Given("""Documents have been created and are indexed""") {
When(
"""the search endpoint is called to search for all objects of type 'DOCUMENT'"""
) {
val response = itestHttpClient.performPutRequest(
url = "$ZAC_API_URI/zoeken/list",
requestBodyAsString = """
{
"filtersType": "ZoekParameters",
"alleenMijnZaken": false,
"alleenOpenstaandeZaken": false,
"alleenAfgeslotenZaken": false,
"alleenMijnTaken": false,
"zoeken": {},
"filters": {},
"datums": {},
"rows": 10,
"page":0,
"type":"DOCUMENT"
}
""".trimIndent()
)
Then(
"""
the response is successful and the search results should include the expected number of indexed documents
and the expected search filters
""".trimMargin()
) {
val responseBody = response.body!!.string()
logger.info { "Response: $responseBody" }
response.isSuccessful shouldBe true
JSONObject(responseBody).getInt("totaal") shouldBe TOTAL_COUNT_DOCUMENTS
JSONObject(responseBody).getJSONObject("filters").toString() shouldEqualJsonIgnoringOrderAndExtraneousFields """
{
"ZAAKTYPE" : [ {
"aantal" : $TOTAL_COUNT_DOCUMENTS,
"naam" : "$ZAAKTYPE_MELDING_KLEIN_EVENEMENT_DESCRIPTION"
} ],
"DOCUMENT_STATUS" : [ {
"aantal" : 5,
"naam" : "$DOCUMENT_STATUS_DEFINITIEF"
}, {
"aantal" : 2,
"naam" : "$DOCUMENT_STATUS_IN_BEWERKING"
} ],
"DOCUMENT_TYPE" : [ {
"aantal" : 6,
"naam" : "$INFORMATIE_OBJECT_TYPE_BIJLAGE_OMSCHRIJVING"
}, {
"aantal" : 1,
"naam" : "$INFORMATIE_OBJECT_TYPE_EMAIL_OMSCHRIJVING"
} ],
"DOCUMENT_VERGRENDELD_DOOR" : [ {
"aantal" : $TOTAL_COUNT_DOCUMENTS,
"naam" : "-NULL-"
} ],
"DOCUMENT_INDICATIES" : [ {
"aantal" : $TOTAL_COUNT_DOCUMENTS,
"naam" : "ONDERTEKEND"
}, {
"aantal" : 6,
"naam" : "GEBRUIKSRECHT"
}, {
"aantal" : 1,
"naam" : "VERZONDEN"
} ]
}
"""
}
}
}
Given("""Documents have been created and are indexed""") {
When(
"""the search endpoint is called to search for a specific document"""
) {
val response = itestHttpClient.performPutRequest(
url = "$ZAC_API_URI/zoeken/list",
requestBodyAsString = """
{
"filtersType": "ZoekParameters",
"alleenMijnZaken": false,
"alleenOpenstaandeZaken": false,
"alleenAfgeslotenZaken": false,
"alleenMijnTaken": false,
"zoeken": { "DOCUMENT_TITEL": "Dummy test document" },
"filters": {},
"datums": {},
"rows": 10,
"page":0,
"type":"DOCUMENT"
}
""".trimIndent()
)
Then(
"""
the response is successful and the search results should include the expected document
""".trimMargin()
) {
val responseBody = response.body!!.string()
logger.info { "Response: $responseBody" }
response.isSuccessful shouldBe true
responseBody shouldEqualJsonIgnoringOrderAndExtraneousFields """
{
"foutmelding" : "",
"resultaten" : [ {
"type" : "DOCUMENT",
"auteur" : "Aanvrager",
"beschrijving" : "Ingezonden formulier",
"bestandsnaam" : "$ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_FILE_NAME",
"bestandsomvang" : 1234,
"creatiedatum" : "$ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_CREATION_DATE",
"documentType" : "bijlage",
"formaat" : "application/pdf",
"indicatieGebruiksrecht" : false,
"indicatieOndertekend" : true,
"indicatieVergrendeld" : false,
"indicaties" : [ "ONDERTEKEND" ],
"rechten" : {
"lezen" : true,
"ondertekenen" : false,
"ontgrendelen" : true,
"toevoegenNieuweVersie" : true,
"vergrendelen" : false,
"verwijderen" : true,
"wijzigen" : true
},
"registratiedatum" : "$ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_CREATION_DATE",
"status" : "definitief",
"titel" : "$ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_TITEL",
"versie" : 1,
"vertrouwelijkheidaanduiding" : "$DOCUMENT_VERTROUWELIJKHEIDS_AANDUIDING_VERTROUWELIJK",
"zaakIdentificatie" : "$ZAAK_PRODUCTAANVRAAG_2_IDENTIFICATION",
"zaakRelatie" : "Hoort bij, omgekeerd: kent",
"zaaktypeIdentificatie" : "$ZAAKTYPE_MELDING_KLEIN_EVENEMENT_IDENTIFICATIE",
"zaaktypeOmschrijving" : "$ZAAKTYPE_MELDING_KLEIN_EVENEMENT_DESCRIPTION",
"zaaktypeUuid" : "$ZAAKTYPE_MELDING_KLEIN_EVENEMENT_UUID"
} ],
"totaal" : 1.0,
"filters" : {
"ZAAKTYPE" : [ {
"aantal" : 1,
"naam" : "$ZAAKTYPE_MELDING_KLEIN_EVENEMENT_DESCRIPTION"
} ],
"DOCUMENT_STATUS" : [ {
"aantal" : 1,
"naam" : "$DOCUMENT_STATUS_DEFINITIEF"
} ],
"DOCUMENT_TYPE" : [ {
"aantal" : 1,
"naam" : "$INFORMATIE_OBJECT_TYPE_BIJLAGE_OMSCHRIJVING"
} ],
"DOCUMENT_VERGRENDELD_DOOR" : [ {
"aantal" : 1,
"naam" : "-NULL-"
} ],
"DOCUMENT_INDICATIES" : [ {
"aantal" : 1,
"naam" : "ONDERTEKEND"
} ]
}
}
"""
}
}
}
})
6 changes: 5 additions & 1 deletion src/itest/kotlin/nl/info/zac/itest/config/ItestConfiguration.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ object ItestConfiguration {
const val HUMAN_TASK_AANVULLENDE_INFORMATIE_NAAM = "Aanvullende informatie"
const val INFORMATIE_OBJECT_TYPE_BIJLAGE_OMSCHRIJVING = "bijlage"
const val INFORMATIE_OBJECT_TYPE_BIJLAGE_UUID = "b1933137-94d6-49bc-9e12-afe712512276"
const val INFORMATIE_OBJECT_TYPE_EMAIL_OMSCHRIJVING = "e-mail"
const val KEYCLOAK_HOSTNAME_URL = "http://localhost:8081"
const val KEYCLOAK_HEALTH_READY_URL = "http://localhost:9001/health/ready"
const val KEYCLOAK_REALM = "zaakafhandelcomponent"
Expand Down Expand Up @@ -235,13 +236,16 @@ object ItestConfiguration {
const val ZAAK_PRODUCTAANVRAAG_1_TOELICHTING = "dummyZaakToelichting"

/**
* First zaak created from a productaanvraag.
* Second zaak created from a productaanvraag.
* Currently, the zaak identification is not set by ZAC but generated by OpenZaak using the format:
* 'ZAAK-YYYY-SEQUENCE_NUMBER' where the year is taken from the start date of the zaak.
*/
const val ZAAK_PRODUCTAANVRAAG_2_IDENTIFICATION = "ZAAK-1999-0000000001"
const val ZAAK_PRODUCTAANVRAAG_2_START_DATE = "1999-01-01"
const val ZAAK_PRODUCTAANVRAAG_2_UITERLIJKE_EINDDATUM_AFDOENING = "1999-01-15"
const val ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_CREATION_DATE = "2023-10-30"
const val ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_TITEL = "Dummy test document"
const val ZAAK_PRODUCTAANVRAAG_2_DOCUMENT_FILE_NAME = "dummy-test-document.pdf"

/**
* First 'manually' created zaak using the ZAC API.
Expand Down
3 changes: 2 additions & 1 deletion .../net/atos/zac/app/inboxdocumenten/converter/RESTInboxDocumentListParametersConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ protected void doConvert(final InboxDocumentListParameters listParameters, final
listParameters.setIdentificatie(restListParameters.identificatie);
listParameters.setTitel(restListParameters.titel);
if (restListParameters.creatiedatum != null && restListParameters.creatiedatum.hasValue()) {
listParameters.setCreatiedatum(new DatumRange(restListParameters.creatiedatum.van, restListParameters.creatiedatum.tot));
listParameters.setCreatiedatum(new DatumRange(restListParameters.creatiedatum.getVan(), restListParameters.creatiedatum
.getTot()));
}
}

Expand Down
6 changes: 4 additions & 2 deletions ...ac/app/ontkoppeldedocumenten/converter/RESTOntkoppeldDocumentListParametersConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@ protected void doConvert(
listParameters.setTitel(restListParameters.titel);

if (restListParameters.creatiedatum != null && restListParameters.creatiedatum.hasValue()) {
listParameters.setCreatiedatum(new DatumRange(restListParameters.creatiedatum.van, restListParameters.creatiedatum.tot));
listParameters.setCreatiedatum(new DatumRange(restListParameters.creatiedatum.getVan(), restListParameters.creatiedatum
.getTot()));
}

if (restListParameters.ontkoppeldDoor != null) {
listParameters.setOntkoppeldDoor(restListParameters.ontkoppeldDoor.getId());
}

if (restListParameters.ontkoppeldOp != null && restListParameters.ontkoppeldOp.hasValue()) {
listParameters.setOntkoppeldOp(new DatumRange(restListParameters.ontkoppeldOp.van, restListParameters.ontkoppeldOp.tot));
listParameters.setOntkoppeldOp(new DatumRange(restListParameters.ontkoppeldOp.getVan(), restListParameters.ontkoppeldOp
.getTot()));
}

listParameters.setZaakID(restListParameters.zaakID);
Expand Down
3 changes: 2 additions & 1 deletion ...s/zac/app/productaanvragen/converter/RESTInboxProductaanvraagListParametersConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ protected void doConvert(
listParameters.setInitiatorID(restListParameters.initiatorID);

if (restListParameters.ontvangstdatum != null && restListParameters.ontvangstdatum.hasValue()) {
listParameters.setOntvangstdatum(new DatumRange(restListParameters.ontvangstdatum.van, restListParameters.ontvangstdatum.tot));
listParameters.setOntvangstdatum(new DatumRange(restListParameters.ontvangstdatum.getVan(), restListParameters.ontvangstdatum
.getTot()));
}
}

Expand Down
61 changes: 0 additions & 61 deletions src/main/java/net/atos/zac/app/zoeken/ZoekenRestService.java
View file

This file was deleted.

Loading

0 comments on commit 51202a6

Please sign in to comment.