From fa8422849ae4c44f6a6594105fb1a5a35ffd3ef4 Mon Sep 17 00:00:00 2001
From: sianida26 <chesakeselekkebo@gmail.com>
Date: Tue, 20 Feb 2024 00:30:19 +0700
Subject: [PATCH] Fix types

---
 src/modules/auth/actions/getUser.ts                     | 2 +-
 src/modules/permission/actions/deletePermission.ts      | 3 ++-
 src/modules/permission/actions/getAllPermissions.ts     | 3 ++-
 src/modules/permission/actions/getPermissionById.ts     | 3 ++-
 src/modules/permission/actions/upsertPermission.ts      | 7 ++++---
 src/modules/role/actions/deleteRole.ts                  | 3 ++-
 src/modules/role/actions/getAllRoles.ts                 | 3 ++-
 src/modules/role/actions/getRoleById.ts                 | 3 ++-
 src/modules/role/actions/upsertRole.ts                  | 7 ++++---
 src/modules/userManagement/actions/deleteUser.ts        | 3 ++-
 src/modules/userManagement/actions/getAllUsers.ts       | 3 ++-
 src/modules/userManagement/actions/getUserDetailById.ts | 3 ++-
 src/modules/userManagement/actions/upsertUser.ts        | 9 +++++----
 13 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/modules/auth/actions/getUser.ts b/src/modules/auth/actions/getUser.ts
