feat(core): Extend all ticket endpoints to contain ticket categories

ref: #14 #96 #93 #95 #90 #283 #284
nofusscomputing · Sep 13, 2024 · 5d116c7 · 5d116c7
1 parent 2a31815
commit 5d116c7
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 0 deletions.
diff --git a/app/api/serializers/assistance/request.py b/app/api/serializers/assistance/request.py
@@ -1,3 +1,5 @@
+from rest_framework.fields import empty
+
 from api.serializers.core.ticket import TicketSerializer
 
 from core.models.ticket.ticket import Ticket
@@ -16,6 +18,7 @@ class Meta:
             'id',
             'assigned_teams',
             'assigned_users',
+            'category',
             'created',
             'modified',
             'status',
@@ -47,3 +50,12 @@ class Meta:
             'ticket_type',
             'url',
         ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            request = True
+        )
diff --git a/app/api/serializers/itim/change.py b/app/api/serializers/itim/change.py
@@ -1,3 +1,5 @@
+from rest_framework.fields import empty
+
 from api.serializers.core.ticket import TicketSerializer
 
 from core.models.ticket.ticket import Ticket
@@ -16,6 +18,7 @@ class Meta:
             'id',
             'assigned_teams',
             'assigned_users',
+            'category',
             'created',
             'modified',
             'status',
@@ -47,3 +50,12 @@ class Meta:
             'ticket_type',
             'url',
         ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            project_task = True
+        )
diff --git a/app/api/serializers/itim/incident.py b/app/api/serializers/itim/incident.py
@@ -1,3 +1,5 @@
+from rest_framework.fields import empty
+
 from api.serializers.core.ticket import TicketSerializer
 
 from core.models.ticket.ticket import Ticket
@@ -16,6 +18,7 @@ class Meta:
             'id',
             'assigned_teams',
             'assigned_users',
+            'category',
             'created',
             'modified',
             'status',
@@ -47,3 +50,12 @@ class Meta:
             'ticket_type',
             'url',
         ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            incident = True
+        )
diff --git a/app/api/serializers/itim/problem.py b/app/api/serializers/itim/problem.py
@@ -1,3 +1,5 @@
+from rest_framework.fields import empty
+
 from api.serializers.core.ticket import TicketSerializer
 
 from core.models.ticket.ticket import Ticket
@@ -16,6 +18,7 @@ class Meta:
             'id',
             'assigned_teams',
             'assigned_users',
+            'category',
             'created',
             'modified',
             'status',
@@ -47,3 +50,12 @@ class Meta:
             'ticket_type',
             'url',
         ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            problem = True
+        )
diff --git a/app/api/serializers/project_management/project_task.py b/app/api/serializers/project_management/project_task.py
@@ -1,3 +1,5 @@
+from rest_framework.fields import empty
+
 from api.serializers.core.ticket import TicketSerializer
 
 from core.models.ticket.ticket import Ticket
@@ -16,6 +18,7 @@ class Meta:
             'id',
             'assigned_teams',
             'assigned_users',
+            'category',
             'created',
             'modified',
             'status',
@@ -47,3 +50,12 @@ class Meta:
             'ticket_type',
             'url',
         ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            project_task = True
+        )
diff --git a/app/core/forms/validate_ticket.py b/app/core/forms/validate_ticket.py
@@ -37,6 +37,7 @@ class TicketValidation(
     import_fields: list = [
         'assigned_users',
         'assigned_teams',
+        'category',
         'created',
         'date_closed',
         'external_ref',