Merge pull request #1271 from Amsterdam/improvement/84133-SIA-will-be…

…-SIG 84133 Updated SIA to SIG
Amsterdam · Oct 8, 2024 · a58d348 · a58d348
2 parents fee5395 + 3865c8d
commit a58d348
Show file tree

Hide file tree

Showing 18 changed files with 85 additions and 41 deletions.
diff --git a/.env b/.env
@@ -23,7 +23,7 @@ REDIS_HOST=zaak-redis
 REDIS_PORT=6379
 REDIS_PASSWORD=password
 DEFAULT_THEME=Vakantieverhuur
-DEFAULT_REASON=SIA melding
+DEFAULT_REASON=SIG melding
 VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_URL=https://api.acceptatie.toeristischeverhuur.nl/api/
 VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_ACCESS_TOKEN=SECRET_ACCESS_TOKEN
 VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_HEALTH_CHECK_BAG_ID=0503100000000209

diff --git a/app/apps/cases/admin.py b/app/apps/cases/admin.py
@@ -63,7 +63,7 @@ def migrate_advertisement_linklist_items(modeladmin, request, queryset):
     for citizen_report in queryset:
         for link in citizen_report.advertisement_linklist:
             if (
-                citizen_report.case.reason.name == "SIA melding"
+                citizen_report.case.reason.name == "SIG melding"
                 and date(
                     year=citizen_report.date_added.year,
                     month=citizen_report.date_added.month,

diff --git a/app/apps/cases/fixtures/fixture.json b/app/apps/cases/fixtures/fixture.json
@@ -64,7 +64,7 @@
     "model": "cases.casereason",
     "pk": 4,
     "fields": {
-      "name": "SIA melding",
+      "name": "SIG melding",
       "theme": 2
     }
   },
@@ -80,15 +80,15 @@
     "model": "cases.casereason",
     "pk": 6,
     "fields": {
-      "name": "SIA melding",
+      "name": "SIG melding",
       "theme": 3
     }
   },
   {
     "model": "cases.casereason",
     "pk": 7,
     "fields": {
-      "name": "SIA melding",
+      "name": "SIG melding",
       "theme": 4
     }
   },
@@ -144,7 +144,7 @@
     "model": "cases.casereason",
     "pk": 15,
     "fields": {
-      "name": "SIA melding",
+      "name": "SIG melding",
       "theme": 5
     }
   },
@@ -192,7 +192,7 @@
     "model": "cases.casereason",
     "pk": 21,
     "fields": {
-      "name": "SIA melding",
+      "name": "SIG melding",
       "theme": 6
     }
   },
@@ -296,7 +296,7 @@
     "model": "cases.casereason",
     "pk": 34,
     "fields": {
-      "name": "SIA melding",
+      "name": "SIG melding",
       "theme": 7
     }
   },
@@ -352,7 +352,7 @@
     "model": "cases.casereason",
     "pk": 41,
     "fields": {
-      "name": "SIA melding",
+      "name": "SIG melding",
       "theme": 8
     }
   },

diff --git a/app/apps/cases/models.py b/app/apps/cases/models.py
@@ -430,7 +430,7 @@ def get_status_information(self):
                 if getattr(self, f) is not None
             ]
         )
-        return f"SIA-nummer: {reporter}"
+        return f"SIG-nummer: {reporter}"
 
     def __str__(self):
         return f"CitizenReport: {self.date_added} - {self.case}"

