fix(sanitize,search): sanitize search and convert dash (-) to space

studentinovisad · Dec 16, 2024 · 07b73b8 · 07b73b8
1 parent 5f5dc03
commit 07b73b8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/lib/server/db/employee.ts b/src/lib/server/db/employee.ts
@@ -27,9 +27,10 @@ export async function getEmployees(
 	}
 
 	// Don't search if the search query is empty when trimmed
-	const nonEmptySearchQuery = searchQuery
-		? searchQuery.trim() !== ''
-			? searchQuery
+	const sanitizedSearchQuery = searchQuery ? sanitizeString(searchQuery) : undefined;
+	const nonEmptySearchQuery = sanitizedSearchQuery
+		? sanitizedSearchQuery !== ''
+			? sanitizedSearchQuery
 			: undefined
 		: undefined;
 
@@ -61,7 +62,8 @@ export async function getEmployees(
 				)
 			)
 			.groupBy(employee.id, employee.fname, employee.lname)
-			.limit(limit);
+			.limit(limit)
+			.offset(offset);
 
 		return employees.map((s) => {
 			return {

diff --git a/src/lib/server/db/student.ts b/src/lib/server/db/student.ts
@@ -27,9 +27,10 @@ export async function getStudents(
 	}
 
 	// Don't search if the search query is empty when trimmed
-	const nonEmptySearchQuery = searchQuery
-		? searchQuery.trim() !== ''
-			? searchQuery
+	const sanitizedSearchQuery = searchQuery ? sanitizeString(searchQuery) : undefined;
+	const nonEmptySearchQuery = sanitizedSearchQuery
+		? sanitizedSearchQuery !== ''
+			? sanitizedSearchQuery
 			: undefined
 		: undefined;
 

diff --git a/src/lib/utils/sanitize.ts b/src/lib/utils/sanitize.ts
@@ -1,5 +1,5 @@
 export function sanitizeString(value: string): string {
-	return value.trim().toLowerCase().toWellFormed();
+	return value.trim().toLowerCase().replaceAll('-', ' ').toWellFormed();
 }
 
 export function capitalizeString(value: string): string {