Merge branch 'fix/card-linking' into stage

Author: TatianaFomina

.env.sample

@@ -20,6 +20,8 @@ JWT_SECRET_REFRESH_TOKEN=abacaba
 # JWT secret for user's access token
 JWT_SECRET_ACCESS_TOKEN=belarus
 
+# max document could for one read request to the database
+MAX_DB_READ_BATCH_SIZE=100000
 
 # JWT secret for signing tokens for processing billing requests
 JWT_SECRET_BILLING_CHECKSUM=checksum_secret

jest-mongodb-config.js

@@ -5,7 +5,7 @@ module.exports = {
       dbName: 'hawk',
     },
     binary: {
-      version: '4.2.13',
+      version: '6.0.2',
       skipMD5: true,
     },
     autoStart: false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.2.0",
+  "version": "1.2.4",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {

src/billing/cloudpayments.ts

@@ -272,7 +272,10 @@ export default class CloudPaymentsWebhooks {
 
     try {
       await businessOperation.setStatus(BusinessOperationStatus.Confirmed);
-      await workspace.changePlan(tariffPlan._id);
+
+      if (!data.isCardLinkOperation) {
+        await workspace.changePlan(tariffPlan._id);
+      }
 
       const subscriptionId = body.SubscriptionId;
 
@@ -350,14 +353,13 @@ export default class CloudPaymentsWebhooks {
         }));
       } catch (e) {
         const error = e as Error;
-  
+
         this.sendError(res, PayCodes.SUCCESS, `[Billing / Pay] Error while sending task to limiter worker ${error.toString()}`, body);
-  
+
         return;
       }
     }
 
