tango-app-api-payment-subscription 3.0.57-dev → 3.0.58-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.57-dev",
+    "version": "3.0.58-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",

package/src/controllers/paymentSubscription.controllers.js

@@ -3063,14 +3063,14 @@ export const dailyPricingInsert = async ( req, res ) => {
                       productDetails = stepProductDetails[stepProductDetails.length - 1];
                     }
                   }
-                  let productStatus = getClient.planDetails.product.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
+                  // let productStatus = getClient.planDetails.product.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
                   if ( productDetails ) {
                     let newObject = {
                       productName: productDetails.productName,
-                      status: productStatus ? productStatus.status : '',
-                      price: productStatus ? [ 'trial', 'free' ].includes( productStatus.status ) ? 0 : productDetails.negotiatePrice : 0,
-                      featureStoreCount: storeIndex + 1,
-                      basePrice: productDetails.negotiatePrice,
+                      // status: productStatus ? productStatus.status : '',
+                      // price: productStatus ? [ 'trial', 'free' ].includes( productStatus.status ) ? 0 : productDetails.negotiatePrice : 0,
+                      // featureStoreCount: storeIndex + 1,
+                      // basePrice: productDetails.negotiatePrice,
                       ...( getClient.priceType == 'step' ? { storeRange: productDetails.storeRange } : { storeRange: 'standard' } ),
                     };
                     productList.push( newObject );
@@ -3094,6 +3094,7 @@ export const dailyPricingInsert = async ( req, res ) => {
                     {
                       $project: {
                         'stores.daysDifference': 1,
+                        'dateString': 1,
                       },
                     },
                     {
@@ -3110,12 +3111,12 @@ export const dailyPricingInsert = async ( req, res ) => {
                         storeId: getStore[storeIndex].storeId,
                         store: getStore[storeIndex]._id,
                         storeName: getStore[storeIndex].storeName,
-                        active: getStore[storeIndex]?.status == 'active' ? true : false,
-                        deployedStatus: getStore[storeIndex]?.edge?.firstFile || false,
+                        status: getStore[storeIndex]?.status,
+                        firstFile: getStore[storeIndex]?.edge?.firstFile || false,
                         edgefirstFileDate: getStore[storeIndex]?.edge?.firstFileDate || null,
                         date: new Date( requestData.date ),
                         processfirstFileDate: processedFileDate?.date_iso || null,
-                        daysDifference: getStore[storeIndex]?.status == 'active' ? ( dailyData.length && dailyData[0]?.stores?.daysDifference ) ? ( dailyData[0]?.stores?.daysDifference + 1 ) : 1 : dailyData[0]?.stores?.daysDifference ? dailyData[0]?.stores?.daysDifference : 0,
+                        daysDifference: ( getStore[storeIndex]?.status == 'active' && dailyData[0]?.dateString != dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) ) ? ( dailyData.length && dailyData[0]?.stores?.daysDifference ) ? ( dailyData[0]?.stores?.daysDifference + 1 ) : 1 : dailyData[0]?.stores?.daysDifference ? dailyData[0]?.stores?.daysDifference : 0,
                         products: productList,
                         camera: cameraDetails.map( ( item ) => item.streamName ),
                         cameraCount: cameraDetails.length,
@@ -3127,13 +3128,13 @@ export const dailyPricingInsert = async ( req, res ) => {
                       stores: storeList,
                       dateISO: new Date( requestData.date ),
                       accountType: getClient?.planDetails?.subscriptionType,
-                      active: getClient?.status == 'active' ? true : false,
+                      status: getClient?.status,
                       activeStores: getStore?.length,
                       brandName: getClient?.clientName,
                       proRate: getClient?.paymentInvoice?.proRate,
                       dateString: dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ),
                     };
-                    await dailyPriceService.create( params );
+                    await dailyPriceService.updateOne( { clientId: requestClient[clientIndex], dateString: params.dateString }, params, { upsert: true } );
                   }
                 } ).catch( ( error ) => {
                   logger.error( { error: error, function: 'old processedDayData' } );

package/src/services/dailyPrice.service.js

@@ -16,7 +16,7 @@ export const create = ( record ) => {
   return model.dailyPricingModel.create( record );
 };
 
-export const updateOne = ( query, record ) => {
-  return model.dailyPricingModel.updateOne( query, { $set: record } );
+export const updateOne = ( query, record, option = {} ) => {
+  return model.dailyPricingModel.updateOne( query, { $set: record }, option );
 };