tango-app-api-payment-subscription 3.5.33 → 3.5.34

package/package.json

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

package/src/controllers/brandsBilling.controller.js

@@ -1804,27 +1804,27 @@ export async function bulkUpdateBillingGroups( req, res ) {
       }
     }
 
-    // Sixth pass: cross-group conflict with OTHER existing groups in the DB.
-    // A store already assigned to a different billing group cannot be claimed
-    // by this upload.
+    // Sixth pass: cross-group MOVE detection with OTHER existing groups in the DB.
+    // A store already assigned to a different billing group is treated as a
+    // MOVE: it will be pulled out of its old group(s) during the write pass and
+    // assigned to the group that claims it in this upload. (Cross-group
+    // uniqueness WITHIN the upload is already enforced by the fourth pass.)
     const idsInUpload = Array.from( groupedByName.values() ).map( ( e ) => e._id );
+    // Map of old-group _id → [storeIds to pull]. Only groups NOT in this upload
+    // need an explicit pull; groups in the upload get their stores[] fully
+    // rewritten in the write pass, which naturally drops released stores.
+    const storesToPullByGroupId = new Map();
     if ( allStoreIds.length > 0 ) {
-      const conflictDocs = await billingService.find(
+      const otherGroupDocs = await billingService.find(
           { clientId, stores: { $in: allStoreIds }, _id: { $nin: idsInUpload } },
           { _id: 1, groupName: 1, stores: 1 },
       );
-      for ( const doc of conflictDocs ) {
-        const conflictIds = ( doc.stores || [] ).filter( ( sid ) => allStoreIds.includes( String( sid ) ) );
-        for ( const sid of conflictIds ) {
-          const claimingGroupName = storeIdToGroup.get( String( sid ) );
-          const claimingEntry = groupedByName.get( claimingGroupName );
-          if ( claimingEntry ) {
-            errors.push( {
-              rowNumber: claimingEntry.firstRowIndex + 2,
-              groupName: claimingEntry.groupName,
-              errors: [ `Store ID ${sid} is already assigned to billing group "${doc.groupName}"` ],
-            } );
-          }
+      for ( const doc of otherGroupDocs ) {
+        const movedIds = ( doc.stores || [] )
+            .map( ( sid ) => String( sid ) )
+            .filter( ( sid ) => storeIdToGroup.has( sid ) );
+        if ( movedIds.length > 0 ) {
+          storesToPullByGroupId.set( String( doc._id ), movedIds );
         }
       }
     }
@@ -1839,6 +1839,19 @@ export async function bulkUpdateBillingGroups( req, res ) {
 
     const openSearchActivityLog = JSON.parse( process.env.OPENSEARCH ).activityLog;
 
+    // Move pass: pull claimed stores out of any OTHER existing DB group first,
+    // so a moved store never ends up assigned to two groups. Groups included in
+    // this upload have their stores[] fully rewritten below, so only the
+    // not-in-upload old groups need an explicit $pull here.
+    for ( const [ oldGroupId, storeIds ] of storesToPullByGroupId ) {
+      try {
+        await billingService.updateOne( { _id: oldGroupId }, { $pull: { stores: { $in: storeIds } } } );
+      } catch ( pullErr ) {
+        logger.error( { error: pullErr, function: 'bulkUpdateBillingGroups.pull', oldGroupId } );
+        return res.sendError( { error: `Failed to release stores from a previous group: ${pullErr?.message || pullErr}` }, 500 );
+      }
+    }
+
     // Seventh pass: serial DB writes — one per billing group.
     let updated = 0;
     let aborted = null;

package/src/controllers/invoice.controller.js

@@ -143,10 +143,18 @@ export async function createInvoice( req, res ) {
       // the auto-generated advance invoices).
       const customAdvanceMonths = req.body.advanceInvoice ?
         ( { quarterly: 3, halfyearly: 6, yearly: 12 }[req.body.advancePeriod] || 1 ) : 1;
+      // Advance invoices bill the UPCOMING period, so the first month label is
+      // NEXT month (start of month), matching the auto-generate branch's
+      // baseDate. Without this the labels started on the CURRENT month
+      // (e.g. quarterly in Jul produced Jul/Aug/Sep instead of Aug/Sep/Oct).
+      // billingDate / monthOfbilling / dueDate below keep using baseDate
+      // (creation date), also matching the auto path.
+      const advanceStart = req.body.advanceInvoice ?
+        dayjs().add( 1, 'month' ).startOf( 'month' ) : baseDate;
       if ( customAdvanceMonths > 1 ) {
         const expanded = [];
         for ( let m = 0; m < customAdvanceMonths; m++ ) {
-          const monthLabel = baseDate.add( m, 'month' ).format( 'MMM YYYY' );
+          const monthLabel = advanceStart.add( m, 'month' ).format( 'MMM YYYY' );
           for ( const p of customProducts ) {
             expanded.push( { ...p, month: monthLabel } );
           }