tango-app-api-trax 3.7.13-qid-halfshutter-8 → 3.7.13-qid-halfshutter-10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.13-qid-halfshutter-8",
+    "version": "3.7.13-qid-halfshutter-10",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -1,4 +1,4 @@
-import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid, insertOpenSearchData, listFileByPath, getObject, deleteFiles } from 'tango-app-api-middleware';
+import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid, insertOpenSearchData } from 'tango-app-api-middleware';
 import * as processedchecklist from '../services/processedchecklist.services.js';
 import * as processedtask from '../services/processedTaskList.service.js';
 import * as PCLconfig from '../services/processedchecklistconfig.services.js';
@@ -19,6 +19,7 @@ import timeZone from 'dayjs/plugin/timezone.js';
 import { findOTP, updateOneOTP } from '../services/otp.service.js';
 import * as clientService from '../services/clients.services.js';
 import { create } from '../services/authentication.service.js';
+import { readFileSync } from 'fs';
 import { join } from 'path';
 import handlebars from 'handlebars';
 dayjs.extend( customParseFormat );
@@ -1077,6 +1078,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
 
     if ( requestData?.editSubmit && requestData?.editSubmit == 'true' ) {
       let sampleData = reqAnswers[0];
+      console.log( 'Edit submit sampleData :', sampleData );
       CLQAnswers.forEach( ( section ) => {
         let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
         if ( requestSection.length ) {
@@ -3771,7 +3773,7 @@ export async function uploadAnswerImage( req, res ) {
       let imageUrl;
       let filePath = `${folder}/${req.user.clientId}/${date}/${input.checklistId}/${input.sectionName.replace( ' ', '' )}/${input.questionNo}/`;
       let params = {
-        fileName: `${Date.now()}-${Math.floor( 1000 + Math.random() * 9000 )}-${req.files.answerImage.name}`,
+        fileName: `${Date.now()}-${Math.floor( 1000 + Math.random() * 9000 )}.${req.files.answerImage.name.split( '.' )[1]}`,
         Key: filePath,
         Bucket: bucket.sop,
         body: req.files.answerImage.data,
@@ -4388,58 +4390,246 @@ export async function questionListV1( req, res ) {
   }
 }
 
+export async function sopMobilechecklistQuestionValidatorV6( req, res, next ) {
+  console.log( 'sopMobilechecklistQuestionValidatorV6 called :', req.body );
+  try {
+    let requestData = req.body;
+    // formatter should have normalized questionAnswers into sectionFormat (sections with questions array)
+    requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
+
+    const getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1, sourceCheckList_id: 1 } );
+    if ( !getChecklistQA ) {
+      return res.sendError( 'Check List Got Edited Please Fill Again', 422 );
+    }
 
-export async function chunkUpload( req, res ) {
+    // if publish check required
+    if ( getChecklistQA && requestData.submittype == 'submit' ) {
+      let checkChecklistStatus = await checklistService.findOne( { _id: getChecklistQA.sourceCheckList_id }, { publish: 1 } );
+      if ( !checkChecklistStatus.publish ) {
+        return res.sendError( 'Checklist got edited.please contact admin', 400 );
+      }
+    }
+
+    if ( !requestData.questionAnswers || !requestData.questionAnswers.length ) {
+      return res.sendError( 'Please Fill all Required Fields', 400 );
+    }
+
+    // For draft saves we allow partial payloads
+    if ( requestData.submittype == 'submit' ) {
+      const incomingSections = requestData.questionAnswers; // already normalized by formatter
+      const CLQAnswers = getChecklistQA.questionAnswers || [];
+
+      let validationCount = 0;
+      let errorCount = 0;
+
+      // Build a map of incoming sections by section_id for quick lookup
+      const incomingMap = new Map();
+      incomingSections.forEach( ( s ) => {
+        if ( s && s.section_id ) incomingMap.set( s.section_id.toString(), s );
+      } );
+
+      for ( const section of CLQAnswers ) {
+        const incoming = incomingMap.get( section.section_id?.toString() );
+        if ( !incoming ) {
+          // missing a configured section in final submit
+          errorCount++;
+          continue;
+        }
+
+        // incoming.questions is expected to be the formatted array where each question has userAnswer (array) or similar
+        for ( const question of incoming.questions || [] ) {
+          try {
+            if ( question.answerType == 'multiplechoicemultiple' ) {
+              if ( !question.userAnswer || !question.userAnswer.length ) validationCount++;
+            } else if ( question.answerType == 'multipleImage' ) {
+              // multipleImage expects an array of answers in userAnswer
+              if ( !question.userAnswer || !question.userAnswer.length ) validationCount++;
+            } else {
+              // other types: expect at least one userAnswer entry
+              if ( !question.userAnswer || !question.userAnswer.length ) validationCount++;
+            }
+          } catch ( e ) {
+            validationCount++;
+          }
+        }
+      }
+
+      if ( validationCount ) {
+        return res.sendError( 'Please Fill all Required Fields', 400 );
+      } else if ( errorCount ) {
+        return res.sendError( 'Checklist got edited.please contact admin', 400 );
+      } else {
+        return next();
+      }
+    } else {
+      return next();
+    }
+  } catch ( e ) {
+    logger.error( { function: 'sopMobilechecklistQuestionValidatorV6', error: e, body: req.body } );
+    return res.sendError( e, 500 );
+  }
+}
+
+/**
+ * @param {Object} req - Request object
+ * @param {Object} res - Response object
+ * submitChecklistV6
+ * New behaviour: updating a single section instead of whole checklist
+ * Expected request payload (partial):
+ * {
+ *   processedcheckListId,
+ *   date,
+ *   sectionIndex,        // 0-based index of the section being saved (preferred)
+ *   sectionId,           // optional: _id or identifier of the section (fallback)
+ *   questionAnswers,     // array with a single section object OR the section object itself
+ *   submittype: 'draft' | 'submit'   // draft = save current section; submit = if this is last section, finalize checklist
+ * }
+ */
+export async function submitChecklistV6( req, res ) {
   try {
-    const { chunkIndex, totalChunks } = req.body;
-    if ( chunkIndex === undefined || !totalChunks || !req.files || !req.files.answerImage ) {
-      return res.status( 400 ).json( { error: 'Missing required params or file.' } );
+    const requestData = req.body;
+    console.log( 'submitChecklistV6 requestData =>', requestData );
+
+    const findQuery = [
+      {
+        $match: {
+          $and: [
+            { _id: new ObjectId( requestData.processedcheckListId ) },
+            { userId: req.user._id },
+            { date_string: requestData.date },
+          ],
+        },
+      },
+    ];
+
+    const getchecklist = await processedchecklist.aggregate( findQuery );
+    if ( !getchecklist.length ) {
+      return res.sendError( 'Checklist Got Edited Please Fill Again', 422 );
     }
-    const chunkNum = Number( chunkIndex );
-    const chunkTotal = Number( totalChunks );
-    const chunkFile = req.files.answerImage;
-    const chunkKey = `traxVideoChunks/${req.user._id}/${chunkNum}`;
-    let bucket;
-    try {
-      bucket = JSON.parse( process.env.BUCKET )?.sop;
-    } catch {
-      return res.sendError( 'Bucket config error', 500 );
+    console.log( 'getchecklist[0] =>', getchecklist );
+    const doc = getchecklist[0];
+    if ( doc.checklistStatus == 'open' ) {
+      return res.sendError( 'checklist in open status need to start', 400 );
+    } else if ( doc.checklistStatus == 'submit' ) {
+      return res.sendError( 'checklist Already Submitted', 400 );
     }
-    await fileUpload( {
-      fileName: '',
-      Key: chunkKey,
-      Bucket: bucket,
-      ContentType: chunkFile.mimetype,
-      body: chunkFile.data,
-    } );
-    if ( chunkNum < chunkTotal ) {
-      return res.sendSuccess( { message: 'Chunk uploaded to S3', chunkIndex: chunkNum } );
+
+    // Normalize incoming section data
+    let incomingSection = null;
+    if ( Array.isArray( requestData.questionAnswers ) && requestData.questionAnswers.length ) {
+      // if client sends an array with a single section
+      incomingSection = requestData.questionAnswers[0];
+    } else if ( requestData.questionAnswers && typeof requestData.questionAnswers === 'object' ) {
+      incomingSection = requestData.questionAnswers;
     }
-    const prefix = `traxVideoChunks/${req.user._id}/`;
-    const s3FilesResp = await listFileByPath( { Bucket: bucket, file_path: prefix, MaxKeys: chunkTotal } );
-    const chunkObjs = s3FilesResp?.data || [];
-    chunkObjs.sort( ( a, b ) => {
-      const ai = Number( a.Key.split( '/' ).pop() );
-      const bi = Number( b.Key.split( '/' ).pop() );
-      return ai - bi;
-    } );
-    const buffers = [];
-    for ( const obj of chunkObjs ) {
-      const s3Obj = await getObject( { Bucket: bucket, Key: obj.Key } );
-      buffers.push( Buffer.from( s3Obj.Body ) );
+
+    if ( !incomingSection && typeof requestData.sectionIndex === 'undefined' ) {
+      return res.sendError( 'sectionIndex or questionAnswers (section) is required', 400 );
     }
-    const finalBuffer = Buffer.concat( buffers );
-    try {
-      await deleteFiles( bucket, prefix );
-    } catch ( e ) {}
-    req.files.answerImage = {
-      data: finalBuffer,
-      name: chunkFile.name,
-      mimetype: chunkFile.mimetype,
+
+    const updateQuery = {
+      _id: new ObjectId( requestData.processedcheckListId ),
+      userId: req.user._id,
+      date_string: requestData.date,
     };
-    return uploadAnswerImage( req, res );
+
+    // Merge the existing questionAnswers with incoming section
+    const existingQA = Array.isArray( doc.questionAnswers ) ? doc.questionAnswers : [];
+    const mergedQA = [ ...existingQA ];
+
+    let targetIndex = -1;
+    if ( typeof requestData.sectionIndex !== 'undefined' && Number.isInteger( Number( requestData.sectionIndex ) ) ) {
+      targetIndex = Number( requestData.sectionIndex );
+    } else if ( incomingSection && incomingSection.section_id ) {
+      targetIndex = mergedQA.findIndex( ( s ) => s._id && s._id.toString() == incomingSection.section_id.toString() || s.section_id == incomingSection.section_id );
+    }
+
+    if ( targetIndex === -1 ) {
+      // If sectionIndex not provided or not found, try to find by section name
+      if ( incomingSection && incomingSection.sectionName ) {
+        targetIndex = mergedQA.findIndex( ( s ) => s.sectionName == incomingSection.sectionName );
+      }
+    }
+
+    if ( targetIndex === -1 && incomingSection ) {
+      // If still not found, append as new section
+      mergedQA.push( incomingSection );
+    } else if ( targetIndex >= 0 && incomingSection ) {
+      // Replace the target section with incoming data
+      mergedQA[targetIndex] = Object.assign( {}, mergedQA[targetIndex], incomingSection );
+    }
+    console.log( 'mergedQA =>', mergedQA );
+    // Compute flags based on merged questionAnswers. Reuse QuestionFlag helper by temporarily setting req.body.questionAnswers
+    const prevBodyQA = req.body.questionAnswers;
+    req.body.questionAnswers = mergedQA;
+    let flagCount = await QuestionFlag( req, res );
+    // QuestionFlag may have returned a response (res.sendError) in case of error; ensure numeric
+    if ( typeof flagCount !== 'number' ) flagCount = 0;
+    req.body.questionAnswers = prevBodyQA; // restore
+
+    const currentDateTime = dayjs();
+
+    const updateData = {};
+    updateData.questionAnswers = mergedQA;
+    updateData.questionFlag = flagCount;
+    updateData.updatedAt = dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format();
+
+    // If this is a final submission (submittype === 'submit') and optionally client indicates this is last section
+    if ( requestData.submittype === 'submit' ) {
+      updateData.submitTime = dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format();
+      updateData.checklistStatus = 'submit';
+      updateData.submitMobileTime = requestData?.currentTime;
+      updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+    } else {
+      // draft/partial save
+      updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+    }
+
+    if ( requestData.deviceDetails && requestData.deviceDetails != '' ) {
+      try {
+        updateData.deviceDetails = JSON.parse( requestData.deviceDetails );
+      } catch ( e ) {
+        // ignore parse error and keep raw
+        updateData.deviceDetails = requestData.deviceDetails;
+      }
+    }
+
+    console.log( 'updateData =>', updateData );
+    console.log( 'updateQuery =>', updateQuery );
+    const updateResult = await processedchecklist.updateOne( updateQuery, updateData );
+
+    if ( updateResult?.modifiedCount > 0 ) {
+      // update open search only on final submit
+      if ( requestData.submittype === 'submit' ) {
+        updateOpenSearch( req.user, requestData );
+        const openSearch = JSON.parse( process.env.OPENSEARCH );
+        const inserttraxlogs = {
+          client_id: req.user.clientId,
+          createAt: new Date(),
+          sourceCheckList_id: doc.sourceCheckList_id,
+          checkListName: doc.checkListName,
+          type: 'checkList',
+          action: 'submit',
+          storeName: doc.storeName,
+          store_id: doc.store_id,
+          userName: doc.userName,
+          userEmail: doc.userEmail,
+          createdByEmail: doc.userEmail,
+          createdBy: doc.userName,
+          coverage: doc.coverage,
+          checkListType: doc.checkListType,
+          logDetails: {},
+          userType: req.user.userType,
+        };
+        insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
+      }
+
+      return res.sendSuccess( 'Checklist Updated Successfully' );
+    } else {
+      return res.sendError( 'something went wrong please try again', 500 );
+    }
   } catch ( e ) {
-    logger.error( { functionName: 'chunkUpload', error: e } );
+    logger.error( { function: 'submitChecklistV6', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
 }