tango-app-api-client 3.0.27-dev → 3.0.29-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.27-dev",
+    "version": "3.0.29-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.3.0",
         "nodemon": "^3.0.3",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.78",
+        "tango-api-schema": "^2.0.82",
         "tango-app-api-middleware": "^1.0.54-dev",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/client.controllers.js

@@ -812,9 +812,20 @@ export async function clientList( req, res ) {
     }
 
     if ( inputData.sortColumName ) {
-      clientQuery.push( {
-        $sort: { [inputData.sortColumName]: inputData.sortBy || -1 },
-      } );
+      clientQuery.push(
+          {
+            $addFields: {
+              lowerCaseSortField: { $toLower: `$${inputData.sortColumName}` },
+            },
+          },
+          {
+            $sort: { lowerCaseSortField: inputData.sortBy || -1 },
+          },
+          {
+            $project: {
+              lowerCaseSortField: 0,
+            },
+          } );
     }
     if ( inputData.isExport ) {
       clientQuery.push( {
@@ -954,7 +965,6 @@ export async function clientList( req, res ) {
         },
       },
     ];
-
     const activeStoreCount = await aggregateStore( storeQuery );
     const activeCameraCount = await aggregateCamera( cameraQuery );
     const result = _.values(
@@ -964,6 +974,19 @@ export async function clientList( req, res ) {
             _.keyBy( activeCameraCount, 'clientId' ),
         ),
     );
+
+    let sortedResult = _.sortBy( result, [ ( obj ) => new Date( obj.createdAt ) ] ).reverse();
+    if ( inputData.sortColumName ) {
+      if ( inputData.sortBy === 1 ) {
+        sortedResult = _.sortBy( result, [ ( obj ) => obj[inputData.sortColumName ? inputData.sortColumName : 'clientName']?.toLowerCase() ] );
+      }
+
+      if ( inputData.sortBy === -1 ) {
+        sortedResult.reverse();
+      }
+    }
+
+
     if ( inputData.isExport ) {
       const resultChunk = await chunkArray( result, 10 );
       const promises = resultChunk.map( async ( chunk ) => {
@@ -986,7 +1009,7 @@ export async function clientList( req, res ) {
       await download( exportResult, res );
       return;
     }
-    return res.sendSuccess( { result: result, count: clientCount.length } );
+    return res.sendSuccess( { result: sortedResult, count: clientCount.length } );
   } catch ( error ) {
     logger.error( { error: error, function: 'clientList' } );
     return res.sendError( error, 500 );