Skip to content

Adding new order exception and using it in find methods #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abnegate merged 4 commits into from
Apr 16, 2025
Merged

Adding new order exception and using it in find methods #554

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f39605
added new Order exception
ArnabChatterjee20k Apr 16, 2025
c1122f9
replaced Database exception with the Order exception where cursor nul…
ArnabChatterjee20k Apr 16, 2025
c744eff
added revamps -> used alias for OrderException and removed status code
ArnabChatterjee20k Apr 16, 2025
1e3df24
removed default attributes from the OrderException
ArnabChatterjee20k Apr 16, 2025
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
3 changes: 2 additions & 1 deletion src/Database/Adapter/MariaDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Utopia\Database\Exception as DatabaseException;
use Utopia\Database\Exception\Duplicate as DuplicateException;
use Utopia\Database\Exception\NotFound as NotFoundException;
use Utopia\Database\Exception\Order as OrderException;
use Utopia\Database\Exception\Timeout as TimeoutException;
use Utopia\Database\Exception\Truncate as TruncateException;
use Utopia\Database\Helpers\ID;
Expand Down Expand Up @@ -1716,7 +1717,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
}

if (\is_null($cursor[$originalAttribute] ?? null)) {
throw new DatabaseException("Order attribute '{$originalAttribute}' is empty");
throw new OrderException("Order attribute '{$originalAttribute}' is empty", 0, null, $originalAttribute);
}

$binds[':cursor'] = $cursor[$originalAttribute];
Expand Down
3 changes: 2 additions & 1 deletion src/Database/Adapter/Postgres.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Utopia\Database\Document;
use Utopia\Database\Exception as DatabaseException;
use Utopia\Database\Exception\Duplicate as DuplicateException;
use Utopia\Database\Exception\Order as OrderException;
use Utopia\Database\Exception\Timeout as TimeoutException;
use Utopia\Database\Exception\Transaction as TransactionException;
use Utopia\Database\Exception\Truncate as TruncateException;
Expand Down Expand Up @@ -1549,7 +1550,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
}

if (\is_null($cursor[$originalAttribute] ?? null)) {
throw new DatabaseException("Order attribute '{$originalAttribute}' is empty");
throw new OrderException("Order attribute '{$originalAttribute}' is empty", 0, null, $originalAttribute);
}

$binds[':cursor'] = $cursor[$originalAttribute];
Expand Down
20 changes: 20 additions & 0 deletions src/Database/Exception/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace Utopia\Database\Exception;

use Throwable;
use Utopia\Database\Exception;

class Order extends Exception
{
protected ?string $attribute;
public function __construct(string $message, int|string $code = 0, ?Throwable $previous = null, ?string $attribute = null)
{
$this->attribute = $attribute;
parent::__construct($message, $code, $previous);
}
public function getAttribute(): ?string
{
return $this->attribute;
}
}