Merge pull request #160 from cuappdev/Kai/mark-notification-read

Kai/mark notification read

Author: ashleynhs

src/api/controllers/NotifController.ts

@@ -17,56 +17,54 @@ import { UserModel } from "../../models/UserModel";
 
 @JsonController("notif/")
 export class NotifController {
-  private notifService: NotifService;
+    private notifService: NotifService;
 
-  constructor(notifService: NotifService) {
-    this.notifService = notifService;
-  }
+    constructor(notifService: NotifService) {
+      this.notifService = notifService;
+    }
 
-  @Get("recent")
-  async getRecentNotifications(@CurrentUser() user: UserModel) {
-    return this.notifService.getRecentNotifications(user.firebaseUid);
-  }
+    @Get('recent')
+    async getRecentNotifications(@CurrentUser() user: UserModel) {
+      return this.notifService.getRecentNotifications(user.firebaseUid);
+    }
 
-  @Get("new")
-  async getUnread(@CurrentUser() user: UserModel) {
-    return this.notifService.getUnreadNotifications(user.firebaseUid);
-  }
+    @Get('new')
+    async getUnread(@CurrentUser() user: UserModel) {
+      return this.notifService.getUnreadNotifications(user.firebaseUid);
+    }
 
-  @Get("last7days")
-  getLast7Days(@CurrentUser() user: UserModel) {
-    return this.notifService.getNotificationsLast7Days(user.firebaseUid);
-  }
+    @Get('last7days')
+    getLast7Days(@CurrentUser() user: UserModel) {
+      return this.notifService.getNotificationsLast7Days(user.firebaseUid);
+    }
 
-  @Get("last30days")
-  getLast30Days(@CurrentUser() user: UserModel) {
-    return this.notifService.getNotificationsLast30Days(user.firebaseUid);
-  }
+    @Get('last30days')
+    getLast30Days(@CurrentUser() user: UserModel) {
+      return this.notifService.getNotificationsLast30Days(user.firebaseUid);
+    }
 
-  @Post()
-  async sendNotif(@Body() findTokensRequest: FindTokensRequest) {
-    return this.notifService.sendNotifs(findTokensRequest);
-  }
+    @Post()
+    async sendNotif(@Body() findTokensRequest: FindTokensRequest) {
+      return this.notifService.sendNotifs(findTokensRequest);
+    }
 
-  @Post("discount")
-  async sendDiscountNotif(
-    @Body() discountRequest: DiscountNotificationRequest,
-  ) {
-    return this.notifService.sendDiscountNotification(discountRequest);
-  }
+    @Post('discount')
+    async sendDiscountNotif(@Body() discountRequest: DiscountNotificationRequest) {
+        return this.notifService.sendDiscountNotification(discountRequest);
+    }
 
-  @Post("request-match")
-  async sendRequestMatchNotif(
-    @Body() matchRequest: RequestMatchNotificationRequest,
-  ) {
-    return this.notifService.sendRequestMatchNotification(matchRequest);
-  }
+    @Post('request-match')
+    async sendRequestMatchNotif(@Body() matchRequest: RequestMatchNotificationRequest) {
+        return this.notifService.sendRequestMatchNotification(matchRequest);
+    }
 
-  @Delete("id/:id")
-  async deleteNotification(
-    @CurrentUser() user: UserModel,
-    @Params() params: { id: string },
-  ) {
-    return this.notifService.deleteNotification(user.firebaseUid, params.id);
-  }
+    @Post('markAsRead/id/:id')
+    async markAsRead(@CurrentUser() user: UserModel, @Params() params: { id: string }) {
+        return this.notifService.markAsRead(user.firebaseUid, params.id);
+    }
+
+    @Delete('id/:id')
+    async deleteNotification(@CurrentUser() user: UserModel, @Params() params: { id: string }) {
+        return this.notifService.deleteNotification(user.firebaseUid, params.id);
+    }
 }

src/services/NotifService.ts

@@ -291,19 +291,31 @@ export class NotifService {
     });
   }
 
-  async deleteNotification(userId: string, notifId: string) {
-    return this.transactions.readWrite(async (transactionalEntityManager) => {
-      const notifRepository = Repositories.notification(
-        transactionalEntityManager,
-      );
-      const notif = await notifRepository.findOne({ where: { id: notifId } });
-      if (!notif) {
-        throw new NotFoundError("Notification not found");
-      }
-      if (notif.userId !== userId) {
-        throw new NotFoundError("Notification not found");
-      }
-      return await notifRepository.deleteNotification(notif);
-    });
-  }
+    async markAsRead(userId: string, notifId: string) {
+        return this.transactions.readWrite(async (transactionalEntityManager) => {
+            const notifRepository = Repositories.notification(transactionalEntityManager);
+            const notif = await notifRepository.findOne({ where: { id: notifId } });
+            if (!notif) {
+                throw new NotFoundError("Notification not found");
+            }
+            if (notif.userId !== userId) {
+                throw new NotFoundError("Notification not found");
+            }
+            return await notifRepository.markAsRead(notifId);
+        });
+    }
+
+    async deleteNotification(userId: string, notifId: string) {
+        return this.transactions.readWrite(async (transactionalEntityManager) => {
+            const notifRepository = Repositories.notification(transactionalEntityManager);
+            const notif = await notifRepository.findOne({ where: { id: notifId } });
+            if (!notif) {
+                throw new NotFoundError("Notification not found");
+            }
+            if (notif.userId !== userId) {
+                throw new NotFoundError("Notification not found");
+            }
+            return await notifRepository.deleteNotification(notif);
+        });
+    }
 }

swagger.json

@@ -1474,6 +1474,38 @@
         }
       }
     },
+    "/notif/markAsRead/id/{id}": {
+      "post": {
+        "summary": "Mark notification as read",
+        "tags": ["Notification"],
+        "security": [{ "bearerAuth": [] }],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "description": "Notification ID"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Notification marked as read successfully",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/Notification" }
+              }
+            }
+          },
+          "404": {
+            "description": "Notification not found"
+          }
+        }
+      }
+    },
     "/request": {
       "get": {
         "tags": ["Request"],