Skip to content

Commit f02e343

Browse files
hartmanhartman
authored
Merge branch 'valtimo-platform:next-minor' into baseflow/next-minor
2 parents 42b4f0e + c9d5df0 commit f02e343

510 files changed

Lines changed: 17106 additions & 4409 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/backend_build_test_libraries.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,26 @@ jobs:
187187
- name: Run integration test suite
188188
run: ./gradlew ${{ matrix.integration_test_suite }}
189189

190+
integration-testing-mysql:
191+
runs-on: ubuntu-latest
192+
needs: [check_cache, build_libraries]
193+
if: ${{ needs.check_cache.outputs.cache-hit != 'true' }}
194+
steps:
195+
- name: Checkout code
196+
uses: actions/checkout@v4
197+
- uses: actions/setup-java@v4
198+
with:
199+
distribution: "temurin"
200+
java-version: "21"
201+
cache: gradle
202+
- name: Download built libraries
203+
uses: actions/download-artifact@v4
204+
with:
205+
name: backend-build-output
206+
path: .
207+
- name: Run MySQL integration test (verzoek)
208+
run: ./gradlew :backend:zgw:verzoek:integrationTestingMysql
209+
190210
security-testing:
191211
needs: [determine-tests, check_cache, build_libraries]
192212
strategy:
@@ -225,11 +245,13 @@ jobs:
225245
always() &&
226246
needs.unit-testing.result == 'success' &&
227247
needs.integration-testing.result == 'success' &&
248+
needs.integration-testing-mysql.result == 'success' &&
228249
(needs.security-testing.result == 'success' || needs.security-testing.result == 'skipped')
229250
needs:
230251
- check_cache
231252
- unit-testing
232253
- integration-testing
254+
- integration-testing-mysql
233255
- security-testing
234256
- build_libraries
235257
steps:

‎backend/app/gzac/docker-compose.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ services:
5959
gzac-database-mysql:
6060
container_name: gzac-docker-compose-gzac-database-mysql
6161
image: mysql/mysql-server:8.0.28-1.2.7-server
62+
profiles:
63+
- mysql
6264
ports:
6365
- "33060:3306"
6466
environment:
@@ -103,6 +105,8 @@ services:
103105
container_name: gotenberg-pdf-conversion-api
104106
ports:
105107
- "3000:3000"
108+
environment:
109+
API_TIMEOUT: "240s"
106110

107111
# ZGW
108112

@@ -582,6 +586,8 @@ services:
582586
ports:
583587
- "6379:6379"
584588
container_name: iko-redis
589+
profiles:
590+
- iko
585591
healthcheck:
586592
test: [ "CMD", "redis-cli", "ping" ]
587593
interval: 10s

