notification api changes

backend/graphql/resolvers/notificationResolvers.ts

@@ -2,6 +2,7 @@ import NotificationService from "../../services/implementations/notificationServ
 import INotificationService, {
   NotificationDTO,
   NotificationReceivedDTO,
+  UpdateNotificationDTO,
 } from "../../services/interfaces/notificationService";
 import IResidentService from "../../services/interfaces/residentService";
 import ResidentService from "../../services/implementations/residentService";
@@ -13,11 +14,11 @@ const notificationService: INotificationService = new NotificationService(
 
 const notificationResolvers = {
   Query: {
-    getNotificationsByUserId: async (
+    getNotificationsByRoomIds: async (
       _parent: undefined,
-      { userId }: { userId: string },
+      { roomIds }: { roomIds: string[] },
     ): Promise<NotificationReceivedDTO[]> => {
-      return notificationService.getNotificationsByUserId(Number(userId));
+      return notificationService.getNotificationsByRoomIds(roomIds.map(Number));
     },
     getNotificationById: async (
       _parent: undefined,
@@ -33,15 +34,15 @@ const notificationResolvers = {
         authorId,
         title,
         message,
-        recipientIds,
+        roomIds,
       }: {
         authorId: number;
         title: string;
         message: string;
-        recipientIds: number[];
+        roomIds: number[];
       },
     ): Promise<NotificationDTO> => {
-      const ids = recipientIds.map((id) => Number(id));
+      const ids = roomIds.map((id) => Number(id));
       const newNotification = await notificationService.sendNotification(
         Number(authorId),
         title,
@@ -68,6 +69,19 @@ const notificationResolvers = {
       );
       return updatedNotification;
     },
+    updateNotification: async (
+      _parent: undefined,
+      {
+        notificationId,
+        notification,
+      }: { notificationId: number; notification: UpdateNotificationDTO },
+    ): Promise<NotificationDTO> => {
+      const updatedNotification = await notificationService.updateNotificationById(
+        Number(notificationId),
+        notification,
+      );
+      return updatedNotification;
+    },
     sendAnnouncement: async (
       _parent: undefined,
       {

backend/graphql/types/notificationType.ts

@@ -17,8 +17,15 @@ const notificationType = gql`
     seen: Boolean!
   }
 
+  input UpdateNotificationDTO {
+    authorId: ID
+    title: String
+    message: String
+    createdAt: DateTime
+  }
+
   extend type Query {
-    getNotificationsByUserId(userId: ID!): [NotificationReceivedDTO!]
+    getNotificationsByRoomIds(roomIds: [Int!]): [NotificationReceivedDTO!]
     getNotificationById(id: ID!): NotificationReceivedDTO!
   }
 
@@ -27,10 +34,14 @@ const notificationType = gql`
       authorId: ID!
       title: String!
       message: String!
-      recipientIds: [ID!]
+      roomIds: [Int!]
     ): NotificationDTO!
     deleteUserNotification(notificationId: ID!): NotificationDTO!
     updateSeenNotification(notificationId: ID!): NotificationReceivedDTO!
+    updateNotification(
+      notificationId: ID!
+      notification: UpdateNotificationDTO!
+    ): NotificationDTO!
     sendAnnouncement(
       title: String
       message: String

backend/services/implementations/notificationService.ts

@@ -2,6 +2,7 @@ import prisma from "../../prisma";
 import INotificationService, {
   NotificationDTO,
   NotificationReceivedDTO,
+  UpdateNotificationDTO,
 } from "../interfaces/notificationService";
 import IResidentService from "../interfaces/residentService";
 import logger from "../../utilities/logger";
@@ -16,20 +17,20 @@ class NotificationService implements INotificationService {
     this.residentService = residentService;
   }
 
-  async getNotificationsByUserId(
-    id: number,
+  async getNotificationsByRoomIds(
+    roomIds: number[],
   ): Promise<NotificationReceivedDTO[]> {
     try {
-      const user = await prisma.user.findUnique({
-        where: {
-          id,
-        },
-        include: {
-          notificationsReceived: true,
-        },
+      const residents = await prisma.resident.findMany({
+        where: { roomNumber: { in: roomIds } },
       });
-      if (!user) throw new Error(`No User found.`);
-      return user.notificationsReceived;
+      const residentIds = residents.map((resident) => resident.userId);
+
+      const notificationReceived = await prisma.notificationReceived.findMany({
+        where: { recipientId: { in: residentIds } },
+      });
+      if (!notificationReceived) throw new Error(`No User found.`);
+      return notificationReceived;
     } catch (error) {
       Logger.error(
         `Failed to get Notification. Reason = ${getErrorMessage(error)}`,
@@ -60,9 +61,14 @@ class NotificationService implements INotificationService {
     authorId: number,
     title: string,
     message: string,
-    recipientIds: number[],
+    roomIds: number[],
   ): Promise<NotificationDTO> {
     try {
+      const residents = await prisma.resident.findMany({
+        where: { roomNumber: { in: roomIds } },
+      });
+      const residentIds = residents.map((resident) => resident.userId);
+
       const newNotification = await prisma.notification.create({
         data: {
           title,
@@ -71,10 +77,10 @@ class NotificationService implements INotificationService {
             connect: { id: authorId },
           },
           recipients: {
-            create: recipientIds.map((recipient) => ({
+            create: residentIds.map((resident) => ({
               recipient: {
                 connect: {
-                  id: recipient,
+                  id: resident,
                 },
               },
             })),
@@ -148,6 +154,35 @@ class NotificationService implements INotificationService {
     }
   }
 
+  async updateNotificationById(
+    notificationId: number,
+    notification: UpdateNotificationDTO,
+  ): Promise<NotificationDTO> {
+    try {
+      const updatedNotification = await prisma.notification.update({
+        where: {
+          id: notificationId,
+        },
+        data: {
+          ...notification,
+        },
+        include: {
+          recipients: true,
+        },
+      });
+
+      if (!updatedNotification)
+        throw new Error(`notification id ${notificationId} not found`);
+
+      return updatedNotification;
+    } catch (error) {
+      Logger.error(
+        `Failed to set seen flag. Reason = ${getErrorMessage(error)}`,
+      );
+      throw error;
+    }
+  }
+
   async sendAnnouncement(
     title: string,
     message: string,

backend/services/interfaces/notificationService.ts

@@ -7,6 +7,13 @@ export interface NotificationDTO {
   recipients: NotificationReceivedDTO[];
 }
 
+export interface UpdateNotificationDTO {
+  authorId?: number;
+  title?: string;
+  message?: string;
+  createdAt?: Date;
+}
+
 export interface NotificationReceivedDTO {
   id: number;
   notificationId: number;
@@ -21,7 +28,9 @@ interface INotificationService {
    * @returns a NotificationDTO[] associated with that users notifications
    * @throws Error if retrieval fails
    */
-  getNotificationsByUserId(id: number): Promise<NotificationReceivedDTO[]>;
+  getNotificationsByRoomIds(
+    roomIds: number[],
+  ): Promise<NotificationReceivedDTO[]>;
 
   /**
    * Get a notification by a defined id
@@ -36,15 +45,15 @@ interface INotificationService {
    * @param authorId user id of author of notification
    * @param title title of notification
    * @param message message of notification
-   * @param recipientIds user ids of recipients of notification
+   * @param roomIds room ids of recipients of notification
    * @returns a NotificationDTO associated with the posted notifications
    * @throws Error if creation fails
    */
   sendNotification(
     authorId: number,
     title: string,
     message: string,
-    recipientIds: number[],
+    roomIds: number[],
   ): Promise<NotificationDTO>;
 
   /**
@@ -58,7 +67,6 @@ interface INotificationService {
 
   /**
    * Update a user notification to be seen
-   * @param userId user id
    * @param notificationId notification id
    * @returns a NotificationDTO associated with the now seen Notification
    * @throws Error if retrieval fails
@@ -67,6 +75,17 @@ interface INotificationService {
     notificationId: number,
   ): Promise<NotificationReceivedDTO>;
 
+  /**
+   * Update a user notification to be seen
+   * @param notificationId notification id
+   * @returns a NotificationDTO associated with the updated Notification
+   * @throws Error if retrieval fails
+   */
+  updateNotificationById(
+    notificationId: number,
+    notification: UpdateNotificationDTO,
+  ): Promise<NotificationDTO>;
+
   /**
    * Post an announcement notification to all active residents
    * @param title title of announcement

frontend/src/APIClients/Mutations/NotificationMutations.ts

@@ -5,13 +5,13 @@ export const SEND_NOTIFICATION = gql`
     $authorId: ID!
     $title: String!
     $message: String!
-    $recipientIds: [ID!]
+    $roomIds: [Int!]
   ) {
     sendNotification(
       authorId: $authorId
       title: $title
       message: $message
-      recipientIds: $recipientIds
+      roomIds: $roomIds
     ) {
       id
       authorId
@@ -45,6 +45,24 @@ export const UPDATE_SEEN_NOTIFICATION = gql`
   }
 `;
 
+export const UPDATE_NOTIFICATION = gql`
+  mutation UpdateNotification(
+    $notificationId: ID!
+    $notification: UpdateNotificationDTO
+  ) {
+    updateNotification(
+      notificationId: $notificationId
+      notification: $notification
+    ) {
+      id
+      authorId
+      title
+      message
+      createdAt
+    }
+  }
+`;
+
 export const SEND_ANNOUNCEMENT = gql`
   mutation SendAnnouncement($title: String, $message: String, $userId: ID) {
     sendAnnouncement(title: $title, message: $message, userId: $userId) {

frontend/src/APIClients/Queries/NotificationQueries.ts

@@ -1,8 +1,8 @@
 import { gql } from "@apollo/client";
 
-export const GET_NOTIFICATIONS_BY_USER_ID = gql`
-  query GetNotificationsByUserId($userId: ID!) {
-    getNotificationsByUserId(userId: $userId) {
+export const GET_NOTIFICATIONS_BY_ROOM_IDS = gql`
+  query GetNotificationsByRoomIds($roomIds: [Int!]) {
+    getNotificationsByRoomIds(roomIds: $roomIds) {
       id
       notificationId
       recipientId