Merge pull request #1261 from Amsterdam/feature/101933-digital-surv-vv

implement new visit and digital surv routes
Amsterdam · Sep 9, 2024 · e974bce · e974bce
2 parents ebc3b3a + f04b8e8
commit e974bce
Show file tree

Hide file tree

Showing 16 changed files with 2,406 additions and 30 deletions.
diff --git a/app/apps/workflow/bpmn_files/default/digital_surveillance/3.0.0/digital_surveillance.bpmn b/app/apps/workflow/bpmn_files/default/digital_surveillance/3.0.0/digital_surveillance.bpmn
@@ -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:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_10wsqin" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.7.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.14.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:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_10wsqin" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.7.0" modeler:executionPlatform="Camunda Platform">
   <bpmn:collaboration id="Collaboration_0j54iub">
     <bpmn:participant id="Participant_026qmxw" name="Process" processRef="digital_surveillance" />
   </bpmn:collaboration>

diff --git a/app/apps/workflow/bpmn_files/default/digital_surveillance/8.0.0/digital_surveillance.bpmn b/app/apps/workflow/bpmn_files/default/digital_surveillance/8.0.0/digital_surveillance.bpmn
diff --git a/app/apps/workflow/bpmn_files/default/director/8.0.0/director.bpmn b/app/apps/workflow/bpmn_files/default/director/8.0.0/director.bpmn
diff --git a/app/apps/workflow/bpmn_files/default/visit/8.0.0/visit.bpmn b/app/apps/workflow/bpmn_files/default/visit/8.0.0/visit.bpmn
diff --git a/app/apps/workflow/user_tasks.py b/app/apps/workflow/user_tasks.py
@@ -1018,6 +1018,14 @@ class task_sub_workflow_terug_melding_bag(user_task):
     """Terug melding BAG"""
 
 
+class task_bepalen_processtap_vv(user_task):
+    due_date = relativedelta(days=2)
+
+
+class task_digitaal_rapport_th(user_task):
+    due_date = relativedelta(days=3)
+
+
 class task_nakijken_informatiebrief(user_task):
     """task_nakijken_informatiebrief"""
 

diff --git a/app/apps/workflow/utils.py b/app/apps/workflow/utils.py
@@ -163,16 +163,22 @@ def get_latest_version_from_config(
     def get_major(v):
         return int(v.split(".")[0])
 
-    version = sorted([v for v, k in config.get("versions").items()])
-
+    theme_versions = sorted([v for v, k in config.get("versions").items()])
     if current_version:
-        version = [v for v in version if get_major(current_version) >= get_major(v)]
+        # Get the hightest version of a workflow, only if it's a lower version than the parent major version
+        # So a parent workflow with a major version of 6 will never start a sub workflow with version 7
+        theme_versions = [
+            theme_version
+            for theme_version in theme_versions
+            if get_major(current_version) >= get_major(theme_version)
+        ]
 
-    if not version:
+    if not theme_versions:
         raise Exception(
             f"Workflow version for theme name '{theme_name}', with type '{workflow_type}', does not exist in this workflow_spec config"
         )
-    return theme_name, version[-1]
+    highest_sub_version = theme_versions[-1]
+    return theme_name, highest_sub_version
 
 
 def get_initial_data_from_config(

diff --git a/app/config/settings.py b/app/config/settings.py
@@ -308,7 +308,6 @@ def filter_traces(envelope):
 LOCAL_DEVELOPMENT_AUTHENTICATION = (
     os.getenv("LOCAL_DEVELOPMENT_AUTHENTICATION", False) == "True"
 )
-
 DATA_UPLOAD_MAX_MEMORY_SIZE = 5242880
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 6000
 
@@ -733,6 +732,7 @@ def get_redis_url():
             },
             "versions": {
                 "3.0.0": {},
+                "8.0.0": {},
             },
         },
         "debrief": {
@@ -1066,6 +1066,44 @@ def get_redis_url():
                         },
                     },
                 },