‎backend/app/gzac/src/dev/resources/config/building-block/household-verification/1-0-0/bpmn/household-verification-process.bpmn‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,32 @@
4747
<bpmn:incoming>Flow_PatchZaak_To_ReadToelichting</bpmn:incoming>
4848
<bpmn:outgoing>Flow_ReadToelichting_To_Calculate</bpmn:outgoing>
4949
</bpmn:serviceTask>
50-
<bpmn:serviceTask id="CalculateBaseAmountTask" name="Bereken Basisbedrag" camunda:asyncAfter="true" camunda:expression="${valueResolverDelegateService.handleValue(execution, 'doc:/baseSubsidyAmount', valueResolverDelegateService.resolveValue(execution, 'doc:/householdSize') * 2)}">
50+
<bpmn:serviceTask id="ResolveHouseholdSizeTask" name="Haal Huishoudgrootte Op" camunda:asyncAfter="true" camunda:expression="${execution.setVariable('householdSize', valueResolverDelegateService.resolveValue(execution, 'doc:/householdSize'))}">
5151
<bpmn:incoming>Flow_ReadToelichting_To_Calculate</bpmn:incoming>
52+
<bpmn:outgoing>Flow_ResolveHouseholdSize_To_Calculate</bpmn:outgoing>
53+
</bpmn:serviceTask>
54+
<bpmn:businessRuleTask id="CalculateBaseAmountDmnTask" name="Bereken Basisbedrag (DMN)" camunda:asyncAfter="true" camunda:decisionRef="base-subsidy-amount-decision" camunda:mapDecisionResult="singleResult" camunda:resultVariable="dmnResult" camunda:decisionRefBinding="versionTag" camunda:decisionRefVersionTag="BB:household-verification:1.0.0">
55+
<bpmn:extensionElements>
56+
<camunda:inputOutput>
57+
<camunda:outputParameter name="baseSubsidyAmount">${dmnResult.baseSubsidyAmount}</camunda:outputParameter>
58+
</camunda:inputOutput>
59+
</bpmn:extensionElements>
60+
<bpmn:incoming>Flow_ResolveHouseholdSize_To_Calculate</bpmn:incoming>
61+
<bpmn:outgoing>Flow_Calculate_To_StoreBaseAmount</bpmn:outgoing>
62+
</bpmn:businessRuleTask>
63+
<bpmn:serviceTask id="StoreBaseAmountTask" name="Sla Basisbedrag Op" camunda:asyncAfter="true" camunda:expression="${valueResolverDelegateService.handleValue(execution, 'doc:/baseSubsidyAmount', baseSubsidyAmount)}">
64+
<bpmn:incoming>Flow_Calculate_To_StoreBaseAmount</bpmn:incoming>
5265
<bpmn:outgoing>Flow_Calculate_To_End</bpmn:outgoing>
5366
</bpmn:serviceTask>
5467
<bpmn:sequenceFlow id="Flow_Verify_To_PatchZaak" sourceRef="CreateVerifiedApplicantTask" targetRef="PatchZaakVerificationTask" />
5568
<bpmn:sequenceFlow id="Flow_PatchZaak_To_ReadToelichting" sourceRef="PatchZaakVerificationTask" targetRef="ReadZaakToelichtingTask" />
56-
<bpmn:sequenceFlow id="Flow_ReadToelichting_To_Calculate" sourceRef="ReadZaakToelichtingTask" targetRef="CalculateBaseAmountTask" />
69+
<bpmn:sequenceFlow id="Flow_ReadToelichting_To_Calculate" sourceRef="ReadZaakToelichtingTask" targetRef="ResolveHouseholdSizeTask" />
70+
<bpmn:sequenceFlow id="Flow_ResolveHouseholdSize_To_Calculate" sourceRef="ResolveHouseholdSizeTask" targetRef="CalculateBaseAmountDmnTask" />
71+
<bpmn:sequenceFlow id="Flow_Calculate_To_StoreBaseAmount" sourceRef="CalculateBaseAmountDmnTask" targetRef="StoreBaseAmountTask" />
5772
<bpmn:endEvent id="EndEvent" name="Verificatie Afgerond">
5873
<bpmn:incoming>Flow_Calculate_To_End</bpmn:incoming>
5974
</bpmn:endEvent>
60-
<bpmn:sequenceFlow id="Flow_Calculate_To_End" sourceRef="CalculateBaseAmountTask" targetRef="EndEvent" />
75+
<bpmn:sequenceFlow id="Flow_Calculate_To_End" sourceRef="StoreBaseAmountTask" targetRef="EndEvent" />
6176
<bpmn:sequenceFlow id="Flow_Start_To_SetStatusVerificatie" sourceRef="StartEvent" targetRef="SetStatusVerificatieTask" />
6277
<bpmn:sequenceFlow id="Flow_SetStatusVerificatie_To_AddTag" sourceRef="SetStatusVerificatieTask" targetRef="AddTagVerificatieTask" />
6378
<bpmn:sequenceFlow id="Flow_AddTag_To_Format" sourceRef="AddTagVerificatieTask" targetRef="FormatNameTask" />
@@ -68,7 +83,7 @@
6883
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
6984
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_HouseholdVerification">
7085
<bpmndi:BPMNShape id="Participant_HouseholdVerification_di" bpmnElement="HouseholdVerificationParticipant" isHorizontal="true">
71-
<dc:Bounds x="160" y="60" width="1570" height="250" />
86+
<dc:Bounds x="160" y="60" width="1830" height="250" />
7287
<bpmndi:BPMNLabel />
7388
</bpmndi:BPMNShape>
7489
<bpmndi:BPMNShape id="StartEvent_di" bpmnElement="StartEvent">
@@ -109,14 +124,22 @@
109124
<dc:Bounds x="1200" y="137" width="100" height="80" />
110125
<bpmndi:BPMNLabel />
111126
</bpmndi:BPMNShape>
112-
<bpmndi:BPMNShape id="CalculateBaseAmountTask_di" bpmnElement="CalculateBaseAmountTask">
127+
<bpmndi:BPMNShape id="ResolveHouseholdSizeTask_di" bpmnElement="ResolveHouseholdSizeTask">
113128
<dc:Bounds x="1330" y="137" width="100" height="80" />
114129
<bpmndi:BPMNLabel />
115130
</bpmndi:BPMNShape>
131+
<bpmndi:BPMNShape id="CalculateBaseAmountDmnTask_di" bpmnElement="CalculateBaseAmountDmnTask">
132+
<dc:Bounds x="1460" y="137" width="100" height="80" />
133+
<bpmndi:BPMNLabel />
134+
</bpmndi:BPMNShape>
135+
<bpmndi:BPMNShape id="StoreBaseAmountTask_di" bpmnElement="StoreBaseAmountTask">
136+
<dc:Bounds x="1590" y="137" width="100" height="80" />
137+
<bpmndi:BPMNLabel />
138+
</bpmndi:BPMNShape>
116139
<bpmndi:BPMNShape id="EndEvent_di" bpmnElement="EndEvent">
117-
<dc:Bounds x="1492" y="159" width="36" height="36" />
140+
<dc:Bounds x="1752" y="159" width="36" height="36" />
118141
<bpmndi:BPMNLabel>
119-
<dc:Bounds x="1470" y="202" width="80" height="27" />
142+
<dc:Bounds x="1730" y="202" width="80" height="27" />
120143
</bpmndi:BPMNLabel>
121144
</bpmndi:BPMNShape>
122145
<bpmndi:BPMNEdge id="Flow_Start_To_SetStatusVerificatie_di" bpmnElement="Flow_Start_To_SetStatusVerificatie">
@@ -155,9 +178,17 @@
155178
<di:waypoint x="1300" y="177" />
156179
<di:waypoint x="1330" y="177" />
157180
</bpmndi:BPMNEdge>
158-
<bpmndi:BPMNEdge id="Flow_Calculate_To_End_di" bpmnElement="Flow_Calculate_To_End">
181+
<bpmndi:BPMNEdge id="Flow_ResolveHouseholdSize_To_Calculate_di" bpmnElement="Flow_ResolveHouseholdSize_To_Calculate">
159182
<di:waypoint x="1430" y="177" />
160-
<di:waypoint x="1492" y="177" />
183+
<di:waypoint x="1460" y="177" />
184+
</bpmndi:BPMNEdge>
185+
<bpmndi:BPMNEdge id="Flow_Calculate_To_StoreBaseAmount_di" bpmnElement="Flow_Calculate_To_StoreBaseAmount">
186+
<di:waypoint x="1560" y="177" />
187+
<di:waypoint x="1590" y="177" />
188+
</bpmndi:BPMNEdge>
189+
<bpmndi:BPMNEdge id="Flow_Calculate_To_End_di" bpmnElement="Flow_Calculate_To_End">
190+
<di:waypoint x="1690" y="177" />
191+
<di:waypoint x="1752" y="177" />
161192
</bpmndi:BPMNEdge>
162193
</bpmndi:BPMNPlane>
163194
</bpmndi:BPMNDiagram>

