tango-app-api-trax 3.3.1-beta-72 → 3.3.1-beta-73

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-72",
+    "version": "3.3.1-beta-73",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.61",
+        "tango-api-schema": "^2.2.67",
         "tango-app-api-middleware": "^3.1.55",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -19,7 +19,7 @@ import utc from 'dayjs/plugin/utc.js';
 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 planoService from '../services/planogram.service.js';
 import * as clusterServices from '../services/cluster.service.js';
 import * as teamsServices from '../services/teams.service.js';
 
@@ -294,6 +294,7 @@ async function insertData( requestData ) {
               insertdata.locationCount = getCLconfig.locationCount;
               insertdata.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
               insertdata.allowedMultiSubmit = getCLconfig.allowedMultiSubmit;
+              insertdata.rawImageUpload = getCLconfig.rawImageUpload || false;
               let collectSections = [];
               let sectionQuery = [];
               sectionQuery.push( {
@@ -565,11 +566,12 @@ async function insertData( requestData ) {
                         element4.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
                         element4.approvalEnable = getCLconfig.approver.length ? true : false;
                         element4.remainder = getCLconfig?.remainder || [];
-                        if ( getCLconfig?.isPlano ) {
-                          let planoDetails = await planoService.findOne( { storeId: element4.store_id, clientId: getCLconfig.client_id }, { _id: 1 } );
-                          element4.planoId = planoDetails?._id;
-                          element4.isPlano = getCLconfig?.isPlano;
-                        }
+                        // if ( getCLconfig?.isPlano ) {
+                        //   let planoDetails = await planoService.findOne( { storeId: element4.store_id, clientId: getCLconfig.client_id }, { _id: 1 } );
+                        //   element4.planoId = planoDetails?._id;
+                        //   element4.isPlano = getCLconfig?.isPlano;
+                        // }
+                        element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
                       }
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -622,7 +624,8 @@ async function insertData( requestData ) {
                           client_id: getCLconfig.client_id,
                           aiStoreList: storeDetails ? storeDetails.map( ( store ) => store.storeId ) : [],
                         };
-                        await processedchecklist.create( data );
+                        // await processedchecklist.create( data );
+                        await processedchecklist.updateOne( { date_string: currentdate, checkListId: updatedchecklist._id, sourceCheckList_id: getCLconfig._id, checkListType: getCLconfig.checkListType }, data );
                       }
                     }
                   }

package/src/controllers/mobileTrax.controller.js

@@ -2556,6 +2556,7 @@ export async function questionList( req, res ) {
         userEmail: { $ifNull: [ '$userEmail', '' ] },
         storeName: { $ifNull: [ '$storeName', '' ] },
         redoStatus: { $ifNull: [ '$redoStatus', false ] },
+        rawImageUpload: { $ifNull: [ '$rawImageUpload', false ] },
       },
     } );
 

package/src/controllers/teaxFlag.controller.js

@@ -1,4 +1,4 @@
-import { download, logger, getChecklistUsers } from 'tango-app-api-middleware';
+import { download, logger } from 'tango-app-api-middleware'; // getChecklistUsers
 import { aggregate } from '../services/processedchecklist.services.js';
 import dayjs from 'dayjs';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
@@ -14,8 +14,8 @@ export const overallFlagMetrics = async ( req, res ) => {
   try {
     let requestData = req.body;
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
     const pipeline = [
       {
@@ -28,7 +28,7 @@ export const overallFlagMetrics = async ( req, res ) => {
                   { date_iso: { $gte: new Date( req.body.startDate ) } },
                   { date_iso: { $lte: new Date( req.body.endDate ) } },
                   // { store_id: { $in: req.body.stores } },
-                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
                 ],
               },
             },
@@ -105,7 +105,7 @@ export const overallFlagMetrics = async ( req, res ) => {
                   { date_iso: { $gte: dayjs.utc( req.body.endDate ).subtract( 7, 'days' ).startOf( 'day' ).toDate() } },
                   { date_iso: { $lte: dayjs.utc( req.body.startDate ).subtract( 1, 'day' ).startOf( 'day' ).toDate() } },
                   // { store_id: { $in: req.body.stores } },
-                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
                 ],
               },
             },
