fix event emitter triggering event multiple times

radekm2000 · Jun 5, 2024 · 71eb17b · 71eb17b
1 parent 8f6f93e
commit 71eb17b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 39 deletions.
diff --git a/server/ecommerce/src/discord-bot/discord-bot.module.ts b/server/ecommerce/src/discord-bot/discord-bot.module.ts
@@ -29,15 +29,6 @@ import { DiscordGuildService } from 'src/discord-guild/discord-guild.service';
     FollowersService,
     ItemNotifierService,
     DiscordNotificationsService,
-    {
-      provide: DiscordGuildService,
-      useFactory: (botService: DiscordBotService, usersService: UsersService) =>
-        new DiscordGuildService({
-          botClient: botService.bot,
-          usersService: usersService,
-        }),
-      inject: [DiscordBotService, UsersService],
-    },
   ],
 
   imports: [

diff --git a/server/ecommerce/src/discord-guild/discord-guild.module.ts b/server/ecommerce/src/discord-guild/discord-guild.module.ts
@@ -38,15 +38,7 @@ import { DiscordNotificationsService } from 'src/discord-notifications/discord-n
       provide: IProductsService,
       useClass: ProductsService,
     },
-    {
-      provide: DiscordGuildService,
-      useFactory: (botService: DiscordBotService, usersService: UsersService) =>
-        new DiscordGuildService({
-          botClient: botService.bot,
-          usersService: usersService,
-        }),
-      inject: [DiscordBotService, UsersService],
-    },
+    DiscordGuildService,
     DiscordBotService,
 
     FollowersService,

diff --git a/server/ecommerce/src/discord-guild/discord-guild.service.ts b/server/ecommerce/src/discord-guild/discord-guild.service.ts
@@ -1,7 +1,13 @@
-import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
+import {
+  Inject,
+  Injectable,
+  Logger,
+  OnApplicationBootstrap,
+} from '@nestjs/common';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
 import { Client, EmbedBuilder, MessageCreateOptions } from 'discord.js';
 import 'dotenv/config';
+import { DiscordBotService } from 'src/discord-bot/discord-bot.service';
 import { DiscordEvents } from 'src/events/constants/events';
 import { UsersService } from 'src/users/users.service';
 
@@ -10,21 +16,17 @@ export type AssignDiscordRoleEvent = {
   discordRoleId: string;
 };
 
-type Config = {
-  botClient: Client;
-  usersService: UsersService;
-};
-
 @Injectable()
 export class DiscordGuildService {
   private readonly botClient: Client;
   private readonly guildId: string;
   private readonly logger: Logger;
-  private readonly usersService: UsersService;
 
-  constructor(config: Config) {
-    this.usersService = config.usersService;
-    this.botClient = config.botClient;
+  constructor(
+    @Inject(UsersService) private usersService: UsersService,
+    @Inject(DiscordBotService) private discordBotService: DiscordBotService,
+  ) {
+    this.botClient = this.discordBotService.bot;
     this.logger = new Logger(DiscordGuildService.name);
     this.guildId = process.env.GUILD_ID ?? '';
   }

diff --git a/server/ecommerce/src/product-notification/product-notification.module.ts b/server/ecommerce/src/product-notification/product-notification.module.ts
@@ -40,16 +40,8 @@ import { FollowersService } from 'src/followers/followers.service';
     { provide: IProductsService, useClass: ProductsService },
     ItemNotifierService,
     DiscordNotificationsService,
-    {
-      provide: DiscordGuildService,
-      useFactory: (botService: DiscordBotService, usersService: UsersService) =>
-        new DiscordGuildService({
-          botClient: botService.bot,
-          usersService: usersService,
-        }),
-      inject: [DiscordBotService, UsersService],
-    },
     DiscordBotService,
+
     FollowersService,
   ],
   exports: [ProductNotificationService],

diff --git a/server/ecommerce/src/tests/reviews/reviews.spec.ts b/server/ecommerce/src/tests/reviews/reviews.spec.ts
@@ -22,6 +22,7 @@ describe('reviews service ADD REVIEW', () => {
       reviewRepositoryMock,
       usersServiceMock,
       {} as any,
+      {} as any,
     );
 
     await expect(
@@ -66,14 +67,19 @@ describe('reviews service ADD REVIEW', () => {
       save: jest.fn().mockResolvedValue(review),
     };
 
+    const eventEmitter = {
+      emit: jest.fn().mockResolvedValue(true),
+    };
+
     const reviewService = new ReviewsService(
       reviewRepositoryMock,
       usersServiceMock,
+      eventEmitter as any,
       {} as any,
     );
 
     expect(
       await reviewService.addReview(reviewDto, reviewRecipient.id),
-    ).toEqual(review);
+    ).toEqual(true);
   });
 });
diff --git a/server/ecommerce/src/users/users.service.ts b/server/ecommerce/src/users/users.service.ts
@@ -5,7 +5,7 @@ import {
   S3Client,
 } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { randomUUID } from 'crypto';
 import { Profile } from 'passport-google-oauth20';