Merge pull request #37 from dystcz/feat/remove-lunar-pipeline-overrides

Feat: Remove lunar pipeline overrides

Author: repl6669

.github/workflows/static-analysis.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.3, 8.4]
         laravel: [11, 12]
 
     name: "PHP ${{ matrix.php }} - L${{ matrix.laravel }}"

.github/workflows/tests.yaml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.3, 8.4]
         laravel: [11, 12]
         testsuite:
           - api

packages/api/src/ApiServiceProvider.php

@@ -189,41 +189,6 @@ protected function setPaymentOptionsConfig(): void
             );
         }
 
-        // // NOTE: Workaround
-        // // Swap calculate lines pipeline
-        // $calculateLinesIndex = array_search(\Lunar\Pipelines\Cart\CalculateLines::class, $cartPipelines);
-        // if (array_key_exists($calculateLinesIndex, $cartPipelines)) {
-        //     $cartPipelines[$calculateLinesIndex] = \Dystore\Api\Domain\Carts\Pipelines\CalculateLines::class;
-        // }
-        //
-        // // NOTE: Workaround
-        // // Swap apply shipping pipeline
-        // $applyShippingIndex = array_search(\Lunar\Pipelines\Cart\ApplyShipping::class, $cartPipelines);
-        // if (array_key_exists($applyShippingIndex, $cartPipelines)) {
-        //     $cartPipelines[$applyShippingIndex] = \Dystore\Api\Domain\Carts\Pipelines\ApplyShipping::class;
-        // }
-        //
-        // // NOTE: Workaround
-        // // Swap apply discounts pipeline
-        // $applyDiscountsIndex = array_search(\Lunar\Pipelines\Cart\ApplyDiscounts::class, $cartPipelines);
-        // if (array_key_exists($applyDiscountsIndex, $cartPipelines)) {
-        //     $cartPipelines[$applyDiscountsIndex] = \Dystore\Api\Domain\Carts\Pipelines\ApplyDiscounts::class;
-        // }
-        //
-        // // NOTE: Workaround
-        // // Swap calculate tax pipeline
-        // $calculateTaxIndex = array_search(\Lunar\Pipelines\Cart\CalculateTax::class, $cartPipelines);
-        // if (array_key_exists($calculateTaxIndex, $cartPipelines)) {
-        //     $cartPipelines[$calculateTaxIndex] = \Dystore\Api\Domain\Carts\Pipelines\CalculateTax::class;
-        // }
-        //
-        // // NOTE: Workaround
-        // // Swap calculate pipeline
-        // $calculateIndex = array_search(\Lunar\Pipelines\Cart\Calculate::class, $cartPipelines);
-        // if (array_key_exists($calculateIndex, $cartPipelines)) {
-        //     $cartPipelines[$calculateIndex] = \Dystore\Api\Domain\Carts\Pipelines\Calculate::class;
-        // }
-
         Config::set('lunar.cart.pipelines.cart', $cartPipelines);
 
         Config::set(
@@ -263,27 +228,6 @@ protected function setPaymentOptionsConfig(): void
                 array_slice($orderPipelines, $createShippingLineIndex + 1),
             );
         }
-        //
-        // // NOTE: Workaround
-        // // Swap create order lines pipeline
-        // $createOrderLinesIndex = array_search(\Lunar\Pipelines\Order\Creation\CreateOrderLines::class, $orderPipelines);
-        // if (array_key_exists($createOrderLinesIndex, $orderPipelines)) {
-        //     $orderPipelines[$createOrderLinesIndex] = \Dystore\Api\Domain\Orders\Pipelines\CreateOrderLines::class;
-        // }
-        //
-        // // NOTE: Workaround
-        // // Swap create order addresses pipeline
-        // $createOrderAddressesIndex = array_search(\Lunar\Pipelines\Order\Creation\CreateOrderAddresses::class, $orderPipelines);
-        // if (array_key_exists($createOrderAddressesIndex, $orderPipelines)) {
-        //     $orderPipelines[$createOrderAddressesIndex] = \Dystore\Api\Domain\Orders\Pipelines\CreateOrderAddresses::class;
-        // }
-        //
-        // // NOTE: Workaround
-        // // Swap create shipping line pipeline
-        // $createShippingLineIndex = array_search(\Lunar\Pipelines\Order\Creation\CreateShippingLine::class, $orderPipelines);
-        // if (array_key_exists($createShippingLineIndex, $orderPipelines)) {
-        //     $orderPipelines[$createShippingLineIndex] = \Dystore\Api\Domain\Orders\Pipelines\CreateShippingLine::class;
-        // }
 
         // Swap clean up order lines pipeline
         $cleanupOrderLinesIndex = array_search(\Lunar\Pipelines\Order\Creation\CleanUpOrderLines::class, $orderPipelines);

