From f80b3f1eb13aaf5dc0302f722937f817253d680f Mon Sep 17 00:00:00 2001
From: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com>
Date: Fri, 26 May 2023 13:51:09 +0530
Subject: [PATCH] fix: issue ordering for priority and updated_by parameters
 (#1142)

---
 apiserver/plane/api/serializers/issue.py |  4 +++
 apiserver/plane/api/views/issue.py       | 42 +++++++++++++++++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/apiserver/plane/api/serializers/issue.py b/apiserver/plane/api/serializers/issue.py
index a39128088..d3c17d057 100644
--- a/apiserver/plane/api/serializers/issue.py
+++ b/apiserver/plane/api/serializers/issue.py
@@ -1,3 +1,6 @@
+# Django imports
+from django.utils import timezone
+
 # Third Party imports
 from rest_framework import serializers
 
@@ -251,6 +254,7 @@ class IssueCreateSerializer(BaseSerializer):
                 batch_size=10,
             )
 
+        instance.updated_at = timezone.now()
         return super().update(instance, validated_data)
 
 
diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py
index 2a2b3e3a9..abdfe6aae 100644
--- a/apiserver/plane/api/views/issue.py
+++ b/apiserver/plane/api/views/issue.py
@@ -4,12 +4,24 @@ import random
 from itertools import chain
 
 # Django imports
-from django.db.models import Prefetch, OuterRef, Func, F, Q, Count
+from django.db.models import (
+    Prefetch,
+    OuterRef,
+    Func,
+    F,
+    Q,
+    Count,
+    Case,
+    Value,
+    CharField,
+    When,
+)
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
 from django.db.models.functions import Coalesce
 from django.conf import settings
+
 # Third Party imports
 from rest_framework.response import Response
 from rest_framework import status
@@ -144,9 +156,13 @@ class IssueViewSet(BaseViewSet):
             filters = issue_filters(request.query_params, "GET")
             show_sub_issues = request.GET.get("show_sub_issues", "true")
 
+            # Custom ordering for priority
+            priority_order = ["urgent", "high", "medium", "low", None]
+
+            order_by_param = request.GET.get("order_by", "-created_at")
+
             issue_queryset = (
                 self.get_queryset()
-                .order_by(request.GET.get("order_by", "created_at"))
                 .filter(**filters)
                 .annotate(cycle_id=F("issue_cycle__id"))
                 .annotate(module_id=F("issue_module__id"))
@@ -166,6 +182,19 @@ class IssueViewSet(BaseViewSet):
                 )
             )
 
+            if order_by_param == "priority":
+                issue_queryset = issue_queryset.annotate(
+                    priority_order=Case(
+                        *[
+                            When(priority=p, then=Value(i))
+                            for i, p in enumerate(priority_order)
+                        ],
+                        output_field=CharField(),
+                    )
+                ).order_by("priority_order")
+            else:
+                issue_queryset = issue_queryset.order_by(order_by_param)
+
             issue_queryset = (
                 issue_queryset
                 if show_sub_issues == "true"
@@ -789,8 +818,13 @@ class IssueAttachmentEndpoint(BaseAPIView):
             if serializer.is_valid():
                 serializer.save(project_id=project_id, issue_id=issue_id)
                 response_data = serializer.data
-                if settings.DOCKERIZED and settings.AWS_S3_ENDPOINT_URL in response_data["asset"]:
-                    response_data["asset"] = response_data["asset"].replace(settings.AWS_S3_ENDPOINT_URL, settings.WEB_URL)
+                if (
+                    settings.DOCKERIZED
+                    and settings.AWS_S3_ENDPOINT_URL in response_data["asset"]
+                ):
+                    response_data["asset"] = response_data["asset"].replace(
+                        settings.AWS_S3_ENDPOINT_URL, settings.WEB_URL
+                    )
                 issue_activity.delay(
                     type="attachment.activity.created",
                     requested_data=None,