tango-app-api-trax 3.3.1-beta-5 → 3.3.1-beta-7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-5",
+    "version": "3.3.1-beta-7",
     "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.32",
+        "tango-api-schema": "^2.2.35",
         "tango-app-api-middleware": "^3.1.50",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -19,6 +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';
 
 
 const ObjectId = mongoose.Types.ObjectId;
@@ -416,6 +417,11 @@ 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 ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );

package/src/controllers/mobileTrax.controller.js

@@ -698,6 +698,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -749,6 +750,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -804,6 +806,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -864,6 +867,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -922,6 +926,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -2340,7 +2345,7 @@ export async function checklistv1( req, res ) {
     const { store_id, date, checklistStatus, searchValue } = req.query;
     const userId = req.user._id;
 
-    const buildPipeline = ( matchExtraConditions = [], type ) => {
+    const buildPipeline = ( matchExtraConditions = [], projectExtraConditions = {} ) => {
       const matchConditions = [
         // eslint-disable-next-line camelcase
         { store_id },
@@ -2388,6 +2393,7 @@ export async function checklistv1( req, res ) {
             redoStatus: { $ifNull: [ '$redoStatus', false ] },
             type: { $ifNull: [ '$checkListType', '' ] },
             priorityType: { $ifNull: [ '$priorityType', '' ] },
+            ...projectExtraConditions,
           },
         },
       ];
@@ -2396,8 +2402,8 @@ export async function checklistv1( req, res ) {
     };
 
     const [ checklistResult, taskResult ] = await Promise.allSettled( [
-      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], 'checklist' ) ),
-      processedTask.aggregate( buildPipeline( [], 'task' ) ),
+      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1 } ) ),
+      processedTask.aggregate( buildPipeline( [], { isPlano: 1, planoId: 1 } ) ),
     ] );
 
     const checklistData = checklistResult.status === 'fulfilled' ? checklistResult.value : [];
@@ -3334,3 +3340,24 @@ export async function clientConfig( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function updatePlanoStatus( req, res ) {
+  try {
+    if ( !req.body.id ) {
+      return res.sendError( 'Processed checklist id is required' );
+    }
+    if ( !req.body.status ) {
+      return res.sendError( 'status is required' );
+    }
+    let processCheckDetails = await processedchecklist.findOne( { _id: req.body.id } );
+    if ( !processCheckDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    processCheckDetails.checklistStatus = req.body.status;
+    processCheckDetails.save();
+    return res.sendSuccess( 'Status updated Successfully' );
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updatePlanoStatus' } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/mobileTrax.routes.js

@@ -25,5 +25,6 @@ mobileRouter
     .post( '/verifylocation', isAllowedSessionHandler, mobileController.getStoreLocation, mobileController.location )
     .post( '/login', mobileController.login )
     .post( '/checkUpdateVersion', mobileController.checkVersion )
-    .post( '/checkClientConfig', isAllowedSessionHandler, mobileController.clientConfig );
+    .post( '/checkClientConfig', isAllowedSessionHandler, mobileController.clientConfig )
+    .post( '/updatePlanoStatus', isAllowedSessionHandler, mobileController.updatePlanoStatus );
 

package/src/services/planogram.service.js

@@ -0,0 +1,5 @@
+import model from 'tango-api-schema';
+
+export const findOne = async ( query ={}, field={} ) => {
+  return model.planogramModel.findOne( query, field );
+};