tango-app-api-trax 1.0.0-alpha-task.132 → 1.0.0-alpha-task.134

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-alpha-task.132",
+    "version": "1.0.0-alpha-task.134",
     "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.1.97",
+        "tango-api-schema": "^2.1.99",
         "tango-app-api-middleware": "^3.1.43-alpha.10",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/download.controller.js

@@ -279,6 +279,7 @@ export const downloadList = async ( req, res ) => {
     findAndQuery.push(
         { client_id: requestData.clientId },
         { createdBy: new mongoose.Types.ObjectId( requestData.createdBy ) },
+        { status: { $ne: 'canceled' } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -418,6 +419,8 @@ export const getChecklistFromZipId = async ( req, res ) => {
         resultData.previewType = getzipdata.previewType || '';
         resultData.answerType = getzipdata.answerType || '';
         resultData.insertType = getzipdata.insertType;
+        resultData.status = getzipdata.status;
+
         return res.sendSuccess( resultData );
       } else {
         let getchecklistsQuery = {};
@@ -440,6 +443,7 @@ export const getChecklistFromZipId = async ( req, res ) => {
         resultData.fileType = getzipdata.fileType;
         resultData.questions = getzipdata.questions;
         resultData.insertType = getzipdata.insertType;
+        resultData.status = getzipdata.status;
         return res.sendSuccess( resultData );
       }
     } else {
@@ -566,3 +570,14 @@ export const getPDFCSVChecklistDetails = async ( req, res ) => {
 };
 
 
+export async function cancelDownload( req, res ) {
+  try {
+    let update = await downloadService.updateOne( { _id: req.params.id }, { status: 'canceled' } );
+    if ( update ) {
+      return res.sendSuccess( 'Canceled Successfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'cancelDownload' } );
+    return res.sendError( error, 500 );
+  }
+}

package/src/controllers/gallery.controller.js

@@ -158,7 +158,7 @@ export const checklistDropdown = async ( req, res ) => {
         { client_id: requestData.clientId },
         // { date_iso: { $gte: fromDate } },
         // { date_iso: { $lte: toDate } },
-        { checkListType: { $eq: 'custom' } },
+        // { checkListType: { $eq: 'custom' } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -242,7 +242,17 @@ export const checklistDropdown = async ( req, res ) => {
     }
 
     let getChecklistData = await processedchecklistconfigService.aggregate( findQuery );
-    result.checklistData = getChecklistData;
+
+    let AiCheklist = getChecklistData.filter( ( data ) => data.checkListType!='custom'&& data.publish== true );
+    let CustomCheklist = getChecklistData.filter( ( data ) => data.checkListType=='custom' );
+
+
+    AiCheklist.forEach( ( data ) => {
+      data.sourceCheckList_id = data.checkListType;
+      data.checkListType = 'AI';
+    } );
+
+    result.checklistData = [ ...CustomCheklist, ...AiCheklist ];
     return res.sendSuccess( result );
   } catch ( error ) {
     logger.error( { error: error, message: req.query, function: 'checklistDropdown' } );
@@ -435,11 +445,11 @@ export async function approvalstatus( req, res ) {
   try {
     let Approver = await ApproverModel.find( { checkListId: req.body.checklistId } );
     if ( Approver.length === 0 ) {
-      return res.sendError( 'No Content', 204 );
+      return res.sendSuccess( 'suceess' );
     }
     let filterApprover = Approver.filter( ( data ) => data.userEmail=== req.user.email );
     if ( filterApprover.length === 0 ) {
-      return res.sendError( 'No Content', 204 );
+      return res.sendSuccess( 'suceess' );
     }
 
 

package/src/controllers/mobileTrax.controller.js

@@ -200,9 +200,10 @@ export async function startChecklist( req, res ) {
         store_id: getBeforeChecklist[0].store_id,
         storeName: getBeforeChecklist[0].storeName,
         action: 'started',
-        checklistId: getBeforeChecklist[0].checkListId,
+        checklistId: getBeforeChecklist[0].sourceCheckList_id,
+        processedChecklistId: getBeforeChecklist[0]._id,
         checkListName: getBeforeChecklist[0].checkListName,
-        checkListType: getBeforeChecklist[0].checkListType,
+        type: getBeforeChecklist[0].checkListType,
         client_id: req.user.clientId,
       };
       await checklistLogs.create( logInsertData );
@@ -1006,7 +1007,10 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
               } else {
                 let des = [];
                 if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
-                  let validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
+                  let validationAnswer = '';
+                  if ( requestSection[i].answer.split( '?' ).length > 1 ) {
+                    validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
+                  }
                   if ( validationAnswer.length ) {
                     let splitImgUrl = validationAnswer.split( '/' );
                     if ( splitImgUrl.length > 1 ) {
@@ -1176,8 +1180,9 @@ export async function submitChecklist( req, res ) {
           checklistId: getchecklist[0].sourceCheckList_id,
           processedChecklistId: getchecklist[0]._id,
           checkListName: getchecklist[0].checkListName,
-          checkListType: getchecklist[0].checkListType,
+          type: getchecklist[0].checkListType,
           client_id: req.user.clientId,
+          redoStatus: requestData?.redoStatus ? true : false,
         };
 
         await checklistLogs.create( logInsertData );
@@ -1230,7 +1235,6 @@ export async function submitTask( req, res ) {
     const { body: requestData, user } = req;
     const { processedcheckListId, date, submittype, currentTime, questionAnswers } = requestData;
 
-
     const findQuery = [
       {
         $match: {
@@ -1310,9 +1314,10 @@ export async function submitTask( req, res ) {
         action: submittype === 'draft' ? 'saved' : 'submitted',
         checklistId: checklist.sourceCheckList_id,
         processedChecklistId: checklist._id,
-        checkListType: checklist.checkListType,
+        type: checklist.checkListType,
         checkListName,
         client_id: user.clientId,
+        redoStatus: requestData?.redoStatus ? true : false,
       };
       await checklistLogs.create( logInsertData );
 
@@ -1346,9 +1351,10 @@ async function updateOpenSearch( user, data ) {
       store_id: getchecklist[0].store_id,
       storeName: getchecklist[0].storeName,
       action: 'OpenSearch insert Triggered',
-      checklistId: getchecklist[0].checkListId,
+      checklistId: getchecklist[0].sourceCheckList_id,
+      processedChecklistId: getchecklist[0]._id,
       checkListName: getchecklist[0].checkListName,
-      checkListType: getchecklist[0].checkListType,
+      type: getchecklist[0].checkListType,
       client_id: user.clientId,
     };
     await checklistLogs.create( logInsertData );
@@ -1366,9 +1372,10 @@ async function updateOpenSearch( user, data ) {
         store_id: getchecklist[0].store_id,
         storeName: getchecklist[0].storeName,
         action: 'OpenSearch inserted Successfully',
-        checklistId: getchecklist[0].checkListId,
+        checklistId: getchecklist[0].sourceCheckList_id,
+        processedChecklistId: getchecklist[0]._id,
         checkListName: getchecklist[0].checkListName,
-        checkListType: getchecklist[0].checkListType,
+        type: getchecklist[0].checkListType,
         client_id: user.clientId,
       };
       await checklistLogs.create( logInsertData );
@@ -1393,9 +1400,10 @@ async function updateOpenSearchTask( user, data ) {
       store_id: getchecklist[0].store_id,
       storeName: getchecklist[0].storeName,
       action: 'OpenSearch insert Triggered',
-      checklistId: getchecklist[0].checkListId,
+      checklistId: getchecklist[0].sourceCheckList_id,
+      processedChecklistId: getchecklist[0]._id,
       checkListName: getchecklist[0].checkListName,
-      checkListType: getchecklist[0].checkListType,
+      type: getchecklist[0].checkListType,
       client_id: user.clientId,
     };
     await checklistLogs.create( logInsertData );
@@ -1413,9 +1421,10 @@ async function updateOpenSearchTask( user, data ) {
         store_id: getchecklist[0].store_id,
         storeName: getchecklist[0].storeName,
         action: 'OpenSearch inserted Successfully',
-        checklistId: getchecklist[0].checkListId,
+        checklistId: getchecklist[0].sourceCheckList_id,
+        processedChecklistId: getchecklist[0]._id,
         checkListName: getchecklist[0].checkListName,
-        checkListType: getchecklist[0].checkListType,
+        type: getchecklist[0].checkListType,
         client_id: user.clientId,
       };
       await checklistLogs.create( logInsertData );
@@ -2182,15 +2191,15 @@ export async function login( req, res ) {
       return res.sendError( 'The user has been unauthorized to login', 401 );
     }
     if ( inputData.otp ) {
-      const otpMatching = await findOTP( { email: inputData.email, type: 'login', otp: inputData.otp } );
+      const otpMatching = await findOTP( { email: result.email, type: 'login', otp: inputData.otp } );
       if ( !otpMatching?.length ) {
         return res.sendError( `Invalid OTP`, 401 );
       }
     } else {
       const otp = getOtp();
-      await updateOneOTP( { email: inputData.email, type: 'login' }, { email: inputData.email, otp: otp, type: 'login' } );
+      await updateOneOTP( { email: result.email, type: 'login' }, { email: result.email, otp: otp, type: 'login' } );
       const emailVars = {
-        email: inputData.email,
+        email: result.email,
         otp: otp,
         name: result.userName,
       };
@@ -2199,7 +2208,7 @@ export async function login( req, res ) {
     }
     const token = {
       authenticationToken: await getUuid(),
-      refreshToken: await getUuid(),
+      ...( !result?.refreshToken ) ? { refreshToken: await getUuid() } : { refreshToken: result.refreshToken },
     };
     const record = {
       user: result?._id,
@@ -2215,7 +2224,9 @@ export async function login( req, res ) {
     }
 
     const auth = await create( record );
-    await userService.updateOne( { _id: result?._id }, { refreshToken: token?.refreshToken, fcmToken: inputData.fcmToken } );
+    if ( !result?.refreshToken ) {
+      await userService.updateOne( { _id: result?._id }, { refreshToken: token?.refreshToken } );
+    }
 
     if ( auth ) {
       return res.sendSuccess( { result: token } );

package/src/controllers/trax.controller.js

@@ -400,8 +400,9 @@ export const userlist = async ( req, res ) => {
   try {
     let users = [];
     let query = {
-      clientId: req.query.clientId || '11',
+      clientId: req.query.clientId,
       isActive: true,
+      role: { $ne: 'user' },
     };
 
     let userDetails = await userService.find( query );
@@ -415,6 +416,7 @@ export const userlist = async ( req, res ) => {
         id: item._id,
         userName: item.userName,
         email: item.email,
+        role: item.role,
       } );
     } );
     return res.sendSuccess( users );
@@ -535,6 +537,7 @@ export const duplicateChecklist = async ( req, res ) => {
     dupDetails.publish = false;
     dupDetails.createdAt = new Date();
     dupDetails.updatedAt = new Date();
+    dupDetails.publishDate = '';
     delete dupDetails._id;
     let logInsertData = {
       action: 'duplicateChecklist',
@@ -896,6 +899,11 @@ export const updateConfigure =async ( req, res ) => {
       return res.sendError( { message: 'Please Assigned a user' }, 400 );
     }
 
+    if ( !inputBody?.checkListDetails?.approver.length && inputBody.submitType == 'publish' ) {
+      return res.sendError( { message: 'Please assign approver' }, 400 );
+    }
+
+
     let logInsertData = {
       action: inputBody.submitType == 'publish' ? 'checklistPublishUsingConfigPage' : 'checklistConfigDraft',
       checklistId: inputBody.checkListDetails._id,
@@ -946,7 +954,9 @@ export const updateConfigure =async ( req, res ) => {
       configEndDate: inputBody?.checkListDetails?.configEndDate || '',
       specificDate: inputBody?.checkListDetails?.specificDate || [],
       allowOnce: inputBody?.checkListDetails?.allowOnce || false,
-      approver: inputBody?.checkListDetails?.approver || [],
+      approver: inputBody?.checkListDetails?.approver.length ? inputBody?.checkListDetails?.approver.map( ( item ) => {
+        return { name: item.name, value: item.value };
+      } ) : [],
       remainder: inputBody?.checkListDetails?.remainder || [],
       owner: inputBody?.checkListDetails?.owner || [],
     };

package/src/routes/download.router.js

@@ -10,6 +10,7 @@ import {
   downloadUpdate,
   getChecklistFromZipId,
   getPDFCSVChecklistDetails,
+  cancelDownload,
 } from '../controllers/download.controller.js';
 
 downloadRouter
@@ -17,7 +18,8 @@ downloadRouter
     .post( '/downloadList', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ), validate( downloadValidationDtos.validateDownloadListParams ), downloadList )
     .post( '/downloadUpdate', downloadUpdate ) // isAllowedInternalAPIHandler,
     .get( '/getChecklistFromZipId', getChecklistFromZipId ) // isAllowedInternalAPIHandler,
-    .post( '/getChecklistDetails', getPDFCSVChecklistDetails );
+    .post( '/getChecklistDetails', getPDFCSVChecklistDetails )
+    .put( '/cancelDownload/:id', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ), cancelDownload );
 
 
 export default downloadRouter;

package/src/services/user.service.js

@@ -1,11 +1,11 @@
 import model from 'tango-api-schema';
 
 export const findOne = async ( query={}, field={} ) => {
-  return model.userModel.findOne( query, field );
+  return model.userModel.findOne( query, field ).sort( { userName: 1 } );
 };
 
 export const find = async ( query={}, field={} ) => {
-  return model.userModel.find( query, field );
+  return model.userModel.find( query, field ).sort( { userName: 1 } );
 };
 
 export const create = async ( document = {} ) => {