fixed test cases getting failed

Author: Bhupesh-mfsi

packages/backend/package.json

@@ -23,7 +23,7 @@
   "scripts": {
     "docker:up": "docker-compose up -d",
     "start": "node  ./dist/index.js",
-    "test": "jest --coverage --runInBand --transformIgnorePatterns 'node_modules/(?!(dm3-lib-\\w*)/)'",
+    "test": "npm run docker:up && jest --coverage --runInBand --transformIgnorePatterns 'node_modules/(?!(dm3-lib-\\w*)/)'",
     "build": "yarn tsc && cp ./config.yml ./dist/config.yml | true",
     "createDeliveryServiceProfile": "node --no-warnings ./cli.js"
   },

packages/backend/src/notifications.test.ts

@@ -278,6 +278,22 @@ describe('Notifications', () => {
                             },
                         },
                     ]),
+                getDeliveryServiceProperties: () => {
+                    return {
+                        notificationChannel: [
+                            {
+                                type: NotificationChannelType.EMAIL,
+                                config: {
+                                    smtpHost: 'smtp.gmail.com',
+                                    smtpPort: 587,
+                                    smtpEmail: '[email protected]',
+                                    smtpUsername: '[email protected]',
+                                    smtpPassword: 'abcd1234',
+                                },
+                            },
+                        ],
+                    };
+                },
                 addNewNotificationChannel: addNewNotificationChannelMock,
                 addUsersNotificationChannel: addUsersNotificationChannelMock,
                 setOtp: setOtpMock,

packages/lib/delivery/src/Messages.test.ts

@@ -7,8 +7,10 @@ import { stringify } from '../../shared/src/stringify';
 import { getConversationId, getMessages, incomingMessage } from './Messages';
 import { Session } from './Session';
 import { SpamFilterRules } from './spam-filter/SpamFilterRules';
-import { NotificationChannelType } from './notifications/types';
-import { getDeliveryServiceProperties } from '../../../backend/src/config/getDeliveryServiceProperties';
+import {
+    NotificationChannel,
+    NotificationChannelType,
+} from './notifications/types';
 
 const SENDER_NAME = 'alice.eth';
 const RECEIVER_NAME = 'bob.eth';
@@ -458,6 +460,19 @@ describe('Messages', () => {
                 ]);
             };
 
+            const dsNotificationChannels: NotificationChannel[] = [
+                {
+                    type: NotificationChannelType.EMAIL,
+                    config: {
+                        smtpHost: 'smtp.gmail.com',
+                        smtpPort: 587,
+                        smtpEmail: '[email protected]',
+                        smtpUsername: '[email protected]',
+                        smtpPassword: 'abcd1234',
+                    },
+                },
+            ];
+
             await incomingMessage(
                 {
                     envelop: {
@@ -477,7 +492,7 @@ describe('Messages', () => {
                 keysA.signingKeyPair,
                 keysA.encryptionKeyPair,
                 2 ** 14,
-                getDeliveryServiceProperties().notificationChannel,
+                dsNotificationChannels,
                 getSession,
                 storeNewMessage,
                 sendMessageViaSocketMock,

packages/lib/delivery/src/Notification.test.ts

@@ -1,6 +1,5 @@
 import { NotificationChannel, NotificationChannelType } from './notifications';
 import { addNewNotificationChannel } from './Notification';
-import { getDeliveryServiceProperties } from '../../../backend/src/config/getDeliveryServiceProperties';
 const nodemailer = require('nodemailer');
 
 jest.mock('nodemailer');
@@ -28,8 +27,18 @@ describe('Notification', () => {
                 ]);
             const setOtp = jest.fn();
 
-            const notificationChannels: NotificationChannel[] =
-                getDeliveryServiceProperties().notificationChannel;
+            const notificationChannels: NotificationChannel[] = [
+                {
+                    type: NotificationChannelType.EMAIL,
+                    config: {
+                        smtpHost: 'smtp.gmail.com',
+                        smtpPort: 587,
+                        smtpEmail: '[email protected]',
+                        smtpUsername: '[email protected]',
+                        smtpPassword: 'abcd1234',
+                    },
+                },
+            ];
 
             const db = {
                 getUsersNotificationChannels,

packages/lib/delivery/src/notifications/Notifications.test.ts

@@ -1,17 +1,30 @@
 import { DeliveryInformation } from '@dm3-org/dm3-lib-messaging';
-import { NotificationChannelType, NotificationType } from './types';
+import {
+    NotificationChannel,
+    NotificationChannelType,
+    NotificationType,
+} from './types';
 import {
     NotificationBroker,
     _setupNotficationBroker,
 } from './broker/NotificationBroker';
-import { getDeliveryServiceProperties } from '../../../../backend/src/config/getDeliveryServiceProperties';
 
 jest.mock('nodemailer');
 
 describe('Notifications', () => {
     it('Send Email notification to verify OTP', async () => {
-        const dsNotificationChannels =
-            getDeliveryServiceProperties().notificationChannel;
+        const dsNotificationChannels: NotificationChannel[] = [
+            {
+                type: NotificationChannelType.EMAIL,
+                config: {
+                    smtpHost: 'smtp.gmail.com',
+                    smtpPort: 587,
+                    smtpEmail: '[email protected]',
+                    smtpUsername: '[email protected]',
+                    smtpPassword: 'abcd1234',
+                },
+            },
+        ];
 
         const channel1 = {
             type: NotificationChannelType.EMAIL,
@@ -56,8 +69,18 @@ describe('Notifications', () => {
     });
 
     it('Should not send email when notification channel is not verified', async () => {
-        const dsNotificationChannels =
-            getDeliveryServiceProperties().notificationChannel;
+        const dsNotificationChannels: NotificationChannel[] = [
+            {
+                type: NotificationChannelType.EMAIL,
+                config: {
+                    smtpHost: 'smtp.gmail.com',
+                    smtpPort: 587,
+                    smtpEmail: '[email protected]',
+                    smtpUsername: '[email protected]',
+                    smtpPassword: 'abcd1234',
+                },
+            },
+        ];
 
         const channel1 = {
             type: NotificationChannelType.EMAIL,