Merge pull request #150 from ConductionNL/development

Dev to main

appinfo/routes.php

@@ -20,6 +20,7 @@
 		['name' => 'synchronizations#contracts', 'url' => '/api/synchronizations-contracts/{id}', 'verb' => 'GET'],
 		['name' => 'synchronizations#logs', 'url' => '/api/synchronizations-logs/{id}', 'verb' => 'GET'],
 		['name' => 'synchronizations#test', 'url' => '/api/synchronizations-test/{id}', 'verb' => 'POST'],
+		['name' => 'synchronizations#run', 'url' => '/api/synchronizations-run/{id}', 'verb' => 'POST'],
 		// Mapping endpoints
 		['name' => 'mappings#test', 'url' => '/api/mappings/test', 'verb' => 'POST'],
 		['name' => 'mappings#saveObject', 'url' => '/api/mappings/objects', 'verb' => 'POST'],

configurations/sharepoint-woo/mappings/xxllnc-suite-to-publications.json

@@ -5,7 +5,7 @@
         "title": "omschrijving",
         "summary": "zaaktypeomschrijving",
         "description": "zaaktypeomschrijving",
-        "category": "{% if zaaktypecode|default %}{% set wooVerzoekenEnBesluiten = ['LP00000431', 'B1873', 'cherry'] %}{% set klachtoordelen = ['LP00000091', 'LP00001132', 'LP00000121', 'B0757', 'LP00000832', 'LP00001096'] %}{% if zaaktypecode in wooVerzoekenEnBesluiten %}{{ 'Woo-verzoeken en -besluiten' }}{% elseif zaaktypecode in klachtoordelen %}{{ 'Klachtoordelen' }}{% endif %}{% endif %}",
+        "category": "{% if zaaktypecode|default %}{% set wooVerzoekenEnBesluiten = ['LP00000431', 'B1873'] %}{% set klachtoordelen = ['LP00000091', 'LP00001132', 'LP00000121', 'B0757', 'LP00000832', 'LP00001096'] %}{% if zaaktypecode in wooVerzoekenEnBesluiten %}{{ 'Woo-verzoeken en -besluiten' }}{% elseif zaaktypecode in klachtoordelen %}{{ 'Klachtoordelen' }}{% endif %}{% endif %}",
         "published": "startdatum",
         "modified": "{{ 'now'|date('H:i:sTm-d-Y') }}",
         "attachments": "[{% if files|default %}{% for file in files %} { {% if file['titel']|default %}\"title\": \"{{ file['titel'] }}\",{% endif %}\"labels\": [\"{{ 'Informatieverzoek' }}\"],{% if file['formaat']|default %}\"extension\": \"{{ file['formaat']|split('/')|last }}\",\"type\": \"{{ file['formaat'] }}\",{% endif %}{% if file['inhoud']|default and file['formaat']|default %}\"accessUrl\": \"data:{{ file['formaat'] }};base64,{{ file.inhoud }}\"{% endif %} }{{ loop.last ? '' : ',' }} {% endfor %}{% endif %}]",

configurations/sharepoint-woo/synchronizations/xxllnc-suite-to-publications.json

@@ -5,6 +5,7 @@
 	"sourceId": "1",
 	"sourceType": "api",
 	"sourceHash": "",
+	"sourceHashMapping": "1",
 	"sourceTargetMapping": "1",
 	"sourceConfig": {
         "idPosition": "identificatie",
@@ -13,6 +14,7 @@
         "headers": [],
         "query.startdatum__gte": "2024-08-01",
         "query.einddatum__lt": "2025-01-01",
+        "query.maximaleVertrouwelijkheidaanduiding": "openbaar",
         "usesPagination": "false",
         "extraDataConfigs.0.staticEndpoint": "/tlb/zaaksysteem/api/v1/zaken/{{ originId }}/informatieobjecten",
         "extraDataConfigs.0.mergeExtraData": "true",
@@ -21,5 +23,17 @@
         "extraDataConfigs.0.extraDataConfigPerResult.staticEndpoint": "/tlb/zaaksysteem/api/v1/informatieobjecten/{{ originId }}"
     },
 	"targetId": "1/1",
-	"targetType": "register/schema"
+	"targetType": "register/schema",
+    "conditions": {
+        "if": [
+            {
+            "or": [
+                { "in": [{ "var": "zaaktypecode" }, ["LP00000431", "B1873"]] },
+                { "in": [{ "var": "zaaktypecode" }, ["LP00000091", "LP00001132", "LP00000121", "B0757", "LP00000832", "LP00001096"]] }
+            ]
+            },
+            true,
+            false
+        ]
+    }
 }

configurations/xxllnc-zoekendpoint-woo/mappings/xxllnc-document-to-attachment

