From d41cbe34e017015308fd8d437eb48a88d6e1c93b Mon Sep 17 00:00:00 2001 From: jeswanth Date: Tue, 1 Oct 2024 18:09:14 +0100 Subject: [PATCH 1/8] CIV-15151 added camunda flow for notifyinf --- ...oad_translated_document_ga_lip_notify.bpmn | 120 ++++++++++++++++++ ...tifyGATranslatedUploadedDocumentsTest.java | 27 ++++ 2 files changed, 147 insertions(+) create mode 100644 src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn create mode 100644 src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java diff --git a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn new file mode 100644 index 000000000..1bdbe3322 --- /dev/null +++ b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn @@ -0,0 +1,120 @@ + + + + + Flow_0g2t112 + + + + Flow_0qmsc9o + + + + + + Flow_1r0joyl + Flow_0qmsc9o + + + + + + + Flow_0g2t112 + Flow_19mft34 + + + Flow_13dgz5v + + + Flow_13dgz5v + + + + + + + + + NOTIFY_RESPONDENT_TRANSLATED_DOCUMENT_UPLOADED_GA + + + Flow_02cu20h + Flow_1r0joyl + + + + + NOTIFY_APPLICANT_TRANSLATED_DOCUMENT_UPLOADED_GA + + + Flow_19mft34 + Flow_02cu20h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java new file mode 100644 index 000000000..55d334eaa --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -0,0 +1,27 @@ +package uk.gov.hmcts.reform.civil.bpmn; + +import org.camunda.bpm.engine.externaltask.ExternalTask; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; + +public class NotifyGATranslatedUploadedDocumentsTest extends BpmnBaseTest { + + public NotifyGATranslatedUploadedDocumentsTest() { + super("upload_translated_document_ga_lip_notify.bpmn", "UPLOAD_TRANSLATED_DOCUMENT_GA_LIP_ID"); + } + + @Test + void shouldNotifyTranslatedDocumentUploaded() { + //assert process has started + assertFalse(processInstance.isEnded()); + //complete the start business process + ExternalTask startBusiness = assertNextExternalTask(START_BUSINESS_TOPIC); + assertCompleteExternalTask( + startBusiness, + START_BUSINESS_TOPIC, + START_BUSINESS_EVENT, + START_BUSINESS_ACTIVITY + ); + } +} From 54515645dabbb0692d77406ff957fa73cfbfd34b Mon Sep 17 00:00:00 2001 From: jeswanth Date: Tue, 1 Oct 2024 18:39:25 +0100 Subject: [PATCH 2/8] CIV-15151 added camunda flow for notifyinf --- ...tifyGATranslatedUploadedDocumentsTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java index 55d334eaa..c91330b3f 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -23,5 +23,25 @@ void shouldNotifyTranslatedDocumentUploaded() { START_BUSINESS_EVENT, START_BUSINESS_ACTIVITY ); + //complete the applicant notification + ExternalTask notificationApplicantTask = assertNextExternalTask(PROCESS_CASE_EVENT); + assertCompleteExternalTask( + notificationApplicantTask, + PROCESS_CASE_EVENT, + "NOTIFY_APPLICANT_TRANSLATED_DOCUMENT_UPLOADED_GA", + "NotifyTranslatedDocumentUploadedToApplicantGA" + ); + //complete the respondent notification + ExternalTask notificationRespondentTask = assertNextExternalTask(PROCESS_CASE_EVENT); + assertCompleteExternalTask( + notificationRespondentTask, + PROCESS_CASE_EVENT, + "NOTIFY_RESPONDENT_TRANSLATED_DOCUMENT_UPLOADED_GA", + "NotifyTranslatedDocumentUploadedToRespondentGA" + ); + + //end business process + ExternalTask endBusinessProcess = assertNextExternalTask(END_BUSINESS_PROCESS); + completeBusinessProcess(endBusinessProcess); } } From ff0aeb56625fb63f260914fc66e3d390e6c1a0a8 Mon Sep 17 00:00:00 2001 From: jeswanth Date: Tue, 1 Oct 2024 18:41:21 +0100 Subject: [PATCH 3/8] CIV-15151 added camunda flow for notifyinf --- .../civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java index c91330b3f..579f452cc 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -43,5 +43,6 @@ void shouldNotifyTranslatedDocumentUploaded() { //end business process ExternalTask endBusinessProcess = assertNextExternalTask(END_BUSINESS_PROCESS); completeBusinessProcess(endBusinessProcess); + assertNoExternalTasksLeft(); } } From 0a10cfff5801be21253b6a1e996b964b5ead16f6 Mon Sep 17 00:00:00 2001 From: jeswanth Date: Wed, 2 Oct 2024 14:34:53 +0100 Subject: [PATCH 4/8] CIV-15151 added camunda flow for notifyinf --- ...oad_translated_document_ga_lip_notify.bpmn | 21 ++++---- ...tifyGATranslatedUploadedDocumentsTest.java | 54 +++++++++++++++---- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn index 1bdbe3322..484e633f0 100644 --- a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn +++ b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn @@ -8,14 +8,14 @@ Flow_0qmsc9o - + Flow_1r0joyl Flow_0qmsc9o - + @@ -33,7 +33,7 @@ - + NOTIFY_RESPONDENT_TRANSLATED_DOCUMENT_UPLOADED_GA @@ -42,7 +42,7 @@ Flow_02cu20h Flow_1r0joyl - + NOTIFY_APPLICANT_TRANSLATED_DOCUMENT_UPLOADED_GA @@ -65,6 +65,13 @@ + + + + + + + @@ -79,12 +86,6 @@ - - - - - - diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java index 579f452cc..c0ee9ac57 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -1,18 +1,51 @@ package uk.gov.hmcts.reform.civil.bpmn; import org.camunda.bpm.engine.externaltask.ExternalTask; +import org.camunda.bpm.engine.variable.VariableMap; +import org.camunda.bpm.engine.variable.Variables; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Map; + import static org.junit.jupiter.api.Assertions.assertFalse; -public class NotifyGATranslatedUploadedDocumentsTest extends BpmnBaseTest { +public class NotifyGATranslatedUploadedDocumentsTest extends BpmnBaseGASpecTest { + public static final String NOTIFY_EVENT = "processExternalCaseEventGASpec"; + private static final String START_BUSINESS_TOPIC = "START_GA_BUSINESS_PROCESS"; + private static final String LIP_APPLICANT = "LIP_APPLICANT"; + private static final String LIP_RESPONDENT = "LIP_RESPONDENT"; public NotifyGATranslatedUploadedDocumentsTest() { super("upload_translated_document_ga_lip_notify.bpmn", "UPLOAD_TRANSLATED_DOCUMENT_GA_LIP_ID"); } + @BeforeEach + void setup() { + //deploy process + startBusinessProcessDeployment = engine.getRepositoryService() + .createDeployment() + .addClasspathResource(String.format(DIAGRAM_PATH, + "start_business_process_in_general_application.bpmn")) + .deploy(); + endBusinessProcessDeployment = engine.getRepositoryService() + .createDeployment() + .addClasspathResource(String.format(DIAGRAM_PATH, "end_general_application_business_process.bpmn")) + .deploy(); + deployment = engine.getRepositoryService() + .createDeployment() + .addClasspathResource(String.format(DIAGRAM_PATH, bpmnFileName)) + .deploy(); + processInstance = engine.getRuntimeService().startProcessInstanceByKey(processId); + } + @Test void shouldNotifyTranslatedDocumentUploaded() { + VariableMap variables = Variables.createVariables(); + variables.put("flowFlags", Map.of( + LIP_APPLICANT, false, + LIP_RESPONDENT, false)); + //assert process has started assertFalse(processInstance.isEnded()); //complete the start business process @@ -20,24 +53,27 @@ void shouldNotifyTranslatedDocumentUploaded() { assertCompleteExternalTask( startBusiness, START_BUSINESS_TOPIC, - START_BUSINESS_EVENT, - START_BUSINESS_ACTIVITY + START_GA_BUSINESS_EVENT, + START_GA_BUSINESS_ACTIVITY, + variables ); //complete the applicant notification - ExternalTask notificationApplicantTask = assertNextExternalTask(PROCESS_CASE_EVENT); + ExternalTask notificationApplicantTask = assertNextExternalTask(NOTIFY_EVENT); assertCompleteExternalTask( notificationApplicantTask, - PROCESS_CASE_EVENT, + NOTIFY_EVENT, "NOTIFY_APPLICANT_TRANSLATED_DOCUMENT_UPLOADED_GA", - "NotifyTranslatedDocumentUploadedToApplicantGA" + "NotifyTranslatedDocumentUploadedToApplicantGA", + variables ); //complete the respondent notification - ExternalTask notificationRespondentTask = assertNextExternalTask(PROCESS_CASE_EVENT); + ExternalTask notificationRespondentTask = assertNextExternalTask(NOTIFY_EVENT); assertCompleteExternalTask( notificationRespondentTask, - PROCESS_CASE_EVENT, + NOTIFY_EVENT, "NOTIFY_RESPONDENT_TRANSLATED_DOCUMENT_UPLOADED_GA", - "NotifyTranslatedDocumentUploadedToRespondentGA" + "NotifyTranslatedDocumentUploadedToRespondentGA", + variables ); //end business process From 39a4d753afff978e6be13dda9433a609dc328ff9 Mon Sep 17 00:00:00 2001 From: jeswanth Date: Wed, 2 Oct 2024 14:41:45 +0100 Subject: [PATCH 5/8] CIV-15151 added camunda flow for notifyinf --- .../civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java index c0ee9ac57..417732cd2 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -16,6 +16,7 @@ public class NotifyGATranslatedUploadedDocumentsTest extends BpmnBaseGASpecTest private static final String START_BUSINESS_TOPIC = "START_GA_BUSINESS_PROCESS"; private static final String LIP_APPLICANT = "LIP_APPLICANT"; private static final String LIP_RESPONDENT = "LIP_RESPONDENT"; + public NotifyGATranslatedUploadedDocumentsTest() { super("upload_translated_document_ga_lip_notify.bpmn", "UPLOAD_TRANSLATED_DOCUMENT_GA_LIP_ID"); } From 49c6ea1b3bbb8ae9c23656fbe44c6a5c8f18e31f Mon Sep 17 00:00:00 2001 From: jeswanth Date: Wed, 2 Oct 2024 16:23:51 +0100 Subject: [PATCH 6/8] CIV-15151 updated GA end process --- .../upload_translated_document_ga_lip_notify.bpmn | 4 ++-- .../reform/civil/bpmn/BpmnBaseGASpecTest.java | 14 ++++++++++++++ .../NotifyGATranslatedUploadedDocumentsTest.java | 7 ++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn index 484e633f0..c90279e5f 100644 --- a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn +++ b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn @@ -8,7 +8,7 @@ Flow_0qmsc9o - + @@ -118,4 +118,4 @@ - + \ No newline at end of file diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java index 5a8700ec5..84a7c84c1 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java @@ -262,6 +262,20 @@ public void completeBusinessProcess(ExternalTask externalTask) { completeTask(lockedEndBusinessProcessTask.get(0).getId()); } + /** + * Completes the external task with topic name END_BUSINESS_PROCESS. + * + * @param externalTask the id of the external task to complete. + */ + public void completeBusinessProcessForGADocUpload(ExternalTask externalTask) { + assertThat(externalTask.getTopicName()).isEqualTo("END_DOC_UPLOAD_BUSINESS_PROCESS_GASPEC"); + + List lockedEndBusinessProcessTask = fetchAndLockTask("END_DOC_UPLOAD_BUSINESS_PROCESS_GASPEC"); + + assertThat(lockedEndBusinessProcessTask).hasSize(1); + completeTask(lockedEndBusinessProcessTask.get(0).getId()); + } + /** * Completes the external task with topic name END_GA_HWF_NOTIFY_PROCESS. * diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java index 417732cd2..15a3996a2 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -16,7 +16,8 @@ public class NotifyGATranslatedUploadedDocumentsTest extends BpmnBaseGASpecTest private static final String START_BUSINESS_TOPIC = "START_GA_BUSINESS_PROCESS"; private static final String LIP_APPLICANT = "LIP_APPLICANT"; private static final String LIP_RESPONDENT = "LIP_RESPONDENT"; - + public static final String END_BUSINESS_PROCESS = "END_DOC_UPLOAD_BUSINESS_PROCESS_GASPEC"; + public NotifyGATranslatedUploadedDocumentsTest() { super("upload_translated_document_ga_lip_notify.bpmn", "UPLOAD_TRANSLATED_DOCUMENT_GA_LIP_ID"); } @@ -31,7 +32,7 @@ void setup() { .deploy(); endBusinessProcessDeployment = engine.getRepositoryService() .createDeployment() - .addClasspathResource(String.format(DIAGRAM_PATH, "end_general_application_business_process.bpmn")) + .addClasspathResource(String.format(DIAGRAM_PATH, "end_doc_upload_general_application_business_process.bpmn")) .deploy(); deployment = engine.getRepositoryService() .createDeployment() @@ -79,7 +80,7 @@ void shouldNotifyTranslatedDocumentUploaded() { //end business process ExternalTask endBusinessProcess = assertNextExternalTask(END_BUSINESS_PROCESS); - completeBusinessProcess(endBusinessProcess); + completeBusinessProcessForGADocUpload(endBusinessProcess); assertNoExternalTasksLeft(); } } From 74df63537861a86d75157ef352b22d8f6c05b39e Mon Sep 17 00:00:00 2001 From: jeswanth Date: Wed, 2 Oct 2024 18:04:49 +0100 Subject: [PATCH 7/8] CIV-15151 updated GA end process --- ..._general_application_business_process.bpmn | 45 +++++++++++++++++++ ...oad_translated_document_ga_lip_notify.bpmn | 4 +- .../reform/civil/bpmn/BpmnBaseGASpecTest.java | 4 +- ...tifyGATranslatedUploadedDocumentsTest.java | 4 +- 4 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/camunda/end_uploaded_translated_doc_general_application_business_process.bpmn diff --git a/src/main/resources/camunda/end_uploaded_translated_doc_general_application_business_process.bpmn b/src/main/resources/camunda/end_uploaded_translated_doc_general_application_business_process.bpmn new file mode 100644 index 000000000..6b126fe89 --- /dev/null +++ b/src/main/resources/camunda/end_uploaded_translated_doc_general_application_business_process.bpmn @@ -0,0 +1,45 @@ + + + + + + + + Flow_0nhnyjm + Flow_1jw9p2g + + + Flow_0nhnyjm + + + + + Flow_1jw9p2g + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn index c90279e5f..81c3a6997 100644 --- a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn +++ b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn @@ -8,7 +8,7 @@ Flow_0qmsc9o - + @@ -118,4 +118,4 @@ - \ No newline at end of file + diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java index 84a7c84c1..2ce34eefa 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java @@ -268,9 +268,9 @@ public void completeBusinessProcess(ExternalTask externalTask) { * @param externalTask the id of the external task to complete. */ public void completeBusinessProcessForGADocUpload(ExternalTask externalTask) { - assertThat(externalTask.getTopicName()).isEqualTo("END_DOC_UPLOAD_BUSINESS_PROCESS_GASPEC"); + assertThat(externalTask.getTopicName()).isEqualTo("END_UPLOADED_TRANSLATED_DOC_BUSINESS_PROCESS_GASPEC"); - List lockedEndBusinessProcessTask = fetchAndLockTask("END_DOC_UPLOAD_BUSINESS_PROCESS_GASPEC"); + List lockedEndBusinessProcessTask = fetchAndLockTask("END_UPLOADED_TRANSLATED_DOC_BUSINESS_PROCESS_GASPEC"); assertThat(lockedEndBusinessProcessTask).hasSize(1); completeTask(lockedEndBusinessProcessTask.get(0).getId()); diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java index 15a3996a2..7d7fb671a 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -16,7 +16,7 @@ public class NotifyGATranslatedUploadedDocumentsTest extends BpmnBaseGASpecTest private static final String START_BUSINESS_TOPIC = "START_GA_BUSINESS_PROCESS"; private static final String LIP_APPLICANT = "LIP_APPLICANT"; private static final String LIP_RESPONDENT = "LIP_RESPONDENT"; - public static final String END_BUSINESS_PROCESS = "END_DOC_UPLOAD_BUSINESS_PROCESS_GASPEC"; + public static final String END_BUSINESS_PROCESS = "END_UPLOADED_TRANSLATED_DOC_BUSINESS_PROCESS_GASPEC"; public NotifyGATranslatedUploadedDocumentsTest() { super("upload_translated_document_ga_lip_notify.bpmn", "UPLOAD_TRANSLATED_DOCUMENT_GA_LIP_ID"); @@ -32,7 +32,7 @@ void setup() { .deploy(); endBusinessProcessDeployment = engine.getRepositoryService() .createDeployment() - .addClasspathResource(String.format(DIAGRAM_PATH, "end_doc_upload_general_application_business_process.bpmn")) + .addClasspathResource(String.format(DIAGRAM_PATH, "end_uploaded_translated_doc_general_application_business_process.bpmn")) .deploy(); deployment = engine.getRepositoryService() .createDeployment() From 9738c5fc23b693705c91c2e4dd6021bf1515a8bd Mon Sep 17 00:00:00 2001 From: jeswanth Date: Thu, 3 Oct 2024 11:40:53 +0100 Subject: [PATCH 8/8] CIV-15151 updated GA end process --- ...lication_business_process_without_WA_task.bpmn} | 14 +++++++------- .../upload_translated_document_ga_lip_notify.bpmn | 2 +- .../reform/civil/bpmn/BpmnBaseGASpecTest.java | 4 ++-- .../NotifyGATranslatedUploadedDocumentsTest.java | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) rename src/main/resources/camunda/{end_uploaded_translated_doc_general_application_business_process.bpmn => end_general_application_business_process_without_WA_task.bpmn} (74%) diff --git a/src/main/resources/camunda/end_uploaded_translated_doc_general_application_business_process.bpmn b/src/main/resources/camunda/end_general_application_business_process_without_WA_task.bpmn similarity index 74% rename from src/main/resources/camunda/end_uploaded_translated_doc_general_application_business_process.bpmn rename to src/main/resources/camunda/end_general_application_business_process_without_WA_task.bpmn index 6b126fe89..486f577d4 100644 --- a/src/main/resources/camunda/end_uploaded_translated_doc_general_application_business_process.bpmn +++ b/src/main/resources/camunda/end_general_application_business_process_without_WA_task.bpmn @@ -1,28 +1,28 @@ - + - - + + Flow_0nhnyjm Flow_1jw9p2g Flow_0nhnyjm - - + + Flow_1jw9p2g - + - + diff --git a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn index 81c3a6997..e957e6a24 100644 --- a/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn +++ b/src/main/resources/camunda/upload_translated_document_ga_lip_notify.bpmn @@ -8,7 +8,7 @@ Flow_0qmsc9o - + diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java index 2ce34eefa..cfc150461 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseGASpecTest.java @@ -268,9 +268,9 @@ public void completeBusinessProcess(ExternalTask externalTask) { * @param externalTask the id of the external task to complete. */ public void completeBusinessProcessForGADocUpload(ExternalTask externalTask) { - assertThat(externalTask.getTopicName()).isEqualTo("END_UPLOADED_TRANSLATED_DOC_BUSINESS_PROCESS_GASPEC"); + assertThat(externalTask.getTopicName()).isEqualTo("END_BUSINESS_PROCESS_GASPEC_WITHOUT_WA_TASK"); - List lockedEndBusinessProcessTask = fetchAndLockTask("END_UPLOADED_TRANSLATED_DOC_BUSINESS_PROCESS_GASPEC"); + List lockedEndBusinessProcessTask = fetchAndLockTask("END_BUSINESS_PROCESS_GASPEC_WITHOUT_WA_TASK"); assertThat(lockedEndBusinessProcessTask).hasSize(1); completeTask(lockedEndBusinessProcessTask.get(0).getId()); diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java index 7d7fb671a..cd07480a0 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyGATranslatedUploadedDocumentsTest.java @@ -16,7 +16,7 @@ public class NotifyGATranslatedUploadedDocumentsTest extends BpmnBaseGASpecTest private static final String START_BUSINESS_TOPIC = "START_GA_BUSINESS_PROCESS"; private static final String LIP_APPLICANT = "LIP_APPLICANT"; private static final String LIP_RESPONDENT = "LIP_RESPONDENT"; - public static final String END_BUSINESS_PROCESS = "END_UPLOADED_TRANSLATED_DOC_BUSINESS_PROCESS_GASPEC"; + public static final String END_BUSINESS_PROCESS = "END_BUSINESS_PROCESS_GASPEC_WITHOUT_WA_TASK"; public NotifyGATranslatedUploadedDocumentsTest() { super("upload_translated_document_ga_lip_notify.bpmn", "UPLOAD_TRANSLATED_DOCUMENT_GA_LIP_ID"); @@ -32,7 +32,7 @@ void setup() { .deploy(); endBusinessProcessDeployment = engine.getRepositoryService() .createDeployment() - .addClasspathResource(String.format(DIAGRAM_PATH, "end_uploaded_translated_doc_general_application_business_process.bpmn")) + .addClasspathResource(String.format(DIAGRAM_PATH, "end_general_application_business_process_without_WA_task.bpmn")) .deploy(); deployment = engine.getRepositoryService() .createDeployment()