linter and Announcement view bug

uwblueprint · Dec 7, 2024 · 252fc1d · 252fc1d
1 parent ca9ac47
commit 252fc1d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/backend/services/implementations/notificationService.ts b/backend/services/implementations/notificationService.ts
@@ -23,18 +23,15 @@ class NotificationService implements INotificationService {
     roomIds: number[],
   ): Promise<NotificationGroupDTO> {
     try {
-      if (roomIds.length == 0) {
-        throw Object.assign(
-          new Error('No rooms specified.'),
-          { code: 400 }
-        );
+      if (roomIds.length === 0) {
+        throw Object.assign(new Error("No rooms specified."), { code: 400 });
       }
-      if (roomIds.length > 1) { 
+      if (roomIds.length > 1) {
         // enforces that a group can only have one member
         // remove in the future if the requirements change
         throw Object.assign(
-          new Error('Notification Group can only have one room.'),
-          { code: 400 }
+          new Error("Notification Group can only have one room."),
+          { code: 400 },
         );
       }
       const residents = await prisma.resident.findMany({
@@ -53,16 +50,18 @@ class NotificationService implements INotificationService {
         },
         include: {
           recipients: true,
-        }
+        },
       });
 
       if (existingGroup && existingGroup.length > 0) {
         // throw error if residents match
         existingGroup.forEach((group) => {
           if (group.recipients.length === residentIds.length) {
             throw Object.assign(
-              new Error('Notification Group already exists with specified roomIds.'),
-              { code: 400 }
+              new Error(
+                "Notification Group already exists with specified roomIds.",
+              ),
+              { code: 400 },
             );
           }
         });
@@ -99,7 +98,9 @@ class NotificationService implements INotificationService {
         },
       });
       if (existingGroup && existingGroup.length > 0) {
-        throw 'Announcement Group already exists.';
+        throw Object.assign(new Error("Announcement Group already exists."), {
+          code: 400,
+        });
       }
 
       const residents = await prisma.resident.findMany({

diff --git a/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx b/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx
@@ -46,6 +46,8 @@ export const formatRooms = (roomIDs: number[]) => {
   const formattedRooms = roomIDs.map((id) => {
     if (id === 0) {
       return "New Announcement";
+    } if (id === -1) {
+      return "All Rooms";
     }
     return `Room ${id}`;
   });