Remove SensorDataStat

Author: karimkawambwa

sensorsafrica/admin.py

@@ -2,7 +2,7 @@
 from django.utils.html import format_html
 from django.conf.urls import include, url
 from django.template.response import TemplateResponse
-from .api.models import LastActiveNodes, SensorDataStat, City
+from .api.models import LastActiveNodes, City
 from django.db.models import Q
 
 from feinstaub.sensors.admin import (
@@ -77,57 +77,6 @@ def delete_model(self, request, obj):
     def save_related(self, request, form, formsets, change):
         pass
 
-
-@admin.register(SensorDataStat)
-class SensorDataStatAdmin(admin.ModelAdmin):
-    readonly_fields = [
-        "node",
-        "sensor",
-        "location",
-        "city_slug",
-        "value_type",
-        "average",
-        "maximum",
-        "minimum",
-        "timestamp",
-    ]
-    search_fields = ["city_slug", "value_type"]
-    list_display = [
-        "node",
-        "sensor",
-        "location",
-        "city_slug",
-        "value_type",
-        "average",
-        "maximum",
-        "minimum",
-        "timestamp",
-        "created",
-        "modified",
-    ]
-    list_filter = ["timestamp", "node", "sensor", "location"]
-
-    def get_actions(self, request):
-        actions = super(SensorDataStatAdmin, self).get_actions(request)
-        del actions["delete_selected"]
-        return actions
-
-    def has_add_permission(self, request):
-        return False
-
-    def has_delete_permission(self, request, obj=None):
-        return False
-
-    def save_model(self, request, obj, form, change):
-        pass
-
-    def delete_model(self, request, obj):
-        pass
-
-    def save_related(self, request, form, formsets, change):
-        pass
-
-
 @admin.register(City)
 class CityAdmin(admin.ModelAdmin):
     search_fields = ["slug", "name", "country"]

sensorsafrica/api/models.py

@@ -5,12 +5,18 @@
 
 
 class City(TimeStampedModel):
-    slug = models.CharField(max_length=255, db_index=True, null=False, blank=False)
-    name = models.CharField(max_length=255, db_index=True, null=False, blank=False)
-    country = models.CharField(max_length=255, db_index=True, null=False, blank=False)
-    location = models.CharField(max_length=255, db_index=True, null=False, blank=False)
-    latitude = models.DecimalField(max_digits=14, decimal_places=11, null=True, blank=True)
-    longitude = models.DecimalField(max_digits=14, decimal_places=11, null=True, blank=True)
+    slug = models.CharField(
+        max_length=255, db_index=True, null=False, blank=False)
+    name = models.CharField(
+        max_length=255, db_index=True, null=False, blank=False)
+    country = models.CharField(
+        max_length=255, db_index=True, null=False, blank=False)
+    location = models.CharField(
+        max_length=255, db_index=True, null=False, blank=False)
+    latitude = models.DecimalField(
+        max_digits=14, decimal_places=11, null=True, blank=True)
+    longitude = models.DecimalField(
+        max_digits=14, decimal_places=11, null=True, blank=True)
 
     class Meta:
         verbose_name_plural = "Cities"
@@ -20,36 +26,6 @@ def save(self, *args, **kwargs):
         return super(City, self).save(*args, **kwargs)
 
 
-class SensorDataStat(TimeStampedModel):
-    node = models.ForeignKey(Node)
-    sensor = models.ForeignKey(Sensor)
-    location = models.ForeignKey(SensorLocation)
-
-    city_slug = models.CharField(max_length=255, db_index=True, null=False, blank=False)
-    value_type = models.CharField(max_length=255, db_index=True, null=False, blank=False)
-
-    average = models.FloatField(null=False, blank=False)
-    maximum = models.FloatField(null=False, blank=False)
-    minimum = models.FloatField(null=False, blank=False)
-
-    # Number of data points averaged
-    sample_size = models.IntegerField(null=False, blank=False)
-    # Last datetime of calculated stats
-    last_datetime = models.DateTimeField()
-
-    timestamp = models.DateTimeField()
-
-    def __str__(self):
-        return "%s %s %s avg=%s min=%s max=%s" % (
-            self.timestamp,
-            self.city_slug,
-            self.value_type,
-            self.average,
-            self.minimum,
-            self.maximum,
-        )
-
-
 class LastActiveNodes(TimeStampedModel):
     node = models.ForeignKey(Node)
     location = models.ForeignKey(SensorLocation)

sensorsafrica/api/v2/router.py

@@ -5,7 +5,7 @@
 
 data_router = routers.DefaultRouter()
 
-data_router.register(r"", SensorDataStatView)
+data_router.register(r"", SensorDataStatView, basename="sensor_data_stat_view")
 
 city_router = routers.DefaultRouter()
 

sensorsafrica/api/v2/serializers.py

@@ -1,16 +1,6 @@
 from rest_framework import serializers
 
 
-class SensorDataStatSerializer(serializers.Serializer):
-    average = serializers.FloatField()
-    minimum = serializers.FloatField()
-    maximum = serializers.FloatField()
-    value_type = serializers.CharField(max_length=200)
-    start_datetime = serializers.DateTimeField()
-    end_datetime = serializers.DateTimeField()
-    city_slug = serializers.CharField(max_length=200)
-
-
 class RawSensorDataStatSerializer(serializers.Serializer):
     average = serializers.SerializerMethodField()
     minimum = serializers.SerializerMethodField()

sensorsafrica/api/v2/views.py

@@ -13,7 +13,7 @@
 
 from django.db import connection
 
-from ..models import SensorDataStat, LastActiveNodes, City, Node
+from ..models import LastActiveNodes, City, Node
 from .serializers import RawSensorDataStatSerializer, CitySerializer
 
 from feinstaub.sensors.views import StandardResultsSetPagination
@@ -101,7 +101,6 @@ def get_paginated_response(self, data_stats):
 
 
 class SensorDataStatView(mixins.ListModelMixin, viewsets.GenericViewSet):
-    queryset = SensorDataStat.objects.none()
     serializer_class = RawSensorDataStatSerializer
     pagination_class = CustomPagination
 

sensorsafrica/management/commands/calculate_data_statistics.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-02-11 12:24
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sensorsafrica', '0004_auto_20190509_1145'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sensordatastat',
+            name='location',
+        ),
+        migrations.RemoveField(
+            model_name='sensordatastat',
+            name='node',
+        ),
+        migrations.RemoveField(
+            model_name='sensordatastat',
+            name='sensor',
+        ),
+        migrations.DeleteModel(
+            name='SensorDataStat',
+        ),
+    ]

