Merge branch 'master' into feat/openai

Author: slaveeks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.2.23",
+  "version": "1.2.26",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {
@@ -28,6 +28,7 @@
     "jest": "^26.2.2",
     "mongodb-memory-server": "^6.6.1",
     "nodemon": "^2.0.2",
+    "redis-mock": "^0.56.3",
     "ts-jest": "^26.1.4",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
@@ -39,7 +40,7 @@
     "@graphql-tools/schema": "^8.5.1",
     "@graphql-tools/utils": "^8.9.0",
     "@hawk.so/nodejs": "^3.1.1",
-    "@hawk.so/types": "^0.1.33",
+    "@hawk.so/types": "^0.1.37",
     "@n1ru4l/json-patch-plus": "^0.2.0",
     "@types/amqp-connection-manager": "^2.0.4",
     "@types/bson": "^4.0.5",
@@ -83,6 +84,7 @@
     "mongodb": "^3.7.3",
     "morgan": "^1.10.1",
     "prom-client": "^15.1.3",
+    "redis": "^4.7.0",
     "safe-regex": "^2.1.0",
     "ts-node-dev": "^2.0.0",
     "uuid": "^8.3.2",

src/index.ts

@@ -29,6 +29,7 @@ import { graphqlUploadExpress } from 'graphql-upload';
 import { metricsMiddleware, createMetricsServer, graphqlMetricsPlugin } from './metrics';
 import { requestLogger } from './utils/logger';
 import ReleasesFactory from './models/releasesFactory';
+import RedisHelper from './redisHelper';
 
 /**
  * Option to enable playground
@@ -148,6 +149,7 @@ class HawkAPI {
   /**
    * Creates factories to work with models
    * @param dataLoaders - dataLoaders for fetching data form database
+   * @returns factories object
    */
   private static setupFactories(dataLoaders: DataLoaders): ContextFactories {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -212,23 +214,9 @@ class HawkAPI {
 
     /**
      * Initializing accounting SDK
-     */
-    let tlsVerify;
-
-    /**
      * Checking env variables
      * If at least one path is not transmitted, the variable tlsVerify is undefined
      */
-    if (
-      ![process.env.TLS_CA_CERT, process.env.TLS_CERT, process.env.TLS_KEY].some(value => value === undefined || value.length === 0)
-    ) {
-      tlsVerify = {
-        tlsCaCertPath: `${process.env.TLS_CA_CERT}`,
-        tlsCertPath: `${process.env.TLS_CERT}`,
-        tlsKeyPath: `${process.env.TLS_KEY}`,
-      };
-    }
-
     /*
      * const accounting = new Accounting({
      *   baseURL: `${process.env.CODEX_ACCOUNTING_URL}`,
@@ -252,6 +240,12 @@ class HawkAPI {
   public async start(): Promise<void> {
     await mongo.setupConnections();
     await rabbitmq.setupConnections();
+
+    // Initialize Redis singleton with auto-reconnect
+    const redis = RedisHelper.getInstance();
+
+    await redis.initialize();
+
     await this.server.start();
     this.app.use(graphqlUploadExpress());
     this.server.applyMiddleware({ app: this.app });

src/models/eventsFactory.js

@@ -1,6 +1,8 @@
 import { getMidnightWithTimezoneOffset, getUTCMidnight } from '../utils/dates';
 import safe from 'safe-regex';
 import { createProjectEventsByIdLoader } from '../dataLoaders';
+import RedisHelper from '../redisHelper';
+import ChartDataService from '../services/chartDataService';
 
 const Factory = require('./modelFactory');
 const mongo = require('../mongo');
@@ -85,11 +87,21 @@ class EventsFactory extends Factory {
 
   /**
    * Creates Event instance
-   * @param {ObjectId} projectId - project ID
+   * @param {ObjectId} projectId
    */
   constructor(projectId) {
     super();
 
+    /**
+     * Redis helper instance (singleton)
+     */
+    this.redis = RedisHelper.getInstance();
+
+    /**
+     * Chart data service for fetching data from Redis TimeSeries
+     */
+    this.chartDataService = new ChartDataService(this.redis);
+
     if (!projectId) {
       throw new Error('Can not construct Event model, because projectId is not provided');
     }
@@ -280,6 +292,12 @@ class EventsFactory extends Factory {
     const searchFilter = search.trim().length > 0
       ? {
         $or: [
+          {
+            'repetition.delta': {
+              $regex: escapedSearch,
+              $options: 'i',
+            },
+          },
           {
             'event.payload.title': {
               $regex: escapedSearch,
@@ -414,6 +432,57 @@ class EventsFactory extends Factory {
     };
   }
 
+  /**
+   * Get project chart data from Redis or fallback to MongoDB
+   *
+   * @param {string} projectId - project ID
+   * @param {string} startDate - start date (ISO string)
+   * @param {string} endDate - end date (ISO string)
+   * @param {number} groupBy - grouping interval in minutes (1=minute, 60=hour, 1440=day)
+   * @param {number} timezoneOffset - user's local timezone offset in minutes
+   * @returns {Promise<Array>}
+   */
+  async getProjectChartData(projectId, startDate, endDate, groupBy = 60, timezoneOffset = 0) {
+    // Calculate days for MongoDB fallback
+    const start = new Date(startDate).getTime();
+    const end = new Date(endDate).getTime();
+    const days = Math.ceil((end - start) / (24 * 60 * 60 * 1000));
+
+    try {
+      const redisData = await this.chartDataService.getProjectChartData(
+        projectId,
+        startDate,
+        endDate,
+        groupBy,
+        timezoneOffset
+      );
+
+      if (redisData && redisData.length > 0) {
+        return redisData;
+      }
+
+      // Fallback to Mongo (empty groupHash for project-level data)
+      return this.findChartData(days, timezoneOffset, '');
+    } catch (err) {
+      console.error('[EventsFactory] getProjectChartData error:', err);
+
+      // Fallback to Mongo on error (empty groupHash for project-level data)
+      return this.findChartData(days, timezoneOffset, '');
+    }
+  }
+
+  /**
+   * Get event daily chart data from MongoDB only
+   *
+   * @param {string} groupHash - event's group hash
+   * @param {number} days - how many days to fetch
+   * @param {number} timezoneOffset - user's local timezone offset in minutes
+   * @returns {Promise<Array>}
+   */
+  async getEventDailyChart(groupHash, days, timezoneOffset = 0) {
+    return this.findChartData(days, timezoneOffset, groupHash);
+  }
+
   /**
    * Fetch timestamps and total count of errors (or target error) for each day since
    *
@@ -528,7 +597,6 @@ class EventsFactory extends Factory {
   /**
    * Returns Event repetitions
    *
-   * @param {string|ObjectID} eventId - Event's id, could be repetitionId in case when we want to get repetitions portion by one repetition
    * @param {string|ObjectID} originalEventId - id of the original event
    * @param {Number} limit - count limitations
    * @param {Number} cursor - pointer to the next repetition

src/models/notify.js

@@ -90,6 +90,11 @@ class Notify {
             endpoint: 'slack',
             minPeriod: 60,
           },
+          loop: {
+            isEnabled: true,
+            endpoint: 'loop',
+            minPeriod: 60,
+          },
           telegram: {
             isEnabled: true,
             endpoint: 'telegram',

src/rabbitmq.ts

@@ -27,6 +27,7 @@ export enum Queues {
   Email = 'sender/email',
   Telegram = 'notify/telegram',
   Slack = 'notify/slack',
+  Loop = 'notify/loop',
   Limiter = 'cron-tasks/limiter',
 }
 
@@ -81,6 +82,14 @@ export const WorkerPaths: Record<string, WorkerPath> = {
     queue: Queues.Slack,
   },
 
+  /**
+   * Path to loop worker
+   */
+  Loop: {
+    exchange: Exchanges.Notify,
+    queue: Queues.Loop,
+  },
+
   /**
    * Path to limiter worker
    */