[PB-6311]: feat/get correct user limit after purchase

src/App.tsx

@@ -45,8 +45,8 @@ import useBeforeUnload from './hooks/useBeforeUnload';
 import useVpnAuth from './hooks/useVpnAuth';
 
 import workerUrl from 'pdfjs-dist/build/pdf.worker.min.mjs?raw';
-import { eventHandler } from 'services/sockets/event-handler.service';
 import RealtimeService from 'services/sockets/socket.service';
+import { EventHandler } from 'services/sockets/event-handler.service';
 const blob = new Blob([workerUrl], { type: 'application/javascript' });
 pdfjs.GlobalWorkerOptions.workerSrc = URL.createObjectURL(blob);
 
@@ -90,17 +90,6 @@ const App = (props: AppProps): JSX.Element => {
     i18next.changeLanguage();
   }, []);
 
-  useEffect(() => {
-    try {
-      const realtimeService = RealtimeService.getInstance();
-      const cleanup = realtimeService.onEvent(eventHandler.onPlanUpdated);
-
-      return cleanup;
-    } catch (err) {
-      errorService.reportError(err);
-    }
-  }, []);
-
   useEffect(() => {
     if (!isWorkspaceIdParam) {
       navigationService.resetB2BWorkspaceCredentials(dispatch);
@@ -132,8 +121,6 @@ const App = (props: AppProps): JSX.Element => {
 
       await domainManager.fetchDomains();
 
-      RealtimeService.getInstance().init();
-
       dispatch(workspaceThunks.fetchWorkspaces());
       navigationService.setWorkspaceFromParams(workspaceThunks, dispatch, false);
 
@@ -142,6 +129,8 @@ const App = (props: AppProps): JSX.Element => {
           redirectToLogin: !!currentRouteConfig?.auth,
         }),
       );
+
+      RealtimeService.getInstance().init(EventHandler.instance);
     } catch (err: unknown) {
       const error = errorService.castError(err);
       errorService.reportError(error);

src/services/sockets/event-handler.service.test.ts

@@ -5,10 +5,12 @@ import { DriveItemData } from 'app/drive/types';
 import { store } from 'app/store';
 import { planActions, planThunks } from 'app/store/slices/plan';
 import { storageActions } from 'app/store/slices/storage';
+import storageSelectors from 'app/store/slices/storage/storage.selectors';
 
 vi.mock('app/store', () => ({
   store: {
     dispatch: vi.fn(),
+    getState: vi.fn(),
   },
 }));
 
@@ -18,9 +20,6 @@ vi.mock('app/store/slices/plan', () => ({
   },
   planThunks: {
     fetchLimitThunk: vi.fn(() => ({ type: 'plan/fetchLimitThunk' })),
-    fetchUsageThunk: vi.fn(() => ({ type: 'plan/fetchUsageThunk' })),
-    fetchSubscriptionThunk: vi.fn(() => ({ type: 'plan/fetchSubscriptionThunk' })),
-    fetchBusinessLimitUsageThunk: vi.fn(() => ({ type: 'plan/fetchBusinessLimitUsageThunk' })),
   },
 }));
 
@@ -30,6 +29,12 @@ vi.mock('app/store/slices/storage', () => ({
   },
 }));
 
+vi.mock('app/store/slices/storage/storage.selectors', () => ({
+  default: {
+    currentFolderId: vi.fn(),
+  },
+}));
+
 describe('Event Handler', () => {
   let eventHandler: EventHandler;
   let consoleLogSpy: ReturnType<typeof vi.spyOn>;
@@ -52,7 +57,7 @@ describe('Event Handler', () => {
         },
       };
 
-      eventHandler.onPlanUpdated(eventData);
+      eventHandler.handleEvent(eventData);
 
       expect(planActions.updatePlanLimit).toHaveBeenCalledWith(eventData.payload.maxSpaceBytes);
       expect(store.dispatch).toHaveBeenCalledWith({
@@ -72,7 +77,7 @@ describe('Event Handler', () => {
         },
       };
 
-      eventHandler.onPlanUpdated(eventData);
+      eventHandler.handleEvent(eventData);
 
       expect(store.dispatch).toHaveBeenCalledWith(planThunks.fetchLimitThunk());
     });
@@ -110,6 +115,8 @@ describe('Event Handler', () => {
     };
 
     test('When a file is created, then it should push item to storage', () => {
+      vi.mocked(storageSelectors.currentFolderId).mockReturnValue('folder-123');
+
       const eventData: EventData = {
         event: SOCKET_EVENTS.FILE_CREATED,
         email: '[email protected]',
@@ -118,7 +125,7 @@ describe('Event Handler', () => {
         payload: mockFileItem as unknown as DriveItemData,
       };
 
-      eventHandler.onFileCreated(eventData, 'folder-123');
+      eventHandler.handleEvent(eventData);
 
       expect(storageActions.pushItems).toHaveBeenCalledWith({
         updateRecents: true,
@@ -136,6 +143,8 @@ describe('Event Handler', () => {
     });
 
     test('When a file is created but the folder id does not match, then should not push the item', () => {
+      vi.mocked(storageSelectors.currentFolderId).mockReturnValue('different-folder-123');
+
       const eventData: EventData = {
         event: SOCKET_EVENTS.FILE_CREATED,
         email: '[email protected]',
@@ -144,7 +153,7 @@ describe('Event Handler', () => {
         payload: mockFileItem as unknown as DriveItemData,
       };
 
-      eventHandler.onFileCreated(eventData, 'different-folder-123');
+      eventHandler.handleEvent(eventData);
 
       expect(consoleLogSpy).toHaveBeenCalledWith('[Event Handler] Handling created file:', {
         itemFolderId: 'folder-123',

src/services/sockets/event-handler.service.ts

@@ -2,9 +2,23 @@ import { planActions, planThunks } from 'app/store/slices/plan';
 import { EventData, SOCKET_EVENTS } from './types/socket.types';
 import { store } from 'app/store';
 import { storageActions } from 'app/store/slices/storage';
+import storageSelectors from 'app/store/slices/storage/storage.selectors';
 
 export class EventHandler {
-  public onPlanUpdated(data: EventData) {
+  static readonly instance: EventHandler = new EventHandler();
+
+  public handleEvent(data: EventData) {
+    switch (data.event) {
+      case SOCKET_EVENTS.PLAN_UPDATED:
+        this.onPlanUpdated(data);
+        break;
+      case SOCKET_EVENTS.FILE_CREATED:
+        this.onFileCreated(data);
+        break;
+    }
+  }
+
+  private onPlanUpdated(data: EventData) {
     if (data.event !== SOCKET_EVENTS.PLAN_UPDATED) return;
     const newLimit = data.payload?.maxSpaceBytes;
     console.log('[Event Handler] Updating plan limit: ', newLimit);
@@ -16,9 +30,10 @@ export class EventHandler {
     }
   }
 
-  public onFileCreated(data: EventData, currentFolderId: string) {
+  private onFileCreated(data: EventData) {
     if (data.event !== SOCKET_EVENTS.FILE_CREATED) return;
     const item = data.payload;
+    const currentFolderId = storageSelectors.currentFolderId(store.getState());
 
     console.log('[Event Handler] Handling created file:', {
       itemFolderId: item.folderUuid,
@@ -37,5 +52,3 @@ export class EventHandler {
     );
   }
 }
-
-export const eventHandler = new EventHandler();