Add sorting

src/organization/organization.schema.ts

@@ -3,9 +3,7 @@ import mongoose from "mongoose";
 import { z } from "zod";
 import { pageMetadata, pageQueryParams } from "../pagination";
 
-export const orgModel = mongoose.model(
-  "organization",
-  new mongoose.Schema({
+const orgSchema = new mongoose.Schema({
   tenantId: {
     type: String,
     required: true,
@@ -25,8 +23,12 @@ export const orgModel = mongoose.model(
   createdAt: Date,
   createdBy: String,
   updatedAt: Date,
-  }).index({ tenantId: 1, domain: 1 }, { unique: true })
+}).index({ tenantId: 1, domain: 1 }, { unique: true });
+
+export const orgFields = Object.keys(orgSchema.paths).filter(
+  (path) => path !== "__v"
 );
+export const orgModel = mongoose.model("organization", orgSchema);
 
 const orgCore = {
   name: z.string().max(30),

src/organization/organization.service.ts

@@ -1,7 +1,8 @@
-import { PageQueryParams } from "../pagination";
+import { getSortObject, PageQueryParams } from "../pagination";
 import { generateId } from "../utils/id";
 import {
   CreateOrgInput,
+  orgFields,
   orgModel,
   UpdateOrgInput,
 } from "./organization.schema";
@@ -26,13 +27,18 @@ export async function getOrg(orgId: string, tenantId: string) {
 export async function listOrgs(params: PageQueryParams, tenantId: string) {
   const page = params.page || 1;
   const pageSize = params.pageSize || 10;
+  const sortObj = getSortObject(params, orgFields);
 
   const orgs = await orgModel.aggregate([
     { $match: { $and: [{ tenantId: tenantId }] } },
     {
       $facet: {
         metadata: [{ $count: "count" }],
-        data: [{ $skip: (page - 1) * pageSize }, { $limit: pageSize }],
+        data: [
+          { $skip: (page - 1) * pageSize },
+          { $limit: pageSize },
+          { $sort: sortObj },
+        ],
       },
     },
   ]);

src/pagination.ts

@@ -9,6 +9,29 @@ export const pageMetadata = z.object({
 export const pageQueryParams = z.object({
   page: z.number().optional(),
   pageSize: z.number().optional(),
+  sort: z.string().optional(),
+  filter: z.string().optional(),
 });
 
 export type PageQueryParams = z.infer<typeof pageQueryParams>;
+
+export function getSortObject(
+  params: PageQueryParams,
+  validFields: Array<string>
+) {
+  const sortObj: Record<string, 1 | -1> = {};
+
+  if (params.sort && params.sort != "") {
+    const sortOptions = params.sort.split(",");
+    sortOptions.forEach((item) => {
+      const order = item.startsWith("-") ? -1 : 1;
+      const field = item.replace("-", "").trim();
+
+      if (validFields.includes(field)) sortObj[field] = order;
+    });
+  }
+
+  if (Object.keys(sortObj).length == 0) sortObj["createdAt"] = -1;
+
+  return sortObj;
+}

src/permit/permit.schema.ts

@@ -3,9 +3,7 @@ import mongoose from "mongoose";
 import { buildJsonSchemas } from "fastify-zod";
 import { pageMetadata, pageQueryParams } from "../pagination";
 
-export const permitModel = mongoose.model(
-  "permit",
-  new mongoose.Schema({
+const permitSchema = new mongoose.Schema({
   tenantId: {
     type: String,
     required: true,
@@ -46,8 +44,12 @@ export const permitModel = mongoose.model(
   createdAt: Date,
   updatedAt: Date,
   createdBy: String,
-  }).index({ tenantId: 1, permitNumber: 1 }, { unique: true })
+}).index({ tenantId: 1, permitNumber: 1 }, { unique: true });
+
+export const permitFields = Object.keys(permitSchema.paths).filter(
+  (path) => path !== "__v"
 );
+export const permitModel = mongoose.model("permit", permitSchema);
 
 const permitCore = {
   permitNumber: z.string(),

src/permit/permit.service.ts

@@ -1,7 +1,8 @@
-import { PageQueryParams } from "../pagination";
+import { getSortObject, PageQueryParams } from "../pagination";
 import { generateId } from "../utils/id";
 import {
   CreatePermitInput,
+  permitFields,
   permitModel,
   UpdatePermitInput,
 } from "./permit.schema";
@@ -29,6 +30,7 @@ export async function getPermit(permitId: string, tenantId: string) {
 export async function listPermits(params: PageQueryParams, tenantId: string) {
   const page = params.page || 1;
   const pageSize = params.pageSize || 10;
+  const sortObj = getSortObject(params, permitFields);
 
   const permitsList = await permitModel.aggregate([
     {
@@ -74,7 +76,11 @@ export async function listPermits(params: PageQueryParams, tenantId: string) {
     {
       $facet: {
         metadata: [{ $count: "count" }],
-        data: [{ $skip: (page - 1) * pageSize }, { $limit: pageSize }],
+        data: [
+          { $skip: (page - 1) * pageSize },
+          { $limit: pageSize },
+          { $sort: sortObj },
+        ],
       },
     },
   ]);