Merge pull request #72 from R15-Software-Dev/fix/filtering-bugs

Check requirement return value on Ok variant

src/pages/student/eligibility_page.rs

@@ -4,7 +4,7 @@ use crate::pages::api::files::list_files;
 use crate::pages::api::students::get_all_student_data;
 use crate::pages::api::{get_all_scholarship_info, get_comparison_info};
 use crate::utils::get_user_claims;
-use leptos::logging::debug_log;
+use leptos::logging::{debug_log, debug_error};
 use leptos::prelude::*;
 use leptos_oidc::AuthSignal;
 
@@ -63,8 +63,7 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                                 .get("name")
                                 .unwrap_or(&ValueType::String(None))
                                 .as_string()
-                                .ok()
+                                .ok()?
-                                .flatten()
                                 .unwrap_or_default();
                             debug_log!("Checking scholarship: {}", scholarship_name);
                             let requirements_map = scholarship
@@ -72,8 +71,7 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                                 .get("requirements")
                                 .unwrap_or(&ValueType::Map(None))
                                 .as_map()
-                                .ok()
+                                .ok()?
-                                .flatten()
                                 .unwrap_or_default()
                                 .values()
                                 .cloned()
@@ -108,19 +106,29 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                                 && resolved_requirements
                                     .iter()
                                     .all(|list| {
-                                        list.iter()
+                                        debug_log!("Checking list: {:?}", list);
-                                            .fold(
+                                        if list.is_empty() {
-                                                false,
+                                            true
-                                                |prev, requirement| {
+                                        } else {
-                                                    let result = requirement
+                                            list.iter()
-                                                        .compare(&student_info)
+                                                .any(
-                                                        .unwrap_or_else(|err| {
+                                                    |requirement| {
-                                                            debug_log!("Requirement failed: {err}");
+                                                        let result = requirement
-                                                            false
+                                                            .compare(&student_info);
-                                                        });
+
-                                                    if prev { prev } else { result }
+                                                        match result.as_ref() {
-                                                },
+                                                            Ok(status) => {
-                                            )
+                                                                debug_log!("Requirement with id {} is Ok({})", requirement.id, status);
+                                                                status.clone()
+                                                            },
+                                                            Err(e) => {
+                                                                debug_error!("Requirement with id {} failed: {}", requirement.id, e);
+                                                                false
+                                                            }
+                                                        }
+                                                    },
+                                                )
+                                        }
                                     });
                             if valid {
                                 debug_log!("Scholarship is valid.");