tango-app-api-trax 3.3.1-beta-23 → 3.3.1-beta-24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-23",
+    "version": "3.3.1-beta-24",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -397,7 +397,6 @@ export async function redoChecklist( req, res ) {
     };
 
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );
-    conosole.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
       let storeTimeZone = await storeService.findOne( { storeName: checklistDetails.storeName }, { 'storeProfile.timeZone': 1 } );
       let currentDateTime;
@@ -414,8 +413,8 @@ export async function redoChecklist( req, res ) {
         sectionName: question[sectionIndex].sectionName,
         questionName: question[sectionIndex].questions[findQuestion].qname,
         action: 'redo',
-        store_id: checklistDetails?.store_id?checklistDetails?.store_id:'',
-        storeName: checklistDetails?.storeName?checklistDetails?.storeName:'',
+        store_id: checklistDetails.store_id,
+        storeName: checklistDetails.storeName,
         client_id: checklistDetails.client_id,
         processedChecklistId: checklistDetails._id,
         type: checklistDetails.checkListType,
@@ -439,7 +438,7 @@ export async function redoChecklist( req, res ) {
       };
       let url = JSON.parse( process.env.LAMBDAURL );
       let searchResponse = await fetch( url.redoChecklist, requestOptions );
-      console.log( searchResponse.ok );
+
 
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );

package/src/controllers/internalTrax.controller.js

@@ -20,6 +20,8 @@ import { logger } from 'tango-app-api-middleware';
 import mongoose from 'mongoose';
 import { sendPushNotification } from 'tango-app-api-middleware';
 import * as planoService from '../services/planogram.service.js';
+import * as clusterServices from '../services/cluster.service.js';
+import * as teamsServices from '../services/teams.service.js';
 
 
 const ObjectId = mongoose.Types.ObjectId;
