2024 10 02 addcheck mandatory fk owner fk_operator fk_dataowner fk_provider fix missing references

qgepqwat2ili/gui/__init__.py

@@ -3,7 +3,6 @@
 import tempfile
 
 # 12.7.2022 for testing import time
-import time
 import webbrowser
 from types import SimpleNamespace
 
@@ -27,6 +26,10 @@
 from ..qgepsia405.export import qgep_export as qgepsia405_export
 from ..qgepsia405.import_ import qgep_import as qgepsia405_import
 from ..utils.ili2db import (  # neu 22.7.2022; get_xtf_model,; neu 31.3.2023; neu 12.4.2023
+    check_fk_dataowner_null,
+    check_fk_operator_null,
+    check_fk_owner_null,
+    check_fk_provider_null,
     check_identifier_null,
     check_organisation_subclass_data,
     check_wastewater_structure_subclass_data,
@@ -98,7 +101,7 @@ def action_do_importc():
         progress_dialog.show()
         progress_dialog.setLabelText("waiting...")
         # delays the execution for 5.5 secs.
-        time.sleep(5.5)
+        # time.sleep(5.5)
         progress_dialog.close
         # end action_do_importc
 
@@ -356,7 +359,7 @@ def action_import(plugin):
     # 31.5.2024 should not be needed anymore
     # progress_dialog.setLabelText("Set main_cover manually after import if vw_qgep_wastewater_structure does not display correctly!")
 
-    time.sleep(2)
+    # time.sleep(2)
     # to add option to run main_cover.sql manually - see postimport.py
 
     # 24.7.2022 / moved to end
@@ -462,26 +465,117 @@ def action_do_export():
                 return
 
         # 3. identifier check check_identifier_null
-        check_identifier = False
-        check_identifier = check_identifier_null()
-        if check_identifier:
-            print("OK: Integrity checks identifiers not isNull")
-            show_success(
-                "Sucess",
-                "OK: Integrity checks identifiers not isNull",
-                None,
-            )
+        if flag_test:
+            check_identifier = False
+            check_identifier = check_identifier_null()
+            if check_identifier:
+                print("OK: Integrity checks identifiers not isNull")
+                show_success(
+                    "Sucess",
+                    "OK: Integrity checks identifiers not isNull",
+                    None,
+                )
 
-        else:
-            progress_dialog.close()
-            print("INFO: missing identifiers")
-            show_hint(
-                "INFO: Missing identifiers in schema qgep_od",
-                "Add missing identifiers to get a valid INTERLIS export file. See qgep logs tab for details.",
-                None,
-            )
-            # just show hint, but continue
-            # return
+            else:
+                progress_dialog.close()
+                print("INFO: missing identifiers")
+                show_hint(
+                    "INFO: Missing identifiers in schema qgep_od",
+                    "Add missing identifiers to get a valid INTERLIS export file. See qgep logs tab for details.",
+                    None,
+                )
+                # just show hint, but continue
+                # return
+
+        # 4. relation check check_fk_owner_null
+        if flag_test:
+            check_fk_owner = False
+            check_fk_owner = check_fk_owner_null()
+            if check_fk_owner:
+                print("OK: Integrity checks fk_owner not isNull")
+                show_success(
+                    "Sucess",
+                    "OK: Integrity checks fk_owner not isNull",
+                    None,
+                )
+
+            else:
+                progress_dialog.close()
+                print("ERROR: missing MANDATORY fk_owner")
+                show_failure(
+                    "ERROR: Missing MANDATORY fk_owner in schema qgep_od",
+                    "Add missing MANDATORY fk_owner to get a valid INTERLIS export file. See qgep logs tab for details.",
+                    None,
+                )
+                # make mandatory
+                return
+
+            # 5. relation check check_fk_operator_null
+            check_fk_operator = False
+            check_fk_operator = check_fk_operator_null()
+            if check_fk_operator:
+                print("OK: Integrity checks fk_operator not isNull")
+                show_success(
+                    "Sucess",
+                    "OK: Integrity checks fk_operator not isNull",
+                    None,
+                )
+
+            else:
+                progress_dialog.close()
+                print("ERROR: missing MANDATORY fk_operator")
+                show_failure(
+                    "ERROR: Missing MANDATORY fk_operator in schema qgep_od",
+                    "Add missing MANDATORY fk_operator to get a valid INTERLIS export file. See qgep logs tab for details.",
+                    None,
+                )
+                # make mandatory
+                return
+
+        # 6. relation check check_fk_dataowner_null
+        if flag_test:
+            check_fk_dataowner = False
+            check_fk_dataowner = check_fk_dataowner_null()
+            if check_fk_dataowner:
+                print("OK: Integrity checks fk_dataowner not isNull")
+                show_success(
+                    "Sucess",
+                    "OK: Integrity checks fk_dataowner not isNull",
+                    None,
+                )
+
+            else:
+                progress_dialog.close()
+                print("INFO: missing fk_dataowner")
+                show_hint(
+                    "INFO: Missing fk_dataowner in schema qgep_od",
+                    "Add missing fk_dataowner to get a valid INTERLIS export file when converting to Release 2020 (will bei MANDATORY). See qgep logs tab for details.",
+                    None,
+                )
+                # just show hint, but continue
+                # return
+
+            # 6. relation check check_fk_provider_null
+            check_fk_provider = False
+            check_fk_provider = check_fk_provider_null()
+            if check_fk_provider:
+                print("OK: Integrity checks fk_provider not isNull")
+                show_success(
+                    "Sucess",
+                    "OK: Integrity checks fk_provider not isNull",
+                    None,
+                )
+
+            else:
+                progress_dialog.close()
+                print("INFO: missing fk_provider")
+                show_hint(
+                    "INFO: Missing fk_provider in schema qgep_od",
+                    "Add missing fk_provider to get a valid INTERLIS export file when converting to Release 2020 (will bei MANDATORY). See qgep logs tab for details.",
+                    None,
+                )
+                # just show hint, but continue
+                # return
 
         # Prepare the temporary ili2pg model
         progress_dialog.setLabelText("Creating ili schema..." + emodel)

qgepqwat2ili/qgep/export.py

@@ -6,6 +6,9 @@
 from sqlalchemy.sql import text
 
 from .. import utils
+
+# 4.10.2024
+from ..utils.ili2db import skip_wwtp_structure_ids
 from ..utils.various import logger
 from .model_abwasser import get_abwasser_model
 from .model_qgep import get_qgep_model
@@ -36,6 +39,15 @@ def qgep_export(selection=None, labels_file=None, orientation=None):
     filtered = selection is not None
     subset_ids = selection if selection is not None else []
 
+    # get list of id's of class wwtp_structure (ARABauwerk) to be able to check if fk_wastewater_structure references to wwtp_structure
+
+    wastewater_structure_id_sia405abwasser_list = None
+    wastewater_structure_id_sia405abwasser_list = skip_wwtp_structure_ids()
+
+    logger.info(
+        f"wastewater_structure_id_sia405abwasser_list : {wastewater_structure_id_sia405abwasser_list}",
+    )
+
     # Orientation
     oriented = orientation is not None
     if oriented:
@@ -90,7 +102,9 @@ def truncate(val, max_length):
         if val is None:
             return None
         if len(val) > max_length:
-            logger.warning(f"Value '{val}' exceeds expected length ({max_length})", stacklevel=2)
+            # _log() got an unexpected keyword argument 'stacklevel'
+            #    logger.warning(f"Value '{val}' exceeds expected length ({max_length})", stacklevel=2)
+            logger.warning(f"Value '{val}' exceeds expected length ({max_length})")
         return val[0:max_length]
 
     def modulo_angle(val):
@@ -130,10 +144,13 @@ def check_fk_in_subsetid(subset, relation):
             logger.info(f"check_fk_in_subsetid - tid = '{tid_maker.tid_for_row(relation)}' ")
             return tid_maker.tid_for_row(relation)
         else:
-            logger.info(
-                f"check_fk_in_subsetid - '{fremdschluesselstr}' is not in subset - replaced with None instead!"
-            )
-            return None
+            if filtered:
+                logger.info(
+                    f"check_fk_in_subsetid - '{fremdschluesselstr}' is not in subset - replaced with None instead!"
+                )
+                return None
+            else:
+                return tid_maker.tid_for_row(relation)
 
     def create_metaattributes(row):
         metaattribute = ABWASSER.metaattribute(
@@ -208,7 +225,10 @@ def wastewater_networkelement_common(row):
         """
 
         return {
-            "abwasserbauwerkref": get_tid(row.fk_wastewater_structure__REL),
+            # "abwasserbauwerkref": get_tid(row.fk_wastewater_structure__REL),
+            "abwasserbauwerkref": check_fk_in_subsetid(
+                wastewater_structure_id_sia405abwasser_list, row.fk_wastewater_structure__REL
+            ),
             "bemerkung": truncate(emptystr_to_null(row.remark), 80),
             "bezeichnung": null_to_emptystr(row.identifier),
         }

qgepqwat2ili/qgepdss/export.py

@@ -6,6 +6,9 @@
 from sqlalchemy.sql import text
 
 from .. import utils
+
+# 4.10.2024
+from ..utils.ili2db import skip_wwtp_structure_ids
 from ..utils.various import logger
 from .model_abwasser import get_abwasser_model
 from .model_qgep import get_qgep_model
@@ -43,6 +46,15 @@ def qgep_export(selection=None, labels_file=None, orientation=None):
     # Logging for debugging
     logger.info(f"print subset_ids '{subset_ids}'")
 
+    # get list of id's of class wwtp_structure (ARABauwerk) to be able to check if fk_wastewater_structure references to wwtp_structure
+
+    wastewater_structure_id_sia405abwasser_list = None
+    wastewater_structure_id_sia405abwasser_list = skip_wwtp_structure_ids()
+
+    logger.info(
+        f"wastewater_structure_id_sia405abwasser_list : {wastewater_structure_id_sia405abwasser_list}",
+    )
+
     # Orientation
     oriented = orientation is not None
     if oriented:
@@ -140,10 +152,13 @@ def check_fk_in_subsetid(subset, relation):
             logger.info(f"check_fk_in_subsetid - tid = '{tid_maker.tid_for_row(relation)}' ")
             return tid_maker.tid_for_row(relation)
         else:
-            logger.info(
-                f"check_fk_in_subsetid - '{fremdschluesselstr}' is not in subset - replaced with None instead!"
-            )
-            return None
+            if filtered:
+                logger.info(
+                    f"check_fk_in_subsetid - '{fremdschluesselstr}' is not in subset - replaced with None instead!"
+                )
+                return None
+            else:
+                return tid_maker.tid_for_row(relation)
 
     def create_metaattributes(row):
         metaattribute = ABWASSER.metaattribute(

qgepqwat2ili/qgepsia405/export.py

@@ -6,6 +6,9 @@
 from sqlalchemy.sql import text
 
 from .. import utils
+
+# 4.10.2024
+from ..utils.ili2db import skip_wwtp_structure_ids
 from ..utils.various import logger
 from .model_abwasser import get_abwasser_model
 from .model_qgep import get_qgep_model
@@ -36,6 +39,15 @@ def qgep_export(selection=None, labels_file=None, orientation=None):
     filtered = selection is not None
     subset_ids = selection if selection is not None else []
 
+    # get list of id's of class wwtp_structure (ARABauwerk) to be able to check if fk_wastewater_structure references to wwtp_structure
+
+    wastewater_structure_id_sia405abwasser_list = None
+    wastewater_structure_id_sia405abwasser_list = skip_wwtp_structure_ids()
+
+    logger.info(
+        f"wastewater_structure_id_sia405abwasser_list : {wastewater_structure_id_sia405abwasser_list}",
+    )
+
     # Orientation
     oriented = orientation is not None
     if oriented:
@@ -49,6 +61,7 @@ def get_tid(relation):
         """
         if relation is None:
             return None
+
         return tid_maker.tid_for_row(relation)
 
     def get_vl(relation):
@@ -90,7 +103,9 @@ def truncate(val, max_length):
         if val is None:
             return None
         if len(val) > max_length:
-            logger.warning(f"Value '{val}' exceeds expected length ({max_length})", stacklevel=2)
+            # _log() got an unexpected keyword argument 'stacklevel'
+            #    logger.warning(f"Value '{val}' exceeds expected length ({max_length})", stacklevel=2)
+            logger.warning(f"Value '{val}' exceeds expected length ({max_length})")
         return val[0:max_length]
 
     def modulo_angle(val):
@@ -130,10 +145,13 @@ def check_fk_in_subsetid(subset, relation):
             logger.info(f"check_fk_in_subsetid - tid = '{tid_maker.tid_for_row(relation)}' ")
             return tid_maker.tid_for_row(relation)
         else:
-            logger.info(
-                f"check_fk_in_subsetid - '{fremdschluesselstr}' is not in subset - replaced with None instead!"
-            )
-            return None
+            if filtered:
+                logger.info(
+                    f"check_fk_in_subsetid - '{fremdschluesselstr}' is not in subset - replaced with None instead!"
+                )
+                return None
+            else:
+                return tid_maker.tid_for_row(relation)
 
     def create_metaattributes(row):
         metaattribute = ABWASSER.metaattribute(
@@ -205,7 +223,10 @@ def wastewater_networkelement_common(row):
         """
 
         return {
-            "abwasserbauwerkref": get_tid(row.fk_wastewater_structure__REL),
+            # "abwasserbauwerkref": get_tid(row.fk_wastewater_structure__REL),
+            "abwasserbauwerkref": check_fk_in_subsetid(
+                wastewater_structure_id_sia405abwasser_list, row.fk_wastewater_structure__REL
+            ),
             "bemerkung": truncate(emptystr_to_null(row.remark), 80),
             "bezeichnung": null_to_emptystr(row.identifier),
         }