Restore API field constants and replace hardcoded query tokens

Author: c15k0

src/base/types/Api.php

@@ -25,9 +25,13 @@ abstract class Api extends Singleton
 {
     use ManagerTrait, ApiListTrait, ApiCrudResponseTrait;
 
+    const API_COMBO_FIELD = '__combo';
     const API_LIST_NAME_FIELD = '__name__';
     const API_FIELDS_RESULT_FIELD = '__fields';
     const API_MODEL_KEY_FIELD = '__pk';
+    const API_ORDER_FIELD = '__order';
+    const API_PAGE_FIELD = '__page';
+    const API_LIMIT_FIELD = '__limit';
     const API_PK_SEPARATOR = '__|__';
 
     const API_ACTION_LIST = 'list';

src/base/types/traits/Api/ApiEndpointExtractorTrait.php

@@ -5,6 +5,7 @@
 use Exception;
 use PSFS\base\Logger;
 use PSFS\base\Request;
+use PSFS\base\types\Api;
 use PSFS\base\types\helpers\AnnotationHelper;
 use PSFS\base\types\helpers\MetadataReader;
 use PSFS\base\types\helpers\attributes\Header;
@@ -148,21 +149,21 @@ private function buildNativeQueryParams(): array
     {
         return [
             [
-                "name" => "__limit",
+                "name" => Api::API_LIMIT_FIELD,
                 "in" => "query",
                 "description" => t("Record limit to return, -1 to return all records"),
                 "required" => false,
                 "type" => "integer",
             ],
             [
-                "name" => "__page",
+                "name" => Api::API_PAGE_FIELD,
                 "in" => "query",
                 "description" => t("Page to return"),
                 "required" => false,
                 "type" => "integer",
             ],
             [
-                "name" => "__fields",
+                "name" => Api::API_FIELDS_RESULT_FIELD,
                 "in" => "query",
                 "description" => t("Fields to return"),
                 "required" => false,

src/base/types/traits/Api/Crud/ApiListTrait.php

@@ -5,6 +5,7 @@
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use PSFS\base\dto\Order;
 use PSFS\base\Logger;
+use PSFS\base\types\Api;
 use PSFS\base\types\helpers\ApiHelper;
 use PSFS\base\types\helpers\attributes\Injectable;
 use PSFS\base\types\traits\Api\MutationTrait;
@@ -139,22 +140,22 @@ protected function paginate()
 
     private function apiComboField(): string
     {
-        return '__combo';
+        return Api::API_COMBO_FIELD;
     }
 
     private function apiOrderField(): string
     {
-        return '__order';
+        return Api::API_ORDER_FIELD;
     }
 
     private function apiPageField(): string
     {
-        return '__page';
+        return Api::API_PAGE_FIELD;
     }
 
     private function apiLimitField(): string
     {
-        return '__limit';
+        return Api::API_LIMIT_FIELD;
     }
 
 }