Working on the organization system.

src/features/dashboard/restore/columns.tsx

@@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button";
 import { MoreHorizontal } from "lucide-react";
 import { ReloadIcon } from "@radix-ui/react-icons";
 import { StatusBadge } from "@/components/wrappers/common/status-badge";
-import { Restoration } from "@/db/schema";
+import {Restoration} from "@/db/schema/06_database";
 
 export const restoreColumns: ColumnDef<Restoration>[] = [
     {

src/features/dashboard/restore/restore.action.ts

@@ -1,9 +1,11 @@
 import { userAction } from "@/safe-actions";
 import { z } from "zod";
 import { ServerActionResult } from "@/types/action-type";
-import { Backup, backup, Restoration, restoration } from "@/db/schema";
+import * as drizzleDb from "@/db";
+
 import { db } from "@/db";
 import { and, eq } from "drizzle-orm";
+import {Backup, Restoration} from "@/db/schema/06_database";
 
 export const deleteBackupAction = userAction
     .schema(
@@ -15,14 +17,14 @@ export const deleteBackupAction = userAction
     .action(async ({ parsedInput }): Promise<ServerActionResult<Backup>> => {
         try {
             await db
-                .delete(backup)
-                .where(and(eq(backup.id, parsedInput.backupId), eq(backup.databaseId, parsedInput.databaseId)))
+                .delete(drizzleDb.schemas.backup)
+                .where(and(eq(drizzleDb.schemas.backup.id, parsedInput.backupId), eq(drizzleDb.schemas.backup.databaseId, parsedInput.databaseId)))
                 .execute();
 
             const backupExists = await db
                 .select()
-                .from(backup)
-                .where(and(eq(backup.id, parsedInput.backupId), eq(backup.databaseId, parsedInput.databaseId)))
+                .from(drizzleDb.schemas.backup)
+                .where(and(eq(drizzleDb.schemas.backup.id, parsedInput.backupId), eq(drizzleDb.schemas.backup.databaseId, parsedInput.databaseId)))
                 .execute();
 
             if (backupExists.length === 0) {
@@ -68,7 +70,7 @@ export const createRestorationAction = userAction
         try {
             // Insert new restoration into the database
             const restorationData = await db
-                .insert(restoration)
+                .insert(drizzleDb.schemas.restoration)
                 .values({
                     databaseId: parsedInput.databaseId,
                     backupId: parsedInput.backupId,

src/features/upload/public/upload.action.ts

@@ -9,9 +9,10 @@ import { checkMinioAlive, createPublicBucket, saveFileInBucket } from "@/utils/s
 //@ts-ignore
 import { UploadedObjectInfo } from "minio/src/internal/type";
 import { getServerUrl } from "@/utils/get-server-url";
-import { setting as drizzleSetting, Setting } from "@/db/schema";
 import { db } from "@/db";
 import { eq } from "drizzle-orm";
+import {Setting} from "@/db/schema/00_setting";
+import * as drizzleDb from "@/db";
 
 export const uploadImageAction = userAction.schema(z.instanceof(FormData)).action(async ({ parsedInput: formData, ctx }) => {
     const file = formData.get("file") as File;
@@ -21,8 +22,7 @@ export const uploadImageAction = userAction.schema(z.instanceof(FormData)).actio
     const arrayBuffer = await file.arrayBuffer();
     const buffer = Buffer.from(arrayBuffer);
 
-    const [settings] = await db.select().from(drizzleSetting).where(eq(drizzleSetting.name, "system")).limit(1);
-
+    const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
     if (!settings) {
         throw new Error("System settings not found.");
     }