fix more metrics logic

ParkenDD · Jul 18, 2024 · be955bb · be955bb
1 parent f28e8aa
commit be955bb
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.7.5
+
+Released 2024-07-18
+
+### Fixes
+
+* Fix more metrics logic
+
+
 ## 0.7.4
 
 Released 2024-07-18

diff --git a/webapp/prometheus_api/prometheus_handler.py b/webapp/prometheus_api/prometheus_handler.py
@@ -158,26 +158,28 @@ def get_parking_site_metrics(self) -> list[str]:
                     parking_site_name=parking_site.name,
                 )
             )
-            if parking_site.has_realtime_data:
-                if parking_site.realtime_capacity is None:
-                    continue
-                parking_site_realtime_capacity.metrics.append(
-                    ParkingSiteMetric(
-                        parking_site_uid=parking_site.original_uid,
-                        source=parking_site.source.uid,
-                        value=parking_site.realtime_capacity,
-                        parking_site_name=parking_site.name,
-                    )
+            if not parking_site.has_realtime_data:
+                continue
+
+            if parking_site.realtime_capacity is None:
+                continue
+            parking_site_realtime_capacity.metrics.append(
+                ParkingSiteMetric(
+                    parking_site_uid=parking_site.original_uid,
+                    source=parking_site.source.uid,
+                    value=parking_site.realtime_capacity,
+                    parking_site_name=parking_site.name,
                 )
-                if parking_site.realtime_free_capacity is None:
-                    continue
-                parking_site_realtime_free_capacity.metrics.append(
-                    ParkingSiteMetric(
-                        parking_site_uid=parking_site.original_uid,
-                        source=parking_site.source.uid,
-                        value=parking_site.realtime_free_capacity,
-                        parking_site_name=parking_site.name,
-                    )
+            )
+            if parking_site.realtime_free_capacity is None:
+                continue
+            parking_site_realtime_free_capacity.metrics.append(
+                ParkingSiteMetric(
+                    parking_site_uid=parking_site.original_uid,
+                    source=parking_site.source.uid,
+                    value=parking_site.realtime_free_capacity,
+                    parking_site_name=parking_site.name,
                 )
+            )
 
-        return parking_site_static_capacity.to_metrics() + parking_site_realtime_capacity.to_metrics()
+        return parking_site_static_capacity.to_metrics() + parking_site_realtime_capacity.to_metrics() + parking_site_realtime_free_capacity.to_metrics()