Change to use ProviderRegistry

Author: LKajan

arho_feature_template/core/exceptions.py

@@ -1,5 +1,2 @@
-from arho_feature_template.qgis_plugin_tools.tools.exceptions import QgsPluginException
-
-
-class AuthConfigException(QgsPluginException):
-    pass
+class UnexpectedNoneError(Exception):
+    """Internal QGIS errors that should not be happened"""

arho_feature_template/gui/ask_credentials.py

@@ -1,13 +1,12 @@
 from importlib import resources
 
-import psycopg2
+from qgis.core import QgsProviderRegistry
 from qgis.PyQt import uic
 from qgis.PyQt.QtCore import QRegularExpression, QSortFilterProxyModel, Qt
 from qgis.PyQt.QtGui import QStandardItem, QStandardItemModel
-from qgis.PyQt.QtWidgets import QComboBox, QDialog, QLineEdit, QMessageBox, QPushButton, QTableView
+from qgis.PyQt.QtWidgets import QComboBox, QDialog, QDialogButtonBox, QLineEdit, QMessageBox, QPushButton, QTableView
 
-from arho_feature_template.gui.ask_credentials import DbAskCredentialsDialog
-from arho_feature_template.utils.db_utils import get_db_connection_params
+from arho_feature_template.core.exceptions import UnexpectedNoneError
 
 ui_path = resources.files(__package__) / "load_plan_dialog.ui"
 
@@ -34,66 +33,67 @@ def filterAcceptsRow(self, source_row, source_parent):  # noqa: N802
 
 
 class LoadPlanDialog(QDialog, LoadPlanDialogBase):  # type: ignore
+    connectionComboBox: QComboBox  # noqa: N815
+    push_button_load: QPushButton
+    planTableView: QTableView  # noqa: N815
+    searchLineEdit: QLineEdit  # noqa: N815
+    buttonBox: QDialogButtonBox  # noqa: N815
+
     def __init__(self, parent, connections):
         super().__init__(parent)
+        self.setupUi(self)
 
-        uic.loadUi(ui_path, self)
+        self._selected_plan_id = None
 
-        self.connectionComboBox: QComboBox = self.findChild(QComboBox, "connectionComboBox")
-        self.planTableView: QTableView = self.findChild(QTableView, "planTableView")
-        self.okButton: QPushButton = self.findChild(QPushButton, "okButton")
+        self.buttonBox.rejected.connect(self.reject)
+        self.buttonBox.accepted.connect(self.accept)
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
 
-        self.searchLineEdit: QLineEdit = self.findChild(QLineEdit, "searchLineEdit")
-        self.searchLineEdit.setPlaceholderText("Etsi kaavoja...")
+        self.push_button_load.clicked.connect(self.load_plans)
+        self.searchLineEdit.textChanged.connect(self.filter_plans)
 
         self.connectionComboBox.addItems(connections)
 
-        self.connectionComboBox.currentIndexChanged.connect(self.load_plans)
-        self.okButton.clicked.connect(self.accept)
-
-        self.okButton.setEnabled(False)
-
-        self.filterProxyModel = PlanFilterProxyModel(self)
+        self.planTableView.setSelectionMode(QTableView.SingleSelection)
+        self.planTableView.setSelectionBehavior(QTableView.SelectRows)
+        self.planTableView.selectionModel().selectionChanged.connect(self.on_selection_changed)
+
+        self.model = QStandardItemModel()
+        self.model.setColumnCount(5)
+        self.model.setHorizontalHeaderLabels(
+            [
+                "ID",
+                "Tuottajan kaavatunnus",
+                "Nimi",
+                "Kaavan elinkaaren tila",
+                "Kaavalaji",
+            ]
+        )
+
+        self.filterProxyModel = PlanFilterProxyModel()
+        self.filterProxyModel.setSourceModel(self.model)
         self.filterProxyModel.setFilterCaseSensitivity(Qt.CaseInsensitive)
 
         self.planTableView.setModel(self.filterProxyModel)
-        self.searchLineEdit.textChanged.connect(self.filter_plans)
-
-        self.selected_plan_id = None
 
     def load_plans(self):
+        self.model.removeRows(0, self.model.rowCount())
+
         selected_connection = self.connectionComboBox.currentText()
         if not selected_connection:
             self.planTableView.setModel(QStandardItemModel())
             return
 
