Skip to content

Commit

Permalink
Merge branch 'master' into feat/CIV-8734
Browse files Browse the repository at this point in the history
  • Loading branch information
German-A-Amoros authored Apr 19, 2024
2 parents 4211205 + 044c79a commit 9c1c944
Show file tree
Hide file tree
Showing 60 changed files with 4,027 additions and 1,544 deletions.
7 changes: 4 additions & 3 deletions bin/utils/ccd-import-definition.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ serviceToken=$(${dir}/idam-lease-service-token.sh ccd_gw $(docker run --rm toolb
version="n/a"
newVersion="n/a"

if [[ "${ENVIRONMENT}" == "preview" ]]; then
if [ "${ENVIRONMENT}" == "preview" ] || [ "${ENVIRONMENT}" == "aat" ]; then
version=$(curl --insecure --silent --show-error -X GET \
${CCD_DEFINITION_STORE_API_BASE_URL:-http://localhost:4451}/api/data/case-type/CIVIL/version \
-H "Authorization: Bearer ${userToken}" \
Expand All @@ -33,7 +33,8 @@ uploadResponse=$(curl --insecure --silent -w "\n%{http_code}" --show-error --ma
upload_http_code=$(echo "$uploadResponse" | tail -n1)
upload_response_content=$(echo "$uploadResponse" | sed '$d')

if [ "${ENVIRONMENT}" == "preview" ] && [ "${upload_http_code}" != "201" ]; then
if [ "${ENVIRONMENT}" == "preview" ] || [ "${ENVIRONMENT}" == "aat" ]; then
if [ "${upload_http_code}" != "201" ]; then
echo "Bypassing audit check as on preview - will wait 45s and then verify the version has changed"
sleep 45

Expand All @@ -47,7 +48,7 @@ if [ "${ENVIRONMENT}" == "preview" ] && [ "${upload_http_code}" != "201" ]; then
echo "Version has not changed - the definition was not imported successfully"
exit 1
fi

fi
echo "CCD definition version has changed, definition successfully uploaded"
exit 0
fi
Expand Down
4 changes: 1 addition & 3 deletions charts/civil-camunda/values.aat.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ java:
CMC_DB_PASSWORD: ${POSTGRES_PASSWORD}
CMC_DB_CONNECTION_OPTIONS: '?sslmode=allow'
REFERENCE_DATABASE_MIGRATION: true
FEIGN_CLIENT_CONFIG_REMOTERUNTIMESERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
FEIGN_CLIENT_CONFIG_REMOTEEXTERNALTASKSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
FEIGN_CLIENT_CONFIG_REMOTEREPOSITORYSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
CAMUNDA_URL: http://${SERVICE_NAME}-camunda/engine-rest/
TESTING_SUPPORT_ENABLED: true
POLLING_EVENT_EMITTER_ENABLED: false
LAUNCH_DARKLY_ENV: camunda-staging
Expand Down
4 changes: 1 addition & 3 deletions charts/civil-camunda/values.preview.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ java:
CMC_DB_USERNAME: "{{ .Values.postgresql.auth.username}}"
CMC_DB_PASSWORD: "{{ .Values.postgresql.auth.password}}"
REFERENCE_DATABASE_MIGRATION: true
FEIGN_CLIENT_CONFIG_REMOTERUNTIMESERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
FEIGN_CLIENT_CONFIG_REMOTEEXTERNALTASKSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
FEIGN_CLIENT_CONFIG_REMOTEREPOSITORYSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
CAMUNDA_URL: http://${SERVICE_NAME}-camunda/engine-rest/
STITCHING_API_ENABLED: false
POLLING_EVENT_EMITTER_ENABLED: false
SERVICE_REQUEST_UPDATE: https://${SERVICE_FQDN}/service-request-update
Expand Down
91 changes: 70 additions & 21 deletions src/main/resources/camunda/applicant_trial_ready_notify_others.bpmn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0rn46su" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.13.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0rn46su" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.9.0">
<bpmn:process id="APPLICANT_TRIAL_READY_NOTIFY_OTHERS" name="Applicant trial ready notify others" isExecutable="true">
<bpmn:startEvent id="Event_0t2zome" name="Start">
<bpmn:outgoing>Flow_08myj65</bpmn:outgoing>
Expand All @@ -13,7 +13,8 @@
<bpmn:extensionElements>
<camunda:in variables="all" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_0g0jkyp</bpmn:incoming>
<bpmn:incoming>Flow_1mcw97n</bpmn:incoming>
<bpmn:incoming>Flow_1ui9efm</bpmn:incoming>
<bpmn:outgoing>Flow_1hce35l</bpmn:outgoing>
</bpmn:callActivity>
<bpmn:serviceTask id="OtherTrialReadyNotifyRespondentSolicitor1" name="Notify Respondent solicitor 1" camunda:type="external" camunda:topic="processCaseEvent">
Expand Down Expand Up @@ -75,7 +76,28 @@
<bpmn:incoming>Flow_1gsn98m</bpmn:incoming>
<bpmn:outgoing>Flow_0g0jkyp</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_0g0jkyp" sourceRef="GenerateTrialReadyFormApplicant" targetRef="Activity_0wretog" />
<bpmn:sequenceFlow id="Flow_0g0jkyp" sourceRef="GenerateTrialReadyFormApplicant" targetRef="Gateway_01l4u29" />
<bpmn:serviceTask id="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty" name="Generate Dashboard Notification For Defendant" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">CREATE_DASHBOARD_NOTIFICATION_TRIAL_ARRANGEMENTS_NOTIFY_DEFENDANT</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1lr6m8a</bpmn:incoming>
<bpmn:outgoing>Flow_1mcw97n</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1mcw97n" sourceRef="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty" targetRef="Activity_0wretog" />
<bpmn:exclusiveGateway id="Gateway_01l4u29">
<bpmn:incoming>Flow_0g0jkyp</bpmn:incoming>
<bpmn:outgoing>Flow_1lr6m8a</bpmn:outgoing>
<bpmn:outgoing>Flow_1ui9efm</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_1lr6m8a" name="Dashboard Service Enabled" sourceRef="Gateway_01l4u29" targetRef="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!empty flowFlags.DASHBOARD_SERVICE_ENABLED &amp;&amp; flowFlags.DASHBOARD_SERVICE_ENABLED}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_1ui9efm" name="Dashboard Service Disabled" sourceRef="Gateway_01l4u29" targetRef="Activity_0wretog">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${empty flowFlags.DASHBOARD_SERVICE_ENABLED || !flowFlags.DASHBOARD_SERVICE_ENABLED}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:textAnnotation id="TextAnnotation_0i3yd0i">
<bpmn:text>Two Respondent Representatives?</bpmn:text>
</bpmn:textAnnotation>
Expand All @@ -92,14 +114,8 @@
<dc:Bounds x="158" y="285" width="25" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0r8yo0r_di" bpmnElement="Event_0r8yo0r">
<dc:Bounds x="1152" y="242" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1x5rl4x_di" bpmnElement="Activity_0wretog">
<dc:Bounds x="1000" y="220" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_03lhz3m_di" bpmnElement="OtherTrialReadyNotifyRespondentSolicitor1">
<dc:Bounds x="660" y="220" width="100" height="80" />
<dc:Bounds x="630" y="220" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0emdthr_di" bpmnElement="TrialReadyProcess">
Expand All @@ -115,24 +131,37 @@
<dc:Bounds x="540" y="90" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_07kc2xy_di" bpmnElement="GenerateTrialReadyFormApplicant">
<dc:Bounds x="820" y="220" width="100" height="80" />
<dc:Bounds x="770" y="220" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="TextAnnotation_0i3yd0i_di" bpmnElement="TextAnnotation_0i3yd0i">
<dc:Bounds x="422" y="310" width="120" height="40" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_01l4u29_di" bpmnElement="Gateway_01l4u29" isMarkerVisible="true">
<dc:Bounds x="905" y="235" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0r8yo0r_di" bpmnElement="Event_0r8yo0r">
<dc:Bounds x="1392" y="242" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1x5rl4x_di" bpmnElement="Activity_0wretog">
<dc:Bounds x="1230" y="220" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0axnyik" bpmnElement="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty">
<dc:Bounds x="1050" y="220" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1fn0bf1_di" bpmnElement="Event_1fn0bf1">
<dc:Bounds x="262" y="202" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="297" y="183" width="27" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1hce35l_di" bpmnElement="Flow_1hce35l">
<di:waypoint x="1100" y="260" />
<di:waypoint x="1152" y="260" />
<di:waypoint x="1330" y="260" />
<di:waypoint x="1392" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1gsn98m_di" bpmnElement="Flow_1gsn98m">
<di:waypoint x="760" y="260" />
<di:waypoint x="820" y="260" />
<di:waypoint x="730" y="260" />
<di:waypoint x="770" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0yvpi10_di" bpmnElement="Flow_0yvpi10">
<di:waypoint x="280" y="202" />
Expand All @@ -152,28 +181,48 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_06dicjn_di" bpmnElement="Flow_06dicjn">
<di:waypoint x="495" y="260" />
<di:waypoint x="660" y="260" />
<di:waypoint x="630" y="260" />
<bpmndi:BPMNLabel>
<dc:Bounds x="580" y="238" width="15" height="14" />
<dc:Bounds x="563" y="238" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_10x6e34_di" bpmnElement="Flow_10x6e34">
<di:waypoint x="640" y="130" />
<di:waypoint x="710" y="130" />
<di:waypoint x="710" y="220" />
<di:waypoint x="680" y="130" />
<di:waypoint x="680" y="220" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ffw39w_di" bpmnElement="Flow_1ffw39w">
<di:waypoint x="330" y="260" />
<di:waypoint x="445" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0g0jkyp_di" bpmnElement="Flow_0g0jkyp">
<di:waypoint x="920" y="260" />
<di:waypoint x="1000" y="260" />
<di:waypoint x="870" y="260" />
<di:waypoint x="905" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1mcw97n_di" bpmnElement="Flow_1mcw97n">
<di:waypoint x="1150" y="260" />
<di:waypoint x="1230" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0ycet74_di" bpmnElement="Association_0ycet74">
<di:waypoint x="470" y="285" />
<di:waypoint x="470" y="310" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1lr6m8a_di" bpmnElement="Flow_1lr6m8a">
<di:waypoint x="955" y="260" />
<di:waypoint x="1050" y="260" />
<bpmndi:BPMNLabel>
<dc:Bounds x="949" y="266" width="81" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ui9efm_di" bpmnElement="Flow_1ui9efm">
<di:waypoint x="930" y="235" />
<di:waypoint x="930" y="130" />
<di:waypoint x="1280" y="130" />
<di:waypoint x="1280" y="220" />
<bpmndi:BPMNLabel>
<dc:Bounds x="938" y="136" width="83" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
58 changes: 47 additions & 11 deletions src/main/resources/camunda/bundle_creation_notification.bpmn
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<bpmn:extensionElements>
<camunda:in variables="all" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_1gsn98m</bpmn:incoming>
<bpmn:incoming>Flow_1utz42u</bpmn:incoming>
<bpmn:outgoing>Flow_1hce35l</bpmn:outgoing>
</bpmn:callActivity>
<bpmn:serviceTask id="BundleCreationNotifyApplicantSolicitor1" name="Notify applicant solicitor 1" camunda:type="external" camunda:topic="processCaseEvent">
Expand All @@ -26,7 +26,7 @@
<bpmn:incoming>Flow_10x6e34</bpmn:incoming>
<bpmn:outgoing>Flow_1gsn98m</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1gsn98m" sourceRef="BundleCreationNotifyApplicantSolicitor1" targetRef="Activity_0wretog" />
<bpmn:sequenceFlow id="Flow_1gsn98m" sourceRef="BundleCreationNotifyApplicantSolicitor1" targetRef="CreateBundleCreatedDashboardNotificationsForDefendant1" />
<bpmn:callActivity id="BundleCreationProcess" name="Start Business Process" calledElement="StartBusinessProcess">
<bpmn:extensionElements>
<camunda:in variables="all" />
Expand Down Expand Up @@ -76,6 +76,26 @@
<bpmn:outgoing>Flow_10x6e34</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1ffw39w" sourceRef="BundleCreationProcess" targetRef="BundleCreationNotifyRespondentSolicitor1" />
<bpmn:serviceTask id="CreateBundleCreatedDashboardNotificationsForDefendant1" name="Create Defendant1 Dashboard Notifications" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">CREATE_DASHBOARD_NOTIFICATION_FOR_BUNDLE_CREATED_FOR_DEFENDANT1</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1gsn98m</bpmn:incoming>
<bpmn:outgoing>Flow_1ubtncf</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1ubtncf" sourceRef="CreateBundleCreatedDashboardNotificationsForDefendant1" targetRef="CreateBundleCreatedDashboardNotificationsForClaimant1" />
<bpmn:serviceTask id="CreateBundleCreatedDashboardNotificationsForClaimant1" name="Create Claimant1 Dashboard Notifications" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">CREATE_DASHBOARD_NOTIFICATION_FOR_BUNDLE_CREATED_FOR_CLAIMANT1</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1ubtncf</bpmn:incoming>
<bpmn:outgoing>Flow_1utz42u</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1utz42u" sourceRef="CreateBundleCreatedDashboardNotificationsForClaimant1" targetRef="Activity_0wretog" />
<bpmn:textAnnotation id="TextAnnotation_0i3yd0i">
<bpmn:text>Two Respondent Representatives?</bpmn:text>
</bpmn:textAnnotation>
Expand All @@ -86,6 +106,10 @@
<bpmn:message id="Message_07vpgvo" name="BUNDLE_CREATION_NOTIFICATION" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="BUNDLE_CREATION_NOTIFICATION">
<bpmndi:BPMNEdge id="Flow_1ubtncf_di" bpmnElement="Flow_1ubtncf">
<di:waypoint x="1000" y="260" />
<di:waypoint x="1040" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ffw39w_di" bpmnElement="Flow_1ffw39w">
<di:waypoint x="320" y="260" />
<di:waypoint x="380" y="260" />
Expand Down Expand Up @@ -124,24 +148,22 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1gsn98m_di" bpmnElement="Flow_1gsn98m">
<di:waypoint x="870" y="260" />
<di:waypoint x="960" y="260" />
<di:waypoint x="900" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1hce35l_di" bpmnElement="Flow_1hce35l">
<di:waypoint x="1060" y="260" />
<di:waypoint x="1142" y="260" />
<di:waypoint x="1280" y="260" />
<di:waypoint x="1342" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1utz42u_di" bpmnElement="Flow_1utz42u">
<di:waypoint x="1140" y="260" />
<di:waypoint x="1180" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_1m02c2o_di" bpmnElement="Event_0t2zome">
<dc:Bounds x="152" y="242" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="158" y="285" width="24" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0r8yo0r_di" bpmnElement="Event_0r8yo0r">
<dc:Bounds x="1142" y="242" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1x5rl4x_di" bpmnElement="Activity_0wretog">
<dc:Bounds x="960" y="220" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_03lhz3m_di" bpmnElement="BundleCreationNotifyApplicantSolicitor1">
<dc:Bounds x="770" y="220" width="100" height="80" />
</bpmndi:BPMNShape>
Expand All @@ -163,6 +185,20 @@
<bpmndi:BPMNShape id="TextAnnotation_0i3yd0i_di" bpmnElement="TextAnnotation_0i3yd0i">
<dc:Bounds x="532" y="310" width="120" height="40" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0r8yo0r_di" bpmnElement="Event_0r8yo0r">
<dc:Bounds x="1342" y="242" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1x5rl4x_di" bpmnElement="Activity_0wretog">
<dc:Bounds x="1180" y="220" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0fexuk7" bpmnElement="CreateBundleCreatedDashboardNotificationsForDefendant1">
<dc:Bounds x="900" y="220" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0vvhf7v" bpmnElement="CreateBundleCreatedDashboardNotificationsForClaimant1">
<dc:Bounds x="1040" y="220" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1fn0bf1_di" bpmnElement="Event_1fn0bf1">
<dc:Bounds x="252" y="202" width="36" height="36" />
<bpmndi:BPMNLabel>
Expand Down
Loading

0 comments on commit 9c1c944

Please sign in to comment.