gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix types

Browse Source
This commit is contained in:
sianida26 2024-02-20 00:30:19 +07:00
parent 6e68b2da58
commit fa8422849a
13 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/auth/actions/getUser.ts
View File

@ -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

3
src/modules/permission/actions/deletePermission.ts
View File

@ -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 },
});

3
src/modules/permission/actions/getAllPermissions.ts
View File

@ -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: {

3
src/modules/permission/actions/getPermissionById.ts
View File

@ -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,

7
src/modules/permission/actions/upsertPermission.ts
View File

@ -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,
});

3
src/modules/role/actions/deleteRole.ts
View File

@ -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 },
});

3
src/modules/role/actions/getAllRoles.ts
View File

@ -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: {

3
src/modules/role/actions/getRoleById.ts
View File

@ -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,

7
src/modules/role/actions/upsertRole.ts
View File

@ -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 } },
});

3
src/modules/userManagement/actions/deleteUser.ts
View File

@ -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 },
});

3
src/modules/userManagement/actions/getAllUsers.ts
View File

@ -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,

3
src/modules/userManagement/actions/getUserDetailById.ts
View File

@ -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,

9
src/modules/userManagement/actions/upsertUser.ts
View File

@ -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,