pass topics sorted to stringlist used for slugs and identificators. a…

…s well mssql behaves like gpkg from the naming. and finalizing those tests
opengisch · Oct 27, 2023 · 069f54e · 069f54e
1 parent 9145c95
commit 069f54e
Show file tree

Hide file tree

Showing 4 changed files with 235 additions and 339 deletions.
diff --git a/modelbaker/dataobjects/layers.py b/modelbaker/dataobjects/layers.py
@@ -220,9 +220,9 @@ def store_variables(self, project):
         Set the layer variables according to the strategy
         """
         interlis_topics = ",".join(
-            self.all_topics
+            sorted(self.all_topics)
             if project.optimize_strategy == OptimizeStrategy.NONE
-            else self.relevant_topics
+            else sorted(self.relevant_topics)
         )
         QgsExpressionContextUtils.setLayerVariable(
             self.__layer, "interlis_topic", interlis_topics

diff --git a/modelbaker/dataobjects/project.py b/modelbaker/dataobjects/project.py
@@ -182,10 +182,11 @@ def create(
                         "AllowAddFeatures": False,
                         "FilterExpression": "\"topic\" IN ({}) and attribute(get_feature('{}', 't_id', \"dataset\"), 'datasetname') != '{}'".format(
                             ",".join(
-                                [f"'{topic}'" for topic in filter_topics]
+                                [f"'{topic}'" for topic in sorted(filter_topics)]
                             ),  # create comma separated string
                             "T_ILI2DB_DATASET"
                             if referenced_layer.provider == "ogr"
+                            or referenced_layer.provider == "mssql"
                             else "t_ili2db_dataset",
                             self.context.get("catalogue_datasetname", ""),
                         )

diff --git a/modelbaker/generator/generator.py b/modelbaker/generator/generator.py
@@ -377,9 +377,9 @@ def layers(self, filter_layer_list=[]):
                 if self.basket_handling and column_name in BASKET_FIELDNAMES:
                     # on NONE strategy those should be all topics the class could be in. On optimized strategies GROUP/HIDE only the relevant topics should be listed.
                     interlis_topics = ",".join(
-                        layer.all_topics
+                        sorted(layer.all_topics)
                         if self.optimize_strategy == OptimizeStrategy.NONE
-                        else layer.relevant_topics
+                        else sorted(layer.relevant_topics)
                     )
 
                     # and set the default value (to be used from the projet variables)