tango-app-api-infra 3.0.60-dev → 3.0.61-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.60-dev",
+    "version": "3.0.61-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "tango-api-schema": "^2.0.94",
-        "tango-app-api-middleware": "^3.1.7",
+        "tango-app-api-middleware": "^1.0.58-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/dataMismatch.controller.js

@@ -1,13 +1,21 @@
 
-
-export async function createTicket() {
+import { findOneTangoTicket, createTangoTicket } from '../services/tangoTicket.service.js';
+import { logger } from 'tango-app-api-middleware';
+export async function createTicket( req, res ) {
   try {
-    let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'basicDetails.storeId': req.body.storeId } );
+    let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'issueDate': ( new Date( req.body.Date ) ), 'basicDetails.storeId': req.body.storeId } );
 
     if ( ticketExist ) {
       return res.sendSuccess( 'MAT Ticket Already Exists for the store' );
     }
-    console.log();
+    req.body.ticketDetails = {};
+    req.body.ticketDetails.dataMismatch = req.body.dataMismatch;
+    req.body.issueDate = new Date( req.body.Date );
+    req.body.ticketId = 'TE_DM_' + new Date().valueOf();
+    let create = await createTangoTicket( req.body );
+    if ( create ) {
+      res.sendSuccess( 'Ticket Created Successfully' );
+    }
   } catch ( error ) {
     logger.error( { error: error, function: 'createTicket Data Mismatch' } );
     return res.sendError( error, 500 );

package/src/controllers/userInfra.controller.js

@@ -75,6 +75,17 @@ export async function userTakeTicket( req, res ) {
       let query = {
         'status': { $ne: 'closed' },
         'issueType': 'mat',
+        'ticketDetails.addressingUser': { $exists: false },
+      };
+      if ( assignedClients.length > 0 ) {
+        query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+      }
+      userTicket = await findOneTangoTicket( query );
+    } else if ( req.body.issueType == 'dataMismatch' ) {
+      let query = {
+        'status': { $ne: 'closed' },
+        'issueType': { $in: [ 'highcount', 'lowcount' ] },
+        'ticketDetails.addressingUser': { $exists: false },
       };
       if ( assignedClients.length > 0 ) {
         query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
@@ -97,15 +108,26 @@ export async function userTakeTicket( req, res ) {
 export async function userTicketList( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let query = [ {
-      $match: {
-        $and: [
-
-          { issueType: req.body.issueType },
-          { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
-        ],
-      },
-    } ];
+    let query = [];
+    if ( req.body.issueType!='dataMismatch' ) {
+      query.push( {
+        $match: {
+          $and: [
+            { issueType: req.body.issueType },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    } else {
+      query.push( {
+        $match: {
+          $and: [
+            { issueType: { $in: [ 'highcount', 'lowcount' ] } },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    }
     if ( req.body.status != 'closed' || req.body.export ) {
       query.push( {
         $match: {
@@ -132,6 +154,7 @@ export async function userTicketList( req, res ) {
     query.push( {
       $project: {
         storeId: '$basicDetails.storeId',
+        storeName: '$basicDetails.storeName',
         Date: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
         updatedAt: 1,
         ticketId: 1,
@@ -162,6 +185,7 @@ export async function userTicketList( req, res ) {
     {
       $project: {
         storeId: 1,
+        storeName: 1,
         updatedAt: 1,
         Date: 1,
         ticketId: 1,
@@ -177,6 +201,7 @@ export async function userTicketList( req, res ) {
       $group: {
         _id: '$ticketId',
         storeId: { $first: '$storeId' },
+        storeName: { $first: '$storeName' },
         updatedAt: { $first: '$updatedAt' },
         Date: { $first: '$Date' },
         ticketId: { $first: '$ticketId' },
@@ -196,6 +221,7 @@ export async function userTicketList( req, res ) {
           $or: [
             { storeId: { $regex: req.body.searchValue, $options: 'i' } },
             { infraIssue: { $regex: req.body.searchValue, $options: 'i' } },
+            { storeName: { $regex: req.body.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -303,16 +329,28 @@ export async function basicDetails( req, res ) {
 export async function workHistory( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let query = [ {
-      $match: {
-        $and: [
-          { 'status': 'closed' },
-          { issueType: req.body.issueType },
-          { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
-        ],
-      },
-    } ];
-
+    let query = [ ];
+    if ( req.body.issueType!='dataMismatch' ) {
+      query.push( {
+        $match: {
+          $and: [
+            { 'status': 'closed' },
+            { issueType: req.body.issueType },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    } else {
+      query.push( {
+        $match: {
+          $and: [
+            { 'status': 'closed' },
+            { issueType: { $in: [ 'highcount', 'lowcount' ] } },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    }
     if ( req.body.dateFilter && req.body.dateFilter != '' ) {
       if ( req.body.dateFilter === 'issueIdentifiedDate' ) {
         query.push(