index 6708827..7af6a47 100644
--- a/src/modules/auth/actions/getUser.ts
+++ b/src/modules/auth/actions/getUser.ts
@@ -27,7 +27,7 @@ export default async function getUser() {
 		return {
 			name: user.name ?? "",
 			email: user.email ?? "",
-			photoUrl: user.photoProfile?.path ?? null,
+			photoUrl: user.photoProfile ?? null,
 		};
 	} catch (e: unknown) {
 		// Handle specific authentication errors gracefully
diff --git a/src/modules/permission/actions/deletePermission.ts b/src/modules/permission/actions/deletePermission.ts
index 4e4e187..4860325 100644
--- a/src/modules/permission/actions/deletePermission.ts
+++ b/src/modules/permission/actions/deletePermission.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import db from "@/core/db";
 import prisma from "@/db";
 import checkPermission from "@/modules/dashboard/services/checkPermission";
 import ServerResponseAction from "@/modules/dashboard/types/ServerResponseAction";
@@ -10,7 +11,7 @@ import { revalidatePath } from "next/cache";
 export default async function deletePermission(id: string): Promise<ServerResponseAction> {
     try {
         if (!(await checkPermission("permission.delete"))) unauthorized();
-		const permission = await prisma.permission.delete({
+		const permission = await db.permission.delete({
 			where: { id },
 		});
 
diff --git a/src/modules/permission/actions/getAllPermissions.ts b/src/modules/permission/actions/getAllPermissions.ts
index 419c60a..8be34a4 100644
--- a/src/modules/permission/actions/getAllPermissions.ts
+++ b/src/modules/permission/actions/getAllPermissions.ts
@@ -6,6 +6,7 @@ import handleCatch from "@/modules/dashboard/utils/handleCatch";
 import unauthorized from "@/modules/dashboard/utils/unauthorized";
 import "server-only";
 import Permission from "../types/Permission";
+import db from "@/core/db";
 
 /**
  * Retrieves all permissions along with the count of associated permissions and users.
@@ -21,7 +22,7 @@ export default async function getAllPermissions(): Promise<ServerResponseAction<
 
 	try {
 		// Fetch permissions from the database
-		const permissions = await prisma.permission.findMany({
+		const permissions = await db.permission.findMany({
 			include: {
 				_count: {
 					select: {
diff --git a/src/modules/permission/actions/getPermissionById.ts b/src/modules/permission/actions/getPermissionById.ts
index 1ed5f81..9cabbec 100644
--- a/src/modules/permission/actions/getPermissionById.ts
+++ b/src/modules/permission/actions/getPermissionById.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import db from "@/core/db";
 import prisma from "@/db";
 import checkPermission from "@/modules/dashboard/services/checkPermission";
 import ServerResponseAction from "@/modules/dashboard/types/ServerResponseAction";
@@ -20,7 +21,7 @@ export default async function getPermissionById(
 	try {
 		if (!(await checkPermission("permissions.read"))) unauthorized();
 
-		const permission = await prisma.permission.findFirst({
+		const permission = await db.permission.findFirst({
 			where: { id },
 			select: {
 				code: true,
diff --git a/src/modules/permission/actions/upsertPermission.ts b/src/modules/permission/actions/upsertPermission.ts
index 51a6258..94d4c47 100644
--- a/src/modules/permission/actions/upsertPermission.ts
+++ b/src/modules/permission/actions/upsertPermission.ts
@@ -9,6 +9,7 @@ import checkPermission from "@/modules/dashboard/services/checkPermission";
 import unauthorized from "@/modules/dashboard/utils/unauthorized";
 import DashboardError from "@/modules/dashboard/errors/DashboardError";
 import handleCatch from "@/modules/dashboard/utils/handleCatch";
+import db from "@/core/db";
 
 /**
  * Upserts a permission based on the provided PermissionFormData.
@@ -47,7 +48,7 @@ export default async function upsertPermission(
 
 		// Database operation
 		if (isInsert) {
-            if (await prisma.permission.findFirst({
+            if (await db.permission.findFirst({
                 where: {
                     code: permissionData.code
                 }
@@ -59,9 +60,9 @@ export default async function upsertPermission(
                     }
                 })
             }
-			await prisma.permission.create({ data: permissionData });
+			await db.permission.create({ data: permissionData });
 		} else {
-			await prisma.permission.update({
+			await db.permission.update({
 				where: { id: validatedFields.data.id! },
 				data: permissionData,
 			});
diff --git a/src/modules/role/actions/deleteRole.ts b/src/modules/role/actions/deleteRole.ts
index e95da5b..2f37fc3 100644
--- a/src/modules/role/actions/deleteRole.ts
+++ b/src/modules/role/actions/deleteRole.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import db from "@/core/db";
 import prisma from "@/db";
 import checkPermission from "@/modules/dashboard/services/checkPermission";
 import ServerResponseAction from "@/modules/dashboard/types/ServerResponseAction";
@@ -13,7 +14,7 @@ export default async function deleteRole(
 ): Promise<ServerResponseAction> {
 	try {
 		if (!(await checkPermission("roles.delete"))) return unauthorized();
-		const role = await prisma.role.delete({
+		const role = await db.role.delete({
 			where: { id },
 		});
 
diff --git a/src/modules/role/actions/getAllRoles.ts b/src/modules/role/actions/getAllRoles.ts
index ed2ad82..c3b52e6 100644
--- a/src/modules/role/actions/getAllRoles.ts
+++ b/src/modules/role/actions/getAllRoles.ts
@@ -6,6 +6,7 @@ import handleCatch from "@/modules/dashboard/utils/handleCatch";
 import unauthorized from "@/modules/dashboard/utils/unauthorized";
 import "server-only";
 import Role from "../types/Role";
+import db from "@/core/db";
 
 /**
  * Retrieves all roles along with the count of associated permissions and users.
@@ -23,7 +24,7 @@ export default async function getAllRoles(): Promise<
 		}
 
 		// Fetch roles from the database
-		const roles = await prisma.role.findMany({
+		const roles = await db.role.findMany({
 			include: {
 				_count: {
 					select: {
diff --git a/src/modules/role/actions/getRoleById.ts b/src/modules/role/actions/getRoleById.ts
index 1b9e13a..1351cbf 100644
--- a/src/modules/role/actions/getRoleById.ts
+++ b/src/modules/role/actions/getRoleById.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import db from "@/core/db";
 import prisma from "@/db";
 import checkPermission from "@/modules/dashboard/services/checkPermission";
 import ServerResponseAction from "@/modules/dashboard/types/ServerResponseAction";
@@ -24,7 +25,7 @@ export default async function getRoleById(id: string): Promise<ServerResponseAct
 
 		if (!(await checkPermission("roles.read"))) return unauthorized();
 
-		const role = await prisma.role.findFirst({
+		const role = await db.role.findFirst({
 			where: { id },
 			select: {
 				code: true,
diff --git a/src/modules/role/actions/upsertRole.ts b/src/modules/role/actions/upsertRole.ts
index 7df8a96..0bc1533 100644
--- a/src/modules/role/actions/upsertRole.ts
+++ b/src/modules/role/actions/upsertRole.ts
@@ -9,6 +9,7 @@ import checkPermission from "@/modules/dashboard/services/checkPermission";
 import unauthorized from "@/modules/dashboard/utils/unauthorized";
 import DashboardError from "@/modules/dashboard/errors/DashboardError";
 import handleCatch from "@/modules/dashboard/utils/handleCatch";
+import db from "@/core/db";
 
 /**
  * Upserts a role based on the provided RoleFormData.
@@ -54,7 +55,7 @@ export default async function upsertRole(
 		// Database operation
 		if (isInsert) {
 			if (
-				await prisma.role.findFirst({
+				await db.role.findFirst({
 					where: {
 						code: roleData.code,
 					},
@@ -67,7 +68,7 @@ export default async function upsertRole(
 					},
 				});
 			}
-			await prisma.role.create({
+			await db.role.create({
 				data: {
 					...roleData,
 					permissions: {
@@ -76,7 +77,7 @@ export default async function upsertRole(
 				},
 			});
 		} else {
-			await prisma.role.update({
+			await db.role.update({
 				where: { id: validatedFields.data.id! },
 				data: { ...roleData, permissions: { connect: permissionIds } },
 			});
diff --git a/src/modules/userManagement/actions/deleteUser.ts b/src/modules/userManagement/actions/deleteUser.ts
index d520456..81320ec 100644
--- a/src/modules/userManagement/actions/deleteUser.ts
+++ b/src/modules/userManagement/actions/deleteUser.ts
@@ -9,6 +9,7 @@ import notFound from "@/modules/dashboard/utils/notFound";
 import unauthorized from "@/modules/dashboard/utils/unauthorized";
 import { revalidatePath } from "next/cache";
 import UserManagementError from "../errors/UserManagementError";
+import db from "@/core/db";
 
 export default async function deleteUser(
 	id: string
@@ -27,7 +28,7 @@ export default async function deleteUser(
 			});
 		}
 
-		const user = await prisma.user.delete({
+		const user = await db.user.delete({
 			where: { id },
 		});
 
diff --git a/src/modules/userManagement/actions/getAllUsers.ts b/src/modules/userManagement/actions/getAllUsers.ts
index 5b6fc51..a62f592 100644
--- a/src/modules/userManagement/actions/getAllUsers.ts
+++ b/src/modules/userManagement/actions/getAllUsers.ts
@@ -1,3 +1,4 @@
+import db from "@/core/db";
 import prisma from "@/db";
 import checkPermission from "@/modules/dashboard/services/checkPermission";
 import unauthorized from "@/modules/dashboard/utils/unauthorized";
@@ -7,7 +8,7 @@ const getAllUsers = async () => {
 	if (!(await checkPermission("users.readAll"))) unauthorized();
 
 	try {
-		const users = await prisma.user.findMany({
+		const users = await db.user.findMany({
 			select: {
 				id: true,
 				email: true,
diff --git a/src/modules/userManagement/actions/getUserDetailById.ts b/src/modules/userManagement/actions/getUserDetailById.ts
index 3c8dc53..ff55d52 100644
--- a/src/modules/userManagement/actions/getUserDetailById.ts
+++ b/src/modules/userManagement/actions/getUserDetailById.ts
@@ -4,6 +4,7 @@ import prisma from "@/db";
 import checkPermission from "@/modules/dashboard/services/checkPermission";
 import unauthorized from "@/modules/dashboard/utils/unauthorized";
 import ServerResponseAction from "@/modules/dashboard/types/ServerResponseAction";
+import db from "@/core/db";
 
 type UserData = {
 	id: string;
@@ -29,7 +30,7 @@ export default async function getUserDetailById(
 	if (!checkPermission("users.read")) return unauthorized();
 
 	// Retrieve user data from the database
-	const user = await prisma.user.findFirst({
+	const user = await db.user.findFirst({
 		where: { id },
 		select: {
 			id: true,
diff --git a/src/modules/userManagement/actions/upsertUser.ts b/src/modules/userManagement/actions/upsertUser.ts
index 93d4c64..be0977c 100644
--- a/src/modules/userManagement/actions/upsertUser.ts
+++ b/src/modules/userManagement/actions/upsertUser.ts
@@ -12,6 +12,7 @@ import DashboardError from "@/modules/dashboard/errors/DashboardError";
 import handleCatch from "@/modules/dashboard/utils/handleCatch";
 import ServerResponseAction from "@/modules/dashboard/types/ServerResponseAction";
 import hashPassword from "@/modules/auth/utils/hashPassword";
+import db from "@/core/db";
 
 /**
  * Upserts a user based on the provided UserFormData.
@@ -52,7 +53,7 @@ export default async function upsertUser(
 
 		const passwordHash = await hashPassword(validatedFields.data.password!);
 
-		const roles = await prisma.role.findMany({
+		const roles = await db.role.findMany({
 			where: {
 				code: {
 					in: validatedFields.data.roles,
@@ -66,7 +67,7 @@ export default async function upsertUser(
 		// Database operation
 		if (isInsert) {
 			if (
-				await prisma.user.findFirst({
+				await db.user.findFirst({
 					where: {
 						email: userData.email,
 					},
@@ -79,7 +80,7 @@ export default async function upsertUser(
 					},
 				});
 			}
-			await prisma.user.create({
+			await db.user.create({
 				data: {
 					...userData,
 					passwordHash,
@@ -89,7 +90,7 @@ export default async function upsertUser(
 				},
 			});
 		} else {
-			await prisma.user.update({
+			await db.user.update({
 				where: { id: validatedFields.data.id! },
 				data: {
 					...userData,