Rename attribute to dataset_attribute of shorterm forecast data and u…

…pdate Diagram (#91)

* Rename attribute to dataset_attribute of shorterm forecast data

* Update database diagram

django_project/gap/factories/crop_insight.py

@@ -69,7 +69,7 @@ class Meta:  # noqa
         model = FarmShortTermForecastData
 
     forecast = factory.SubFactory(FarmShortTermForecastFactory)
-    attribute = factory.SubFactory(DatasetAttributeFactory)
+    dataset_attribute = factory.SubFactory(DatasetAttributeFactory)
     value_date = factory.Faker('date')
     value = factory.Faker('pyfloat')
 

django_project/gap/migrations/0007_alter_farmshorttermforecastdata_options_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.7 on 2024-08-13 02:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gap', '0006_datasettype_variable_name'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='farmshorttermforecastdata',
+            options={'ordering': ['dataset_attribute', '-value_date']},
+        ),
+        migrations.RenameField(
+            model_name='farmshorttermforecastdata',
+            old_name='attribute',
+            new_name='dataset_attribute',
+        ),
+    ]

django_project/gap/models/crop_insight.py

@@ -61,7 +61,7 @@ class FarmShortTermForecastData(models.Model):
     forecast = models.ForeignKey(
         FarmShortTermForecast, on_delete=models.CASCADE
     )
-    attribute = models.ForeignKey(
+    dataset_attribute = models.ForeignKey(
         DatasetAttribute, on_delete=models.CASCADE,
         help_text='Forecast attribute'
     )
@@ -73,7 +73,7 @@ class FarmShortTermForecastData(models.Model):
     )
 
     class Meta:  # noqa: D106
-        ordering = ['attribute', '-value_date']
+        ordering = ['dataset_attribute', '-value_date']
 
 
 class FarmProbabilisticWeatherForcast(models.Model):
@@ -290,7 +290,7 @@ def data(self):
                     if key not in output:
                         output[key] = {}
                     output[key][
-                        data.attribute.attribute.variable_name
+                        data.dataset_attribute.attribute.variable_name
                     ] = data.value
         return output
 
@@ -370,7 +370,7 @@ def generate_report(self):
                         different = data.value_date - first_date
                         curr_idx = different.days * 3  # 3 columns per day
                         curr_idx += first_columns_count
-                        var = data.attribute.source
+                        var = data.dataset_attribute.source
                         if var == 'temperatureMax':
                             curr_idx += 1
                         elif var == 'rainAccumulationSum':

django_project/spw/generator/crop_insight.py

@@ -73,7 +73,7 @@ def generate_spw(self):
                             FarmShortTermForecastData.objects.update_or_create(
                                 forecast=c,
                                 value_date=_date,
-                                attribute=attr,
+                                dataset_attribute=attr,
                                 defaults={
                                     'value': val
                                 }

docs/src/developer/data-model.md

@@ -13,9 +13,9 @@ license: This program is free software; you can redistribute it and/or modify it
 
 ## GAP
 
-![database design gap](./diagram/ground-observations-database-design-1.png)
+![database design gap](./diagram/solution-design-app-0018-Database-GAP.drawio.png)
 
 ## SPW
 
-![database design spw](./diagram/ground-observations-database-design-2.png)
+![database design spw](./diagram/solution-design-app-0018-Database-SPW.drawio.png)