feat: add weather is forecast, update cron job, add logging for weather

.github/workflows/ci.yml

@@ -34,9 +34,6 @@ jobs:
       - name: Black Lint
         run: poetry run black --line-length 120 --exclude '/migrations/' --check apps project
 
-      - name: Isort Lint
-        run: poetry run isort --check-only --diff apps project -l 120
-
       - name: Ruff Lint
         run: poetry run ruff check .
 

.pre-commit-config.yaml

@@ -12,12 +12,6 @@ repos:
     -   id: black
 
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort (python)
-
   - repo: https://github.com/compilerla/conventional-pre-commit
     rev: 'v2.1.1'
     hooks:

apps/weather/admin.py

@@ -5,4 +5,5 @@
 
 @admin.register(Weather)
 class WeatherAdmin(admin.ModelAdmin):
-    list_filter = ["date_time", "location"]
+    list_filter = ["date_time", "location", "is_forecast"]
+    read_only_fields = ["is_forecast", "created", "updated"]

apps/weather/management/commands/populate_weather.py

@@ -1,8 +1,15 @@
+import logging
+
 import requests
 from django.contrib.gis.geos import Point
 from django.core.management.base import BaseCommand
+from django.utils.timezone import datetime, now
+from pytz import utc
 from weather.models import Weather
 
+# Get an instance of a logger
+logger = logging.getLogger(__name__)
+
 
 class Command(BaseCommand):
     """Command for populating weather into the database.
@@ -18,7 +25,9 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         # TODO get lat/lon from database.
         for lat, lon in [(52.52, 13.41), (52.40, -2.01)]:
+            logger.debug(f"Fetching data for {lat}, {lon}")
             resp = requests.get(self.url.format(lat, lon)).json()
+            time_now = now()
 
             for time, temp, apparent_temp, rain, weather_code, cloud_cover in zip(
                 resp["hourly"]["time"],
@@ -28,15 +37,18 @@ def handle(self, *args, **options):
                 resp["hourly"]["weathercode"],
                 resp["hourly"]["cloudcover"],
             ):
+                tz_aware_time = datetime.fromisoformat(time)
+                tz_aware_time = utc.localize(tz_aware_time)
                 # this is bad! optimise later!
                 Weather.objects.update_or_create(
-                    date_time=time,
+                    date_time=tz_aware_time,
                     location=Point(lat, lon),
                     defaults={
                         "temperature": temp,
                         "apparent_temperature": apparent_temp,
                         "rain": rain,
                         "cloud_cover": cloud_cover,
                         "weather_code": weather_code,
+                        "is_forecast": tz_aware_time > time_now,
                     },
                 )

apps/weather/migrations/0003_weather_is_forecast.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2 on 2023-04-18 17:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("weather", "0002_rename_apparent_temperate_weather_apparent_temperature"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="weather",
+            name="is_forecast",
+            field=models.BooleanField(default=False),
+        ),
+    ]

apps/weather/migrations/0004_set_default_weather.py

@@ -0,0 +1,17 @@
+from django.db import migrations
+from django.utils.timezone import now
+
+
+def update_weather(apps, schema_editor):
+    Weather = apps.get_model("weather", "Weather")
+    for weather in Weather.objects.all():
+        weather.is_forecast = weather.date_time > now()
+        weather.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("weather", "0003_weather_is_forecast"),
+    ]
+
+    operations = [migrations.RunPython(update_weather)]

apps/weather/migrations/0005_alter_weather_is_forecast.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2 on 2023-04-18 17:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("weather", "0004_set_default_weather"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="weather",
+            name="is_forecast",
+            field=models.BooleanField(),
+        ),
+    ]

apps/weather/migrations/0006_weather_created_weather_updated.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2 on 2023-04-18 17:09
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("weather", "0005_alter_weather_is_forecast"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="weather",
+            name="created",
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="weather",
+            name="updated",
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

apps/weather/models.py

@@ -22,6 +22,11 @@ class Weather(models.Model):
     cloud_cover = models.FloatField()
     weather_code = models.FloatField()  # TODO there are choices.
 
+    is_forecast = models.BooleanField()
+
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
+
     class Meta:
         constraints = [
             models.UniqueConstraint(name="unique_weather_for_location_time", fields=["date_time", "location"])

pyproject.toml

@@ -26,6 +26,7 @@ parameterized = "^0.9.0"
 psycopg = "^3.1.8"
 whitenoise = "^6.4.0"
 crispy-bootstrap5 = "^0.7"
+pytz = "^2023.3"
 
 
 [tool.poetry.group.local.dependencies]