Merge branch 'master' into fix-bump-workflow

Author: nikmel2803

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.1.29",
+  "version": "1.1.36",
   "main": "index.ts",
   "license": "UNLICENSED",
   "scripts": {
@@ -37,13 +37,16 @@
     "@graphql-tools/schema": "^8.5.1",
     "@graphql-tools/utils": "^8.9.0",
     "@hawk.so/nodejs": "^3.1.1",
-    "@hawk.so/types": "^0.1.31",
+    "@hawk.so/types": "^0.1.33",
+    "@n1ru4l/json-patch-plus": "^0.2.0",
     "@types/amqp-connection-manager": "^2.0.4",
     "@types/bson": "^4.0.5",
     "@types/debug": "^4.1.5",
     "@types/escape-html": "^1.0.0",
     "@types/graphql-upload": "^8.0.11",
     "@types/jsonwebtoken": "^8.3.5",
+    "@types/lodash.clonedeep": "^4.5.9",
+    "@types/lodash.mergewith": "^4.6.9",
     "@types/mime-types": "^2.1.0",
     "@types/mongodb": "^3.6.20",
     "@types/node": "^16.11.46",
@@ -70,6 +73,8 @@
     "graphql-upload": "^13",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.15",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.mergewith": "^4.6.2",
     "migrate-mongo": "^7.0.1",
     "mime-types": "^2.1.25",
     "mongodb": "^3.7.3",

src/billing/cloudpayments.ts

@@ -42,15 +42,9 @@ import { PaymentData } from './types/paymentData';
 import cloudPaymentsApi from '../utils/cloudPaymentsApi';
 import PlanModel from '../models/plan';
 import { ClientApi, ClientService, CustomerReceiptItem, ReceiptApi, ReceiptTypes, TaxationSystem } from 'cloudpayments';
-import { ComposePaymentPayload } from './types/composePaymentPayload';
 
 const PENNY_MULTIPLIER = 100;
 
-interface ComposePaymentRequest extends express.Request {
-  query: ComposePaymentPayload & { [key: string]: any };
-  context: import('../types/graphql').ResolverContextBase;
-};
-
 /**
  * Class for describing the logic of payment routes
  */
@@ -86,7 +80,6 @@ export default class CloudPaymentsWebhooks {
   public getRouter(): express.Router {
     const router = express.Router();
 
-    router.get('/compose-payment', this.composePayment.bind(this));
     router.all('/check', this.check.bind(this));
     router.all('/pay', this.pay.bind(this));
     router.all('/fail', this.fail.bind(this));
@@ -95,120 +88,6 @@ export default class CloudPaymentsWebhooks {
     return router;
   }
 
-  /**
-   * Prepares payment data before charge
-   *
-   * @param req — Express request object
-   * @param res - Express response object
-   */
-  private async composePayment(req: ComposePaymentRequest, res: express.Response): Promise<void> {
-    const { workspaceId, tariffPlanId, shouldSaveCard } = req.query;
-    const userId = req.context.user.id;
-
-    if (!workspaceId || !tariffPlanId || !userId) {
-      this.sendError(res, 1, `[Billing / Compose payment] No workspace, tariff plan or user id in request body
-Details:
-workspaceId: ${workspaceId}
-tariffPlanId: ${tariffPlanId}
-userId: ${userId}`
-      , req.query);
-
-      return;
-    }
-
-    let workspace;
-    let tariffPlan;
-
-    try {
-      workspace = await this.getWorkspace(req, workspaceId);
-      tariffPlan = await this.getPlan(req, tariffPlanId);
-    } catch (e) {
-      const error = e as Error;
-
-      this.sendError(res, 1, `[Billing / Compose payment] Can't get data from Database ${error.toString()}`, req.query);
-
-      return;
-    }
-
-    try {
-      await this.getMember(userId, workspace);
-    } catch (e) {
-      const error = e as Error;
-
-      this.sendError(res, 1, `[Billing / Compose payment] Can't compose payment due to error: ${error.toString()}`, req.query);
-
-      return;
-    }
-    const invoiceId = this.generateInvoiceId(tariffPlan, workspace);
-
-    const isCardLinkOperation = workspace.tariffPlanId.toString() === tariffPlanId && !workspace.isTariffPlanExpired();
-
-    // Calculate next payment date
-    const lastChargeDate = new Date(workspace.lastChargeDate);
-    const now = new Date();
-    let nextPaymentDate: Date;
-
-    if (isCardLinkOperation) {
-      nextPaymentDate = new Date(lastChargeDate);
-    } else {
-      nextPaymentDate = new Date(now);
-    }
-
-    if (workspace.isDebug) {
-      nextPaymentDate.setDate(nextPaymentDate.getDate() + 1);
-    } else {
-      nextPaymentDate.setMonth(nextPaymentDate.getMonth() + 1);
-    }
-
-    let checksum;
-
-    try {
-      const checksumData = isCardLinkOperation ? {
-        isCardLinkOperation: true,
-        workspaceId: workspace._id.toString(),
-        userId: userId,
-        nextPaymentDate: nextPaymentDate.toISOString(),
-      } : {
-        workspaceId: workspace._id.toString(),
-        userId: userId,
-        tariffPlanId: tariffPlan._id.toString(),
-        shouldSaveCard: shouldSaveCard === 'true',
-        nextPaymentDate: nextPaymentDate.toISOString(),
-      };
-
-      checksum = await checksumService.generateChecksum(checksumData);
-    } catch (e) {
-      const error = e as Error;
-
-      this.sendError(res, 1, `[Billing / Compose payment] Can't generate checksum: ${error.toString()}`, req.query);
-
-      return;
-    }
-
-    this.handleSendingToTelegramError(telegram.sendMessage(`✅ [Billing / Compose payment]
-
-card link operation: ${isCardLinkOperation}
-amount: ${+tariffPlan.monthlyCharge} RUB
-last charge date: ${workspace.lastChargeDate?.toISOString()}
-next payment date: ${nextPaymentDate.toISOString()}
-workspace id: ${workspace._id.toString()}
-debug: ${Boolean(workspace.isDebug)}`
-    , TelegramBotURLs.Money));
-
-    res.send({
-      invoiceId,
-      plan: {
-        id: tariffPlan._id.toString(),
-        name: tariffPlan.name,
-        monthlyCharge: tariffPlan.monthlyCharge,
-      },
-      isCardLinkOperation,
-      currency: 'RUB',
-      checksum,
-      nextPaymentDate: nextPaymentDate.toISOString(),
-    });
-  }
-
   /**
    * Generates invoice id for payment
    *
@@ -557,14 +436,26 @@ plan monthly charge: ${data.cloudPayments?.recurrent.amount} ${body.Currency}`
 
         await this.sendReceipt(workspace, tariffPlan, userEmail);
 
-        this.handleSendingToTelegramError(telegram.sendMessage(`✅ [Billing / Pay] New payment
+        let messageText = '';
+
+        if (data.cloudPayments?.recurrent.startDate) {
+          messageText = `✅ [Billing / Pay] New payment
 
 amount: ${+body.Amount} ${body.Currency}
 next payment date: ${data.cloudPayments?.recurrent.startDate}
 workspace id: ${workspace._id}
 date of operation: ${body.DateTime}
-subscription id: ${body.SubscriptionId}`
-        , TelegramBotURLs.Money));
+subscription id: ${body.SubscriptionId}`;
+        } else {
+          messageText = `✅ [Billing / Pay] New Recurrent payment
+
+amount: ${+body.Amount} ${body.Currency}
+workspace id: ${workspace._id}
+date of operation: ${body.DateTime}
+subscription id: ${body.SubscriptionId}`;
+        }
+
+        this.handleSendingToTelegramError(telegram.sendMessage(messageText, TelegramBotURLs.Money));
       }
     } catch (e) {
       const error = e as Error;
@@ -676,14 +567,17 @@ subscription id: ${body.SubscriptionId}`
 
     console.log('💎 CloudPayments /recurrent request', body);
 
-    this.handleSendingToTelegramError(telegram.sendMessage(`✅ [Billing / Recurrent] New recurrent transaction
+    const emoji = [SubscriptionStatus.CANCELLED, SubscriptionStatus.REJECTED].includes(body.Status) ? '❌' : '✅';
+
+    this.handleSendingToTelegramError(telegram.sendMessage(`${emoji} [Billing / Recurrent] New recurrent event
 
 amount: ${+body.Amount} ${body.Currency}
 next payment date: ${body.NextTransactionDate}
 workspace id: ${body.AccountId}
 subscription id: ${body.Id}
 status: ${body.Status}`
     , TelegramBotURLs.Money));
+
     HawkCatcher.send(new Error(`[Billing / Recurrent] New recurrent event with ${body.Status} status`), req.body);
 
     switch (body.Status) {

src/billing/types/composePaymentPayload.ts

@@ -24,7 +24,6 @@
 /**
  * @typedef {Object} EventPayload
  * @property {string} title - event title
- * @property {DateTime} timestamp - event datetime
  * @property {Number} level - event severity level
  * @property {EventBacktraceFrame[]} [backtrace] - event stack array from the latest call to the earliest
  * @property {Object} [get] - GET params
@@ -39,11 +38,13 @@
 /**
  * @typedef {Object} EventSchema
  * @property {String} _id - event ID
- * @property {String} catcherType - type of an event
- * @property {Number} count - event repetitions count
  * @property {String} groupHash - event's hash (catcherType + title + salt)
- * @property {User[]} visitedBy - array of users who visited this event
+ * @property {Number} totalCount - event repetitions count
+ * @property {String} catcherType - type of an event
  * @property {EventPayload} payload - event's payload
+ * @property {Number} timestamp - event's Unix timestamp
+ * @property {Number} usersAffected - number of users that were affected by the event
+ * @property {User[]} visitedBy - array of users who visited this event
  */
 
 /**