Merge pull request #335 from Portabase/fix/backup-size-restoration

fix: size in restoration agent helper
This commit is contained in:
Charles GTE
2026-06-25 14:56:06 +02:00
committed by GitHub
+7 -4
View File
@@ -18,7 +18,7 @@ const log = logger.child({module: "api/agent/status/helpers"});
export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) { export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) {
const databasesResponse = []; const databasesResponse = [];
const formatDatabase = (database: DatabaseWith, backupAction: boolean, restoreAction: boolean, UrlBackup: string | null, storages: PingDatabaseStorageChannels[], urlMeta: string | null) => ({ const formatDatabase = (database: DatabaseWith, backupAction: boolean, restoreAction: boolean, UrlBackup: string | null, storages: PingDatabaseStorageChannels[], urlMeta: string | null, backupSize: number | null) => ({
generatedId: database.agentDatabaseId, generatedId: database.agentDatabaseId,
dbms: database.dbms, dbms: database.dbms,
storages: storages, storages: storages,
@@ -31,7 +31,8 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
restore: { restore: {
action: restoreAction, action: restoreAction,
file: UrlBackup, file: UrlBackup,
metaFile: urlMeta metaFile: urlMeta,
size: backupSize
}, },
}, },
}); });
@@ -49,6 +50,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
let restoreAction: boolean = false let restoreAction: boolean = false
let urlBackup: string | null = null; let urlBackup: string | null = null;
let urlMeta: string | null = null let urlMeta: string | null = null
let backupSize: number | null = null
if (!existingDatabase) { if (!existingDatabase) {
if (!isUuidv4(db.generatedId)) { if (!isUuidv4(db.generatedId)) {
@@ -90,7 +92,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
const storages = await getDatabaseStorageChannels(databaseCreated.id) const storages = await getDatabaseStorageChannels(databaseCreated.id)
databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null)); databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null, null));
} }
} else { } else {
@@ -180,6 +182,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
if (result.success) { if (result.success) {
urlBackup = result.url ?? null; urlBackup = result.url ?? null;
urlMeta = resultMeta.url ?? null urlMeta = resultMeta.url ?? null
backupSize = restoration.backupStorage.size
} else { } else {
await dbClient await dbClient
.update(drizzleDb.schemas.restoration) .update(drizzleDb.schemas.restoration)
@@ -205,7 +208,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
.where(eq(drizzleDb.schemas.restoration.id, restoration.id)); .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
} }
const storages = await getDatabaseStorageChannels(databaseUpdated.id) const storages = await getDatabaseStorageChannels(databaseUpdated.id)
databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup, storages, urlMeta)); databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup, storages, urlMeta, backupSize));
} }
} }
return databasesResponse; return databasesResponse;