@@ -0,0 +1,22 @@
+{
+    "name": "Xxllnc document to attachment",
+    "version": "0.0.1",
+    "mapping": {
+        "title": "filename",
+        "labels": "[{{ label }}]",
+        "size": "size",
+        "type": "mimetype",
+        "extension": "{{ filename|split('.')|last }}",
+        "shareUrl": "{ \"accessUrl\": \"https://urlvanzaaksysteem/{{ caseId }}/document/{{ uuid }}/download\",\"downloadUrl\": \"https://zaaksysteem-accept.noordwijk.nl/api/case/{{ caseId }}/document/{{ uuid }}/download\",\"shareUrl\": \"https://zaaksysteem-accept.noordwijk.nl/api/case/{{ caseId }}/document/{{ uuid }}/download\", {% if filename|default %}\"filename\": \"filename\",\"extension\": \"{{ filename|split('.')|last }}\",{% endif %}\"source\": \"1\" }"
+    },
+    "unset": [],
+    "cast": {
+        "title": "unsetIfValue==filename",
+        "labels": "jsonToArray",
+        "size": "unsetIfValue==size",
+        "type": "unsetIfValue==mimetype",
+        "extension": "unsetIfValue==",
+        "shareUrl": "jsonToArray"
+    },
+    "passThrough": false
+}

configurations/xxllnc-zoekendpoint-woo/mappings/xxllnc-zoek-endpoint-to-publication.json

@@ -0,0 +1,29 @@
+{
+    "name": "Xxllnc zoek endpoint to Publication",
+    "version": "0.0.1",
+    "mapping": {
+        "title": "{{ values['case.subject'] }}",
+        "summary": "{{ values['attribute.woo_samenvatting'] }}",
+        "description": "{{ values['attribute.woo_beschrijving'] }}",
+        "category": "{{ values['attribute.woo_categorie'] }}",
+        "featured": false,
+        "status": "Published",
+        "attachmentCount": 0,
+        "published": "{{ values['attribute.woo_publicatiedatum'] }}",
+        "modified": "{{ \"now\"|date(\"Y-m-d\\\\TH:i:s.v\\\\Z\") }}",
+        "license": "eupl2",
+        "catalog": "1bcb99cd-7e47-4242-b7a7-ac7d36fe5d5e",
+        "attachments": "[{% set fileCount = 0 %}{% for file in values['attribute.woo_publicatie'] %}{% if fileCount > 0 %}, {% endif %}{% set file = file|merge({'label': 'Publicatie', 'caseId': id}) %}{{ executeMapping(2, file)|json_encode }}{% set fileCount = fileCount + 1 %}{% endfor %}{% for file in values['attribute.woo_inventarisatielijst'] %}{% if fileCount > 0 %}, {% endif %}{% set file = file|merge({'label': 'Inventarisatielijst', 'caseId': id}) %}{{ executeMapping(2, file)|json_encode }}{% set fileCount = fileCount + 1 %}{% endfor %}{% for file in values['attribute.woo_informatieverzoek'] %}{% if fileCount > 0 %}, {% endif %}{% set file = file|merge({'label': 'Informatieverzoek', 'caseId': id}) %}{{ executeMapping(2, file)|json_encode }}{% set fileCount = fileCount + 1 %}{% endfor %}{% for file in values['attribute.woo_besluit'] %}{% if fileCount > 0 %}, {% endif %}{% set file = file|merge({'label': 'Besluit', 'caseId': id}) %}{{ executeMapping(2, file)|json_encode }}{% set fileCount = fileCount + 1 %}{% endfor %}]"
+    },
+    "unset": [],
+    "cast": {
+        "title": "unsetIfValue==",
+        "summary": "unsetIfValue==",
+        "description": "unsetIfValue==",
+        "category": "unsetIfValue==",
+        "published": "unsetIfValue==",
+        "modified": "unsetIfValue==",
+        "attachments": "jsonToArray"
+    },
+    "passThrough": false
+}

configurations/xxllnc-zoekendpoint-woo/sources/xxllnc-v1.json

@@ -0,0 +1,18 @@
+{
+    "name": "Xxllnc zaaksysteem",
+    "version": "0.0.1",
+    "location": "",
+    "isEnabled": true,
+    "type": "api",
+    "auth": "none",
+    "authorizationPassthroughMethod": "header",
+    "configuration": {
+        "headers.API-KEY": "",
+        "headers.API-Interface-ID": ""
+    },
+    "endpointsConfig": [],
+    "logRetention": 3600,
+    "errorRetention": 86400,
+    "objectCount": 0,
+    "test": false
+}

configurations/xxllnc-zoekendpoint-woo/synchronizations/xxllnc-zoek-endpoint-to-publications.json

