feat: refactor product detail retrieval to simplify variant handling and enhance response structure

This commit is contained in:
2026-07-01 01:05:21 +00:00
parent 429fa36b05
commit 1aa831f921
5 changed files with 98 additions and 90 deletions

View File

@@ -10,7 +10,6 @@ use App\Domains\Catalog\Services\ProductService;
use App\Domains\Tenant\Models\Tenant;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -30,12 +29,10 @@ class ProductController extends Controller
return ProductResource::make($product)->response()->setStatusCode(201);
}
public function show(Request $request, Tenant $tenant, Product $producto, ProductService $productService): ProductResource
public function show(Tenant $tenant, Product $producto, ProductService $productService): ProductResource
{
$producto = $this->resolveScopedProduct($tenant, $producto);
$variantId = $request->query('variant_id');
$variantId = is_numeric($variantId) ? (int) $variantId : null;
$producto = $productService->getProductDetail($tenant, $producto, $variantId);
$producto = $productService->getProductDetail($tenant, $producto);
return ProductResource::make($producto);
}

View File

@@ -2,11 +2,12 @@
namespace App\Domains\Catalog\Resources;
use App\Domains\Catalog\Models\Product;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
/**
* @mixin \App\Domains\Catalog\Models\Product
* @mixin Product
*/
class ProductResource extends JsonResource
{
@@ -23,15 +24,26 @@ class ProductResource extends JsonResource
'nombre' => $this->nombre,
'descripcion' => $this->descripcion,
'precio' => $this->precio,
'category' => $this->whenLoaded('category', fn () => $this->category?->nombre),
'category' => $this->whenLoaded('category', fn () => $this->category?->nombre),
'brand' => $this->whenLoaded('brand', fn () => $this->brand?->nombre),
'images' => $this->whenLoaded('attachments', fn () =>
$this->attachments
->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
->values()
'images' => $this->whenLoaded('attachments', fn () => $this->attachments
->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
->values()
),
'attributes' => AttributeResource::collection($this->whenLoaded('attributes')),
'variants' => ProductVariantResource::collection($this->whenLoaded('variants')),
'variants_map' => $this->whenLoaded('variants', fn () => $this->variants
->map(fn ($variant) => [
'variant_id' => $variant->id,
'stock' => $variant->stock,
'attributes' => $variant->definitions
->mapWithKeys(fn ($definition) => [
$definition->productAttribute?->attribute?->codigo => $definition->value,
])
->filter(fn ($value, $key) => $key !== null)
->toArray(),
])
->values()
),
'variant' => $this->when(
$this->getSelectedVariant() !== null,
fn () => ProductVariantResource::make($this->getSelectedVariant())

View File

@@ -7,16 +7,18 @@ use App\Domains\Catalog\Models\Attribute;
use App\Domains\Catalog\Models\Product;
use App\Domains\Catalog\Models\ProductVariant;
use App\Domains\Tenant\Models\Tenant;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\DB;
class ProductService
{
public function __construct(protected AttachmentService $attachmentService) {}
/**
* Create a product.
*
* @param array<string, mixed> $data
* @param array<string, mixed> $data
*/
public function create(Tenant $tenant, array $data): Product
{
@@ -44,7 +46,7 @@ class ProductService
/**
* Update a product.
*
* @param array<string, mixed> $data
* @param array<string, mixed> $data
*/
public function update(Product $product, array $data): Product
{
@@ -98,7 +100,7 @@ class ProductService
/**
* Create a product variant.
*
* @param array<string, mixed> $data
* @param array<string, mixed> $data
*/
public function createVariant(Product $product, array $data): ProductVariant
{
@@ -119,7 +121,7 @@ class ProductService
/**
* Update a product variant.
*
* @param array<string, mixed> $data
* @param array<string, mixed> $data
*/
public function updateVariant(ProductVariant $variant, array $data): ProductVariant
{
@@ -156,7 +158,7 @@ class ProductService
/**
* Create an attribute.
*
* @param array<string, mixed> $data
* @param array<string, mixed> $data
*/
public static function createAttribute(Tenant $tenant, array $data): Attribute
{
@@ -168,7 +170,7 @@ class ProductService
/**
* Update an attribute.
*
* @param array<string, mixed> $data
* @param array<string, mixed> $data
*/
public static function updateAttribute(Attribute $attribute, array $data): Attribute
{
@@ -183,7 +185,7 @@ class ProductService
* When called on update, the existing attachments are detached first so the
* final set always matches exactly what was sent in the request.
*
* @param array<int, UploadedFile|string> $images
* @param array<int, UploadedFile|string> $images
*/
protected function syncVariantImages(ProductVariant $variant, array $images): void
{
@@ -204,7 +206,7 @@ class ProductService
*
* Same logic as syncVariantImages but for products without variants.
*
* @param array<int, UploadedFile|string> $images
* @param array<int, UploadedFile|string> $images
*/
protected function syncProductImages(Product $product, array $images): void
{
@@ -248,7 +250,7 @@ class ProductService
/**
* Get products for a tenant with resolved first image (with fallback to first variant's first image).
*/
public function getProductos(Tenant $tenant): \Illuminate\Contracts\Pagination\LengthAwarePaginator
public function getProductos(Tenant $tenant): LengthAwarePaginator
{
$products = Product::query()
->where('tenant_codigo', $tenant->codigo)
@@ -279,39 +281,16 @@ class ProductService
return $products;
}
public function getProductDetail(Tenant $tenant, Product $product, ?int $variantId = null): Product
public function getProductDetail(Tenant $tenant, Product $product): Product
{
$product->load([
'attachments',
'brand',
'category',
'attributes.options',
'variants' => fn ($query) => $query->orderBy('id'),
'variants.definitions.productAttribute.attribute.options',
]);
$selectedVariantQuery = $product->variants()
->with([
'attachments',
'definitions.productAttribute.attribute.options',
]);
$selectedVariant = $variantId !== null
? $selectedVariantQuery->whereKey($variantId)->first()
: null;
if ($selectedVariant === null) {
$selectedVariant = $product->variants()
->with([
'attachments',
'definitions.productAttribute.attribute.options',
])
->first();
}
if ($selectedVariant) {
$product->setSelectedVariant($selectedVariant);
}
return $product;
}
}