From 065d1f3e71e1b3f5ad2dae13dd469ad0fda281cf Mon Sep 17 00:00:00 2001
From: Akhil Meka <akhil.reddy@qualyval.com>
Date: Mon, 10 Mar 2025 19:10:39 +0530
Subject: [PATCH] fixed sorting

---
 src/notification/notification.service.ts | 2 +-
 src/organization/organization.service.ts | 4 ++--
 src/pagination.ts                        | 1 +
 src/permit/permit.service.ts             | 4 ++--
 src/processed/processed.service.ts       | 2 +-
 src/rts/rts.service.ts                   | 2 +-
 src/task/task.service.ts                 | 4 ++--
 src/view/view.service.ts                 | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/notification/notification.service.ts b/src/notification/notification.service.ts
index c96908c..d03a20a 100644
--- a/src/notification/notification.service.ts
+++ b/src/notification/notification.service.ts
@@ -53,9 +53,9 @@ export async function listNotifications(
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
diff --git a/src/organization/organization.service.ts b/src/organization/organization.service.ts
index 979253a..1382e27 100644
--- a/src/organization/organization.service.ts
+++ b/src/organization/organization.service.ts
@@ -47,9 +47,9 @@ export async function listOrgs(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
@@ -140,9 +140,9 @@ export async function searchOrgs(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
diff --git a/src/pagination.ts b/src/pagination.ts
index ae65990..1282743 100644
--- a/src/pagination.ts
+++ b/src/pagination.ts
@@ -35,6 +35,7 @@ export function getSortObject(
 
   if (Object.keys(sortObj).length == 0) sortObj["createdAt"] = -1;
 
+  console.log(sortObj);
   return sortObj;
 }
 
diff --git a/src/permit/permit.service.ts b/src/permit/permit.service.ts
index 0b7b559..506db57 100644
--- a/src/permit/permit.service.ts
+++ b/src/permit/permit.service.ts
@@ -124,9 +124,9 @@ export async function listPermits(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
@@ -281,9 +281,9 @@ export async function searchPermit(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
diff --git a/src/processed/processed.service.ts b/src/processed/processed.service.ts
index d9d04f7..f0d1012 100644
--- a/src/processed/processed.service.ts
+++ b/src/processed/processed.service.ts
@@ -90,9 +90,9 @@ export async function listProcessedPermits(
         $facet: {
           metadata: [{ $count: "count" }],
           data: [
+            { $sort: sortObj },
             { $skip: (page - 1) * pageSize },
             { $limit: pageSize },
-            { $sort: sortObj },
           ],
         },
       },
diff --git a/src/rts/rts.service.ts b/src/rts/rts.service.ts
index 4ffcd3f..d132a85 100644
--- a/src/rts/rts.service.ts
+++ b/src/rts/rts.service.ts
@@ -130,9 +130,9 @@ export async function listRts(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
diff --git a/src/task/task.service.ts b/src/task/task.service.ts
index c93045c..9eba383 100644
--- a/src/task/task.service.ts
+++ b/src/task/task.service.ts
@@ -127,9 +127,9 @@ export async function listTasks(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
@@ -220,9 +220,9 @@ export async function searchTasks(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },
diff --git a/src/view/view.service.ts b/src/view/view.service.ts
index b047d8b..58f68bf 100644
--- a/src/view/view.service.ts
+++ b/src/view/view.service.ts
@@ -54,9 +54,9 @@ export async function listViews(params: PageQueryParams, tenantId: string) {
       $facet: {
         metadata: [{ $count: "count" }],
         data: [
+          { $sort: sortObj },
           { $skip: (page - 1) * pageSize },
           { $limit: pageSize },
-          { $sort: sortObj },
         ],
       },
     },