add test YAML; convert datetime to str before DIFF comparison

Author: KatKatKateryna

models/ConfigData.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass, field, fields, is_dataclass
+from datetime import datetime, timezone
 from enum import Enum
 
 from .utils import update_dataclass_from_dict
@@ -140,7 +141,15 @@ def all_missing_props(self):
             return self._all_missing_props
         return []
 
-    def asdict_enum_safe(self, obj):
+    def datetime_to_string(self, data: datetime):
+        # normalize to UTC and format with Z
+        if data.tzinfo is None:
+            data = data.replace(tzinfo=timezone.utc)
+        else:
+            data = data.astimezone(timezone.utc)
+        return data.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    def asdict_enum_safe(self, obj, datetime_to_str=False):
         """Overwriting dataclass 'asdict' fuction to replace Enums with strings."""
         if is_dataclass(obj):
             result = {}
@@ -151,21 +160,26 @@ def asdict_enum_safe(self, obj):
                 if key == "linked__data":
                     key = "linked-data"
                 if value is not None:
-                    result[key] = self.asdict_enum_safe(value)
+                    result[key] = self.asdict_enum_safe(value, datetime_to_str)
             return result
         elif isinstance(obj, Enum):
             return obj.value
         elif isinstance(obj, InlineList):
             return obj
         elif isinstance(obj, list):
-            return [self.asdict_enum_safe(v) for v in obj]
+            return [self.asdict_enum_safe(v, datetime_to_str) for v in obj]
         elif isinstance(obj, dict):
             return {
-                self.asdict_enum_safe(k): self.asdict_enum_safe(v)
+                self.asdict_enum_safe(k, datetime_to_str): self.asdict_enum_safe(
+                    v, datetime_to_str
+                )
                 for k, v in obj.items()
             }
         else:
-            return obj
+            if isinstance(obj, datetime) and datetime_to_str:
+                return self.datetime_to_string(obj)
+            else:
+                return obj
 
     def add_new_resource(self) -> str:
         """Add a placeholder resource."""

pygeoapi_config_dialog.py

@@ -121,12 +121,8 @@ class CustomDumper(yaml.SafeDumper):
         )
 
         def represent_datetime_as_timestamp(dumper, data: datetime):
-            # normalize to UTC and format with Z
-            if data.tzinfo is None:
-                data = data.replace(tzinfo=timezone.utc)
-            else:
-                data = data.astimezone(timezone.utc)
-            value = data.strftime("%Y-%m-%dT%H:%M:%SZ")
+            value = self.config_data.datetime_to_string(data)
+
             # emit as YAML timestamp → plain scalar, no quotes
             return dumper.represent_scalar("tag:yaml.org,2002:timestamp", value)
 

tests/test_yaml_save.py

@@ -97,7 +97,9 @@ def test_open_file_validate_ui_data_save_file(qtbot, sample_yaml: str):
     dialog.open_file(
         sample_yaml
     )  # now dialog.config_data has the data stored including .all_missing_props
-    yaml1_data = deepcopy(dialog.yaml_original_data)
+    yaml1_data = dialog.config_data.asdict_enum_safe(
+        deepcopy(dialog.yaml_original_data), True
+    )
     yaml1_missing_props = deepcopy(dialog.config_data.all_missing_props)
 
     # Save YAML - EVEN THOUGH some mandatory fields might be missing and recorded as empty strings/lists
@@ -106,7 +108,9 @@ def test_open_file_validate_ui_data_save_file(qtbot, sample_yaml: str):
 
     # open the new file
     dialog.open_file(abs_new_yaml_path)  # now dialog.config_data has the data stored
-    yaml2_data = deepcopy(dialog.yaml_original_data)
+    yaml2_data = dialog.config_data.asdict_enum_safe(
+        deepcopy(dialog.yaml_original_data), True
+    )
 
     # get diff between old and new data
     diff_data = diff_yaml_dict_remove_known_faulty_fields(