Improve validation and tests

Author: willemarcel

.gitignore

@@ -54,6 +54,7 @@ coverage.xml
 *.log
 .static_storage/
 .media/
+.media/raster/*
 local_settings.py
 
 # Flask stuff:

media/raster/cog.tif

@@ -1,4 +1,5 @@
 from django.contrib.gis.db import models
+from django.core.validators import FileExtensionValidator
 from django.db.models.fields.files import default_storage
 from django.db.models.signals import pre_delete
 from django.dispatch import receiver
@@ -7,7 +8,14 @@
 class RasterFile(models.Model):
     name = models.CharField(max_length=155)
     created = models.DateTimeField(auto_now_add=True)
-    file = models.FileField(upload_to="raster/")
+    file = models.FileField(
+        upload_to="raster/",
+        validators=[
+            FileExtensionValidator(
+                allowed_extensions=["tiff", "tif", "geotiff", "gtiff"]
+            )
+        ],
+    )
 
     def __str__(self):
         return self.name

vbos/datasets/models.py

@@ -1,31 +1,44 @@
 from django.db.models.deletion import ProtectedError
 from django.test import TestCase
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.exceptions import ValidationError
 
 from vbos.datasets.models import RasterDataset, RasterFile
+from genericpath import exists
 
 
 class TestRasterModels(TestCase):
     def setUp(self):
-        self.r_1 = RasterFile.objects.create(
-            name="Rainfall COG", file="raster/rainfall.tiff"
+        self.valid_file = SimpleUploadedFile(
+            "rainfall.tif", b"file_content", content_type="image/tiff"
         )
+        self.r_1 = RasterFile.objects.create(name="Rainfall COG", file=self.valid_file)
         self.r_2 = RasterFile.objects.create(
             name="Coastline COG", file="raster/coastline.tiff"
         )
         self.dataset = RasterDataset.objects.create(name="Rainfall", file=self.r_1)
 
-    def test_deletion_restriction(self):
+    def test_deletion(self):
+        # RasterFile can't be deleted if it's associates with a dataset
         with self.assertRaises(ProtectedError):
             self.r_1.delete()
-        self.r_2.delete()
-        self.assertEqual(RasterFile.objects.count(), 1)
-
-    def test_deletion(self):
+        # modify dataset
         self.dataset.file = self.r_2
         self.dataset.save()
+        # delete file
         self.r_1.delete()
         self.assertEqual(RasterFile.objects.count(), 1)
+        # delete dataset
         self.dataset.delete()
         self.assertEqual(RasterDataset.objects.count(), 0)
+        # delete remaining file
         self.r_2.delete()
         self.assertEqual(RasterFile.objects.count(), 0)
+
+        # test file extension validation
+        invalid_file = SimpleUploadedFile(
+            "test.jpg", b"file_content", content_type="image/jpeg"
+        )
+        raster = RasterFile(name="Test", file=invalid_file)
+        with self.assertRaises(ValidationError):
+            raster.full_clean()