copenhagentruckwash/api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

Add endpoint to close invoice drafts and refactor routes

Browse Source 
Introduced a new POST endpoint `/invoices/draft/close` to allow closing of draft invoices, enforcing user authentication and permissions. Refactored and reorganized route and utility methods to improve readability and maintainability, including restoring `match_route` and restructuring `fromRequest`. Removed unused methods for cleaner code.
This commit is contained in:
Jepp9350
2025-02-07 13:03:22 +01:00
parent f8cd736154
commit ac657d6130
5 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/nginx/app/traits/route_t.php
+30 -22
View File
@@ -8,17 +8,12 @@ use objects\logs_o;
trait route_t
{
private string $route;
public function __construct()
{
$this->route = $_SERVER['REQUEST_URI'];
}
private function registerRoute($route, $method, $callback): void
{
global $router;
$router->add($route, $method, $callback);
}
public function run(): void
{
// Add the routes here
@@ -33,6 +28,12 @@ trait route_t
$this->registerRoute($route, 'GET', $callback);
}
private function registerRoute($route, $method, $callback): void
{
global $router;
$router->add($route, $method, $callback);
}
/**
* POST route
* @param string $route Example: /home, /home/{id}
@@ -78,16 +79,6 @@ trait route_t
$this->registerRoute($route, 'PATCH', $callback);
}
/**
* Match route
* @param string $route Example: /home, /home/{id}
*/
private function match_route(string $route): bool
{
// Check if route is the same, or if it matches the regex pattern
return $route === $this->route || preg_match($route, $this->route);
}
/**
* Get the parameter from the route URL by index
* @param string $index
@@ -118,7 +109,7 @@ trait route_t
}
if (!$user->hasPermission($permission)) {
(new logs_o())->add('global', 'global', 1, $user->id, 'PERMISSION_DENIED', 'Permission denied. Missing permission: ' . $permission);
$response->error('Permission denied. Missing permission: ' . $permission .' for user: ' . $user->id . ' In group: ' . $user->group_id->value(), 403);
$response->error('Permission denied. Missing permission: ' . $permission . ' for user: ' . $user->id . ' In group: ' . $user->group_id->value(), 403);
}
} catch (\Exception $e) {
$response->error($e->getMessage(), 400);
@@ -147,6 +138,23 @@ trait route_t
return true;
}
/**
* Get data from the request body or query string by name
* @param string $name
* @return string|null
*/
public function fromRequest(string $name): ?string
{
// If the $_POST variable is set, return the value from the POST variable, otherwise return the value from the query string
if (isset($_POST)) {
$data = json_decode(file_get_contents('php://input'), true);
if (isset($data[$name])) {
return $data[$name];
}
}
return (isset($_POST[$name])) ? $_POST[$name] : $this->fromQuery($name);
}
/**
* Get the parameter from the query string by name
* @param string $name
@@ -158,12 +166,12 @@ trait route_t
}
/**
* Get data from the request body or query string by name
* @param string $name
* @return string|null
* Match route
* @param string $route Example: /home, /home/{id}
*/
public function fromRequest(string $name): ?string
private function match_route(string $route): bool
{
return (isset($_POST[$name])) ? $_POST[$name] : $this->fromQuery($name);
// Check if route is the same, or if it matches the regex pattern
return $route === $this->route || preg_match($route, $this->route);
}
}