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

Author: slaveeks

.nvmrc

@@ -1 +1 @@
-v16.16.0
+v22.12.0

docker/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:22-alpine as builder
 
 WORKDIR /usr/src/app
 RUN apk add --no-cache git gcc g++ python3 make musl-dev
@@ -7,7 +7,7 @@ COPY package.json yarn.lock ./
 
 RUN yarn install
 
-FROM node:16-alpine
+FROM node:22-alpine
 
 WORKDIR /usr/src/app
 

docker/Dockerfile.prod

@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:22-alpine as builder
 
 WORKDIR /usr/src/app
 RUN apk add --no-cache git gcc g++ python3 make musl-dev
@@ -11,7 +11,7 @@ COPY . .
 
 RUN yarn build
 
-FROM node:16-alpine
+FROM node:22-alpine
 
 WORKDIR /usr/src/app
 

package.json

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

src/billing/cloudpayments.ts

@@ -202,7 +202,7 @@ export default class CloudPaymentsWebhooks {
       return;
     }
 
-    telegram.sendMessage(`✅ [Billing / Check] All checks passed successfully «${workspace.name}»`, TelegramBotURLs.Money)
+    telegram.sendMessage(`🤗 [Billing / Check] All checks passed successfully «${workspace.name}»`, TelegramBotURLs.Money)
       .catch(e => console.error('Error while sending message to Telegram: ' + e));
 
     HawkCatcher.send(new Error('[Billing / Check] All checks passed successfully'), body as any);

src/resolvers/billingNew.ts

@@ -156,7 +156,7 @@ export default {
        * Send info to Telegram (non-blocking)
        */
       telegram
-        .sendMessage(`✅ [Billing / Compose payment]
+        .sendMessage(`👀 [Billing / Compose payment]
 
 card link operation: ${isCardLinkOperation}
 amount: ${+plan.monthlyCharge} RUB

src/resolvers/project.js

@@ -14,6 +14,7 @@ const EVENTS_GROUP_HASH_INDEX_NAME = 'groupHashUnique';
 const REPETITIONS_GROUP_HASH_INDEX_NAME = 'groupHash_hashed';
 const REPETITIONS_USER_ID_INDEX_NAME = 'userId';
 const EVENTS_TIMESTAMP_INDEX_NAME = 'timestamp';
+const EVENTS_PAYLOAD_RELEASE_INDEX_NAME = 'payloadRelease';
 const GROUPING_TIMESTAMP_INDEX_NAME = 'groupingTimestamp';
 const GROUPING_TIMESTAMP_AND_LAST_REPETITION_TIME_AND_ID_INDEX_NAME = 'groupingTimestampAndLastRepetitionTimeAndId';
 const GROUPING_TIMESTAMP_AND_GROUP_HASH_INDEX_NAME = 'groupingTimestampAndGroupHash';
@@ -127,6 +128,15 @@ module.exports = {
         name: GROUPING_TIMESTAMP_AND_LAST_REPETITION_TIME_AND_ID_INDEX_NAME,
       });
 
+      await projectEventsCollection.createIndex({
+        'payload.release': 1,
+      },
+      {
+        name: EVENTS_PAYLOAD_RELEASE_INDEX_NAME,
+        background: true,
+        sparse: true,
+      });
+
       await projectEventsCollection.createIndex({
         groupHash: 1,
       },
@@ -503,14 +513,7 @@ module.exports = {
         { $match: { projectId: project._id.toString() } },
         {
           $project: {
-            release: {
-              $convert: {
-                input: '$release',
-                to: 'string',
-                onError: '',
-                onNull: '',
-              },
-            },
+            release: '$release',
             commitsCount: { $size: { $ifNull: ['$commits', [] ] } },
             filesCount: { $size: { $ifNull: ['$files', [] ] } },
             _releaseIdSec: { $floor: { $divide: [ { $toLong: { $toDate: '$_id' } }, 1000] } },
@@ -524,14 +527,7 @@ module.exports = {
               {
                 $match: {
                   $expr: {
-                    $eq: [ {
-                      $convert: {
-                        input: '$payload.release',
-                        to: 'string',
-                        onError: '',
-                        onNull: '',
-                      },
-                    }, '$$rel'],
+                    $eq: ['$payload.release', '$$rel'],
                   },
                 },
               },