fix bug in filtering students (#31)

Administrative Merge Commit
jainsujay02 · Mar 16, 2023 · 7edd8c6 · 7edd8c6
2 parents 7c8f7fc + f84102c
commit 7edd8c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/components/CoursePage.js b/src/components/CoursePage.js
@@ -118,12 +118,13 @@ const CourseForm = () => {
 
     //update database
     const course = id; //"CS 35L – Software Construction Lab";
-    console.log(filterUsers(checkValues.years, checkValues.interests, course));
+    // console.log(filterUsers(checkValues.years, checkValues.interests, course));
 
     const promise = filterUsers(
       checkValues.years,
       checkValues.interests,
-      course
+      course,
+      allStudentsInCourse
     );
     promise.then((value) => {
       setStudents(value);

diff --git a/src/components/utils/firebase.js b/src/components/utils/firebase.js
@@ -291,12 +291,17 @@ export const getUserDataFromName = async (id) => {
 };
 
 const dbRef = collection(db, "ProfileFormData");
-export const filterUsers = async (filterYear, filterInterests, filterCourse) => {
+export const filterUsers = async (filterYear, filterInterests, filterCourse, studentsInCourse) => {
   let iList = [];
   let cList = [];
   let yList = [];
   let retList = [];
-
+  console.log("students in course", studentsInCourse);
+  if (studentsInCourse.length === 0) {
+    console.log("no students in this course, returning early");
+    alert("Cannot filter students in an empty class");
+    return;
+  }
   if (filterCourse.length !== 0) {
     const c = query(dbRef, where("courses", "array-contains", filterCourse) );