Improved excemption handling if a collection is missing

ksainc · Jan 23, 2024 · 01cfc5c · 01cfc5c
1 parent 0dea32f
commit 01cfc5c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/lib/Service/ContactsService.php b/lib/Service/ContactsService.php
@@ -142,12 +142,19 @@ public function performHarmonization($correlation) : object {
 			return $statistics;
 		}
 		// delete and skip collection correlation if remote collection is missing
-		$rcollection = $this->RemoteContactsService->fetchCollection($rcid);
-		if (!isset($rcollection) || ($rcollection->Id != $rcid)) {
-			$this->CorrelationsService->deleteByAffiliationId($this->Configuration->UserId, $caid);
-			$this->CorrelationsService->delete($correlation);
-			$this->logger->debug('EWS - Deleted contacts collection correlation for ' . $this->Configuration->UserId . ' due to missing Remote Collection');
-			return $statistics;
+		try {
+			$rcollection = $this->RemoteContactsService->fetchCollection($rcid);
+		} 
+		catch (\Throwable $th) {
+			if (str_contains($th->getMessage(), 'Remote Error: ErrorItemNotFound')) {
+				$this->CorrelationsService->deleteByAffiliationId($this->Configuration->UserId, $caid);
+				$this->CorrelationsService->delete($correlation);
+				$this->logger->debug('EWS - Deleted contacts collection correlation for ' . $this->Configuration->UserId . ' due to missing Remote Collection');
+				return $statistics;
+			}
+			else {
+				throw $th;
+			}
 		}
 		// retrieve list of local changed objects
 		$lCollectionChanges = $this->LocalContactsService->fetchCollectionChanges($correlation->getloid(), (string) $correlation->getlostate());

diff --git a/lib/Service/EventsService.php b/lib/Service/EventsService.php
@@ -149,12 +149,19 @@ public function performHarmonization($correlation) : object {
 			return $statistics;
 		}
 		// delete and skip collection correlation if remote collection is missing
-		$rcollection = $this->RemoteEventsService->fetchCollection($rcid);
-		if (!isset($rcollection) || ($rcollection->Id != $rcid)) {
-			$this->CorrelationsService->deleteByAffiliationId($this->Configuration->UserId, $caid);
-			$this->CorrelationsService->delete($correlation);
-			$this->logger->debug('EWS - Deleted Events collection correlation for ' . $this->Configuration->UserId . ' due to missing Remote Collection');
-			return $statistics;
+		try {
+			$rcollection = $this->RemoteEventsService->fetchCollection($rcid);
+		} 
+		catch (\Throwable $th) {
+			if (str_contains($th->getMessage(), 'Remote Error: ErrorItemNotFound')) {
+				$this->CorrelationsService->deleteByAffiliationId($this->Configuration->UserId, $caid);
+				$this->CorrelationsService->delete($correlation);
+				$this->logger->debug('EWS - Deleted Events collection correlation for ' . $this->Configuration->UserId . ' due to missing Remote Collection');
+				return $statistics;
+			}
+			else {
+				throw $th;
+			}
 		}
 		// retrieve list of local changed objects
 		$lCollectionChanges = $this->LocalEventsService->fetchCollectionChanges($correlation->getloid(), (string) $correlation->getlostate());

diff --git a/lib/Service/TasksService.php b/lib/Service/TasksService.php
@@ -149,12 +149,19 @@ public function performHarmonization($correlation) : object {
 			return $statistics;
 		}
 		// delete and skip collection correlation if remote collection is missing
-		$rcollection = $this->RemoteTasksService->fetchCollection($rcid);
-		if (!isset($rcollection) || ($rcollection->Id != $rcid)) {
-			$this->CorrelationsService->deleteByAffiliationId($this->Configuration->UserId, $caid);
-			$this->CorrelationsService->delete($correlation);
-			$this->logger->debug('EWS - Deleted tasks collection correlation for ' . $this->Configuration->UserId . ' due to missing Remote Collection');
-			return $statistics;
+		try {
+			$rcollection = $this->RemoteTasksService->fetchCollection($rcid);
+		} 
+		catch (\Throwable $th) {
+			if (str_contains($th->getMessage(), 'Remote Error: ErrorItemNotFound')) {
+				$this->CorrelationsService->deleteByAffiliationId($this->Configuration->UserId, $caid);
+				$this->CorrelationsService->delete($correlation);
+				$this->logger->debug('EWS - Deleted tasks collection correlation for ' . $this->Configuration->UserId . ' due to missing Remote Collection');
+				return $statistics;
+			}
+			else {
+				throw $th;
+			}
 		}
 		// retrieve list of local changed objects
 		$lCollectionChanges = $this->LocalTasksService->fetchCollectionChanges($correlation->getloid(), (string) $correlation->getlostate());