created tests for sending notifications

src/backend/src/utils/homepage-notifications.utils.ts

@@ -24,13 +24,14 @@ export const sendNotificationToUsers = async (userIds: string[], text: string, i
     data: {
       text,
       iconName
-    }
+    },
+    ...getNotificationQueryArgs(organizationId)
   });
 
   const notificationPromises = userIds.map(async (userId) => {
     return sendNotificationToUser(userId, createdNotification.notificationId, organizationId);
   });
 
-  const resolvedNotifications = await Promise.all(notificationPromises);
-  return resolvedNotifications.flat();
+  await Promise.all(notificationPromises);
+  return notificationTransformer(createdNotification);
 };

src/backend/tests/unmocked/notifications.test.ts

@@ -0,0 +1,49 @@
+import { Organization } from '@prisma/client';
+import { createTestOrganization, createTestUser, resetUsers } from '../test-utils';
+import { batmanAppAdmin, wonderwomanGuest } from '../test-data/users.test-data';
+import { NotFoundException } from '../../src/utils/errors.utils';
+import { sendNotificationToUsers } from '../../src/utils/homepage-notifications.utils';
+import prisma from '../../src/prisma/prisma';
+
+describe('Notification Tests', () => {
+  let orgId: string;
+  let organization: Organization;
+  beforeEach(async () => {
+    organization = await createTestOrganization();
+    orgId = organization.organizationId;
+  });
+
+  afterEach(async () => {
+    await resetUsers();
+  });
+
+  describe('Send Notification', () => {
+    it('fails on invalid user id', async () => {
+      await expect(async () => await sendNotificationToUsers(['1'], 'test', 'test', orgId)).rejects.toThrow(
+        new NotFoundException('User', '1')
+      );
+    });
+
+    it('Succeeds and sends notification to user', async () => {
+      const testBatman = await createTestUser(batmanAppAdmin, orgId);
+      const testWonderWoman = await createTestUser(wonderwomanGuest, orgId);
+
+      const notification = await sendNotificationToUsers([testBatman.userId, testWonderWoman.userId], 'test', 'icon', orgId);
+
+      const batmanWithNotifications = await prisma.user.findUnique({
+        where: { userId: testBatman.userId },
+        include: { unreadNotifications: true }
+      });
+      const wonderWomanWithNotifications = await prisma.user.findUnique({
+        where: { userId: testWonderWoman.userId },
+        include: { unreadNotifications: true }
+      });
+
+      expect(batmanWithNotifications?.unreadNotifications).toHaveLength(1);
+      expect(batmanWithNotifications?.unreadNotifications[0]).toStrictEqual(notification);
+
+      expect(wonderWomanWithNotifications?.unreadNotifications).toHaveLength(1);
+      expect(wonderWomanWithNotifications?.unreadNotifications[0]).toStrictEqual(notification);
+    });
+  });
+});

src/backend/tests/unmocked/users.test.ts

@@ -3,7 +3,6 @@ import { createTestOrganization, createTestTask, createTestUser, resetUsers } fr
 import { batmanAppAdmin } from '../test-data/users.test-data';
 import UsersService from '../../src/services/users.services';
 import { NotFoundException } from '../../src/utils/errors.utils';
-import prisma from '../../src/prisma/prisma';
 
 describe('User Tests', () => {
   let orgId: string;
@@ -49,29 +48,4 @@ describe('User Tests', () => {
       expect(userTasks).toStrictEqual([batmanTask, batmanTask]);
     });
   });
-
-  /*
-  describe('Send Notification', () => {
-    it('fails on invalid user id', async () => {
-      await expect(async () => await UsersService.sendNotification('1', 'test', 'test')).rejects.toThrow(
-        new NotFoundException('User', '1')
-      );
-    });
-
-    it('Succeeds and sends notification to user', async () => {
-      const testBatman = await createTestUser(batmanAppAdmin, orgId);
-      await UsersService.sendNotification(testBatman.userId, 'test1', 'test1');
-      await UsersService.sendNotification(testBatman.userId, 'test2', 'test2');
-
-      const batmanWithNotifications = await prisma.user.findUnique({
-        where: { userId: testBatman.userId },
-        include: { unreadNotifications: true }
-      });
-
-      expect(batmanWithNotifications?.unreadNotifications).toHaveLength(2);
-      expect(batmanWithNotifications?.unreadNotifications[0].text).toBe('test1');
-      expect(batmanWithNotifications?.unreadNotifications[1].text).toBe('test2');
-    });
-  });
-  */
 });