tango-app-api-client 3.1.19 → 3.1.20-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.1.19",
+    "version": "3.1.20-alpha.1",
     "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.155",
+        "tango-api-schema": "^2.0.161",
         "tango-app-api-middleware": "^3.1.30",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/client.controllers.js

@@ -1,11 +1,11 @@
-import { billingDetailsUpdate, brandInfoUpdate, domainDetailsConfigurationUpdate, featureConfigurationUpdate, getClientData, signatoryDetailsUpdate, ticketConfigurationUpdate, documentsUpdate, getUserData, auditConfigurationUpdate, auditConfigurationGet, CsmUsersGet, OpsUsersGet, userConfigurationUpdate, findClient, aggregateClient, createAuditQueue, findOne, insert, update, findOneClient, updateOneClient } from '../service/client.service.js';
+import { billingDetailsUpdate, brandInfoUpdate, domainDetailsConfigurationUpdate, featureConfigurationUpdate, getClientData, signatoryDetailsUpdate, ticketConfigurationUpdate, documentsUpdate, getUserData, CsmUsersGet, OpsUsersGet, userConfigurationUpdate, findClient, aggregateClient, createAuditQueue, findOne, insert, update, findOneClient, updateOneClient } from '../service/client.service.js';
 import { checkFileExist, fileUpload, signedUrl, chunkArray, download, logger, getOpenSearchData, insertOpenSearchData, sendEmailWithSES, createCustomer, createVirtualAccount } from 'tango-app-api-middleware';
 import { countDocumentsUser, findOneAndUpdateUser, findOneUser, getUserNameEmailById, updateManyUser } from '../service/user.service.js';
-import { aggregateStore, countDocumentsStore, findStore, findOneStore, updateManyStore } from '../service/store.service.js';
+import { aggregateStore, countDocumentsStore, findStore, updateManyStore } from '../service/store.service.js';
 import { aggregateCamera, countDocumentsCamera } from '../service/camera.service.js';
 import _ from 'lodash';
 import { findOneStandaredRole } from '../service/standaredRole.service.js';
-import { aggregateUserAssignedStore, deleteOneAssignedStore, updateOneUserAssignedStore } from '../service/userAssignedStore.service.js';
+import { aggregateUserAssignedStore, updateOneUserAssignedStore } from '../service/userAssignedStore.service.js';
 import { aggregateTickets } from '../service/tangoticket.service.js';
 import { join } from 'path';
 import { readFileSync } from 'fs';
@@ -356,18 +356,18 @@ export async function getClients( req, res ) {
           $match: {
             userEmail: req?.user?.email,
             assignedType: { $eq: 'client' },
-            $expr: {
-              $cond: {
-                if: {
-                  $and: [
-                    { $eq: [ '$userType', 'tango' ] },
-                    { $eq: [ '$tangoUserType', 'csm' ] },
-                  ],
-                },
-                then: { $eq: [ '$isClientApproved', true ] },
-                else: true,
-              },
-            },
+            // $expr: {
+            //   $cond: {
+            //     if: {
+            //       $and: [
+            //         { $eq: [ '$userType', 'tango' ] },
+            //         { $eq: [ '$tangoUserType', 'csm' ] },
+            //       ],
+            //     },
+            //     then: { $eq: [ '$isClientApproved', true ] },
+            //     else: true,
+            //   },
+            // },
           },
         },
         {
@@ -1093,67 +1093,75 @@ export async function updateDocuments( req, res ) {
 
 export async function getAuditConfiguration( req, res ) {
   try {
-    const bucket = JSON.parse( process.env.BUCKET );
-    const auditConfig = await auditConfigurationGet( { storeId: req.params?.id } );
-    if ( auditConfig ) {
-      const isDocExist = await checkFileExist( { Bucket: bucket.assets, Key: `templates/audit_bulk_update.xlsx` } );
-      if ( isDocExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `templates/audit_bulk_update.xlsx` } );
-        auditConfig._doc.templateUrl = signedFilUrl;
-      } else {
-        auditConfig._doc.templateUrl = '';
-      }
-      res.sendSuccess( auditConfig );
-    } else {
-      res.sendError( 'Store not Found', 404 );
+    const query ={
+      clientId: req.params?.id,
+    };
+    const fields = {
+      'auditConfigs.count': 1,
+      'auditConfigs.audit': 1,
+      'auditConfigs.ratio': 1,
+      'clientId': 1,
+      '_id': 0,
+    };
+    const auditConfig = await findOneClient( query, fields );
+    if ( !auditConfig ) {
+      return res.sendError( 'Client not Found', 204 );
     }
+    return res.sendSuccess( auditConfig );
   } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.params, function: 'getAuditConfiguration' } );
