From e1769003bcb73253584d598a2ce9d77acf286850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Fri, 17 Apr 2026 17:51:36 +0300
Subject: [PATCH] Ordered external entity configuration mappings
 alphabetically.

---
 ...ternal_entity_type.helfi_announcements.yml | 56 +++++++-------
 ...es.external_entity_type.helfi_hearings.yml | 76 +++++++++----------
 ...ies.external_entity_type.helfi_surveys.yml | 56 +++++++++-----
 3 files changed, 102 insertions(+), 86 deletions(-)

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
index 4880ee6e..61bb0ee4 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -15,15 +15,15 @@ content_class: Drupal\external_entities\Entity\ExternalEntity
 read_only: true
 debug_level: 0
 field_mappers:
-  id:
+  announcement_assistive_technology_close_button_title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
-            required_field: true
+            mapping: '$.attributes["field_announcement_title"]'
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -31,14 +31,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  uuid:
+  announcement_link_text:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
+            mapping: '$.attributes["field_announcement_link"]["title"]'
             required_field: false
             main_property: true
             data_processors:
@@ -47,15 +47,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  title:
+  announcement_link_url:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["title"]'
-            required_field: true
+            mapping: '$.attributes["field_announcement_link"]["uri"]'
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -63,14 +63,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  status:
+  announcement_type:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["status"]'
+            mapping: '$.attributes["field_announcement_type"]'
             required_field: false
             main_property: true
             data_processors:
@@ -79,14 +79,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  published_at:
+  body:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["published_at"]'
+            mapping: '$.attributes["body"]["value"]'
             required_field: false
             main_property: true
             data_processors:
@@ -95,15 +95,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  unpublish_on:
+  id:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["unpublish_on"]'
-            required_field: false
+            mapping: $.id
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -111,14 +111,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  body:
+  notification:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["body"]["value"]'
+            mapping: '$.attributes["notification"]'
             required_field: false
             main_property: true
             data_processors:
@@ -127,14 +127,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  notification:
+  published_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["notification"]'
+            mapping: '$.attributes["published_at"]'
             required_field: false
             main_property: true
             data_processors:
@@ -143,14 +143,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  announcement_type:
+  status:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_type"]'
+            mapping: '$.attributes["status"]'
             required_field: false
             main_property: true
             data_processors:
@@ -159,15 +159,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  announcement_link_text:
+  title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_link"]["title"]'
-            required_field: false
+            mapping: '$.attributes["title"]'
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -175,14 +175,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  announcement_link_url:
+  unpublish_on:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_link"]["uri"]'
+            mapping: '$.attributes["unpublish_on"]'
             required_field: false
             main_property: true
             data_processors:
@@ -191,14 +191,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  announcement_assistive_technology_close_button_title:
+  uuid:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_title"]'
+            mapping: $.id
             required_field: false
             main_property: true
             data_processors:
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
index 8a3c5d71..abfd2695 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
@@ -15,15 +15,15 @@ content_class: Drupal\external_entities\Entity\ExternalEntity
 read_only: true
 debug_level: 0
 field_mappers:
-  id:
+  abstract:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
-            required_field: true
+            mapping: $.abstract
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -31,14 +31,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  uuid:
+  close_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
+            mapping: $.close_at
             required_field: false
             main_property: true
             data_processors:
@@ -47,15 +47,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  title:
+  comments:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.title
-            required_field: true
+            mapping: $.n_comments
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -63,14 +63,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  main_image:
+  count:
     id: generic
     config:
       property_mappings:
-        uri:
+        value:
           id: jsonpath
           config:
-            mapping: $.main_image_url
+            mapping: $.count
             required_field: false
             main_property: true
             data_processors:
@@ -78,17 +78,15 @@ field_mappers:
                 id: default
                 config: {  }
             description: ''
-        title:
-          id: ''
       debug_level: 0
-  close_at:
+  created_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.close_at
+            mapping: $.created_at
             required_field: false
             main_property: true
             data_processors:
