- avoids grouping notifications with wrong categories

- fixes for missing sourceTypes in statistics controller
game-node-app · Dec 6, 2024 · 413a21c · 413a21c
1 parent aca51ee
commit 413a21c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/notifications/notifications.service.ts b/src/notifications/notifications.service.ts
@@ -113,14 +113,20 @@ export class NotificationsService {
                         comparedNotification.category,
                     );
 
-                    const comparableProperties: (keyof Notification)[] = [
+                    const comparableSourceIds: (keyof Notification)[] = [
                         "reviewId",
                         "activityId",
                         "reviewCommentId",
                         "activityCommentId",
                     ];
 
-                    const isSameSource = comparableProperties.some(
+                    const hasSameCategory =
+                        notification.category === comparedNotification.category;
+                    const hasSameSourceType =
+                        notification.sourceType ===
+                        comparedNotification.sourceType;
+
+                    const hasSameSourceId = comparableSourceIds.some(
                         (property) => {
                             return (
                                 comparedNotification[property] != undefined &&
@@ -131,7 +137,11 @@ export class NotificationsService {
                     );
 
                     const isSimilar =
-                        !isAlreadyProcessed && hasValidCategory && isSameSource;
+                        !isAlreadyProcessed &&
+                        hasValidCategory &&
+                        hasSameCategory &&
+                        hasSameSourceType &&
+                        hasSameSourceId;
 
                     if (isSimilar) {
                         processedEntities.set(

diff --git a/src/statistics/statistics-queue/statistics-queue.processor.ts b/src/statistics/statistics-queue/statistics-queue.processor.ts
@@ -16,7 +16,7 @@ import { StatisticsService } from "../statistics.types";
 import { CommentStatisticsService } from "../comment-statistics.service";
 
 @Processor(STATISTICS_QUEUE_NAME, {
-    concurrency: 300,
+    concurrency: 5,
 })
 export class StatisticsQueueProcessor extends WorkerHostProcessor {
     logger = new Logger(StatisticsQueueProcessor.name);

diff --git a/src/statistics/statistics.controller.ts b/src/statistics/statistics.controller.ts
@@ -61,10 +61,15 @@ export class StatisticsController {
                 return this.activityStatisticsService.findOne(
                     dto.sourceId as string,
                 );
+            case StatisticsSourceType.ACTIVITY_COMMENT:
+                return this.commentStatisticsService.findOne(
+                    dto.sourceId as string,
+                    StatisticsSourceType.ACTIVITY_COMMENT,
+                );
             case StatisticsSourceType.REVIEW_COMMENT:
                 return this.commentStatisticsService.findOne(
                     dto.sourceId as string,
-                    dto.sourceType,
+                    StatisticsSourceType.REVIEW_COMMENT,
                 );
             default:
                 throw new HttpException(
@@ -149,6 +154,11 @@ export class StatisticsController {
                     dto.statisticsId,
                     session?.getUserId(),
                 );
+            case StatisticsSourceType.ACTIVITY_COMMENT:
+                return this.commentStatisticsService.getStatus(
+                    dto.statisticsId,
+                    session?.getUserId(),
+                );
             case StatisticsSourceType.REVIEW_COMMENT:
                 return this.commentStatisticsService.getStatus(
                     dto.statisticsId,