try and fix search

cornell-dti · Nov 26, 2023 · 1deccaa · 1deccaa
1 parent 8fd6cdf
commit 1deccaa
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 38 deletions.
diff --git a/client/src/modules/Results/Components/Results.jsx b/client/src/modules/Results/Components/Results.jsx
@@ -71,21 +71,29 @@ export class Results extends Component {
       axios
         .post(`/v2/getClassesByQuery`, { query: userQuery })
         .then((response) => {
-          const queryCourseList = response.data.result
-          if (queryCourseList.length !== 0) {
-            // Save the Class object that matches the request
-            this.setState({
-              courseList: queryCourseList,
-              loading: false,
-            })
-          } else {
-            this.setState({
-              courseList: [],
-              loading: false,
-            })
+          if (response.status === 200) {
+            const queryCourseList = response.data.result
+            if (queryCourseList.length !== 0) {
+              // Save the Class object that matches the request
+              this.setState({
+                courseList: queryCourseList,
+                loading: false,
+              })
+            } else {
+              this.setState({
+                courseList: [],
+                loading: false,
+              })
+            }
           }
         })
-        .catch((e) => console.log('Getting courses failed!'))
+        .catch((e) => {
+          this.setState({
+            courseList: [],
+            loading: false,
+          })
+          console.log('Getting courses failed!')
+        })
     }
   }
 

diff --git a/client/src/modules/Results/Components/ResultsDisplay.jsx b/client/src/modules/Results/Components/ResultsDisplay.jsx
@@ -231,26 +231,28 @@ export default class ResultsDisplay extends Component {
       ? this.state.filteredItems
       : this.state.courseList
 
-    return items.map((result, index) => (
-      <div
-        onClick={() => {
-          if (this.computeHeight() < 992) {
-            this.props.history.push(
-              `/course/${result?.classSub?.toUpperCase()}/${result?.classNum}`
-            )
-          }
-        }}
-      >
-        <FilteredResult
-          key={index}
-          index={index}
-          selected={index === this.state.active_card}
-          course={result}
-          previewHandler={this.previewHandler}
-          sortBy={this.state.selected}
-        />
-      </div>
-    ))
+    if (items.error === undefined | null) {
+      return items.map((result, index) => (
+        <div
+          onClick={() => {
+            if (this.computeHeight() < 992) {
+              this.props.history.push(
+                `/course/${result?.classSub?.toUpperCase()}/${result?.classNum}`
+              )
+            }
+          }}
+        >
+          <FilteredResult
+            key={index}
+            index={index}
+            selected={index === this.state.active_card}
+            course={result}
+            previewHandler={this.previewHandler}
+            sortBy={this.state.selected}
+          />
+        </div>
+      ))
+    }
   }
 
   renderCheckboxes(group) {

diff --git a/server/src/search/search.router.ts b/server/src/search/search.router.ts
@@ -17,18 +17,17 @@ router.post('/getClassesByQuery', async (req, res) => {
       { sort: { score: { $meta: 'textScore' } } },
     ).exec();
     if (classes && classes.length > 0) {
-      res.status(200).json({
+      return res.status(200).json({
         message: `Successfully retrieved classes with query ${query}`,
         data: classes.sort(courseSort(query)),
       });
     }
 
-    const regexClasses = await regexClassesSearch(query);
+    // const regexClasses = await regexClassesSearch(query);
     res
-      .status(200)
+      .status(400)
       .json({
-        message: `Successfully retrieved classes with query ${query} using regex`,
-        data: regexClasses,
+        error: `Error retrieved classes with query ${query} using regex`,
       });
   } catch (error) {
     // eslint-disable-next-line no-console