Skip to content

Update unique datasets name constraint #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

Update unique datasets name constraint #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions vbos/datasets/migrations/0016_alter_rasterdataset_unique_together_and_more.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 5.2.5 on 2025-10-20 21:04

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
(
"datasets",
"0015_rasterdataset_description_tabulardataset_description_and_more",
),
]

operations = [
migrations.AlterUniqueTogether(
name="rasterdataset",
unique_together={("name", "type", "cluster")},
),
migrations.AlterUniqueTogether(
name="tabulardataset",
unique_together={("name", "type", "cluster")},
),
migrations.AlterUniqueTogether(
name="vectordataset",
unique_together={("name", "type", "cluster")},
),
]
12 changes: 6 additions & 6 deletions vbos/datasets/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ class RasterDataset(models.Model):
file = models.ForeignKey(RasterFile, on_delete=models.PROTECT)

def __str__(self):
return self.name
return f"{self.name} - {self.cluster} / {self.type}"

class Meta:
ordering = ["id"]
unique_together = ["name", "type"]
unique_together = ["name", "type", "cluster"]


class VectorDataset(models.Model):
Expand All @@ -114,11 +114,11 @@ class VectorDataset(models.Model):
source = models.CharField(max_length=155, blank=True, null=True)

def __str__(self):
return f"{self.name} ({self.type})"
return f"{self.name} - {self.cluster} / {self.type}"

class Meta:
ordering = ["id"]
unique_together = ["name", "type"]
unique_together = ["name", "type", "cluster"]


class VectorItem(models.Model):
Expand Down Expand Up @@ -155,11 +155,11 @@ class TabularDataset(models.Model):
unit = models.CharField(max_length=50, blank=True, null=True)

def __str__(self):
return f"{self.name} ({self.type})"
return f"{self.name} - {self.cluster} / {self.type}"

class Meta:
ordering = ["id"]
unique_together = ["name", "type"]
unique_together = ["name", "type", "cluster"]


class TabularItem(models.Model):
Expand Down
25 changes: 22 additions & 3 deletions vbos/datasets/test/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def test_deletion(self):

RasterFile.objects.all().delete()

def test_unique_name_type(self):
def test_unique_name_type_cluster(self):
self.cluster = Cluster.objects.create(name="Administrative")
r_2 = RasterFile.objects.create(
name="Population Density COG", file="raster/pop.tiff"
Expand All @@ -84,6 +84,13 @@ def test_unique_name_type(self):
file=r_2,
type="estimated_damage",
)
RasterDataset.objects.create(
name="Population",
cluster=Cluster.objects.create(name="Education"),
source="Government",
file=r_2,
type="estimated_damage",
)
with self.assertRaises(IntegrityError):
RasterDataset.objects.create(
name="Population",
Expand All @@ -94,7 +101,7 @@ def test_unique_name_type(self):


class TestTabularDatasetModel(TestCase):
def test_unique_name_type(self):
def test_unique_name_type_cluster(self):
self.cluster = Cluster.objects.create(name="Administrative")
TabularDataset.objects.create(
name="Population",
Expand All @@ -107,6 +114,12 @@ def test_unique_name_type(self):
source="Government",
type="estimated_damage",
)
TabularDataset.objects.create(
name="Population",
cluster=Cluster.objects.create(name="education"),
source="Government",
type="estimated_damage",
)
with self.assertRaises(IntegrityError):
TabularDataset.objects.create(
name="Population",
Expand All @@ -116,7 +129,7 @@ def test_unique_name_type(self):


class TestVectorDatasetModel(TestCase):
def test_unique_name_type(self):
def test_unique_name_type_cluster(self):
self.cluster = Cluster.objects.create(name="Administrative")
VectorDataset.objects.create(
name="Population",
Expand All @@ -129,6 +142,12 @@ def test_unique_name_type(self):
source="Government",
type="estimated_damage",
)
VectorDataset.objects.create(
name="Population",
cluster=Cluster.objects.create(name="education"),
source="Government",
type="estimated_damage",
)
with self.assertRaises(IntegrityError):
VectorDataset.objects.create(
name="Population",
Expand Down