@@ -256,8 +256,8 @@ export const checklistFlagsTable = async ( req, res ) => {
   try {
     let requestData = req.body;
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
     const matchStage = {
       $match: {
@@ -273,7 +273,7 @@ export const checklistFlagsTable = async ( req, res ) => {
             { uniformDetectionFlag: { $gt: 0 } },
           ] },
           // { store_id: { $in: req.body.stores } },
-          { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+          { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
         ],
       },
     };
@@ -537,8 +537,8 @@ export const flagCardsV1 = async ( req, res ) => {
 
     let requestData = req.body;
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
     const findQuery = [
       {
@@ -546,7 +546,7 @@ export const flagCardsV1 = async ( req, res ) => {
           client_id: clientId,
           // $or: [ { store_id: { $in: storeId } }, { aiStoreList: { $in: storeId } } ],
           date_iso: { $gte: adjustedFromDate, $lte: adjustedToDate },
-          $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: storeId } } ],
+          $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: storeId } } ],
         },
       },
       {
@@ -678,14 +678,14 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
     }
 
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
     const createFindQuery = ( fromDate, toDate ) => [
       { $match: { client_id: requestData.clientId,
         // $or: [ { store_id: { $in: requestData.storeId } }, { aiStoreList: { $in: requestData.storeId } } ],
         date_iso: { $gte: fromDate, $lte: toDate },
-        $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: requestData.storeId } } ],
+        $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ],
       } },
       {
         $project: {
@@ -794,8 +794,8 @@ export const flagTablesV1 = async ( req, res ) => {
     let result = {};
 
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
 
     let findQuery = [];
@@ -804,11 +804,12 @@ export const flagTablesV1 = async ( req, res ) => {
         { client_id: requestData.clientId },
         // { $or: [ { store_id: { $in: requestData.storeId } }, { aiStoreList: { $in: requestData.storeId } } ] },
         { date_iso: { $gte: fromDate, $lte: toDate } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
     );
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { questionFlag: { $gte: 1 } }, { timeFlag: { $gte: 1 } }, { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } ] } );
+      // findAndQuery.push( { $or: [ { questionFlag: { $gte: 1 } }, { timeFlag: { $gte: 1 } }, { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } ] } );
+      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -858,25 +859,40 @@ export const flagTablesV1 = async ( req, res ) => {
         checkListType: { $last: '$checkListType' },
         storeCount: { $sum: 1 },
         storeCountAi: { $max: '$storeCount' },
-        flaggedStores: {
-          $addToSet: {
-            $cond: [
-              {
-                $or: [
-                  { $gt: [ '$timeFlag', 0 ] },
-                  { $gt: [ '$questionFlag', 0 ] },
-                  { $gt: [ '$mobileDetectionFlag', 0 ] },
-                  { $gt: [ '$storeOpenCloseFlag', 0 ] },
-                  { $gt: [ '$uniformDetectionFlag', 0 ] },
-                  { $gt: [ '$customerUnattended', 0 ] },
-                  { $gt: [ '$staffLeftInTheMiddle', 0 ] },
-                ],
-              },
-              '$store_id',
-              '$$REMOVE',
+        // flaggedStores: {
+        //   $addToSet: {
+        //     $cond: [
+        //       {
+        //         $or: [
+        //           { $gt: [ '$timeFlag', 0 ] },
+        //           { $gt: [ '$questionFlag', 0 ] },
+        //           { $gt: [ '$mobileDetectionFlag', 0 ] },
+        //           { $gt: [ '$storeOpenCloseFlag', 0 ] },
+        //           { $gt: [ '$uniformDetectionFlag', 0 ] },
+        //           { $gt: [ '$customerUnattended', 0 ] },
+        //           { $gt: [ '$staffLeftInTheMiddle', 0 ] },
+        //         ],
+        //       },
+        //       '$store_id',
+        //       '$$REMOVE',
+        //     ],
+        //   },
+        // },
+        flaggedStores: { $sum: { $cond: [
+          {
+            $or: [
+              { '$gt': [ '$timeFlag', 0 ] },
+              { '$gt': [ '$questionFlag', 0 ] },
+              { '$gt': [ '$mobileDetectionFlag', 0 ] },
+              { '$gt': [ '$storeOpenCloseFlag', 0 ] },
+              { '$gt': [ '$uniformDetectionFlag', 0 ] },
+              { '$gt': [ '$customerUnattended', 0 ] },
+              { '$gt': [ '$staffLeftInTheMiddle', 0 ] },
             ],
           },
-        },
+          1,
+          0,
+        ] } },
         flagCount: {
           $sum: {
             $add: [ '$questionFlag', '$timeFlag' ],
@@ -914,6 +930,7 @@ export const flagTablesV1 = async ( req, res ) => {
           // },
         },
         aiStoreList: { $max: '$aiStoreList' },
+        aiStoreListNew: { $sum: { $size: '$aiStoreList' } },
         submittedQuestionCount: {
           $sum: {
             $cond: [
@@ -929,7 +946,7 @@ export const flagTablesV1 = async ( req, res ) => {
     findQuery.push( {
       $project: {
         assignedStores: '$storeCount',
-        assignedStoresAi: '$storeCountAi',
+        assignedStoresAi: '$aiStoreListNew',
         checkListName: 1,
         coverage: 1,
         checkListChar: 1,
@@ -937,7 +954,8 @@ export const flagTablesV1 = async ( req, res ) => {
         checkListType: 1,
         flagType: 1,
         uniqueFlaggedStores: 1,
-        flaggedStores: { $size: '$flaggedStores' },
+        // flaggedStores: { $size: '$flaggedStores' },
+        flaggedStores: '$flaggedStores',
         flagCount: 1,
         questionCount: 1,
         correctAnswers: { $subtract: [ '$submittedQuestionCount', '$questionFlag' ] },
@@ -1852,8 +1870,8 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
   try {
     let reqestData = req.body;
     // Get User Based Checklist //
-    let loginUser = { clientId: reqestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: reqestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
 
     if ( reqestData.ChecklistType == 'custom' ) {
@@ -1866,7 +1884,7 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
               { date_iso: { $lte: dayjs.utc( reqestData.toDate ).endOf( 'day' ).toDate() } },
               { sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ) },
               // { store_id: { $in: reqestData?.storeId } },
-              { $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+              { $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: reqestData.userEmailes } } ] },
             ],
           },
         },
@@ -1970,7 +1988,7 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
               client_id: reqestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ),
               // store_id: { $in: reqestData.storeId },
-              $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+              $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: reqestData.userEmailes } } ],
             },
         },
         {
@@ -2073,8 +2091,8 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
     };
 
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
 
     if ( requestData.ChecklistType == 'custom' ) {
@@ -2087,7 +2105,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
               { date_iso: { $lte: rangeOneToDate } },
               { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
               // { store_id: { $in: requestData?.storeId } },
-              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
             ],
           },
         },
@@ -2169,7 +2187,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
               { date_iso: { $lte: rangeTwoToDate } },
               { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
               // { store_id: { $in: requestData?.storeId } },
-              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
             ],
           },
         },
@@ -2283,7 +2301,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
               client_id: requestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
               // store_id: { $in: requestData.storeId },
-              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
             },
         },
         {
@@ -2309,7 +2327,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
               client_id: requestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
               // store_id: { $in: requestData.storeId },
-              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
             },
         },
         {
@@ -2353,8 +2371,8 @@ export const flagChecklistTableV1 = async ( req, res ) => {
   try {
     let reqestData = req.body;
     // Get User Based Checklist //
-    let loginUser = { clientId: reqestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: reqestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
     if ( reqestData.ChecklistType == 'custom' ) {
       const match = {
@@ -2371,7 +2389,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
             //   ],
             // },
             // { store_id: { $in: reqestData?.storeId } },
-            { $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+            { $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: reqestData.userEmailes } } ] },
           ],
         },
       };
@@ -2626,14 +2644,14 @@ export const checklistDropdownV1 = async ( req, res ) => {
     let result = {};
 
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
 
     let findQuery = [
       { $match: { $and: [
         { client_id: requestData.clientId },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
         { date_iso: { $gte: fromDate } },
         { date_iso: { $lte: toDate } },
         {

package/src/controllers/trax.controller.js

@@ -2551,6 +2551,7 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
       insertdata.remainder = getCLconfig?.remainder || [];
       insertdata.restrictAttendance = getCLconfig?.restrictAttendance;
       insertdata.coverage = getCLconfig?.coverage;
+      insertdata.rawImageUpload = getCLconfig?.rawImageUpload || false;
 
       let collectSections = [];
       let sectionQuery = [];
@@ -3262,6 +3263,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         element4.remainder = getCLconfig?.remainder || [];
         element4.restrictAttendance = getCLconfig?.restrictAttendance;
         element4.coverage = getCLconfig?.coverage;
+        element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
         assignUserList.push( { ...element4 } );
       }
     } ) );