From 4c1f188371473c23ab08b59e85aef074b31ab6a0 Mon Sep 17 00:00:00 2001
From: Matthias Hochmeister <matthias.hochmeister@apple.com>
Date: Sat, 28 Mar 2026 18:13:07 +0100
Subject: [PATCH] fix: use ausruestung.bezeichnung in checklist queries and
 cast interval param in atemschutz

---
 backend/src/services/atemschutz.service.ts | 8 ++++----
 backend/src/services/checklist.service.ts  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/services/atemschutz.service.ts b/backend/src/services/atemschutz.service.ts
index 518e96b..a365daf 100644
--- a/backend/src/services/atemschutz.service.ts
+++ b/backend/src/services/atemschutz.service.ts
@@ -230,20 +230,20 @@ class AtemschutzService {
           at.leistungstest_gueltig_bis,
           CASE
             WHEN at.untersuchung_gueltig_bis < CURRENT_DATE THEN 'abgelaufen'
-            WHEN at.untersuchung_gueltig_bis <= CURRENT_DATE + $1 THEN 'bald_faellig'
+            WHEN at.untersuchung_gueltig_bis <= CURRENT_DATE + $1::interval THEN 'bald_faellig'
             ELSE 'ok'
           END as untersuchung_status,
           CASE
             WHEN at.leistungstest_gueltig_bis < CURRENT_DATE THEN 'abgelaufen'
-            WHEN at.leistungstest_gueltig_bis <= CURRENT_DATE + $1 THEN 'bald_faellig'
+            WHEN at.leistungstest_gueltig_bis <= CURRENT_DATE + $1::interval THEN 'bald_faellig'
             ELSE 'ok'
           END as leistungstest_status
         FROM atemschutz_traeger at
         JOIN users u ON u.id = at.user_id
         WHERE at.einsatzbereit = TRUE
           AND (
-            at.untersuchung_gueltig_bis <= CURRENT_DATE + $1
-            OR at.leistungstest_gueltig_bis <= CURRENT_DATE + $1
+            at.untersuchung_gueltig_bis <= CURRENT_DATE + $1::interval
+            OR at.leistungstest_gueltig_bis <= CURRENT_DATE + $1::interval
           )
         ORDER BY LEAST(at.untersuchung_gueltig_bis, at.leistungstest_gueltig_bis) ASC
       `, [`${daysAhead} days`]);
diff --git a/backend/src/services/checklist.service.ts b/backend/src/services/checklist.service.ts
index 72d61c3..b8d7206 100644
--- a/backend/src/services/checklist.service.ts
+++ b/backend/src/services/checklist.service.ts
@@ -667,7 +667,7 @@ async function getExecutionById(id: string) {
     const execResult = await pool.query(
       `SELECT a.*,
               f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname,
-              ar.name AS ausruestung_name,
+              ar.bezeichnung AS ausruestung_name,
               v.name AS vorlage_name,
               u1.name AS ausgefuehrt_von_name,
               u2.name AS freigegeben_von_name
@@ -823,7 +823,7 @@ async function getExecutions(filter?: { fahrzeugId?: string; ausruestungId?: str
     const result = await pool.query(
       `SELECT a.*,
               f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname,
-              ar.name AS ausruestung_name,
+              ar.bezeichnung AS ausruestung_name,
               v.name AS vorlage_name,
               u1.name AS ausgefuehrt_von_name,
               u2.name AS freigegeben_von_name
@@ -853,7 +853,7 @@ async function getOverdueChecklists() {
     const result = await pool.query(`
       SELECT cf.*,
              f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname,
-             ar.name AS ausruestung_name,
+             ar.bezeichnung AS ausruestung_name,
              v.name AS vorlage_name
       FROM checklist_faelligkeit cf
       LEFT JOIN fahrzeuge f ON f.id = cf.fahrzeug_id AND f.deleted_at IS NULL