-    return res.sendError( 'Internal Server Error', 500 );
+    return res.sendError( err, 500 );
   }
 }
 
 
 export async function auditConfiguration( req, res ) {
   try {
+    const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    for ( let i = 0; i < req.body?.length; i++ ) {
-      const previousStore = await findOneStore( { storeId: req.body[i].storeId }, { auditConfigs: 1, _id: 0 } );
-      await auditConfigurationUpdate( {
-        storeId: req.body[i].storeId,
-        count: req.body[i].count,
-        iteration: req.body[i].iteration,
-        ratio: normalizeNumber( req.body[i].ratio, 0, 100 ),
-      } );
-
-      const logObj = {
+    const query ={
+      clientId: req.params?.id,
+    };
+    const fields ={
+      auditConfigs: 1, _id: 0,
+    };
+    const previousClient = await findOneClient( query, fields );
+    const record ={
+      'auditConfigs.count': inputData.count,
+      'auditConfigs.audit': inputData.audit,
+      'auditConfigs.ratio': Number( normalizeNumber( inputData.ratio, 0, 100 ) ),
+    };
+    logger.info( { record: record, query: query } );
+    const a = await updateOneClient( query, record );
+    logger.info( { a: a } );
+    const logObj = {
+      clientId: req.params?.id,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'configuration',
+      logSubType: 'auditConfig',
+      eventType: 'update',
+      showTo: [ 'tango' ],
+      changes: [ `Audit config for client id ${req.params?.id}` ],
+      previous: previousClient,
+      current: {
         clientId: req.params?.id,
-        userName: req.user?.userName,
-        email: req.user?.email,
-        date: new Date(),
-        logType: 'configuration',
-        logSubType: 'auditConfig',
-        eventType: 'update',
-        showTo: [ 'tango' ],
-        changes: [ `Audit config for store id ${req.body[i].storeId}` ],
-        storeId: req.body[i].storeId,
-        previous: previousStore,
-        current: {
-          storeId: req.body[i].storeId,
-          count: req.body[i].count,
-          iteration: req.body[i].iteration,
-          ratio: normalizeNumber( req.body[i].ratio, 0, 100 ),
-        },
-      };
+        count: inputData.count,
+        audit: inputData.audit,
+        ratio: normalizeNumber( inputData.ratio, 0, 100 ),
+      },
+    };
 
-      await insertOpenSearchData( openSearch.activityLog, logObj );
-    }
+    await insertOpenSearchData( openSearch.activityLog, logObj );
 
 
-    res.sendSuccess( { result: 'Updated Successfully' } );
+    return res.sendSuccess( { result: 'Updated Successfully' } );
   } catch ( error ) {
+    const err = message.error || 'Internal Server Error';
     logger.error( { error: error, message: req.params, function: 'auditConfiguration' } );
-    return res.sendError( 'Internal Server Error', 500 );
+    return res.sendError( err, 500 );
   }
 }
 
