From 6dde088d06237bb94bfce9d0fc49a30f135d6bf6 Mon Sep 17 00:00:00 2001 From: Daniel Subiabre Date: Tue, 7 Oct 2025 11:15:43 +0200 Subject: [PATCH] Rename ApiMoney to MoneyWithConversion --- src/ApiResource/Accounting/AccountingApiResource.php | 4 ++-- src/ApiResource/Accounting/AccountingBalancePoint.php | 4 ++-- src/ApiResource/Accounting/TransactionApiResource.php | 4 ++-- src/ApiResource/Gateway/ChargeApiResource.php | 4 ++-- .../Matchfunding/MatchStrategyApiResource.php | 4 ++-- .../{ApiMoney.php => MoneyWithConversion.php} | 2 +- src/ApiResource/Project/BudgetItemApiResource.php | 4 ++-- src/ApiResource/Project/BudgetSummary.php | 10 +++++----- src/ApiResource/Project/RewardApiResource.php | 4 ++-- src/ApiResource/Project/SupportApiResource.php | 4 ++-- src/Mapping/Transformer/BudgetMapTransformer.php | 10 +++++----- src/Service/AccountingService.php | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) rename src/ApiResource/{ApiMoney.php => MoneyWithConversion.php} (96%) diff --git a/src/ApiResource/Accounting/AccountingApiResource.php b/src/ApiResource/Accounting/AccountingApiResource.php index 2f8ea55..2c7ab3a 100644 --- a/src/ApiResource/Accounting/AccountingApiResource.php +++ b/src/ApiResource/Accounting/AccountingApiResource.php @@ -4,7 +4,7 @@ namespace App\ApiResource\Accounting; use ApiPlatform\Doctrine\Orm\State\Options; use ApiPlatform\Metadata as API; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\Entity\Accounting\Accounting; use App\Mapping\Transformer\AccountingOwnerMapTransformer; use App\State\Accounting\AccountingStateProcessor; @@ -51,5 +51,5 @@ class AccountingApiResource public string $currency; #[API\ApiProperty(security: 'is_granted("ACCOUNTING_VIEW", object)')] - public ApiMoney $balance; + public MoneyWithConversion $balance; } diff --git a/src/ApiResource/Accounting/AccountingBalancePoint.php b/src/ApiResource/Accounting/AccountingBalancePoint.php index 80c3c11..82d02c1 100644 --- a/src/ApiResource/Accounting/AccountingBalancePoint.php +++ b/src/ApiResource/Accounting/AccountingBalancePoint.php @@ -4,7 +4,7 @@ namespace App\ApiResource\Accounting; use ApiPlatform\Metadata as API; use ApiPlatform\Metadata\QueryParameter; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\State\Accounting\AccountingBalancePointStateProvider; use Symfony\Component\Validator\Constraints as Assert; @@ -57,7 +57,7 @@ class AccountingBalancePoint /** * Resulting balance for items in this point. */ - public ApiMoney $balance; + public MoneyWithConversion $balance; /** * The number of items aggregated in this point. diff --git a/src/ApiResource/Accounting/TransactionApiResource.php b/src/ApiResource/Accounting/TransactionApiResource.php index 06ba51a..fb264e4 100644 --- a/src/ApiResource/Accounting/TransactionApiResource.php +++ b/src/ApiResource/Accounting/TransactionApiResource.php @@ -5,7 +5,7 @@ namespace App\ApiResource\Accounting; use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use ApiPlatform\Doctrine\Orm\State\Options; use ApiPlatform\Metadata as API; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\Entity\Accounting\Transaction; use App\State\ApiResourceStateProvider; @@ -33,7 +33,7 @@ class TransactionApiResource /** * The monetary value received at target and issued at origin. */ - public ApiMoney $money; + public MoneyWithConversion $money; /** * The Accounting from which the Transaction comes from. diff --git a/src/ApiResource/Gateway/ChargeApiResource.php b/src/ApiResource/Gateway/ChargeApiResource.php index 1b2ea13..cd35bc7 100644 --- a/src/ApiResource/Gateway/ChargeApiResource.php +++ b/src/ApiResource/Gateway/ChargeApiResource.php @@ -6,7 +6,7 @@ use ApiPlatform\Doctrine\Orm\Filter; use ApiPlatform\Doctrine\Orm\State\Options; use ApiPlatform\Metadata as API; use App\ApiResource\Accounting\AccountingApiResource; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\Dto\Gateway\ChargeUpdationDto; use App\Entity\Gateway\Charge; use App\Filter\GatewayFilter; @@ -81,7 +81,7 @@ class ChargeApiResource #[Assert\NotBlank()] #[API\ApiFilter(Filter\RangeFilter::class, properties: ['money.amount'])] #[API\ApiFilter(Filter\SearchFilter::class, properties: ['money.currency' => 'exact'])] - public ApiMoney $money; + public MoneyWithConversion $money; /** * The status of the charge item with the Gateway. diff --git a/src/ApiResource/Matchfunding/MatchStrategyApiResource.php b/src/ApiResource/Matchfunding/MatchStrategyApiResource.php index a58c382..f158ccc 100644 --- a/src/ApiResource/Matchfunding/MatchStrategyApiResource.php +++ b/src/ApiResource/Matchfunding/MatchStrategyApiResource.php @@ -6,7 +6,7 @@ use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use ApiPlatform\Doctrine\Orm\State\Options; use ApiPlatform\Metadata as API; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\Entity\Matchfunding\MatchAgainst; use App\Entity\Matchfunding\MatchStrategy; use App\Mapping\Transformer\MatchFormulaMapTransformer; @@ -81,7 +81,7 @@ class MatchStrategyApiResource */ #[Assert\NotBlank()] #[Assert\Valid()] - public ApiMoney $limit; + public MoneyWithConversion $limit; /** * The `x` factor used to calculate the resulting match of funds with the MatchFormula. diff --git a/src/ApiResource/ApiMoney.php b/src/ApiResource/MoneyWithConversion.php similarity index 96% rename from src/ApiResource/ApiMoney.php rename to src/ApiResource/MoneyWithConversion.php index daab79e..0feb854 100644 --- a/src/ApiResource/ApiMoney.php +++ b/src/ApiResource/MoneyWithConversion.php @@ -7,7 +7,7 @@ use App\Money\Conversion\Conversion; use App\Money\MoneyInterface; use Symfony\Component\Validator\Constraints as Assert; -class ApiMoney implements MoneyInterface +class MoneyWithConversion implements MoneyInterface { /** * An amount of currency.\ diff --git a/src/ApiResource/Project/BudgetItemApiResource.php b/src/ApiResource/Project/BudgetItemApiResource.php index 5e3ce52..7a73c9f 100644 --- a/src/ApiResource/Project/BudgetItemApiResource.php +++ b/src/ApiResource/Project/BudgetItemApiResource.php @@ -5,8 +5,8 @@ namespace App\ApiResource\Project; use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use ApiPlatform\Doctrine\Orm\State\Options; use ApiPlatform\Metadata as API; -use App\ApiResource\ApiMoney; use App\ApiResource\LocalizedApiResourceTrait; +use App\ApiResource\MoneyWithConversion; use App\Entity\Project\BudgetItem; use App\Entity\Project\BudgetItemType; use App\Entity\Project\ProjectDeadline; @@ -58,7 +58,7 @@ class BudgetItemApiResource */ #[Assert\NotBlank()] #[Assert\Valid()] - public ApiMoney $money; + public MoneyWithConversion $money; /** * Defines the budget category for this item within the project. diff --git a/src/ApiResource/Project/BudgetSummary.php b/src/ApiResource/Project/BudgetSummary.php index 9b30db5..ea66f75 100644 --- a/src/ApiResource/Project/BudgetSummary.php +++ b/src/ApiResource/Project/BudgetSummary.php @@ -2,27 +2,27 @@ namespace App\ApiResource\Project; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; class BudgetSummary { /** * The total money by the included items. */ - public ApiMoney $money; + public MoneyWithConversion $money; /** * The total money of type 'task'. */ - public ApiMoney $task; + public MoneyWithConversion $task; /** * The total money of type 'material'. */ - public ApiMoney $material; + public MoneyWithConversion $material; /** * The total money of type 'infrastructure'. */ - public ApiMoney $infra; + public MoneyWithConversion $infra; } diff --git a/src/ApiResource/Project/RewardApiResource.php b/src/ApiResource/Project/RewardApiResource.php index b2b1fca..b1910c6 100644 --- a/src/ApiResource/Project/RewardApiResource.php +++ b/src/ApiResource/Project/RewardApiResource.php @@ -7,8 +7,8 @@ use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use ApiPlatform\Doctrine\Orm\State\Options; use ApiPlatform\Metadata as API; -use App\ApiResource\ApiMoney; use App\ApiResource\LocalizedApiResourceTrait; +use App\ApiResource\MoneyWithConversion; use App\Entity\Project\Reward; use App\State\ApiResourceStateProvider; use App\State\Project\RewardStateProcessor; @@ -56,7 +56,7 @@ class RewardApiResource */ #[Assert\NotBlank()] #[API\ApiFilter(OrderFilter::class, properties: ['money.amount'])] - public ApiMoney $money; + public MoneyWithConversion $money; /** * Rewards might be finite, i.e: has a limited amount of existing unitsTotal. diff --git a/src/ApiResource/Project/SupportApiResource.php b/src/ApiResource/Project/SupportApiResource.php index ec8d1c9..0423b6f 100644 --- a/src/ApiResource/Project/SupportApiResource.php +++ b/src/ApiResource/Project/SupportApiResource.php @@ -8,7 +8,7 @@ use ApiPlatform\Doctrine\Orm\State\Options; use ApiPlatform\Metadata as API; use App\ApiResource\Accounting\AccountingApiResource; use App\ApiResource\Accounting\TransactionApiResource; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\Entity\Project\Support; use App\Money\Totalization\TotalizedMoney; use App\State\ApiResourceStateProvider; @@ -87,7 +87,7 @@ class SupportApiResource /** * The total monetary value of the Transactions going to the Project. */ - public ApiMoney $money; + public MoneyWithConversion $money; /** * User's will to have their support to the Project be shown publicly. diff --git a/src/Mapping/Transformer/BudgetMapTransformer.php b/src/Mapping/Transformer/BudgetMapTransformer.php index c9bdd15..5f48e4d 100644 --- a/src/Mapping/Transformer/BudgetMapTransformer.php +++ b/src/Mapping/Transformer/BudgetMapTransformer.php @@ -2,7 +2,7 @@ namespace App\Mapping\Transformer; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\ApiResource\Project\Budget; use App\ApiResource\Project\BudgetSummary; use App\Entity\Project\BudgetItem; @@ -46,22 +46,22 @@ class BudgetMapTransformer implements PropertyTransformerInterface $summary = new BudgetSummary(); - $summary->money = ApiMoney::of($this->budgetService->calcBudget( + $summary->money = MoneyWithConversion::of($this->budgetService->calcBudget( $items, $currency )[$deadline]); - $summary->task = ApiMoney::of($this->budgetService->calcBudget( + $summary->task = MoneyWithConversion::of($this->budgetService->calcBudget( $this->filterItemsByType($items, BudgetItemType::Task), $currency )[$deadline]); - $summary->material = ApiMoney::of($this->budgetService->calcBudget( + $summary->material = MoneyWithConversion::of($this->budgetService->calcBudget( $this->filterItemsByType($items, BudgetItemType::Material), $currency )[$deadline]); - $summary->infra = ApiMoney::of($this->budgetService->calcBudget( + $summary->infra = MoneyWithConversion::of($this->budgetService->calcBudget( $this->filterItemsByType($items, BudgetItemType::Infrastructure), $currency )[$deadline]); diff --git a/src/Service/AccountingService.php b/src/Service/AccountingService.php index 09f7289..860f021 100644 --- a/src/Service/AccountingService.php +++ b/src/Service/AccountingService.php @@ -3,7 +3,7 @@ namespace App\Service; use App\ApiResource\Accounting\AccountingBalancePoint; -use App\ApiResource\ApiMoney; +use App\ApiResource\MoneyWithConversion; use App\Entity\Accounting\Accounting; use App\Entity\Accounting\Transaction; use App\Entity\User\User; @@ -72,7 +72,7 @@ class AccountingService $point = new AccountingBalancePoint(); $point->start = $lowerBound; $point->end = $upperBound; - $point->balance = ApiMoney::of($balance); + $point->balance = MoneyWithConversion::of($balance); $point->length = count($transactions); return $point;