imp(notifier): improve redis structure key

codex-team · Feb 2, 2025 · 17f5a04 · 17f5a04
1 parent fc8170b
commit 17f5a04
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/workers/notifier/src/index.ts b/workers/notifier/src/index.ts
@@ -73,13 +73,13 @@ export default class NotifierWorker extends Worker {
           return;
         }
 
-        const currentEventCount = await this.redis.computeEventCountForPeriod(rule._id.toString(), event.groupHash, rule.eventThresholdPeriod);
+        const currentEventCount = await this.redis.computeEventCountForPeriod(projectId, rule._id.toString(), event.groupHash, rule.eventThresholdPeriod);
 
         /**
          * If threshold reached, then send event to channels
          */
         if (rule.threshold === currentEventCount) {
-          await this.addEventToChannels(projectId, rule, event);
+          await this.sendEventsToChannels(projectId, rule, event);
         }
       }
     } catch (e) {
@@ -122,13 +122,13 @@ export default class NotifierWorker extends Worker {
   }
 
   /**
-   * Add event to channel's buffer or set timer if it doesn't exist
+   * Send events to sender for each enabled channel in rule
    *
    * @param {string} projectId - project id event is related to
    * @param {Rule} rule - notification rule
    * @param {NotifierEvent} event - received event
    */
-  private async addEventToChannels(projectId: string, rule: Rule, event: NotifierEvent): Promise<void> {
+  private async sendEventsToChannels(projectId: string, rule: Rule, event: NotifierEvent): Promise<void> {
     const channels: Array<[string, Channel]> = Object.entries(rule.channels as { [name: string]: Channel });
 
     for (const [name, options] of channels) {

diff --git a/workers/notifier/src/redisHelper.ts b/workers/notifier/src/redisHelper.ts
@@ -41,12 +41,18 @@ export default class RedisHelper {
   /**
    * Method that updates the event count respectfully to the threshold reset period
    *
+   * @param projectId - id of the project used as a part of structure key
    * @param ruleId - id of the rule used as a part of structure key
    * @param groupHash - event group hash used as a part of structure key
    * @param thresholdPeriod - period of time used to reset the event count
    * @returns {number} current event count
    */
-  public async computeEventCountForPeriod(ruleId: string, groupHash: NotifierEvent['groupHash'], thresholdPeriod: Rule['eventThresholdPeriod']): Promise<number> {
+  public async computeEventCountForPeriod(
+      projectId: string, 
+      ruleId: string, 
+      groupHash: NotifierEvent['groupHash'], 
+      thresholdPeriod: Rule['eventThresholdPeriod']
+    ): Promise<number> {
     const script = `
     local key = KEYS[1]
     local currentTimestamp = tonumber(ARGV[1])
@@ -63,13 +69,13 @@ export default class RedisHelper {
     return newCounter
     `;
 
-    const key = `${ruleId}:${groupHash}:${thresholdPeriod}:times`;
+    const key = `${projectId}:${ruleId}:${groupHash}:${thresholdPeriod}:times`;
 
     const currentTimestamp = Date.now();
 
     const currentEventCount = await this.redisClient.eval(script, {
       keys: [ key ],
-      arguments: [currentTimestamp.toString(), (currentTimestamp + thresholdPeriod).toString()],
+      arguments: [currentTimestamp.toString(), (thresholdPeriod).toString()],
     }) as number;
 
     return (currentEventCount !== null) ? currentEventCount : 0;