From e756b3692d8da02d8d1bb619b1535ed9fb67be08 Mon Sep 17 00:00:00 2001 From: "Torsten Schulz (local)" Date: Fri, 5 Dec 2025 17:23:54 +0100 Subject: [PATCH] Refactor availability status logic in FalukantService - Enhanced the logic for determining the availability status of vehicles based on the 'availableFrom' date. - Added conditions to differentiate between 'building' and 'available' statuses, improving clarity and accuracy in status reporting. - Updated comments for better understanding of the code flow. --- backend/services/falukantService.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/backend/services/falukantService.js b/backend/services/falukantService.js index 6909225..93b4ddf 100644 --- a/backend/services/falukantService.js +++ b/backend/services/falukantService.js @@ -660,11 +660,18 @@ class FalukantService extends BaseService { if (hasTransportHere) { // verknüpft mit Transport in dieser Region = unterwegs status = 'travelling'; - } else if (plain.availableFrom && new Date(plain.availableFrom).getTime() > now.getTime()) { - // kein Transport, aber Verfügbarkeit liegt in der Zukunft = im Bau - status = 'building'; + } else if (plain.availableFrom) { + const availableFromTime = new Date(plain.availableFrom).getTime(); + const nowTime = now.getTime(); + // Verfügbarkeit liegt in der Zukunft = im Bau oder in Reparatur + if (availableFromTime > nowTime) { + status = 'building'; + } else { + // Verfügbarkeit erreicht = verfügbar + status = 'available'; + } } else { - // kein Transport und Verfügbarkeit erreicht = verfügbar + // Kein availableFrom gesetzt = verfügbar (Fallback) status = 'available'; }