packages/api/src/Domain/ProductVariants/Builders/ProductVariantBuilder.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Dystore\Api\Domain\ProductVariants\Builders;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @extends Builder<Model>
+ */
+class ProductVariantBuilder extends Builder
+{
+    //
+}

packages/api/src/Domain/ProductVariants/Concerns/InteractsWithDystoreApi.php

@@ -6,6 +6,7 @@
 use Dystore\Api\Base\Traits\InteractsWithAvailability;
 use Dystore\Api\Domain\Attributes\Traits\InteractsWithAttributes;
 use Dystore\Api\Domain\Products\Models\Product;
+use Dystore\Api\Domain\ProductVariants\Builders\ProductVariantBuilder;
 use Dystore\Api\Domain\ProductVariants\Factories\ProductVariantFactory;
 use Dystore\Api\Domain\ProductVariants\Models\ProductVariantMedia;
 use Dystore\Api\Hashids\Traits\HashesRouteKey;
@@ -38,6 +39,16 @@ protected static function newFactory(): ProductVariantFactory
         return ProductVariantFactory::new();
     }
 
+    /**
+     * Create a new Eloquent query builder for the model.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     */
+    public function newEloquentBuilder($query): ProductVariantBuilder
+    {
+        return new ProductVariantBuilder($query);
+    }
+
     /**
      * Determine when model is considered to be preorderable.
      */

packages/api/src/Domain/ProductVariants/Models/ProductVariant.php

@@ -4,18 +4,31 @@
 
 use Dystore\Api\Base\Contracts\HasAvailability;
 use Dystore\Api\Base\Contracts\Translatable;
+use Dystore\Api\Domain\ProductVariants\Builders\ProductVariantBuilder;
 use Dystore\Api\Domain\ProductVariants\Concerns\InteractsWithDystoreApi;
 use Dystore\Api\Domain\ProductVariants\Contracts\ProductVariant as ProductVariantContract;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Collection;
 use Lunar\Models\ProductVariant as LunarPoductVariant;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 /**
+ * @method static ProductVariantBuilder query()
+ * @method bool isPreorderable() Determine when model is considered to be preorderable.
  * @method MorphMany notifications() Get the notifications relation if `dystore-product-notifications` package is installed.
  * @method Media|null getThumbnail() Get either variant thumbnail or fallback to product thumbnail.
  * @method Collection getImages() Get either variant images or fallback to product images.
+ * @method HasOneThrough thumbnail() Get the thumbnail relation.
+ * @method MorphOne lowestPrice() Get the lowest price relation.
+ * @method MorphOne highestPrice() Get the highest price relation.
+ * @method HasMany otherVariants() Get the other variants relation.
+ *
+ * @param  string|null  $approximateInStockQuantity
+ * @param  int  $inStockQuantity
  */
 class ProductVariant extends LunarPoductVariant implements HasAvailability, HasMedia, ProductVariantContract, Translatable
 {

packages/api/src/Domain/Products/Concerns/InteractsWithDystoreApi.php

@@ -27,9 +27,8 @@ protected static function newFactory(): ProductFactory
      * Create a new Eloquent query builder for the model.
      *
      * @param  \Illuminate\Database\Query\Builder  $query
-     * @return ProductBuilder|static
      */
-    public function newEloquentBuilder($query): Builder
+    public function newEloquentBuilder($query): ProductBuilder
     {
         return new ProductBuilder($query);
     }

packages/api/src/Domain/Products/Models/Product.php

@@ -15,6 +15,7 @@
 
 /**
  * @method static ProductBuilder query()
+ * @method static ProductBuilder published()
  * @method MorphToMany attributes() Get the mapped attributes relation.
  * @method HasManyThrough prices() Get prices relation through variants.
  * @method HasManyThrough basePrices() Get base prices relation through variants.