+                "8.0.0": {
+                    "messages": {
+                        "main_process": {
+                            "initial_data": {
+                                "status_name": DEFAULT_SCHEDULE_ACTIONS[0],
+                                "authorization": {"value": "No"},
+                                "reason": {"value": "default"},
+                                "theme": {"value": "default"},
+                                "bepalen_processtap": {"value": "ja"},
+                                "debrief_next_step": {"value": "default"},
+                                "summon_next_step": {"value": "default"},
+                                "visit_next_step": {"value": "default"},
+                                "housing_corporation_next_step": {"value": "default"},
+                                "monitoren_reactie_platform_duration": timedelta(
+                                    days=14
+                                ),
+                                "leegstandsmelding_eigenaar": {"value": "default"},
+                            },
+                        },
+                        "aanschrijving_toevoegen": {
+                            "initial_data": {
+                                "status_name": DEFAULT_SCHEDULE_ACTIONS[0],
+                                "authorization": {"value": "No"},
+                                "reason": {"value": "default"},
+                                "theme": {"value": "default"},
+                                "bepalen_processtap": {"value": "ja"},
+                                "debrief_next_step": {"value": "default"},
+                                "summon_next_step": {"value": "default"},
+                                "visit_next_step": {"value": "default"},
+                                "housing_corporation_next_step": {"value": "default"},
+                                "monitoren_reactie_platform_duration": timedelta(
+                                    days=14
+                                ),
+                                "leegstandsmelding_eigenaar": {"value": "default"},
+                            },
+                        },
+                    },
+                },
             },
         },
         "housing_corporation": {
@@ -1332,6 +1370,7 @@ def get_redis_url():
                 "0.4.0": {},
                 "0.5.0": {},
                 "0.6.0": {},
+                "8.0.0": {},
             },
         },
         "citizen_report_feedback": {

diff --git a/e2e-tests/api/tasks/visit.py b/e2e-tests/api/tasks/visit.py
@@ -15,7 +15,7 @@
 from api.user_tasks import (
     task_aanvragen_machtiging,
     task_bepalen_processtap,
-    task_bepalen_processtap_standaard,
+    task_bepalen_processtap_vv,
     task_doorgeven_status_top,
     task_inplannen_status,
     task_monitoren_binnenkomen_machtiging,
@@ -34,9 +34,7 @@ def get_steps():
         return [__class__()]
 
 
-class test_bepalen_processtap_standaard(
-    GenericUserTask, task_bepalen_processtap_standaard
-):
+class test_bepalen_processtap_vv(GenericUserTask, task_bepalen_processtap_vv):
     def __init__(self, visit_next_step=VisitNextStep.VISIT_WITHOUT_AUTHORIZATION):
         super().__init__(visit_next_step={"value": visit_next_step})
 
@@ -89,7 +87,7 @@ def __init__(
     def get_steps():
         # No preceiding step, case was just created
         return [
-            *test_bepalen_processtap_standaard.get_steps(),
+            *test_bepalen_processtap_vv.get_steps(),
             __class__(),
         ]
 

diff --git a/e2e-tests/flows/test_aanschrijving.py b/e2e-tests/flows/test_aanschrijving.py
@@ -12,7 +12,7 @@
     test_verwerk_aanschrijving,
 )
 from api.tasks.visit import (
-    test_bepalen_processtap_standaard,
+    test_bepalen_processtap_vv,
     test_doorgeven_status_top,
     test_inplannen_status,
 )
@@ -23,7 +23,7 @@
 class TestViolationLegalizationLetter(DefaultAPITest):
     def test(self):
         self.get_case().run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             test_doorgeven_status_top(),
             test_create_debrief(violation=Violation.YES),

diff --git a/e2e-tests/flows/test_invalid_civilian_objection.py b/e2e-tests/flows/test_invalid_civilian_objection.py
@@ -20,7 +20,7 @@
     test_verwerk_aanschrijving,
 )
 from api.tasks.visit import (
-    test_bepalen_processtap_standaard,
+    test_bepalen_processtap_vv,
     test_doorgeven_status_top,
     test_inplannen_status,
 )
@@ -31,7 +31,7 @@
 class TestInvalidCivilianObjection(DefaultAPITest):
     def test(self):
         self.get_case().run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             test_doorgeven_status_top(),
             test_create_debrief(violation=Violation.YES),

diff --git a/e2e-tests/flows/test_multiple_summons.py b/e2e-tests/flows/test_multiple_summons.py
@@ -5,7 +5,7 @@
     test_afzien_concept_aanschrijving,
     test_opstellen_concept_aanschrijving,
 )
