Skip to content
This repository was archived by the owner on May 29, 2026. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 39 additions & 34 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions lib/BackgroundJob/AppointmentReminderJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,11 @@ protected function run($argument): void

$tomorrow = (new \DateTime('+1 day'))->format('Y-m-d');

$result = $objectService->getObjects(
(int) $register,
(int) $schema,
['status' => 'scheduled'],
$appointments = $objectService->findAll(
['filters' => ['register' => (int) $register, 'schema' => (int) $schema, 'status' => 'scheduled']],
);

foreach (($result['objects'] ?? []) as $apt) {
foreach ($appointments as $apt) {
if (is_object($apt) === true) {
$data = $apt->jsonSerialize();
} else {
Expand Down
7 changes: 2 additions & 5 deletions lib/BackgroundJob/ShareMaintenanceJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,10 @@ protected function run($argument): void
}

try {
$result = $objectService->getObjects(
(int) $register,
(int) $schema,
[],
$shares = $objectService->findAll(
['filters' => ['register' => (int) $register, 'schema' => (int) $schema]],
);

$shares = ($result['objects'] ?? []);
$reminderDate = new \DateTime('+'.self::REMINDER_DAYS.' days');

foreach ($shares as $share) {
Expand Down
10 changes: 5 additions & 5 deletions lib/Repair/SeedLhsMatrix.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ public function run(IOutput $output): void
return;
}

$existing = $objectService->getObjects(
register: $register,
schema: $schema,
filters: ['active' => true],
limit: 1,
$existing = $objectService->findAll(
[
'filters' => ['register' => $register, 'schema' => $schema, 'active' => true],
'limit' => 1,
],
);
if ($this->hasRow(results: $existing) === true) {
$output->info('Active LHS matrix already exists. Skipping seed.');
Expand Down
16 changes: 4 additions & 12 deletions lib/Service/AppointmentService.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,9 @@ public function getAppointmentsForCase(string $caseId): array
$register = $this->settingsService->getConfigValue('register');
$schema = $this->settingsService->getConfigValue('appointment_schema');

$result = $objectService->getObjects(
(int) $register,
(int) $schema,
['caseId' => $caseId],
return $objectService->findAll(
['filters' => ['register' => (int) $register, 'schema' => (int) $schema, 'caseId' => $caseId]],
);

return $result['objects'] ?? [];
}//end getAppointmentsForCase()

/**
Expand All @@ -221,13 +217,9 @@ public function getAppointmentByToken(string $token): ?array
$register = $this->settingsService->getConfigValue('register');
$schema = $this->settingsService->getConfigValue('appointment_schema');

$result = $objectService->getObjects(
(int) $register,
(int) $schema,
['cancelToken' => $token],
$appointments = $objectService->findAll(
['filters' => ['register' => (int) $register, 'schema' => (int) $schema, 'cancelToken' => $token]],
);

$appointments = ($result['objects'] ?? []);
if (empty($appointments) === true) {
return null;
}
Expand Down
8 changes: 2 additions & 6 deletions lib/Service/BerichtenboxService.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,9 @@ public function getMessagesForCase(string $caseId): array
$register = $this->settingsService->getConfigValue('register');
$schema = $this->settingsService->getConfigValue('berichtenbox_message_schema');

$result = $objectService->getObjects(
(int) $register,
(int) $schema,
['caseId' => $caseId],
return $objectService->findAll(
['filters' => ['register' => (int) $register, 'schema' => (int) $schema, 'caseId' => $caseId]],
);

return $result['objects'] ?? [];
}//end getMessagesForCase()

/**
Expand Down
8 changes: 2 additions & 6 deletions lib/Service/CaseSharingService.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,9 @@ public function validateToken(string $token, ?string $password=null): array
$register = $this->settingsService->getConfigValue('register');
$schema = $this->settingsService->getConfigValue('case_share_schema');

$result = $objectService->getObjects(
(int) $register,
(int) $schema,
['token' => $token],
$shares = $objectService->findAll(
['filters' => ['register' => (int) $register, 'schema' => (int) $schema, 'token' => $token]],
);

$shares = ($result['objects'] ?? []);
if (empty($shares) === true) {
return ['valid' => false, 'error' => 'Token niet gevonden'];
}
Expand Down
10 changes: 5 additions & 5 deletions lib/Service/SeedDataService.php
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,11 @@ private function findByFilter(
array $filters,
): ?object {
try {
$results = $objectService->getObjects(
register: $registerId,
schema: $schemaId,
filters: $filters,
limit: 1,
$results = $objectService->findAll(
[
'filters' => (['register' => $registerId, 'schema' => $schemaId] + $filters),
'limit' => 1,
],
);

if (is_array($results) === true && count($results) > 0) {
Expand Down
10 changes: 5 additions & 5 deletions lib/Service/Vth/LhsRecommendationService.php
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,11 @@ private function loadMatrix(?int $version): array
}

try {
$results = $objectService->getObjects(
register: $register,
schema: $schema,
filters: $filters,
limit: 1,
$results = $objectService->findAll(
[
'filters' => (['register' => $register, 'schema' => $schema] + $filters),
'limit' => 1,
],
);
} catch (Throwable $e) {
$this->logger->error(
Expand Down
Loading
Loading