553 Adding files to Database when importing extrenal files

flood_adapt/api/measures.py

@@ -35,8 +35,6 @@ def create_measure(attrs: dict[str, Any], type: str = None) -> IMeasure:
         Dictionary of attributes for the measure.
     type : str
         Type of measure to create.
-    database : IDatabase, optional
-        Database to use for creating the measure, by default None
 
     Returns
     -------
@@ -55,6 +53,8 @@ def create_measure(attrs: dict[str, Any], type: str = None) -> IMeasure:
         return Pump.load_dict(attrs)
     elif type in ["water_square", "total_storage", "greening"]:
         return GreenInfrastructure.load_dict(attrs)
+    else:
+        raise ValueError(f"Invalid measure type: {type}")
 
 
 def save_measure(measure: IMeasure) -> None:

flood_adapt/dbs_classes/dbs_event.py

@@ -1,4 +1,3 @@
-import shutil
 from pathlib import Path
 from typing import Any
 
@@ -58,45 +57,6 @@ def list_objects(self) -> dict[str, list[Any]]:
         events["objects"] = objects
         return events
 
-    def copy(self, old_name: str, new_name: str, new_description: str):
-        """Copy (duplicate) an existing object, and give it a new name.
-
-        Parameters
-        ----------
-        old_name : str
-            name of the existing measure
-        new_name : str
-            name of the new measure
-        new_description : str
-            description of the new measure
-        """
-        # Check if the provided old_name is valid
-        if old_name not in self.list_objects()["name"]:
-            raise ValueError(
-                f"{self._object_class.class_name} '{old_name}' does not exist."
-            )
-
-        # First do a get and change the name and description
-        copy_object = self.get(old_name)
-        copy_object.attrs.name = new_name
-        copy_object.attrs.description = new_description
-
-        # After changing the name and description, receate the model to re-trigger the validators
-        copy_object.attrs = type(copy_object.attrs)(**copy_object.attrs.model_dump())
-
-        # Then a save. Checking whether the name is already in use is done in the save function
-        self.save(copy_object)
-
-        # Then save all the accompanied files
-        src = self.input_path / old_name
-        dest = self.input_path / new_name
-
-        EXCLUDE = [".spw", ".toml"]
-        for file in src.glob("*"):
-            if file.suffix in EXCLUDE:
-                continue
-            shutil.copy(file, dest / file.name)
-
     def _check_standard_objects(self, name: str) -> bool:
         """Check if an event is a standard event.
 

flood_adapt/dbs_classes/dbs_template.py

@@ -103,8 +103,27 @@ def copy(self, old_name: str, new_name: str, new_description: str):
         # After changing the name and description, receate the model to re-trigger the validators
         copy_object.attrs = type(copy_object.attrs)(**copy_object.attrs.model_dump())
 
-        # Then save. Checking whether the name is already in use is done in the save function
-        self.save(copy_object)
+        EXCLUDE_SUFFIX = [".spw"]
+        try:
+            # Copy the folder
+            shutil.copytree(
+                self.input_path / old_name,
+                self.input_path / new_name,
+                ignore=shutil.ignore_patterns(*EXCLUDE_SUFFIX),
+            )
+
+            # Rename the toml file to not raise in the name check
+            os.rename(
+                self.input_path / new_name / f"{old_name}.toml",
+                self.input_path / new_name / f"{new_name}.toml",
+            )
+
+            # Check new name is valid and update toml file
+            self.save(copy_object, overwrite=True)
+        except:
+            # If an error occurs, delete the folder and raise the error
+            shutil.rmtree(self.input_path / new_name, ignore_errors=True)
+            raise
 
     def save(
         self,

flood_adapt/object_model/hazard/measure/green_infrastructure.py

@@ -34,6 +34,7 @@ def save_additional(self, toml_path: Path | str | os.PathLike) -> None:
                 self.dir_name, self.attrs.name, self.attrs.polygon_file
             )
             path = save_file_to_database(src_path, Path(toml_path).parent)
+
             # Update the shapefile path in the object so it is saved in the toml file as well
             self.attrs.polygon_file = path.name
 

tests/test_api/test_measures.py

@@ -0,0 +1,91 @@
+import pytest
+
+from flood_adapt.api.measures import (
+    copy_measure,
+    create_measure,
+    delete_measure,
+    get_measure,
+    save_measure,
+)
+from tests.test_object_model.test_measures import (
+    test_buyout,
+    test_elevate,
+    test_floodproof,
+    test_floodwall,
+    test_green_infra,
+    test_pump,
+)
+
+__all__ = [
+    "test_buyout",
+    "test_elevate",
+    "test_floodproof",
+    "test_floodwall",
+    "test_pump",
+    "test_green_infra",
+]
+# dict of measure fixture names and their corresponding measure type
+measure_fixtures = {
+    "test_elevate": "elevate_properties",
+    "test_buyout": "buyout_properties",
+    "test_floodproof": "floodproof_properties",
+    "test_floodwall": "floodwall",
+    "test_pump": "pump",
+    "test_green_infra": "greening",
+}
+
+
+@pytest.mark.parametrize("measure_fixture_name", measure_fixtures.keys())
+def test_create_measure(measure_fixture_name, request):
+    measure = request.getfixturevalue(measure_fixture_name)
+    measure_type = measure_fixtures[measure_fixture_name]
+
+    measure = create_measure(attrs=measure.attrs, type=measure_type)
+    assert measure is not None
+
+
+@pytest.mark.parametrize("measure_fixture", measure_fixtures.keys())
+def test_save_measure(test_db, measure_fixture, request):
+    measure = request.getfixturevalue(measure_fixture)
+
+    save_measure(measure)
+    assert (test_db.measures.input_path / measure.attrs.name).exists()
+
+
+@pytest.mark.parametrize("measure_fixture", measure_fixtures.keys())
+def test_get_measure(test_db, measure_fixture, request):
+    measure = request.getfixturevalue(measure_fixture)
+
+    save_measure(measure)
+    assert (test_db.measures.input_path / measure.attrs.name).exists()
+
+    loaded_measure = get_measure(measure.attrs.name)
+    assert loaded_measure == measure
+
+
+@pytest.mark.parametrize("measure_fixture", measure_fixtures.keys())
+def test_delete_measure(test_db, measure_fixture, request):
+    measure = request.getfixturevalue(measure_fixture)
+    save_measure(measure)
+    assert (test_db.measures.input_path / measure.attrs.name).exists()
+
+    delete_measure(measure.attrs.name)
+    assert not (test_db.measures.input_path / measure.attrs.name).exists()
+
+
+@pytest.mark.parametrize("measure_fixture", measure_fixtures.keys())
+def test_copy_measure(test_db, measure_fixture, request):
+    measure = request.getfixturevalue(measure_fixture)
+    save_measure(measure)
+    assert (test_db.measures.input_path / measure.attrs.name).exists()
+
+    new_name = f"copy_{measure.attrs.name}"
+    new_description = f"copy of {measure.attrs.description}"
+
+    copy_measure(
+        old_name=measure.attrs.name, new_name=new_name, new_description=new_description
+    )
+    new_measure = get_measure(new_name)
+
+    assert (test_db.measures.input_path / new_name).exists()
+    assert measure == new_measure

tests/test_object_model/test_measures.py

@@ -34,22 +34,30 @@
 )
 
 
-def test_floodwall_read(test_db):
-    test_toml = test_db.input_path / "measures" / "seawall" / "seawall.toml"
-    assert test_toml.is_file()
+@pytest.fixture
+def test_floodwall(test_data_dir):
+    floodwall_model = {
+        "name": "test_seawall",
+        "description": "seawall",
+        "type": HazardType.floodwall,
+        "selection_type": SelectionType.polygon,
+        "elevation": UnitfulLength(value=12, units=UnitTypesLength.feet),
+        "polygon_file": str(test_data_dir / "polyline.geojson"),
+    }
+    return FloodWall(floodwall_model)
 
-    floodwall = FloodWall.load_file(test_toml)
 
-    assert isinstance(floodwall.attrs.name, str)
-    assert isinstance(floodwall.attrs.description, str)
-    assert isinstance(floodwall.attrs.type, HazardType)
-    assert isinstance(floodwall.attrs.elevation, UnitfulLength)
+def test_floodwall_read(test_floodwall):
+    assert isinstance(test_floodwall.attrs.name, str)
+    assert isinstance(test_floodwall.attrs.description, str)
+    assert isinstance(test_floodwall.attrs.type, HazardType)
+    assert isinstance(test_floodwall.attrs.elevation, UnitfulLength)
 
-    assert floodwall.attrs.name == "seawall"
-    assert floodwall.attrs.description == "seawall"
-    assert floodwall.attrs.type == "floodwall"
-    assert floodwall.attrs.elevation.value == 12
-    assert floodwall.attrs.elevation.units == UnitTypesLength.feet
+    assert test_floodwall.attrs.name == "test_seawall"
+    assert test_floodwall.attrs.description == "seawall"
+    assert test_floodwall.attrs.type == "floodwall"
+    assert test_floodwall.attrs.elevation.value == 12
+    assert test_floodwall.attrs.elevation.units == UnitTypesLength.feet
 
 
 def test_elevate_aggr_area_read(test_db):