feat: backend for checkboxes

Author: harshkhandeparkar

backend/src/db/mod.rs

@@ -2,7 +2,6 @@
 
 use color_eyre::eyre::eyre;
 use models::DBAdminDashboardQP;
-pub use queries::ExamFilter;
 use sqlx::{postgres::PgPoolOptions, prelude::FromRow, PgPool, Postgres, Transaction};
 use std::time::Duration;
 
@@ -68,18 +67,11 @@ impl Database {
     pub async fn search_papers(
         &self,
         query: &str,
-        exam_filter: ExamFilter,
-        exam_filter_str: String,
+        exam_filter: Vec<Exam>,
     ) -> Result<Vec<qp::BaseQP>, sqlx::Error> {
-        let (query_sql, use_exam_arg) = queries::get_qp_search_query(exam_filter);
+        let query_sql = queries::get_qp_search_query(exam_filter);
         let query = sqlx::query_as(&query_sql).bind(query);
 
-        let query = if use_exam_arg {
-            query.bind(exam_filter_str)
-        } else {
-            query
-        };
-
         let papers: Vec<models::DBBaseQP> = query.fetch_all(&self.connection).await?;
 
         Ok(papers

backend/src/db/queries.rs

@@ -101,27 +101,6 @@ pub fn get_all_unapproved_query() -> String {
     format!("SELECT {} FROM iqps WHERE approve_status = false and is_deleted=false ORDER BY upload_timestamp ASC", ADMIN_DASHBOARD_QP_FIELDS)
 }
 
-/// An enum representing the exam filter for the search query
-pub enum ExamFilter {
-    Exam(Exam), // Match an exact exam or use `ct` substring match
-    Any,        // Match anything
-    MidEnd,     // Midsem or endsem
-}
-
-impl TryFrom<&String> for ExamFilter {
-    type Error = color_eyre::eyre::Error;
-
-    fn try_from(value: &String) -> Result<Self, Self::Error> {
-        if value.is_empty() {
-            Ok(ExamFilter::Any)
-        } else if value == "midend" {
-            Ok(ExamFilter::MidEnd)
-        } else {
-            Ok(ExamFilter::Exam(Exam::try_from(value)?))
-        }
-    }
-}
-
 /// Returns the query for searching question papers. It is mostly voodoo, see [blog post](https://rajivharlalka.in/posts/iqps-search-development/).
 ///
 /// Optionally, the `exam` argument can be used to also add a clause to match the exam field.
@@ -131,21 +110,26 @@ impl TryFrom<&String> for ExamFilter {
 /// $2 - Exam filter string (can be midsem, endsem, midend, or ct)
 ///
 /// Returns the query and a boolean representing whether the second argument is required
-pub fn get_qp_search_query(exam_filter: ExamFilter) -> (String, bool) {
-    let (exam_filter, use_exam_arg) = match exam_filter {
-        ExamFilter::Any => ("", false),
-        ExamFilter::MidEnd => (
-            "WHERE (exam = 'midsem' OR exam = 'endsem' OR exam = '')",
-            false,
-        ),
-        ExamFilter::Exam(exam) => match exam {
-            Exam::CT(_) => ("WHERE (exam LIKE 'ct%' OR exam = '')", false),
-            _ => ("WHERE (exam = $2 OR exam = '')", true),
-        },
+pub fn get_qp_search_query(exam_filter: Vec<Exam>) -> String {
+    let exam_filter_clause = exam_filter
+        .iter()
+        .map(|&exam| {
+            if let Exam::CT(_) = exam {
+                "exam LIKE 'ct%'".into()
+            } else {
+                format!("exam = '{}'", String::from(exam))
+            }
+        })
+        .collect::<Vec<String>>()
+        .join(" OR ");
+
+    let exam_clause_str = if exam_filter_clause.is_empty() {
+        "".into()
+    } else {
+        format!("WHERE ({} OR exam = '')", exam_filter_clause)
     };
 
-    (
-        format!("
+    format!("
             WITH filtered AS (
                 SELECT * from iqps {exam_filter} ORDER BY year DESC
             ),
@@ -189,11 +173,9 @@ pub fn get_qp_search_query(exam_filter: ExamFilter) -> (String, bool) {
             ) SELECT {search_qp_fields} FROM result",
             search_qp_fields = SEARCH_QP_FIELDS,
             to_tsquery = "to_tsquery('simple', websearch_to_tsquery('simple', $1)::text || ':*')",
-            exam_filter = exam_filter,
+            exam_filter = exam_clause_str,
             intermediate_fields = ADMIN_DASHBOARD_QP_FIELDS.split(", ").map(|field| format!("filtered.{}", field)).collect::<Vec<String>>().join(", ")
-        ),
-        use_exam_arg
-    )
+        )
 }
 
 /// List of fields in the [`crate::db::models::DBAdminDashboardQP`] to be used with SELECT clauses

backend/src/routing/handlers.rs

@@ -23,7 +23,7 @@ use serde::Deserialize;
 use crate::{
     auth::{self, Auth},
     pathutils::PaperCategory,
-    qp::{self, AdminDashboardQP, WithUrl},
+    qp::{self, AdminDashboardQP, Exam, WithUrl},
 };
 
 use super::{AppError, BackendResponse, RouterState, Status};
@@ -68,11 +68,13 @@ pub async fn search(
             .map(|value| value.to_owned())
             .unwrap_or("".into());
 
-        if let Ok(exam_filter) = (&exam_query_str).try_into() {
-            let papers = state
-                .db
-                .search_papers(query, exam_filter, exam_query_str.to_owned())
-                .await?;
+        if let Ok(exam_filter) = exam_query_str
+            .split(',')
+            .filter(|val| !val.trim().is_empty())
+            .map(|val| Exam::try_from(&val.to_owned()))
+            .collect::<Result<Vec<Exam>, _>>()
+        {
+            let papers = state.db.search_papers(query, exam_filter).await?;
 
             let papers = papers
                 .iter()

backend/src/routing/mod.rs

@@ -152,7 +152,7 @@ impl IntoResponse for AppError {
         tracing::error!("An error occured: {}", self.0);
 
         BackendResponse::<()>::error(
-            format!("An internal server error occured. Please try again later."),
+            "An internal server error occured. Please try again later.".into(),
             StatusCode::INTERNAL_SERVER_ERROR,
         )
         .into_response()