tango-app-api-task 1.0.0-alpha.6 → 1.0.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-alpha.6",
+    "version": "1.0.0-alpha.8",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -96,15 +96,19 @@ export async function createUpdateTask( req, res ) {
         for ( let i = 0; i < inputBody?.sections?.length; i++ ) {
           let section = inputBody.sections[i];
           section.questions.forEach( ( section ) => {
-            if ( section.questionReferenceImage && section.questionReferenceImage !='' ) {
-              let imgUrl = decodeURIComponent( section.questionReferenceImage.split( '?' )[0] );
-              let url = imgUrl.split( '/' );
-              url.splice( 0, 3 );
-              section.questionReferenceImage = url.join( '/' );
+            if ( section.questionReferenceImage && section.questionReferenceImage.length ) {
+              let image = [];
+              for ( let img of section.questionReferenceImage ) {
+                let imgUrl = decodeURIComponent( img.split( '?' )[0] );
+                let url = imgUrl.split( '/' );
+                url.splice( 0, 3 );
+                image.push( url.join( '/' ) );
+              }
+              section.questionReferenceImage = image;
             }
             section.answers.forEach( ( answer ) => {
               if ( answer.referenceImage != '' ) {
-                let imgUrl = decodeURIComponent( answer.referenceImage.split( '?' )[0] );
+                let imgUrl = decodeURIComponent( answer.referenceImage?.split( '?' )[0] );
                 let url = imgUrl.split( '/' );
                 url.splice( 0, 3 );
                 answer.referenceImage = url.join( '/' );
@@ -231,12 +235,24 @@ export async function taskDetails( req, res ) {
       let bucket = JSON.parse( process.env.BUCKET );
       questionDetails.forEach( ( item ) => {
         item.question.forEach( async ( question ) => {
-          if ( question.questionReferenceImage && question.questionReferenceImage !='' ) {
+          if ( question.questionReferenceImage && question.questionReferenceImage !='' && typeof question.questionReferenceImage == 'string' ) {
             let inputData = {
               Bucket: bucket.sop,
               file_path: decodeURIComponent( question.questionReferenceImage ),
             };
             question.questionReferenceImage = await signedUrl( inputData );
+          } else {
+            if ( question.questionReferenceImage.length ) {
+              let image = [];
+              for ( let img of question.questionReferenceImage ) {
+                let inputData = {
+                  Bucket: bucket.sop,
+                  file_path: decodeURIComponent( img ),
+                };
+                image.push( await signedUrl( inputData ) );
+              }
+              question.questionReferenceImage = image;
+            }
           }
           question.answers.forEach( async ( answer ) => {
             if ( answer.referenceImage != '' ) {
@@ -320,7 +336,7 @@ export async function validateUser( req, res ) {
           }
           if ( alreadyExist.length ) {
             let email = [ ...new Set( alreadyExist ) ];
-            return res.sendError( `${email.join()} - email already exist`, 500 );
+            return res.sendError( `${email.join()} - email already exist for another brand`, 500 );
           } else {
             userEmail.forEach( ( item ) => {
               data.push( {
@@ -701,7 +717,7 @@ export async function taskConfig( req, res ) {
     await taskService.updateOne( { _id: inputBody._id }, { storeCount, locationCount } );
     if ( inputBody.submitType == 'publish' ) {
       let currentDate = dayjs.utc().format();
-      let updatedscheduleEndTimeISO = dayjs( checklistDetails?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + checklistDetails.scheduleEndTime;
+      let updatedscheduleEndTimeISO = dayjs.utc( checklistDetails?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + checklistDetails.scheduleEndTime;
       updatedscheduleEndTimeISO = dayjs.utc( updatedscheduleEndTimeISO, 'YYYY-MM-DD hh:mm A' ).format();
       if ( updatedscheduleEndTimeISO >= currentDate ) {
         let deleteQuery = {
@@ -1042,7 +1058,7 @@ export async function createChecklistTask( req, res ) {
       publish: true,
       questionCount: 1,
       storeCount: 1,
-      scheduleDate: inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' ),
+      scheduleDate: date,
       scheduleEndTime: time,
       scheduleEndTimeISO: dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format(),
       priorityType: 'high',
@@ -1145,22 +1161,46 @@ export async function createChecklistTask( req, res ) {
 
 export async function approveTask( req, res ) {
   try {
-    if ( !req.body.id ) {
-      return res.sendError( 'id is required', 400 );
+    let toDate = new Date( req.body.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
+    let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, checklistStatus: 'submit', approvalEnable: true };
+    if ( req.body?.storeId?.length ) {
+      query['store_id'] = { $in: req.body.storeId };
     }
-    let taskDetails = await taskProcessedService.findOne( { _id: req.body.id }, { approvalEnable: 1, approvalStatus: 1 } );
-    if ( !taskDetails ) {
+    let taskDetails = await taskProcessedService.find( query, { _id: 1 } );
+    if ( !taskDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
-    if ( !taskDetails.approvalEnable ) {
-      return res.sendError( 'task has no approver', 400 );
+    let idList = taskDetails.map( ( item ) => item._id );
+    let updateResponse = await taskProcessedService.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
+    if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
+      let params = {
+        'payload': {
+          sourceCheckList_id: req.body.sourceCheckList_id,
+          fromDate: req.body.fromDate,
+          toDate: req.body.toDate,
+          store_id: req.body.storeId,
+        },
+        'upsert': {
+          approvalStatus: true,
+        },
+      };
+      const requestOptions = {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify( params ),
+      };
+      let searchResponse = await fetch( 'https://wnx32v5mtyqx6kh3nt6xuosjqa0xvdfq.lambda-url.ap-south-1.on.aws', requestOptions );
+      if ( searchResponse.ok ) {
+        return res.sendSuccess( 'Task Approved successfully' );
+      } else {
+        return res.sendError( 'Something went wrong', 500 );
+      }
     }
-    taskDetails.approvalStatus = true;
-    taskDetails.save().then( () => {
-      return res.sendSuccess( 'task Approved Successfully' );
-    } ).catch( ( e ) => {
-      return res.sendError( e, 500 );
-    } );
   } catch ( e ) {
     logger.error( { function: 'approveTask', error: e } );
     return res.sendError( e, 500 );

package/src/controllers/taskActionCenter.controllers.js

@@ -2,6 +2,7 @@ import * as traxApprover from '../service/approver.service.js';
 import * as processedTask from '../service/processedTaskList.service.js';
 import { logger } from 'tango-app-api-middleware';
 import * as processedChecklist from '../service/processedChecklist.service.js';
+import * as checklistLog from '../service/checklistLog.service.js';
 import mongoose from 'mongoose';
 const ObjectId = mongoose.Types.ObjectId;
 export const overallCardsV1 = async ( req, res ) => {
@@ -183,10 +184,10 @@ export const approvalTableV1 = async ( req, res ) => {
           },
         } );
       }
-      if ( req.body?.filter?.trim() && req.body?.filter?.trim().length ) {
+      if ( req.body?.filter.length ) {
         query.push( {
           $match: {
-            priorityType: req.body?.filter,
+            priorityType: { $in: req.body?.filter },
           },
         } );
       }
@@ -260,6 +261,58 @@ export const approvalTableV1 = async ( req, res ) => {
   }
 };
 
+export const activityLogV1 = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let findQuery = [];
+    let findAndQuery = [];
+
+
+    findAndQuery.push(
+        { client_id: requestData.clientId },
+        { store_id: { $in: requestData.storeId } },
+        { action: { $in: [ 'submitted', 'started' ] } },
+    );
+
+
+    findQuery.push( { $match: { $and: findAndQuery } } );
+    findQuery.push( {
+      $project: {
+        checkListName: 1,
+        storeName: 1,
+        action: 1,
+        createdAt: 1,
+      },
+    } );
+    let limit = parseInt( requestData?.limit ) || 10;
+    let skip = limit * ( requestData?.offset -1 ) || 0;
+
+    findQuery.push( {
+      $facet: {
+        activityLogData: [
+          { $skip: skip },
+          { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    } );
+
+
+    let activityLogData = await checklistLog.aggregate( findQuery );
+
+    if ( activityLogData && activityLogData.length > 0 ) {
+      return res.sendSuccess( activityLogData );
+    } else {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'activityLogV1' } );
+    return res.sendError( error, 500 );
+  }
+};
+
 export const overallCards = async ( req, res ) => {
   try {
     let requestData = req.body;

package/src/routes/taskActionCenter.routes.js

@@ -3,7 +3,7 @@ import { isAllowedSessionHandler } from 'tango-app-api-middleware';
 export const taskActionCenterRouter = express.Router();
 
 import {
-  overallCards, approvalTable, activityLog, overallCardsV1, approvalTableV1,
+  overallCards, approvalTable, activityLog, overallCardsV1, approvalTableV1, activityLogV1,
 } from '../controllers/taskActionCenter.controllers.js';
 
 taskActionCenterRouter
@@ -11,6 +11,8 @@ taskActionCenterRouter
     .post( '/overallcards', overallCards )
     .post( '/approvalTableV1', isAllowedSessionHandler, approvalTableV1 )
     .post( '/approvalTable', approvalTable )
-    .post( '/activityLog', activityLog );
+    .post( '/activityLog', activityLog )
+    .post( '/activityLogV1', isAllowedSessionHandler, activityLogV1 );
+
 
 export default taskActionCenterRouter;