-
     try {
       // todo: add plan-prolongation notification if it was a payment by subscription
       const senderWorkerTask: PaymentSuccessNotificationTask = {

src/models/eventsFactory.js

@@ -1,5 +1,4 @@
 import { getMidnightWithTimezoneOffset, getUTCMidnight } from '../utils/dates';
-import { groupBy } from '../utils/grouper';
 import safe from 'safe-regex';
 
 const Factory = require('./modelFactory');
@@ -8,6 +7,8 @@ const Event = require('../models/event');
 const { ObjectID } = require('mongodb');
 const { composeEventPayloadByRepetition } = require('../utils/merge');
 
+const MAX_DB_READ_BATCH_SIZE = Number(process.env.MAX_DB_READ_BATCH_SIZE);
+
 /**
  * @typedef {import('mongodb').UpdateWriteOpResult} UpdateWriteOpResult
  */
@@ -423,24 +424,35 @@ class EventsFactory extends Factory {
       };
     }
 
-    let dailyEvents = await this.getCollection(this.TYPES.DAILY_EVENTS)
-      .find(options)
-      .toArray();
+    const dailyEventsCursor = await this.getCollection(this.TYPES.DAILY_EVENTS)
+      .find(options, {
+        projection: {
+          lastRepetitionTime: 1,
+          groupingTimestamp: 1,
+          count: 1,
+        },
+      })
+      .batchSize(MAX_DB_READ_BATCH_SIZE);
 
-    /**
-     * Convert UTC midnight to midnights in user's timezone
-     */
-    dailyEvents = dailyEvents.map((item) => {
-      return Object.assign({}, item, {
-        groupingTimestamp: getMidnightWithTimezoneOffset(item.lastRepetitionTime, item.groupingTimestamp, timezoneOffset),
-      });
-    });
+    const groupedCounts = {};
 
-    /**
-     * Group events using 'groupingTimestamp:NNNNNNNN' key
-     * @type {ProjectChartItem[]}
-     */
-    const groupedData = groupBy('groupingTimestamp')(dailyEvents);
+    for await (const item of dailyEventsCursor) {
+      const groupingTimestamp = getMidnightWithTimezoneOffset(
+        item.lastRepetitionTime,
+        item.groupingTimestamp,
+        timezoneOffset
+      );
+
+      const key = `groupingTimestamp:${groupingTimestamp}`;
+      const current = groupedCounts[key] || 0;
+
+      if (item.count === undefined || item.count === null) {
+        console.warn(`Missing 'count' field for daily event with key ${key}. Defaulting to 0.`);
+        groupedCounts[key] = current;
+      } else {
+        groupedCounts[key] = current + item.count;
+      }
+    }
 
     /**
      * Now fill all requested days
@@ -451,11 +463,16 @@ class EventsFactory extends Factory {
       const now = new Date();
       const day = new Date(now.setDate(now.getDate() - i));
       const dayMidnight = getUTCMidnight(day) / 1000;
-      const groupedEvents = groupedData[`groupingTimestamp:${dayMidnight}`];
+
+      let groupedCount = groupedCounts[`groupingTimestamp:${dayMidnight}`];
+
+      if (!groupedCount) {
+        groupedCount = 0;
+      }
 
       result.push({
         timestamp: dayMidnight,
-        count: groupedEvents ? groupedEvents.reduce((sum, value) => sum + value.count, 0) : 0,
+        count: groupedCount,
       });
     }
 

src/resolvers/billingNew.ts

@@ -109,7 +109,11 @@ export default {
       const now = new Date();
       const invoiceId = `${workspace.name} ${now.getDate()}/${now.getMonth() + 1} ${plan.name}`;
 
-      const isCardLinkOperation = workspace.tariffPlanId.toString() === tariffPlanId && !workspace.isTariffPlanExpired();
+      let isCardLinkOperation = false;
+
+      if (workspace.tariffPlanId.toString() === tariffPlanId && !workspace.isTariffPlanExpired() && !workspace.isBlocked) {
+        isCardLinkOperation = true;
+      }
 
       // Calculate next payment date
       const lastChargeDate = workspace.lastChargeDate ? new Date(workspace.lastChargeDate) : now;

test/integration/cases/billing/pay.test.ts

@@ -337,6 +337,26 @@ describe('Pay webhook', () => {
       expect(updatedWorkspace?.billingPeriodEventsCount).toBe(0);
     });
 
+    test('Should not reset events counter in workspace if it is a card linking operation', async () => {
+      const apiResponse = await apiInstance.post('/billing/pay', {
+        ...validPayRequestData,
+        Data: JSON.stringify({
+          checksum: await checksumService.generateChecksum({
+            ...paymentSuccessPayload,
+            isCardLinkOperation: true,
+            nextPaymentDate: new Date(Date.now() + 24 * 60 * 60 * 1000).toString(), // next day
+          }),
+        }),
+      });
+
+      const notUpdatedWorkspace = await workspacesCollection.findOne({
+        _id: workspace._id,
+      });
+
+      expect(apiResponse.data.code).toBe(PayCodes.SUCCESS);
+      expect(notUpdatedWorkspace?.billingPeriodEventsCount).not.toBe(0);
+    });
+
     test('Should reset last charge date in workspace', async () => {
       const apiResponse = await apiInstance.post('/billing/pay', validPayRequestData);
 
@@ -375,6 +395,26 @@ describe('Pay webhook', () => {
       expect(apiResponse.data.code).toBe(PayCodes.SUCCESS);
     });
 
+    test('Should not send task to limiter worker if it is a card linking operation', async () => {
+      const apiResponse = await apiInstance.post('/billing/pay', {
+        ...validPayRequestData,
+        Data: JSON.stringify({
+          checksum: await checksumService.generateChecksum({
+            ...paymentSuccessPayload,
+            isCardLinkOperation: true,
+            nextPaymentDate: new Date(Date.now() + 24 * 60 * 60 * 1000).toString(), // next day
+          }),
+        }),
+      });
+
+      const message = await global.rabbitChannel.get('cron-tasks/limiter', {
+        noAck: true,
+      });
+
+      expect(message).toBeFalsy();
+      expect(apiResponse.data.code).toBe(PayCodes.SUCCESS);
+    });
+
     // test('Should associate an account with a workspace if the workspace did not have one', async () => {
     //   /**
     //    * Remove accountId from existed workspace
@@ -479,6 +519,8 @@ describe('Pay webhook', () => {
       expect(updatedUser?.bankCards?.shift()).toMatchObject(expectedCard);
       expect(apiResponse.data.code).toBe(PayCodes.SUCCESS);
     });
+
+
   });
 
   describe('With invalid request', () => {