Merge branch 'main' into 156-kaavamaarayksen-otsikointi-dynaamisesti

Author: nmaarnio

arho_feature_template/core/lambda_service.py

@@ -3,7 +3,7 @@
 import json
 import re
 from http import HTTPStatus
-from typing import cast
+from typing import Callable, cast
 
 from qgis.PyQt.QtCore import QByteArray, QObject, QUrl, pyqtSignal
 from qgis.PyQt.QtNetwork import QNetworkAccessManager, QNetworkProxy, QNetworkReply, QNetworkRequest
@@ -15,6 +15,7 @@
 class LambdaService(QObject):
     jsons_received = pyqtSignal(dict, dict)
     validation_received = pyqtSignal(dict)
+    validation_failed = pyqtSignal()
     ActionAttribute = cast(QNetworkRequest.Attribute, QNetworkRequest.User + 1)
     ACTION_VALIDATE_PLANS = "validate_plans"
     ACTION_GET_PLANS = "get_plans"
@@ -57,10 +58,28 @@ def _is_api_gateway_request(self) -> bool:
         match = re.match(r"^https://.*execute-api.*amazonaws\.com.*$", self.lambda_url)
         return bool(match)
 
+    def _get_response_handler(self, action: str) -> Callable[[dict], None]:
+        handlers = {
+            self.ACTION_GET_PLANS: self._process_json_reply,
+            self.ACTION_VALIDATE_PLANS: self._process_validation_reply,
+        }
+        return handlers[action]
+
+    def _get_error_handler(self, action: str) -> Callable[[], None]:
+        handlers = {
+            self.ACTION_GET_PLANS: lambda: None,
+            self.ACTION_VALIDATE_PLANS: self._handle_validation_error,
+        }
+        return handlers[action]
+
     def _handle_reply(self, reply: QNetworkReply):
+        action = reply.request().attribute(LambdaService.ActionAttribute)
+        response_handler = self._get_response_handler(action)
+        error_handler = self._get_error_handler(action)
         if reply.error() != QNetworkReply.NoError:
             error = reply.errorString()
-            QMessageBox.critical(None, "API Error", f"Lambda call failed: {error}")
+            QMessageBox.critical(None, "API Virhe", f"Lambda kutsu epäonnistui: {error}")
+            error_handler()
             reply.deleteLater()
             return
 
@@ -72,30 +91,29 @@ def _handle_reply(self, reply: QNetworkReply):
                 # If calling the lambda directly, the response includes status code and body
                 if int(response_json.get("statusCode", 0)) != HTTPStatus.OK:
                     error = response_json["body"] if "body" in response_json else response_json["errorMessage"]
-                    QMessageBox.critical(None, "API Error", f"Lambda call failed: {error}")
+                    QMessageBox.critical(None, "API Virhe", f"Lambda kutsu epäonnistui: {error}")
+                    error_handler()
                     reply.deleteLater()
                     return
                 body = response_json["body"]
             else:
                 body = response_json
 
         except (json.JSONDecodeError, KeyError) as e:
-            QMessageBox.critical(None, "JSON Error", f"Failed to parse response JSON: {e}")
+            QMessageBox.critical(None, "JSON Virhe", f"Vastauksen JSON-tiedoston jäsennys epäonnistui: {e}")
+            error_handler()
             return
         finally:
             reply.deleteLater()
+        response_handler(body)
 
-        action = reply.request().attribute(LambdaService.ActionAttribute)
-        if action == self.ACTION_GET_PLANS:
-            self._process_json_reply(body)
-        elif action == self.ACTION_VALIDATE_PLANS:
-            self._process_validation_reply(body)
+    def _handle_validation_error(self):
+        self.validation_failed.emit()
 
     def _process_validation_reply(self, response_json: dict):
         """Processes the validation reply from the lambda and emits a signal."""
 
         validation_errors = response_json.get("ryhti_responses")
-
         self.validation_received.emit(validation_errors)
 
     def _process_json_reply(self, response_json: dict):

arho_feature_template/core/models.py

@@ -12,12 +12,13 @@
 from arho_feature_template.exceptions import ConfigSyntaxError
 from arho_feature_template.project.layers.code_layers import AdditionalInformationTypeLayer, UndergroundTypeLayer
 from arho_feature_template.qgis_plugin_tools.tools.resources import resources_path
