flfeders/FEDEO
2
1
Fork 0
Code Issues 95 Pull Requests Actions Packages Projects 22 Releases Wiki Activity

Scanner Verwaltung für Geräte-Agenten ergänzen

Browse Source
This commit is contained in:
florianfederspiel
2026-06-02 15:25:00 +02:00
parent a26ff30cd8
commit c854b0bf30
6 changed files with 491 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/db/migrations/0052_instance_agent_scan_defaults.sql Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE "instance_agents" ADD COLUMN "preferred_scanner_name" text;
--> statement-breakpoint
ALTER TABLE "instance_agents" ADD COLUMN "scan_defaults" jsonb DEFAULT '{"format":"pdf","resolution":300,"mode":"Color","source":null}'::jsonb NOT NULL;

7
backend/db/schema/instance_agents.ts
View File

@@ -29,6 +29,13 @@ export const instanceAgents = pgTable("instance_agents", {
capabilities: jsonb("capabilities").notNull().default({ scan: true, print: false }),
scannerNames: jsonb("scanner_names").notNull().default([]),
printerNames: jsonb("printer_names").notNull().default([]),
preferredScannerName: text("preferred_scanner_name"),
scanDefaults: jsonb("scan_defaults").notNull().default({
format: "pdf",
resolution: 300,
mode: "Color",
source: null,
}),
lastSeenAt: timestamp("last_seen_at", { withTimezone: true }),
lastDebugInfo: jsonb("last_debug_info"),

22
backend/src/routes/instanceAgents.ts
View File

@@ -13,6 +13,8 @@ const updateAgentSchema = z.object({
name: z.string().min(1).optional(),
description: z.string().optional().nullable(),
active: z.boolean().optional(),
preferredScannerName: z.string().optional().nullable(),
scanDefaults: z.record(z.string(), z.any()).optional(),
})
const createScanJobSchema = z.object({
@@ -52,6 +54,8 @@ export default async function instanceAgentRoutes(server: FastifyInstance) {
capabilities: instanceAgents.capabilities,
scannerNames: instanceAgents.scannerNames,
printerNames: instanceAgents.printerNames,
preferredScannerName: instanceAgents.preferredScannerName,
scanDefaults: instanceAgents.scanDefaults,
lastSeenAt: instanceAgents.lastSeenAt,
lastDebugInfo: instanceAgents.lastDebugInfo,
})
@@ -81,6 +85,8 @@ export default async function instanceAgentRoutes(server: FastifyInstance) {
description: instanceAgents.description,
tokenPrefix: instanceAgents.tokenPrefix,
active: instanceAgents.active,
preferredScannerName: instanceAgents.preferredScannerName,
scanDefaults: instanceAgents.scanDefaults,
createdAt: instanceAgents.createdAt,
})
@@ -106,6 +112,8 @@ export default async function instanceAgentRoutes(server: FastifyInstance) {
name: instanceAgents.name,
description: instanceAgents.description,
active: instanceAgents.active,
preferredScannerName: instanceAgents.preferredScannerName,
scanDefaults: instanceAgents.scanDefaults,
updatedAt: instanceAgents.updatedAt,
})
@@ -127,7 +135,12 @@ export default async function instanceAgentRoutes(server: FastifyInstance) {
}
const [agent] = await server.db
.select({ id: instanceAgents.id, active: instanceAgents.active })
.select({
id: instanceAgents.id,
active: instanceAgents.active,
preferredScannerName: instanceAgents.preferredScannerName,
scanDefaults: instanceAgents.scanDefaults,
})
.from(instanceAgents)
.where(eq(instanceAgents.id, body.agentId))
.limit(1)
@@ -142,9 +155,12 @@ export default async function instanceAgentRoutes(server: FastifyInstance) {
tenantId: requestedTenantId,
agentId: body.agentId,
requestedBy: req.user?.user_id,
scannerName: body.scannerName,
scannerName: body.scannerName || agent.preferredScannerName,
requestedFilename: body.requestedFilename,
settings: body.settings || {},
settings: {
...((agent.scanDefaults || {}) as Record<string, any>),
...(body.settings || {}),
},
target: body.target || {},
})
.returning()