Include global resources in tenant exports
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 39s
Build and Push Docker Images / build-frontend (push) Successful in 25s
Build and Push Docker Images / build-website (push) Successful in 24s
Build and Push Docker Images / build-central-services-api (push) Successful in 24s
Build and Push Docker Images / build-central-services-admin (push) Successful in 25s
Build and Push Docker Images / build-docs (push) Successful in 24s

This commit is contained in:
2026-08-06 11:11:31 +02:00
parent 52490ff734
commit f375d63655
3 changed files with 96 additions and 0 deletions

View File

@@ -0,0 +1,36 @@
type TableRows = Record<string, Record<string, any>[]>
type LoadRows = (
table: string,
whereSql: string,
params?: any[]
) => Promise<Record<string, any>[]>
type AddRows = (
tables: TableRows,
table: string,
rows: Record<string, any>[]
) => void
export const TENANT_EXPORT_GLOBAL_TABLES = ["units", "citys", "countrys"] as const
export const addTenantExportGlobalResources = async (
tables: TableRows,
availableTables: ReadonlySet<string>,
tenant: Record<string, any>,
loadRows: LoadRows,
addRows: AddRows
) => {
for (const table of TENANT_EXPORT_GLOBAL_TABLES) {
if (!availableTables.has(table)) continue
addRows(tables, table, await loadRows(table, "true"))
}
if (availableTables.has("accounts")) {
addRows(
tables,
"accounts",
await loadRows("accounts", `"accountChart" = $1`, [tenant.accountChart || "skr03"])
)
}
}

View File

@@ -11,6 +11,7 @@ import { pool } from "../../db"
import { s3 } from "./s3"
import { secrets } from "./secrets"
import { decrypt, encrypt } from "./crypt"
import { addTenantExportGlobalResources } from "./tenantExportGlobalResources"
import { restoreImportedTenantNumberRanges } from "./tenantImportNumberRanges"
type TableRows = Record<string, Record<string, any>[]>
@@ -300,6 +301,13 @@ export const buildTenantFullExport = async (
if (!tenantRows.length) throw new Error("Tenant nicht gefunden")
addRows(tables, "tenants", tenantRows)
await addTenantExportGlobalResources(
tables,
new Set(columnsByTable.keys()),
tenantRows[0],
(table, whereSql, params) => loadRows(client, table, whereSql, params),
addRows
)
for (const [table, metadata] of columnsByTable.entries()) {
if (table === "tenants") continue

View File

@@ -0,0 +1,52 @@
import assert from "node:assert/strict"
import test from "node:test"
import { addTenantExportGlobalResources } from "../src/utils/tenantExportGlobalResources"
test("adds global resources and the tenant account chart to a tenant export", async () => {
const tables: Record<string, Record<string, any>[]> = {}
const calls: { table: string, whereSql: string, params?: any[] }[] = []
const rowsByTable: Record<string, Record<string, any>[]> = {
units: [{ id: 1, name: "Monat" }],
citys: [{ id: 1, zip: 26316 }],
countrys: [{ id: 1, name: "Deutschland" }],
accounts: [{ id: 1, accountChart: "skr04", number: "4400" }],
}
await addTenantExportGlobalResources(
tables,
new Set(Object.keys(rowsByTable)),
{ id: 42, accountChart: "skr04" },
async (table, whereSql, params) => {
calls.push({ table, whereSql, params })
return rowsByTable[table]
},
(target, table, rows) => {
target[table] = rows
}
)
assert.deepEqual(tables, rowsByTable)
assert.deepEqual(calls, [
{ table: "units", whereSql: "true", params: undefined },
{ table: "citys", whereSql: "true", params: undefined },
{ table: "countrys", whereSql: "true", params: undefined },
{ table: "accounts", whereSql: `"accountChart" = $1`, params: ["skr04"] },
])
})
test("skips global tables that do not exist in an older database schema", async () => {
const tables: Record<string, Record<string, any>[]> = {}
await addTenantExportGlobalResources(
tables,
new Set(["units"]),
{ id: 42 },
async () => [{ id: 1, name: "Stück" }],
(target, table, rows) => {
target[table] = rows
}
)
assert.deepEqual(tables, { units: [{ id: 1, name: "Stück" }] })
})