Merge remote-tracking branch 'origin/main'

This commit is contained in:
killian-larcher
2024-11-29 12:39:57 +01:00
3 changed files with 97 additions and 74 deletions
+80 -53
View File
@@ -1,7 +1,8 @@
import {prisma} from "@/prisma";
import {NextRequest, NextResponse} from "next/server";
import {Dbms} from "@prisma/client";
import {Agent, Database, Dbms} from "@prisma/client";
import {getFileUrlPresignedLocal} from "@/features/upload/private/upload.action";
import {tree} from "next/dist/build/templates/app-page";
// Regular expression for UUIDv4
const uuidv4Regex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -14,12 +15,17 @@ function isUuidv4(value: string): value is string {
}
export type Body = {
export type databaseAgent = {
name: string,
dbms: Dbms,
generatedId: string
}
export type Body = {
databases: databaseAgent[]
}
export async function GET(request: Request) {
const url = await getFileUrlPresignedLocal("d4a7fa35-2506-4d01-a612-a8ef2e2cc1c5.dump")
return Response.json({
@@ -27,6 +33,8 @@ export async function GET(request: Request) {
})
}
export async function POST(
request: Request,
{params}: { params: Promise<{ agentId: string }> }
@@ -37,15 +45,6 @@ export async function POST(
const body: Body = await request.json();
const lastContact = new Date()
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
@@ -56,33 +55,7 @@ export async function POST(
return NextResponse.json({error: "Agent not found"}, {status: 404})
}
const database = await prisma.database.findFirst({
where: {
generatedId: body.generatedId,
}
})
if(!database){
await prisma.database.create({
data : {
agentId: agent.id,
name: body.name,
dbms: body.dbms,
generatedId: body.generatedId,
lastContact: lastContact,
}
})
}else{
await prisma.database.update({
where: {
id: database.id,
},
data: {
lastContact: lastContact,
}
});
}
const databasesResponse = await handleDatabases(body, agent, lastContact)
const response = {
@@ -90,31 +63,85 @@ export async function POST(
id: agentId,
lastContact: lastContact
},
database:{
generatedId: body.generatedId,
dbms: body.dbms,
},
backup: {
action: true,
cron: ""
},
restore: {
action: false,
file: ""
}
databases: databasesResponse
}
return Response.json({
message: response
})
} catch (error) {
console.error('Error in POST handler:', error);
return NextResponse.json(
{ error: 'Internal server error' },
{ status: 500 }
{error: 'Internal server error'},
{status: 500}
);
}
}
async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
const databasesResponse = [];
// Helper function to format the database response
const formatDatabase = (database) => ({
generatedId: database.generatedId,
dbms: database.dbms,
data: {
backup: {
action: true,
cron: "",
},
restore: {
action: false,
file: "",
},
},
});
for (const db of body.databases) {
const existingDatabase = await prisma.database.findFirst({
where: {
generatedId: db.generatedId,
},
});
if (!existingDatabase) {
if (!isUuidv4(db.generatedId)) {
return NextResponse.json(
{ error: "generatedId is not a valid uuid" },
{ status: 500 }
);
}
// Create a new database
const databaseCreated = await prisma.database.create({
data: {
agentId: agent.id,
name: db.name,
dbms: db.dbms,
generatedId: db.generatedId,
lastContact: lastContact,
},
});
if (databaseCreated) {
databasesResponse.push(formatDatabase(databaseCreated));
}
} else {
// Update the existing database
const databaseUpdated = await prisma.database.update({
where: {
id: existingDatabase.id,
},
data: {
lastContact: lastContact,
},
});
databasesResponse.push(formatDatabase(databaseUpdated));
}
}
return databasesResponse;
}
-3
View File
@@ -7,19 +7,16 @@ export async function GET(
{params}: { params: Promise<{ fileName: string }> }
) {
// Retrieve params
const {searchParams} = new URL(request.url);
const token = searchParams.get('token');
const expires = searchParams.get('expires');
const fileName = (await params).fileName
const privateLocalDir = "private/uploads/";
const filePath = path.join(privateLocalDir, fileName);
const crypto = require('crypto');
if (!fs.existsSync(filePath)) {
return NextResponse.json(
{error: 'File not found'},