Merge branch 'master' of github.com:codex-team/hawk.api.nodejs into feat/new-diff

Author: slaveeks

.eslintrc.js

@@ -11,5 +11,13 @@ module.exports = {
     'require-jsdoc': 'warn',
     'no-shadow': 'warn',
     'no-unused-expressions': 'warn'
-  }
+  },
+  overrides: [
+    {
+      files: ['*.js'],
+      rules: {
+        '@typescript-eslint/explicit-function-return-type': 'off'
+      }
+    }
+  ]
 };

.github/workflows/build-and-push-docker-image.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Login to GitHub registry
         uses: docker/login-action@v2
@@ -55,4 +55,4 @@ jobs:
           file: docker/Dockerfile.prod
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          push: ${{ startsWith(github.ref, 'refs/tags/v') || endsWith(github.ref, '/stage') || endsWith(github.ref, '/prod') }}
+          push: ${{ github.ref == 'refs/heads/stage' || github.ref == 'refs/heads/prod' || startsWith(github.ref, 'refs/tags/v') }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "main": "index.ts",
   "license": "UNLICENSED",
   "scripts": {
@@ -37,7 +37,7 @@
     "@graphql-tools/schema": "^8.5.1",
     "@graphql-tools/utils": "^8.9.0",
     "@hawk.so/nodejs": "^3.1.1",
-    "@hawk.so/types": "^0.1.26",
+    "@hawk.so/types": "^0.1.28",
     "@types/amqp-connection-manager": "^2.0.4",
     "@types/bson": "^4.0.5",
     "@types/debug": "^4.1.5",
@@ -48,6 +48,7 @@
     "@types/mongodb": "^3.6.20",
     "@types/node": "^16.11.46",
     "@types/node-fetch": "^2.5.4",
+    "@types/safe-regex": "^1.1.6",
     "@types/uuid": "^8.3.4",
     "amqp-connection-manager": "^3.1.0",
     "amqplib": "^0.5.5",
@@ -72,6 +73,7 @@
     "migrate-mongo": "^7.0.1",
     "mime-types": "^2.1.25",
     "mongodb": "^3.7.3",
+    "safe-regex": "^2.1.0",
     "ts-node-dev": "^2.0.0",
     "uuid": "^8.3.2"
   }

src/billing/cloudpayments.ts

@@ -886,7 +886,7 @@ export default class CloudPaymentsWebhooks {
       {
         Items: [ item ],
         email: userMail,
-        taxationSystem: TaxationSystem.GENERAL,
+        taxationSystem: TaxationSystem.SIMPLIFIED_INCOME,
       }
     );
   }

src/models/eventsFactory.js

@@ -149,15 +149,23 @@ class EventsFactory extends Factory {
    * @param {Number} skip - certain number of documents to skip
    * @param {'BY_DATE' | 'BY_COUNT'} sort - events sort order
    * @param {EventsFilters} filters - marks by which events should be filtered
+   * @param {String} search - Search query
    *
    * @return {RecentEventSchema[]}
    */
   async findRecent(
     limit = 10,
     skip = 0,
     sort = 'BY_DATE',
-    filters = {}
+    filters = {},
+    search = ''
   ) {
+    if (typeof search !== 'string') {
+      throw new Error('Search parameter must be a string');
+    }
+
+    const escapedSearch = search.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
     limit = this.validateLimit(limit);
 
     switch (sort) {
@@ -184,71 +192,64 @@ class EventsFactory extends Factory {
       },
     ];
 
-    /**
-     * If some events should be omitted, use alternative pipeline
-     */
-    if (Object.values(filters).length > 0) {
-      pipeline.push(
-        /**
-         * Lookup events object for each daily event
-         */
-        {
-          $lookup: {
-            from: 'events:' + this.projectId,
-            localField: 'groupHash',
-            foreignField: 'groupHash',
-            as: 'event',
+    const searchFilter = search.trim().length > 0
+      ? {
+        $or: [
+          {
+            'event.payload.title': {
+              $regex: escapedSearch,
+              $options: 'i',
+            },
           },
-        },
-        {
-          $unwind: '$event',
-        },
-        /**
-         * Match filters
-         */
-        {
-          $match: {
-            ...Object.fromEntries(
-              Object
-                .entries(filters)
-                .map(([mark, exists]) => [`event.marks.${mark}`, { $exists: exists } ])
-            ),
+          {
+            'event.payload.backtrace.file': {
+              $regex: escapedSearch,
+              $options: 'i',
+            },
           },
+        ],
+      }
+      : {};
+
+    const matchFilter = filters
+      ? Object.fromEntries(
+        Object
+          .entries(filters)
+          .map(([mark, exists]) => [`event.marks.${mark}`, { $exists: exists } ])
+      )
+      : {};
+
+    pipeline.push(
+      {
+        $lookup: {
+          from: 'events:' + this.projectId,
+          localField: 'groupHash',
+          foreignField: 'groupHash',
+          as: 'event',
         },
-        { $skip: skip },
-        { $limit: limit },
-        {
-          $group: {
-            _id: null,
-            dailyInfo: { $push: '$$ROOT' },
-            events: { $push: '$event' },
-          },
+      },
+      {
+        $unwind: '$event',
+      },
+      {
+        $match: {
+          ...matchFilter,
+          ...searchFilter,
         },
-        {
-          $unset: 'dailyInfo.event',
-        }
-      );
-    } else {
-      pipeline.push(
-        { $skip: skip },
-        { $limit: limit },
-        {
-          $group: {
-            _id: null,
-            groupHash: { $addToSet: '$groupHash' },
-            dailyInfo: { $push: '$$ROOT' },
-          },
+      },
+      { $skip: skip },
+      { $limit: limit },
+      {
+        $group: {
+          _id: null,
+          dailyInfo: { $push: '$$ROOT' },
+          events: { $push: '$event' },
         },
-        {
-          $lookup: {
-            from: 'events:' + this.projectId,
-            localField: 'groupHash',
-            foreignField: 'groupHash',
-            as: 'events',
-          },
-        }
-      );
-    }
+      },
+      {
+        $unset: 'dailyInfo.event',
+      }
+    );
 
     const cursor = this.getCollection(this.TYPES.DAILY_EVENTS).aggregate(pipeline);
 
@@ -316,7 +317,7 @@ class EventsFactory extends Factory {
     });
 
     /**
-     * Group events using 'groupByTimestamp:NNNNNNNN' key
+     * Group events using 'groupingTimestamp:NNNNNNNN' key
      * @type {ProjectChartItem[]}
      */
     const groupedData = groupBy('groupingTimestamp')(dailyEvents);