update filter sorting by sort order

Author: ayocodingit

src/helpers/requestParams.ts

@@ -2,7 +2,7 @@ export interface RequestParams {
     page: number
     offset: number
     limit: number
-    order_by: string
+    sort_by: string
     sort_order: string
     keyword: string
     [key: string]: any
@@ -12,10 +12,10 @@ export const GetRequestParams = (query: Record<string, any>): RequestParams => {
     const limit = Number(query.limit) || 100
     const page = Number(query.page) || 1
     const offset = limit * (page - 1)
-    let { q, sort_order, order_by } = query
+    let { q, sort_order, sort_by } = query
 
-    if (!['ASC', 'DESC'].includes(order_by)) {
-        order_by = 'ASC'
+    if (!['ASC', 'DESC'].includes(sort_order)) {
+        sort_order = 'ASC'
     }
 
     return {
@@ -24,7 +24,7 @@ export const GetRequestParams = (query: Record<string, any>): RequestParams => {
         offset,
         limit,
         sort_order,
-        order_by,
+        sort_by,
         keyword: q,
     }
 }

src/modules/images/entity/schema.ts

@@ -14,9 +14,7 @@ const file = Joi.object({
 
 export const Store = Joi.object({
     caption: Joi.string().regex(RegexSanitize).optional(),
-    category: Joi.string()
-        .alphanum()
-        .required(),
+    category: Joi.string().alphanum().required(),
     tags: Joi.array()
         .items(Joi.string().alphanum())
         .optional()

src/modules/images/repository/mongo/repository.ts

@@ -6,8 +6,16 @@ import { Store } from '../../entity/interface'
 class Repository {
     constructor(private logger: Logger) {}
 
-    public async Fetch({ offset, limit, keyword, category }: RequestParams) {
+    public async Fetch({
+        offset,
+        limit,
+        keyword,
+        category,
+        sort_order,
+        sort_by,
+    }: RequestParams) {
         const filter = {}
+        const sort = {}
 
         if (keyword)
             Object.assign(filter, {
@@ -21,7 +29,17 @@ class Repository {
                 category: category,
             })
 
-        const data = await imageSchema.find(filter).skip(offset).limit(limit)
+        if (['created_at'].includes(sort_order)) {
+            Object.assign(sort, {
+                sort_order: sort_by,
+            })
+        }
+
+        const data = await imageSchema
+            .find(filter)
+            .sort(sort)
+            .skip(offset)
+            .limit(limit)
         const count = await imageSchema.find(filter).count()
 
         return {