fix: single cache instance

renn71 · Dec 7, 2022 · a2eb759 · a2eb759
1 parent efcd2e1
commit a2eb759
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/apps/api/e2e/setup.ts b/apps/api/e2e/setup.ts
@@ -2,14 +2,18 @@ import { DalService } from '@novu/dal';
 import { testServer } from '@novu/testing';
 import * as sinon from 'sinon';
 import { bootstrap } from '../src/bootstrap';
-import { CacheService, ICacheService } from '@novu/dal';
+import { CacheService } from '@novu/dal';
 
 const dalService = new DalService();
 
+export const testCacheService = new CacheService({
+  cachePort: process.env.REDIS_CACHE_PORT,
+  cacheHost: process.env.REDIS_CACHE_HOST,
+});
+
 before(async () => {
   await testServer.create(await bootstrap());
   await dalService.connect(process.env.MONGO_URL);
-  testCacheService().connect();
 });
 
 after(async () => {
@@ -26,16 +30,3 @@ after(async () => {
 afterEach(() => {
   sinon.restore();
 });
-
-export function testCacheService() {
-  let cacheService: ICacheService;
-
-  function connect() {
-    cacheService = new CacheService({
-      cachePort: process.env.REDIS_CACHE_PORT,
-      cacheHost: process.env.REDIS_CACHE_HOST,
-    });
-  }
-
-  return { connect, cacheService };
-}
diff --git a/apps/api/src/app/change/e2e/promote-changes.e2e.ts b/apps/api/src/app/change/e2e/promote-changes.e2e.ts
@@ -17,7 +17,7 @@ import { testCacheService } from '../../../../e2e/setup';
 
 describe('Promote changes', () => {
   let session: UserSession;
-  const cacheService = testCacheService().cacheService;
+  const cacheService = testCacheService;
   const changeRepository: ChangeRepository = new ChangeRepository();
   const notificationTemplateRepository = new NotificationTemplateRepository(cacheService);
   const messageTemplateRepository: MessageTemplateRepository = new MessageTemplateRepository();

diff --git a/apps/api/src/app/events/e2e/process-subscriber.e2e.ts b/apps/api/src/app/events/e2e/process-subscriber.e2e.ts
@@ -21,7 +21,7 @@ describe('Trigger event - process subscriber /v1/events/trigger (POST)', functio
   let subscriber: SubscriberEntity;
   let subscriberService: SubscribersService;
 
-  const cacheService = testCacheService().cacheService;
+  const cacheService = testCacheService;
   const subscriberRepository = new SubscriberRepository(cacheService);
   const messageRepository = new MessageRepository(cacheService);
   const notificationTemplateRepository = new NotificationTemplateRepository(cacheService);

diff --git a/apps/api/src/app/events/e2e/trigger-event.e2e.ts b/apps/api/src/app/events/e2e/trigger-event.e2e.ts
@@ -21,7 +21,7 @@ import { testCacheService } from '../../../../e2e/setup';
 const axiosInstance = axios.create();
 
 describe('Trigger event - /v1/events/trigger (POST)', function () {
-  const cacheService = testCacheService().cacheService;
+  const cacheService = testCacheService;
   let session: UserSession;
   let template: NotificationTemplateEntity;
   let subscriber: SubscriberEntity;