diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index ae7d732e6..ee01e7636 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -22,8 +22,7 @@ jobs: - run: docker network create zaken_network - run: docker network create top_and_zaak_backend_bridge - - run: docker-compose -f docker-compose.local.yml up --detach - # - run: docker-compose -f docker-compose.tests.yml up + - run: docker compose -f docker-compose.local.yml up --detach - run: sleep 30 - run: bash bin/setup_credentials.sh - run: ./e2e-tests/fix_models.sh diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b8dee468d..98cb8676e 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -28,7 +28,7 @@ jobs: - run: docker network create top_and_zaak_backend_bridge working-directory: backend - - run: docker-compose -f docker-compose.local.yml up --build --detach + - run: docker compose -f docker-compose.local.yml up --build --detach working-directory: backend ################################################### diff --git a/.github/workflows/main.workflow.yml b/.github/workflows/main.workflow.yml index 79be4706c..9b33db443 100644 --- a/.github/workflows/main.workflow.yml +++ b/.github/workflows/main.workflow.yml @@ -17,12 +17,12 @@ jobs: - name: Linting run: bash bin/cleanup_pre_commit.sh - name: Build Docker image - run: docker-compose -f docker-compose.local.yml build + run: docker compose -f docker-compose.local.yml build - name: Create Docker network run: docker network create zaken_network - name: Create TOP and Zaken Docker network run: docker network create top_and_zaak_backend_bridge - name: Start images - run: docker-compose -f docker-compose.local.yml up -d + run: docker compose -f docker-compose.local.yml up -d - name: Run Tests - run: docker-compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test + run: docker compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test diff --git a/README.md b/README.md index 81a0049f3..070c15d1a 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,13 @@ First, make sure you have built the project and executed the database migrations ```bash docker network create top_and_zaak_backend_bridge docker network create zaken_network -docker-compose -f docker-compose.local.yml build +docker compose -f docker-compose.local.yml build ``` Start AZA backend: ```bash -docker-compose -f docker-compose.local.yml up +docker compose -f docker-compose.local.yml up ``` To create all necessary credentials run the following command: @@ -95,7 +95,7 @@ docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.p Or a specific test: ```bash -docker-compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test apps.addresses.tests.tests_models.AddressModelTest.test_can_create_address_with_bag_result_without_stadsdeel +docker compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test apps.addresses.tests.tests_models.AddressModelTest.test_can_create_address_with_bag_result_without_stadsdeel ``` @@ -173,7 +173,7 @@ To improve reliability, the health checks should be expanded for each essential It's possible to generate a graph of the datamodel using the following command: ``` -docker-compose run --rm zaak-gateway python manage.py graph_models cases debriefings permits fines addresses events visits summons -X ModelEventEmitter,ModelEditableTimeConstraint,ModelEditablelBase --pygraphviz -o diagram.png +docker compose run --rm zaak-gateway python manage.py graph_models cases debriefings permits fines addresses events visits summons -X ModelEventEmitter,ModelEditableTimeConstraint,ModelEditablelBase --pygraphviz -o diagram.png ``` Note that the apps and models should be updated whenever applications and models are added or modified. diff --git a/app/apps/workflow/bpmn_files/default/sub_workflow/7.1.0/sub_workflow.bpmn b/app/apps/workflow/bpmn_files/default/sub_workflow/7.1.0/sub_workflow.bpmn new file mode 100644 index 000000000..a3056c302 --- /dev/null +++ b/app/apps/workflow/bpmn_files/default/sub_workflow/7.1.0/sub_workflow.bpmn @@ -0,0 +1,1914 @@ + + + + + + + + + task_verwerken_uitkomst_corporatie + start_uitkomst_corporatie_proces + Event_10vzlgp + service_status_uitkomst_corporatie + task_aanleveren_wob_dossier + start_aanleveren_wob_dossier + end_aanleveren_wob_dossier + service_status_wob_verzoek + task_afwachten_casus_overleg + start_casus_overleg_proces + end_1id87mn + service_status_casus_overleg + service_status_report_nuisance + end_0bk5wui + start_nuisance_process + task_doorzetten_melding_overlast + service_status_extra_informatie + end_094h2mm + event_start_extra_information_process + task_add_extra_information + service_status_bezwaardossier + service_status_terugbelverzoek + service_status_correspondentie + end_1tux6wv + end_1xkmac5 + event_start_objectionfile_process + event_start_callbackrequest_process + end_1nv61es + event_start_correspondence_process + task_callback_request + task_submit_objectionfile + task_correspondence + start_rapport_bewoners + service_status_rapport_bewoners + Event_1cotvbr + Activity_0t99d9n + start_controleren_handhavingsverzoek + task_controleren_juistheid_aanvraag + Event_0j1c5c5 + service_status_handhavingsverzoek + Gateway_1unhz54 + Gateway_0t5rj58 + Gateway_10fxjok + Gateway_01k1rx7 + Gateway_16tf6v6 + task_handhavingsverzoek_opstellen_ontvangstbevestiging + task_handhavingsverzoek_verwerken_ontvangstbevestiging + task_handhavingsverzoek_aangeven_uitkomst_debrief + task_handhavingsverzoek_opstellen_afwijzing + task_handhavingsverzoek_verwerken_afwijzing + task_handhavingsverzoek_aangeven_uitkomst + Gateway_0s3nj3w + Gateway_19zjpm5 + task_handhavingsverzoek_opstellen_besluit_afwijzing + task_handhavingsverzoek_verwerken_besluit_afwijzing + task_handhavingsverzoek_opstellen_buiten_behandeling_laten + task_handhavingsverzoek_verwerken_buiten_behandeling_laten + task_handhavingsverzoek_afwijzen + task_handhavingsverzoek_juist_verwerken_afwijzing + start_ingebrekestelling + task_controleren_of_gemeente_in_gebreke_is + service_status_ingebrekestelling + Gateway_0m0ys6j + task_opstellen_brief_ongeldige_ingebrekestelling + task_verturen_brief_ongeldige_ingebrekestelling + Event_1b0ead4 + start_uit_termijn_lopen + task_opsturen_verlenging_beslistermijn + Event_075kgpa + service_status_uit_termijn_lopen + task_verwerken_verlenging_beslistermijn + start_lod_verzoek_tot_opheffing + service_status_lod_verzoek_tot_opheffing + end_lod_verzoek_tot_opheffing + task_lod_opheffen + event_start_verzoek_opheffing_openbaarmaking_namen + Event_01c001z + service_status_verzoek_opheffing_openbaarmaking_namen + task_opheffen_openbaarmaking_namen + service_status_doorzon_pv + Event_0natutb + task_doorzon_pv + event_start_doorzon_pv_process + + + event_start_signal_process + service_status_melding + task_create_signal + end_0q70hru + end_mma_signal_process + end_doorzon_signal_process + task_create_mma_signal + service_status_mma_melding + start_mma_signal_process + task_create_doorzon_signal + service_status_doorzon_melding + start_doorzon_signal_process + + + start_afsluiten_zaak + end_afsluiten_zaak + Activity_1a9iu2s + task_close_case + + + task_sub_workflow_opstellen_digitale_analyse + start_opstellen_digitale_analyse_proces + end_opstellen_digitale_analyse_proces + service_status_digitale_analyse + start_terugkoppelen_bi + end_terugkoppelen_bi + service_status_terugkoppelen_bi + task_sub_workflow_terugkoppelen_bi + start_terugmelding_bag + Event_0zt8k76 + service_status_terugmelding_BAG + task_sub_workflow_terug_melding_bag + + + task_handhavingsverzoek_nakijken_ontvangstbevestiging + task_handhavingsverzoek_nakijken_besluit_afwijzing + task_handhavingsverzoek_nakijken_buiten_behandeling_laten + task_handhavingsverzoek_juist_nakijken_afwijzing + task_handhavingsverzoek_onjuist_nakijken_afwijzing + task_nakijken_brief_ongeldige_ingebrekestelling + task_nakijken_verlenging_beslistermijn + + + + + + + + + + + + Flow_1uk9vd0 + Flow_09ggopg + + + + + + + + + + + Flow_0tzw9jf + + + + Flow_09ggopg + + + Flow_0tzw9jf + Flow_1uk9vd0 + set_status("Uitkomst corporatie") + + + Flow_0urd3rb + Flow_0jpefkg + + + + + + + + + + + Flow_125t48z + + + + Flow_0jpefkg + + + Flow_125t48z + Flow_0urd3rb + set_status("WOB verzoek") + + + + + + + + Flow_1kxgx3x + Flow_15w8err + + + + + + + + + + + Flow_1sx8pu0 + + + + Flow_15w8err + + + Flow_1sx8pu0 + Flow_1kxgx3x + set_status("Casus overleg") + + + Flow_1gmn80j + Flow_0jee1e2 + set_status("Melding overlast") + + + Flow_16jc6al + + + + + + + + + + + Flow_1gmn80j + + + + Flow_0jee1e2 + Flow_16jc6al + + + Flow_1h3e4l1 + Flow_1jq09n1 + set_status("Extra informatie") + + + Flow_0lhfgfk + + + + + + + + + + + Flow_1h3e4l1 + + + + + + + + + Flow_1jq09n1 + Flow_0lhfgfk + + + Flow_00kh5me + Flow_016cuwo + set_status("Bezwaardossier") + + + Flow_09pyhbj + Flow_1hqevbd + set_status("Terugbelverzoek") + + + Flow_0v6xuji + Flow_1kz95i3 + set_status("Correspondentie") + + + Flow_1ugt3k2 + + + Flow_01drnzg + + + + + + + + + + + Flow_00kh5me + + + + + + + + + + + + Flow_09pyhbj + + + + Flow_14ot4wv + + + + + + + + + + + Flow_0v6xuji + + + + + + + + + Flow_1hqevbd + Flow_01drnzg + + + Flow_016cuwo + Flow_1ugt3k2 + + + + + + + + Flow_1kz95i3 + Flow_14ot4wv + + + + + + + + + + + Flow_01tzgt8 + + + + Flow_01tzgt8 + Flow_1w72eb6 + set_status("Rapport bewoner(s)") + + + Flow_15sazwc + + + Flow_1w72eb6 + Flow_15sazwc + + + + + + + + + + + Flow_1vgj6r9 + + + + + + + + + + + + + + Flow_00t4jix + Flow_18jf7bf + + + Flow_01lsi38 + + + Flow_1vgj6r9 + Flow_00t4jix + set_status("Handhavingsverzoek") + + + Flow_18jf7bf + Flow_0796m3t + Flow_0ahparx + Flow_16nf6jj + + + Flow_1ceqygs + Flow_1gl9vud + Flow_1tdmpu9 + + + Flow_0ps3pvh + Flow_18r3sx9 + Flow_0gr9qm7 + + + Flow_08wdnxt + Flow_1tunsld + Flow_01lsi38 + + + Flow_13egf47 + Flow_1viv6rl + Flow_08wdnxt + + + Flow_0ahparx + Flow_12ekkya + + + Flow_12ekkya + Flow_1k34o9j + + + + + + + + Flow_1k34o9j + Flow_0vjdsxk + + + + + + + + + + + Flow_0vjdsxk + Flow_0ps3pvh + + + Flow_18r3sx9 + Flow_1ahzpds + + + Flow_0j18n05 + Flow_13egf47 + + + + + + + + + + + Flow_0gr9qm7 + Flow_116za7x + + + Flow_116za7x + Flow_0217kgp + Flow_1eztzfv + + + Flow_1tdmpu9 + Flow_1eztzfv + Flow_1tunsld + + + Flow_0217kgp + Flow_0d5ueu4 + + + Flow_0d5ueu4 + Flow_1u2f04t + + + Flow_1u2f04t + Flow_1viv6rl + + + Flow_0796m3t + Flow_1q52yj5 + + + Flow_1q52yj5 + Flow_0ol0nre + + + Flow_0ol0nre + Flow_1gl9vud + + + Flow_16nf6jj + Flow_0gzomjb + + + Flow_0gzomjb + Flow_0f34185 + + + Flow_1ahzpds + Flow_0j18n05 + + + Flow_0f34185 + Flow_1ceqygs + + + + + + + + + + + Flow_1b83l5q + + + + Flow_1vy94j9 + + + Flow_1b83l5q + Flow_1ggc19w + set_status("Afsluiten zaak") + + + + + + + + Flow_1ggc19w + Flow_1vy94j9 + + + Flow_1ddhrnp + Flow_1byn9r2 + + + + + + + + + + + Flow_1ccbixy + + + + Flow_1byn9r2 + + + Flow_1ccbixy + Flow_1ddhrnp + set_status("Digitale analyse") + + + + + + + + + + + Flow_0ch6ryy + + + + Flow_12wg609 + + + Flow_0ch6ryy + Flow_0y6wjdz + set_status("Terugkoppeling BI") + + + + + + + + Flow_0y6wjdz + Flow_12wg609 + + + + + + + + + + + Flow_181qwlq + + + + + + + + + + + + Flow_0klerhw + Flow_14x8s9f + + + Flow_181qwlq + Flow_0klerhw + set_status("Ingebrekestelling") + + + Flow_14x8s9f + Flow_07nkpfr + Flow_1krzf7r + + + Flow_07nkpfr + Flow_085cjmc + + + Flow_0rxc2k4 + Flow_0twizs3 + + + Flow_085cjmc + Flow_0rxc2k4 + + + Flow_1krzf7r + Flow_0twizs3 + + + + + + + + + + + Flow_0bscbwu + + + + Flow_1pxurcs + Flow_0wpzudu + + + Flow_05mxb5c + + + Flow_0bscbwu + Flow_1pxurcs + set_status("Uit termijn lopen") + + + Flow_0wpzudu + Flow_1i4rpcn + + + + + + + + Flow_1i4rpcn + Flow_05mxb5c + + + + + + + + + + + Flow_018zo5f + + + + Flow_018zo5f + Flow_0i0ns5h + set_status("LOD verzoek tot opheffing") + + + Flow_14tllld + + + Flow_0i0ns5h + Flow_14tllld + + + + + + + + + + + Flow_0o6jc5g + + + + Flow_0o6jc5g + Flow_0xjebak + set_status("Nieuwe SIA melding") + + + Flow_0xjebak + Flow_1dpqiy9 + + + Flow_1dpqiy9 + + + Flow_06dktlc + + + Flow_1lym5cd + + + + + + + + + + + + + Flow_07l58c6 + Flow_06dktlc + + + Flow_1o6jbi1 + Flow_07l58c6 + set_status("Nieuwe MMA melding") + + + + + + + + + + + Flow_1o6jbi1 + + + + + + + + + Flow_1smzytp + Flow_1lym5cd + + + Flow_1ibuuuy + Flow_1smzytp + set_status("Nieuwe Doorzon melding") + + + + + + + + + + + Flow_1ibuuuy + + + + + + + + + + + + Flow_0cgzqyp + + + + Flow_1fs6r0z + + + Flow_0cgzqyp + Flow_17kd6x2 + set_status("Verzoek opheffing openbaarmaking namen") + + + Flow_17kd6x2 + Flow_1fs6r0z + + + Flow_0ta1v57 + Flow_0gzsstw + set_status("Doorzon PV") + + + Flow_0vee5as + + + + + + + + Flow_0gzsstw + Flow_0vee5as + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + handhavingsverzoek_juistheid_aanvraag.value == "juist_voldoet" + + + handhavingsverzoek_juistheid_aanvraag.value == "onjuist" + + + + + + + + handhavingsverzoek_uitkomst_debrief.value == "geen_overtreding" + + + + + + + + + + + + + + handhavingsverzoek_uitkomst.value == "afwijzing_handhavingsverzoek" + + + + + + + + + + + + + + + + + + + + + ingebrekestelling_resultaat.value == "gemeente_is_in_gebreke" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Flow_0ta1v57 + + + + + + + + Flow_0iudsij + + + + Flow_03flrgt + + + Flow_0iudsij + Flow_0fnnojb + set_status("Terug melding BAG") + + + + + + + + Flow_0fnnojb + Flow_03flrgt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/apps/workflow/fixtures/fixture.json b/app/apps/workflow/fixtures/fixture.json index 5b4f90a41..dc0c6718c 100644 --- a/app/apps/workflow/fixtures/fixture.json +++ b/app/apps/workflow/fixtures/fixture.json @@ -1032,5 +1032,141 @@ "message_name": "start_handhavingsverzoek", "to_directing_proccess": false } + }, + { + "model": "workflow.workflowoption", + "pk": 122, + "fields": { + "theme": 2, + "name": "Doorzon PV", + "message_name": "start_doorzon_pv", + "to_directing_proccess": false, + "enabled_on_case_closed": true + } + }, + { + "model": "workflow.workflowoption", + "pk": 123, + "fields": { + "theme": 4, + "name": "Doorzon PV", + "message_name": "start_doorzon_pv", + "to_directing_proccess": false, + "enabled_on_case_closed": true + } + }, + { + "model": "workflow.workflowoption", + "pk": 124, + "fields": { + "theme": 5, + "name": "Doorzon PV", + "message_name": "start_doorzon_pv", + "to_directing_proccess": false, + "enabled_on_case_closed": true + } + }, + { + "model": "workflow.workflowoption", + "pk": 125, + "fields": { + "theme": 6, + "name": "Doorzon PV", + "message_name": "start_doorzon_pv", + "to_directing_proccess": false, + "enabled_on_case_closed": true + } + }, + { + "model": "workflow.workflowoption", + "pk": 126, + "fields": { + "theme": 7, + "name": "Doorzon PV", + "message_name": "start_doorzon_pv", + "to_directing_proccess": false, + "enabled_on_case_closed": true + } + }, + { + "model": "workflow.workflowoption", + "pk": 127, + "fields": { + "theme": 8, + "name": "Doorzon PV", + "message_name": "start_doorzon_pv", + "to_directing_proccess": false, + "enabled_on_case_closed": true + } + }, + { + "model": "workflow.workflowoption", + "pk": 128, + "fields": { + "theme": 2, + "name": "Terug melding BAG", + "message_name": "start_terugmelding_bag", + "to_directing_proccess": false + } + }, + { + "model": "workflow.workflowoption", + "pk": 129, + "fields": { + "theme": 3, + "name": "Terug melding BAG", + "message_name": "start_terugmelding_bag", + "to_directing_proccess": false + } + }, + { + "model": "workflow.workflowoption", + "pk": 130, + "fields": { + "theme": 4, + "name": "Terug melding BAG", + "message_name": "start_terugmelding_bag", + "to_directing_proccess": false + } + }, + { + "model": "workflow.workflowoption", + "pk": 131, + "fields": { + "theme": 5, + "name": "Terug melding BAG", + "message_name": "start_terugmelding_bag", + "to_directing_proccess": false + } + }, + { + "model": "workflow.workflowoption", + "pk": 132, + "fields": { + "theme": 6, + "name": "Terug melding BAG", + "message_name": "start_terugmelding_bag", + "to_directing_proccess": false + } + }, + { + "model": "workflow.workflowoption", + "pk": 133, + "fields": { + "theme": 7, + "name": "Terug melding BAG", + "message_name": "start_terugmelding_bag", + "to_directing_proccess": false + } + }, + { + "model": "workflow.workflowoption", + "pk": 134, + "fields": { + "theme": 8, + "name": "Terug melding BAG", + "message_name": "start_terugmelding_bag", + "to_directing_proccess": false + } } ] diff --git a/app/apps/workflow/user_tasks.py b/app/apps/workflow/user_tasks.py index d5936d892..8dc5dc3bd 100644 --- a/app/apps/workflow/user_tasks.py +++ b/app/apps/workflow/user_tasks.py @@ -1008,3 +1008,11 @@ class task_administrative_hercontrole(user_task): class task_opstellen_verslag_digitale_hercontrole(user_task): due_date = relativedelta(days=3) + + +class task_doorzon_pv(user_task): + """Doorzon PV""" + + +class task_sub_workflow_terug_melding_bag(user_task): + """Terug melding BAG""" diff --git a/app/config/settings.py b/app/config/settings.py index b9a4ba199..8566b04ff 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -1245,6 +1245,28 @@ def get_redis_url(): "start_verzoek_opheffing_openbaarmaking_namen": {}, }, }, + "7.1.0": { + "messages": { + "start_signal_process": {}, + "start_correspondence_process": {}, + "start_callbackrequest_process": {}, + "start_objectionfile_process": {}, + "start_extra_information": {}, + "start_nuisance_process": {}, + "start_casus_overleg_proces": {}, + "start_opstellen_digitale_analyse_proces": {}, + "start_aanleveren_wob_dossier": {}, + "start_terugkoppelen_bi": {}, + "start_uitkomst_corporatie_proces": {}, + "start_rapport_bewoners": {}, + "start_afsluiten_zaak": {}, + "start_mma_signal_process": {}, + "start_lod_verzoek_tot_opheffing": {}, + "start_verzoek_opheffing_openbaarmaking_namen": {}, + "start_doorzon_pv": {}, + "start_terugmelding_bag": {}, + }, + }, }, }, "summon": { diff --git a/bin/setup_credentials.sh b/bin/setup_credentials.sh index c3c81ffe6..f077d421f 100755 --- a/bin/setup_credentials.sh +++ b/bin/setup_credentials.sh @@ -1,2 +1,2 @@ # Creates a superuser for the zaak-gateway backend -echo "from django.contrib.auth import get_user_model; get_user_model().objects.create_superuser('admin@admin.com', 'insecure')" | docker-compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell +echo "from django.contrib.auth import get_user_model; get_user_model().objects.create_superuser('admin@admin.com', 'insecure')" | docker compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell diff --git a/bin/setup_user_groups.sh b/bin/setup_user_groups.sh index 01bd136d6..61c54f418 100755 --- a/bin/setup_user_groups.sh +++ b/bin/setup_user_groups.sh @@ -33,4 +33,4 @@ group.permissions.add(Permission.objects.get(name=\"Create a new 'Digitaal toezi (group, _) = UserGroup.objects.get_or_create(name='TOEZICHTHOUDER_DIGITAAL_TOEZICHT', display_name='Toezichthouder - Digitaal toezicht') group.permissions.add(Permission.objects.get(name=\"Can read 'Digitaal toezicht'\")) -group.permissions.add(Permission.objects.get(name=\"Create a new 'Digitaal toezicht' Case\"))" | docker-compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell +group.permissions.add(Permission.objects.get(name=\"Create a new 'Digitaal toezicht' Case\"))" | docker compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell diff --git a/e2e-tests/fix_models.sh b/e2e-tests/fix_models.sh index f6ade8364..7e3191ee5 100755 --- a/e2e-tests/fix_models.sh +++ b/e2e-tests/fix_models.sh @@ -1,9 +1,9 @@ #!/bin/bash -docker-compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c " +docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c " from django.contrib.auth import get_user_model get_user_model().objects.get_or_create(email='local.user@dev.com', first_name='local', last_name='user')" -docker-compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c " +docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c " from apps.users.models import User, UserGroup from django.contrib.auth.models import Permission (group, _) = UserGroup.objects.get_or_create(name='PROJECTHANDHAVER', display_name='Projecthandhaver') @@ -14,7 +14,7 @@ group.permissions.add(Permission.objects.get(name='Can read gevoelige dossiers') user = User.objects.get(email='local.user@dev.com') user.groups.add(group)" -docker-compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c " +docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c " from django_celery_beat.models import PeriodicTask, IntervalSchedule schedule, created = IntervalSchedule.objects.get_or_create(every=10, period=IntervalSchedule.SECONDS) PeriodicTask.objects.get_or_create(interval=schedule, name='Update workflows', task='apps.workflow.tasks.task_update_workflows')" diff --git a/e2e-tests/setup_or_reset_and_start.sh b/e2e-tests/setup_or_reset_and_start.sh index c4c5f08b6..4be936e60 100755 --- a/e2e-tests/setup_or_reset_and_start.sh +++ b/e2e-tests/setup_or_reset_and_start.sh @@ -1,15 +1,15 @@ #!/bin/bash -docker-compose down +docker compose down docker volume rm $(docker volume ls -q) -docker-compose -f ../docker-compose.local.yml build +docker compose -f ../docker-compose.local.yml build -docker-compose run --rm zaak-gateway python manage.py migrate +docker compose run --rm zaak-gateway python manage.py migrate bash ../bin/setup_credentials.sh ./fix_models.sh -docker-compose -f ../docker-compose.local.yml up +docker compose -f ../docker-compose.local.yml up