Merge pull request #401 from ConductionNL/hotfix/synchronization-logs

Fix logging endpoint of synchronizations, fix setting last synced

Author: rjzondervan

lib/Controller/SynchronizationsController.php

@@ -209,7 +209,8 @@ public function contracts(int $id): JSONResponse
     public function logs(string $uuid): JSONResponse
     {
         try {
-            $logs = $this->synchronizationLogMapper->findAll(null, null, ['synchronization_id' => $uuid]);
+            $synchronization = $this->synchronizationMapper->find($uuid);
+            $logs = $this->synchronizationLogMapper->findAll(null, null, ['synchronization_id' => $synchronization->getUuid()]);
             return new JSONResponse($logs);
         } catch (DoesNotExistException $e) {
             return new JSONResponse(['error' => 'Logs not found'], 404);

lib/Service/SynchronizationService.php

@@ -188,9 +188,9 @@ public function synchronize(
 				force: $force,
 				log: $log
 			);
-			
+
 			$result = $processResult['result'];
-			
+
 			if ($processResult['targetId'] !== null) {
 				$synchronizedTargetIds[] = $processResult['targetId'];
 			}
@@ -222,6 +222,9 @@ public function synchronize(
 			);
 		}
 
+        $synchronization->setTargetLastSynced(new DateTime());
+        $this->synchronizationMapper->update($synchronization);
+
 		// Calculate execution time in milliseconds
 		$executionTime = round((microtime(true) - $startTime) * 1000);
 		$log->setExecutionTime($executionTime);
@@ -2056,23 +2059,23 @@ private function xmlToArray(\SimpleXMLElement $xml): array
 	 * @param bool $isTest Whether this is a test run
 	 * @param bool $force Whether to force synchronization regardless of changes
 	 * @param SynchronizationLog $log The synchronization log
-	 * 
+	 *
 	 * @return array Contains updated result data and the targetId ['result' => array, 'targetId' => string|null]
 	 */
 	private function processSynchronizationObject(
-		Synchronization $synchronization, 
-		array $object, 
-		array $result, 
-		bool $isTest, 
-		bool $force, 
+		Synchronization $synchronization,
+		array $object,
+		array $result,
+		bool $isTest,
+		bool $force,
 		SynchronizationLog $log
 	): array {
 		// We can only deal with arrays (based on the source empty values or string might be returned)
 		if (is_array($object) === false) {
 			$result['objects']['invalid']++;
 			return ['result' => $result, 'targetId' => null];
 		}
-		
+
 		$conditionsObject = $this->encodeArrayKeys($object, '.', '.');
 
 		// Check if object adheres to conditions.
@@ -2088,7 +2091,7 @@ private function processSynchronizationObject(
 
 		// Get the synchronization contract for this object
 		$synchronizationContract = $this->synchronizationContractMapper->findSyncContractByOriginId(
-			synchronizationId: $synchronization->id, 
+			synchronizationId: $synchronization->id,
 			originId: $originId
 		);
 
@@ -2108,9 +2111,9 @@ private function processSynchronizationObject(
 			);
 
 			$synchronizationContract = $synchronizationContractResult['contract'];
-			$result['contracts'][] = isset($synchronizationContractResult['contract']['uuid']) ? 
+			$result['contracts'][] = isset($synchronizationContractResult['contract']['uuid']) ?
 				$synchronizationContractResult['contract']['uuid'] : null;
-			$result['logs'][] = isset($synchronizationContractResult['log']['uuid']) ? 
+			$result['logs'][] = isset($synchronizationContractResult['log']['uuid']) ?
 				$synchronizationContractResult['log']['uuid'] : null;
 			$result['objects']['created']++;
 		} else {
@@ -2125,15 +2128,15 @@ private function processSynchronizationObject(
 			);
 
 			$synchronizationContract = $synchronizationContractResult['contract'];
-			$result['contracts'][] = isset($synchronizationContractResult['contract']['uuid']) === true ? 
+			$result['contracts'][] = isset($synchronizationContractResult['contract']['uuid']) === true ?
 				$synchronizationContractResult['contract']['uuid'] : null;
-			$result['logs'][] = isset($synchronizationContractResult['log']['uuid']) === true ? 
+			$result['logs'][] = isset($synchronizationContractResult['log']['uuid']) === true ?
 				$synchronizationContractResult['log']['uuid'] : null;
 			$result['objects']['updated']++;
 		}
 
 		$targetId = $synchronizationContract['targetId'] ?? null;
-		
+
 		return ['result' => $result, 'targetId' => $targetId];
 	}