Ingest country data and update station model (#15)

* Add country ingestor

* Add code to the station

* Fix flake

deployment/.template.env

@@ -18,4 +18,4 @@ REDIS_PASSWORD=redis_password
 
 RABBITMQ_HOST=rabbitmq
 SENTRY_DSN=
-SECRET_KEY=SECRET_KEY
+INITIAL_FIXTURES=

deployment/docker-compose.yml

@@ -29,7 +29,7 @@ x-common-django:
 
     - RABBITMQ_HOST=${RABBITMQ_HOST:-rabbitmq}
     - SENTRY_DSN=${SENTRY_DSN:-}
-    - SECRET_KEY=SECRET_KEY
+    - INITIAL_FIXTURES=${INITIAL_FIXTURES:-}
   volumes:
     - static-data:/home/web/static
     - media-data:/home/web/media
@@ -98,7 +98,7 @@ services:
 
   dev:
     <<: *default-common-django
-    entrypoint: []
+    entrypoint: [ ]
     volumes:
       - static-data:/home/web/static
       - media-data:/home/web/media

django_project/core/settings/contrib.py

@@ -14,10 +14,9 @@
     'webpack_loader',
     'guardian',
     'django_cleanup.apps.CleanupConfig',
-    'django_celery_beat',
-    'django_celery_results',
-    'drf_yasg',
+    'drf_yasg'
 )
+
 WEBPACK_LOADER = {
     'DEFAULT': {
         'BUNDLE_DIR_NAME': 'frontend/',  # must end with slash

django_project/gap/admin.py

@@ -57,7 +57,7 @@ class StationAdmin(admin.ModelAdmin):
     """Station admin."""
 
     list_display = (
-        'name', 'country', 'provider'
+        'code', 'name', 'country', 'provider'
     )
-    list_filter = ('country',)
-    search_fields = ('name',)
+    list_filter = ('provider', 'country')
+    search_fields = ('code', 'name')

django_project/gap/apps.py

@@ -13,4 +13,4 @@ class GAPConfig(AppConfig):
     """App Config for GroundObservations."""
 
     name = 'gap'
-    verbose_name = _('Ground Observations')
+    verbose_name = _('Global Access Platform')

django_project/gap/management/commands/__init__.py

@@ -0,0 +1,6 @@
+# coding=utf-8
+"""
+Tomorrow Now GAP.
+
+.. note:: Commands
+"""

django_project/gap/management/commands/load_fixtures.py

@@ -0,0 +1,19 @@
+# coding=utf-8
+"""
+Tomorrow Now GAP.
+
+.. note:: Load fixtures
+"""
+
+from django.core.management import call_command
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    """Command to load fixtures."""
+
+    help = 'Generate country geometry'
+
+    def handle(self, *args, **options):
+        """Handle load fixtures."""
+        call_command('loaddata', 'gap/fixtures/1.country.json')

django_project/gap/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2024-06-26 03:55
+# Generated by Django 4.2.7 on 2024-06-27 04:30
 
 import django.contrib.gis.db.models.fields
 from django.db import migrations, models
@@ -35,6 +35,7 @@ class Migration(migrations.Migration):
             ],
             options={
                 'verbose_name_plural': 'countries',
+                'ordering': ['name'],
             },
         ),
         migrations.CreateModel(
@@ -65,6 +66,7 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=512)),
                 ('description', models.TextField(blank=True, null=True)),
+                ('code', models.CharField(max_length=512)),
                 ('geometry', django.contrib.gis.db.models.fields.PointField(srid=4326)),
                 ('country', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gap.country')),
                 ('observation_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gap.observationtype')),

django_project/gap/models.py

@@ -6,6 +6,7 @@
 """
 
 from django.contrib.gis.db import models
+from django.contrib.gis.geos import Point
 
 from core.models.common import Definition
 
@@ -49,7 +50,15 @@ class Country(Definition):
     )
 
     class Meta:  # noqa
-        verbose_name_plural = "countries"
+        verbose_name_plural = 'countries'
+        ordering = ['name']
+
+    @staticmethod
+    def get_countries_by_point(point: Point):
+        """Get country by point."""
+        return Country.objects.filter(
+            geometry__contains=point
+        )
 
 
 class Station(Definition):
@@ -59,6 +68,7 @@ class Station(Definition):
 
     Attributes:
         name (str): Name of the station.
+        code (str): Code of the station.
         country (ForeignKey):
             Foreign key referencing the Country model based on country_ISO_A3.
         geometry (Point):
@@ -67,6 +77,9 @@ class Station(Definition):
             Foreign key referencing the Provider model based on provider_id.
     """
 
+    code = models.CharField(
+        max_length=512
+    )
     country = models.ForeignKey(
         Country, on_delete=models.CASCADE
     )

django_project/initialize.py

@@ -70,17 +70,12 @@
 #########################################################
 # 4. Loading fixtures
 #########################################################
-
-print("-----------------------------------------------------")
-print("4. Loading fixtures")
-
-# Disable fixtures loading in prod by including environment variable:
-#  INITIAL_FIXTURES=False
-
 _load_initial_fixtures = ast.literal_eval(
     os.getenv('INITIAL_FIXTURES', 'False')
 )
 if _load_initial_fixtures:
+    print("-----------------------------------------------------")
+    print("4. Loading fixtures")
     call_command('load_fixtures')
 
 #########################################################
@@ -89,4 +84,4 @@
 
 print("-----------------------------------------------------")
 print("5. Collecting static files")
-call_command('collectstatic', '--noinput', verbosity=0)
+call_command('collectstatic', '--noinput', verbosity=0)