[API] Gas cost missing at start of day #432

Author: dennissiemensma

docs/changelog.rst

@@ -26,6 +26,7 @@ v1.14.0 - 2018-xx-xx
 - [`#441 <https://github.com/dennissiemensma/dsmr-reader/issues/441>`_] PVOutput exports schedulen naar ingestelde upload interval - by pyrocumulus
 - [`#436 <https://github.com/dennissiemensma/dsmr-reader/issues/436>`_] Update docs: authentication method for public webinterface
 - [`#445 <https://github.com/dennissiemensma/dsmr-reader/issues/445>`_] Upload/export to PVoutput doesn't work
+- [`#432 <https://github.com/dennissiemensma/dsmr-reader/issues/432>`_] [API] Gas cost missing at start of day 
 
 
 

dsmr_api/tests/v2/test_consumption.py

@@ -23,13 +23,21 @@ def test_get(self, now_mock):
 
         FIELDS = (
             'day', 'electricity1', 'electricity2', 'electricity1_returned', 'electricity2_returned',
-            'electricity1_cost', 'electricity2_cost', 'total_cost'
+            'electricity1_cost', 'electricity2_cost', 'gas', 'gas_cost', 'total_cost'
         )
 
         for x in FIELDS:
             self.assertIn(x, result.keys())
 
 
+class TestTodayWithGas(TestToday):
+    fixtures = [
+        'dsmr_api/test_electricity_consumption.json',
+        'dsmr_api/test_electricity_consumption.json',
+        'dsmr_api/test_gas_consumption.json'
+    ]
+
+
 class TestElectricity(APIv2TestCase):
     fixtures = ['dsmr_api/test_electricity_consumption.json']
 

dsmr_api/views/v2.py

@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 from rest_framework import mixins, viewsets
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -31,6 +33,7 @@ class TodayConsumptionView(APIView):
         'electricity2_returned_end', 'electricity_cost_merged', 'electricity_merged', 'electricity_returned_merged',
         'average_temperature', 'lowest_temperature', 'highest_temperature', 'latest_consumption'
     )
+    DEFAULT_ZERO_FIELDS = ('gas', 'gas_cost')  # These might miss during the first hour of each day.
 
     def get(self, request):
         try:
@@ -45,6 +48,11 @@ def get(self, request):
             if x in day_totals.keys():
                 del day_totals[x]
 
+        # Default these, if omitted.
+        for x in self.DEFAULT_ZERO_FIELDS:
+            if x not in day_totals.keys():
+                day_totals[x] = Decimal(0)
+
         return Response(day_totals)