Merge pull request #110 from ConductionNL/development

Dev to main
ConductionNL · Dec 2, 2024 · 53e4195 · 53e4195
2 parents 81ea336 + 0c61bc0
commit 53e4195
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/configurations/sharepoint-woo/mappings/sharepoint-woo-verzoek-to-publications.json b/configurations/sharepoint-woo/mappings/sharepoint-woo-verzoek-to-publications.json
@@ -9,7 +9,7 @@
         "category": "d.woo_x005f_categorie",
         "published": "{% if d['woo_x005f_publicatiedatum']|default %}{{ d['woo_x005f_publicatiedatum']|date('Y-m-d') }}{% endif %}",
         "modified": "d.vti_x005f_nexttolasttimemodified",
-        "attachments": "{{ '[' }}{% if fileUrls['d']['results']|default %}{% set index = 0 %}{% for file in fileUrls['d']['results'] %}{% if index > 0 %}{{ ', ' }}{% endif %}{{ '{' }}{% if file['Name']|default %} \"title\": \"{{ file['Name'] }}\",{% endif %} \"downloadUrl\": {{ '{' }}{% set uri = file['__metadata']['uri']~'/$value' %}{{ '\"downloadUrl\": \"'~uri~'\",\"source\": \"1\"' }}{{ '}' }}{{ '}' }}{% endfor %}{% endif %}{{ ']' }}",
+        "attachments": "[ {% for file in fileUrls %} { {% if file['Name']|default %}\"title\": \"{{ file['Name'] }}\",{% endif %}{% if file['d']['document_x005f_label']|default %}\"labels\": [\"{{ file['d']['document_x005f_label'] }}\"],{% endif %}{% if file['__metadata']['uri']|default %}\"downloadUrl\": {\"downloadUrl\": \"{{ file['__metadata']['uri']~'/$value' }}\", \"source\": \"1\"}{% endif %} }{{ loop.last ? '' : ',' }} {% endfor %} ]",
         "status": "{% if d['woo_x005f_publicatiedatum']|default %}Published{% else %}Concept{% endif %}",
         "catalog": ""
     },

diff --git a/configurations/sharepoint-woo/synchronizations/sharepoint-convenanten-to-publications.json b/configurations/sharepoint-woo/synchronizations/sharepoint-convenanten-to-publications.json
@@ -15,6 +15,9 @@
         "extraDataConfigs.1.dynamicEndpointLocation": "Files.__deferred.uri",
         "extraDataConfigs.1.mergeExtraData": "true",
         "extraDataConfigs.1.keyToSetExtraData": "fileUrls",
+        "extraDataConfigs.1.resultsLocation": "d.results",
+        "extraDataConfigs.1.extraDataConfigPerResult.dynamicEndpointLocation": "Properties.__deferred.uri",
+        "extraDataConfigs.1.extraDataConfigPerResult.mergeExtraData": "true",
         "headers": [],
         "query": []
     },

diff --git a/configurations/sharepoint-woo/synchronizations/sharepoint-woo-verzoeken-to-publications.json b/configurations/sharepoint-woo/synchronizations/sharepoint-woo-verzoeken-to-publications.json
@@ -15,6 +15,9 @@
         "extraDataConfigs.1.dynamicEndpointLocation": "Files.__deferred.uri",
         "extraDataConfigs.1.mergeExtraData": "true",
         "extraDataConfigs.1.keyToSetExtraData": "fileUrls",
+        "extraDataConfigs.1.resultsLocation": "d.results",
+        "extraDataConfigs.1.extraDataConfigPerResult.dynamicEndpointLocation": "Properties.__deferred.uri",
+        "extraDataConfigs.1.extraDataConfigPerResult.mergeExtraData": "true",
         "headers": [],
         "query": []
 	},

diff --git a/lib/Service/SynchronizationService.php b/lib/Service/SynchronizationService.php
@@ -269,13 +269,25 @@ private function fetchExtraDataForObject(Synchronization $synchronization, array
 
         $extraData = $this->getObjectFromSource($synchronization, $endpoint);
 
+        // Temporary fix,
+        if ($extraDataConfig['extraDataConfigPerResult']) {
+            $dotObject = new Dot($extraData);
+            $results = $dotObject->get($extraDataConfig['resultsLocation']);
+
+            foreach ($results as $key => $result) {
+                $results[$key] = $this->fetchExtraDataForObject($synchronization, $extraDataConfig['extraDataConfigPerResult'], $result);
+            }
+
+            $extraData = $results;
+        }
+
         // Set new key if configured.
         if (isset($extraDataConfig[$this::KEY_FOR_EXTRA_DATA_LOCATION]) === true) {
             $extraData = [$extraDataConfig[$this::KEY_FOR_EXTRA_DATA_LOCATION] => $extraData];
         }
 
         // Merge with earlier fetchde object if configured.
-        if (isset($extraDataConfig[$this::MERGE_EXTRA_DATA_OBJECT_LOCATION]) === true && $extraDataConfig[$this::MERGE_EXTRA_DATA_OBJECT_LOCATION] === true) {
+        if (isset($extraDataConfig[$this::MERGE_EXTRA_DATA_OBJECT_LOCATION]) === true && ($extraDataConfig[$this::MERGE_EXTRA_DATA_OBJECT_LOCATION] === true || $extraDataConfig[$this::MERGE_EXTRA_DATA_OBJECT_LOCATION] === 'true')) {
             return array_merge($object, $extraData);
         }
 
@@ -347,7 +359,6 @@ public function synchronizeContract(SynchronizationContract $synchronizationCont
             }
         }
 
-
         // set the target hash
         $targetHash = md5(serialize($targetObject));
         $synchronizationContract->setTargetHash($targetHash);