-        cursor = None
-        conn = None
+        provider_registry = QgsProviderRegistry.instance()
+        if provider_registry is None:
+            raise UnexpectedNoneError
+        postgres_provider_metadata = provider_registry.providerMetadata("postgres")
+        if postgres_provider_metadata is None:
+            raise UnexpectedNoneError
 
         try:
-            conn_params = get_db_connection_params(selected_connection)
-
-            if not conn_params.get("user") or not conn_params.get("password"):
-                # Trigger dialog to ask for missing credentials
-                dialog = DbAskCredentialsDialog(self)
-                dialog.rejected.connect(self.reject)
-                if dialog.exec() == QDialog.Accepted:
-                    user, password = dialog.get_credentials()
-                    conn_params["user"] = user
-                    conn_params["password"] = password
-
-            conn = psycopg2.connect(
-                host=conn_params["host"],
-                port=conn_params["port"],
-                dbname=conn_params["dbname"],
-                user=conn_params["user"],
-                password=conn_params["password"],
-                sslmode=conn_params["sslmode"],
-            )
-
-            cursor = conn.cursor()
-
-            cursor.execute("""
+            connection = postgres_provider_metadata.createConnection(selected_connection)
+            plans = connection.executeSql("""
                 SELECT
                     p.id,
                     p.producers_plan_identifier,
@@ -111,46 +111,12 @@ def load_plans(self):
                 ON
                     p.plan_type_id = pt.id;
             """)
-            plans = cursor.fetchall()
-
-            model = QStandardItemModel(len(plans), 5)
-            model.setHorizontalHeaderLabels(
-                [
-                    "ID",
-                    "Tuottajan kaavatunnus",
-                    "Nimi",
-                    "Kaavan elinkaaren tila",
-                    "Kaavalaji",
-                ]
-            )
-
-            for row_idx, plan in enumerate(plans):
-                model.setItem(row_idx, 0, QStandardItem(str(plan[0])))  # id
-                model.setItem(row_idx, 1, QStandardItem(str(plan[1])))  # producer_plan_identifier
-                model.setItem(row_idx, 2, QStandardItem(str(plan[2])))  # name_fin
-                model.setItem(row_idx, 3, QStandardItem(str(plan[3])))  # lifecycle_status_fin
-                model.setItem(row_idx, 4, QStandardItem(str(plan[4])))  # plan_type_fin
-
-            self.filterProxyModel.setSourceModel(model)
-
-            self.planTableView.setSelectionMode(QTableView.SingleSelection)
-            self.planTableView.setSelectionBehavior(QTableView.SelectRows)
-
-            self.planTableView.selectionModel().selectionChanged.connect(self.on_selection_changed)
-
-        except ValueError as ve:
-            QMessageBox.critical(self, "Connection Error", str(ve))
-            self.planTableView.setModel(QStandardItemModel())
+            for plan in plans:
+                self.model.appendRow([QStandardItem(column) for column in plan])
 
         except Exception as e:  # noqa: BLE001
             QMessageBox.critical(self, "Error", f"Failed to load plans: {e}")
-            self.planTableView.setModel(QStandardItemModel())
-
-        finally:
-            if cursor:
-                cursor.close()
-            if conn:
-                conn.close()
+            self.model.removeRows(0, self.model.rowCount())
 
     def filter_plans(self):
         search_text = self.searchLineEdit.text()
@@ -163,16 +129,17 @@ def filter_plans(self):
     def on_selection_changed(self):
         # Enable the OK button only if a row is selected
         selection = self.planTableView.selectionModel().selectedRows()
+        ok_button = self.buttonBox.button(QDialogButtonBox.Ok)
         if selection:
             selected_row = selection[0].row()
-            self.selected_plan_id = self.planTableView.model().index(selected_row, 0).data()
-            self.okButton.setEnabled(True)
+            self._selected_plan_id = self.planTableView.model().index(selected_row, 0).data()
+            ok_button.setEnabled(True)
         else:
-            self.selected_plan_id = None
-            self.okButton.setEnabled(False)
+            self._selected_plan_id = None
+            ok_button.setEnabled(False)
 
     def get_selected_connection(self):
         return self.connectionComboBox.currentText()
 
     def get_selected_plan_id(self):
-        return self.selected_plan_id
+        return self._selected_plan_id