tango-app-api-client 3.0.39-dev → 3.0.40-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.39-dev",
+    "version": "3.0.40-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -25,8 +25,8 @@
         "mongodb": "^6.3.0",
         "nodemon": "^3.0.3",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.89",
-        "tango-app-api-middleware": "^1.0.60-dev",
+        "tango-api-schema": "^2.0.93",
+        "tango-app-api-middleware": "^3.1.9",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -382,9 +382,18 @@ export async function detailedAllClientCount( req, res ) {
       {
         $project: {
           activeClient: { $cond: [ { $eq: [ '$status', 'active' ] }, 1, 0 ] },
-          paidClient: { $cond: [ { $in: [ '$planDetails.paymentStatus', [ 'paid', 'unbilled', 'due' ] ] }, 1, 0 ] },
-          trialClient: { $cond: [ { $eq: [ '$planDetails.paymentStatus', 'trial' ] }, 1, 0 ] },
-          freeClient: { $cond: [ { $eq: [ '$planDetails.paymentStatus', 'free' ] }, 1, 0 ] },
+          paidClient: { $cond: [ { $and: [
+            { $eq: [ '$status', 'active' ] },
+            { $in: [ '$planDetails.paymentStatus', [ 'paid', 'unbilled', 'due' ] ] },
+          ] }, 1, 0 ] },
+          trialClient: { $cond: [ { $and: [
+            { $eq: [ '$status', 'active' ] },
+            { $eq: [ '$planDetails.paymentStatus', 'trial' ] },
+          ] }, 1, 0 ] },
+
+          freeClient: { $cond: [ { $and: [
+            { $eq: [ '$status', 'active' ] }, { $eq: [ '$planDetails.paymentStatus', 'free' ] },
+          ] }, 1, 0 ] },
           holdClient: { $cond: [ { $eq: [ '$status', 'hold' ] }, 1, 0 ] },
           suspendClient: { $cond: [ { $eq: [ '$status', 'suspended' ] }, 1, 0 ] },
           deactiveClient: { $cond: [ { $eq: [ '$status', 'deactive' ] }, 1, 0 ] },
@@ -404,11 +413,30 @@ export async function detailedAllClientCount( req, res ) {
 
         },
       },
+      {
+        $project: {
+          _id: 0,
+          totalCount: 1,
+          activeClient: 1,
+          paidClient: 1,
+          trialClient: 1,
+          freeClient: 1,
+          holdClient: 1,
+          suspendClient: 1,
+          deactiveClient: 1,
+          activeStoresCount: { $ifNull: [ 0, 0 ] },
+          activeCameraCount: { $ifNull: [ 0, 0 ] },
+        },
+      },
     ];
     const result = await aggregateClient( query );
-    if ( result == 0 ) {
+    const activeStores = await countDocumentsStore( { status: 'active' } );
+    const activeCameras = await countDocumentsCamera( { isUp: true, isActivated: true } );
+    if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
+    result[0].activeStoresCount = activeStores;
+    result[0].activeCameraCount = activeCameras;
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'detailedAllClientCount' } );
@@ -994,6 +1022,10 @@ export async function clientList( req, res ) {
       );
     }
     if ( inputData.filterByPaymentStatus ) {
+      if ( inputData.filterByPaymentStatus.includes( 'paid' ) ) {
+        inputData.filterByPaymentStatus.push( ...[ 'unbilled', 'due' ] );
+      }
+
       clientQuery.push(
           {
             $match: {

package/src/docs/client.docs.js

@@ -40,14 +40,6 @@ export const clientDocs = {
       description: 'Get list of clients',
       operationId: 'get-clients',
       parameters: [
-        {
-          in: 'path',
-          name: 'id',
-          required: true,
-          schema: {
-            type: 'string',
-          },
-        },
       ],
       responses: {
         200: { description: 'Success' },
@@ -455,14 +447,6 @@ export const clientDocs = {
       description: 'Get toatal info about overall clients',
       operationId: 'detailed-all-client-count',
       parameters: [
-        {
-          in: 'path',
-          name: 'id',
-          required: true,
-          schema: {
-            type: 'string',
-          },
-        },
       ],
       responses: {
         200: { description: 'Success' },

package/src/service/client.service.js

@@ -28,23 +28,25 @@ export function findClient( query, field ) {
 export async function createAuditQueue( queueName ) {
   try {
     const isExist = await getQueueUrl( `${queueName}${appConfig.cloud.aws.sqs.queueType}` );
+    logger.info( { message: isExist, function: 'createAuditQueue-isExist' } );
     if ( isExist.statusCode ) {
       const addQueue = await createQueue( `${queueName}${appConfig.cloud.aws.sqs.queueType}` );
+      logger.info( { message: addQueue.QueueUrl, function: 'addQueue.QueueUrl' } );
       if ( addQueue.QueueUrl ) {
         logger.info(
             'Queueue Created'
             , { queueName: addQueue.QueueUrl, addQueue },
         );
       } else {
-        logger.error( { error: 'Queue creation failed', function: 'createAuditQueue' } );
+        logger.error( { error: 'Queue creation failed', function: 'createAuditQueue-failed' } );
       }
     } else {
-      logger.error( { error: 'Queue already exisit', message: queueName, function: 'createAuditQueue' } );
+      logger.error( { error: 'Queue already exisit', message: queueName, function: 'createAuditQueue-alreday exist' } );
     }
     return true;
   } catch ( error ) {
     logger.error( { error: error, message: queueName, function: 'createAuditQueue' } );
-    return false;
+    return res.sendError( `Queue Doesn't create`, 500 );
   }
 }