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

package/src/routes/mobileTrax.routes.js

@@ -1,6 +1,7 @@
 import express from 'express';
 import * as mobileController from '../controllers/mobileTrax.controller.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { sopMobilechecklistSectionValidator } from '../validators/mobileChecklistSection.validator.js';
 import { dashboardValidation, mobileChecklistValidation, startValidation } from '../dtos/validation.dtos.js';
 
 export const mobileRouter = express.Router();
@@ -12,6 +13,8 @@ mobileRouter
     .post( '/startTask', isAllowedSessionHandler, validate( startValidation ), mobileController.startTask )
     .post( '/submitCheckList', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidator, mobileController.sopMobilechecklistMultiSectionFormatter, mobileController.submitChecklist )
     .post( '/submitCheckListv5', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidatorv1, mobileController.sopMobilechecklistMultiSectionFormatterv1, mobileController.submitChecklist )
+    // For v6 we run formatter first to normalize partial section payloads, then a V6 validator that validates merged checklist on final submit
+    .post( '/submitCheckListv6', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistMultiSectionFormatterv1, sopMobilechecklistSectionValidator, mobileController.sopMobilechecklistQuestionValidatorV6, mobileController.submitChecklistV6 )
     .post( '/submitTask', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobileTaskQuestionValidator, mobileController.sopMobileTaskMultiSectionFormatter, mobileController.submitTask )
     .post( '/submiteyeTestTask', isAllowedSessionHandler, mobileController.submiteyeTestTask )
     .get( '/dashboard', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboard )
@@ -29,6 +32,5 @@ mobileRouter
     .post( '/checkUpdateVersion', mobileController.checkVersion )
     .post( '/checkUpdateVersionv1', mobileController.checkVersionV1 )
     .post( '/checkClientConfig', isAllowedSessionHandler, mobileController.clientConfig )
-    .post( '/updatePlanoStatus', isAllowedSessionHandler, mobileController.updatePlanoStatus )
-    .post( '/chunkUpload', isAllowedSessionHandler, mobileController.chunkUpload );
+    .post( '/updatePlanoStatus', isAllowedSessionHandler, mobileController.updatePlanoStatus );
 

package/src/validators/mobileChecklistSection.validator.js

@@ -0,0 +1,43 @@
+import { logger } from 'tango-app-api-middleware';
+
+export async function sopMobilechecklistSectionValidator( req, res, next ) {
+  try {
+    let requestData = req.body;
+    requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
+    const reqAnswers = requestData.questionAnswers;
+
+    if ( !Array.isArray( reqAnswers ) || !reqAnswers.length ) return next();
+
+    // ensure each section required fields are present.
+    for ( const section of reqAnswers ) {
+      if ( !section || !Array.isArray( section.questions ) ) continue;
+      for ( const question of section.questions ) {
+        try {
+          // Types that expect array of answers
+          if ( [ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) ) {
+            if ( !question.userAnswer || ( Array.isArray( question.userAnswer ) && question.userAnswer.length === 0 ) ) {
+              return res.sendError( 'Please Fill All Fields', 400 );
+            }
+          } else {
+            // other types: expect at least one userAnswer entry
+            if ( !question.userAnswer || !question.userAnswer.length ) {
+              // If question has linkType enabled, ensure answer present as well
+              if ( question.linkType && question.linkquestionenabled ) {
+                return res.sendError( 'Please Fill All Fields', 400 );
+              }
+              return res.sendError( 'Please Fill All Fields', 400 );
+            }
+          }
+        } catch ( e ) {
+          logger.error( { function: 'sopMobilechecklistSectionValidator', error: e, body: req.body } );
+          return res.sendError( e, 500 );
+        }
+      }
+    }
+    console.log( 'sopMobilechecklistSectionValidator passed' );
+    return next();
+  } catch ( error ) {
+    logger.error( { function: 'sopMobilechecklistSectionValidator', error, body: req.body } );
+    return res.sendError( error, 500 );
+  }
+}