Added subjects and tags

app/apps/itinerary/migrations/0070_add_subjects_tags_daysetting_itinerary.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.13 on 2024-05-14 10:04
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("itinerary", "0069_itinerarysettings_districts"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="itinerarysettings",
+            name="subjects",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.PositiveSmallIntegerField(),
+                blank=True,
+                null=True,
+                size=None,
+            ),
+        ),
+        migrations.AddField(
+            model_name="itinerarysettings",
+            name="tags",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.PositiveSmallIntegerField(),
+                blank=True,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]

app/apps/itinerary/models.py

@@ -225,6 +225,16 @@ class ItinerarySettings(models.Model):
         blank=True,
         null=True,
     )
+    subjects = ArrayField(
+        base_field=models.PositiveSmallIntegerField(),
+        blank=True,
+        null=True,
+    )
+    tags = ArrayField(
+        base_field=models.PositiveSmallIntegerField(),
+        blank=True,
+        null=True,
+    )
     districts = ArrayField(
         base_field=models.PositiveSmallIntegerField(),
         blank=True,
@@ -261,6 +271,8 @@ def get_cases_query_params(self):
                 "district": self.districts,
                 "project": self.project_ids,
                 "priority": self.priorities,
+                "subject": self.subjects,
+                "tag": self.tags,
             }
         )
         return cases_query_params

app/apps/planner/admin.py

@@ -31,6 +31,8 @@ class DaySettingsInline(admin.TabularInline):
                     "max_use_limit",
                     "start_time",
                     "project_ids",
+                    "subjects",
+                    "tags",
                 )
             },
         ),

app/apps/planner/migrations/0041_add_subjects_tags_daysetting_itinerary.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.13 on 2024-05-14 10:04
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("planner", "0040_daysettings_districts"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="daysettings",
+            name="subjects",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.PositiveSmallIntegerField(),
+                blank=True,
+                null=True,
+                size=None,
+            ),
+        ),
+        migrations.AddField(
+            model_name="daysettings",
+            name="tags",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.PositiveSmallIntegerField(),
+                blank=True,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]

app/apps/planner/models.py

@@ -123,6 +123,30 @@ def fetch_team_reasons(self, auth_header=None):
 
         return response.json().get("results", [])
 
+    def fetch_subjects(self, auth_header=None):
+        url = f"{settings.ZAKEN_API_URL}/themes/{self.zaken_team_id}/subjects/"
+
+        response = requests.get(
+            url,
+            timeout=5,
+            headers=get_headers(auth_header),
+        )
+        response.raise_for_status()
+
+        return response.json().get("results", [])
+
+    def fetch_tags(self, auth_header=None):
+        url = f"{settings.ZAKEN_API_URL}/themes/{self.zaken_team_id}/tags/"
+
+        response = requests.get(
+            url,
+            timeout=5,
+            headers=get_headers(auth_header),
+        )
+        response.raise_for_status()
+
+        return response.json().get("results", [])
+
     class Meta:
         verbose_name_plural = "Team settings"
         ordering = ["name"]
@@ -231,6 +255,16 @@ class DaySettings(models.Model):
         blank=True,
         null=True,
     )
+    subjects = ArrayField(
+        base_field=models.PositiveSmallIntegerField(),
+        blank=True,
+        null=True,
+    )
+    tags = ArrayField(
+        base_field=models.PositiveSmallIntegerField(),
+        blank=True,
+        null=True,
+    )
     districts = ArrayField(
         base_field=models.PositiveSmallIntegerField(),
         blank=True,
@@ -278,6 +312,8 @@ def get_cases_query_params(self):
                 "schedule_week_segment": self.week_segments,
                 "project": self.project_ids,
                 "reason": self.reasons,
+                "subject": self.subjects,
+                "tag": self.tags,
                 "district": self.districts,
                 "priority": self.priorities,
             }

app/apps/planner/serializers.py

@@ -188,6 +188,18 @@ class CaseProjectSerializer(serializers.Serializer):
     team = serializers.IntegerField(read_only=True)
 
 
+class CaseSubjectSerializer(serializers.Serializer):
+    id = serializers.IntegerField(read_only=True)
+    name = serializers.CharField(read_only=True)
+    team = serializers.IntegerField(read_only=True)
+
+
+class CaseTagSerializer(serializers.Serializer):
+    id = serializers.IntegerField(read_only=True)
+    name = serializers.CharField(read_only=True)
+    team = serializers.IntegerField(read_only=True)
+
+
 class CaseStateTypeSerializer(CaseReasonSerializer):
     pass
 
@@ -229,6 +241,8 @@ class Meta:
             "reasons",
             "state_types",
             "project_ids",
+            "subjects",
+            "tags",
             "districts",
             "housing_corporations",
             "housing_corporation_combiteam",
@@ -261,6 +275,8 @@ class Meta:
             "reasons",
             "state_types",
             "project_ids",
+            "subjects",
+            "tags",
             "districts",
             "housing_corporations",
             "housing_corporation_combiteam",

app/apps/planner/views.py

@@ -7,6 +7,8 @@
     CaseProjectSerializer,
     CaseReasonSerializer,
     CaseStateTypeSerializer,
+    CaseSubjectSerializer,
+    CaseTagSerializer,
     DaySettingsSerializer,
     NewDaySettingsSerializer,
     TeamScheduleTypesSerializer,
@@ -124,6 +126,50 @@ def projects(self, request, pk):
 
         return Response(data)
 
+    @extend_schema(
+        description="Gets the subjects associated with the requested team",
+        responses={status.HTTP_200_OK: CaseSubjectSerializer(many=True)},
+    )
+    @action(
+        detail=True,
+        url_path="subjects",
+        methods=["get"],
+    )
+    def subjects(self, request, pk):
+        team_settings = self.get_object()
+        data = []
+
+        serializer = CaseSubjectSerializer(
+            team_settings.fetch_subjects(
+                get_keycloak_auth_header_from_request(request)
+            ),
+            many=True,
+        )
+        data = serializer.data
+
+        return Response(data)
+
+    @extend_schema(
+        description="Gets the tags associated with the requested team",
+        responses={status.HTTP_200_OK: CaseTagSerializer(many=True)},
+    )
+    @action(
+        detail=True,
+        url_path="tags",
+        methods=["get"],
+    )
+    def tags(self, request, pk):
+        team_settings = self.get_object()
+        data = []
+
+        serializer = CaseTagSerializer(
+            team_settings.fetch_tags(get_keycloak_auth_header_from_request(request)),
+            many=True,
+        )
+        data = serializer.data
+
+        return Response(data)
+
 
 @extend_schema(
     parameters=[