-from api.tasks.visit import test_bepalen_processtap_standaard
+from api.tasks.visit import test_bepalen_processtap_vv
 from api.test import DefaultAPITest
 from api.validators import ValidateOpenTasks
 
@@ -16,7 +16,7 @@ def test(self):
         case.add_process(Process.HolidayRental.ADD_SUMMON),
         case.run_steps(
             ValidateOpenTasks(
-                test_bepalen_processtap_standaard, test_opstellen_concept_aanschrijving
+                test_bepalen_processtap_vv, test_opstellen_concept_aanschrijving
             ),
             *test_opstellen_verkorte_rapportage_huisbezoek.get_steps(),
             ValidateOpenTasks(test_opstellen_concept_aanschrijving),

diff --git a/e2e-tests/flows/test_no_civilian_objection.py b/e2e-tests/flows/test_no_civilian_objection.py
@@ -14,7 +14,7 @@
     test_verwerk_aanschrijving,
 )
 from api.tasks.visit import (
-    test_bepalen_processtap_standaard,
+    test_bepalen_processtap_vv,
     test_doorgeven_status_top,
     test_inplannen_status,
 )
@@ -26,7 +26,7 @@
 class TestNoCivilianObjection(DefaultAPITest):
     def test(self):
         self.get_case().run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             test_doorgeven_status_top(),
             test_create_debrief(violation=Violation.YES),

diff --git a/e2e-tests/flows/test_no_violation.py b/e2e-tests/flows/test_no_violation.py
@@ -6,7 +6,7 @@
     test_terugkoppelen_melder_1,
 )
 from api.tasks.visit import (
-    test_bepalen_processtap_standaard,
+    test_bepalen_processtap_vv,
     test_doorgeven_status_top,
     test_inplannen_status,
 )
@@ -17,7 +17,7 @@
 class TestNoViolation(DefaultAPITest):
     def test(self):
         self.get_case().run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             test_doorgeven_status_top(),
             test_create_debrief(violation=Violation.NO),

diff --git a/e2e-tests/flows/test_sluiting.py b/e2e-tests/flows/test_sluiting.py
@@ -22,7 +22,7 @@
     test_verwerk_aanschrijving,
 )
 from api.tasks.visit import (
-    test_bepalen_processtap_standaard,
+    test_bepalen_processtap_vv,
     test_doorgeven_status_top,
     test_inplannen_status,
 )
@@ -34,7 +34,7 @@
 class TestViolationClosure(DefaultAPITest):
     def test_direct(self):
         self.get_case().run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             test_doorgeven_status_top(),
             test_create_debrief(violation=Violation.YES),

diff --git a/e2e-tests/flows/test_timeline.py b/e2e-tests/flows/test_timeline.py
@@ -6,7 +6,7 @@
     test_terugkoppelen_melder_1,
 )
 from api.tasks.visit import (
-    test_bepalen_processtap_standaard,
+    test_bepalen_processtap_vv,
     test_doorgeven_status_top,
     test_inplannen_status,
 )
@@ -18,7 +18,7 @@ class TestTimeline(DefaultAPITest):
     def test_no_identification(self):
         case = self.get_case()
         case.run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             ValidateOpenTasks(test_doorgeven_status_top),
         )
@@ -28,7 +28,7 @@ def test_no_identification(self):
 
     def test_home_visit_report(self):
         self.get_case().run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             test_doorgeven_status_top(),
             test_create_debrief(violation=Violation.NO),
@@ -47,7 +47,7 @@ def get_case_data(self):
     def test(self):
         case = self.get_case()
         case.run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             ValidateOpenTasks(test_doorgeven_status_top),
         )

diff --git a/e2e-tests/user_tasks/test_inplannen_status.py b/e2e-tests/user_tasks/test_inplannen_status.py
@@ -1,5 +1,5 @@
 from api.tasks.visit import (
-    test_bepalen_processtap_standaard,
+    test_bepalen_processtap_vv,
     test_doorgeven_status_top,
     test_inplannen_status,
 )
@@ -10,7 +10,7 @@
 class task_inplannen_status_test(DefaultAPITest):
     def test(self):
         self.get_case().run_steps(
-            test_bepalen_processtap_standaard(),
+            test_bepalen_processtap_vv(),
             test_inplannen_status(),
             ValidateOpenTasks(test_doorgeven_status_top),
         )