sensorsafrica/migrations/0005_auto_20200211_1224.py

@@ -97,10 +97,11 @@
 # Database
 # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
 
-DATABASE_URL = os.getenv(
-    "SENSORSAFRICA_DATABASE_URL",
-    "postgres://sensorsafrica:sensorsafrica@localhost:5432/sensorsafrica",
-)
+DATABASE_URL = "postgres://htools:EFiNop6PMKBbeE6@cfa-general.cfgmtx8ishfx.eu-west-1.rds.amazonaws.com:54321/htools-airquality-api"
+#  os.getenv(
+#     "SENSORSAFRICA_DATABASE_URL",
+#     "postgres://sensorsafrica:sensorsafrica@localhost:5432/sensorsafrica",
+# )
 DATABASES = {"default": dj_database_url.parse(DATABASE_URL)}
 
 
@@ -152,10 +153,6 @@
 CELERY_IGNORE_RESULT = True
 
 CELERY_BEAT_SCHEDULE = {
-    "statistics-task": {
-        "task": "sensorsafrica.tasks.calculate_data_statistics",
-        "schedule": crontab(hour="*", minute=0)
-    },
     "archive-task": {
         "task": "sensorsafrica.tasks.archive_data",
         "schedule": crontab(hour="*", minute=0)

sensorsafrica/settings.py

@@ -2,11 +2,6 @@
 from django.core.management import call_command
 
 
-@shared_task
-def calculate_data_statistics():
-    call_command("calculate_data_statistics")
-
-
 @shared_task
 def archive_data():
     call_command("upload_to_ckan")

sensorsafrica/tasks.py

@@ -203,14 +203,7 @@ def datavalues(sensors, sensordata):
 
 
 @pytest.fixture
-def sensorsdatastats(datavalues):
-    from django.core.management import call_command
-
-    call_command("calculate_data_statistics")
-
-
-@pytest.fixture
-def additional_sensorsdatastats(sensors, locations, sensorsdatastats):
+def additional_sensorsdatastats(sensors, locations):
     sensordata = SensorData.objects.bulk_create([
         SensorData(sensor=sensors[0], location=locations[0]),
         SensorData(sensor=sensors[0], location=locations[0]),
@@ -224,13 +217,9 @@ def additional_sensorsdatastats(sensors, locations, sensorsdatastats):
         SensorDataValue(sensordata=sensordata[2], value="4", value_type="P2"),
     ])
 
-    from django.core.management import call_command
-
-    call_command("calculate_data_statistics")
-
 
 @pytest.fixture
-def last_active(sensors, locations, sensorsdatastats):
+def last_active(sensors, locations):
     timestamps = [
         timezone.now(),
         timezone.now() + datetime.timedelta(minutes=2),