refactor(domain): regroup Inco entities and Value Objects under Inco/ and Inco/Composition/

src/Application/Usecase/Employees/Find/Input.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Application\Usecase\Employees\Find;
 
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 use Shared\DDD\Usecase\Input as UsecaseInput;
 
 final readonly class Input implements UsecaseInput

src/Application/Usecase/Employees/Find/Output.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Application\Usecase\Employees\Find;
 
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 use Shared\DDD\Usecase\Output as UsecaseOutput;
 
 final readonly class Output implements UsecaseOutput

src/Application/Usecase/Employees/FindAll/PaginatedEmployee.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Application\Usecase\Employees\FindAll;
 
 use Domain\Models\Entities\Employee;
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 use Shared\DDD\Usecase\Output as UsecaseOutput;
 
 final readonly class PaginatedEmployee implements UsecaseOutput

src/Application/Usecase/IncoSheets/Find/Input.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\Find;
 
-use Domain\Models\ValueObjects\Entities\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoId;
 use Shared\DDD\Usecase\Input as UsecaseInput;
 
 final readonly class Input implements UsecaseInput

src/Application/Usecase/IncoSheets/Find/Output.php

@@ -4,22 +4,22 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\Find;
 
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\IncoWeight;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
-use Domain\Models\ValueObjects\IncoSheets\Nutriscore;
-use Domain\Models\ValueObjects\IncoSheets\PortionAmount;
-use Domain\Models\ValueObjects\IncoSheets\StorageCondition;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoWeight;
+use Domain\Models\ValueObjects\Inco\Ingredients;
+use Domain\Models\ValueObjects\Inco\Nutriscore;
+use Domain\Models\ValueObjects\Inco\PortionAmount;
+use Domain\Models\ValueObjects\Inco\StorageCondition;
 use Shared\DDD\Usecase\Output as UsecaseOutput;
 
 final readonly class Output implements UsecaseOutput
 {
     /**
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Allergen>  $allergens
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Additive>  $additives
+     * @param  array<\Domain\Models\ValueObjects\Inco\Allergen>  $allergens
+     * @param  array<\Domain\Models\ValueObjects\Inco\Additive>  $additives
      */
     public function __construct(
         public IncoId $id,
@@ -40,7 +40,7 @@ final readonly class Output implements UsecaseOutput
         public ?Nutriscore $nutriscore,
         public ?StorageCondition $storageCondition,
         public array $additives,
-        public ?IncoCompoId $compo,
+        public ?IncoCompositionId $compo,
         public ?\DateTimeInterface $createdAt,
         public ?\DateTimeInterface $updatedAt,
     ) {

src/Application/Usecase/IncoSheets/FindAll/FindAllIncoSheets.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\FindAll;
 
-use Domain\Models\Entities\IncoSheet;
-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\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\IncoSheetFilter as DirectoryIncoSheetFilter;
+use Domain\Models\ValueObjects\Inco\IncoSheetSortColumn as DirectoryIncoSheetSortColumn;
+use Domain\Models\ValueObjects\Inco\IncoSheetSorter as DirectoryIncoSheetSorter;
 use Domain\Ports\Directories\IncoSheetDirectory;
 use Shared\DDD\Usecase\Input as BaseInput;
 use Shared\DDD\Usecase\Usecase;

src/Application/Usecase/IncoSheets/FindAll/PaginatedIncoSheet.php

@@ -4,23 +4,23 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\FindAll;
 
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\IncoWeight;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
-use Domain\Models\ValueObjects\IncoSheets\Nutriscore;
-use Domain\Models\ValueObjects\IncoSheets\PortionAmount;
-use Domain\Models\ValueObjects\IncoSheets\StorageCondition;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoWeight;
+use Domain\Models\ValueObjects\Inco\Ingredients;
+use Domain\Models\ValueObjects\Inco\Nutriscore;
+use Domain\Models\ValueObjects\Inco\PortionAmount;
+use Domain\Models\ValueObjects\Inco\StorageCondition;
 use Shared\DDD\Usecase\Output as UsecaseOutput;
 
 final readonly class PaginatedIncoSheet implements UsecaseOutput
 {
     /**
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Allergen>  $allergens
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Additive>  $additives
+     * @param  array<\Domain\Models\ValueObjects\Inco\Allergen>  $allergens
+     * @param  array<\Domain\Models\ValueObjects\Inco\Additive>  $additives
      */
     public function __construct(
         public IncoId $id,
@@ -41,7 +41,7 @@ final readonly class PaginatedIncoSheet implements UsecaseOutput
         public ?Nutriscore $nutriscore,
         public ?StorageCondition $storageCondition,
         public array $additives,
-        public ?IncoCompoId $compo,
+        public ?IncoCompositionId $compo,
         public ?\DateTimeInterface $createdAt,
         public ?\DateTimeInterface $updatedAt,
     ) {

src/Application/Usecase/IncoSheets/FindAll/PaginatedShortIncoSheet.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\FindAll;
 
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoId;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\IncoId;
 use Shared\DDD\Usecase\Output as UsecaseOutput;
 
 final readonly class PaginatedShortIncoSheet implements UsecaseOutput

src/Application/Usecase/IncoSheets/Search/Input.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\Search;
 
-use Domain\Models\ValueObjects\IncoSheets\IncoIdQuery;
+use Domain\Models\ValueObjects\Inco\IncoIdQuery;
 use Shared\DDD\Usecase\Input as UsecaseInput;
 
 final readonly class Input implements UsecaseInput

src/Application/Usecase/IncoSheets/Search/PaginatedIncoSheet.php

@@ -4,23 +4,23 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\Search;
 
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\IncoWeight;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
-use Domain\Models\ValueObjects\IncoSheets\Nutriscore;
-use Domain\Models\ValueObjects\IncoSheets\PortionAmount;
-use Domain\Models\ValueObjects\IncoSheets\StorageCondition;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoWeight;
+use Domain\Models\ValueObjects\Inco\Ingredients;
+use Domain\Models\ValueObjects\Inco\Nutriscore;
+use Domain\Models\ValueObjects\Inco\PortionAmount;
+use Domain\Models\ValueObjects\Inco\StorageCondition;
 use Shared\DDD\Usecase\Output as UsecaseOutput;
 
 final readonly class PaginatedIncoSheet implements UsecaseOutput
 {
     /**
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Allergen>  $allergens
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Additive>  $additives
+     * @param  array<\Domain\Models\ValueObjects\Inco\Allergen>  $allergens
+     * @param  array<\Domain\Models\ValueObjects\Inco\Additive>  $additives
      */
     public function __construct(
         public IncoId $id,
@@ -41,7 +41,7 @@ final readonly class PaginatedIncoSheet implements UsecaseOutput
         public ?Nutriscore $nutriscore,
         public ?StorageCondition $storageCondition,
         public array $additives,
-        public ?IncoCompoId $compo,
+        public ?IncoCompositionId $compo,
         public ?\DateTimeInterface $createdAt,
         public ?\DateTimeInterface $updatedAt,
     ) {

src/Application/Usecase/IncoSheets/Search/PaginatedShortIncoSheet.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\Search;
 
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoId;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\IncoId;
 use Shared\DDD\Usecase\Output as UsecaseOutput;
 
 final readonly class PaginatedShortIncoSheet implements UsecaseOutput

src/Application/Usecase/IncoSheets/Search/SearchIncoSheets.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Application\Usecase\IncoSheets\Search;
 
-use Domain\Models\Entities\IncoSheet;
+use Domain\Models\Entities\Inco\IncoSheet;
 use Domain\Ports\Directories\IncoSheetDirectory;
 use Shared\DDD\Usecase\Input as BaseInput;
 use Shared\DDD\Usecase\Usecase;

src/Domain/Models/Entities/Employee.php

@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace Domain\Models\Entities;
 
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 use Domain\Models\ValueObjects\EstablishmentCode;
 use Domain\Models\ValueObjects\ServiceId;
 use Domain\Models\ValueObjects\SiteId;
 use Shared\DDD\Entity;
 
-/** @implements \Shared\DDD\Entity<\Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId> */
+/** @implements \Shared\DDD\Entity<\Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId> */
 final readonly class Employee implements Entity
 {
     public function __construct(

src/Domain/Models/Entities/Inco/Composition/IncoComposition.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Domain\Models\Entities\Inco\Composition;
+
+use Domain\Models\ValueObjects\Inco\Composition\AminoAcids;
+use Domain\Models\ValueObjects\Inco\Composition\CarbohydratesDetail;
+use Domain\Models\ValueObjects\Inco\Composition\Energy;
+use Domain\Models\ValueObjects\Inco\Composition\FattyAcids;
+use Domain\Models\ValueObjects\Inco\Composition\FreshProduceAndNuts;
+use Domain\Models\ValueObjects\Inco\Composition\Identification;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
+use Domain\Models\ValueObjects\Inco\Composition\Minerals;
+use Domain\Models\ValueObjects\Inco\Composition\NutriScore;
+use Domain\Models\ValueObjects\Inco\Composition\NutriScorePoints;
+use Domain\Models\ValueObjects\Inco\Composition\PortionMacronutrients;
+use Domain\Models\ValueObjects\Inco\Composition\ReferenceIntakes;
+use Domain\Models\ValueObjects\Inco\Composition\ReferenceMacronutrients;
+use Domain\Models\ValueObjects\Inco\Composition\SpecialCompounds;
+use Domain\Models\ValueObjects\Inco\Composition\Vitamins;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Shared\DDD\Entity;
+
+/** @implements Entity<IncoCompositionId> */
+final readonly class IncoComposition implements Entity
+{
+    public function __construct(
+        public IncoCompositionId $id,
+        public IncoId $idInco,
+        public Identification $identification,
+        public Energy $energy,
+        public ReferenceMacronutrients $referenceMacronutrients,
+        public PortionMacronutrients $portionMacronutrients,
+        public FreshProduceAndNuts $freshProduceAndNuts,
+        public ReferenceIntakes $referenceIntakes,
+        public NutriScore $nutriScore,
+        public NutriScorePoints $nutriScorePoints,
+        public Minerals $minerals,
+        public Vitamins $vitamins,
+        public CarbohydratesDetail $carbohydratesDetail,
+        public FattyAcids $fattyAcids,
+        public AminoAcids $aminoAcids,
+        public SpecialCompounds $specialCompounds,
+    ) {
+    }
+
+    #[\Override]
+    public function id(): IncoCompositionId
+    {
+        return $this->id;
+    }
+}

src/Domain/Models/Entities/Inco/IncoSheet.php

@@ -2,25 +2,25 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\Entities;
+namespace Domain\Models\Entities\Inco;
 
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\IncoWeight;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
-use Domain\Models\ValueObjects\IncoSheets\Nutriscore;
-use Domain\Models\ValueObjects\IncoSheets\PortionAmount;
-use Domain\Models\ValueObjects\IncoSheets\StorageCondition;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoWeight;
+use Domain\Models\ValueObjects\Inco\Ingredients;
+use Domain\Models\ValueObjects\Inco\Nutriscore;
+use Domain\Models\ValueObjects\Inco\PortionAmount;
+use Domain\Models\ValueObjects\Inco\StorageCondition;
 use Shared\DDD\Entity;
 
 /** @implements Entity<IncoId> */
 final readonly class IncoSheet implements Entity
 {
     /**
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Allergen>  $allergens
-     * @param  array<\Domain\Models\ValueObjects\IncoSheets\Additive>  $additives
+     * @param  array<\Domain\Models\ValueObjects\Inco\Allergen>  $allergens
+     * @param  array<\Domain\Models\ValueObjects\Inco\Additive>  $additives
      */
     public function __construct(
         public IncoId $id,
@@ -41,7 +41,7 @@ final readonly class IncoSheet implements Entity
         public ?Nutriscore $nutriscore,
         public ?StorageCondition $storageCondition,
         public array $additives,
-        public ?IncoCompoId $compo,
+        public ?IncoCompositionId $compo,
         public ?\DateTimeInterface $createdAt,
         public ?\DateTimeInterface $updatedAt,
     ) {

src/Domain/Models/Entities/IncoCompo.php

@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Domain\Models\Entities;
-
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoCompo\AminoAcids;
-use Domain\Models\ValueObjects\IncoCompo\CarbohydratesDetail;
-use Domain\Models\ValueObjects\IncoCompo\Energy;
-use Domain\Models\ValueObjects\IncoCompo\FattyAcids;
-use Domain\Models\ValueObjects\IncoCompo\FreshProduceAndNuts;
-use Domain\Models\ValueObjects\IncoCompo\Identification;
-use Domain\Models\ValueObjects\IncoCompo\Minerals;
-use Domain\Models\ValueObjects\IncoCompo\NutriScore;
-use Domain\Models\ValueObjects\IncoCompo\NutriScorePoints;
-use Domain\Models\ValueObjects\IncoCompo\PortionMacronutrients;
-use Domain\Models\ValueObjects\IncoCompo\ReferenceIntakes;
-use Domain\Models\ValueObjects\IncoCompo\ReferenceMacronutrients;
-use Domain\Models\ValueObjects\IncoCompo\SpecialCompounds;
-use Domain\Models\ValueObjects\IncoCompo\Vitamins;
-use Shared\DDD\Entity;
-
-/** @implements Entity<IncoCompoId> */
-final readonly class IncoCompo implements Entity
-{
-    public function __construct(
-        public IncoCompoId $id,
-        public IncoId $idInco,
-        public Identification $identification,
-        public Energy $energy,
-        public ReferenceMacronutrients $referenceMacronutrients,
-        public PortionMacronutrients $portionMacronutrients,
-        public FreshProduceAndNuts $freshProduceAndNuts,
-        public ReferenceIntakes $referenceIntakes,
-        public NutriScore $nutriScore,
-        public NutriScorePoints $nutriScorePoints,
-        public Minerals $minerals,
-        public Vitamins $vitamins,
-        public CarbohydratesDetail $carbohydratesDetail,
-        public FattyAcids $fattyAcids,
-        public AminoAcids $aminoAcids,
-        public SpecialCompounds $specialCompounds,
-    ) {
-    }
-
-    #[\Override]
-    public function id(): IncoCompoId
-    {
-        return $this->id;
-    }
-}

src/Domain/Models/ValueObjects/Employees/ArcadiaEmployeeId.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\Entities;
+namespace Domain\Models\ValueObjects\Employees;
 
 use Shared\DDD\EntityId;
 

src/Domain/Models/ValueObjects/Inco/Additive.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 /**
  * Represents a food additive identified by its E-number code.

src/Domain/Models/ValueObjects/Inco/Allegations.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 final readonly class Allegations
 {

src/Domain/Models/ValueObjects/Inco/Allergen.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 final readonly class Allergen
 {

src/Domain/Models/ValueObjects/Inco/Brand.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 final readonly class Brand
 {

src/Domain/Models/ValueObjects/Inco/Composition/AminoAcids.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class AminoAcids
 {

src/Domain/Models/ValueObjects/Inco/Composition/CarbohydratesDetail.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class CarbohydratesDetail
 {

src/Domain/Models/ValueObjects/Inco/Composition/Energy.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class Energy
 {

src/Domain/Models/ValueObjects/Inco/Composition/EnergyValues.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class EnergyValues
 {

src/Domain/Models/ValueObjects/Inco/Composition/FattyAcids.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class FattyAcids
 {

src/Domain/Models/ValueObjects/Inco/Composition/FreshProduceAndNuts.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class FreshProduceAndNuts
 {

src/Domain/Models/ValueObjects/Inco/Composition/FruitAndNutAmount.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class FruitAndNutAmount
 {

src/Domain/Models/ValueObjects/Inco/Composition/Identification.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class Identification
 {

src/Domain/Models/ValueObjects/Inco/Composition/IncoCompositionId.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\Entities;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 use Shared\DDD\EntityId;
 
-final readonly class IncoCompoId extends EntityId
+final readonly class IncoCompositionId extends EntityId
 {
     private const PATTERN = '/^\d{1,}$/';
 

src/Domain/Models/ValueObjects/Inco/Composition/Minerals.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class Minerals
 {

src/Domain/Models/ValueObjects/Inco/Composition/NutriScore.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class NutriScore
 {

src/Domain/Models/ValueObjects/Inco/Composition/NutriScorePoints.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class NutriScorePoints
 {

src/Domain/Models/ValueObjects/Inco/Composition/NutrientValue.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class NutrientValue
 {

src/Domain/Models/ValueObjects/Inco/Composition/PercentageValue.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class PercentageValue
 {

src/Domain/Models/ValueObjects/Inco/Composition/PortionMacronutrients.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class PortionMacronutrients
 {

src/Domain/Models/ValueObjects/Inco/Composition/ReferenceIntakes.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class ReferenceIntakes
 {

src/Domain/Models/ValueObjects/Inco/Composition/ReferenceMacronutrients.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class ReferenceMacronutrients
 {

src/Domain/Models/ValueObjects/Inco/Composition/SpecialCompounds.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class SpecialCompounds
 {

src/Domain/Models/ValueObjects/Inco/Composition/Vitamins.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoCompo;
+namespace Domain\Models\ValueObjects\Inco\Composition;
 
 final readonly class Vitamins
 {

src/Domain/Models/ValueObjects/Inco/IncoId.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\Entities;
+namespace Domain\Models\ValueObjects\Inco;
 
 use Shared\DDD\EntityId;
 

src/Domain/Models/ValueObjects/Inco/IncoIdQuery.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 final readonly class IncoIdQuery
 {

src/Domain/Models/ValueObjects/Inco/IncoSheetFilter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 final readonly class IncoSheetFilter
 {

src/Domain/Models/ValueObjects/Inco/IncoSheetSortColumn.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 enum IncoSheetSortColumn: string
 {

src/Domain/Models/ValueObjects/Inco/IncoSheetSorter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 final readonly class IncoSheetSorter
 {

src/Domain/Models/ValueObjects/Inco/IncoWeight.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 final readonly class IncoWeight
 {

src/Domain/Models/ValueObjects/Inco/Ingredients.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 /**
  * Represents a structured and parsed ingredient list.

src/Domain/Models/ValueObjects/Inco/Nutriscore.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 /**
  * Represents the Nutri-Score grade of a product as displayed on pack.

src/Domain/Models/ValueObjects/Inco/PortionAmount.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 /**
  * Si le type de portion est exact, seul la partie basse est utilisée,

src/Domain/Models/ValueObjects/Inco/PortionType.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 enum PortionType: int
 {

src/Domain/Models/ValueObjects/Inco/StorageCondition.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Domain\Models\ValueObjects\IncoSheets;
+namespace Domain\Models\ValueObjects\Inco;
 
 /**
  * Represents the storage/conservation conditions of a product.

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\Employees\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;

src/Domain/Ports/Directories/IncoSheetDirectory.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 
 namespace Domain\Ports\Directories;
 
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\IncoIdQuery;
-use Domain\Models\ValueObjects\IncoSheets\IncoSheetFilter;
-use Domain\Models\ValueObjects\IncoSheets\IncoSheetSorter;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoIdQuery;
+use Domain\Models\ValueObjects\Inco\IncoSheetFilter;
+use Domain\Models\ValueObjects\Inco\IncoSheetSorter;
 use Shared\DDD\Directory;
 use Shared\Paginated;
 use Shared\Pagination;

src/Infra/Adapters/Directories/EloquentEmployeeDirectory.php

@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Infra\Adapters\Directories;
 
 use Domain\Models\Entities\Employee;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 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;

src/Infra/Adapters/Directories/EloquentIncoSheetDirectory.php

@@ -4,22 +4,22 @@ declare(strict_types=1);
 
 namespace Infra\Adapters\Directories;
 
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Additive;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Allergen;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\IncoIdQuery;
-use Domain\Models\ValueObjects\IncoSheets\IncoSheetFilter;
-use Domain\Models\ValueObjects\IncoSheets\IncoSheetSortColumn;
-use Domain\Models\ValueObjects\IncoSheets\IncoSheetSorter;
-use Domain\Models\ValueObjects\IncoSheets\IncoWeight;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
-use Domain\Models\ValueObjects\IncoSheets\Nutriscore;
-use Domain\Models\ValueObjects\IncoSheets\PortionAmount;
-use Domain\Models\ValueObjects\IncoSheets\StorageCondition;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\Additive;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Allergen;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoIdQuery;
+use Domain\Models\ValueObjects\Inco\IncoSheetFilter;
+use Domain\Models\ValueObjects\Inco\IncoSheetSortColumn;
+use Domain\Models\ValueObjects\Inco\IncoSheetSorter;
+use Domain\Models\ValueObjects\Inco\IncoWeight;
+use Domain\Models\ValueObjects\Inco\Ingredients;
+use Domain\Models\ValueObjects\Inco\Nutriscore;
+use Domain\Models\ValueObjects\Inco\PortionAmount;
+use Domain\Models\ValueObjects\Inco\StorageCondition;
 use Domain\Ports\Directories\IncoSheetDirectory;
 use Infra\Database\Models\IncoSheet as IncoSheetModel;
 use Shared\Paginated;
@@ -124,7 +124,7 @@ final class EloquentIncoSheetDirectory implements IncoSheetDirectory
         $storageCondition = $this->storageConditionFrom($model);
         $additives        = $this->additivesFrom($model);
 
-        $compo = $model->compo_id !== null ? new IncoCompoId((string) $model->compo_id) : null;
+        $compo = $model->compo_id !== null ? new IncoCompositionId((string) $model->compo_id) : null;
 
         return new IncoSheet(
             id: new IncoId((string) $model->id),
@@ -200,7 +200,7 @@ final class EloquentIncoSheetDirectory implements IncoSheetDirectory
         );
     }
 
-    /** @return \Domain\Models\ValueObjects\IncoSheets\Allergen[] */
+    /** @return \Domain\Models\ValueObjects\Inco\Allergen[] */
     private function allergensFrom(IncoSheetModel $model): array
     {
         $allergensRaw = is_array($model->allergens) ? $model->allergens : [];
@@ -266,7 +266,7 @@ final class EloquentIncoSheetDirectory implements IncoSheetDirectory
         );
     }
 
-    /** @return \Domain\Models\ValueObjects\IncoSheets\Additive[] */
+    /** @return \Domain\Models\ValueObjects\Inco\Additive[] */
     private function additivesFrom(IncoSheetModel $model): array
     {
         $additivesRaw = is_array($model->additives) ? $model->additives : [];

src/Presentation/Api/V1/Dto/IncoSheets/Parts/AdditiveDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\Additive;
+use Domain\Models\ValueObjects\Inco\Additive;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class AdditiveDto implements ApiResponseDto

src/Presentation/Api/V1/Dto/IncoSheets/Parts/AllegationsDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
+use Domain\Models\ValueObjects\Inco\Allegations;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class AllegationsDto implements ApiResponseDto

src/Presentation/Api/V1/Dto/IncoSheets/Parts/AllergenDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\Allergen;
+use Domain\Models\ValueObjects\Inco\Allergen;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class AllergenDto implements ApiResponseDto

src/Presentation/Api/V1/Dto/IncoSheets/Parts/BrandDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\Brand;
+use Domain\Models\ValueObjects\Inco\Brand;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class BrandDto implements ApiResponseDto

src/Presentation/Api/V1/Dto/IncoSheets/Parts/NutriscoreDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\Nutriscore;
+use Domain\Models\ValueObjects\Inco\Nutriscore;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class NutriscoreDto implements ApiResponseDto

src/Presentation/Api/V1/Dto/IncoSheets/Parts/PortionsDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\PortionAmount;
+use Domain\Models\ValueObjects\Inco\PortionAmount;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class PortionsDto implements ApiResponseDto

src/Presentation/Api/V1/Dto/IncoSheets/Parts/StorageConditionDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\StorageCondition;
+use Domain\Models\ValueObjects\Inco\StorageCondition;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class StorageConditionDto implements ApiResponseDto

src/Presentation/Api/V1/Dto/IncoSheets/Parts/WeightDto.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Dto\IncoSheets\Parts;
 
-use Domain\Models\ValueObjects\IncoSheets\IncoWeight;
+use Domain\Models\ValueObjects\Inco\IncoWeight;
 use Presentation\Api\V1\Contracts\ApiResponseDto;
 
 final readonly class WeightDto implements ApiResponseDto

src/Presentation/Api/V1/Http/Requests/Employees/EmployeeShowRequest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Http\Requests\Employees;
 
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 use Illuminate\Foundation\Http\FormRequest;
 
 final class EmployeeShowRequest extends FormRequest

src/Presentation/Api/V1/Http/Requests/IncoSheets/IncoSheetsSearchRequest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Http\Requests\IncoSheets;
 
-use Domain\Models\ValueObjects\IncoSheets\IncoIdQuery;
+use Domain\Models\ValueObjects\Inco\IncoIdQuery;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 

src/Presentation/Api/V1/Http/Requests/IncoSheets/IncoSheetsShowRequest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Presentation\Api\V1\Http\Requests\IncoSheets;
 
-use Domain\Models\ValueObjects\Entities\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoId;
 use Illuminate\Foundation\Http\FormRequest;
 
 final class IncoSheetsShowRequest extends FormRequest

src/Presentation/Api/V1/Http/Responses/IncoSheets/IncoSheetsIndexResponse.php

@@ -6,8 +6,8 @@ namespace Presentation\Api\V1\Http\Responses\IncoSheets;
 
 use Application\Usecase\IncoSheets\FindAll\PaginatedIncoSheet;
 use Application\Usecase\IncoSheets\FindAll\PaginatedShortIncoSheet;
-use Domain\Models\ValueObjects\IncoSheets\Additive;
-use Domain\Models\ValueObjects\IncoSheets\Allergen;
+use Domain\Models\ValueObjects\Inco\Additive;
+use Domain\Models\ValueObjects\Inco\Allergen;
 use Illuminate\Http\JsonResponse;
 use League\Uri\Http;
 use Presentation\Api\V1\Contracts\ApiResponse;

src/Presentation/Api/V1/Http/Responses/IncoSheets/IncoSheetsSearchResponse.php

@@ -6,8 +6,8 @@ namespace Presentation\Api\V1\Http\Responses\IncoSheets;
 
 use Application\Usecase\IncoSheets\Search\PaginatedIncoSheet;
 use Application\Usecase\IncoSheets\Search\PaginatedShortIncoSheet;
-use Domain\Models\ValueObjects\IncoSheets\Additive;
-use Domain\Models\ValueObjects\IncoSheets\Allergen;
+use Domain\Models\ValueObjects\Inco\Additive;
+use Domain\Models\ValueObjects\Inco\Allergen;
 use Illuminate\Http\JsonResponse;
 use League\Uri\Http;
 use Presentation\Api\V1\Contracts\ApiResponse;

src/Presentation/Api/V1/Http/Responses/IncoSheets/IncoSheetsShowResponse.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Presentation\Api\V1\Http\Responses\IncoSheets;
 
 use Application\Usecase\IncoSheets\Find\Output as FindOutput;
-use Domain\Models\ValueObjects\IncoSheets\Additive;
-use Domain\Models\ValueObjects\IncoSheets\Allergen;
+use Domain\Models\ValueObjects\Inco\Additive;
+use Domain\Models\ValueObjects\Inco\Allergen;
 use Illuminate\Http\JsonResponse;
 use Presentation\Api\V1\Contracts\ApiResponse;
 use Presentation\Api\V1\Dto\IncoSheets\IncoSheetDto;

src/Presentation/Api/V1/Presenters/Employees/EmployeeShowView.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Presentation\Api\V1\Presenters\Employees;
 
 use Application\Usecase\Employees\Find\Output;
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 
 final readonly class EmployeeShowView
 {

tests/Integration/Infra/Adapters/Directories/EloquentEmployeeDirectoryTest.php

@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Tests\Integration\Infra\Adapters\Directories;
 
 use Domain\Models\Entities\Employee;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 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;

tests/Unit/Application/Usecase/Employees/FindAllEmployeesTest.php

@@ -10,9 +10,9 @@ 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\ArcadiaEmployeeId;
 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;

tests/Unit/Application/Usecase/Employees/FindEmployeeTest.php

@@ -9,7 +9,7 @@ use Application\Usecase\Employees\Find\FindEmployee;
 use Application\Usecase\Employees\Find\Input;
 use Application\Usecase\Employees\Find\Output;
 use Domain\Models\Entities\Employee;
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 use Domain\Models\ValueObjects\EstablishmentCode;
 use Domain\Models\ValueObjects\ServiceId;
 use Domain\Models\ValueObjects\SiteId;

tests/Unit/Application/Usecase/Incosheets/FindAllIncoSheetsDtoTest.php

@@ -11,11 +11,11 @@ use Application\Usecase\IncoSheets\FindAll\PaginatedIncoSheet;
 use Application\Usecase\IncoSheets\FindAll\PaginatedShortIncoSheet;
 use Application\Usecase\IncoSheets\FindAll\SortColumn;
 use Application\Usecase\IncoSheets\FindAll\Sorter;
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\Ingredients;
 use Shared\Pagination;
 
 covers(

tests/Unit/Application/Usecase/Incosheets/FindAllIncoSheetsTest.php

@@ -9,13 +9,13 @@ use Application\Usecase\IncoSheets\FindAll\Input;
 use Application\Usecase\IncoSheets\FindAll\Output;
 use Application\Usecase\IncoSheets\FindAll\SortColumn;
 use Application\Usecase\IncoSheets\FindAll\Sorter;
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\IncoSheetSortColumn as DirectoryIncoSheetSortColumn;
-use Domain\Models\ValueObjects\IncoSheets\IncoSheetSorter as DirectoryIncoSheetSorter;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\IncoSheetSortColumn as DirectoryIncoSheetSortColumn;
+use Domain\Models\ValueObjects\Inco\IncoSheetSorter as DirectoryIncoSheetSorter;
+use Domain\Models\ValueObjects\Inco\Ingredients;
 use Domain\Ports\Directories\IncoSheetDirectory;
 use Shared\Paginated;
 use Shared\Pagination;

tests/Unit/Application/Usecase/Incosheets/FindIncoSheetDtoTest.php

@@ -6,10 +6,10 @@ namespace Tests\Unit\Application\Usecase\IncoSheets;
 
 use Application\Usecase\IncoSheets\Find\Input;
 use Application\Usecase\IncoSheets\Find\Output;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\Ingredients;
 
 covers(Input::class, Output::class);
 

tests/Unit/Application/Usecase/Incosheets/FindIncoSheetTest.php

@@ -8,11 +8,11 @@ use Application\Exceptions\NotFoundException;
 use Application\Usecase\IncoSheets\Find\FindIncoSheet;
 use Application\Usecase\IncoSheets\Find\Input;
 use Application\Usecase\IncoSheets\Find\Output;
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\Ingredients;
 use Domain\Ports\Directories\IncoSheetDirectory;
 
 covers(FindIncoSheet::class);

tests/Unit/Domain/Entities/EmployeeTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Tests\Unit\Domain\Entities;
 
 use Domain\Models\Entities\Employee;
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 use Domain\Models\ValueObjects\EstablishmentCode;
 use Domain\Models\ValueObjects\ServiceId;
 use Domain\Models\ValueObjects\SiteId;

tests/Unit/Domain/Entities/IncoCompositionEntityTest.php

@@ -4,35 +4,35 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Domain\Entities;
 
-use Domain\Models\Entities\IncoCompo;
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoCompo\AminoAcids;
-use Domain\Models\ValueObjects\IncoCompo\CarbohydratesDetail;
-use Domain\Models\ValueObjects\IncoCompo\Energy;
-use Domain\Models\ValueObjects\IncoCompo\EnergyValues;
-use Domain\Models\ValueObjects\IncoCompo\FattyAcids;
-use Domain\Models\ValueObjects\IncoCompo\FreshProduceAndNuts;
-use Domain\Models\ValueObjects\IncoCompo\FruitAndNutAmount;
-use Domain\Models\ValueObjects\IncoCompo\Identification;
-use Domain\Models\ValueObjects\IncoCompo\Minerals;
-use Domain\Models\ValueObjects\IncoCompo\NutrientValue;
-use Domain\Models\ValueObjects\IncoCompo\NutriScore;
-use Domain\Models\ValueObjects\IncoCompo\NutriScorePoints;
-use Domain\Models\ValueObjects\IncoCompo\PercentageValue;
-use Domain\Models\ValueObjects\IncoCompo\PortionMacronutrients;
-use Domain\Models\ValueObjects\IncoCompo\ReferenceIntakes;
-use Domain\Models\ValueObjects\IncoCompo\ReferenceMacronutrients;
-use Domain\Models\ValueObjects\IncoCompo\SpecialCompounds;
-use Domain\Models\ValueObjects\IncoCompo\Vitamins;
+use Domain\Models\Entities\Inco\Composition\IncoComposition;
+use Domain\Models\ValueObjects\Inco\Composition\AminoAcids;
+use Domain\Models\ValueObjects\Inco\Composition\CarbohydratesDetail;
+use Domain\Models\ValueObjects\Inco\Composition\Energy;
+use Domain\Models\ValueObjects\Inco\Composition\EnergyValues;
+use Domain\Models\ValueObjects\Inco\Composition\FattyAcids;
+use Domain\Models\ValueObjects\Inco\Composition\FreshProduceAndNuts;
+use Domain\Models\ValueObjects\Inco\Composition\FruitAndNutAmount;
+use Domain\Models\ValueObjects\Inco\Composition\Identification;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
+use Domain\Models\ValueObjects\Inco\Composition\Minerals;
+use Domain\Models\ValueObjects\Inco\Composition\NutrientValue;
+use Domain\Models\ValueObjects\Inco\Composition\NutriScore;
+use Domain\Models\ValueObjects\Inco\Composition\NutriScorePoints;
+use Domain\Models\ValueObjects\Inco\Composition\PercentageValue;
+use Domain\Models\ValueObjects\Inco\Composition\PortionMacronutrients;
+use Domain\Models\ValueObjects\Inco\Composition\ReferenceIntakes;
+use Domain\Models\ValueObjects\Inco\Composition\ReferenceMacronutrients;
+use Domain\Models\ValueObjects\Inco\Composition\SpecialCompounds;
+use Domain\Models\ValueObjects\Inco\Composition\Vitamins;
+use Domain\Models\ValueObjects\Inco\IncoId;
 use Shared\DDD\Entity;
 
-covers(IncoCompo::class);
+covers(IncoComposition::class);
 
-describe('IncoCompo Domain Entity Unit Tests', function (): void {
+describe('IncoComposition Domain Entity Unit Tests', function (): void {
     it('instantiates IncoCompo entity and returns correct id', function (): void {
         // GIVEN
-        $id             = new IncoCompoId('67890');
+        $id             = new IncoCompositionId('67890');
         $idInco         = new IncoId('12345');
         $identification = new Identification('Poulet Rôti', '12345', 'LDC');
         $zeroNutrient   = new NutrientValue('0');
@@ -201,7 +201,7 @@ describe('IncoCompo Domain Entity Unit Tests', function (): void {
         $specialCompounds = new SpecialCompounds('0', '0', '0', '0');
 
         // WHEN
-        $compo = new IncoCompo(
+        $compo = new IncoComposition(
             id: $id,
             idInco: $idInco,
             identification: $identification,

tests/Unit/Domain/Entities/IncoSheetEntityTest.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Domain\Entities;
 
-use Domain\Models\Entities\IncoSheet;
-use Domain\Models\ValueObjects\Entities\IncoId;
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
-use Domain\Models\ValueObjects\IncoSheets\Brand;
-use Domain\Models\ValueObjects\IncoSheets\Ingredients;
+use Domain\Models\Entities\Inco\IncoSheet;
+use Domain\Models\ValueObjects\Inco\Allegations;
+use Domain\Models\ValueObjects\Inco\Brand;
+use Domain\Models\ValueObjects\Inco\IncoId;
+use Domain\Models\ValueObjects\Inco\Ingredients;
 use Shared\DDD\Entity;
 
 covers(IncoSheet::class);

tests/Unit/Domain/Models/ValueObjects/Employees/ArcadiaEmployeeIdTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Domain;
 
-use Domain\Models\ValueObjects\Entities\ArcadiaEmployeeId;
+use Domain\Models\ValueObjects\Employees\ArcadiaEmployeeId;
 
 covers(ArcadiaEmployeeId::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/AdditiveTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoSheets;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco;
 
-use Domain\Models\ValueObjects\IncoSheets\Additive;
+use Domain\Models\ValueObjects\Inco\Additive;
 
 covers(Additive::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/AllegationsTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoSheets;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco;
 
-use Domain\Models\ValueObjects\IncoSheets\Allegations;
+use Domain\Models\ValueObjects\Inco\Allegations;
 
 covers(Allegations::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/AllergenTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoSheets;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco;
 
-use Domain\Models\ValueObjects\IncoSheets\Allergen;
+use Domain\Models\ValueObjects\Inco\Allergen;
 
 covers(Allergen::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/BrandTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoSheets;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco;
 
-use Domain\Models\ValueObjects\IncoSheets\Brand;
+use Domain\Models\ValueObjects\Inco\Brand;
 
 covers(Brand::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/AminoAcidsTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\AminoAcids;
+use Domain\Models\ValueObjects\Inco\Composition\AminoAcids;
 
 covers(AminoAcids::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/CarbohydratesDetailTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\CarbohydratesDetail;
+use Domain\Models\ValueObjects\Inco\Composition\CarbohydratesDetail;
 
 covers(CarbohydratesDetail::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/EnergyTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\Energy;
-use Domain\Models\ValueObjects\IncoCompo\EnergyValues;
+use Domain\Models\ValueObjects\Inco\Composition\Energy;
+use Domain\Models\ValueObjects\Inco\Composition\EnergyValues;
 
 covers(Energy::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/EnergyValuesTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\EnergyValues;
+use Domain\Models\ValueObjects\Inco\Composition\EnergyValues;
 
 covers(EnergyValues::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/FattyAcidsTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\FattyAcids;
+use Domain\Models\ValueObjects\Inco\Composition\FattyAcids;
 
 covers(FattyAcids::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/FreshProduceAndNutsTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\FreshProduceAndNuts;
-use Domain\Models\ValueObjects\IncoCompo\FruitAndNutAmount;
-use Domain\Models\ValueObjects\IncoCompo\PercentageValue;
+use Domain\Models\ValueObjects\Inco\Composition\FreshProduceAndNuts;
+use Domain\Models\ValueObjects\Inco\Composition\FruitAndNutAmount;
+use Domain\Models\ValueObjects\Inco\Composition\PercentageValue;
 
 covers(FreshProduceAndNuts::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/FruitAndNutAmountTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\FruitAndNutAmount;
+use Domain\Models\ValueObjects\Inco\Composition\FruitAndNutAmount;
 
 covers(FruitAndNutAmount::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/IdentificationTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\Identification;
+use Domain\Models\ValueObjects\Inco\Composition\Identification;
 
 covers(Identification::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/IncoCompoIdTest.php

@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\Entities;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\Entities\IncoCompoId;
+use Domain\Models\ValueObjects\Inco\Composition\IncoCompositionId;
 
-covers(IncoCompoId::class);
+covers(IncoCompositionId::class);
 
-describe('IncoCompoId Value Object', function (): void {
+describe('IncoCompositionId Value Object', function (): void {
     it('accepts valid numeric values', function (string $input): void {
         // GIVEN
         $value = $input;
 
         // WHEN
-        $vo = new IncoCompoId($value);
+        $vo = new IncoCompositionId($value);
 
         // THEN
         expect($vo->value)->toBe($value);
@@ -22,7 +22,7 @@ describe('IncoCompoId Value Object', function (): void {
 
     it('rejects invalid non-numeric or empty values', function (string $invalid): void {
         // GIVEN / WHEN / THEN
-        expect(fn () => new IncoCompoId($invalid))
+        expect(fn () => new IncoCompositionId($invalid))
             ->toThrow(\DomainException::class);
     })->with(['abc', '12a', '', ' 123 ', '-5']);
 });

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/MineralsTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\Minerals;
+use Domain\Models\ValueObjects\Inco\Composition\Minerals;
 
 covers(Minerals::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/NutriScorePointsTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\NutriScorePoints;
+use Domain\Models\ValueObjects\Inco\Composition\NutriScorePoints;
 
 covers(NutriScorePoints::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/NutriScoreTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\NutriScore;
+use Domain\Models\ValueObjects\Inco\Composition\NutriScore;
 
 covers(NutriScore::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/NutrientValueTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\NutrientValue;
+use Domain\Models\ValueObjects\Inco\Composition\NutrientValue;
 
 covers(NutrientValue::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/PercentageValueTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\PercentageValue;
+use Domain\Models\ValueObjects\Inco\Composition\PercentageValue;
 
 covers(PercentageValue::class);
 

tests/Unit/Domain/Models/ValueObjects/Inco/Composition/PortionMacronutrientsTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\Domain\Models\ValueObjects\IncoCompo;
+namespace Tests\Unit\Domain\Models\ValueObjects\Inco\Composition;
 
-use Domain\Models\ValueObjects\IncoCompo\NutrientValue;
-use Domain\Models\ValueObjects\IncoCompo\PortionMacronutrients;
+use Domain\Models\ValueObjects\Inco\Composition\NutrientValue;
+use Domain\Models\ValueObjects\Inco\Composition\PortionMacronutrients;
 
 covers(PortionMacronutrients::class);