fix: discussions new messages verify

weni-ai · Dec 23, 2024 · 8a401e4 · 8a401e4
1 parent ca3fa10
commit 8a401e4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/services/api/websocket/listeners/discussion/message/__tests__/create.unit.spec.js b/src/services/api/websocket/listeners/discussion/message/__tests__/create.unit.spec.js
@@ -1,5 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
+import { useDashboard } from '@/store/modules/dashboard';
 import { useDiscussions } from '@/store/modules/chats/discussions';
 import { useDiscussionMessages } from '@/store/modules/chats/discussionMessages';
 
@@ -28,13 +29,19 @@ vi.mock('@/store/modules/chats/discussionMessages', () => ({
   useDiscussionMessages: vi.fn(),
 }));
 
+vi.mock('@/store/modules/dashboard', () => ({
+  useDashboard: vi.fn(),
+}));
+
 describe('Create discussion message service', () => {
   let mockDiscussionStore,
     mockDiscussionMessagesStore,
+    mockDashboardStore,
     mockApp,
     soundNotificationMock;
 
   beforeEach(() => {
+    mockDashboardStore = { viewedAgent: { email: '' } };
     mockDiscussionStore = {
       discussions: [{ uuid: '123', name: 'Test Discussion' }],
       activeDiscussion: { uuid: '123' },
@@ -58,6 +65,7 @@ describe('Create discussion message service', () => {
     soundNotificationMock = new SoundNotification('ping-bing');
     SoundNotification.mockReturnValue(soundNotificationMock);
 
+    useDashboard.mockReturnValue(mockDashboardStore);
     useDiscussions.mockReturnValue(mockDiscussionStore);
     useDiscussionMessages.mockReturnValue(mockDiscussionMessagesStore);
   });

diff --git a/src/services/api/websocket/listeners/discussion/message/create.js b/src/services/api/websocket/listeners/discussion/message/create.js
@@ -5,10 +5,14 @@ import { isValidJson } from '@/utils/messages';
 
 import { useDiscussions } from '@/store/modules/chats/discussions';
 import { useDiscussionMessages } from '@/store/modules/chats/discussionMessages';
+import { useDashboard } from '@/store/modules/dashboard';
 
 export default (message, { app }) => {
   const discussionStore = useDiscussions();
   const discussionMessagesStore = useDiscussionMessages();
+  const dashboardStore = useDashboard();
+
+  const { viewedAgent } = dashboardStore;
   const { discussions, activeDiscussion } = discussionStore;
   const findDiscussion = discussions.find(
     (discussion) => discussion.uuid === message.discussion,
@@ -31,12 +35,11 @@ export default (message, { app }) => {
       });
     }
 
-    const isCurrentDiscussion =
-      app.$route.name === 'discussion' &&
-      app.$route.params.discussionId === message.discussion;
+    const isCurrentDiscussion = activeDiscussion?.uuid === message.discussion;
+
     const isViewModeCurrentDiscussion =
-      app.$route.params.viewedAgent &&
-      activeDiscussion?.uuid === message.discussion;
+      viewedAgent.email && activeDiscussion?.uuid === message.discussion;
+
     const shouldAddDiscussionMessage =
       isCurrentDiscussion || isViewModeCurrentDiscussion;
 
@@ -45,9 +48,11 @@ export default (message, { app }) => {
     }
 
     const isJsonMessage = isValidJson(message.text);
+
     if (shouldAddDiscussionMessage || isJsonMessage) {
       return;
     }
+
     discussionStore.addNewMessagesByDiscussion({
       discussion: message.discussion,
       message: {