Fix tests, rename migration to 1.1.0, switch to Python enum

3liz · Oct 24, 2023 · 14b4dc8 · 14b4dc8
1 parent 343a18b
commit 14b4dc8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/.../install/sql/upgrade/upgrade_to_0.0.2.sql → .../install/sql/upgrade/upgrade_to_1.1.0.sql b/.../install/sql/upgrade/upgrade_to_0.0.2.sql → .../install/sql/upgrade/upgrade_to_1.1.0.sql
diff --git a/netads/processing_netads/data/import_impacts.py b/netads/processing_netads/data/import_impacts.py
@@ -2,6 +2,7 @@
 __license__ = "GPL version 3"
 __email__ = "[email protected]"
 
+from enum import Enum
 from typing import Callable, Dict, List, Tuple, Union
 
 from qgis import processing
@@ -31,14 +32,12 @@
 
 from netads.processing_netads.data.base import BaseDataAlgorithm
 
-LISTE_TYPE = (
-    'ZONAGE', 'SERVITUDE', 'PRESCRIPTION', 'INFORMATION',
-)
 
-# Impact = namedtuple(
-#     'Impact',
-#     ['type', 'code', 'sous_code', 'etiquette', 'libelle', 'description']
-# )
+class ListeType(Enum):
+    Zonage = 'ZONAGE'
+    Servitude = 'SERVITUDE'
+    Prescription = 'PRESCRIPTION'
+    Information = 'INFORMATION'
 
 
 def sql_error_handler(func: Callable):
@@ -84,7 +83,7 @@ def shortHelpString(self):
             "<br>"
             "Le champ pour le 'type' doit contenir exclusivement "
             "les valeurs suivantes : "
-            f"{','.join(LISTE_TYPE)}"
+            f"{','.join([e.value for e in ListeType])}"
         )
 
     # noinspection PyMethodOverriding
@@ -105,7 +104,7 @@ def initAlgorithm(self, config: Dict):
         param = QgsProcessingParameterEnum(
             self.TYPE_IMPORT,
             "Type d'import",
-            options=LISTE_TYPE,
+            options=[e.value for e in ListeType],
             optional=False,
         )
         param.setHelp("Type d'import concernant la couche")

diff --git a/netads/processing_netads/data/load_layers.py b/netads/processing_netads/data/load_layers.py
@@ -140,11 +140,11 @@ def processAlgorithm(
         if prefix_parcelle and len(prefix_parcelle) != 3:
             # The virtual field needs this variable on runtime.
             raise QgsProcessingException(
-                    "Le préfixe parcellaire doit contenir 3 caractères : "
-                    "le code département (2 caractères) + "
-                    "le code de direction (1 caractère). "
-                    f"Le préfixe parcellaire proposé `{prefix_parcelle}` est "
-                    f"de longueur {len(prefix_parcelle)}."
+                "Le préfixe parcellaire doit contenir 3 caractères : "
+                "le code département (2 caractères) + "
+                "le code de direction (1 caractère). "
+                f"Le préfixe parcellaire proposé `{prefix_parcelle}` est "
+                f"de longueur {len(prefix_parcelle)}."
             )
 
         # Then set variables

diff --git a/netads/processing_netads/provider.py b/netads/processing_netads/provider.py
@@ -6,7 +6,6 @@
 from qgis.PyQt.QtGui import QIcon
 
 from netads.processing_netads.data.import_communes import ImportCommunesAlg
-
 from netads.processing_netads.data.import_impacts import ImportImpactsAlg
 from netads.processing_netads.data.import_parcelles import ImportParcellesAlg
 from netads.processing_netads.data.load_layers import LoadLayersAlgorithm

diff --git a/netads/tests/test_import.py b/netads/tests/test_import.py
@@ -4,21 +4,20 @@
 
 import os
 import time
-import unittest
 
 from unittest import main
 
 import processing
 
-from qgis.core import (  # QgsFeature,; QgsGeometry,; edit,
+from qgis.core import (
     QgsCoordinateReferenceSystem,
     QgsCoordinateTransform,
     QgsProject,
     QgsProviderRegistry,
     QgsVectorLayer,
 )
 
-from netads.processing_netads.data.import_impacts import LISTE_TYPE
+from netads.processing_netads.data.import_impacts import ListeType
 from netads.processing_netads.provider import (
     NetAdsProvider as ProcessingProvider,
 )
@@ -42,7 +41,7 @@ def test_import_impacts(self):
             "ENTREE": str(
                 plugin_test_data_path("plui", "248000747_INFO_SURF_20201109.shp")
             ),
-            "TYPE_IMPORT":  LISTE_TYPE[1],
+            "TYPE_IMPORT": ListeType.Servitude.value,
             "CHAMP_CODE": "code",
             "CHAMP_SOUS_CODE": "",
             "CHAMP_ETIQUETTE": "",

diff --git a/netads/tests/test_load_layers.py b/netads/tests/test_load_layers.py
@@ -8,7 +8,6 @@
 from qgis.core import QgsProcessingContext, QgsProcessingException, QgsProject
 
 from netads.processing_netads.data.load_layers import Key
-
 from netads.tests.base_database import DatabaseTestCase
 from netads.tests.feedbacks import FeedbackPrint