Merge pull request #14 from drewpayment/feat/fix-login-and-registration

refactor(employees): wrap database queries in transactions

Author: drewpayment

src/lib/drizzle/mysql/models/employees.ts

@@ -16,28 +16,30 @@ export const getLegacyEmployees = async (): Promise<SelectLegacyEmployee[]> => {
 
 export const searchLegacyEmployees = async (page: number, take: number, search: string | undefined): Promise<{ data: SelectLegacyEmployee[], count: number }> => {
 	try {
-		const data = (await legacyDb.query.legacyEmployees.findMany({
-			where: (legacyEmployees, { and, eq, like }) => search !== undefined 
-				? and(
-					eq(legacyEmployees.isActive, 1),
-					like(legacyEmployees.name, `%${search}%`)
-				)
-				: eq(legacyEmployees.isActive, 1),
-			orderBy: (legacyEmployees, { asc }) => asc(legacyEmployees.name),
-			offset: (page - 1) * take,
-			limit: take,
-		})) as SelectLegacyEmployee[];
-
-		const count = (await legacyDb.query.legacyEmployees.findMany({
-			where: (legacyEmployees, { and, eq, like }) => search !== undefined 
-				? and(
-					eq(legacyEmployees.isActive, 1),
-					like(legacyEmployees.name, `%${search}%`)
-				)
-				: eq(legacyEmployees.isActive, 1),
-		})).length;
-
-		return { data, count };
+		return await legacyDb.transaction(async (tx) => {
+			const data = (await tx.query.legacyEmployees.findMany({
+				where: (legacyEmployees, { and, eq, like }) => search?.length 
+					? and(
+						eq(legacyEmployees.isActive, 1),
+						like(legacyEmployees.name, `%${search}%`)
+					)
+					: eq(legacyEmployees.isActive, 1),
+				orderBy: (legacyEmployees, { asc }) => asc(legacyEmployees.name),
+				offset: (page - 1) * take,
+				limit: take,
+			})) as SelectLegacyEmployee[];
+	
+			const count = (await tx.query.legacyEmployees.findMany({
+				where: (legacyEmployees, { and, eq, like }) => search?.length 
+					? and(
+						eq(legacyEmployees.isActive, 1),
+						like(legacyEmployees.name, `%${search}%`)
+					)
+					: eq(legacyEmployees.isActive, 1),
+			})).length;
+	
+			return { data, count };
+		});
 	} catch (err) {
 		console.error(err);
 		return { data: [] as SelectLegacyEmployee[], count: 0 };

src/lib/drizzle/postgres/models/employees.ts

@@ -86,35 +86,37 @@ export const searchEmployees = async (clientId: string, page: number, take: numb
   const offset = (page - 1) * take;
 
   try {
-    const data = await db.query.employee.findMany({
-      with: {
-        employeeProfile: true,
-        employeeCodes: {
-          where: (code, { eq }) => eq(code.isActive, true),
+    return await db.transaction(async (tx) => {
+      const data = await tx.query.employee.findMany({
+        with: {
+          employeeProfile: true,
+          employeeCodes: {
+            where: (code, { eq }) => eq(code.isActive, true),
+          },
         },
-      },
-      where: (employee, { eq, and, like, or }) => search !== undefined 
-        ? and(
-            or(like(employee.firstName, search), like(employee.lastName, search)), 
-            eq(employee.clientId, clientId), 
-            eq(employee.isCommissionable, true)
-          )
-        : and(eq(employee.clientId, clientId), eq(employee.isCommissionable, true)),
-      offset,
-      limit: take,
-    }) as Employee[];
-
-    const count = (await db.query.employee.findMany({
-      where: (employee, { eq, and, like, or }) => search !== undefined 
-        ? and(
-            or(like(employee.firstName, search), like(employee.lastName, search)), 
-            eq(employee.clientId, clientId), 
-            eq(employee.isCommissionable, true)
-          )
-        : and(eq(employee.clientId, clientId), eq(employee.isCommissionable, true)),
-    })).length;
-
-    return { data, count };
+        where: (employee, { eq, and, ilike, or }) => search != null 
+          ? and(
+              or(ilike(employee.firstName, `%${search}%`), ilike(employee.lastName, `%${search}%`)), 
+              eq(employee.clientId, clientId), 
+              eq(employee.isCommissionable, true)
+            )
+          : and(eq(employee.clientId, clientId), eq(employee.isCommissionable, true)),
+        offset,
+        limit: take,
+      }) as Employee[];
+  
+      const count = (await tx.query.employee.findMany({
+        where: (employee, { eq, and, ilike, or }) => search != null 
+          ? and(
+              or(ilike(employee.firstName, `%${search}%`), ilike(employee.lastName, `%${search}%`)), 
+              eq(employee.clientId, clientId), 
+              eq(employee.isCommissionable, true)
+            )
+          : and(eq(employee.clientId, clientId), eq(employee.isCommissionable, true)),
+      })).length;
+  
+      return { data, count };
+    });
   } catch (ex) {
     console.error(ex);
     return { data: [] as Employee[], count: 0 };