Merge remote-tracking branch 'origin/master' into prod

Author: TatianaFomina

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "main": "index.ts",
   "license": "UNLICENSED",
   "scripts": {

src/billing/cloudpayments.ts

@@ -135,7 +135,7 @@ export default class CloudPaymentsWebhooks {
     }
     const invoiceId = this.generateInvoiceId(tariffPlan, workspace);
 
-    const isCardLinkOperation = workspace.tariffPlanId.toString() === tariffPlanId && !this.isPlanExpired(workspace);
+    const isCardLinkOperation = workspace.tariffPlanId.toString() === tariffPlanId && !workspace.isTariffPlanExpired();
 
     let checksum;
 
@@ -173,26 +173,6 @@ export default class CloudPaymentsWebhooks {
     });
   }
 
-  /**
-   * Returns true if workspace's plan is expired
-   * @param workspace - workspace to check
-   */
-  private isPlanExpired(workspace: WorkspaceModel): boolean {
-    const lastChargeDate = new Date(workspace.lastChargeDate);
-
-    let planExpiracyDate;
-
-    if (workspace.isDebug) {
-      planExpiracyDate = lastChargeDate.setDate(lastChargeDate.getDate() + 1);
-    } else {
-      planExpiracyDate = lastChargeDate.setMonth(lastChargeDate.getMonth() + 1);
-    }
-
-    const isPlanExpired = planExpiracyDate < Date.now();
-
-    return isPlanExpired;
-  }
-
   /**
    * Generates invoice id for payment
    *
@@ -216,6 +196,8 @@ export default class CloudPaymentsWebhooks {
     const context = req.context;
     const body: CheckRequest = req.body;
     let data;
+    
+    console.log('💎 CloudPayments /check request', body);
 
     try {
       data = await this.getDataFromRequest(req);
@@ -326,6 +308,8 @@ export default class CloudPaymentsWebhooks {
     const body: PayRequest = req.body;
     let data;
 
+    console.log('💎 CloudPayments /pay request', body);
+
     try {
       data = await this.getDataFromRequest(req);
     } catch (e) {
@@ -492,11 +476,33 @@ export default class CloudPaymentsWebhooks {
 
     try {
       /**
-       * Cancel payment if it is deferred
+       * Refund the money that were charged to link a card
        */
-      if (data.cloudPayments?.recurrent?.startDate) {
+      if (data.isCardLinkOperation) {
         this.handleSendingToTelegramError(telegram.sendMessage(`✅ [Billing / Pay] Recurrent payments activated for «${workspace.name}». 1 RUB charged`, TelegramBotURLs.Money));
+
         await cloudPaymentsApi.cancelPayment(body.TransactionId);
+
+        const member = await this.getMember(data.userId, workspace);
+        const plan = await this.getPlan(req, planId);
+
+        /**
+         * Create business operation about refund
+         */
+        await req.context.factories.businessOperationsFactory.create<PayloadOfWorkspacePlanPurchase>({
+          transactionId: body.TransactionId.toString(),
+          type: BusinessOperationType.CardLinkRefund,
+          status: BusinessOperationStatus.Confirmed,
+          payload: {
+            workspaceId: workspace._id,
+            amount: +body.Amount * PENNY_MULTIPLIER * -1,
+            currency: body.Currency,
+            userId: member._id,
+            tariffPlanId: plan._id,
+          },
+          dtCreated: new Date(),
+        });
+
         this.handleSendingToTelegramError(telegram.sendMessage(`✅ [Billing / Pay] Recurrent payments activated for «${workspace.name}». 1 RUB returned`, TelegramBotURLs.Money));
       } else {
         /**
@@ -516,7 +522,7 @@ export default class CloudPaymentsWebhooks {
     } catch (e) {
       const error = e as Error;
 
-      this.sendError(res, PayCodes.SUCCESS, error.toString(), body);
+      this.sendError(res, PayCodes.SUCCESS, `[Billing / Pay] Error trying to refund for card linking occured: ${error.toString()}`, body);
 
       return;
     }
@@ -537,6 +543,8 @@ export default class CloudPaymentsWebhooks {
     const body: FailRequest = req.body;
     let data: PlanProlongationPayload;
 
+    console.log('💎 CloudPayments /fail request', body);
+
     try {
       data = await this.getDataFromRequest(req);
     } catch (e) {
@@ -549,6 +557,10 @@ export default class CloudPaymentsWebhooks {
     let workspace;
     let user;
 
+    /**
+     * @todo handle card linking and update business operation status
+     */
+
     if (!data.workspaceId || !data.userId || !data.tariffPlanId) {
       this.sendError(res, FailCodes.SUCCESS, `[Billing / Fail] No workspace or user id or plan id in request body`, body);
 
@@ -615,6 +627,8 @@ export default class CloudPaymentsWebhooks {
     const body: RecurrentRequest = req.body;
     const context = req.context;
 
+    console.log('💎 CloudPayments /recurrent request', body);
+
     this.handleSendingToTelegramError(telegram.sendMessage(`[Billing / Recurrent] New recurrent event with ${body.Status} status`, TelegramBotURLs.Money));
     HawkCatcher.send(new Error(`[Billing / Recurrent] New recurrent event with ${body.Status} status`), req.body);
 
@@ -763,6 +777,9 @@ export default class CloudPaymentsWebhooks {
       code: errorCode,
     });
 
+    console.log(errorText, backtrace);
+    console.log('We responded with an error code to CloudPayments: ' + errorCode);
+
     this.handleSendingToTelegramError(telegram.sendMessage(`❌ ${errorText}`, TelegramBotURLs.Money));
 
     HawkCatcher.send(new Error(errorText), backtrace);

src/typeDefs/billing.ts

@@ -63,6 +63,16 @@ enum BusinessOperationType {
   Workspace deposit balance by user
   """
   DEPOSIT_BY_USER
+
+  """
+  Charge minimal amount of money to link a card for further recurrent payments
+  """
+  CARD_LINK_CHARGE
+
+  """
+  Refund the money that were charged to link a card
+  """
+  CARD_LINK_REFUND
 }