Merge pull request #91 from heseya/feature/B2B-303

Added search to payment methods, price maps and shipping methods

app/Criteria/WhereHasNameLike.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Criteria;
+
+use Heseya\Searchable\Criteria\Criterion;
+use Illuminate\Database\Eloquent\Builder;
+
+class WhereHasNameLike extends Criterion
+{
+    public function query(Builder $query): Builder
+    {
+        return $query->where('name', 'LIKE', "%{$this->value}%");
+    }
+}

src/Application/PriceMap/Controllers/PriceMapController.php

@@ -8,6 +8,7 @@
 use App\Models\Product;
 use Application\PriceMap\Requests\PriceMapListPricesRequest;
 use Domain\PriceMap\Dtos\PriceMapCreateDto;
+use Domain\PriceMap\Dtos\PriceMapIndexDto;
 use Domain\PriceMap\Dtos\PriceMapPricesUpdateDto;
 use Domain\PriceMap\Dtos\PriceMapProductPricesUpdateDto;
 use Domain\PriceMap\Dtos\PriceMapSchemaPricesUpdateDto;
@@ -28,9 +29,9 @@ public function __construct(
         private PriceMapService $priceMapService,
     ) {}
 
-    public function index(Request $request): HttpResponse
+    public function index(Request $request, PriceMapIndexDto $dto): HttpResponse
     {
-        return $this->priceMapService->list()->toResponse($request);
+        return $this->priceMapService->list($dto)->toResponse($request);
     }
 
     public function store(Request $request, PriceMapCreateDto $dto): HttpResponse

src/Domain/PaymentMethods/Dtos/PaymentMethodIndexDto.php

