Locations and Departments (#107)

Author: jkluge

my-app/firebase.js

@@ -2,7 +2,6 @@ import { initializeApp } from "firebase/app";
 import { getAuth, GoogleAuthProvider, onAuthStateChanged } from "firebase/auth";
 import { get, getDatabase, ref, set, onValue, push } from "firebase/database";
 import { reaction, toJS } from "mobx";
-// import throttle from "lodash.throttle";
 
 // Your web app's Firebase configuration
 const firebaseConfig = {
@@ -27,20 +26,20 @@ let noUpload = false;
 
 export function connectToFirebase(model) {
 	loadCoursesFromCacheOrFirebase(model);
-
+	fetchDepartmentsAndLocations(model);
 	// setting missing
 	// also save filters to local storage
-	// 
+	//
 	const options = JSON.parse(localStorage.getItem("filterOptions"));
-		if (options) {
-			model.setFilterOptions(options);
-			console.log("Restore options from local storage");
-		}
+	if (options) {
+		model.setFilterOptions(options);
+		console.log("Restore options from local storage");
+	}
 
 	reaction(
-		() => ({filterOptions: JSON.stringify(model.filterOptions)}),
+		() => ({ filterOptions: JSON.stringify(model.filterOptions) }),
 		// eslint-disable-next-line no-unused-vars
-		({filterOptions}) => {
+		({ filterOptions }) => {
 			localStorage.setItem("filterOptions", filterOptions);
 		}
 	);
@@ -64,8 +63,8 @@ async function firebaseToModel(model) {
 		if (!snapshot.exists()) return;
 		const data = snapshot.val();
 		noUpload = true;
-		if (data.favourites) model.setFavourite(data.favourites);
-		if (data.currentSearchText)
+		if (data?.favourites) model.setFavourite(data.favourites);
+		if (data?.currentSearchText)
 			model.setCurrentSearchText(data.currentSearchText);
 		// if (data.scrollPosition)
 		// 	model.setScrollPosition(data.scrollPosition);
@@ -84,18 +83,15 @@ export function syncModelToFirebase(model) {
 			// Add more per-user attributes here
 		}),
 		// eslint-disable-next-line no-unused-vars
-		({ userId, favourites, currentSearchText, filterOptions }) => {
+		({ userId, favourites, currentSearchText }) => {
 			if (noUpload || !userId) return;
-			const userRef = ref(db, `users/${userId}`);
+			const userRef = ref(db, "users/${userId}");
 			const dataToSync = {
 				favourites,
 				currentSearchText,
 				// filterOptions,
 			};
-
-			set(userRef, dataToSync)
-				.then(() => console.log("User model synced to Firebase"))
-				.catch(console.error);
+			set(userRef, dataToSync).catch(console.error);
 		}
 	);
 }
@@ -191,6 +187,53 @@ export async function fetchAllCourses() {
 	return courses;
 }
 
+export async function uploadDepartmentsAndLocations(departments, locations) {
+	if (departments) {
+		const departmentsRef = ref(db, "departments");
+		try {
+			await set(departmentsRef, departments);
+			console.log("Uploaded Departments");
+		} catch (error) {
+			console.error("Failed to upload departments:", error);
+			return false;
+		}
+	}
+	if (locations) {
+		const locationsRef = ref(db, "locations");
+		try {
+			await set(locationsRef, locations);
+			console.log("Uploaded Locations");
+		} catch (error) {
+			console.error("Failed to upload locations:", error);
+			return false;
+		}
+	}
+	return true;
+}
+
+export async function fetchDepartmentsAndLocations(model) {
+	const departmentsRef = ref(db, "departments");
+	const locationsRef = ref(db, "locations");
+	let snapshot = await get(departmentsRef);
+	if (snapshot.exists()) {
+		const value = snapshot.val();
+		const set = new Set();
+		for (const id of Object.keys(value)) {
+			set.add(value[id]);
+		}
+		model.setDepartments(Array.from(set));
+	}
+	snapshot = await get(locationsRef);
+	if (snapshot.exists()) {
+		const value = snapshot.val();
+		const set = new Set();
+		for (const id of Object.keys(value)) {
+			set.add(value[id]);
+		}
+		model.setLocations(Array.from(set));
+	}
+}
+
 async function loadCoursesFromCacheOrFirebase(model) {
 	const firebaseTimestamp = await fetchLastUpdatedTimestamp();
 	const dbPromise = new Promise((resolve, reject) => {
@@ -241,32 +284,6 @@ async function loadCoursesFromCacheOrFirebase(model) {
 	const courses = await fetchAllCourses();
 	model.setCourses(courses);
 	saveCoursesToCache(courses, firebaseTimestamp);
-
-}
-
-
-export async function saveJSONCoursesToFirebase(model, data) {
-	if (!data || !model) {
-		console.log("no model or data");
-		return;
-	}
-	const entries = Object.entries(data);
-	entries.forEach((entry) => {
-		const course = {
-			code: entry[1].code,
-			name: entry[1]?.name ?? "",
-			location: entry[1]?.location ?? "",
-			department: entry[1]?.department ?? "",
-			language: entry[1]?.language ?? "",
-			description: entry[1]?.description ?? "",
-			academicLevel: entry[1]?.academic_level ?? "",
-			period: entry[1]?.period ?? "",
-			credits: entry[1]?.credits ?? 0,
-			//lectureCount:entry[1].courseLectureCount,
-			//prerequisites:entry.coursePrerequisites
-		};
-		model.addCourse(course);
-	});
 }
 
 export async function addReviewForCourse(courseCode, review) {

my-app/src/model.js

@@ -1,4 +1,4 @@
-import { addCourse, addReviewForCourse, getReviewsForCourse } from "../firebase";
+import { addCourse, addReviewForCourse, getReviewsForCourse, uploadDepartmentsAndLocations } from "../firebase";
 
 
 export const model = {
@@ -12,7 +12,8 @@ export const model = {
     scrollPosition: 0,
     /* list of all course objects downloaded from the Firebase realtime database and stored locally as JSON object in this array */
     courses: [],
-    /* courses the user selected as their favourite */
+    departments : [],
+    locations: [],
     favourites: [],
     isReady: false,
     /* this is a boolean flag showing that filtering options in the UI have changed, triggering the FilterPresenter to recalculate the filteredCourses[] */
@@ -38,10 +39,6 @@ export const model = {
         creditMin: 0,
         creditMax: 45,
         applyDepartmentFilter: true,
-        department: ["EECS/Computational Science and  Technology", "EECS/Theoretical Computer Science", "EECS/Electric Power and Energy Systems", "EECS/Network and Systems Engineering",
-        "ITM/Learning in Engineering Sciences", "ITM/Industrial Economics and Management", "ITM/Energy Systems", "ITM/Integrated Product Development and Design", "ITM/SKD GRU",
-        "SCI/Mathematics", "SCI/Applied Physics", "SCI/Mechanics", "SCI/Aeronautical and Vehicle Engineering", 
-        "ABE/Sustainability and Environmental Engineering", "ABE/Concrete Structures", "ABE/Structural Design & Bridges", "ABE/History of Science, Technology and Environment", ],
         applyRemoveNullCourses: false,
         period: [true, true, true, true],
         applyPeriodFilter: true
@@ -76,6 +73,12 @@ export const model = {
             console.error("Error adding course:", error);
         }
     },
+    setDepartments(departments){
+        this.departments = departments;
+    },
+    setLocations(locations){
+        this.locations = locations;
+    },
     setFavourite(favorites){
         this.favourites = favorites;
     },
@@ -107,6 +110,8 @@ export const model = {
             console.log("no model or data");
             return;
         }
+        const dep = new Set();
+        const loc = new Set();
         const entries = Object.entries(data);
         entries.forEach(entry => {
             const course = {
@@ -124,7 +129,13 @@ export const model = {
                 learning_outcomes: entry[1]?.learning_outcomes ?? null
             };
             this.addCourse(course);
+            dep.add(course.department);
+            loc.add(course.location);
         });
+        this.departments = Array.from(dep);
+        this.locations = Array.from(loc);
+        uploadDepartmentsAndLocations(this.departments, this.locations);
+        
     },
     //for reviews
     async addReview(courseCode, review) {
@@ -223,6 +234,8 @@ export const model = {
         const reviews = await getReviewsForCourse(courseCode);
         if (!reviews || reviews.length === 0) return null;
         const total = reviews.reduce((sum, review) => sum + (review.overallRating || 0), 0);
-        return (total / reviews.length).toFixed(1);
+        const avgRtg = (total / reviews.length).toFixed(1);
+        // cache the result
+        return avgRtg;
     },
 };

my-app/src/presenters/SearchbarPresenter.jsx

@@ -18,7 +18,7 @@ const SearchbarPresenter = observer(({ model }) => {
             { name: 'name', weight: 0.3 },  
             { name: 'description', weight: 0.1 }, 
         ],
-        threshold: 0.3,           // adjust this for sensitivity
+        threshold: 0.4,           // adjust this for sensitivity
         ignoreLocation: true,
         minMatchCharLength: 2,
     };