Adding methods to delete backups on remote storage s3 and local. Some refactoring on models db and adding common.ts model with createdAt, updatedAt, and deletedAt.

2026-07-14 11:16:13 +02:00 · 2025-08-29 15:31:23 +02:00
parent c8da2579e8
commit 45e3b31fda
48 changed files with 310 additions and 148 deletions
@@ -6,7 +6,7 @@ import { sendEmail } from "@/utils/email-helper";
 import TestEmailSettings from "../../../../../../emails/TestEmailSettings";
 import { render } from "@react-email/render";
 import { toast } from "sonner";
-import {Setting} from "@/db/schema/00_setting";
+import {Setting} from "@/db/schema/01_setting";
 import {EmailFormType} from "@/components/wrappers/dashboard/admin/admin-email-tab/email-form/email-form.schema";

 export type SettingsEmailTabProps = {
@@ -12,7 +12,7 @@ import {useRouter} from "next/navigation";
 import {
    updateStorageSettingsAction
 } from "@/components/wrappers/dashboard/admin/admin-storage-tab/storage-s3/s3-form.action";
-import {Setting} from "@/db/schema/00_setting";
+import {Setting} from "@/db/schema/01_setting";
 import {S3FormType} from "@/components/wrappers/dashboard/admin/admin-storage-tab/storage-s3/s3-form.schema";

 export type SettingsStorageTabProps = {
@@ -3,8 +3,8 @@
 import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs";
 import {SettingsEmailTab} from "@/components/wrappers/dashboard/admin/admin-email-tab/settings-email-tab";
 import {SettingsStorageTab} from "@/components/wrappers/dashboard/admin/admin-storage-tab/settings-storage-tab";
-import {User, UserWithAccounts} from "@/db/schema/01_user";
-import {Setting} from "@/db/schema/00_setting";
+import {User, UserWithAccounts} from "@/db/schema/02_user";
+import {Setting} from "@/db/schema/01_setting";
 import {useEffect, useState} from "react";
 import {useRouter, useSearchParams} from "next/navigation";
 import {AdminUsersTable} from "@/components/wrappers/dashboard/admin/admin-user-tab/admin-user-table";
@@ -1,4 +1,4 @@
-import {User, UserWithAccounts} from "@/db/schema/01_user";
+import {User, UserWithAccounts} from "@/db/schema/02_user";
 import {Card, CardContent, CardDescription, CardHeader, CardTitle} from "@/components/ui/card";
 import {DataTable} from "@/components/wrappers/common/table/data-table";
 import {usersColumnsAdmin} from "@/components/wrappers/dashboard/admin/admin-user-tab/columns-users";
@@ -9,7 +9,7 @@ import {useState} from "react";
 import {Trash2} from "lucide-react";
 import {deleteUserAction} from "@/components/wrappers/dashboard/profile/button-delete-account/delete-account.action";
 import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
-import {UserWithAccounts} from "@/db/schema/01_user";
+import {UserWithAccounts} from "@/db/schema/02_user";
 import {authClient, useSession} from "@/lib/auth/auth-client";
 import {formatFrenchDate} from "@/utils/date-formatting";
 import {providerSwitch} from "@/components/wrappers/common/provider-switch";
@@ -4,7 +4,7 @@ import {getServerUrl} from "@/utils/get-server-url";
 import {PasswordInput} from "@/components/wrappers/auth/password-input/password-input";
 import {useState} from "react";
 import {CopyButton} from "@/components/wrappers/common/button/copy-button";
-import {Agent} from "@/db/schema/07_agent";
+import {Agent} from "@/db/schema/08_agent";

 export type AgentCardKeyProps = {
    agent: Agent;
@@ -4,7 +4,7 @@ import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import Link from "next/link";
 import { formatDateLastContact } from "@/utils/date-formatting";
 import { ConnectionCircle } from "@/components/wrappers/common/connection-circle";
-import {Agent} from "@/db/schema/07_agent";
+import {Agent} from "@/db/schema/08_agent";

 export type agentCardProps = {
    data: Agent;
@@ -8,7 +8,7 @@ import { PropsWithChildren } from "react";
 import { CopyButton } from "@/components/wrappers/common/button/copy-button";
 import { getServerUrl } from "@/utils/get-server-url";
 import { CodeSnippet } from "@/components/wrappers/code-snippet/code-snippet";
-import {Agent} from "@/db/schema/07_agent";
+import {Agent} from "@/db/schema/08_agent";

 export type agentRegistrationDialogProps = PropsWithChildren<{
    agent: Agent;
@@ -7,7 +7,7 @@ import {ServerActionResult} from "@/types/action-type";
 import {eq} from "drizzle-orm";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
-import {Agent} from "@/db/schema/07_agent";
+import {Agent} from "@/db/schema/08_agent";

 export const deleteAgentAction = userAction.schema(z.string()).action(async ({parsedInput}): Promise<ServerActionResult<Agent>> => {
    try {
@@ -1,13 +1,14 @@
 "use server";

-import { z } from "zod";
-import { userAction } from "@/safe-actions";
-import { db } from "@/db";
-import { ServerActionResult } from "@/types/action-type";
+import {z} from "zod";
+import {userAction} from "@/safe-actions";
+import {db} from "@/db";
+import {ServerActionResult} from "@/types/action-type";
 import * as drizzleDb from "@/db";
-import {Backup} from "@/db/schema/06_database";
+import {Backup} from "@/db/schema/07_database";
+import {withUpdatedAt} from "@/db/utils";

-export const backupButtonAction = userAction.schema(z.string()).action(async ({ parsedInput }): Promise<ServerActionResult<Backup>> => {
+export const backupButtonAction = userAction.schema(z.string()).action(async ({parsedInput}): Promise<ServerActionResult<Backup>> => {
    try {
        const [createdBackup] = await db
            .insert(drizzleDb.schemas.backup)
@@ -22,7 +23,7 @@ export const backupButtonAction = userAction.schema(z.string()).action(async ({
            value: createdBackup,
            actionSuccess: {
                message: "Backup has been successfully created.",
-                messageParams: { databaseId: parsedInput },
+                messageParams: {databaseId: parsedInput},
            },
        };
    } catch (error) {
@@ -34,7 +35,7 @@ export const backupButtonAction = userAction.schema(z.string()).action(async ({
                message: "Failed to create backup.",
                status: 500,
                cause: error instanceof Error ? error.message : "Unknown error",
-                messageParams: { databaseId: parsedInput },
+                messageParams: {databaseId: parsedInput},
            },
        };
    }
@@ -6,7 +6,7 @@ import { redirect } from "next/navigation";
 import { CircleUser, LogOut, ShieldHalf } from "lucide-react";
 import { signOut } from "@/lib/auth/auth-client";
 import { useRouter } from "next/navigation";
-import { User } from "@/db/schema/01_user";
+import { User } from "@/db/schema/02_user";

 export type LoggedInDropdownProps = PropsWithChildren<{
    user: User;
@@ -11,7 +11,7 @@ import { useMutation } from "@tanstack/react-query";
 import { toast } from "sonner";
 import { useRouter } from "next/navigation";
 import { updateDatabaseBackupPolicyAction } from "@/components/wrappers/dashboard/database/cron-button/cron.action";
-import {Database} from "@/db/schema/06_database";
+import {Database} from "@/db/schema/07_database";

 export type CronButtonProps = {
    database: Database;
@@ -6,7 +6,7 @@ import {useRouter} from "next/navigation";
 import {toast} from "sonner";
 import {Button} from "@/components/ui/button";
 import {Separator} from "@/components/ui/separator";
-import {Database} from "@/db/schema/06_database";
+import {Database} from "@/db/schema/07_database";

 export type CronInputProps = {
    database: Database;
@@ -20,14 +20,14 @@ import {
    OrganizationFormSchema,
    OrganizationFormType
 } from "@/components/wrappers/dashboard/organization/organization-form/organization-form.schema";
-import {MemberWithUser, OrganizationWithMembers} from "@/db/schema/02_organization";
+import {MemberWithUser, OrganizationWithMembers} from "@/db/schema/03_organization";
 import {
    deleteOrganizationAction,
    updateOrganizationAction
 } from "@/components/wrappers/dashboard/organization/organization.action";
 import {toast} from "sonner";
 import {User as BetterAuthUser} from "better-auth";
-import {User} from "@/db/schema/01_user";
+import {User} from "@/db/schema/02_user";

 export type organizationFormProps = {
    defaultValues?: OrganizationWithMembers;
@@ -11,7 +11,7 @@ import {db} from "@/db";
 import {and, eq, inArray} from "drizzle-orm";
 import {auth, checkSlugOrganization, createOrganization, deleteOrganization} from "@/lib/auth/auth";
 import {slugify} from "@/utils/slugify";
-import {Organization} from "@/db/schema/02_organization";
+import {Organization} from "@/db/schema/03_organization";
 import * as drizzleDb from "@/db";
 import {headers} from "next/headers";

@@ -6,7 +6,7 @@ import { uploadImageAction } from "@/features/upload/public/upload.action";
 import { useMutation } from "@tanstack/react-query";
 import { updateImageUserAction } from "@/components/wrappers/dashboard/profile/avatar/avatar.action";
 import { useRouter } from "next/navigation";
-import { User } from "@/db/schema/01_user";
+import { User } from "@/db/schema/02_user";
 import {ChangeEvent} from "react";

 export type AvatarWithUploadProps = {
@@ -2,7 +2,7 @@

 import {Card, CardContent, CardHeader} from "@/components/ui/card";
 import {formatDateLastContact} from "@/utils/date-formatting";
-import {Database} from "@/db/schema/06_database";
+import {Database} from "@/db/schema/07_database";

 export type DatabaseKpiPro = {
    successRate: any;
@@ -7,8 +7,8 @@ import {eventUpdate} from "@/types/events";
 import {backupColumns} from "@/features/dashboard/backup/columns";
 import {restoreColumns} from "@/features/dashboard/restore/columns";
 import {DataTable} from "@/components/wrappers/common/table/data-table";
-import {Backup, Database, DatabaseWith, Restoration} from "@/db/schema/06_database";
-import {Setting} from "@/db/schema/00_setting";
+import {Backup, Database, DatabaseWith, Restoration} from "@/db/schema/07_database";
+import {Setting} from "@/db/schema/01_setting";
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from "@/components/ui/dropdown-menu";
 import {MoreHorizontal, Trash2} from "lucide-react";
 import {useMutation} from "@tanstack/react-query";
@@ -62,6 +62,8 @@ export const DatabaseTabs = (props: DatabaseTabsProps) => {
                    const backupDeleted = await deleteBackupAction({
                        backupId: backup.id,
                        databaseId: backup.databaseId,
+                        file: backup.file!,
+                        projectSlug: props.database?.project?.slug!
                    });
                    return {
                        success: backupDeleted?.data?.success,
@@ -2,7 +2,7 @@

 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import Link from "next/link";
-import {ProjectWith} from "@/db/schema/05_project";
+import {ProjectWith} from "@/db/schema/06_project";

 export type projectCardProps = {
    data: ProjectWith;
@@ -5,7 +5,7 @@ import Image from "next/image";
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { ConnectionCircle } from "@/components/wrappers/common/connection-circle";
 import { formatDateLastContact } from "@/utils/date-formatting";
-import {Database} from "@/db/schema/06_database";
+import {Database} from "@/db/schema/07_database";
 import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar";

 export type projectDatabaseCardProps = {
@@ -6,9 +6,9 @@ import { z } from "zod";
 import { ServerActionResult } from "@/types/action-type";
 import { db } from "@/db";
 import { eq, inArray } from "drizzle-orm";
-import {Project} from "@/db/schema/05_project";
+import {Project} from "@/db/schema/06_project";
 import * as drizzleDb from "@/db";
-import {Database} from "@/db/schema/06_database";
+import {Database} from "@/db/schema/07_database";
 import {slugify} from "@/utils/slugify";

 export const createProjectAction = userAction
@@ -11,8 +11,8 @@ import { createProjectAction, updateProjectAction } from "@/components/wrappers/
 import { useRouter } from "next/navigation";
 import { MultiSelect } from "@/components/wrappers/common/multiselect/multi-select";
 import { toast } from "sonner";
-import {DatabaseWith} from "@/db/schema/06_database";
-import {Organization} from "@/db/schema/02_organization";
+import {DatabaseWith} from "@/db/schema/07_database";
+import {Organization} from "@/db/schema/03_organization";

 export type projectFormProps = {
    defaultValues?: ProjectType;
@@ -1,7 +1,7 @@
 "use client";

 import {ColumnDef} from "@tanstack/react-table";
-import {MemberWithUser} from "@/db/schema/02_organization";
+import {MemberWithUser} from "@/db/schema/03_organization";
 import {useState} from "react";
 import {authClient, useSession} from "@/lib/auth/auth-client";
 import {useMutation} from "@tanstack/react-query";
@@ -1,7 +1,7 @@
 import {DataTable} from "@/components/wrappers/common/table/data-table";
 import {usersColumnsAdmin} from "@/components/wrappers/dashboard/admin/columns-users";
-import {MemberWithUser, Organization, OrganizationWithMembers} from "@/db/schema/02_organization";
-import {OrganizationInvitation} from "@/db/schema/04_invitation";
+import {MemberWithUser, Organization, OrganizationWithMembers} from "@/db/schema/03_organization";
+import {OrganizationInvitation} from "@/db/schema/05_invitation";
 import {organizationMemberColumns} from "@/components/wrappers/dashboard/settings/columns-organization-members";