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

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.133",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

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

@@ -435,11 +435,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,7 +200,8 @@ 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,
         client_id: req.user.clientId,
@@ -1346,7 +1347,8 @@ 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,
       client_id: user.clientId,
@@ -1366,7 +1368,8 @@ 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,
         client_id: user.clientId,
@@ -1393,7 +1396,8 @@ 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,
       client_id: user.clientId,
@@ -1413,7 +1417,8 @@ 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,
         client_id: user.clientId,

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;