The OpenRegister calls that only the fakes believed: saveObject's retired arg order and the id filter that matches nothing

lib/BackgroundJob/SentimentAnalysisJob.php

@@ -169,10 +169,11 @@ private function processContact($objectService, string $register, string $sentim
 
 		$analysis = $this->sentimentService->analyzeSentiment($transcript, $triggerWords);
 
-		$objectService->saveObject(
-			$register,
-			$sentimentSchema,
-			[
+		$this->saveObjectAsArray(
+			objectService: $objectService,
+			register: $register,
+			schema: $sentimentSchema,
+			object: [
 				'interactionId' => $contactId,
 				'sentimentScore' => $analysis['score'],
 				'sentimentLabel' => $analysis['label'],

lib/BackgroundJob/SpecialistBeschikbaarheidRefreshJob.php

@@ -159,14 +159,15 @@ private function ageOut($objectService, string $register, string $schema, array
 		}
 
 		try {
-			$objectService->saveObject(
-				$register,
-				$schema,
-				[
+			$this->saveObjectAsArray(
+				objectService: $objectService,
+				register: $register,
+				schema: $schema,
+				object: [
 					'status' => 'afwezig',
 					'lastUpdate' => date('c'),
 				],
-				$id,
+				uuid: $id,
 			);
 		} catch (Throwable $e) {
 			$this->logger->warning(

lib/Controller/BelplanController.php

@@ -139,7 +139,7 @@ public function create(): JSONResponse {
 		];
 
 		try {
-			$created = $objectService->saveObject($register, $schema, $record);
+			$created = $objectService->saveObject(object: $record, register: $register, schema: $schema);
 		} catch (Throwable $e) {
 			return new JSONResponse(['error' => 'Could not create belplan'], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -178,7 +178,7 @@ public function update(string $id): JSONResponse {
 		}
 
 		try {
-			$updated = $objectService->saveObject($register, $schema, $patch, $id);
+			$updated = $objectService->saveObject(object: $patch, register: $register, schema: $schema, uuid: $id);
 		} catch (Throwable $e) {
 			return new JSONResponse(['error' => 'Could not update belplan'], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}

lib/Controller/StufController.php

@@ -202,9 +202,9 @@ public function outbound(): JSONResponse {
 			return new JSONResponse(['error' => $this->l10n->t('endpointId and berichtNaam are required')], Http::STATUS_BAD_REQUEST);
 		}
 
-		$endpoint = $this->stuf->register->findOne(
+		$endpoint = $this->stuf->register->findById(
 			schema: StufRegisterAccess::SCHEMA_ENDPOINT,
-			filters: ['id' => $endpointId]
+			id: $endpointId
 		);
 		if ($endpoint === null) {
 			return new JSONResponse(['error' => $this->l10n->t('Endpoint not found')], Http::STATUS_NOT_FOUND);

lib/Repair/ArmTermijnEngineTimers.php

@@ -212,8 +212,13 @@ private function definitieFor(array $row): array {
 		}
 
 		try {
-			$def = $objectService->find($defId, register: $register, schema: $schema);
-			if (is_array($def) === true) {
+			$def = $this->findObjectAsArray(
+				objectService: $objectService,
+				register: $register,
+				schema: $schema,
+				id: $defId
+			);
+			if ($def !== null) {
 				return $def;
 			}
 		} catch (\Throwable $e) {

lib/Service/AdvisoryBodyService.php

@@ -108,18 +108,15 @@ public function findById(string $id): ?array {
 			return null;
 		}
 
-		$results = $this->searchObjectsAsArrays(
+		// A top-level `['id' => $id]` filter does not resolve in OpenRegister
+		// (ids are metadata, not schema properties) and silently matches
+		// nothing. The get-by-uuid path resolves the id directly.
+		return $this->findObjectAsArray(
 			objectService: $objectService,
 			register: $register,
 			schema: $schema,
-			filters: ['id' => $id, '_limit' => 1],
+			id: $id
 		);
-
-		if (empty($results) === false) {
-			return $results[0];
-		}
-
-		return null;
 	}//end findById()
 
 	/**

lib/Service/ContactMomentService.php

@@ -109,7 +109,7 @@ public function createContactMoment(array $data): array {
 		}
 
 		try {
-			$created = $objectService->saveObject($register, $schema, $record);
+			$created = $objectService->saveObject(object: $record, register: $register, schema: $schema);
 		} catch (Throwable $e) {
 			$this->logger->error(
 				'Dossiq: failed to create contactmoment: ' . $e->getMessage(),
@@ -269,7 +269,7 @@ public function recordActivity(
 				'timestamp' => date('c'),
 			];
 
-			$objectService->saveObject($register, $caseSchema, ['activity' => $activity], $caseId);
+			$objectService->saveObject(object: ['activity' => $activity], register: $register, schema: $caseSchema, uuid: $caseId);
 			return true;
 		} catch (Throwable $e) {
 			$this->logger->error(
@@ -304,14 +304,14 @@ public function linkUnlinkedContactmoment(
 
 		try {
 			$updated = $objectService->saveObject(
-				$register,
-				$schema,
-				[
+				object: [
 					'geidentificeerdeBurgerId' => $burgerId,
 					'identificationMethod' => $method,
 					'identificationScore' => round($score, 2),
 				],
-				$interactionId,
+				register: $register,
+				schema: $schema,
+				uuid: $interactionId,
 			);
 		} catch (Throwable $e) {
 			$this->logger->error(

lib/Service/DeadlineMonitoringSeedDataService.php

@@ -123,7 +123,7 @@ private function insertDefinitions(
 			}
 
 			try {
-				$objectService->saveObject($register, $schema, $row);
+				$this->saveObjectAsArray(objectService: $objectService, register: $register, schema: $schema, object: $row);
 				$counts['definities']++;
 			} catch (\Throwable $e) {
 				$this->logger->warning(

lib/Service/DoorverbindingService.php

@@ -95,7 +95,7 @@ public function initiateWarmTransfer(array $data): array {
 		];
 
 		try {
-			$created = $objectService->saveObject($register, $schema, $record);
+			$created = $objectService->saveObject(object: $record, register: $register, schema: $schema);
 		} catch (Throwable $e) {
 			$this->logger->error(
 				'Dossiq: failed to initiate doorverbinding: ' . $e->getMessage(),
@@ -238,7 +238,7 @@ private function update(string $doorverbindingId, array $patch): array {
 		[$objectService, $register, $schema] = $this->resolve();
 
 		try {
-			$updated = $objectService->saveObject($register, $schema, $patch, $doorverbindingId);
+			$updated = $objectService->saveObject(object: $patch, register: $register, schema: $schema, uuid: $doorverbindingId);
 		} catch (Throwable $e) {
 			$this->logger->error(
 				'Dossiq: failed to update doorverbinding: ' . $e->getMessage(),

lib/Service/DwangsomBezwaarService.php

@@ -85,18 +85,28 @@ public function registerBezwaar(string $calculationId, string $basis, string $ra
 		);
 
 		try {
-			$calculation = $objectService->find($calculationId, register: $register, schema: $bSchema);
+			$calculation = $this->findObjectAsArray(
+				objectService: $objectService,
+				register: $register,
+				schema: $bSchema,
+				id: $calculationId
+			);
 		} catch (\Throwable $e) {
 			throw new RuntimeException('DwangsomBerekening lookup failed: ' . $e->getMessage());
 		}
 
-		if (is_array($calculation) === false) {
+		if ($calculation === null) {
 			throw new RuntimeException('DwangsomBerekening not found: ' . $calculationId);
 		}
 
 		$calculation['status'] = 'objection-bevroren';
 		try {
-			$calculation = $objectService->saveObject($register, $bSchema, $calculation);
+			$calculation = ($this->saveObjectAsArray(
+				objectService: $objectService,
+				register: $register,
+				schema: $bSchema,
+				object: $calculation
+			) ?? $calculation);
 		} catch (\Throwable $e) {
 			throw new RuntimeException('DwangsomBerekening persist failed: ' . $e->getMessage());
 		}
@@ -112,7 +122,7 @@ public function registerBezwaar(string $calculationId, string $basis, string $ra
 		foreach ($uitbetalingen as $u) {
 			$u['status'] = 'on-hold-objection';
 			try {
-				$objectService->saveObject($register, $uSchema, $u);
+				$this->saveObjectAsArray(objectService: $objectService, register: $register, schema: $uSchema, object: $u);
 			} catch (\Throwable $e) {
 				$this->logger->warning('Bezwaar freeze on uitbetaling failed', ['id' => $u['id'] ?? '', 'error' => $e->getMessage()]);
 			}
@@ -131,11 +141,7 @@ public function registerBezwaar(string $calculationId, string $basis, string $ra
 		}
 
 		$this->logger->info('Dwangsom bezwaar registered', ['berekening' => $calculationId]);
-		if (is_array($calculation) === true) {
-			return $calculation;
-		}
-
-		return [];
+		return $calculation;
 	}//end registerBezwaar()
 
 	/**
@@ -168,19 +174,29 @@ public function resolveBezwaar(string $calculationId, int $newAmountCents, strin
 		);
 
 		try {
-			$calculation = $objectService->find($calculationId, register: $register, schema: $bSchema);
+			$calculation = $this->findObjectAsArray(
+				objectService: $objectService,
+				register: $register,
+				schema: $bSchema,
+				id: $calculationId
+			);
 		} catch (\Throwable $e) {
 			throw new RuntimeException('DwangsomBerekening lookup failed: ' . $e->getMessage());
 		}
 
-		if (is_array($calculation) === false) {
+		if ($calculation === null) {
 			throw new RuntimeException('DwangsomBerekening not found: ' . $calculationId);
 		}
 
 		$calculation['definitiveAmount'] = $newAmountCents;
 		$calculation['status'] = 'completed';
 		try {
-			$calculation = $objectService->saveObject($register, $bSchema, $calculation);
+			$calculation = ($this->saveObjectAsArray(
+				objectService: $objectService,
+				register: $register,
+				schema: $bSchema,
+				object: $calculation
+			) ?? $calculation);
 		} catch (\Throwable $e) {
 			throw new RuntimeException('DwangsomBerekening persist failed: ' . $e->getMessage());
 		}
@@ -196,7 +212,7 @@ public function resolveBezwaar(string $calculationId, int $newAmountCents, strin
 			$u['amount'] = $newAmountCents;
 			$u['status'] = 'voorbereid';
 			try {
-				$objectService->saveObject($register, $uSchema, $u);
+				$this->saveObjectAsArray(objectService: $objectService, register: $register, schema: $uSchema, object: $u);
 			} catch (\Throwable $e) {
 				$this->logger->warning('Bezwaar resolve on uitbetaling failed', ['id' => $u['id'] ?? '', 'error' => $e->getMessage()]);
 			}
@@ -214,11 +230,7 @@ public function resolveBezwaar(string $calculationId, int $newAmountCents, strin
 		}
 
 		$this->logger->info('Dwangsom bezwaar resolved', ['berekening' => $calculationId, 'newBedrag' => $newAmountCents]);
-		if (is_array($calculation) === true) {
-			return $calculation;
-		}
-
-		return [];
+		return $calculation;
 	}//end resolveBezwaar()
 
 	/**

lib/Service/DwangsomCalculationService.php

@@ -37,12 +37,15 @@
 namespace OCA\Dossiq\Service;
 
 use DateTimeImmutable;
+use OCA\Dossiq\Service\Support\SearchesObjects;
 use Psr\Log\LoggerInterface;
 
 /**
  * Daily-accruing dwangsom calculator.
  */
 class DwangsomCalculationService {
+	use SearchesObjects;
+
 	/**
 	 * AWB-default tier 1 daily tariff in EUR cents (days 1-14).
 	 */
@@ -235,20 +238,14 @@ private function fetchCalculationRow(
 		string $calculationId,
 	): ?array {
 		try {
-			$row = $objectService->find($calculationId, register: $register, schema: $schema);
+			return $this->findObjectAsArray(objectService: $objectService, register: $register, schema: $schema, id: $calculationId);
 		} catch (\Throwable $e) {
 			$this->logger->warning(
 				'DwangsomCalculation lookup failed',
 				['id' => $calculationId, 'error' => $e->getMessage()]
 			);
 			return null;
 		}
-
-		if (is_array($row) === false) {
-			return null;
-		}
-
-		return $row;
 	}//end fetchBerekeningRow()
 
 	/**
@@ -304,12 +301,13 @@ private function persistCalculation(
 		string $calculationId,
 	): array {
 		try {
-			$saved = $objectService->saveObject($register, $schema, $row);
-			if (is_array($saved) === true) {
-				return $saved;
-			}
-
-			return $row;
+			$saved = $this->saveObjectAsArray(
+				objectService: $objectService,
+				register: $register,
+				schema: $schema,
+				object: $row
+			);
+			return ($saved ?? $row);
 		} catch (\Throwable $e) {
 			$this->logger->error(
 				'DwangsomCalculation persist failed',
@@ -419,12 +417,12 @@ private function resolveTermijnDefinitieId(
 		string $instanceId,
 	): string {
 		try {
-			$instance = $objectService->find($instanceId, register: $register, schema: $schema);
+			$instance = $this->findObjectAsArray(objectService: $objectService, register: $register, schema: $schema, id: $instanceId);
 		} catch (\Throwable $e) {
 			return '';
 		}
 
-		if (is_array($instance) === false) {
+		if ($instance === null) {
 			return '';
 		}
 
@@ -448,12 +446,12 @@ private function resolveRegimeDailyTariff(
 		string $definitieId,
 	): int {
 		try {
-			$def = $objectService->find($definitieId, register: $register, schema: $schema);
+			$def = $this->findObjectAsArray(objectService: $objectService, register: $register, schema: $schema, id: $definitieId);
 		} catch (\Throwable $e) {
 			return self::AWB_TIER_1_CENTS;
 		}
 
-		if (is_array($def) === false) {
+		if ($def === null) {
 			return self::AWB_TIER_1_CENTS;
 		}