tango-app-api-trax 3.4.0-flag-11 → 3.4.1-activitylog-1

package/index.js

@@ -9,4 +9,5 @@ import { mobileRouter } from './src/routes/mobileTrax.routes.js';
 import { internalTraxRouter } from './src/routes/internalTraxApi.router.js';
 import { locusOrderRouter } from './src/routes/locus.router.js';
 import { traxActivityLogRouter } from './src/routes/activityLog.router.js';
+
 export { traxDashboardRouter, traxFlagRouter, traxRouter, galleryRouter, downloadRouter, mobileRouter, internalTraxRouter, locusOrderRouter, traxActivityLogRouter };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.4.0-flag-11",
+    "version": "3.4.1-activitylog-1",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,8 +26,8 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.70",
-        "tango-app-api-middleware": "^3.1.55",
+        "tango-api-schema": "^2.2.101",
+        "tango-app-api-middleware": "^3.1.72",
         "url": "^0.11.4",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/activityLog.controller.js

@@ -1,6 +1,7 @@
 // import mongoose from 'mongoose';
 import { insertOpenSearchData, updateOpenSearchData, getOpenSearchData } from 'tango-app-api-middleware';
 import * as checklistService from '../services/checklist.service.js';
+import * as taskconfigService from '../services/taskConfig.service.js';
 
 export const insertLog = async ( req, res ) => {
   try {
@@ -112,13 +113,13 @@ export const listLog = async ( req, res ) => {
     let requestBody = req.body;
     let from = ( requestBody.offset ) * requestBody.limit;
 
-    // let start = new Date( requestBody.fromDate );
-    // let userTimezoneOffset = start.getTimezoneOffset() * 60000;
-    // start = new Date( start.getTime() - userTimezoneOffset );
-    // start.setUTCHours( 0, 0, 0, 0 );
-    // let end = new Date( requestBody.toDate );
-    // end = new Date( end.getTime() - userTimezoneOffset );
-    // end.setUTCHours( 23, 59, 59, 59 );
+    let start = new Date( requestBody.fromDate );
+    let userTimezoneOffset = start.getTimezoneOffset() * 60000;
+    start = new Date( start.getTime() - userTimezoneOffset );
+    start.setUTCHours( 0, 0, 0, 0 );
+    let end = new Date( requestBody.toDate );
+    end = new Date( end.getTime() - userTimezoneOffset );
+    end.setUTCHours( 23, 59, 59, 59 );
 
     // console.log( 'list' );
     const mustConditions = [];
@@ -130,23 +131,36 @@ export const listLog = async ( req, res ) => {
     if ( requestBody.type ) {
       mustConditions.push( { term: { type: requestBody.type } } );
     }
-
-    if ( requestBody.action ) {
+    if ( requestBody.action && requestBody.action.length > 0 ) {
       mustConditions.push( { terms: { action: requestBody.action } } );
     }
 
     if ( req.user.userType == 'client' && req.user.role == 'user' ) {
       return res.sendError( 'no data found', 204 );
     }
+    let sourceCheckListIds;
+    if ( req.user.userType === 'client' && req.user.role == 'admin' ) {
+      if ( requestBody.type === 'checklist' ) {
+        const sourceCheckListResult = await checklistService.aggregate( [
+          // { $match: { 'owner.value': req.user.email } },
+          { $match: { $or: [ { 'owner.value': req.user.email }, { 'approver.value': req.user.email } ] } },
+          { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
+          { $project: { _id: 0, checklistIds: 1 } },
+        ] );
+        sourceCheckListIds = sourceCheckListResult.length > 0 ? sourceCheckListResult[0].checklistIds : [];
+        // console.log( 'sourceCheckListIds', sourceCheckListIds );
+      }
+      if ( requestBody.type === 'task' ) {
+        const sourceCheckListResult = await taskconfigService.aggregate( [
+          // { $match: { 'owner.value': req.user.email } },
+          { $match: { $or: [ { 'owner.value': req.user.email }, { 'approver.value': req.user.email } ] } },
+          { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
+          { $project: { _id: 0, checklistIds: 1 } },
+        ] );
+        sourceCheckListIds = sourceCheckListResult.length > 0 ? sourceCheckListResult[0].checklistIds : [];
+        // console.log( 'sourceCheckListIds', sourceCheckListIds );
+      }
 
-    if ( req.user.userType == 'client' && req.user.role == 'admin' ) {
-      const sourceCheckListResult = await checklistService.aggregate( [
-        { $match: { 'owner.value': req.user.email } },
-        { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
-        { $project: { _id: 0, checklistIds: 1 } },
-      ] );
-      const sourceCheckListIds = sourceCheckListResult.length > 0 ? sourceCheckListResult[0].checklistIds : [];
-      console.log( 'sourceCheckListIds', sourceCheckListIds );
       // mustConditions.push( { terms: { $or: [ { store_id: { $in: requestBody.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestBody.userEmailes } }, { sourceCheckList_id: { $in: sourceCheckListIds } } ] } } );
       mustConditions.push( {
         'bool': {
@@ -166,6 +180,12 @@ export const listLog = async ( req, res ) => {
         },
       } );
     }
+    if ( req.user.userType === 'client' ) {
+      mustConditions.push( {
+        term: { userType: 'client' },
+      } );
+    }
+
 
     if ( requestBody.searchValue ) {
       mustConditions.push( { multi_match: {
@@ -178,16 +198,16 @@ export const listLog = async ( req, res ) => {
     // console.log( 'Generated Query:', JSON.stringify( mustConditions, null, 2 ) );
 
     // console.log( 'mustConditions =>', mustConditions );
-    // if ( requestBody.dateRange ) {
-    //   mustConditions.push( {
-    //     range: {
-    //       createdAt: {
-    //         gte: start, // Start date
-    //         lte: end, // End date
-    //       },
-    //     },
-    //   } );
-    // }
+    if ( requestBody.fromDate && requestBody.toDate ) {
+      mustConditions.push( {
+        range: {
+          createAt: {
+            gte: start, // Start date
+            lte: end, // End date
+          },
+        },
+      } );
+    }
     let sortCreatedAt = 'desc';
     if ( requestBody.sortColumnName && requestBody.sortColumnName != '' ) {
       if ( requestBody.sortBy == '1' ) {
@@ -210,7 +230,9 @@ export const listLog = async ( req, res ) => {
         },
       ],
     };
+    // console.log( 'Executing OpenSearch Query:', JSON.stringify( query, null, 2 ) );
     let result = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, query );
+    // console.log( 'OpenSearch Raw Response', JSON.stringify( result, null, 2 ) );
     if ( !result || !result.body.hits.hits.length ) {
       return res.sendError( 'no data found', 204 );
     }

package/src/controllers/download.controller.js

@@ -6,6 +6,7 @@ import * as processedTaskService from '../services/processedTaskList.service.js'
 import * as taskConfigService from '../services/taskConfig.service.js';
 import * as checklistService from '../services/checklist.service.js';
 // import * as processedTaskconfigService from '../services/processedTaskConfig.service.js';
+import * as processedcheklistconfigService from '../services/processedchecklistconfig.services.js';
 import * as clientService from '../services/clients.services.js';
 import * as storeService from '../services/store.service.js';
 
@@ -143,8 +144,9 @@ export const downloadInsert = async ( req, res ) => {
       'viewRedo': requestData.viewRedo || false,
       'userEmailList': requestData.userEmailList || [],
       'filtertype': requestData.filtertype || 'Clusters',
-
+      'checkListType': requestData.checkListType,
     };
+    console.log( insertData );
     let resultData = await downloadService.insert( insertData );
     if ( resultData ) {
       let sqsMessageRequestData = {
@@ -171,7 +173,93 @@ export const downloadInsert = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
-
+export const downloadInsertAI = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let name;
+    let fileType = requestData?.fileType || 'pdfzip';
+    if ( requestData.fileType == 'pdf' ) {
+      if ( requestData?.sourceCheckList_id && requestData?.sourceCheckList_id != '' ) {
+        fileType = 'pdfzip';
+      }
+      if ( requestData?.checklistId && requestData?.checklistId.length > 1 ) {
+        fileType = 'pdfzip';
+      }
+    }
+    if ( requestData.checklistName != '' ) {
+      name = requestData.checklistName + '_' + dayjs( requestData.fromDate ).format( 'DD/MM/YYYY' );
+      if ( requestData?.toDate ) {
+        name = name + '-' + dayjs( requestData?.toDate ).format( 'DD/MM/YYYY' );
+      }
+      let regexName = new RegExp( `^${name.split( '(' )[0]} \\(.*\\)$`, 'i' );
+      let type = requestData.fileType || 'pdfzip';
+      let downloadDetails = await downloadService.getCount( { $and: [ { $or: [ { name: { $regex: regexName } }, { name: name } ] }, { fileType: type } ] } );
+      if ( downloadDetails ) {
+        name = name + ' (' + downloadDetails + ')';
+      }
+    } else {
+      name = requestData?.checklistName;
+    }
+    let findchecklist = await processedcheklistconfigService.findOne( { 'checkListType': requestData.checkListType, 'client_id': requestData.clientId } ).sort( { _id: -1 } );
+    console.log( findchecklist );
+    name = name + '-' + requestData.fileType;
+    let insertData = {
+      'date_string': requestData.fromDate || '',
+      'sourceCheckList_id': requestData?.sourceCheckList_id || '',
+      'checklistIdList': requestData?.checklistId || [],
+      'status': 'inprogress',
+      'client_id': requestData.clientId || '',
+      'date_iso': new Date( requestData.fromDate ) || '',
+      'createdBy': req.user._id || '',
+      'name': name,
+      'fileType': fileType,
+      'storeIds': requestData.storeIds || [],
+      'questions': requestData.questions || [],
+      'fromDate': requestData.fromDate || '',
+      'toDate': requestData.toDate || '',
+      'previewType': requestData.previewType || '',
+      'viewFlag': requestData.viewFlag || false,
+      'userEmail': req.user.email || '',
+      'createdBy': req.user._id || '',
+      'downloadInsertFrom': requestData.downloadInsertFrom || '',
+      'answerType': requestData.answerType || '',
+      'searchValue': requestData.searchValue || '',
+      'insertType': requestData.insertType || '',
+      'viewRedo': requestData.viewRedo || false,
+      'userEmailList': requestData.userEmailList || [],
+      'filtertype': requestData.filtertype || 'Clusters',
+      'checkListType': requestData.checkListType,
+      'checkListName': findchecklist.checkListName,
+      'checkListDescription': findchecklist.checkListDescription,
+    };
+    console.log( requestData );
+    console.log( insertData );
+    let resultData = await downloadService.insert( insertData );
+    console.log( resultData );
+    if ( resultData ) {
+      let sqsMessageRequestData = {
+        'zipId': resultData._id,
+        'fileType': fileType || 'zip',
+        'storeId': requestData.storeIds || [],
+      };
+      console.log( sqsMessageRequestData );
+      if ( fileType === 'csv' || fileType === 'pdf' || fileType === 'csvzip' || fileType === 'pdfzip' || fileType === 'zipfiles' ) {
+        const msg = await sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).AIchecklistExport}`, JSON.stringify( sqsMessageRequestData ) );
+        console.log( 'Send SQS Message CSV/PDF=>', msg );
+      }
+      if ( fileType === 'ppt' || fileType === 'pptzip' ) {
+        const msg = await sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).AIchecklistExport}`, JSON.stringify( sqsMessageRequestData ) );
+        console.log( 'Send SQS Message PPT=>', msg );
+      }
+      res.sendSuccess( 'Success' );
+    } else {
+      return res.sendError( 'something went wrong, please try again', 500 );
+    }
+  } catch ( e ) {
+    console.log( 'insertdownloadRequest =>', e );
+    return res.sendError( e, 500 );
+  }
+};
 export const downloadInsertOld = async ( req, res ) => {
   try {
     let requestData = req.body;
@@ -482,7 +570,33 @@ export const getChecklistFromZipId = async ( req, res ) => {
     return res.sendError( error, 500 );
   }
 };
-
+export const getAiChecklistDataFromZipId = async ( req, res ) => {
+  try {
+    let reqquery = req.query;
+    let getzipdata = await downloadService.findOne( { _id: new mongoose.Types.ObjectId( reqquery.zipId ) } );
+    let brandInfo = {
+      clientName: '',
+      brandLogo: '',
+      checkListDescription: '',
+    };
+    if ( getzipdata ) {
+      let getClientData = await clientService.findOne( { clientId: getzipdata.client_id } );
+      if ( getClientData ) {
+        brandInfo.clientName = getClientData.clientName;
+        brandInfo.brandLogo = getzipdata.client_id + '/logo/' + getClientData.profileDetails.logo;
+      }
+      getzipdata.brandInfo = brandInfo;
+      console.log( getzipdata );
+      return res.sendSuccess( getzipdata );
+    } else {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, function: 'getChecklistFromZipId' } );
+    return res.sendError( error, 500 );
+  }
+};
 export const getPDFCSVChecklistDetails = async ( req, res ) => {
   try {
     let requestData = req.body;

package/src/controllers/gallery.controller.js

@@ -1,6 +1,6 @@
 
 
-import { logger } from 'tango-app-api-middleware';
+import { logger, insertOpenSearchData } from 'tango-app-api-middleware';
 import * as storeService from '../services/store.service.js';
 import * as groupService from '../services/group.service.js';
 import * as clusterService from '../services/cluster.service.js';
@@ -282,7 +282,7 @@ export async function approveChecklist( req, res ) {
     if ( req.body?.storeId?.length ) {
       query['store_id'] = { $in: req.body.storeId };
     }
-    let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1 } );
+    let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1, checkListName: 1 } );
     if ( !checklistDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -291,6 +291,7 @@ export async function approveChecklist( req, res ) {
       let updateResponse = await processedChecklist.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
         let inputstores = checklistDetails.filter( ( data ) => data.checklistStatus == 'submit' );
+        let storeNames = inputstores.map( ( data ) => data.storeName );
 
 
         let params = {
@@ -315,15 +316,12 @@ export async function approveChecklist( req, res ) {
         };
         let url = JSON.parse( process.env.LAMBDAURL );
         let searchResponse = await fetch( url.approveChecklist, requestOptions );
-
-        console.log( searchResponse.ok );
-
         let logData= {
           'client_id': checklistDetails[0].client_id,
           'createAt': new Date(),
           'sourceCheckList_id': req.body.sourceCheckList_id,
           'checkListName': checklistDetails[0].checkListName,
-          'fromCheckListName': checklistDetails[0].checkListName,
+          'fromCheckListName': '',
           'type': 'checklist',
           'action': 'approved',
           'storeName': '',
@@ -332,12 +330,14 @@ export async function approveChecklist( req, res ) {
           'createdBy': req.user._id,
           'coverage': checklistDetails[0].coverage,
           'logDetails': {
-            'approved': [ 'LKST011', 'LKST022', 'LKST3444', 'LKST455', 'LKST566', 'LKST666', 'LKST766', 'LKST866', 'LkST966' ],
+            'approved': storeNames,
           },
+          'userType': req.user.userType,
         };
-        let urlopensearch = JSON.parse( process.env.OPENSEARCH );
         console.log( 'logData', logData );
-        await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
+        let urlopensearch = JSON.parse( process.env.OPENSEARCH );
+        insertOpenSearchData( urlopensearch.traxActivityLog, logData );
+        console.log( searchResponse.ok );
         if ( searchResponse.ok ) {
           let pendingstores = checklistDetails.filter( ( data ) => data.checklistStatus != 'submit' );
           if ( pendingstores && pendingstores.length > 0 ) {
@@ -383,7 +383,7 @@ export async function redoChecklist( req, res ) {
       return res.sendError( 'section is not found', 400 );
     }
 
-    let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
+    let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.uniqueNo == req.body.payload.uniqueNo );
 
     let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
     // if ( checklistDetails.client_id == '458' ) {
@@ -450,7 +450,7 @@ export async function redoChecklist( req, res ) {
         submitTime: checklistDetails.submitTime,
       };
       await checklistLogs.create( data );
-      console.log( req.body );
+
       const requestOptions = {
         method: 'POST',
         headers: {
@@ -468,7 +468,7 @@ export async function redoChecklist( req, res ) {
         'checkListName': checklistDetails.checkListName,
         'fromCheckListName': checklistDetails.checkListName,
         'type': 'checklist',
-        'action': 'redo',
+        'action': checklistDetails.redoStatus?'multiredo': 'redo',
         'storeName': checklistDetails?.storeName?checklistDetails?.storeName:'',
         'store_id': checklistDetails?.store_id?checklistDetails?.store_id:'',
         'userName': checklistDetails.userName,
@@ -477,10 +477,11 @@ export async function redoChecklist( req, res ) {
         'createdBy': req.user.userName,
         'coverage': checklistDetails.coverage,
         'logDetails': {},
+        'userType': req.user.userType,
       };
       let urlopensearch = JSON.parse( process.env.OPENSEARCH );
       console.log( 'logData', logData );
-      await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
+      insertOpenSearchData( urlopensearch.traxActivityLog, logData );
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );
       } else {
@@ -494,6 +495,7 @@ export async function redoChecklist( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
 export async function redomultiChecklist( req, res ) {
   try {
     let inputData = req.body.payload.coverage==='user'?req.body.payload.userEmail:req.body.payload.storeName;
@@ -615,7 +617,7 @@ export async function redomultiChecklist( req, res ) {
           'checkListName': checklistDetails.checkListName,
           'fromCheckListName': checklistDetails.checkListName,
           'type': 'checklist',
-          'action': 'redo',
+          'action': checklistDetails.redoStatus?'multiredo': 'redo',
           'storeName': checklistDetails?.storeName?checklistDetails?.storeName:'',
           'store_id': checklistDetails?.store_id?checklistDetails?.store_id:'',
           'userName': checklistDetails.userName,
@@ -624,10 +626,11 @@ export async function redomultiChecklist( req, res ) {
           'createdBy': req.user.userName,
           'coverage': checklistDetails.coverage,
           'logDetails': {},
+          'userType': req.user.userType,
         };
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );
         console.log( 'logData', logData );
-        await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
+        insertOpenSearchData( urlopensearch.traxActivityLog, logData );
       }
     }
     return res.sendSuccess( 'Question redo successfully' );