Merge remote-tracking branch 'origin/main'

app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/page.tsx

@@ -38,6 +38,7 @@ export default async function RoutePage(props: PageParams<{ databaseId: string }
 
     const isAlreadyBackup = !!backups.find(backup => backup.status === "waiting");
     const isAlreadyRestore = !!restaurations.find(restoration => restoration.status === "waiting");
+
     const totalBackups = await prisma.backup.count({
         where: {
             databaseId: databaseId,
@@ -66,6 +67,7 @@ export default async function RoutePage(props: PageParams<{ databaseId: string }
                 <DatabaseKpi
                     successRate={successRate}
                     database={database}
+                    totalBackups={totalBackups}
                 />
                 <DatabaseTabs
                     isAlreadyRestore={isAlreadyRestore}

app/api/agent/[agentId]/restore/route.ts

@@ -0,0 +1,85 @@
+import {NextResponse} from "next/server";
+import {isUuidv4} from "@/utils/verify-uuid";
+import {prisma} from "@/prisma";
+
+
+
+export type BodyResultRestore = {
+    generatedId: string
+    status: string
+}
+
+
+export async function POST(
+    request: Request,
+    {params}: { params: Promise<{ agentId: string }> }
+) {
+
+    try {
+        const agentId = (await params).agentId
+        const body: BodyResultRestore = await request.json();
+
+        console.log(body)
+        console.log(agentId)
+
+
+        if (!isUuidv4(body.generatedId)) {
+            return NextResponse.json(
+                {error: "generatedId is not a valid uuid"},
+                {status: 500}
+            );
+        }
+
+        const agent = await prisma.agent.findFirst({
+            where: {
+                id: agentId
+            }
+        })
+        if (!agent) {
+            return NextResponse.json({error: "Agent not found"}, {status: 404})
+        }
+
+        const database = await prisma.database.findFirst({
+            where: {
+                generatedId: body.generatedId
+            }
+        })
+
+        if (!database) {
+            return NextResponse.json({error: "Database associated with generatedId provided not found"}, {status: 404})
+        }
+
+        const restoration = await prisma.restauration.findFirst({
+            where: {
+                status : "ongoing",
+                databaseId: database.id
+            }
+        })
+        if (!restoration) {
+            return NextResponse.json({error: "Unable to fin the corresponding restoration"}, {status: 404})
+        }
+
+        await prisma.restauration.update({
+            where:{
+                id : restoration.id
+            },
+            data: {
+                status: body.status
+            }
+        })
+
+        const response = {
+            message: true,
+            details: "Restoration successfully updated"
+        }
+        return Response.json(response , {status: 200})
+
+
+    } catch (error) {
+        console.error('Error in POST handler:', error);
+        return NextResponse.json(
+            {error: 'Internal server error'},
+            {status: 500}
+        );
+    }
+}

app/api/agent/[agentId]/status/helpers.ts

@@ -3,6 +3,7 @@ import {prisma} from "@/prisma";
 import {NextResponse} from "next/server";
 import {Body} from "./route";
 import {isUuidv4} from "@/utils/verify-uuid";
+import {getFileUrlPresignedLocal} from "@/features/upload/private/upload.action";
 
 
 
@@ -14,7 +15,7 @@ import {isUuidv4} from "@/utils/verify-uuid";
 export async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
     const databasesResponse = [];
 
-    const formatDatabase = (database: Database, backupAction: boolean) => ({
+    const formatDatabase = (database: Database, backupAction: boolean, restoreAction: boolean, UrlBackup: string) => ({
         generatedId: database.generatedId,
         dbms: database.dbms,
         data: {
@@ -23,8 +24,8 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 cron: "",
             },
             restore: {
-                action: false,
-                file: "",
+                action: restoreAction,
+                file: UrlBackup,
             },
         },
     });
@@ -37,6 +38,8 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
         });
 
         let backupAction: boolean = false
+        let restoreAction: boolean = false
+        let UrlBackup: string = null
 
         if (!existingDatabase) {
             if (!isUuidv4(db.generatedId)) {
@@ -56,7 +59,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             });
 
             if (databaseCreated) {
-                databasesResponse.push(formatDatabase(databaseCreated, backupAction));
+                databasesResponse.push(formatDatabase(databaseCreated, backupAction,restoreAction , UrlBackup));
             }
         } else {
             const databaseUpdated = await prisma.database.update({
@@ -75,6 +78,14 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 }
             })
 
+            const restoration = await prisma.restauration.findFirst({
+                where:{
+                    databaseId: databaseUpdated.id,
+                    status: "waiting"
+                }
+            })
+
+
             if(backup){
                 backupAction = true
                 await prisma.backup.update({
@@ -87,7 +98,28 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 })
             }
 
-            databasesResponse.push(formatDatabase(databaseUpdated, backupAction));
+            if(restoration){
+                restoreAction = true
+
+                const backupToRestore = await prisma.backup.findFirst({
+                    where:{
+                        id: restoration.backupId
+                    }
+                })
+                const fileName = backupToRestore.file
+                UrlBackup = await getFileUrlPresignedLocal(fileName)
+                await prisma.restauration.update({
+                    where: {
+                        id: restoration.id
+                    },
+                    data:{
+                        status: "ongoing"
+                    }
+                })
+            }
+
+
+            databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, UrlBackup));
         }
     }
     return databasesResponse;

app/api/agent/[agentId]/status/route.ts

@@ -41,7 +41,6 @@ export async function POST(
             return NextResponse.json({error: "Agent not found"}, {status: 404})
         }
         const databasesResponse = await handleDatabases(body, agent, lastContact)
-
         await prisma.agent.update({
             where:{
                 id: agentId,

middleware.ts

@@ -38,7 +38,8 @@ function checkRouteExists(pathname) {
         // /^\/api\/auth\/\w+$/,        // Dynamic route with a number as a parameter (e.g., /api/dynamic/123)
         // /^\/api\/agent\/healthcheck\/\w+$/,           // Dynamic route with an alphanumeric parameter (e.g., /api/user/username)
         /^\/api\/agent\/[^/]+\/status\/?$/,   // Dynamic route for /api/agent/[id]/status
-        /^\/api\/agent\/[^/]+\/backup\/?$/,   // Dynamic route for /api/agent/[id]/status
+        /^\/api\/agent\/[^/]+\/backup\/?$/,
+        /^\/api\/agent\/[^/]+\/restore\/?$/,
         /^\/api\/files\/[^/]+\/?$/,
     ];
     return routePatterns.some(pattern => pattern.test(pathname));

src/components/wrappers/Dashboard/Projects/Database/DatabaseKpi.tsx

@@ -6,7 +6,8 @@ import {Database} from "@prisma/client";
 
 export type DatabaseKpiPro = {
     successRate: any,
-    database: Database
+    database: Database,
+    totalBackups: number
 }
 
 
@@ -17,7 +18,7 @@ export const DatabaseKpi = (props: DatabaseKpiPro) => {
                 <CardHeader className="font-bold text-xl">
                     Backups
                 </CardHeader>
-                <CardContent></CardContent>
+                <CardContent>{props.totalBackups}</CardContent>
             </Card>
             <Card className="w-full sm:w-auto flex-1">
                 <CardHeader className="font-bold text-xl">