diff --git a/src/Domain/Models/ValueObjects/RequestedCoupon/RequestedCoupon.php b/src/Domain/Models/ValueObjects/RequestedCoupon/RequestedCoupon.php index 78b1bd7..306e68b 100644 --- a/src/Domain/Models/ValueObjects/RequestedCoupon/RequestedCoupon.php +++ b/src/Domain/Models/ValueObjects/RequestedCoupon/RequestedCoupon.php @@ -13,11 +13,9 @@ use Domain\Models\ValueObjects\MoneyAmount; use Domain\Models\ValueObjects\Period; use Domain\Models\ValueObjects\ProcessingCode; use Domain\Models\ValueObjects\WarningThresholdQuantity; -use Shared\Enums\Country; final readonly class RequestedCoupon { - /** @var array $country */ public function __construct( public CouponName $name, public CouponProductName $productName, @@ -28,15 +26,7 @@ final readonly class RequestedCoupon public ProcessingCode $processingCode, public CouponPicture $couponPicture, public ?GS1 $gs1, - public CouponValidity $couponValidity, - public array $country, + public CouponValidity $couponValidity ) { - // TODO: règle de validation ici pour Country - // Par défaut dans le tableau country il y aura Country::FRANCE - // Si GS1 est non null alors il ya aura aussi Country::BENELUX - // ça se passera au moment de la création donc peut être plutôt dans l'entité associée ? - - - // JE viens de passer GS1 en nullable, donc il faudra peut être tester } } diff --git a/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php b/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php index 33abf38..11e7944 100644 --- a/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php +++ b/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php @@ -10,7 +10,6 @@ use Application\UseCases\CampaignRequest\Find\Output\CampaignRequestFound; use Application\UseCases\CampaignRequest\Find\Output\CampaignRequestNotFound; use Application\UseCases\CampaignRequest\Find\Output\Output; use Domain\Enums\BarcodeFormat; -use Shared\Enums\Country; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestStatus; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestType; use Domain\Exceptions\BrandNotFoundException; @@ -59,7 +58,6 @@ describe('find campaign request use case', function (): void { new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), new CouponValidity(30, new DateTime()), - Country::FRANCE ); }); diff --git a/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php b/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php index 15aa7d6..8a1915c 100644 --- a/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php +++ b/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php @@ -7,7 +7,6 @@ namespace Application\UseCases\CampaignRequest\List; use Domain\Enums\BarcodeFormat; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestStatus; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestType; -use Shared\Enums\Country; use Domain\Models\Entities\CampaignRequest; use Domain\Models\ValueObjects\Brand\BrandCode; use Domain\Models\ValueObjects\CampaignRequest\Applicant; @@ -52,7 +51,6 @@ describe('list campaigns request use case', function (): void { new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), new CouponValidity(30, new DateTime()), - Country::FRANCE ); $this->couponB = new RequestedCoupon( @@ -66,7 +64,6 @@ describe('list campaigns request use case', function (): void { new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), new CouponValidity(30, new DateTime()), - Country::FRANCE ); }); diff --git a/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php b/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php index 265eb36..7c73427 100644 --- a/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php +++ b/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php @@ -13,7 +13,6 @@ use Carbon\CarbonImmutable; use Domain\Enums\BarcodeFormat; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestStatus; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestType; -use Shared\Enums\Country; use Domain\Models\Entities\CampaignRequest; use Domain\Models\ValueObjects\Brand\BrandCode; use Domain\Models\ValueObjects\CampaignRequest\Applicant; @@ -57,7 +56,6 @@ describe('reject campaign request use case', function (): void { new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), new CouponValidity(30, new DateTime()), - Country::FRANCE ); }); diff --git a/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php b/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php index d3bc3a6..2217f6e 100644 --- a/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php +++ b/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php @@ -7,7 +7,6 @@ namespace Tests\Unit\Domain\Models\Entities; use Domain\Enums\BarcodeFormat; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestStatus; use Domain\Models\ValueObjects\CampaignRequest\CampaignRequestType; -use Shared\Enums\Country; use Domain\Models\Entities\CampaignRequest; use Domain\Models\ValueObjects\Brand\BrandCode; use Domain\Models\ValueObjects\CampaignRequest\Applicant; @@ -52,7 +51,6 @@ describe('campaign request', function (): void { new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), new CouponValidity(30, new DateTime()), - Country::FRANCE ); }); diff --git a/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/RequestedCouponTest.php b/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/RequestedCouponTest.php index 41beeb3..2913dc3 100644 --- a/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/RequestedCouponTest.php +++ b/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/RequestedCouponTest.php @@ -20,7 +20,6 @@ use Domain\Models\ValueObjects\WarningThresholdQuantity; use Shared\Enums\Currency; use DateTime; use Domain\Models\ValueObjects\RequestedCoupon\RequestedCoupon; -use Shared\Enums\Country; use Shared\ValueObjects\Money; covers(RequestedCoupon::class); @@ -42,7 +41,6 @@ describe('requested coupon', function (): void { $couponPicture = new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')); $gs1 = new GS1('01234567890128', BarcodeFormat::EAN13); $couponValidity = new CouponValidity(30, new DateTime()); - $country = Country::FRANCE; // WHEN $coupon = new RequestedCoupon( $name, @@ -55,7 +53,6 @@ describe('requested coupon', function (): void { $couponPicture, $gs1, $couponValidity, - $country ); // THEN @@ -68,7 +65,25 @@ describe('requested coupon', function (): void { ->and($coupon->processingCode)->toBe($processingCode) ->and($coupon->couponPicture)->toBe($couponPicture) ->and($coupon->gs1)->toBe($gs1) - ->and($coupon->couponValidity)->toBe($couponValidity) - ->and($coupon->country)->toBe($country); + ->and($coupon->couponValidity)->toBe($couponValidity); + }); + + it('hydrates a requested coupon without a GS1', function (): void { + // WHEN + $coupon = new RequestedCoupon( + new CouponName('Coupon A'), + new CouponProductName('Product A'), + new RequestedCouponQuantity(100), + new WarningThresholdQuantity(10), + new Period(new DateTime('2026-01-01'), new DateTime('2026-02-01')), + new MoneyAmount(new Money(Currency::EUR, 300)), + new ProcessingCode('PC1'), + new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), + null, + new CouponValidity(30, new DateTime()), + ); + + // THEN + expect($coupon->gs1)->toBeNull(); }); });