From fc31186aecb25747f6f432d86efe8d8f098359fb Mon Sep 17 00:00:00 2001
From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com>
Date: Fri, 17 May 2024 18:19:17 +0530
Subject: [PATCH 1/2] chore: snoozed inbox issue (#4487)

---
 apiserver/plane/app/views/inbox/base.py | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.py
index d688a88533..7919899fa6 100644
--- a/apiserver/plane/app/views/inbox/base.py
+++ b/apiserver/plane/app/views/inbox/base.py
@@ -467,12 +467,7 @@ class InboxIssueViewSet(BaseViewSet):
                 )
 
                 inbox_issue = (
-                    InboxIssue.objects.filter(
-                        inbox_id=inbox_id.id,
-                        issue_id=serializer.data["id"],
-                        project_id=project_id,
-                    )
-                    .select_related("issue")
+                    InboxIssue.objects.select_related("issue")
                     .prefetch_related(
                         "issue__labels",
                         "issue__assignees",
@@ -484,10 +479,7 @@ class InboxIssueViewSet(BaseViewSet):
                                 distinct=True,
                                 filter=~Q(issue__labels__id__isnull=True),
                             ),
-                            Value(
-                                [],
-                                output_field=ArrayField(UUIDField()),
-                            ),
+                            Value([], output_field=ArrayField(UUIDField())),
                         ),
                         assignee_ids=Coalesce(
                             ArrayAgg(
@@ -495,13 +487,14 @@ class InboxIssueViewSet(BaseViewSet):
                                 distinct=True,
                                 filter=~Q(issue__assignees__id__isnull=True),
                             ),
-                            Value(
-                                [],
-                                output_field=ArrayField(UUIDField()),
-                            ),
+                            Value([], output_field=ArrayField(UUIDField())),
                         ),
                     )
-                    .first()
+                    .get(
+                        inbox_id=inbox_id.id,
+                        issue_id=issue_id,
+                        project_id=project_id,
+                    )
                 )
                 serializer = InboxIssueDetailSerializer(inbox_issue).data
                 return Response(serializer, status=status.HTTP_200_OK)

From e3e7c99e117a2de822412366b214ca951050f581 Mon Sep 17 00:00:00 2001
From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com>
Date: Fri, 17 May 2024 18:51:47 +0530
Subject: [PATCH 2/2] chore: user favorite sequence (#4501)

---
 apiserver/plane/db/models/favorite.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apiserver/plane/db/models/favorite.py b/apiserver/plane/db/models/favorite.py
index 95157c793c..2ea1014bc8 100644
--- a/apiserver/plane/db/models/favorite.py
+++ b/apiserver/plane/db/models/favorite.py
@@ -39,11 +39,11 @@ class UserFavorite(WorkspaceBaseModel):
 
     def save(self, *args, **kwargs):
         if self._state.adding:
-            largest_sort_order = UserFavorite.objects.filter(
-                workspace=self.workspace
-            ).aggregate(largest=models.Max("sort_order"))["largest"]
-            if largest_sort_order is not None:
-                self.sort_order = largest_sort_order + 10000
+            largest_sequence = UserFavorite.objects.filter(
+                workspace=self.project.workspace
+            ).aggregate(largest=models.Max("sequence"))["largest"]
+            if largest_sequence is not None:
+                self.sequence = largest_sequence + 10000
 
         super(UserFavorite, self).save(*args, **kwargs)