Merge pull request #124 from ReflectionsProjections/dev/riyap/filtering2

Dev/riyap/filtering2
ReflectionsProjections · Aug 17, 2024 · 8011fd4 · 8011fd4
2 parents 0f43670 + 9993b9b
commit 8011fd4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/src/services/registration/registration-router.ts b/src/services/registration/registration-router.ts
@@ -112,19 +112,37 @@ registrationRouter.get("/", RoleChecker([]), async (req, res, next) => {
     }
 });
 
-// Get attendees based on a partial filter in body
 registrationRouter.post(
     "/filter",
-    RoleChecker([Role.Enum.STAFF, Role.Enum.CORPORATE]),
+    RoleChecker([Role.Enum.STAFF, Role.Enum.CORPORATE], true),
     async (req, res, next) => {
         try {
-            const filterData = RegistrationFilterValidator.parse(req.body);
-            const projection = Object.assign({}, ...filterData.projection);
-            const attendees = await Database.REGISTRATION.find(
-                filterData.filter,
-                { ...projection, hasSubmitted: 1 }
+            const { graduations, majors, jobInterests } =
+                RegistrationFilterValidator.parse(req.body);
+
+            const query = {
+                hasSubmitted: true,
+                ...(graduations && { graduation: { $in: graduations } }),
+                ...(majors && { major: { $in: majors } }),
+                ...(jobInterests && {
+                    jobInterest: { $elemMatch: { $in: jobInterests } },
+                }),
+            };
+
+            const projection = {
+                userId: 1,
+                name: 1,
+                major: 1,
+                graduation: 1,
+                jobInterest: 1,
+            };
+
+            const registrants = await Database.REGISTRATION.find(
+                query,
+                projection
             );
-            return res.status(StatusCodes.OK).json(attendees);
+
+            return res.status(StatusCodes.OK).json({ registrants });
         } catch (error) {
             next(error);
         }

diff --git a/src/services/registration/registration-schema.ts b/src/services/registration/registration-schema.ts
@@ -49,14 +49,10 @@ const RegistrationSchema = new mongoose.Schema({
     hasSubmitted: { type: Boolean, default: false },
 });
 
-// Partial schema for attendee filter
-const PartialRegistrationValidator = RegistrationValidator.partial();
-
 const RegistrationFilterValidator = z.object({
-    filter: PartialRegistrationValidator,
-    projection: z.array(
-        z.record(PartialRegistrationValidator.keyof(), z.number().min(1).max(1))
-    ),
+    graduations: z.array(z.string()).optional(),
+    majors: z.array(z.string()).optional(),
+    jobInterests: z.array(z.string()).optional(),
 });
 
 export {