From 7ab3ec5e3d61e7daef7f5eb8671f95aed55c45e9 Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Mon, 6 Oct 2025 15:55:49 -0300 Subject: [PATCH 1/2] Add unit column to TabularDataset table --- .../migrations/0012_tabulardataset_unit.py | 18 ++++++++++++++++++ vbos/datasets/models.py | 1 + vbos/datasets/serializers.py | 2 +- vbos/datasets/test/test_tabular_views.py | 2 ++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 vbos/datasets/migrations/0012_tabulardataset_unit.py diff --git a/vbos/datasets/migrations/0012_tabulardataset_unit.py b/vbos/datasets/migrations/0012_tabulardataset_unit.py new file mode 100644 index 0000000..bae6c47 --- /dev/null +++ b/vbos/datasets/migrations/0012_tabulardataset_unit.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.5 on 2025-10-06 18:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("datasets", "0011_rename_data_tabularitem_metadata_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="tabulardataset", + name="unit", + field=models.CharField(blank=True, max_length=50, null=True), + ), + ] diff --git a/vbos/datasets/models.py b/vbos/datasets/models.py index c143bea..80e7fab 100644 --- a/vbos/datasets/models.py +++ b/vbos/datasets/models.py @@ -147,6 +147,7 @@ class TabularDataset(models.Model): ) type = models.CharField(max_length=55, choices=TYPE_CHOICES, default="baseline") source = models.CharField(max_length=155, blank=True, null=True) + unit = models.CharField(max_length=50, blank=True, null=True) def __str__(self): return self.name diff --git a/vbos/datasets/serializers.py b/vbos/datasets/serializers.py index 45fc247..8fd72fe 100644 --- a/vbos/datasets/serializers.py +++ b/vbos/datasets/serializers.py @@ -66,7 +66,7 @@ class TabularDatasetSerializer(serializers.ModelSerializer): class Meta: model = TabularDataset - fields = ["id", "name", "created", "updated", "cluster", "type", "source"] + fields = ["id", "name", "created", "updated", "cluster", "type", "source", "unit"] class TabularItemSerializer(serializers.ModelSerializer): diff --git a/vbos/datasets/test/test_tabular_views.py b/vbos/datasets/test/test_tabular_views.py index dc7c282..65059ba 100644 --- a/vbos/datasets/test/test_tabular_views.py +++ b/vbos/datasets/test/test_tabular_views.py @@ -20,6 +20,7 @@ def setUp(self): cluster=Cluster.objects.create(name="Statistics"), source="Government", type="estimated_damage", + unit="Vatu (VUV)" ) self.url = reverse("datasets:tabular-list") @@ -35,6 +36,7 @@ def test_tabular_datasets_list(self): assert req.data.get("results")[1]["cluster"] == "Statistics" assert req.data.get("results")[0]["type"] == "baseline" assert req.data.get("results")[1]["type"] == "estimated_damage" + assert req.data.get("results")[1]["unit"] == "Vatu (VUV)" def test_raster_datasets_list_filter(self): req = self.client.get(self.url, {"cluster": "transportation"}) From 0beac1fa57204f6ce55b623d004b4e70a3d4673a Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Mon, 6 Oct 2025 15:56:08 -0300 Subject: [PATCH 2/2] Lint code --- vbos/datasets/models.py | 2 +- vbos/datasets/serializers.py | 11 ++++++++++- vbos/datasets/test/test_tabular_views.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/vbos/datasets/models.py b/vbos/datasets/models.py index 80e7fab..6319c16 100644 --- a/vbos/datasets/models.py +++ b/vbos/datasets/models.py @@ -147,7 +147,7 @@ class TabularDataset(models.Model): ) type = models.CharField(max_length=55, choices=TYPE_CHOICES, default="baseline") source = models.CharField(max_length=155, blank=True, null=True) - unit = models.CharField(max_length=50, blank=True, null=True) + unit = models.CharField(max_length=50, blank=True, null=True) def __str__(self): return self.name diff --git a/vbos/datasets/serializers.py b/vbos/datasets/serializers.py index 8fd72fe..6db9219 100644 --- a/vbos/datasets/serializers.py +++ b/vbos/datasets/serializers.py @@ -66,7 +66,16 @@ class TabularDatasetSerializer(serializers.ModelSerializer): class Meta: model = TabularDataset - fields = ["id", "name", "created", "updated", "cluster", "type", "source", "unit"] + fields = [ + "id", + "name", + "created", + "updated", + "cluster", + "type", + "source", + "unit", + ] class TabularItemSerializer(serializers.ModelSerializer): diff --git a/vbos/datasets/test/test_tabular_views.py b/vbos/datasets/test/test_tabular_views.py index 65059ba..79aad3d 100644 --- a/vbos/datasets/test/test_tabular_views.py +++ b/vbos/datasets/test/test_tabular_views.py @@ -20,7 +20,7 @@ def setUp(self): cluster=Cluster.objects.create(name="Statistics"), source="Government", type="estimated_damage", - unit="Vatu (VUV)" + unit="Vatu (VUV)", ) self.url = reverse("datasets:tabular-list")