API voor live gas verbruik #562

Author: dennissiemensma

dsmr_api/tests/v2/test_consumption.py

@@ -73,6 +73,10 @@ def test_get(self, now_mock):
 class GasLive(APIv2TestCase):
     @mock.patch('django.utils.timezone.now')
     def test_get(self, now_mock):
+        # Without gas.
+        result = self._request('gas-live')
+        self.assertEqual(result, {})
+
         now_mock.return_value = timezone.make_aware(timezone.datetime(2019, 4, 20))
         GasConsumption.objects.create(**{
             "read_at": "2019-04-19T12:00:00+02:00",

dsmr_api/tests/v2/test_generic.py

@@ -1,6 +1,5 @@
-from django.db.migrations.executor import MigrationExecutor
+from django.contrib.auth.models import User
 from django.urls.base import reverse
-from django.db import connection
 from django.apps import apps
 
 from dsmr_api.models import APISettings
@@ -34,11 +33,7 @@ def app(self):
 
     def test_user_does_not_exist(self):
         """ Tests what happens when the API user was not created. """
-        if connection.vendor == 'sqlite':  # pragma: no cover
-            return self.skipTest(reason='SQLite cannot be used while foreign key constraint checks are enabled')
-
-        # Roll back migration creating the API user.
-        MigrationExecutor(connection=connection).migrate([(self.app, '0002_generate_random_auth_key')])
+        User.objects.all().delete()
 
         response = self.client.get(
             reverse('{}:dsmrreading'.format(self.NAMESPACE)),

dsmr_consumption/services.py

@@ -341,13 +341,7 @@ def live_gas_consumption():
         # Don't even bother when no data available.
         return data
 
-    latest_timestamp = timezone.localtime(latest_data.read_at)
-
-    # In case the smart meter is running a clock in the future.
-    if latest_timestamp > timezone.now():
-        latest_timestamp = timezone.now()
-
-    data['timestamp'] = latest_timestamp
+    data['timestamp'] = timezone.localtime(latest_data.read_at)
     data['currently_delivered'] = latest_data.currently_delivered
 
     try: