diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index 17f665f824..64156a4cf3 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -32,7 +32,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Support\Facades\Amount; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\AbstractTransformer; +use FireflyIII\Transformers\AbstractTransformer; use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php index ef88c982b3..019cda34b3 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\ExchangeRateTransformer; +use FireflyIII\Transformers\ExchangeRateTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php index d06132370d..0b3efa9ce6 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php @@ -29,7 +29,7 @@ use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\ExchangeRateTransformer; +use FireflyIII\Transformers\ExchangeRateTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php index e0114242fc..fcfb36ab6a 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreRequest; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\ExchangeRateTransformer; +use FireflyIII\Transformers\ExchangeRateTransformer; use Illuminate\Http\JsonResponse; class StoreController extends Controller diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php index ffde6543f7..f8e21942e6 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php @@ -29,7 +29,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\ExchangeRateTransformer; +use FireflyIII\Transformers\ExchangeRateTransformer; use Illuminate\Http\JsonResponse; class UpdateController extends Controller diff --git a/app/Api/V2/Controllers/Controller.php b/app/Api/V2/Controllers/Controller.php index 3891b7659e..66569e2a34 100644 --- a/app/Api/V2/Controllers/Controller.php +++ b/app/Api/V2/Controllers/Controller.php @@ -29,7 +29,7 @@ use Carbon\Exceptions\InvalidDateException; use Carbon\Exceptions\InvalidFormatException; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\AbstractTransformer; +use FireflyIII\Transformers\AbstractTransformer; use Illuminate\Database\Eloquent\Model; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Routing\Controller as BaseController; @@ -167,7 +167,7 @@ class Controller extends BaseController // the transformer, at this point, needs to collect information that ALL items in the collection // require, like meta-data and stuff like that, and save it for later. - $objects = $transformer->collectMetaData($objects); + //$objects = $transformer->collectMetaData($objects); $paginator->setCollection($objects); $resource = new FractalCollection($objects, $transformer, $key); @@ -188,7 +188,7 @@ class Controller extends BaseController $baseUrl = request()->getSchemeAndHttpHost().'/api/v2'; $manager->setSerializer(new JsonApiSerializer($baseUrl)); - $transformer->collectMetaData(new Collection([$object])); + //$transformer->collectMetaData(new Collection([$object])); $resource = new Item($object, $transformer, $key); diff --git a/app/Api/V2/Controllers/Model/Account/IndexController.php b/app/Api/V2/Controllers/Model/Account/IndexController.php index 5ee6adfc02..a2960e6673 100644 --- a/app/Api/V2/Controllers/Model/Account/IndexController.php +++ b/app/Api/V2/Controllers/Model/Account/IndexController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Api\V2\Request\Model\Account\IndexRequest; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Transformers\V2\AccountTransformer; +use FireflyIII\Transformers\AccountTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Facades\Log; diff --git a/app/Api/V2/Controllers/Model/Account/ShowController.php b/app/Api/V2/Controllers/Model/Account/ShowController.php index 9849d3b3c0..13d1f0cd8e 100644 --- a/app/Api/V2/Controllers/Model/Account/ShowController.php +++ b/app/Api/V2/Controllers/Model/Account/ShowController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Transformers\V2\AccountTransformer; +use FireflyIII\Transformers\AccountTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Api/V2/Controllers/Model/Account/UpdateController.php b/app/Api/V2/Controllers/Model/Account/UpdateController.php index 8246b74cd2..49c0f8d5b9 100644 --- a/app/Api/V2/Controllers/Model/Account/UpdateController.php +++ b/app/Api/V2/Controllers/Model/Account/UpdateController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Api\V2\Request\Model\Account\UpdateRequest; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Transformers\V2\AccountTransformer; +use FireflyIII\Transformers\AccountTransformer; use Illuminate\Http\JsonResponse; class UpdateController extends Controller diff --git a/app/Api/V2/Controllers/Model/Bill/IndexController.php b/app/Api/V2/Controllers/Model/Bill/IndexController.php index 4a311a6e20..bf09a6360b 100644 --- a/app/Api/V2/Controllers/Model/Bill/IndexController.php +++ b/app/Api/V2/Controllers/Model/Bill/IndexController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Bill; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\BillTransformer; +use FireflyIII\Transformers\BillTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V2/Controllers/Model/Bill/ShowController.php b/app/Api/V2/Controllers/Model/Bill/ShowController.php index 4b5387e022..16327e3f02 100644 --- a/app/Api/V2/Controllers/Model/Bill/ShowController.php +++ b/app/Api/V2/Controllers/Model/Bill/ShowController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\BillTransformer; +use FireflyIII\Transformers\BillTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Api/V2/Controllers/Model/Budget/IndexController.php b/app/Api/V2/Controllers/Model/Budget/IndexController.php index a1b7ab41c6..d2a8eb6e6e 100644 --- a/app/Api/V2/Controllers/Model/Budget/IndexController.php +++ b/app/Api/V2/Controllers/Model/Budget/IndexController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Budget; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Transformers\V2\BudgetTransformer; +use FireflyIII\Transformers\BudgetTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V2/Controllers/Model/Budget/ShowController.php b/app/Api/V2/Controllers/Model/Budget/ShowController.php index 6e5f9499c1..566cc992f9 100644 --- a/app/Api/V2/Controllers/Model/Budget/ShowController.php +++ b/app/Api/V2/Controllers/Model/Budget/ShowController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Api\V2\Request\Generic\DateRequest; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Transformers\V2\BudgetTransformer; +use FireflyIII\Transformers\BudgetTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Api/V2/Controllers/Model/BudgetLimit/IndexController.php b/app/Api/V2/Controllers/Model/BudgetLimit/IndexController.php index 8148aff6b9..1a54aa4ef9 100644 --- a/app/Api/V2/Controllers/Model/BudgetLimit/IndexController.php +++ b/app/Api/V2/Controllers/Model/BudgetLimit/IndexController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\BudgetLimit; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface; -use FireflyIII\Transformers\V2\BudgetLimitTransformer; +use FireflyIII\Transformers\BudgetLimitTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V2/Controllers/Model/Currency/IndexController.php b/app/Api/V2/Controllers/Model/Currency/IndexController.php index aa0418e43d..80657188b4 100644 --- a/app/Api/V2/Controllers/Model/Currency/IndexController.php +++ b/app/Api/V2/Controllers/Model/Currency/IndexController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Currency; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use FireflyIII\Transformers\V2\CurrencyTransformer; +use FireflyIII\Transformers\CurrencyTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V2/Controllers/Model/PiggyBank/IndexController.php b/app/Api/V2/Controllers/Model/PiggyBank/IndexController.php index 7d6027597c..7577edf95a 100644 --- a/app/Api/V2/Controllers/Model/PiggyBank/IndexController.php +++ b/app/Api/V2/Controllers/Model/PiggyBank/IndexController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\PiggyBank; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; -use FireflyIII\Transformers\V2\PiggyBankTransformer; +use FireflyIII\Transformers\PiggyBankTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V2/Controllers/Model/Transaction/ShowController.php b/app/Api/V2/Controllers/Model/Transaction/ShowController.php index 19cd0fab3d..185bd41774 100644 --- a/app/Api/V2/Controllers/Model/Transaction/ShowController.php +++ b/app/Api/V2/Controllers/Model/Transaction/ShowController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Transaction; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Models\TransactionGroup; -use FireflyIII\Transformers\V2\TransactionGroupTransformer; +use FireflyIII\Transformers\TransactionGroupTransformer; use Illuminate\Http\JsonResponse; class ShowController extends Controller diff --git a/app/Api/V2/Controllers/Model/Transaction/StoreController.php b/app/Api/V2/Controllers/Model/Transaction/StoreController.php index 570313010c..9c9d61592b 100644 --- a/app/Api/V2/Controllers/Model/Transaction/StoreController.php +++ b/app/Api/V2/Controllers/Model/Transaction/StoreController.php @@ -32,7 +32,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Rules\IsDuplicateTransaction; -use FireflyIII\Transformers\V2\TransactionGroupTransformer; +use FireflyIII\Transformers\TransactionGroupTransformer; use FireflyIII\User; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Validator; diff --git a/app/Api/V2/Controllers/Model/Transaction/UpdateController.php b/app/Api/V2/Controllers/Model/Transaction/UpdateController.php index 7af67d836b..2304fcf93b 100644 --- a/app/Api/V2/Controllers/Model/Transaction/UpdateController.php +++ b/app/Api/V2/Controllers/Model/Transaction/UpdateController.php @@ -31,7 +31,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionGroup; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; -use FireflyIII\Transformers\V2\TransactionGroupTransformer; +use FireflyIII\Transformers\TransactionGroupTransformer; use FireflyIII\User; use Illuminate\Http\JsonResponse; diff --git a/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php b/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php index e0c4d7db58..aad0662430 100644 --- a/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php +++ b/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Api\V2\Request\Model\TransactionCurrency\IndexRequest; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use FireflyIII\Transformers\V2\CurrencyTransformer; +use FireflyIII\Transformers\CurrencyTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php b/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php index c27ce06389..7486f17cee 100644 --- a/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php +++ b/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\UserGroup; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use FireflyIII\Transformers\V2\CurrencyTransformer; +use FireflyIII\Transformers\CurrencyTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Api/V2/Controllers/System/PreferencesController.php b/app/Api/V2/Controllers/System/PreferencesController.php index 5cc40ea225..ad7ee52a27 100644 --- a/app/Api/V2/Controllers/System/PreferencesController.php +++ b/app/Api/V2/Controllers/System/PreferencesController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\System; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Models\Preference; -use FireflyIII\Transformers\V2\PreferenceTransformer; +use FireflyIII\Transformers\PreferenceTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Api/V2/Controllers/Transaction/List/AccountController.php b/app/Api/V2/Controllers/Transaction/List/AccountController.php index 56f9c612e1..1ab79af7a9 100644 --- a/app/Api/V2/Controllers/Transaction/List/AccountController.php +++ b/app/Api/V2/Controllers/Transaction/List/AccountController.php @@ -29,7 +29,7 @@ use FireflyIII\Api\V2\Request\Model\Transaction\ListRequest; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Support\Http\Api\TransactionFilter; -use FireflyIII\Transformers\V2\TransactionGroupTransformer; +use FireflyIII\Transformers\TransactionGroupTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; diff --git a/app/Api/V2/Controllers/Transaction/List/TransactionController.php b/app/Api/V2/Controllers/Transaction/List/TransactionController.php index 09960a2251..0e630d7444 100644 --- a/app/Api/V2/Controllers/Transaction/List/TransactionController.php +++ b/app/Api/V2/Controllers/Transaction/List/TransactionController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Api\V2\Request\Model\Transaction\InfiniteListRequest; use FireflyIII\Api\V2\Request\Model\Transaction\ListRequest; use FireflyIII\Helpers\Collector\GroupCollectorInterface; -use FireflyIII\Transformers\V2\TransactionGroupTransformer; +use FireflyIII\Transformers\TransactionGroupTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Api/V2/Controllers/UserGroup/IndexController.php b/app/Api/V2/Controllers/UserGroup/IndexController.php index ab30a818bd..5aabec109a 100644 --- a/app/Api/V2/Controllers/UserGroup/IndexController.php +++ b/app/Api/V2/Controllers/UserGroup/IndexController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\UserGroup; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Api\V2\Request\Model\Account\IndexRequest; use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface; -use FireflyIII\Transformers\V2\UserGroupTransformer; +use FireflyIII\Transformers\UserGroupTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; diff --git a/app/Api/V2/Controllers/UserGroup/ShowController.php b/app/Api/V2/Controllers/UserGroup/ShowController.php index 3701ab81b4..9b535aaf10 100644 --- a/app/Api/V2/Controllers/UserGroup/ShowController.php +++ b/app/Api/V2/Controllers/UserGroup/ShowController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\UserGroup; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Models\UserGroup; use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface; -use FireflyIII\Transformers\V2\UserGroupTransformer; +use FireflyIII\Transformers\UserGroupTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; diff --git a/app/Api/V2/Controllers/UserGroup/StoreController.php b/app/Api/V2/Controllers/UserGroup/StoreController.php index 9b094cb3b9..a84add787d 100644 --- a/app/Api/V2/Controllers/UserGroup/StoreController.php +++ b/app/Api/V2/Controllers/UserGroup/StoreController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\UserGroup; use FireflyIII\Api\V2\Controllers\Controller; use FireflyIII\Api\V2\Request\UserGroup\StoreRequest; use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface; -use FireflyIII\Transformers\V2\UserGroupTransformer; +use FireflyIII\Transformers\UserGroupTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Api/V2/Controllers/UserGroup/UpdateController.php b/app/Api/V2/Controllers/UserGroup/UpdateController.php index 27b240604a..c881eeb887 100644 --- a/app/Api/V2/Controllers/UserGroup/UpdateController.php +++ b/app/Api/V2/Controllers/UserGroup/UpdateController.php @@ -29,7 +29,7 @@ use FireflyIII\Api\V2\Request\UserGroup\UpdateMembershipRequest; use FireflyIII\Api\V2\Request\UserGroup\UpdateRequest; use FireflyIII\Models\UserGroup; use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface; -use FireflyIII\Transformers\V2\UserGroupTransformer; +use FireflyIII\Transformers\UserGroupTransformer; use Illuminate\Http\JsonResponse; /** diff --git a/app/Transformers/ExchangeRateTransformer.php b/app/Transformers/ExchangeRateTransformer.php new file mode 100644 index 0000000000..08080aa24e --- /dev/null +++ b/app/Transformers/ExchangeRateTransformer.php @@ -0,0 +1,69 @@ + (string) $rate->id, + 'created_at' => $rate->created_at->toAtomString(), + 'updated_at' => $rate->updated_at->toAtomString(), + + 'from_currency_id' => (string) $rate->fromCurrency->id, + 'from_currency_code' => $rate->fromCurrency->code, + 'from_currency_symbol' => $rate->fromCurrency->symbol, + 'from_currency_decimal_places' => $rate->fromCurrency->decimal_places, + + 'to_currency_id' => (string) $rate->toCurrency->id, + 'to_currency_code' => $rate->toCurrency->code, + 'to_currency_symbol' => $rate->toCurrency->symbol, + 'to_currency_decimal_places' => $rate->toCurrency->decimal_places, + + 'rate' => $rate->rate, + 'date' => $rate->date->toAtomString(), + 'links' => [ + [ + 'rel' => 'self', + 'uri' => sprintf('/exchange-rates/%s', $rate->id), + ], + ], + ]; + } +} diff --git a/app/Transformers/UserGroupTransformer.php b/app/Transformers/UserGroupTransformer.php index 95f8a39613..c9aec36a3c 100644 --- a/app/Transformers/UserGroupTransformer.php +++ b/app/Transformers/UserGroupTransformer.php @@ -28,7 +28,7 @@ use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Models\GroupMembership; use FireflyIII\Models\UserGroup; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Transformers\V2\AbstractTransformer; +use FireflyIII\Transformers\AbstractTransformer; use FireflyIII\User; use Illuminate\Support\Collection; diff --git a/app/Transformers/V2/AbstractTransformer.php b/app/Transformers/V2/AbstractTransformer.php index 04d7a4efc6..f016c3b6c1 100644 --- a/app/Transformers/V2/AbstractTransformer.php +++ b/app/Transformers/V2/AbstractTransformer.php @@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class AbstractTransformer + * @deprecated */ abstract class AbstractTransformer extends TransformerAbstract { diff --git a/app/Transformers/V2/AccountTransformer.php b/app/Transformers/V2/AccountTransformer.php index 9dbe23813e..9d933880f0 100644 --- a/app/Transformers/V2/AccountTransformer.php +++ b/app/Transformers/V2/AccountTransformer.php @@ -36,6 +36,7 @@ use Illuminate\Support\Facades\Log; /** * Class AccountTransformer + * @deprecated */ class AccountTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/BillTransformer.php b/app/Transformers/V2/BillTransformer.php index 42f3cbc64d..8b1c248598 100644 --- a/app/Transformers/V2/BillTransformer.php +++ b/app/Transformers/V2/BillTransformer.php @@ -40,6 +40,7 @@ use Illuminate\Support\Facades\Log; /** * Class BillTransformer + * @deprecated */ class BillTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/BudgetLimitTransformer.php b/app/Transformers/V2/BudgetLimitTransformer.php index 192d095c04..ad99074cca 100644 --- a/app/Transformers/V2/BudgetLimitTransformer.php +++ b/app/Transformers/V2/BudgetLimitTransformer.php @@ -30,6 +30,7 @@ use League\Fractal\Resource\Item; /** * Class BudgetLimitTransformer + * @deprecated */ class BudgetLimitTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/BudgetTransformer.php b/app/Transformers/V2/BudgetTransformer.php index aca7ed8758..dd4a529b84 100644 --- a/app/Transformers/V2/BudgetTransformer.php +++ b/app/Transformers/V2/BudgetTransformer.php @@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class BudgetTransformer + * @deprecated */ class BudgetTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/CurrencyTransformer.php b/app/Transformers/V2/CurrencyTransformer.php index 27480ba6fc..359022cd15 100644 --- a/app/Transformers/V2/CurrencyTransformer.php +++ b/app/Transformers/V2/CurrencyTransformer.php @@ -29,6 +29,7 @@ use Illuminate\Support\Collection; /** * Class CurrencyTransformer + * @deprecated */ class CurrencyTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/ExchangeRateTransformer.php b/app/Transformers/V2/ExchangeRateTransformer.php index 045f8f3a28..9ccc7457ce 100644 --- a/app/Transformers/V2/ExchangeRateTransformer.php +++ b/app/Transformers/V2/ExchangeRateTransformer.php @@ -29,6 +29,7 @@ use Illuminate\Support\Collection; /** * Class AccountTransformer + * @deprecated */ class ExchangeRateTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/PiggyBankTransformer.php b/app/Transformers/V2/PiggyBankTransformer.php index 431181c696..7c5b7c0d60 100644 --- a/app/Transformers/V2/PiggyBankTransformer.php +++ b/app/Transformers/V2/PiggyBankTransformer.php @@ -41,6 +41,7 @@ use Illuminate\Support\Facades\Log; /** * Class PiggyBankTransformer + * @deprecated */ class PiggyBankTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/PreferenceTransformer.php b/app/Transformers/V2/PreferenceTransformer.php index 07c1a37017..9a9972918d 100644 --- a/app/Transformers/V2/PreferenceTransformer.php +++ b/app/Transformers/V2/PreferenceTransformer.php @@ -29,6 +29,7 @@ use Illuminate\Support\Collection; /** * Class PreferenceTransformer + * @deprecated */ class PreferenceTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/TransactionGroupTransformer.php b/app/Transformers/V2/TransactionGroupTransformer.php index b4eba64da7..b48ab0b09c 100644 --- a/app/Transformers/V2/TransactionGroupTransformer.php +++ b/app/Transformers/V2/TransactionGroupTransformer.php @@ -43,6 +43,7 @@ use Illuminate\Support\Facades\DB; /** * Class TransactionGroupTransformer + * @deprecated */ class TransactionGroupTransformer extends AbstractTransformer { diff --git a/app/Transformers/V2/UserGroupTransformer.php b/app/Transformers/V2/UserGroupTransformer.php index 2a33edd6b9..968b91eeb4 100644 --- a/app/Transformers/V2/UserGroupTransformer.php +++ b/app/Transformers/V2/UserGroupTransformer.php @@ -32,6 +32,7 @@ use Illuminate\Support\Collection; /** * Class UserGroupTransformer + * @deprecated */ class UserGroupTransformer extends AbstractTransformer {