@@ -25,6 +25,7 @@ public function __construct(
         public readonly array|Optional $ids,
         #[Uuid, Exists('sales_channels', 'id')]
         public readonly Optional|string $sales_channel_id,
+        public readonly Optional|string $search,
     ) {}
 
     /**

src/Domain/PaymentMethods/Models/PaymentMethod.php

@@ -4,6 +4,7 @@
 
 namespace Domain\PaymentMethods\Models;
 
+use App\Criteria\WhereHasNameLike;
 use App\Criteria\WhereHasOrderWithCode;
 use App\Criteria\WhereHasSalesChannel;
 use App\Criteria\WhereHasShippingMethod;
@@ -56,6 +57,7 @@ final class PaymentMethod extends Model
         'alias',
         'ids' => WhereInIds::class,
         'sales_channel_id' => WhereHasSalesChannel::class,
+        'search' => WhereHasNameLike::class,
     ];
 
     /**

src/Domain/PriceMap/Dtos/PriceMapIndexDto.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Domain\PriceMap\Dtos;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Optional;
+
+final class PriceMapIndexDto extends Data
+{
+    public function __construct(
+        public Optional|string $search,
+    ) {}
+}

src/Domain/PriceMap/PriceMap.php

@@ -4,10 +4,12 @@
 
 namespace Domain\PriceMap;
 
+use App\Criteria\WhereHasNameLike;
 use App\Models\Model;
 use Domain\Currency\Currency;
 use Domain\PriceMap\Resources\PriceMapData;
 use Domain\SalesChannel\Models\SalesChannel;
+use Heseya\Searchable\Traits\HasCriteria;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Spatie\LaravelData\WithData;
@@ -17,6 +19,7 @@
  */
 final class PriceMap extends Model
 {
+    use HasCriteria;
     use HasFactory;
     /**
      * @use WithData<PriceMapData>
@@ -38,6 +41,11 @@ final class PriceMap extends Model
         'prices_generated' => 'bool',
     ];
 
+    /** @var string[] */
+    protected array $criteria = [
+        'search' => WhereHasNameLike::class,
+    ];
+
     /**
      * @return HasMany<PriceMapProductPrice>
      */

src/Domain/PriceMap/PriceMapService.php

@@ -13,6 +13,7 @@
 use Domain\Currency\Currency;
 use Domain\Price\Dtos\PriceDto;
 use Domain\PriceMap\Dtos\PriceMapCreateDto;
+use Domain\PriceMap\Dtos\PriceMapIndexDto;
 use Domain\PriceMap\Dtos\PriceMapPricesUpdateDto;
 use Domain\PriceMap\Dtos\PriceMapPriceUpdateDto;
 use Domain\PriceMap\Dtos\PriceMapProductPricesUpdateDto;
@@ -53,9 +54,9 @@
     /**
      * @return PaginatedDataCollection<int|string,PriceMapData>
      */
-    public function list(): PaginatedDataCollection
+    public function list(PriceMapIndexDto $dto): PaginatedDataCollection
     {
-        return PriceMapData::collection(PriceMap::query()->paginate(Config::get('pagination.per_page')));
+        return PriceMapData::collection(PriceMap::searchByCriteria($dto->toArray())->paginate(Config::get('pagination.per_page')));
     }
 
     public function create(PriceMapCreateDto $dto): PriceMap

src/Domain/ShippingMethod/Dtos/ShippingMethodIndexDto.php

@@ -37,6 +37,7 @@ public function __construct(
         public array|Optional $metadata_private,
         #[Uuid, Exists('sales_channels', 'id')]
         public Optional|string $sales_channel_id,
+        public Optional|string $search,
         #[ArrayType]
         public array $items = [],
     ) {}

src/Domain/ShippingMethod/Models/ShippingMethod.php

@@ -7,6 +7,7 @@
 use App\Criteria\MetadataPrivateSearch;
 use App\Criteria\MetadataSearch;
 use App\Criteria\ShippingMethodItems;
+use App\Criteria\WhereHasNameLike;
 use App\Criteria\WhereHasSalesChannel;
 use App\Criteria\WhereInIds;
 use App\Enums\ShippingType;
@@ -85,6 +86,7 @@ final class ShippingMethod extends Model
         'ids' => WhereInIds::class,
         'items' => ShippingMethodItems::class,
         'sales_channel_id' => WhereHasSalesChannel::class,
+        'search' => WhereHasNameLike::class,
     ];
 
     /**

src/Domain/ShippingMethod/Services/ShippingMethodService.php

@@ -37,6 +37,7 @@ public function index(ShippingMethodIndexDto $dto, ?Money $cartValue): LengthAwa
             'ids',
             'items',
             'sales_channel_id',
+            'search',
         )->toArray();
 
         $query = ShippingMethod::query()

tests/Feature/PaymentMethodTest.php

@@ -60,6 +60,24 @@ public function testIndex($user): void
     {
         $this->{$user}->givePermissionTo('payment_methods.show');
 
+        $this->payment_method->update([
+            'name' => 'Searched value',
+        ]);
+
+        $response = $this->actingAs($this->{$user})->json('GET', '/payment-methods', ['search' => $this->payment_method->name]);
+        $response
+            ->assertOk()
+            ->assertJsonCount(1, 'data')
+            ->assertJsonFragment(['id' => $this->payment_method->getKey()]);
+    }
+
+    /**
+     * @dataProvider authProvider
+     */
+    public function testIndexSearch($user): void
+    {
+        $this->{$user}->givePermissionTo('payment_methods.show');
+
         $response = $this->actingAs($this->{$user})->getJson('/payment-methods');
         $response
             ->assertOk()

tests/Feature/PriceMap/PriceMapTest.php

@@ -34,6 +34,18 @@ public function testIndex(string $user): void
         $response->assertOk()->assertJsonCount(1 + count(Currency::cases()), 'data');
     }
 
+    /**
+     * @dataProvider authProvider
+     */
+    public function testIndexSearch(string $user): void
+    {
+        $this->{$user}->givePermissionTo('price-maps.show');
+
+        $response = $this->actingAs($this->{$user})->json('GET', '/price-maps', ['search' => $this->priceMap->name]);
+
+        $response->assertOk()->assertJsonCount(1, 'data');
+    }
+
     public function testCreateUnauthorized(): void
     {
         $this

tests/Feature/ShippingMethodTest.php

@@ -138,6 +138,26 @@ public function testIndex($user): void
             ]);
     }
 
+    /**
+     * @dataProvider authProvider
+     */
+    public function testIndexSearch($user): void
+    {
+        $this->{$user}->givePermissionTo('shipping_methods.show');
+
+        $shippingMethod = ShippingMethod::factory()->create([
+            'public' => true,
+            'name' => 'Searched value',
+        ]);
+
+        $this->actingAs($this->{$user})->json('GET', '/shipping-methods', ['search' => 'Searched value'])
+            ->assertOk()
+            ->assertJsonCount(1, 'data')
+            ->assertJsonFragment([
+                'id' => $shippingMethod->getKey(),
+            ]);
+    }
+
     /**
      * @dataProvider authProvider
      */