tango-app-api-trax 1.0.0-task.127 → 1.0.0-task.128

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-task.127",
+    "version": "1.0.0-task.128",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -6,6 +6,10 @@ import * as groupService from '../services/group.service.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
 import * as processedChecklist from '../services/processedchecklist.services.js';
 import * as checklistLogs from '../services/checklistlog.service.js';
+import * as ApproverModel from '../services/approver.service.js';
+
+import mongoose from 'mongoose';
+import dayjs from 'dayjs';
 // import axios from 'axios';
 async function LamdaServiceCall( url, data ) {
   try {
@@ -122,16 +126,12 @@ export async function getcustomerunattendedlist( req, res ) {
 
 export async function storesList( req, res ) {
   try {
-    console.log( req.body );
-
     let storeslist = await storeService.find( { clientId: req.body.clientId }, { storeId: 1, storeName: 1 } );
     if ( req.body.groups&&req.body.groups.length>0 ) {
       let stores = [];
       for ( let group of req.body.groups ) {
         let findGroup = await groupService.findOneGroup( { groupName: group.groupName }, { storeList: 1 } );
-        console.log( findGroup );
         stores = [ ...stores, ...findGroup.storeList ];
-        console.log( stores );
       }
       let storeslist = await storeService.find( { storeId: { $in: stores } }, { storeId: 1, storeName: 1 } );
       return res.sendSuccess( { result: storeslist } );
@@ -286,8 +286,9 @@ export async function approveChecklist( req, res ) {
         },
         body: JSON.stringify( params ),
       };
-      let searchResponse = await fetch( 'https://wnx32v5mtyqx6kh3nt6xuosjqa0xvdfq.lambda-url.ap-south-1.on.aws', requestOptions );
-      console.log( searchResponse );
+      let url = JSON.parse( process.env.LAMBDAURL );
+      let searchResponse = await fetch( url.approveChecklist, requestOptions );
+
 
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Checklist Approved successfully' );
@@ -313,17 +314,23 @@ export async function redoChecklist( req, res ) {
       return res.sendError( 'Question number is Required', 400 );
     }
 
-    let checklistDetails = await processedChecklist.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1 } );
+
+    let checklistDetails = await processedChecklist.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1 } );
     if ( !checklistDetails ) {
       return res.sendError( 'No data found', 204 );
     }
     let question = checklistDetails.questionAnswers;
+
+
     let sectionIndex = question.findIndex( ( sec ) => sec.section_id == req.body.payload.section_id );
     if ( sectionIndex == -1 ) {
       return res.sendError( 'section is not found', 400 );
     }
+
     let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true };
     let userAnswer = data.userAnswer;
+
+
     question[sectionIndex].questions[req.body.payload.qno - 1] = data;
     question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
     checklistDetails.questionAnswers = question;
@@ -338,6 +345,7 @@ export async function redoChecklist( req, res ) {
       data = {
         checklistId: checklistDetails.sourceCheckList_id,
         checkListName: checklistDetails.checkListName,
+        checklistDescription: req.body.payload.checklistDescription,
         sectionId: req.body.payload.section_id,
         sectionName: question[sectionIndex].sectionName,
         questionName: question[sectionIndex].questions[req.body.payload.qno - 1].qname,
@@ -348,8 +356,16 @@ export async function redoChecklist( req, res ) {
         processedChecklistId: checklistDetails._id,
         type: checklistDetails.checkListType,
         userAnswer: userAnswer,
+        initiatedBy: req.user.userName,
+        initiatedTime: dayjs().format(),
+        answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
+        submitedBy: checklistDetails.userName,
+        submitTime: checklistDetails.submitTime,
       };
+
+      // return;
       await checklistLogs.create( data );
+
       const requestOptions = {
         method: 'POST',
         headers: {
@@ -357,8 +373,9 @@ export async function redoChecklist( req, res ) {
         },
         body: JSON.stringify( req.body ),
       };
-      let searchResponse = await fetch( 'https://7et6pebvmii725tcntww4w56yq0rjpqw.lambda-url.ap-south-1.on.aws/', requestOptions );
-      console.log( searchResponse );
+      let url = JSON.parse( process.env.LAMBDAURL );
+      let searchResponse = await fetch( url.redoChecklist, requestOptions );
+
 
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );
@@ -375,3 +392,66 @@ export async function redoChecklist( req, res ) {
 }
 
 
+export async function getLogs( req, res ) {
+  try {
+    let result = await checklistLogs.find( {
+      checklistId: new mongoose.Types.ObjectId( req.body.checklistId ),
+      processedChecklistId: new mongoose.Types.ObjectId( req.body.processedChecklistId ),
+      sectionId: new mongoose.Types.ObjectId( req.body.section_id ),
+      questionName: req.body.qname,
+      action: 'redo',
+    } );
+
+    let response =[];
+    for ( let data of result ) {
+      let userAnswer = {
+        actionType: 'answer',
+        userName: data.submitedBy,
+        Timestamp: data.submitTime,
+        userAnswer: data.userAnswer,
+        answerType: data.answerType,
+      };
+      let initiatedstatus = {
+        actionType: 'initation',
+        userName: data.initiatedBy,
+        Timestamp: data.initiatedTime,
+        description: data.checklistDescription,
+
+      };
+      response.push( initiatedstatus );
+      response.push( userAnswer );
+    }
+
+
+    res.sendSuccess( response );
+  } catch ( e ) {
+    logger.error( { function: 'getLogs', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+
+export async function approvalstatus( req, res ) {
+  try {
+    let Approver = await ApproverModel.findOne( { checkListId: req.body.checklistId } );
+    if ( !Approver||Approver&&Approver.email!=req.user.email ) {
+      return res.sendError( 'No Content', 204 );
+    }
+
+
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let resultData = await LamdaServiceCall( url.approvalstatus, req.body );
+    if ( resultData ) {
+      if ( resultData.status_code == '200' ) {
+        return res.sendSuccess( resultData );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( error, 'approvalstatus' );
+    return res.sendError( error, 500 );
+  }
+}

package/src/routes/gallery.routes.js

@@ -1,6 +1,6 @@
 
 
-import { getchecklist, viewchecklist, getMobileUseagelist, storeOpencloselist, getcustomerunattendedlist, storesList, checklistDropdown, redoChecklist, approveChecklist } from '../controllers/gallery.controller.js';
+import { getchecklist, viewchecklist, getMobileUseagelist, storeOpencloselist, getcustomerunattendedlist, storesList, checklistDropdown, redoChecklist, approveChecklist, approvalstatus, getLogs } from '../controllers/gallery.controller.js';
 import express from 'express';
 export const galleryRouter = express.Router();
 import { isAllowedSessionHandler } from 'tango-app-api-middleware';
@@ -23,4 +23,6 @@ galleryRouter
 
 galleryRouter
     .post( '/updateApprove', isAllowedSessionHandler, approveChecklist )
-    .post( '/redo', isAllowedSessionHandler, redoChecklist );
+    .post( '/redo', isAllowedSessionHandler, redoChecklist )
+    .post( '/approvalstatus', isAllowedSessionHandler, approvalstatus )
+    .post( '/getLogs', isAllowedSessionHandler, getLogs );

package/src/services/approver.service.js

@@ -15,3 +15,6 @@ export const insertMany = async ( data = [] ) => {
 export const find = async ( query ={}, field={} ) => {
   return model.traxApproverModel.find( query, field );
 };
+export const findOne = async ( query ={}, field={} ) => {
+  return model.traxApproverModel.findOne( query, field );
+};