diff --git a/app/apps/cases/views/bwv.py b/app/apps/cases/views/bwv.py
@@ -56,9 +56,9 @@ class ImportBWVCaseDataView(UserPassesTestMixin, FormView):
     template_name = "import/body.html"
 
     reason_translate = {
-        "melding": "SIA melding",
-        "sia_melding": "SIA melding",
-        "sia": "SIA melding",
+        "melding": "SIG melding",
+        "sia_melding": "SIG melding",
+        "sia": "SIG melding",
         "project": "Project",
         "digitaal_toezicht": "Digitaal toezicht",
         "melding_eigenaar": "Leegstandsmelding eigenaar",

diff --git a/app/apps/users/migrations/0008_alter_permission_options.py b/app/apps/users/migrations/0008_alter_permission_options.py
@@ -0,0 +1,45 @@
+# Generated by Django 4.2.14 on 2024-10-03 08:45
+
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0007_remove_user_manager"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="permission",
+            options={
+                "default_permissions": (),
+                "managed": False,
+                "permissions": [
+                    ("create_case", "Create a new Case"),
+                    (
+                        "create_digital_surveilance_case",
+                        "Create a new 'Digitaal toezicht' Case",
+                    ),
+                    ("close_case", "Close a Case (by performing the last task)"),
+                    ("perform_task", "Can perform a tasks"),
+                    (
+                        "access_personal_data_register",
+                        "Can access 'BRP' (persoonsgegevens / ingeschreven personen)",
+                    ),
+                    (
+                        "access_business_register",
+                        "Can access 'Handelsregister' (bedrijfseigenaren van panden, bedrijfsinformatie)",
+                    ),
+                    ("access_recovery_check", "Can access 'invorderingscheck'"),
+                    ("access_sensitive_dossiers", "Can read gevoelige dossiers"),
+                    ("access_sigital_surveillance", "Can read 'Digitaal toezicht'"),
+                    (
+                        "access_document_management_system",
+                        "Can access 'DMS' (Alfresco / Decos)",
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/app/apps/users/permissions.py b/app/apps/users/permissions.py
@@ -18,7 +18,6 @@
         "access_business_register",
         "Can access 'Handelsregister' (bedrijfseigenaren van panden, bedrijfsinformatie)",
     ),
-    ("access_signals", "Can access 'SIA' (signalen)"),
     ("access_recovery_check", "Can access 'invorderingscheck'"),
     ("access_sensitive_dossiers", "Can read gevoelige dossiers"),
     ("access_sigital_surveillance", "Can read 'Digitaal toezicht'"),

diff --git a/...ps/workflow/bpmn_files/default/citizen_report_feedback/0.1.0/citizen_report_feedback.bpmn b/...ps/workflow/bpmn_files/default/citizen_report_feedback/0.1.0/citizen_report_feedback.bpmn
@@ -30,7 +30,7 @@
     <bpmn:startEvent id="start_citizen_report_feedback">
       <bpmn:outgoing>Flow_000qqth</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:userTask id="task_1_sia_terugkoppeling_melders" name="1e SIA terugkoppeling melder" camunda:formKey="form">
+    <bpmn:userTask id="task_1_sia_terugkoppeling_melders" name="1e SIG terugkoppeling melder" camunda:formKey="form">
       <bpmn:extensionElements>
         <camunda:formData>
           <camunda:formField id="1_feedback" label="Ja, deze taak is afgerond" type="boolean" />
@@ -106,7 +106,7 @@
     <bpmn:sequenceFlow id="Flow_0hb8y6t" name="force_citizen_report_feedback" sourceRef="Gateway_1kv5oje" targetRef="Gateway_1wphfcu">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">force_citizen_report_feedback.value == True</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:userTask id="task_2_sia_terugkoppeling_melders" name="2e SIA terugkoppeling melder" camunda:formKey="form">
+    <bpmn:userTask id="task_2_sia_terugkoppeling_melders" name="2e SIG terugkoppeling melder" camunda:formKey="form">
       <bpmn:extensionElements>
         <camunda:formData>
           <camunda:formField id="2_feedback" label="Ja, deze taak is afgerond" type="boolean" />
@@ -125,7 +125,7 @@
       <bpmn:incoming>Flow_0j8xj87</bpmn:incoming>
       <bpmn:incoming>Flow_0ntx4te</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:userTask id="task_sia_terugkoppeling_melders" name="SIA terugkoppeling melder">
+    <bpmn:userTask id="task_sia_terugkoppeling_melders" name="SIG terugkoppeling melder">
       <bpmn:incoming>Flow_1nqle2x</bpmn:incoming>
       <bpmn:outgoing>Flow_0j8xj87</bpmn:outgoing>
     </bpmn:userTask>

diff --git a/app/apps/workflow/bpmn_files/default/sub_workflow/0.1.0/sub_workflow.bpmn b/app/apps/workflow/bpmn_files/default/sub_workflow/0.1.0/sub_workflow.bpmn
@@ -109,7 +109,7 @@
       <bpmn:incoming>Flow_0xjebak</bpmn:incoming>
       <bpmn:outgoing>Flow_1dpqiy9</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:userTask id="Activity_19a40xb" name="SIA terugkoppeling melder(s)" camunda:candidateGroups="Projectmedewerker" camunda:dueDate="${dateTime().plusDays(28).toDate()}">
+    <bpmn:userTask id="Activity_19a40xb" name="SIG terugkoppeling melder(s)" camunda:candidateGroups="Projectmedewerker" camunda:dueDate="${dateTime().plusDays(28).toDate()}">
       <bpmn:incoming>Flow_1dpqiy9</bpmn:incoming>
       <bpmn:outgoing>Flow_0zw0zxy</bpmn:outgoing>
     </bpmn:userTask>

diff --git a/app/apps/workflow/bpmn_files/default/sub_workflow/0.2.0/sub_workflow.bpmn b/app/apps/workflow/bpmn_files/default/sub_workflow/0.2.0/sub_workflow.bpmn
@@ -119,7 +119,7 @@
       <bpmn:incoming>Flow_0xjebak</bpmn:incoming>
       <bpmn:outgoing>Flow_1dpqiy9</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:userTask id="Activity_19a40xb" name="SIA terugkoppeling melder(s)" camunda:candidateGroups="Projectmedewerker" camunda:dueDate="${dateTime().plusDays(28).toDate()}">
+    <bpmn:userTask id="Activity_19a40xb" name="SIG terugkoppeling melder(s)" camunda:candidateGroups="Projectmedewerker" camunda:dueDate="${dateTime().plusDays(28).toDate()}">
       <bpmn:incoming>Flow_1dpqiy9</bpmn:incoming>
       <bpmn:outgoing>Flow_0zw0zxy</bpmn:outgoing>
     </bpmn:userTask>

diff --git a/app/apps/workflow/bpmn_files/default/sub_workflow/0.3.0/sub_workflow.bpmn b/app/apps/workflow/bpmn_files/default/sub_workflow/0.3.0/sub_workflow.bpmn
@@ -127,7 +127,7 @@
       <bpmn:incoming>Flow_0xjebak</bpmn:incoming>
       <bpmn:outgoing>Flow_1dpqiy9</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:userTask id="Activity_19a40xb" name="SIA terugkoppeling melder(s)" camunda:candidateGroups="Projectmedewerker" camunda:dueDate="${dateTime().plusDays(28).toDate()}">
+    <bpmn:userTask id="Activity_19a40xb" name="SIG terugkoppeling melder(s)" camunda:candidateGroups="Projectmedewerker" camunda:dueDate="${dateTime().plusDays(28).toDate()}">
       <bpmn:incoming>Flow_1dpqiy9</bpmn:incoming>
       <bpmn:outgoing>Flow_0zw0zxy</bpmn:outgoing>
     </bpmn:userTask>

diff --git a/app/apps/workflow/bpmn_files/default/sub_workflow/0.8.0/sub_workflow.bpmn b/app/apps/workflow/bpmn_files/default/sub_workflow/0.8.0/sub_workflow.bpmn
@@ -693,10 +693,10 @@
     <bpmn:endEvent id="end_0q70hru">
       <bpmn:incoming>Flow_1dpqiy9</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIA melding">
+    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIG melding">
       <bpmn:incoming>Flow_0o6jc5g</bpmn:incoming>
       <bpmn:outgoing>Flow_0xjebak</bpmn:outgoing>
-      <bpmn:script>set_status("Nieuwe SIA melding")</bpmn:script>
+      <bpmn:script>set_status("Nieuwe SIG melding")</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:startEvent id="event_start_signal_process" name="Start melding proces" camunda:formKey="start_melding">
       <bpmn:extensionElements>
@@ -710,7 +710,7 @@
       <bpmn:outgoing>Flow_0o6jc5g</bpmn:outgoing>
       <bpmn:messageEventDefinition id="MessageEventDefinition_0nu5r8p" messageRef="Message_0f7jpp5" />
     </bpmn:startEvent>
-    <bpmn:userTask id="task_create_signal" name="SIA melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
+    <bpmn:userTask id="task_create_signal" name="SIG melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
       <bpmn:incoming>Flow_0xjebak</bpmn:incoming>
       <bpmn:outgoing>Flow_1dpqiy9</bpmn:outgoing>
     </bpmn:userTask>

diff --git a/app/apps/workflow/bpmn_files/default/sub_workflow/0.9.0/sub_workflow.bpmn b/app/apps/workflow/bpmn_files/default/sub_workflow/0.9.0/sub_workflow.bpmn
@@ -697,10 +697,10 @@
     <bpmn:endEvent id="end_0q70hru">
       <bpmn:incoming>Flow_1dpqiy9</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIA melding">
+    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIG melding">
       <bpmn:incoming>Flow_0o6jc5g</bpmn:incoming>
       <bpmn:outgoing>Flow_0xjebak</bpmn:outgoing>
-      <bpmn:script>set_status("Nieuwe SIA melding")</bpmn:script>
+      <bpmn:script>set_status("Nieuwe SIG melding")</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:startEvent id="event_start_signal_process" name="Start melding proces" camunda:formKey="start_melding">
       <bpmn:extensionElements>
@@ -714,7 +714,7 @@
       <bpmn:outgoing>Flow_0o6jc5g</bpmn:outgoing>
       <bpmn:messageEventDefinition id="MessageEventDefinition_0nu5r8p" messageRef="Message_0f7jpp5" />
     </bpmn:startEvent>
-    <bpmn:userTask id="task_create_signal" name="SIA melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
+    <bpmn:userTask id="task_create_signal" name="SIG melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
       <bpmn:incoming>Flow_0xjebak</bpmn:incoming>
       <bpmn:outgoing>Flow_1dpqiy9</bpmn:outgoing>
     </bpmn:userTask>

diff --git a/app/apps/workflow/bpmn_files/default/sub_workflow/7.0.0/sub_workflow.bpmn b/app/apps/workflow/bpmn_files/default/sub_workflow/7.0.0/sub_workflow.bpmn
@@ -828,12 +828,12 @@
       <bpmn:outgoing>Flow_0o6jc5g</bpmn:outgoing>
       <bpmn:messageEventDefinition id="MessageEventDefinition_0nu5r8p" messageRef="Message_0f7jpp5" />
     </bpmn:startEvent>
-    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIA melding">
+    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIG melding">
       <bpmn:incoming>Flow_0o6jc5g</bpmn:incoming>
       <bpmn:outgoing>Flow_0xjebak</bpmn:outgoing>
-      <bpmn:script>set_status("Nieuwe SIA melding")</bpmn:script>
+      <bpmn:script>set_status("Nieuwe SIG melding")</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:userTask id="task_create_signal" name="SIA melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
+    <bpmn:userTask id="task_create_signal" name="SIG melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
       <bpmn:incoming>Flow_0xjebak</bpmn:incoming>
       <bpmn:outgoing>Flow_1dpqiy9</bpmn:outgoing>
     </bpmn:userTask>

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
@@ -742,12 +742,12 @@
       <bpmn:outgoing>Flow_0o6jc5g</bpmn:outgoing>
       <bpmn:messageEventDefinition id="MessageEventDefinition_0nu5r8p" messageRef="Message_0f7jpp5" />
     </bpmn:startEvent>
-    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIA melding">
+    <bpmn:scriptTask id="service_status_melding" name="Bijwerken status: Nieuwe SIG melding">
       <bpmn:incoming>Flow_0o6jc5g</bpmn:incoming>
       <bpmn:outgoing>Flow_0xjebak</bpmn:outgoing>
-      <bpmn:script>set_status("Nieuwe SIA melding")</bpmn:script>
+      <bpmn:script>set_status("Nieuwe SIG melding")</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:userTask id="task_create_signal" name="SIA melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
+    <bpmn:userTask id="task_create_signal" name="SIG melding verwerken" camunda:formKey="task_create_signal" camunda:candidateGroups="Projectmedewerker">
       <bpmn:incoming>Flow_0xjebak</bpmn:incoming>
       <bpmn:outgoing>Flow_1dpqiy9</bpmn:outgoing>
     </bpmn:userTask>

diff --git a/app/apps/workflow/fixtures/fixture.json b/app/apps/workflow/fixtures/fixture.json
@@ -3,7 +3,7 @@
     "pk": 2,
     "fields": {
       "theme": 2,
-      "name": "Nieuwe SIA melding",
+      "name": "Nieuwe SIG melding",
       "message_name": "start_signal_process",
       "to_directing_proccess": false
     }
@@ -107,7 +107,7 @@
     "pk": 22,
     "fields": {
       "theme": 3,
-      "name": "Nieuwe SIA melding",
+      "name": "Nieuwe SIG melding",
       "message_name": "start_signal_process",
       "to_directing_proccess": false
     }
@@ -169,7 +169,7 @@
     "pk": 29,
     "fields": {
       "theme": 4,
-      "name": "Nieuwe SIA melding",
+      "name": "Nieuwe SIG melding",
       "message_name": "start_signal_process",
       "to_directing_proccess": false
     }
@@ -272,7 +272,7 @@
     "pk": 39,
     "fields": {
       "theme": 5,
-      "name": "Nieuwe SIA melding",
+      "name": "Nieuwe SIG melding",
       "message_name": "start_signal_process",
       "to_directing_proccess": false
     }
@@ -422,7 +422,7 @@
     "pk": 54,
     "fields": {
       "theme": 6,
-      "name": "Nieuwe SIA melding",
+      "name": "Nieuwe SIG melding",
       "message_name": "start_signal_process",
       "to_directing_proccess": false
     }
@@ -796,7 +796,7 @@
     "pk": 96,
     "fields": {
       "theme": 7,
-      "name": "Nieuwe SIA melding",
+      "name": "Nieuwe SIG melding",
       "message_name": "start_signal_process",
       "to_directing_proccess": false
     }
@@ -947,7 +947,7 @@
     "pk": 113,
     "fields": {
       "theme": 8,
-      "name": "Nieuwe SIA melding",
+      "name": "Nieuwe SIG melding",
       "message_name": "start_signal_process",
       "to_directing_proccess": false
     }

diff --git a/app/apps/workflow/user_tasks.py b/app/apps/workflow/user_tasks.py
@@ -163,7 +163,7 @@ class task_terugkoppelen_melder_2(user_task):
 
 
 class task_sia_terugkoppeling_melders_legacy(user_task):
-    """SIA terugkoppeling melder(s)"""
+    """SIG terugkoppeling melder(s)"""
 
     _task_name = "Activity_19a40xb"
     due_date = relativedelta(days=2)

diff --git a/app/config/settings.py b/app/config/settings.py
@@ -547,7 +547,7 @@ def get_redis_url():
 LOGOUT_REDIRECT_URL = "/admin"
 
 DEFAULT_THEME = os.getenv("DEFAULT_THEME", "Vakantieverhuur")
-DEFAULT_REASON = os.getenv("DEFAULT_REASON", "SIA melding")
+DEFAULT_REASON = os.getenv("DEFAULT_REASON", "SIG melding")
 
 DEFAULT_SCHEDULE_ACTIONS = os.getenv("DEFAULT_SCHEDULE_ACTIONS").split(",")
 DEFAULT_SCHEDULE_WEEK_SEGMENTS = os.getenv("DEFAULT_SCHEDULE_WEEK_SEGMENTS").split(",")