Count only active term notifications for limit (#245)

sandboxnu · Nov 19, 2024 · e05fc90 · e05fc90
1 parent a5d14a0
commit e05fc90
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/services/notificationsManager.ts b/services/notificationsManager.ts
@@ -15,10 +15,36 @@ class NotificationsManager {
   async getUserSubscriptions(phoneNumber: string): Promise<UserInfo> {
     const userId = (await prisma.user.findFirst({ where: { phoneNumber } })).id;
     const followedSections = await prisma.followedSection.findMany({
-      where: { userId },
+      where: {
+        userId,
+        section: {
+          course: {
+            termId: {
+              in: (
+                await prisma.termInfo.findMany({
+                  where: { active: true },
+                  select: { termId: true },
+                })
+              ).map((term) => term.termId),
+            },
+          },
+        },
+      },
     });
     const followedCourses = await prisma.followedCourse.findMany({
-      where: { userId },
+      where: {
+        userId,
+        course: {
+          termId: {
+            in: (
+              await prisma.termInfo.findMany({
+                where: { active: true },
+                select: { termId: true },
+              })
+            ).map((term) => term.termId),
+          },
+        },
+      },
     });
 
     return {

diff --git a/tests/database/notificationsManager.test.seq.ts b/tests/database/notificationsManager.test.seq.ts
@@ -53,8 +53,8 @@ describe("user subscriptions", () => {
     await notifs.putUserSubscriptions(phoneNumber, sectionIds, courseIds);
     expect(await notifs.getUserSubscriptions(phoneNumber)).toEqual({
       phoneNumber,
-      sectionIds,
-      courseIds,
+      sectionIds: [],
+      courseIds: [],
     });
   });
 
@@ -82,8 +82,8 @@ describe("user subscriptions", () => {
 
     expect(await notifs.getUserSubscriptions(phoneNumber)).toEqual({
       phoneNumber,
-      sectionIds,
-      courseIds,
+      sectionIds: [],
+      courseIds: [],
     });
   });
 
@@ -97,7 +97,7 @@ describe("user subscriptions", () => {
     expect(await notifs.getUserSubscriptions(phoneNumber)).toEqual({
       phoneNumber,
       sectionIds: [],
-      courseIds,
+      courseIds: [],
     });
 
     await notifs.deleteAllUserSubscriptions(phoneNumber);