-from arho_feature_template.utils.misc_utils import LANGUAGE, get_layer_by_name, iface
+from arho_feature_template.utils.misc_utils import deserialize_localized_text, get_layer_by_name, iface
 
 if TYPE_CHECKING:
     from datetime import datetime
 
     from qgis.core import QgsFeature, QgsGeometry
+    from qgis.PyQt.QtCore import QDate
 
 
 logger = logging.getLogger(__name__)
@@ -96,6 +97,7 @@ def from_config_file(
                                 for group_name in feature_data.get("regulation_groups", [])
                                 if (group := cls.find_matching_group_config(group_name, regulation_group_libraries))
                             ],
+                            lifecycles=[],
                             plan_id=None,
                             id_=None,
                         )
@@ -144,6 +146,15 @@ def from_config_file(cls, config_fp: Path) -> RegulationGroupLibrary:
                 ],
             )
 
+    def get_short_names(self) -> set[str]:
+        """Returns set of non-empty short names (letter codes) of regulation groups part of the library."""
+        return {
+            regulation_group.short_name
+            for category in self.regulation_group_categories
+            for regulation_group in category.regulation_groups
+            if regulation_group.short_name
+        }
+
 
 @dataclass
 class RegulationLibrary:
@@ -246,8 +257,8 @@ class RegulationConfig:
 
     id: str
     regulation_code: str
-    name: str
-    description: str
+    name: str | None
+    description: str | None
     status: str
     level: int
     parent_id: str | None
@@ -268,8 +279,8 @@ def from_feature(cls, feature: QgsFeature) -> RegulationConfig:
         return cls(
             id=feature["id"],
             regulation_code=feature["value"],
-            name=feature["name"].get(LANGUAGE) if feature["name"] else None,
-            description=feature["description"].get(LANGUAGE) if feature["description"] else None,
+            name=deserialize_localized_text(feature["name"]),
+            description=deserialize_localized_text(feature["description"]),
             status=feature["status"],
             level=feature["level"],
             parent_id=feature["parent_id"],
@@ -287,8 +298,8 @@ class AdditionalInformationConfig:
     # From layer
     id: str
     additional_information_type: str
-    name: str
-    description: str
+    name: str | None
+    description: str | None
     status: str
     level: int
     parent_id: str | None
@@ -344,8 +355,8 @@ def initialize(cls, config_fp: Path = ADDITIONAL_INFORMATION_CONFIG_PATH) -> Add
             ai_config = AdditionalInformationConfig(
                 id=feature["id"],
                 additional_information_type=ai_code,
-                name=feature["name"].get(LANGUAGE) if feature["name"] else None,
-                description=feature["description"].get(LANGUAGE) if feature["description"] else None,
+                name=deserialize_localized_text(feature["name"]),
+                description=deserialize_localized_text(feature["description"]),
                 status=feature["status"],
                 level=feature["level"],
                 parent_id=feature["parent_id"],
@@ -513,6 +524,26 @@ def from_config_data(cls, data: dict) -> RegulationGroup:
             id_=None,
         )
 
+    def __str__(self):
+        return " - ".join(part for part in (self.short_name, self.name) if part)
+
+
+@dataclass
+class LifeCycle:
+    status_id: str | None = None
+    id_: str | None = None
+    plan_id: str | None = None
+    plan_regulation_id: str | None = None
+    plan_proposition_id: str | None = None
+    starting_at: QDate | None = None
+    ending_at: QDate | None = None
+    # might not need the following
+    land_use_are_id: str | None = None
+    other_area_id: str | None = None
+    line_id: str | None = None
+    land_use_point_id: str | None = None
+    other_point_id: str | None = None
+
 
 @dataclass
 class PlanFeature:
@@ -522,6 +553,7 @@ class PlanFeature:
     name: str | None = None
     description: str | None = None
     regulation_groups: list[RegulationGroup] = field(default_factory=list)
+    lifecycles: list[LifeCycle] = field(default_factory=list)
     plan_id: int | None = None
     id_: str | None = None
 
@@ -537,6 +569,7 @@ class Plan:
     description: str | None = None
     plan_type_id: str | None = None
     lifecycle_status_id: str | None = None
+    lifecycles: list[LifeCycle] = field(default_factory=list)
     record_number: str | None = None
     matter_management_identifier: str | None = None
     permanent_plan_identifier: str | None = None