feat(catalog): omit hidden products before pagination
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
namespace App\Domains\Catalog\Controllers;
|
||||
|
||||
use App\Domains\Cart\Services\CartService;
|
||||
use App\Domains\Catalog\Enums\AvailabilitySubject;
|
||||
use App\Domains\Catalog\Models\CatalogItem;
|
||||
use App\Domains\Catalog\Models\Category;
|
||||
use App\Domains\Catalog\Models\FeaturedGroup;
|
||||
@@ -123,6 +124,11 @@ class CatalogController extends Controller
|
||||
$variantId === null ? null : (int) $variantId,
|
||||
);
|
||||
$allowances->attach(collect([$item]), $this->userId($request));
|
||||
abort_unless($allowances->isVisible(
|
||||
$item->availableStock(),
|
||||
$item->getAttribute('remaining_user_quota'),
|
||||
AvailabilitySubject::Product,
|
||||
), 404);
|
||||
|
||||
return CatalogItemDetailResource::make($item);
|
||||
}
|
||||
|
||||
@@ -186,6 +186,59 @@ class CatalogItem extends Model
|
||||
});
|
||||
}
|
||||
|
||||
/** @param Builder<CatalogItem> $query */
|
||||
public function scopeWhereAvailableInCatalog(Builder $query): Builder
|
||||
{
|
||||
return $query->where(function (Builder $query): void {
|
||||
$query
|
||||
->where(function (Builder $standardQuery): void {
|
||||
$standardQuery
|
||||
->where('catalog_items.type', CatalogItemType::Standard->value)
|
||||
->where(function (Builder $inventoryQuery): void {
|
||||
$inventoryQuery
|
||||
->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
|
||||
->orWhereHas(
|
||||
'inventory',
|
||||
fn (Builder $query): Builder => $query
|
||||
->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock'),
|
||||
)
|
||||
->orWhereHas(
|
||||
'variants.inventory',
|
||||
fn (Builder $query): Builder => $query
|
||||
->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock'),
|
||||
);
|
||||
});
|
||||
})
|
||||
->orWhere(function (Builder $bundleQuery): void {
|
||||
$bundleQuery
|
||||
->where('catalog_items.type', CatalogItemType::Bundle->value)
|
||||
->whereRaw(<<<'SQL'
|
||||
NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM bundle_components AS availability_components
|
||||
INNER JOIN catalog_items AS availability_items
|
||||
ON availability_items.id = availability_components.component_catalog_item_id
|
||||
LEFT JOIN variantes AS availability_variants
|
||||
ON availability_variants.id = availability_components.component_variant_id
|
||||
INNER JOIN inventories AS availability_inventories
|
||||
ON availability_inventories.id = COALESCE(
|
||||
availability_variants.inventory_id,
|
||||
availability_items.inventory_id
|
||||
)
|
||||
WHERE availability_components.bundle_catalog_item_id = catalog_items.id
|
||||
AND availability_items.inventory_policy = ?
|
||||
GROUP BY availability_inventories.id,
|
||||
availability_inventories.real_stock,
|
||||
availability_inventories.reserved_stock
|
||||
HAVING availability_inventories.real_stock
|
||||
- availability_inventories.reserved_stock
|
||||
< SUM(availability_components.quantity)
|
||||
)
|
||||
SQL, [InventoryPolicy::Tracked->value]);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/** @return Collection<int, Variant> */
|
||||
public function visibleVariants(?int $includedVariantId = null): Collection
|
||||
{
|
||||
|
||||
@@ -22,7 +22,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
class CatalogService
|
||||
{
|
||||
public function __construct(protected AttachmentService $attachmentService) {}
|
||||
public function __construct(
|
||||
protected AttachmentService $attachmentService,
|
||||
private readonly CatalogItemAllowanceService $allowances,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $data
|
||||
@@ -229,7 +232,7 @@ class CatalogService
|
||||
$containsPattern = "%{$normalizedTerm}%";
|
||||
$startsWithPattern = "{$normalizedTerm}%";
|
||||
|
||||
$paginator = CatalogItem::query()
|
||||
$query = CatalogItem::query()
|
||||
->where('tenant_code', $tenant->codigo)
|
||||
->where(function (Builder $query) use ($containsPattern): void {
|
||||
$query
|
||||
@@ -257,7 +260,10 @@ class CatalogService
|
||||
'variants.definitions.itemAttribute.attribute.options',
|
||||
'bundleComponents.catalogItem',
|
||||
'bundleComponents.variant.catalogItem',
|
||||
])
|
||||
]);
|
||||
|
||||
$paginator = $this->allowances
|
||||
->applyProductVisibilityPolicy($query)
|
||||
->orderByRaw(
|
||||
'CASE WHEN LOWER(nombre) = ? THEN 0 WHEN LOWER(nombre) LIKE ? THEN 1 ELSE 2 END',
|
||||
[$normalizedTerm, $startsWithPattern],
|
||||
@@ -277,7 +283,7 @@ class CatalogService
|
||||
int $perPage,
|
||||
int $page,
|
||||
): LengthAwarePaginator {
|
||||
return CatalogItem::query()
|
||||
$query = CatalogItem::query()
|
||||
->where('tenant_code', $tenant->codigo)
|
||||
->where('category_id', $category->id)
|
||||
->with([
|
||||
@@ -291,7 +297,10 @@ class CatalogService
|
||||
'variants.definitions.itemAttribute.attribute.options',
|
||||
'bundleComponents.catalogItem',
|
||||
'bundleComponents.variant.catalogItem',
|
||||
])
|
||||
]);
|
||||
|
||||
return $this->allowances
|
||||
->applyProductVisibilityPolicy($query)
|
||||
->orderBy('nombre')
|
||||
->paginate(perPage: $perPage, pageName: 'page', page: $page);
|
||||
}
|
||||
|
||||
@@ -71,6 +71,8 @@ class FeaturedGroupService
|
||||
'bundleComponents.variant.catalogItem',
|
||||
]);
|
||||
|
||||
$query = $this->allowances->applyProductVisibilityPolicy($query);
|
||||
|
||||
return match ($featuredGroup->source_type) {
|
||||
FeaturedGroupSource::Manual => $query
|
||||
->select('catalog_items.*')
|
||||
|
||||
Reference in New Issue
Block a user