tango-app-api-payment-subscription 3.4.2 → 3.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.4.2",
+    "version": "3.4.4",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.5.73",
+        "tango-api-schema": "^2.5.77",
         "tango-app-api-middleware": "^3.6.18",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/brandsBilling.controller.js

@@ -443,7 +443,8 @@ export async function latestDailyPricing( req, res ) {
               'Store Name': store.storeName,
               'Store ID': store.storeId,
               'Product': product.productName,
-              'Camera Count': store.cameraCount || 0,
+              'Traffic Camera Count': store.trafficCameraCount || 0,
+              'Zone Camera Count': store.zoneCameraCount || 0,
               'Zone Count': store.zoneCount || 0,
               'Working Days': product.workingdays || 0,
               'Status': store.status || '',
@@ -454,7 +455,8 @@ export async function latestDailyPricing( req, res ) {
             'Store Name': store.storeName,
             'Store ID': store.storeId,
             'Product': '',
-            'Camera Count': store.cameraCount || 0,
+            'Traffic Camera Count': store.trafficCameraCount || 0,
+            'Zone Camera Count': store.zoneCameraCount || 0,
             'Zone Count': store.zoneCount || 0,
             'Working Days': 0,
             'Status': store.status || '',
@@ -632,7 +634,7 @@ export async function updateDailyPricingStoreField( req, res ) {
   try {
     const { clientId, dateString, storeId, fieldName, value } = req.body;
 
-    const allowedFields = [ 'cameraCount', 'zoneCount' ];
+    const allowedFields = [ 'trafficCameraCount', 'zoneCameraCount', 'zoneCount' ];
     if ( !clientId || !dateString || !storeId || !fieldName || value === undefined || !allowedFields.includes( fieldName ) ) {
       return res.sendError( 'Missing or invalid required fields', 400 );
     }

package/src/controllers/invoice.controller.js

@@ -226,7 +226,7 @@ export async function invoiceDownload( req, res ) {
       } );
 
 
-      let invoiceDate = dayjs( invoiceInfo.createdAt ).format( 'DD/MM/YYYY' );
+      let invoiceDate = dayjs( invoiceInfo.billingDate ).format( 'DD/MM/YYYY' );
 
       invoiceInfo.totalAmount = Math.round( invoiceInfo.totalAmount );
       let AmountinWords = inWords( invoiceInfo.totalAmount );
@@ -607,7 +607,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: { $sum: 1 },
         totalZoneCount: { $sum: '$zoneCount' },
-        totalCameraCount: { $sum: '$cameraCount' },
+        totalTrafficCameraCount: { $sum: '$trafficCameraCount' },
+        totalZoneCameraCount: { $sum: '$zoneCameraCount' },
       },
     },
     {
@@ -617,7 +618,8 @@ async function standardPrice( group, getClient, baseDate ) {
         workingdays: '$_id.workingdays',
         storeCount: '$storeCount',
         totalZoneCount: '$totalZoneCount',
-        totalCameraCount: '$totalCameraCount',
+        totalTrafficCameraCount: '$totalTrafficCameraCount',
+        totalZoneCameraCount: '$totalZoneCameraCount',
       },
     },
     {
@@ -651,7 +653,8 @@ async function standardPrice( group, getClient, baseDate ) {
         workingdays: 1,
         storeCount: 1,
         totalZoneCount: 1,
-        totalCameraCount: 1,
+        totalTrafficCameraCount: 1,
+        totalZoneCameraCount: 1,
         standard: {
           $filter: {
             input: '$basepricing.standard',
@@ -678,7 +681,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: 1,
         totalZoneCount: 1,
-        totalCameraCount: 1,
+        totalTrafficCameraCount: 1,
+        totalZoneCameraCount: 1,
         standardPrice: '$standard.negotiatePrice',
         runningCost: {
           $round: [
@@ -725,7 +729,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: { $sum: '$storeCount' },
         totalZoneCount: { $sum: '$totalZoneCount' },
-        totalCameraCount: { $sum: '$totalCameraCount' },
+        totalTrafficCameraCount: { $sum: '$totalTrafficCameraCount' },
+        totalZoneCameraCount: { $sum: '$totalZoneCameraCount' },
         amount: { $sum: '$perstorecost' },
       },
     },
@@ -739,7 +744,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: 1,
         totalZoneCount: 1,
-        totalCameraCount: 1,
+        totalTrafficCameraCount: 1,
+        totalZoneCameraCount: 1,
         amount: 1,
         description: {
           $cond: {
@@ -843,8 +849,12 @@ async function standardPrice( group, getClient, baseDate ) {
       if ( store.productName === 'tangoZone' ) {
         if ( productBillingType === 'perZone' && store.zoneCount > 0 ) {
           storeCount = store.zoneCount;
-        } else if ( productBillingType === 'perCamera' && store.cameraCount > 0 ) {
-          storeCount = store.cameraCount;
+        } else if ( productBillingType === 'perCamera' && store.zoneCameraCount > 0 ) {
+          storeCount = store.zoneCameraCount;
+        }
+      } else if ( store.productName === 'tangoTraffic' ) {
+        if ( productBillingType === 'perCamera' && store.trafficCameraCount > 0 ) {
+          storeCount = store.trafficCameraCount;
         }
       }
 
@@ -872,20 +882,26 @@ async function standardPrice( group, getClient, baseDate ) {
   // Filter out eachStore products from aggregated results
   products = products.filter( ( p ) => !eachStoreProductNames.includes( p.productName ) );
 
-  // Adjust storeCount based on billingType for tangoZone (overallStore products only)
+  // Adjust storeCount based on billingType for tangoZone and tangoTraffic (overallStore products only)
   products = products.map( ( product ) => {
     let productBillingType = billingTypeMap[product.productName] || 'perStore';
     if ( product.productName === 'tangoZone' ) {
       if ( productBillingType === 'perZone' && product.totalZoneCount > 0 ) {
         product.amount = product.price * product.totalZoneCount;
         product.storeCount = product.totalZoneCount;
-      } else if ( productBillingType === 'perCamera' && product.totalCameraCount > 0 ) {
-        product.amount = product.price * product.totalCameraCount;
-        product.storeCount = product.totalCameraCount;
+      } else if ( productBillingType === 'perCamera' && product.totalZoneCameraCount > 0 ) {
+        product.amount = product.price * product.totalZoneCameraCount;
+        product.storeCount = product.totalZoneCameraCount;
+      }
+    } else if ( product.productName === 'tangoTraffic' ) {
+      if ( productBillingType === 'perCamera' && product.totalTrafficCameraCount > 0 ) {
+        product.amount = product.price * product.totalTrafficCameraCount;
+        product.storeCount = product.totalTrafficCameraCount;
       }
     }
     delete product.totalZoneCount;
-    delete product.totalCameraCount;
+    delete product.totalTrafficCameraCount;
+    delete product.totalZoneCameraCount;
     return product;
   } );
 
@@ -991,7 +1007,8 @@ async function stepPrice( group, getClient ) {
         },
         storeCount: { $sum: 1 },
         totalZoneCount: { $sum: '$zoneCount' },
-        totalCameraCount: { $sum: '$cameraCount' },
+        totalTrafficCameraCount: { $sum: '$trafficCameraCount' },
+        totalZoneCameraCount: { $sum: '$zoneCameraCount' },
       },
     },
     {
@@ -1001,7 +1018,8 @@ async function stepPrice( group, getClient ) {
         workingdays: '$_id.workingdays',
         storeCount: '$storeCount',
         totalZoneCount: '$totalZoneCount',
-        totalCameraCount: '$totalCameraCount',
+        totalTrafficCameraCount: '$totalTrafficCameraCount',
+        totalZoneCameraCount: '$totalZoneCameraCount',
       },
     },
     {
@@ -1083,8 +1101,12 @@ async function stepPrice( group, getClient ) {
       if ( store.productName === 'tangoZone' ) {
         if ( productBillingType === 'perZone' && store.zoneCount > 0 ) {
           storeCount = store.zoneCount;
-        } else if ( productBillingType === 'perCamera' && store.cameraCount > 0 ) {
-          storeCount = store.cameraCount;
+        } else if ( productBillingType === 'perCamera' && store.zoneCameraCount > 0 ) {
+          storeCount = store.zoneCameraCount;
+        }
+      } else if ( store.productName === 'tangoTraffic' ) {
+        if ( productBillingType === 'perCamera' && store.trafficCameraCount > 0 ) {
+          storeCount = store.trafficCameraCount;
         }
       }
 
@@ -1114,18 +1136,23 @@ async function stepPrice( group, getClient ) {
   // Filter out eachStore products from aggregated results
   products = products.filter( ( p ) => !eachStoreProductNames.includes( p.productName ) );
 
-  // Adjust storeCount based on billingType for tangoZone (overallStore only)
+  // Adjust storeCount based on billingType for tangoZone and tangoTraffic (overallStore only)
   products = products.map( ( product ) => {
     let productBillingType = billingTypeMap[product.productName] || 'perStore';
     if ( product.productName === 'tangoZone' ) {
       if ( productBillingType === 'perZone' && product.totalZoneCount > 0 ) {
         product.storeCount = product.totalZoneCount;
-      } else if ( productBillingType === 'perCamera' && product.totalCameraCount > 0 ) {
-        product.storeCount = product.totalCameraCount;
+      } else if ( productBillingType === 'perCamera' && product.totalZoneCameraCount > 0 ) {
+        product.storeCount = product.totalZoneCameraCount;
+      }
+    } else if ( product.productName === 'tangoTraffic' ) {
+      if ( productBillingType === 'perCamera' && product.totalTrafficCameraCount > 0 ) {
+        product.storeCount = product.totalTrafficCameraCount;
       }
     }
     delete product.totalZoneCount;
-    delete product.totalCameraCount;
+    delete product.totalTrafficCameraCount;
+    delete product.totalZoneCameraCount;
     return product;
   } );
 
@@ -1700,6 +1727,10 @@ export async function updateInvoice( req, res ) {
       }
     } );
 
+    if ( req.body.billingDate ) {
+      updateData.createdAt = new Date( req.body.billingDate );
+    }
+
     let updatedInvoice = await invoiceService.updateOne( { _id: req.body._id }, updateData );
 
     let logObj = {
@@ -1769,3 +1800,24 @@ export async function getClientBasePricing( req, res ) {
   }
 }
 
+export async function deleteInvoice( req, res ) {
+  try {
+    const { invoiceId } = req.params;
+    if ( !invoiceId ) {
+      return res.sendError( 'Invoice ID is required', 400 );
+    }
+
+    const invoice = await invoiceService.findOne( { _id: invoiceId } );
+    if ( !invoice ) {
+      return res.sendError( 'Invoice not found', 404 );
+    }
+
+    await invoiceService.deleteRecord( { _id: invoiceId } );
+
+    res.sendSuccess( { message: 'Invoice deleted successfully' } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'deleteInvoice' } );
+    return res.sendError( error, 500 );
+  }
+}
+

package/src/controllers/paymentSubscription.controllers.js

@@ -3318,15 +3318,23 @@ export const dailyPricingInsert = async ( req, res ) => {
                 ];
                 let dailyData = await dailyPriceService.aggregate( query );
                 let cameraDetails = await cameraService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], isActivated: true, isUp: true }, { streamName: 1, productModule: 1 } );
+                console.log( '🚀 ~ dailyPricingInsert ~ cameraDetails:', cameraDetails );
 
-                let cameraCount = cameraDetails.filter( ( cam ) =>
+                let trafficCameraCount = cameraDetails.filter( ( cam ) =>
                   ( cam.productModule || [] ).some( ( mod ) =>
-                    ( mod.name === 'tangoTraffic' || mod.name === 'tangoTracking' ) && mod.checked === true,
+                    ( mod.productName === 'tangoTraffic' || mod.productName === 'tangoTracking' ) && mod.checked === true,
                   ),
                 ).length;
+
+                let zoneCameraCount = cameraDetails.filter( ( cam ) =>
+                  ( cam.productModule || [] ).some( ( mod ) =>
+                    mod.productName === 'tangoZone' && mod.checked === true,
+                  ),
+                ).length;
+
                 let zoneCameraStreamNames = cameraDetails.filter( ( cam ) =>
                   ( cam.productModule || [] ).some( ( mod ) =>
-                    mod.name === 'tangoZone' && mod.checked === true,
+                    mod.productName === 'tangoZone' && mod.checked === true,
                   ),
                 ).map( ( cam ) => cam.streamName );
                 let taggingDetails = await taggingService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], productName: 'tangoZone', coordinates: { $ne: [] }, streamName: { $in: zoneCameraStreamNames } }, { tagName: 1 } );
@@ -3336,7 +3344,7 @@ export const dailyPricingInsert = async ( req, res ) => {
                 let workingdays;
                 let workingdaystrax;
                 const givenDate = dayjs( requestData.date );
-
+                console.log( '🚀 ~ dailyPricingInsert ~ cameraCount:', trafficCameraCount, zoneCameraCount, zoneCount );
                 const isFirstDayOfMonth = givenDate.isSame( dayjs().startOf( 'month' ), 'day' );
                 if ( getStore[storeIndex]?.edge.firstFile ) {
                   if ( firstDate < requestData.date && getStore[storeIndex]?.status == 'active' &&
@@ -3413,7 +3421,8 @@ export const dailyPricingInsert = async ( req, res ) => {
                       daysDifferenceTrax: workingdaystrax,
                       products: productList,
                       camera: cameraDetails.map( ( item ) => item.streamName ),
-                      cameraCount: cameraCount,
+                      trafficCameraCount: trafficCameraCount,
+                      zoneCameraCount: zoneCameraCount,
                       zoneCount: zoneCount,
                       zoneName: zoneName,
                     },

package/src/routes/invoice.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { createInvoice, invoiceDownload, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice, PaymentStatusChange, checkPaymentStatus, getInvoice, updateInvoice, getClientBasePricing } from '../controllers/invoice.controller.js';
+import { createInvoice, invoiceDownload, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice, PaymentStatusChange, checkPaymentStatus, getInvoice, updateInvoice, getClientBasePricing, deleteInvoice } from '../controllers/invoice.controller.js';
 import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
 export const invoiceRouter = express.Router();
 
@@ -17,5 +17,6 @@ invoiceRouter.post( '/checkPaymentStatus', checkPaymentStatus );
 invoiceRouter.get( '/getInvoice/:invoiceId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getInvoice );
 invoiceRouter.put( '/updateInvoice', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), updateInvoice );
 invoiceRouter.get( '/getClientBasePricing/:clientId', isAllowedSessionHandler, getClientBasePricing );
+invoiceRouter.delete( '/deleteInvoice/:invoiceId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), deleteInvoice );