added no duplicate courses in search and dont show courses that are already completed.

Author: spotta85

entrypoints/components/course-add-modal.tsx

@@ -2,6 +2,7 @@ import { getCurrentSemester } from "@/lib/backend/audit-scraper";
 import { searchCatalogCourses } from "@/lib/backend/db";
 import type {
   CatalogCourse,
+  Course,
   CourseCode,
   PlannedCourseOutline,
 } from "@/lib/general-types";
@@ -54,11 +55,33 @@ const DEPARTMENTS = [
   "History",
 ];
 
+// Course statuses that mean the student already has the course, so it should be
+// hidden from search results.
+const EXCLUDED_SEARCH_STATUSES = new Set<string>(["Completed", "In Progress"]);
+
+// Build the set of course codes to hide from search based on the student's audit.
+function getExcludedCourseCodes(courses: Course[]): Set<string> {
+  const excludedCodes = new Set<string>();
+  for (const course of courses) {
+    if (EXCLUDED_SEARCH_STATUSES.has(course.status)) {
+      excludedCodes.add(course.code.trim());
+    }
+  }
+  return excludedCodes;
+}
+
 async function SearchCourses(
   searchData: CourseSearchData,
+  excludeCodes?: Set<string>,
 ): Promise<CatalogCourse[]> {
   // Pass the modal form data into the DB search helper and return the results.
-  return searchCatalogCourses(searchData);
+  return searchCatalogCourses({
+    searchQuery: searchData.searchQuery,
+    department: searchData.department,
+    lowerDivision: searchData.lowerDivision,
+    upperDivision: searchData.upperDivision,
+    excludeCodes,
+  });
 }
 
 function waitForNextPaint(): Promise<void> {
@@ -543,6 +566,7 @@ export function CourseSearchResults({
 }
 
 export function CourseSearchPanel() {
+  const { courses: studentCourses } = useAuditContext();
   const [view, setView] = useState(false);
   const [courses, setCourses] = useState<CatalogCourse[]>([]);
 
@@ -551,7 +575,10 @@ export function CourseSearchPanel() {
   ) : (
     <CourseSearchContent
       onSearchSubmit={async (formData) => {
-        const results = await SearchCourses(formData);
+        const results = await SearchCourses(
+          formData,
+          getExcludedCourseCodes(studentCourses),
+        );
         setCourses(results);
         setView(true);
       }}

lib/backend/db.ts

@@ -175,19 +175,23 @@ function getDepartmentCodesByName(departmentName: string): string[] {
 }
 
 // Searches catalog courses by text, department, and lower/upper division filters.
-export function searchCatalogCourses(filters: {
+// Skips any course codes passed in `excludeCodes` (e.g. courses the student has
+// already taken) and collapses duplicate sections so each course appears once.
+export async function searchCatalogCourses(filters: {
   searchQuery: string;
   department: string;
   lowerDivision: boolean;
   upperDivision: boolean;
+  excludeCodes?: Set<string>;
 }): Promise<CatalogCourse[]> {
   // Normalize the search inputs once before filtering the collection.
   const normalizedQuery = filters.searchQuery.trim().toLowerCase();
   const departmentCodes = filters.department
     ? getDepartmentCodesByName(filters.department)
     : [];
+  const excludeCodes = filters.excludeCodes ?? new Set<string>();
 
-  return db.courses
+  const matches = await db.courses
     .toCollection()
     .filter((course) => {
       // Match the search text against the catalog title fields.
@@ -208,7 +212,26 @@ export function searchCatalogCourses(filters: {
         (filters.lowerDivision && courseLevel >= 1 && courseLevel <= 3) ||
         (filters.upperDivision && courseLevel >= 4 && courseLevel <= 6);
 
-      return matchesQuery && matchesDepartment && matchesDivision;
+      // Drop courses the student has already taken.
+      const isAlreadyTaken = excludeCodes.has(
+        `${course.department} ${course.number}`,
+      );
+
+      return (
+        matchesQuery && matchesDepartment && matchesDivision && !isAlreadyTaken
+      );
     })
     .toArray();
+
+  // Collapse duplicate sections/teachers so each course code appears only once.
+  const seenCourseCodes = new Set<string>();
+  return matches.filter((course) => {
+    const courseCode = `${course.department} ${course.number}`;
+    if (seenCourseCodes.has(courseCode)) {
+      return false;
+    }
+
+    seenCourseCodes.add(courseCode);
+    return true;
+  });
 }