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 index 8d075729f..45a52616f 100644 --- 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 @@ - + 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 new file mode 100644 index 000000000..45c170835 --- /dev/null +++ b/app/apps/workflow/bpmn_files/default/digital_surveillance/8.0.0/digital_surveillance.bpmn @@ -0,0 +1,712 @@ + + + + + + + + + task_rappelleren_informeren_collegas_beleid + gateway_reactie_platform + Gateway_1si19kh + Gateway_0je9lyy + Gateway_0bre241 + Gateway_0oh4f3m + end_digital_surveillance + script_digitaal_toezicht_next_step_summon + service_visit_next_step_default + script_digitaal_toezicht_next_step_debrief + Gateway_1vdfq20 + + + Gateway_0zapr2k + task_extra_inlichtingen + task_opstellen_verzoek_tot_inlichtingen + Gateway_059aorr + task_monitoren_reactie_platform + task_verwerken_informatie_platform + task_opstelllen_rapport_van_bevindingen_2 + task_create_picture_rapport_2 + Gateway_1f3ywi7 + Gateway_0g175z9 + Gateway_0bosnt7 + task_bepalen_processtap + Gateway_0vyn25j + Gateway_0cyoym3 + task_opstelllen_rapport_van_bevindingen_1 + task_create_picture_rapport_1 + task_opstellen_digitale_analyse + Gateway_08r2oii + timer_monitoren_reactie_platform + start_digital_surveillance + service_status_digitaal_toezicht + Gateway_17f750n + service_status_debrief + Activity_0e509br + Event_0s8titi + + + + Flow_0z2cckq + Flow_174tpfq + Flow_02uij0x + + + + + + + + + + + Flow_02uij0x + Flow_0s4mrid + + + Flow_0qox8mr + Flow_040f72a + + + Flow_0s4mrid + Flow_0qox8mr + Flow_13p5gby + + + + + + + + + + Flow_040f72a + Flow_0vsc8b1 + Flow_0f345it + + + Flow_0f345it + Flow_1kd271m + Flow_17u0prb + + + + + + + + + + + + Flow_06oy58t + Flow_1tv2ms7 + + + Flow_1tv2ms7 + Flow_0vsc8b1 + Flow_1kd271m + Flow_1qnpvqx + + + Flow_1qnpvqx + Flow_17u0prb + Flow_13p5gby + Flow_1kzui0d + + + Flow_1kzui0d + Flow_0wvb1te + Flow_1q1jsb2 + Flow_0cnrig2 + Flow_16tpotg + + + Flow_0w089jh + Flow_1q1jsb2 + Flow_0udbkr3 + + + Flow_0oa8006 + Flow_1id3lky + + + Flow_0pthtzu + Flow_0w089jh + + + Flow_1kiy9a8 + Flow_0pthtzu + Flow_0z2cckq + Flow_0oa8006 + + + Flow_1id3lky + Flow_0s8mukf + Flow_0wvb1te + + + Flow_1b4cx5k + Flow_0v7y8j0 + + + Flow_0cnrig2 + Flow_1uo97lz + Flow_1b4cx5k + digitaal_toezicht_next_step = {"value": "summon"} + + + Flow_1rnmquk + Flow_1uo97lz + visit_next_step = {"value": "default"} + + + Flow_1xa193k + Flow_0v7y8j0 + digitaal_toezicht_next_step = {"value": "debrief"} + + + Flow_0spf5l3 + Flow_1e9hjuu + Flow_174tpfq + + + Flow_0brsjux + Flow_0spf5l3 + Flow_1xa193k + Flow_07nlz48 + + + + + + + + + + + + Flow_0ipqqhf + Flow_0brsjux + + + Flow_0eh185q + Flow_19v98tr + Flow_1l1rhde + Flow_0zpz91h + + + Flow_1ov86h4 + Flow_1iu08rj + Flow_0q5q4mj + Flow_0ipqqhf + + + Flow_1l1rhde + Flow_0q5q4mj + + + Flow_19v98tr + Flow_1ov86h4 + + + Flow_0zpz91h + Flow_1iu08rj + + + Flow_167tz8u + Flow_0eh185q + Flow_1e9hjuu + + + Flow_06oy58t + + parse_duration(monitoren_reactie_platform_duration) + + + + + debrief_next_step.value == "digital_surveillance" and visit_next_step.value == "debrief_after_visit" + + + + + + digitale_surveillance_bepalen_processtap.value == "uitzetten_naar_handhaving" + + + + + + + + + extra_inlichtingen_nodig.value == "ja" + + + + + rappelleren_informeren_collegas_beleid.value == "opnieuw_monitoren" + + + + + + rappelleren_informeren_collegas_beleid.value == "informatie_ontvangen" + + + + + + + + + + debrief_next_step.value == "digital_surveillance" and visit_next_step.value == "debrief_after_visit" + + + debrief_next_step.value == "digital_surveillance" and visit_next_step.value == "debrief_after_visit" + + + + debrief_next_step.value == "digital_surveillance" and visit_next_step.value == "debrief_after_visit" + + + + + debrief_next_step.value == "digital_surveillance" + + + + + + + + + + + + + + Flow_16tpotg + Flow_0s8mukf + Flow_0udbkr3 + Flow_1rnmquk + + + + + Flow_1uc5ibn + + + Flow_0eabd5q + Flow_167tz8u + set_status("Digitaal toezicht") + + + Flow_1uc5ibn + Flow_0hq63xi + Flow_0eabd5q + + + + Flow_0hq63xi + Flow_1kiy9a8 + set_status("Debrief") + + + digitale_surveillance_bepalen_processtap.value == "inplannen_huisbezoek" + + + Flow_07nlz48 + Flow_02bzraa + digitaal_toezicht_next_step = {"value": "visit"} + + + + Flow_02bzraa + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..30d476b1c --- /dev/null +++ b/app/apps/workflow/bpmn_files/default/director/8.0.0/director.bpmn @@ -0,0 +1,1032 @@ + + + + + Flow_00zhyln + Flow_1sswvpm + Flow_1bizv1n + Flow_0yxxjh3 + + + next_step.value == "hercontrole" + + + + Flow_1bizv1n + + + + + Flow_1sswvpm + Flow_011ql1v + status_name = "Hercontrole" + + + + Flow_019jpwo + Flow_0pydgnj + print("Set super_process") + + + + Flow_19fjsci + Flow_0bq1d3y + Flow_1e320ch + Flow_1dztw7t + Flow_1clv0pm + Flow_1hd9vm8 + Flow_01ofopc + Flow_162tpj4 + + + Flow_0s3mvda + Flow_19fjsci + Flow_0ysd6yg + Flow_161irhq + Flow_1806n6d + + + debrief_next_step.value == "close_case" + + + Flow_10huie7 + Flow_1e320ch + Flow_0nnxs73 + + + Flow_1vzxtlf + Flow_0bq1d3y + Flow_02ymmf5 + Flow_104a0sv + Flow_0wmhmgd + Flow_1x0oeqr + Flow_1hd9vm8 + Flow_15yj673 + + + summon_next_step.value == "close_case" + + + summon_next_step.value == "decision" + + + + debrief_next_step.value == "summon" or debrief_next_step.value == "unoccupied" + + + Flow_0dzqcwg + Flow_1x0oeqr + Flow_0rtnb42 + Flow_1j6e4oc + Flow_133ivwt + Flow_1t3hdny + + + Flow_0dzqcwg + + + + + + Flow_019jpwo + + + + Flow_1rh05pm + Flow_083v05b + + + + + Flow_162tpj4 + Flow_1rh05pm + wait_for_workflows_and_send_message("message_wait_for_summons") + + + + Flow_0mhbkmb + Flow_19od6c4 + Flow_0sso3f3 + start_subworkflow("visit", vars()) + + + + + Flow_0sso3f3 + Flow_0fip1hz + + + + + Flow_1t3hdny + Flow_0j9lzb6 + start_subworkflow("summon", vars()) + + + + Flow_0j9lzb6 + Flow_1vzxtlf + + + + + Flow_02ymmf5 + Flow_1jxw3cs + Flow_10r8pq8 + start_subworkflow("decision", vars()) + + + + Flow_10r8pq8 + Flow_10huie7 + + + + + Flow_104a0sv + Flow_0nnxs73 + Flow_0dvll3h + start_subworkflow("renounce_decision", vars()) + + + Flow_0dvll3h + Flow_1dztw7t + + + + + summon_next_step.value == "renounce" + + + next_step.value == "renounce" + + + + Flow_1x8zzjk + Flow_1wwhp76 + start_subworkflow("close_case", vars()) + + + + Flow_1wwhp76 + Flow_00zhyln + + + + Flow_11pb2e0 + Flow_1yjml00 + start_subworkflow("debrief", vars()) + + + + Flow_1yjml00 + Flow_0s3mvda + + + + + debrief_next_step.value == "visit" or debrief_next_step.value == "digital_surveillance" + + + Flow_0wmhmgd + Flow_0pr3ioo + start_subworkflow("closing_procedure", vars()) + + + summon_next_step.value == "closing_procedure" + + + Flow_0pr3ioo + Flow_1clv0pm + + + + + + + summon_next_step.value == "visit" + + + Flow_0fip1hz + Flow_1806n6d + Flow_1whc19q + Flow_12zuc9d + Flow_12gxshx + + + + + + Flow_0pydgnj + Flow_03aynvp + Flow_19p0suh + + + + Flow_0av4c69 + Flow_1ce0ocf + Flow_0yz93jc + + + + theme.value == "theme_onderhuur" + + + Flow_16wkjh5 + Flow_1shvero + + + + + + Flow_19p0suh + Flow_16wkjh5 + start_subworkflow("housing_corporation", vars()) + + + reason.value == "reason_digitaal_toezicht" + + + + Flow_188gtgc + Flow_186kb5e + + + + Flow_083v05b + Flow_1x8zzjk + Flow_0bgyjfv + + + + next_step.value == "visit" and decision_count.value == 0 + + + Flow_1ce0ocf + Flow_161irhq + Flow_1dcoqd4 + Flow_0cfknxr + + + + Flow_186kb5e + Flow_1whc19q + Flow_0rtnb42 + Flow_19od6c4 + + + + digitaal_toezicht_next_step.value == "summon" + + + Flow_0yz93jc + Flow_0cfknxr + Flow_0lficrx + + + + debrief_next_step.value == "digital_surveillance" + + + Flow_1dcoqd4 + Flow_011ql1v + Flow_0bgyjfv + Flow_14bgcmj + + + + + Flow_1088n0h + Flow_0am0ivs + + + + Flow_0ysd6yg + Flow_15yj673 + Flow_1j6e4oc + Flow_0ak5tur + + + + debrief_next_step.value == "unoccupied" or summon_next_step.value == "unoccupied" + + + + Flow_0am0ivs + Flow_133ivwt + Flow_0xv24sz + Flow_1tss8a3 + Flow_1jxw3cs + + + unoccupied_next_step.value == "summon" + + + Flow_0k7tb8q + Flow_1088n0h + start_subworkflow("unoccupied", vars()) + + + Flow_12zuc9d + Flow_0xv24sz + Flow_0rxsevw + Flow_0yxxjh3 + Flow_11pb2e0 + + + + unoccupied_next_step.value == "debrief" + + + unoccupied_next_step.value == "close_case" + + + summon_next_step.value == "unoccupied" + + + Flow_0ak5tur + Flow_1y6m8zg + Flow_0k7tb8q + + + + Flow_14bgcmj + Flow_0mhbkmb + Flow_1y6m8zg + + + + leegstandsmelding_eigenaar.value == "ja" + + + Flow_03aynvp + Flow_19k7e4e + Flow_0av4c69 + Flow_1wfa7hv + + + + Flow_1tss8a3 + Flow_1wfa7hv + Flow_01ofopc + + + + housing_corporation_next_step.value == "close_case" + + + Flow_1shvero + Flow_19k7e4e + Flow_0rxsevw + + + + housing_corporation_next_step.value == "debrief" + + + next_step.value == "debrief" + + + unoccupied_next_step.value == "decision" + + + Flow_0lficrx + Flow_12gxshx + Flow_188gtgc + start_subworkflow("digital_surveillance", vars()) + + + + visit_next_step .value == "digital_surveillance" + + + digitaal_toezicht_next_step.value == "visit" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..b6bb8d7e6 --- /dev/null +++ b/app/apps/workflow/bpmn_files/default/visit/8.0.0/visit.bpmn @@ -0,0 +1,581 @@ + + + + + + + + + task_monitor_incoming_authorization + Gateway_19hfteh + task_request_authorization + service_visit_next_step_debrief_after_no_visit + + + task_create_schedule + gateway_merge_0h60qot + gateway_is_authorisation_required + Activity_1b2tfoc + service_status_inplannen_huisbezoek_hercontrole + gateway_merge_1fmcb00 + start_xbisnr1 + gateway_bepalen_processtap + task_bepalen_processtap_standaard + task_bepalen_processtap + Gateway_1r1i4zw + task_bepalen_processtap_vv + Gateway_1p4utag + service_bepalen_processtap_default + Gateway_0i97097 + Gateway_1vlqpiy + + + service_status_huisbezoek_hercontrole + task_create_visit + Event_0ii0awz + gateway_what_is_result_visit + service_visit_next_step_debrief_after_visit + Event_0ca4k6y + Activity_0l1sulc + task_digitaal_rapport_th + Gateway_06dolxs + + + + Flow_07yq2lt + Flow_04ckol7 + + + Flow_1ud05n0 + Flow_1e7wchj + Flow_07yq2lt + + + Flow_04ckol7 + Flow_0bbwpzi + set_status(status_name) + + + + + + + + + + + + + Flow_0bbwpzi + Flow_1mmzhem + + + Flow_1w441rj + Flow_1ud05n0 + Flow_0aiyxmw + + + Flow_0xiaus7 + Flow_01xohud + + + Flow_1mmzhem + Flow_100ib64 + Flow_0umtr1t + + + Flow_0umtr1t + Flow_0xiaus7 + visit_next_step = {"value": "debrief_after_visit"} + + + Flow_1o3d54n + Flow_1e7wchj + authorization = {"value": "No"} + + + Flow_0co89x0 + Flow_1o3d54n + + + Flow_19qcmz2 + Flow_0aiyxmw + Flow_0zdn4il + + + Flow_0zdn4il + Flow_0co89x0 + + + Flow_15wg2t8 + Flow_01xohud + visit_next_step = {"value": "debrief_after_no_visit"} + + + + + + + + visit_next_step.value == "no_visit" + + + visit_next_step.value == "visit_with_authorization" + + + + + + + + + + authorization.value == "Yes" + + + + situation.value == "nobody_present" and can_next_visit_go_ahead.value == True + + + + + + + + + Flow_0hnj8op + Flow_1tx62ja + set_status("Inplannen %s" % status_name) + + + Flow_100ib64 + Flow_1921ocy + Flow_0hnj8op + + + Flow_1921ocy + + + Flow_1tx62ja + Flow_1rtyo5h + Flow_1glf0ko + + + + + + bepalen_processtap.value == "ja" + + + theme.value == "theme_ondermijning" + + + + visit_next_step.value == "digital_surveillance" + + + + + + + + + + + + Flow_1l7o27c + Flow_1smxs2o + + + + + + + + + + + + Flow_07mixd1 + Flow_1d4p7zq + + + Flow_1glf0ko + Flow_07mixd1 + Flow_1l7o27c + Flow_0f3da8n + + + + + + + + + + + + Flow_0f3da8n + Flow_1lqm8yu + + + theme.value == "theme_vakantieverhuur" + + + + Flow_1d4p7zq + Flow_1smxs2o + Flow_1lqm8yu + Flow_10fkhlo + + + Flow_10fkhlo + Flow_1vk0xad + bepalen_processtap = {"value": "default"} + + + Flow_1vk0xad + Flow_0q3mp95 + Flow_19qcmz2 + Flow_15wg2t8 + Flow_12o3b0i + + + digitaal_rapport_th.value == "yes" + + + + + Flow_1t9f8sb + + + Flow_1skdulz + Flow_1t9f8sb + visit_next_step = {"value": "digital_surveillance"} + + + + + + + + + + + Flow_12o3b0i + Flow_0o5pug1 + + + Flow_0o5pug1 + Flow_1skdulz + Flow_0lqt4ia + + + Flow_1rtyo5h + Flow_0q3mp95 + Flow_0lqt4ia + Flow_1w441rj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/apps/workflow/user_tasks.py b/app/apps/workflow/user_tasks.py index 8165ee70d..24779c312 100644 --- 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 index d1175a2c3..d74db4034 100644 --- 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 index afede158a..c360e4e50 100644 --- 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 index 019937a25..1f44135af 100644 --- 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 index 85fb11e1f..c66d7929b 100644 --- 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 index 232b8e396..6688aa856 100644 --- 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 index 2508367a5..0ac7f9360 100644 --- 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 index e3f212761..ac44b19af 100644 --- 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 index f2ea24b6e..ec102e9a7 100644 --- 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 index d550a51bb..5ad5b8073 100644 --- 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 index 9d47c0887..5f6ee784e 100644 --- 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 index bde8bbf39..f9a8c6467 100644 --- 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), )