update from master

Author: e11sy

.env.test

@@ -2,10 +2,10 @@
 PORT=4000
 
 # Hawk API database URL
-MONGO_HAWK_DB_URL=mongodb://localhost:55011/hawk
+MONGO_HAWK_DB_URL=mongodb://127.0.0.1:55011/hawk
 
 # Events database URL
-MONGO_EVENTS_DB_URL=mongodb://localhost:55011/hawk_events
+MONGO_EVENTS_DB_URL=mongodb://127.0.0.1:55011/hawk_events
 
 # MongoDB settings
 MONGO_RECONNECT_TRIES=60

.github/workflows/bump-version.yml

@@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
   # If pull request was merged then we should check for a package version update
   check-version-update:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       # Checkout to target branch
       - uses: actions/checkout@v2
@@ -33,7 +33,7 @@ jobs:
 
   bump-version:
     needs: check-version-update
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       # Checkout to target branch
       - uses: actions/checkout@v2

.github/workflows/nodejs.yml

@@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
   lint:
     name: ESlint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js

.github/workflows/pr-to-prod.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   update-from-master:
     if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
 

.github/workflows/tests.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   build:
     name: Run Jest tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install modules

jest.config.js

@@ -4,6 +4,7 @@
  */
 
 module.exports = {
+  testTimeout: 30000,
   /**
    * The test environment that will be used for testing
    */

package.json

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

src/billing/cloudpayments.ts

@@ -584,6 +584,10 @@ export default class CloudPaymentsWebhooks {
         }
 
         if (!workspace) {
+          this.sendError(res, RecurrentCodes.SUCCESS, `[Billing / Recurrent] Workspace with subscription id ${body.Id} not found`, {
+            body,
+          });
+
           return;
         }
 
@@ -793,13 +797,13 @@ export default class CloudPaymentsWebhooks {
      * involving the production and distribution of goods and the provision of services
      * Also known as "НДС" in Russia
      */
-    const VALUE_ADDED_TAX = 20;
+    const VALUE_ADDED_TAX = 0;
 
     const item: CustomerReceiptItem = {
       amount: tariff.monthlyCharge,
       label: `${tariff.name} tariff plan`,
       price: tariff.monthlyCharge,
-      // vat: VALUE_ADDED_TAX,
+      vat: VALUE_ADDED_TAX,
       quantity: 1,
     };
 

src/models/workspace.ts

@@ -71,6 +71,11 @@ export default class WorkspaceModel extends AbstractModel<WorkspaceDBScheme> imp
    */
   public subscriptionId!: string | undefined;
 
+  /**
+   * True if workspace is used for debugging
+   */
+  public isDebug?: boolean;
+
   /**
    * Model's collection
    */
@@ -411,6 +416,10 @@ export default class WorkspaceModel extends AbstractModel<WorkspaceDBScheme> imp
   public getTariffPlanDueDate(): Date {
     const lastChargeDate = new Date(this.lastChargeDate);
 
+    if (this.isDebug) {
+      return new Date(lastChargeDate.setDate(lastChargeDate.getDate() + 1));
+    }
+
     return new Date(lastChargeDate.setMonth(lastChargeDate.getMonth() + 1));
   }
 

src/resolvers/billingNew.ts

@@ -163,9 +163,11 @@ export default {
       const dueDate = workspace.getTariffPlanDueDate();
 
       if (args.input.isRecurrent) {
+        const interval = workspace.isDebug ? 'Day' : 'Month';
+
         jsonData.cloudPayments = {
           recurrent: {
-            interval: 'Month',
+            interval,
             period: 1,
           },
         };