add SKIP_EXISTING_UUID and change requirement of occhab import

PnX-SI · Jul 26, 2024 · 486c54e · 486c54e
1 parent fd5e3e2
commit 486c54e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/backend/geonature/core/imports/checks/errors.py b/backend/geonature/core/imports/checks/errors.py
@@ -52,6 +52,8 @@ class ImportCodeError:
         A uuid value is duplicated
     EXISTING_UUID: str
         A uuid value already exists in the destination table
+    SKIP_EXISTING_UUID: str
+        A uuid value already exists in the destination table and should be skipped
     MISSING_VALUE : str
         A required value is missing (see `mandatory` column in `gn_imports.bib_fields` table)
     MISSING_GEOM : str
@@ -151,6 +153,7 @@ class ImportCodeError:
     DUPLICATE_ROWS = "DUPLICATE_ROWS"
     DUPLICATE_UUID = "DUPLICATE_UUID"
     EXISTING_UUID = "EXISTING_UUID"
+    SKIP_EXISTING_UUID = "SKIP_EXISTING_UUID"
 
     # Missing value when required
     MISSING_VALUE = "MISSING_VALUE"

diff --git a/backend/geonature/migrations/versions/0e8e1943c215_add_import_missing_error.py b/backend/geonature/migrations/versions/0e8e1943c215_add_import_missing_error.py
@@ -39,6 +39,12 @@ def upgrade():
                 "description": "Le champ doit être renseigné avec une valeur numérique (entier, flottant).",
                 "error_level": "ERROR",
             },
+            {
+                "error_type": "Ignorer les données existantes",
+                "name": "SKIP_EXISTING_UUID",
+                "description": "Les entitiés existantes selon UUID sont ignorees.",
+                "error_level": "WARNING",
+            },
         ],
     )
 

diff --git a/...occhab/backend/gn_module_occhab/migrations/69494f900cab_add_requirements_import_occhab.py b/...occhab/backend/gn_module_occhab/migrations/69494f900cab_add_requirements_import_occhab.py
@@ -30,6 +30,14 @@ def upgrade():
         ["id_station_source", dict(optional_conditions=["unique_id_sinp_station"], mandatory=True)],
         ["unique_id_sinp_station", dict(optional_conditions=["id_station_source"], mandatory=True)],
         ["WKT", dict(optional_conditions=["longitude", "latitude"], mandatory=True)],
+        [
+            "latitude",
+            dict(mandatory_conditions=["longitude"], optional_conditions=["WKT"], mandatory=True),
+        ],
+        [
+            "longitude",
+            dict(mandatory_conditions=["latitude"], optional_conditions=["WKT"], mandatory=True),
+        ],
     ]
     for name_field, update_values in inter_fields_conditions:
         op.execute(