@@ -0,0 +1,31 @@
+{
+    "name": "Xxllnc zoek endpoint to Publications",
+    "description": "",
+    "version": "0.0.1",
+    "sourceId": "1",
+    "sourceType": "api",
+    "sourceTargetMapping": "1",
+    "sourceConfig": {
+        "idPosition": "id",
+        "resultsPosition": "result",
+        "endpoint": "/public_search/x/search",
+        "headers": [],
+        "query": []
+    },
+    "currentPage": 1,
+    "targetId": "1/1",
+    "targetType": "register/schema",
+    "conditions": {
+        "and": [
+            {
+                "var": "values['attribute.woo_categorie']"
+            },
+            {
+                "var": "values['case.subject']"
+            },
+            {
+                "var": "values['attribute.woo_publicatiedatum']"
+            }
+        ]
+    }
+}

lib/Action/SynchronizationAction.php

@@ -6,6 +6,7 @@
 use OCA\OpenConnector\Service\SynchronizationService;
 use OCA\OpenConnector\Db\SynchronizationMapper;
 use OCA\OpenConnector\Db\SynchronizationContractMapper;
+use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
 
 /**
  * This action handles the synchronization of data from the source to the target.
@@ -70,7 +71,15 @@ public function run(array $argument = []): array
         $response['stackTrace'][] = 'Doing the synchronization';
         try {
             $objects = $this->synchronizationService->synchronize($synchronization);
-        } catch (Exception $e) {
+        } catch (TooManyRequestsHttpException $e) {
+			$response['level'] = 'WARNING';
+			$response['stackTrace'][] = $response['message'] = 'Stopped synchronization: ' . $e->getMessage();
+			if (isset($e->getHeaders()['X-RateLimit-Reset']) === true) {
+				$response['nextRun'] = $e->getHeaders()['X-RateLimit-Reset'];
+				$response['stackTrace'][] = 'Returning X-RateLimit-Reset header to update Job nextRun: ' . $response['nextRun'];
+			}
+			return $response;
+		} catch (Exception $e) {
             $response['level'] = 'ERROR';
 			$response['stackTrace'][] = $response['message'] = 'Failed to synchronize: ' . $e->getMessage();
             return $response;

lib/Controller/SynchronizationsController.php

@@ -256,17 +256,73 @@ public function test(int $id): JSONResponse
 
         // Try to synchronize
         try {
-            $logAndContractArray = $this->synchronizationService->synchronize(synchronization: $synchronization, isTest: true);
+            $logAndContractArray = $this->synchronizationService->synchronize(
+				synchronization: $synchronization,
+				isTest: true
+			);
+
             // Return the result as a JSON response
             return new JSONResponse(data: $logAndContractArray, statusCode: 200);
         } catch (Exception $e) {
-            // If synchronizaiton fails, return an error response
-            return new JSONResponse([
-                'error' => 'Synchronization error',
-                'message' => $e->getMessage()
-            ], 400);
+			// Check if getHeaders method exists and use it if available
+			$headers = method_exists($e, 'getHeaders') ? $e->getHeaders() : [];
+
+            // If synchronization fails, return an error response
+            return new JSONResponse(
+				data: [
+					'error' => 'Synchronization error',
+					'message' => $e->getMessage()
+				],
+				statusCode: $e->getCode() ?? 400,
+				headers: $headers
+			);
+        }
+    }
+
+    /**
+     * Run a synchronization
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * Endpoint: /api/synchronizations-run/{id}
+     *
+     * @param int $id The ID of the synchronization to test
+     * @return JSONResponse A JSON response containing the run results
+	 * @throws GuzzleException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+     */
+    public function run(int $id): JSONResponse
+    {
+        try {
+            $synchronization = $this->synchronizationMapper->find(id: $id);
+        } catch (DoesNotExistException $exception) {
+            return new JSONResponse(data: ['error' => 'Not Found'], statusCode: 404);
         }
 
-        return new JSONResponse($resultFromTest, 200);
+        // Try to synchronize
+        try {
+            $logAndContractArray = $this->synchronizationService->synchronize(
+				synchronization: $synchronization,
+				isTest: false
+			);
+
+            // Return the result as a JSON response
+            return new JSONResponse(data: $logAndContractArray, statusCode: 200);
+        } catch (Exception $e) {
+			// Check if getHeaders method exists and use it if available
+			$headers = method_exists($e, 'getHeaders') ? $e->getHeaders() : [];
+
+            // If synchronization fails, return an error response
+            return new JSONResponse(
+				data: [
+					'error' => 'Synchronization error',
+					'message' => $e->getMessage()
+				],
+				statusCode: $e->getCode() ?? 400,
+				headers: $headers
+			);
+        }
     }
 }