diff --git a/database/factories/IncoCompoFactory.php b/database/factories/IncoCompoFactory.php index de297a2..6e52cdf 100644 --- a/database/factories/IncoCompoFactory.php +++ b/database/factories/IncoCompoFactory.php @@ -57,8 +57,8 @@ final class IncoCompoFactory extends Factory 'fresh_produce_and_nuts' => [ 'reference' => ['fruits' => '0', 'nuts' => '0'], 'portion' => ['fruits' => '0', 'nuts' => '0'], - 'freshFnlPercentage' => ['value' => '0'], - 'fruitsPercentage' => ['value' => '0'], + 'freshFnlPercentage' => ['value' => '0'], + 'fruitsPercentage' => ['value' => '0'], ], 'reference_intakes' => [ 'energyE14' => ['value' => '6%'], @@ -79,13 +79,13 @@ final class IncoCompoFactory extends Factory 'status' => 'valid', ], 'nutri_score_points' => [ - 'energyPoints' => '1', - 'saturatedFatPoints' => '1', + 'energyPoints' => '1', + 'saturatedFatPoints' => '1', 'sugarsPoints' => '0', 'saltPoints' => '2', 'fiberPoints' => '0', 'proteinPoints' => '5', - 'freshFnlPoints' => '0', + 'freshFnlPoints' => '0', ], 'minerals' => [ 'calcium' => '12.0', diff --git a/src/Application/Usecase/Employees/FindAll/FindAllEmployees.php b/src/Application/Usecase/Employees/FindAll/FindAllEmployees.php index d64f62b..b31d991 100644 --- a/src/Application/Usecase/Employees/FindAll/FindAllEmployees.php +++ b/src/Application/Usecase/Employees/FindAll/FindAllEmployees.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace Application\Usecase\Employees\FindAll; use Domain\Models\Entities\Employee; -use Domain\Ports\Directories\EmployeeDirectory; use Domain\Models\ValueObjects\Employees\EmployeeFilter as DirectoryEmployeeFilter; use Domain\Models\ValueObjects\Employees\EmployeeSortColumn as DirectoryEmployeeSortColumn; use Domain\Models\ValueObjects\Employees\EmployeeSorter as DirectoryEmployeeSorter; +use Domain\Ports\Directories\EmployeeDirectory; use Shared\DDD\Usecase\Input as BaseInput; use Shared\DDD\Usecase\Usecase; use Shared\Paginated; diff --git a/src/Application/Usecase/IncoSheets/FindAll/FindAllIncoSheets.php b/src/Application/Usecase/IncoSheets/FindAll/FindAllIncoSheets.php index ef74913..6cb7866 100644 --- a/src/Application/Usecase/IncoSheets/FindAll/FindAllIncoSheets.php +++ b/src/Application/Usecase/IncoSheets/FindAll/FindAllIncoSheets.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace Application\Usecase\IncoSheets\FindAll; use Domain\Models\Entities\IncoSheet; -use Domain\Ports\Directories\IncoSheetDirectory; use Domain\Models\ValueObjects\IncoSheets\IncoSheetFilter as DirectoryIncoSheetFilter; use Domain\Models\ValueObjects\IncoSheets\IncoSheetSortColumn as DirectoryIncoSheetSortColumn; use Domain\Models\ValueObjects\IncoSheets\IncoSheetSorter as DirectoryIncoSheetSorter; +use Domain\Ports\Directories\IncoSheetDirectory; use Shared\DDD\Usecase\Input as BaseInput; use Shared\DDD\Usecase\Usecase; use Shared\Paginated; diff --git a/src/Domain/Ports/Directories/EmployeeDirectory.php b/src/Domain/Ports/Directories/EmployeeDirectory.php index 76038ec..1bb759f 100644 --- a/src/Domain/Ports/Directories/EmployeeDirectory.php +++ b/src/Domain/Ports/Directories/EmployeeDirectory.php @@ -5,9 +5,9 @@ declare(strict_types=1); namespace Domain\Ports\Directories; use Domain\Models\Entities\Employee; -use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId; use Domain\Models\ValueObjects\Employees\EmployeeFilter; use Domain\Models\ValueObjects\Employees\EmployeeSorter; +use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId; use Shared\DDD\Directory; use Shared\Paginated; use Shared\Pagination; diff --git a/src/Infra/Adapters/Directories/EloquentEmployeeDirectory.php b/src/Infra/Adapters/Directories/EloquentEmployeeDirectory.php index 21f86e5..456dc70 100644 --- a/src/Infra/Adapters/Directories/EloquentEmployeeDirectory.php +++ b/src/Infra/Adapters/Directories/EloquentEmployeeDirectory.php @@ -5,14 +5,14 @@ declare(strict_types=1); namespace Infra\Adapters\Directories; use Domain\Models\Entities\Employee; +use Domain\Models\ValueObjects\Employees\EmployeeFilter; +use Domain\Models\ValueObjects\Employees\EmployeeSortColumn; +use Domain\Models\ValueObjects\Employees\EmployeeSorter; use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId; use Domain\Models\ValueObjects\EstablishmentCode; use Domain\Models\ValueObjects\ServiceId; use Domain\Models\ValueObjects\SiteId; use Domain\Ports\Directories\EmployeeDirectory; -use Domain\Models\ValueObjects\Employees\EmployeeFilter; -use Domain\Models\ValueObjects\Employees\EmployeeSortColumn; -use Domain\Models\ValueObjects\Employees\EmployeeSorter; use Infra\Database\Models\Employee as EmployeeModel; use Shared\Paginated; use Shared\Pagination; diff --git a/src/Infra/Database/Models/IncoSheet.php b/src/Infra/Database/Models/IncoSheet.php index 21ba502..f07b468 100644 --- a/src/Infra/Database/Models/IncoSheet.php +++ b/src/Infra/Database/Models/IncoSheet.php @@ -83,12 +83,12 @@ final class IncoSheet extends Model protected function casts(): array { return [ - 'allegations' => 'array', - 'ingredients' => 'array', - 'portions' => 'array', + 'allegations' => 'array', + 'ingredients' => 'array', + 'portions' => 'array', 'allergens' => 'array', 'brand' => 'array', - 'is_seasonal' => 'boolean', + 'is_seasonal' => 'boolean', 'weight' => 'array', 'nutriscore' => 'array', 'storage_condition' => 'array', diff --git a/src/Presentation/Api/V1/Http/Responses/IncoSheets/IncoSheetsIndexResponse.php b/src/Presentation/Api/V1/Http/Responses/IncoSheets/IncoSheetsIndexResponse.php index 61c4b6d..f6ac506 100644 --- a/src/Presentation/Api/V1/Http/Responses/IncoSheets/IncoSheetsIndexResponse.php +++ b/src/Presentation/Api/V1/Http/Responses/IncoSheets/IncoSheetsIndexResponse.php @@ -42,7 +42,7 @@ final readonly class IncoSheetsIndexResponse implements ApiResponse $nextUrl = $page < $totalPages ? (string) $this->baseUri->withQuery(http_build_query(['page' => $page + 1, 'pageSize' => $pageSize])) : null; $items = array_map( - fn (PaginatedIncoSheet|PaginatedShortIncoSheet $sheet): array => $sheet instanceof PaginatedShortIncoSheet + fn (PaginatedIncoSheet | PaginatedShortIncoSheet $sheet): array => $sheet instanceof PaginatedShortIncoSheet ? get_object_vars(IncoShortSheetDto::fromPaginatedShortIncoSheet($sheet)) : get_object_vars(IncoSheetDto::fromPaginatedIncoSheet($sheet)), $this->view->incoSheets diff --git a/tests/Integration/Infra/Adapters/Directories/EloquentEmployeeDirectoryTest.php b/tests/Integration/Infra/Adapters/Directories/EloquentEmployeeDirectoryTest.php index cee942a..3dd8373 100644 --- a/tests/Integration/Infra/Adapters/Directories/EloquentEmployeeDirectoryTest.php +++ b/tests/Integration/Infra/Adapters/Directories/EloquentEmployeeDirectoryTest.php @@ -5,13 +5,13 @@ declare(strict_types=1); namespace Tests\Integration\Infra\Adapters\Directories; use Domain\Models\Entities\Employee; +use Domain\Models\ValueObjects\Employees\EmployeeFilter; +use Domain\Models\ValueObjects\Employees\EmployeeSortColumn; +use Domain\Models\ValueObjects\Employees\EmployeeSorter; use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId; use Domain\Models\ValueObjects\EstablishmentCode; use Domain\Models\ValueObjects\ServiceId; use Domain\Models\ValueObjects\SiteId; -use Domain\Models\ValueObjects\Employees\EmployeeFilter; -use Domain\Models\ValueObjects\Employees\EmployeeSortColumn; -use Domain\Models\ValueObjects\Employees\EmployeeSorter; use Illuminate\Foundation\Testing\RefreshDatabase; use Infra\Adapters\Directories\EloquentEmployeeDirectory; use Infra\Database\Models\Employee as EmployeeModel; diff --git a/tests/Unit/Application/Usecase/Employees/FindAllEmployeesTest.php b/tests/Unit/Application/Usecase/Employees/FindAllEmployeesTest.php index 68ee087..06689d5 100644 --- a/tests/Unit/Application/Usecase/Employees/FindAllEmployeesTest.php +++ b/tests/Unit/Application/Usecase/Employees/FindAllEmployeesTest.php @@ -10,13 +10,13 @@ use Application\Usecase\Employees\FindAll\Output; use Application\Usecase\Employees\FindAll\SortColumn; use Application\Usecase\Employees\FindAll\Sorter; use Domain\Models\Entities\Employee; +use Domain\Models\ValueObjects\Employees\EmployeeSortColumn as DirectoryEmployeeSortColumn; +use Domain\Models\ValueObjects\Employees\EmployeeSorter as DirectoryEmployeeSorter; use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId; use Domain\Models\ValueObjects\EstablishmentCode; use Domain\Models\ValueObjects\ServiceId; use Domain\Models\ValueObjects\SiteId; use Domain\Ports\Directories\EmployeeDirectory; -use Domain\Models\ValueObjects\Employees\EmployeeSortColumn as DirectoryEmployeeSortColumn; -use Domain\Models\ValueObjects\Employees\EmployeeSorter as DirectoryEmployeeSorter; use Shared\Paginated; use Shared\Pagination; diff --git a/tests/Unit/Domain/Models/ValueObjects/Employees/EmployeeFilterTest.php b/tests/Unit/Domain/Models/ValueObjects/Employees/EmployeeFilterTest.php index 4abba33..24c66db 100644 --- a/tests/Unit/Domain/Models/ValueObjects/Employees/EmployeeFilterTest.php +++ b/tests/Unit/Domain/Models/ValueObjects/Employees/EmployeeFilterTest.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace Tests\Unit\Domain\Models\ValueObjects\Employees; +use Domain\Models\ValueObjects\Employees\EmployeeFilter; use Domain\Models\ValueObjects\EstablishmentCode; use Domain\Models\ValueObjects\ServiceId; use Domain\Models\ValueObjects\SiteId; -use Domain\Models\ValueObjects\Employees\EmployeeFilter; covers(EmployeeFilter::class);