Add value limits to GPS coordinates for Configurations (#410)

HiSPARC · Dec 21, 2024 · 029bc58 · 029bc58
2 parents 2ba4a79 + ccf25c5
commit 029bc58
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 21 deletions.
diff --git a/publicdb/default/management/commands/createfakedata.py b/publicdb/default/management/commands/createfakedata.py
@@ -62,16 +62,16 @@ def handle(*args, **options):
         ]
 
         for summary in summaries:
-            histograms_factories.EventtimeHistogramFactory(summary=summary)
             histograms_factories.AzimuthHistogramFactory(summary=summary)
-            histograms_factories.ZenithHistogramFactory(summary=summary)
+            histograms_factories.BarometerDatasetFactory(summary=summary)
+            histograms_factories.ConfigurationFactory(summary=summary)
+            histograms_factories.DetectorTimingOffsetFactory(summary=summary)
+            histograms_factories.EventtimeHistogramFactory(summary=summary)
             histograms_factories.PulseheightHistogramFactory(summary=summary)
             histograms_factories.PulseintegralHistogramFactory(summary=summary)
-            histograms_factories.SingleslowHistogramFactory(summary=summary)
             histograms_factories.SingleshighHistogramFactory(summary=summary)
-            histograms_factories.TemperatureDatasetFactory(summary=summary)
-            histograms_factories.BarometerDatasetFactory(summary=summary)
-            histograms_factories.SinglesratelowDatasetFactory(summary=summary)
+            histograms_factories.SingleslowHistogramFactory(summary=summary)
             histograms_factories.SinglesratehighDatasetFactory(summary=summary)
-            histograms_factories.ConfigurationFactory(summary=summary)
-            histograms_factories.DetectorTimingOffsetFactory(summary=summary)
+            histograms_factories.SinglesratelowDatasetFactory(summary=summary)
+            histograms_factories.TemperatureDatasetFactory(summary=summary)
+            histograms_factories.ZenithHistogramFactory(summary=summary)
diff --git a/publicdb/histograms/jobs.py b/publicdb/histograms/jobs.py
@@ -581,16 +581,27 @@ def update_config(summary):
 
     for config in configs[summary.num_config :]:
         new_config = Configuration(summary=summary)
-        for var in vars(new_config):
-            if var in ['summary', 'id', 'summary_id'] or var[0] == '_':
-                pass
-            elif var in ['mas_version', 'slv_version']:
-                vars(new_config)[var] = blobs[config[var]]
-            elif var == 'timestamp':
-                ts = datetime.datetime.utcfromtimestamp(config[var])
-                vars(new_config)[var] = ts
+        for field in new_config._meta.get_fields():
+            field_name = field.name
+            if field_name in ['summary', 'id']:
+                continue
+            elif field_name in ['mas_version', 'slv_version']:
+                value = blobs[config[field_name]]
+            elif field_name == 'timestamp':
+                value = datetime.datetime.utcfromtimestamp(config[field_name])
+            elif field_name == 'gps_latitude':
+                if -90 <= config[field_name] <= 90:
+                    value = config[field_name]
+                else:
+                    value = 0
+            elif field_name == 'gps_longitude':
+                if -360 <= config[field_name] <= 360:
+                    value = config[field_name]
+                else:
+                    value = 0
             else:
-                vars(new_config)[var] = config[var]
+                value = config[field_name]
+            setattr(new_config, field_name, value)
         django.db.close_old_connections()
         new_config.save()
 

diff --git a/publicdb/inforecords/views.py b/publicdb/inforecords/views.py
@@ -1,5 +1,3 @@
-import socket
-
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import render
@@ -11,7 +9,7 @@ def create_datastore_config(request):
     """Create the datastore configuration"""
 
     # Limit access to only allow access from the Datastore server
-    if socket.gethostbyaddr(request.META['REMOTE_ADDR'])[0] != settings.DATASTORE_HOST:
+    if request.META['REMOTE_HOST'] != settings.DATASTORE_HOST:
         raise PermissionDenied
 
     return render(

diff --git a/publicdb/settings_docker.py b/publicdb/settings_docker.py
@@ -26,4 +26,4 @@
 DATASTORE_PROXY = 'http://datastore:8002'
 
 # Datastore host name
-DATASTORE_HOST = 'publicdb_datastore_1.publicdb_default'
+DATASTORE_HOST = 'datastore'
diff --git a/tests/factories/histograms_factories.py b/tests/factories/histograms_factories.py
@@ -168,6 +168,7 @@ class NetworkHistogramFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = models.NetworkHistogram
+        django_get_or_create = ('network_summary', 'type')
 
 
 class CoincidencetimeHistogramFactory(NetworkHistogramFactory):
@@ -190,6 +191,7 @@ class DailyHistogramFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = models.DailyHistogram
+        django_get_or_create = ('summary', 'type')
 
 
 class EventtimeHistogramFactory(DailyHistogramFactory):
@@ -249,6 +251,7 @@ class DailyDatasetFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = models.DailyDataset
+        django_get_or_create = ('summary', 'type')
 
 
 class TemperatureDatasetFactory(DailyDatasetFactory):
@@ -301,3 +304,4 @@ class StationTimingOffsetFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = models.StationTimingOffset
+        django_get_or_create = ('ref_summary', 'summary')