@@ -1186,17 +1194,17 @@ export async function clientList( req, res ) {
           $match: {
             userEmail: { $eq: req?.user?.email },
             userType: 'tango',
-            $expr: {
-              $cond: {
-                if: {
-                  $and: [
-                    { $eq: [ '$tangoUserType', 'csm' ] },
-                  ],
-                },
-                then: { $eq: [ '$isClientApproved', true ] },
-                else: true,
-              },
-            },
+            // $expr: {
+            //   $cond: {
+            //     if: {
+            //       $and: [
+            //         { $eq: [ '$tangoUserType', 'csm' ] },
+            //       ],
+            //     },
+            //     then: { $eq: [ '$isClientApproved', true ] },
+            //     else: true,
+            //   },
+            // },
 
           },
         }, {
@@ -1512,17 +1520,17 @@ export async function clientListV1( req, res ) {
           $match: {
             userEmail: { $eq: req?.user?.email },
             userType: 'tango',
-            $expr: {
-              $cond: {
-                if: {
-                  $and: [
-                    { $eq: [ '$tangoUserType', 'csm' ] },
-                  ],
-                },
-                then: { $eq: [ '$isClientApproved', true ] },
-                else: true,
-              },
-            },
+            // $expr: {
+            //   $cond: {
+            //     if: {
+            //       $and: [
+            //         { $eq: [ '$tangoUserType', 'csm' ] },
+            //       ],
+            //     },
+            //     then: { $eq: [ '$isClientApproved', true ] },
+            //     else: true,
+            //   },
+            // },
 
           },
         },
@@ -2048,7 +2056,7 @@ export async function clientCsmAssignAction( req, res ) {
     }
 
     if ( req.body.action === 'decline' ) {
-      await deleteOneAssignedStore( { clientId: req.query.clientId, tangoUserType: 'csm', assignedType: 'client' } );
+      // await deleteOneAssignedStore( { clientId: req.query.clientId, tangoUserType: 'csm', assignedType: 'client' } );
     }
 
     res.sendSuccess( 'Updated Succesfully' );

package/src/docs/client.docs.js

@@ -319,14 +319,14 @@ export const clientDocs = {
   '/v3/client/audit-configuration/{id}': {
     get: {
       tags: [ 'Client' ],
-      description: 'Get audit configuration by store id',
+      description: 'Get audit configuration by client id',
       operationId: 'get-audit-configuration',
       parameters: [
         {
           in: 'path',
           name: 'id',
           required: true,
-          description: 'The ID of the store.',
+          description: 'The ID of the client.',
           schema: {
             type: 'string',
           },
@@ -340,9 +340,6 @@ export const clientDocs = {
         204: { description: 'Not Found' },
       },
     },
-  },
-
-  '/v3/client/audit-configuration/{id}': {
     post: {
       tags: [ 'Client' ],
       description: 'Audit configuration settings',
@@ -351,7 +348,7 @@ export const clientDocs = {
         in: 'path',
         name: 'id',
         required: true,
-        description: 'The ID of the store.',
+        description: 'The ID of the client.',
         schema: {
           type: 'string',
         },

package/src/dtos/client.dtos.js

@@ -206,16 +206,11 @@ export const getAuditConfigValid = {
 };
 
 
-export const auditConfigSchemaBody = joi.array().items(
-    joi.object(
-        {
-          ratio: joi.number().required(),
-          count: joi.number().required(),
-          iteration: joi.number().required(),
-          storeId: joi.string().required(),
-        },
-    ).required(),
-).required();
+export const auditConfigSchemaBody = joi.object( {
+  ratio: joi.number().required(),
+  count: joi.number().required(),
+  audit: joi.boolean().required(),
+} );
 
 export const auditConfigSchemaParam = joi.object( {
   id: joi.string().required(),

package/src/service/client.service.js

@@ -1,6 +1,5 @@
 import clientModel from 'tango-api-schema/schema/client.model.js';
 import leadModel from 'tango-api-schema/schema/lead.model.js';
-import storeModel from 'tango-api-schema/schema/store.model.js';
 import userModel from 'tango-api-schema/schema/user.model.js';
 import { createQueue, getQueueUrl, logger } from 'tango-app-api-middleware';
 
@@ -197,27 +196,6 @@ export function documentsUpdate( { clientId, gstNumber, panNumber, cinNumber, ad
       } );
 }
 
-export function auditConfigurationGet( { storeId } ) {
-  return storeModel.findOne( { storeId: storeId },
-      {
-        'auditConfigs.count': 1,
-        'auditConfigs.iteration': 1,
-        'auditConfigs.ratio': 1,
-        'storeId': 1,
-        '_id': 0,
-      } );
-}
-
-export function auditConfigurationUpdate( { storeId, count, iteration, ratio } ) {
-  return storeModel.updateOne( { storeId: storeId },
-      {
-        $set: {
-          'auditConfigs.count': count,
-          'auditConfigs.iteration': iteration,
-          'auditConfigs.ratio': ratio,
-        },
-      } );
-}
 
 export function CsmUsersGet( ) {
   return userModel.aggregate(