‎backend/app/gzac/src/dev/resources/config/building-block/household-verification/1-0-0/dmn/base-subsidy-amount-decision.dmn‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="Definitions_BaseSubsidyAmount" name="Base Subsidy Amount Decision" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.28.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.20.0">
3+
<decision id="base-subsidy-amount-decision" name="Basisbedrag Subsidie Beslissing" camunda:historyTimeToLive="180">
4+
<decisionTable id="DecisionTable_BaseSubsidyAmount" hitPolicy="FIRST">
5+
<input id="Input_HouseholdSize" label="Huishoudgrootte" camunda:inputVariable="householdSize">
6+
<inputExpression id="InputExpression_HouseholdSize" typeRef="integer">
7+
<text>householdSize</text>
8+
</inputExpression>
9+
</input>
10+
<output id="Output_BaseSubsidyAmount" label="Basisbedrag subsidie" name="baseSubsidyAmount" typeRef="integer" />
11+
<rule id="Rule_SinglePerson">
12+
<description>Alleenstaande: EUR 200</description>
13+
<inputEntry id="UnaryTests_SinglePerson">
14+
<text>1</text>
15+
</inputEntry>
16+
<outputEntry id="OutputEntry_SingleAmount">
17+
<text>200</text>
18+
</outputEntry>
19+
</rule>
20+
<rule id="Rule_TwoPersons">
21+
<description>2 personen: EUR 350</description>
22+
<inputEntry id="UnaryTests_TwoPersons">
23+
<text>2</text>
24+
</inputEntry>
25+
<outputEntry id="OutputEntry_TwoAmount">
26+
<text>350</text>
27+
</outputEntry>
28+
</rule>
29+
<rule id="Rule_ThreePersons">
30+
<description>3 personen: EUR 500</description>
31+
<inputEntry id="UnaryTests_ThreePersons">
32+
<text>3</text>
33+
</inputEntry>
34+
<outputEntry id="OutputEntry_ThreeAmount">
35+
<text>500</text>
36+
</outputEntry>
37+
</rule>
38+
<rule id="Rule_FourPersons">
39+
<description>4 personen: EUR 650</description>
40+
<inputEntry id="UnaryTests_FourPersons">
41+
<text>4</text>
42+
</inputEntry>
43+
<outputEntry id="OutputEntry_FourAmount">
44+
<text>650</text>
45+
</outputEntry>
46+
</rule>
47+
<rule id="Rule_FiveOrMore">
48+
<description>5+ personen: EUR 800</description>
49+
<inputEntry id="UnaryTests_FiveOrMore">
50+
<text>&gt;= 5</text>
51+
</inputEntry>
52+
<outputEntry id="OutputEntry_FiveOrMoreAmount">
53+
<text>800</text>
54+
</outputEntry>
55+
</rule>
56+
</decisionTable>
57+
</decision>
58+
<dmndi:DMNDI>
59+
<dmndi:DMNDiagram>
60+
<dmndi:DMNShape dmnElementRef="base-subsidy-amount-decision">
61+
<dc:Bounds height="80" width="180" x="160" y="100" />
62+
</dmndi:DMNShape>
63+
</dmndi:DMNDiagram>
64+
</dmndi:DMNDI>
65+
</definitions>

0 commit comments

Comments
 (0)