diff --git a/backend/src/db/mod.rs b/backend/src/db/mod.rs index b5e4191..4cade1b 100644 --- a/backend/src/db/mod.rs +++ b/backend/src/db/mod.rs @@ -221,20 +221,14 @@ impl Database { &self, course_code: &str, year: Option, - course_name: Option<&String>, semester: Option<&String>, exam: Option<&String>, ) -> Result, sqlx::Error> { - let query_sql = queries::get_similar_papers_query( - year.is_some(), - course_name.is_some(), - semester.is_some(), - exam.is_some(), - ); + let query_sql = + queries::get_similar_papers_query(year.is_some(), semester.is_some(), exam.is_some()); let query = sqlx::query_as(&query_sql).bind(course_code); let query = query.bind(year); - let query = query.bind(course_name); let query = query.bind(semester); let query = query.bind(exam); diff --git a/backend/src/db/queries.rs b/backend/src/db/queries.rs index 570db24..1cb5d26 100644 --- a/backend/src/db/queries.rs +++ b/backend/src/db/queries.rs @@ -5,16 +5,17 @@ use crate::qp::Exam; /// Query to get similar papers. Matches `course_code` ($1) always. Other parameters are optional and can be enabled or disabled using the arguments to this function. -pub fn get_similar_papers_query( - year: bool, - course_name: bool, - semester: bool, - exam: bool, -) -> String { +/// +/// Query parameters: +/// `$1` - `course_code`` +/// `$2` - `year` +/// `$3` - `semester` +/// `$3` - `exam` +pub fn get_similar_papers_query(year: bool, semester: bool, exam: bool) -> String { let mut param_num = 1; format!( - "SELECT {} from iqps where is_deleted=false and course_code = $1 {} {} {} {}", + "SELECT {} from iqps where is_deleted=false and course_code = $1 {} {} {}", ADMIN_DASHBOARD_QP_FIELDS, if year { param_num += 1; @@ -22,12 +23,6 @@ pub fn get_similar_papers_query( } else { "".to_string() }, - if course_name { - param_num += 1; - format!("AND course_name=${}", param_num) - } else { - "".to_string() - }, if semester { param_num += 1; format!("AND semester=${}", param_num) diff --git a/backend/src/routing/handlers.rs b/backend/src/routing/handlers.rs index 735fd36..a8320b6 100644 --- a/backend/src/routing/handlers.rs +++ b/backend/src/routing/handlers.rs @@ -428,7 +428,6 @@ pub async fn similar( body.get("year") .map(|year| year.parse::()) .transpose()?, - body.get("course_name"), body.get("semester"), body.get("exam"), )