@@ -97,14 +95,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  created_at:
+  existing_translations:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.created_at
+            mapping: $.existing_translations
             required_field: false
             main_property: true
             data_processors:
@@ -113,15 +111,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  open_at:
+  id:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.open_at
-            required_field: false
+            mapping: $.id
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -129,14 +127,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  slug:
+  main_image:
     id: generic
     config:
       property_mappings:
-        value:
+        uri:
           id: jsonpath
           config:
-            mapping: $.slug
+            mapping: $.main_image_url
             required_field: false
             main_property: true
             data_processors:
@@ -144,15 +142,17 @@ field_mappers:
                 id: default
                 config: {  }
             description: ''
+        title:
+          id: ''
       debug_level: 0
-  comments:
+  main_image_title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.n_comments
+            mapping: $.main_image_caption
             required_field: false
             main_property: true
             data_processors:
@@ -161,14 +161,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  organization:
+  open_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.organization
+            mapping: $.open_at
             required_field: false
             main_property: true
             data_processors:
@@ -177,14 +177,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  abstract:
+  organization:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.abstract
+            mapping: $.organization
             required_field: false
             main_property: true
             data_processors:
@@ -193,14 +193,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  main_image_title:
+  slug:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.main_image_caption
+            mapping: $.slug
             required_field: false
             main_property: true
             data_processors:
@@ -209,15 +209,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  url:
+  title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.url
-            required_field: false
+            mapping: $.title
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -225,14 +225,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  count:
+  url:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.count
+            mapping: $.url
             required_field: false
             main_property: true
             data_processors:
@@ -241,14 +241,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  existing_translations:
+  uuid:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.existing_translations
+            mapping: $.id
             required_field: false
             main_property: true
             data_processors:
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
index 5ab23035..b1a684f6 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
@@ -15,15 +15,15 @@ content_class: Drupal\external_entities\Entity\ExternalEntity
 read_only: true
 debug_level: 0
 field_mappers:
-  id:
+  body:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
-            required_field: true
+            mapping: '$.attributes["body"]["value"]'
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -31,7 +31,10 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  uuid:
+  default_langcode:
+    id: null
+    config: { }
+  id:
     id: generic
     config:
       property_mappings:
@@ -39,7 +42,7 @@ field_mappers:
           id: jsonpath
           config:
             mapping: $.id
-            required_field: false
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -47,15 +50,29 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  title:
+  langcode:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["title"]'
-            required_field: true
+            mapping: '$.attributes["langcode"]'
+            required_field: false
+            main_property: true
+            data_processors:
+              - id: default
+                config: { }
+            description: ''
+  published_at:
+    id: generic
+    config:
+      property_mappings:
+        value:
+          id: jsonpath
+          config:
+            mapping: '$.attributes["published_at"]'
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -79,14 +96,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  published_at:
+  survey_link_text:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["published_at"]'
+            mapping: '$.attributes["field_survey_link"]["title"]'
             required_field: false
             main_property: true
             data_processors:
@@ -95,14 +112,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  unpublish_on:
+  survey_link_url:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["unpublish_on"]'
+            mapping: '$.attributes["field_survey_link"]["uri"]'
             required_field: false
             main_property: true
             data_processors:
@@ -111,15 +128,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  body:
+  title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["body"]["value"]'
-            required_field: false
+            mapping: '$.attributes["title"]'
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -127,14 +144,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  survey_link_text:
+  unpublish_on:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_survey_link"]["title"]'
+            mapping: '$.attributes["unpublish_on"]'
             required_field: false
             main_property: true
             data_processors:
@@ -143,14 +160,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  survey_link_url:
+  uuid:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_survey_link"]["uri"]'
+            mapping: $.id
             required_field: false
             main_property: true
             data_processors:
@@ -159,7 +176,6 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-field_save_order: null
 field_mapping_notes: ''
 data_aggregator:
   id: single