@@ -341,6 +343,152 @@ async function insertData( requestData ) {
                     } );
                     let allQuestion = await CLassign.aggregate( getquestionQuery );
                     if ( allQuestion.length ) {
+                      let assignList = [];
+                      if ( getCLconfig.coverage == 'store' ) {
+                        let clusterList = allQuestion.filter( ( ele ) => ele?.clusterName ).map( ( item ) => item.assignId );
+                        if ( clusterList.length ) {
+                          let clusterDetails = await clusterServices.findcluster( { _id: { $in: clusterList } } );
+                          if ( clusterDetails.length ) {
+                            let idList = clusterDetails.flatMap( ( item ) => item.stores.map( ( ele ) => ele.store ) );
+                            let getStoreDetails = await storeService.find( { _id: { $in: idList } } );
+                            if ( getStoreDetails.length ) {
+                              assignList = await Promise.all( getStoreDetails.map( async ( store ) => {
+                                let userDetails = await userService.findOne( { email: store?.spocDetails?.[0]?.email, clientId: store.clientId } );
+                                if ( !userDetails ) {
+                                  let data = {
+                                    clientId: store.clientId,
+                                    userName: store.spocDetails?.[0]?.name,
+                                    mobileNumber: store.spocDetails?.[0]?.phone || '',
+                                    email: store.spocDetails[0].email,
+                                    password: '5dqFKAJj29PsV6P+kL+3Dw==',
+                                    role: 'user',
+                                    userType: 'client',
+                                    rolespermission: [
+                                      {
+                                        featureName: 'Global',
+                                        modules: [
+                                          {
+                                            name: 'Store',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                          {
+                                            name: 'User',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                          {
+                                            name: 'Camera',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                          {
+                                            name: 'Configuration',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                          {
+                                            name: 'Subscription',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                          {
+                                            name: 'Billing',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                        ],
+                                      },
+                                      {
+                                        featurName: 'TangoEye',
+                                        modules: [
+                                          {
+                                            name: 'ZoneTag',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                        ],
+                                      },
+                                      {
+                                        featurName: 'TangoTrax',
+                                        modules: [
+                                          {
+                                            name: 'checklist',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                          {
+                                            name: 'Task',
+                                            isAdd: false,
+                                            isEdit: false,
+
+                                          },
+                                        ],
+                                      },
+                                    ],
+                                  };
+                                  userDetails = await userService.create( data );
+                                }
+                                let data = {
+                                  store_id: store?.storeId,
+                                  storeName: store?.storeName,
+                                  userId: userDetails._id,
+                                  userName: userDetails.userName,
+                                  userEmail: userDetails.email,
+                                  userPhone: userDetails?.mobileNumber,
+                                  city: store?.storeProfile?.city,
+                                  country: store?.storeProfile?.country,
+                                  checkFlag: true,
+                                  checkListId: getCLconfig._id,
+                                  checkListName: getCLconfig.checkListName,
+                                  client_id: getCLconfig.client_id,
+                                };
+                                return data;
+                              } ) );
+                            }
+                          }
+                        }
+                        allQuestion = allQuestion.filter( ( ele ) => !clusterList.includes( ele.assignId ) );
+                      }
+                      if ( getCLconfig.coverage == 'user' ) {
+                        let teamsList = allQuestion.filter( ( ele ) => ele?.teamName ).map( ( item ) => item.assignId );
+                        if ( teamsList.length ) {
+                          let teamDetails = await teamsServices.findteams( { _id: { $in: teamsList } } );
+                          if ( teamDetails.length ) {
+                            let idList = teamDetails.flatMap( ( item ) => item.users.map( ( ele ) => ele.userId ) );
+                            let getUserDetails = await userService.find( { _id: { $in: idList } } );
+                            if ( getUserDetails.length ) {
+                              assignList = getUserDetails.map( ( user ) => {
+                                let data = {
+                                  store_id: '',
+                                  storeName: '',
+                                  userId: user._id,
+                                  userName: user.userName,
+                                  userEmail: user.email,
+                                  userPhone: user?.mobileNumber,
+                                  city: '',
+                                  country: '',
+                                  checkFlag: true,
+                                  checkListId: getCLconfig._id,
+                                  checkListName: getCLconfig.checkListName,
+                                  client_id: getCLconfig.client_id,
+                                };
+                                return data;
+                              } );
+                            }
+                          }
+                        }
+                        allQuestion = allQuestion.filter( ( ele ) => !teamsList.includes( ele.assignId ) );
+                      }
+                      allQuestion = [ ...allQuestion, ...assignList ];
                       let userIdList = [];
                       for ( let element4 of allQuestion ) {
                         if ( getCLconfig.allowOnce && ![ 'onetime', 'daily' ].includes( getCLconfig.schedule ) ) {

package/src/controllers/trax.controller.js

@@ -394,9 +394,9 @@ export const getConfigDetails = async ( req, res ) => {
         result.checkListDetails.scheduleStartTime = result.openTime;
         result.checkListDetails.scheduleEndTime = result.closeTime;
       }
-      let removedUsers = await assignedService.find( { checkFlag: false, checkListId: storechecklistdetails._id }, { _id: 1 } );
-      removedUsers = removedUsers?.map( ( item ) => item._id );
-      result.checkListDetails = { ...result.checkListDetails, ...{ sections: sectionList }, ...{ assignedUsers: [] }, ...{ removedUsers: removedUsers } };
+      let assignedUsers = await assignedService.find( { checkListId: storechecklistdetails._id }, { _id: 1, assignId: 1 } );
+      assignedUsers = assignedUsers?.map( ( item ) => item.assignId );
+      result.checkListDetails = { ...result.checkListDetails, ...{ sections: sectionList }, ...{ assignedUsers: assignedUsers }, ...{ removedUsers: [] } };
     }
 
     return res.sendSuccess( result );
@@ -863,7 +863,7 @@ export const assignedUserDetails = async ( req, res ) => {
     let page = parseInt( req.query.offset ) || 0;
     let skip = limit * page;
 
-    let query = [ { $match: { checkListId: new ObjectId( req.params.checklistId ), isdeleted: false } } ];
+    let query = [ { $match: { checkListId: new ObjectId( req.params.checklistId ), ...( req.query.coverage ) ? { coverage: req.query.coverage } : {}, isdeleted: false } } ];
     if ( req.query.search.trim() && req.query.search.trim() != '' ) {
       let searchValue = req.query.search;
       searchValue = searchValue.split( ',' ).map( ( item ) => item.trim().toLowerCase() );
@@ -972,7 +972,7 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
     // let page = parseInt( req.query.offset ) || 0;
     // let skip = limit * page;
 
-    let query = [ { $match: { checkListId: new ObjectId( req.params.checklistId ), isdeleted: false } } ];
+    let query = [ { $match: { checkListId: new ObjectId( req.params.checklistId ), ...( req.query.coverage ) ? { coverage: req.query.coverage } : {}, isdeleted: false } } ];
     if ( req.query.search.trim() && req.query.search.trim() != '' ) {
       let searchValue = req.query.search;
       searchValue = searchValue.split( ',' ).map( ( item ) => item.trim().toLowerCase() );
@@ -1954,7 +1954,7 @@ export const validateUser = async ( req, res ) => {
   }
 };
 
-export const validateUserv1 = async ( req, res, next ) => {
+export const validateUserv1 = async ( req, res ) => {
   try {
     if ( !req.body.assignedUsers.length ) {
       return res.sendError( 'Please Enter user Details', 400 );
@@ -2049,8 +2049,7 @@ export const validateUserv1 = async ( req, res, next ) => {
     if ( userDetails.length || storeDetails.length ) {
       return res.sendError( { validate: false, user: userDetails, store: storeDetails }, 400 );
     }
-
-    next();
+    return res.sendSuccess( { validate: true } );
   } catch ( e ) {
     logger.error( 'validateUser 2=>', e );
     return res.sendError( e, 500 );
@@ -3638,7 +3637,7 @@ async function assignUsers( data ) {
       ];
       let storeDetails = await storeService.aggregate( query );
       if ( storeDetails.length ) {
-        let email = data?.upload ? data.userEmail : storeDetails?.[0]?.spocDetails?.email;
+        let email = data?.upload ? data.userEmail : storeDetails?.[0]?.spocDetails?.[0]?.email;
         let userDetails = await userService.findOne( { email: email, clientId: data.clientId } );
         if ( !userDetails ) {
           let userData = {
@@ -3764,7 +3763,7 @@ export async function checklistAssign( req, res ) {
         return res.sendError( 'No data found', 204 );
       }
       assignList = await Promise.all( getStoreDetails.map( async ( store ) => {
-        let userDetails = await userService.findOne( { email: store?.spocDetails?.email, clientId: store.clientId } );
+        let userDetails = await userService.findOne( { email: store?.spocDetails?.[0]?.email, clientId: store.clientId } );
         if ( !userDetails ) {
           let data = {
             clientId: store.clientId,

package/src/dtos/validation.dtos.js

@@ -81,13 +81,14 @@ export const checklistPageValidation = {
 };
 
 export const uploadUserSchema = joi.object( {
-  id: joi.string().required(),
+  checklistId: joi.string().required(),
   assignedUsers: joi.array().required(),
-  uploadUser: joi.boolean().required(),
+  // uploadUser: joi.boolean().required(),
   type: joi.string().optional().allow( '' ),
   addUser: joi.boolean().optional(),
   delete: joi.boolean().optional(),
   clientId: joi.string().optional(),
+  coverage: joi.string().optional(),
 } );
 
 export const uploadUserValidation = {