switched fts to rpc with pgroonga, Closes #28

nthumodifications · Nov 1, 2023 · 00abbf9 · 00abbf9
1 parent d877d92
commit 00abbf9
Show file tree

Hide file tree

Showing 4 changed files with 823 additions and 14 deletions.
diff --git a/database/indexes/courses.sql b/database/indexes/courses.sql
@@ -0,0 +1,29 @@
+create index courses_name_zh ON courses USING pgroonga(name_zh);
+create index courses_teacher_zh ON courses USING pgroonga(teacher_zh);
+create index courses_venues ON courses USING pgroonga(venues);
+create index courses_name_en ON courses USING pgroonga(name_en);
+create index courses_teacher_en ON courses USING pgroonga(teacher_en);
+create index courses_department ON courses USING pgroonga(department);
+create index courses_course ON courses USING pgroonga(course);
+create index courses_raw_id ON courses USING pgroonga(raw_id);
+
+CREATE OR REPLACE FUNCTION search_courses(keyword text)
+RETURNS SETOF courses AS
+$func$
+BEGIN
+  IF trim(keyword) = '' THEN
+    -- Keyword is blank, return all courses
+    RETURN QUERY SELECT * FROM courses;
+  ELSE
+    -- Keyword is not blank, perform the search
+    RETURN QUERY SELECT * FROM courses
+      WHERE name_zh &@~ keyword
+         OR teacher_zh &@~ keyword
+         OR venues &@~ keyword
+         OR name_en &@~ keyword
+         OR teacher_en &@~ keyword
+         OR raw_id &@ keyword;
+  END IF;
+END
+$func$
+LANGUAGE plpgsql;
diff --git a/src/app/[lang]/courses/page.tsx b/src/app/[lang]/courses/page.tsx
@@ -113,13 +113,9 @@ const CoursePage: NextPage = () => {
         setLoading(true);
         //Query for courses
         try {
-            let temp = supabase
-                .from('courses')
-                .select('*', { count: 'exact' })
-            if (filters.textSearch) {
-                temp = temp
-                    .textSearch('multilang_search', `'${filters.textSearch.split(' ').join("' & '")}'`)
-            }
+            let temp = supabase.rpc('search_courses', {
+                    keyword: filters.textSearch,
+                }, { count: 'exact' })
             if (filters.level.length)
                 temp = temp
                     .or(filters.level.map(level => `and(course.gte.${level}000,course.lte.${level}999)`).join(','))
@@ -171,7 +167,7 @@ const CoursePage: NextPage = () => {
             if (error) console.error(error);
             else {
                 console.log(courses)
-                setCourses(courses!);
+                setCourses(courses as CourseDefinition[]);
                 setHeadIndex(index);
             }
         }

diff --git a/src/components/Timetable/CourseSearchbar.tsx b/src/components/Timetable/CourseSearchbar.tsx
@@ -15,15 +15,14 @@ const CourseSearchbar = ({ onAddCourse }: { onAddCourse: (course: CourseDefiniti
         console.log(text)
         try {
             setLoading(true);
-            let temp = supabase
-                .from('courses')
-                .select('*')
-            if(text.length > 0) temp = temp.textSearch('multilang_search', `'${text.split(' ').join("' & '")}'`)
+            let temp = supabase.rpc('search_courses', {
+                keyword: text
+            });
             const { data = [], error } = await temp
                 .order('raw_id', { ascending: true })
                 .limit(10);
             if(error) console.error(error);
-            else setOptions(data ?? []);
+            else setOptions(data as CourseDefinition[] ?? []);
         } catch (e) {
             console.error(e);
         }