6 Commits

32 changed files with 867 additions and 78 deletions

View File

@@ -2,8 +2,10 @@
namespace App\Domains\Catalog\Controllers;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Models\CatalogItem;
use App\Domains\Catalog\Models\FeaturedGroup;
use App\Domains\Catalog\Models\FeaturedItem;
use App\Domains\Catalog\Requests\CatalogItemDetailRequest;
use App\Domains\Catalog\Requests\FeaturedGroupPageRequest;
use App\Domains\Catalog\Requests\StoreCatalogItemRequest;
@@ -14,6 +16,7 @@ use App\Domains\Catalog\Resources\CatalogItemResource;
use App\Domains\Catalog\Services\CatalogService;
use App\Domains\Tenant\Models\Tenant;
use App\Http\Controllers\Controller;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
@@ -81,9 +84,19 @@ class CatalogController extends Controller
->setStatusCode(201);
}
/** @return array<string, mixed> */
/** @return array<array-key, mixed> */
private function featuredItemsResponse(FeaturedGroup $featuredGroup, int $page): array
{
if ($featuredGroup->group_layout !== GroupLayout::Paginated) {
$featuredItems = $this->featuredItemsQuery($featuredGroup)->get();
$featuredItems->each(
fn ($featuredItem) => $featuredItem->setRelation('featuredGroup', $featuredGroup)
);
return CatalogFeaturedItemResource::collection($featuredItems)->resolve();
}
$paginator = $this->paginateFeaturedItems($featuredGroup, $page);
$paginator->getCollection()->each(
@@ -99,25 +112,29 @@ class CatalogController extends Controller
FeaturedGroup $featuredGroup,
int $page,
): LengthAwarePaginator {
$paginator = $featuredGroup->featuredItems()
->with([
'catalogItem.inventory',
'catalogItem.attachments',
'catalogItem.variants.inventory',
'catalogItem.variants.attachments',
'catalogItem.variants.definitions.itemAttribute.attribute',
'catalogItem.bundleComponents.catalogItem',
'catalogItem.bundleComponents.variant.catalogItem',
])
->paginate(
perPage: self::ITEMS_PER_PAGE,
pageName: 'page',
page: $page,
);
$paginator = $this->featuredItemsQuery($featuredGroup)->paginate(
perPage: self::ITEMS_PER_PAGE,
pageName: 'page',
page: $page,
);
return $paginator->withPath(route('catalog.featured-groups.items.index', [
'tenant' => $featuredGroup->tenant_code,
'featuredGroup' => $featuredGroup->id,
]));
}
/** @return HasMany<FeaturedItem, FeaturedGroup> */
private function featuredItemsQuery(FeaturedGroup $featuredGroup): HasMany
{
return $featuredGroup->featuredItems()->with([
'catalogItem.inventory',
'catalogItem.attachments',
'catalogItem.variants.inventory',
'catalogItem.variants.attachments',
'catalogItem.variants.definitions.itemAttribute.attribute',
'catalogItem.bundleComponents.catalogItem',
'catalogItem.bundleComponents.variant.catalogItem',
]);
}
}

View File

@@ -0,0 +1,19 @@
<?php
namespace App\Domains\Catalog\Enums;
enum GroupLayout: string
{
case Paginated = 'paginated';
case Simple = 'simple';
case SimpleVertical = 'simple_vertical';
case Carousel = 'carousel';
/**
* @return list<string>
*/
public static function values(): array
{
return array_column(self::cases(), 'value');
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Domains\Catalog\Models;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Enums\ProductLayout;
use App\Domains\Tenant\Models\Tenant;
use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -13,6 +14,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
#[Fillable([
'tenant_code',
'product_layout',
'group_layout',
'group_name',
'group_order',
])]
@@ -28,6 +30,7 @@ class FeaturedGroup extends Model
{
return [
'product_layout' => ProductLayout::class,
'group_layout' => GroupLayout::class,
'group_order' => 'integer',
];
}

View File

@@ -9,8 +9,8 @@ use Illuminate\Http\Resources\Json\JsonResource;
/** @mixin FeaturedGroup */
class CatalogFeaturedGroupResource extends JsonResource
{
/** @param array<string, mixed> $itemsPage */
public function __construct($resource, private readonly array $itemsPage)
/** @param array<array-key, mixed> $items */
public function __construct($resource, private readonly array $items)
{
parent::__construct($resource);
}
@@ -22,8 +22,9 @@ class CatalogFeaturedGroupResource extends JsonResource
'id' => $this->id,
'title' => $this->group_name,
'layout' => $this->product_layout->value,
'group_layout' => $this->group_layout->value,
'group_order' => $this->group_order,
'items' => $this->itemsPage,
'items' => $this->items,
];
}
}

View File

@@ -15,7 +15,10 @@ class BootstrapTenantController extends Controller
$dominio = $request->validated('dominio');
return TenantResource::make(
Tenant::query()->with(['headerLogo', 'footerLogo', 'menues'])->where('dominio', $dominio)->firstOrFail()
Tenant::query()
->with(['headerLogo', 'footerLogo', 'mainCarouselImages', 'menues'])
->where('dominio', $dominio)
->firstOrFail()
);
}
}

View File

@@ -13,32 +13,41 @@ use Illuminate\Http\Response;
class TenantController extends Controller
{
public function __construct(protected TenantService $tenantService)
{
}
public function __construct(protected TenantService $tenantService) {}
public function index(): JsonResponse
{
return TenantResource::collection(Tenant::query()->with(['headerLogo', 'footerLogo'])->latest()->paginateFromRequest())->response();
return TenantResource::collection(
Tenant::query()
->with(['headerLogo', 'footerLogo', 'mainCarouselImages'])
->latest()
->paginateFromRequest()
)->response();
}
public function store(StoreTenantRequest $request): JsonResponse
{
$tenant = $this->tenantService->create($request->validated());
return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']))->response()->setStatusCode(201);
return TenantResource::make(
$tenant->loadMissing(['headerLogo', 'footerLogo', 'mainCarouselImages'])
)->response()->setStatusCode(201);
}
public function show(Tenant $tenant): TenantResource
{
return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']));
return TenantResource::make(
$tenant->loadMissing(['headerLogo', 'footerLogo', 'mainCarouselImages'])
);
}
public function update(UpdateTenantRequest $request, Tenant $tenant): TenantResource
{
$tenant = $this->tenantService->update($tenant, $request->validated());
return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']));
return TenantResource::make(
$tenant->loadMissing(['headerLogo', 'footerLogo', 'mainCarouselImages'])
);
}
public function destroy(Tenant $tenant): Response

View File

@@ -0,0 +1,34 @@
<?php
namespace App\Domains\Tenant\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
class SocialMedia extends Model
{
protected $table = 'social_media';
protected $fillable = [
'code',
'icon',
'name',
];
/**
* @return BelongsToMany<Tenant, $this>
*/
public function tenants(): BelongsToMany
{
return $this->belongsToMany(
Tenant::class,
'tenant_social_media',
'social_media_code',
'tenant_code',
'code',
'codigo'
)
->withPivot('url')
->withTimestamps();
}
}

View File

@@ -73,11 +73,44 @@ class Tenant extends Model
return $this->belongsTo(Attachment::class, 'hero_bg_image_id');
}
/**
* @return BelongsToMany<Attachment, $this>
*/
public function mainCarouselImages(): BelongsToMany
{
return $this->belongsToMany(
Attachment::class,
'tenant_main_carousel_images',
'tenant_id',
'attachment_id'
)
->withPivot('orden')
->withTimestamps()
->orderByPivot('orden');
}
public function catalogItems(): HasMany
{
return $this->hasMany(CatalogItem::class, 'tenant_code', 'codigo');
}
/**
* @return BelongsToMany<SocialMedia, $this>
*/
public function socialMedia(): BelongsToMany
{
return $this->belongsToMany(
SocialMedia::class,
'tenant_social_media',
'tenant_code',
'social_media_code',
'codigo',
'code'
)
->withPivot('url')
->withTimestamps();
}
public function menues(): BelongsToMany
{
return $this->belongsToMany(

View File

@@ -35,8 +35,7 @@ class StoreTenantRequest extends FormRequest
*/
public function rules(): array
{
$logoRule = ['required', new ImageOrBase64Rule()];
$logoRule = ['required', new ImageOrBase64Rule];
return [
'codigo' => ['required', 'string', 'max:255', Rule::unique('tenants', 'codigo')],
@@ -61,7 +60,9 @@ class StoreTenantRequest extends FormRequest
'footer_bg_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
'header_logo' => $logoRule,
'footer_logo' => $logoRule,
'hero_bg_image' => ['nullable', new ImageOrBase64Rule()],
'hero_bg_image' => ['nullable', new ImageOrBase64Rule],
'main_carousel_images' => ['sometimes', 'array'],
'main_carousel_images.*' => ['required', 'distinct', new ImageOrBase64Rule],
'hero_config' => ['nullable', 'array'],
'hero_config.title_html' => ['nullable', 'string'],
'hero_config.description_html' => ['nullable', 'string'],

View File

@@ -41,8 +41,7 @@ class UpdateTenantRequest extends FormRequest
/** @var Tenant|null $tenant */
$tenant = $this->route('tenant');
$logoRule = ['nullable', new ImageOrBase64Rule()];
$logoRule = ['nullable', new ImageOrBase64Rule];
return [
'codigo' => [
@@ -72,7 +71,9 @@ class UpdateTenantRequest extends FormRequest
'footer_bg_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
'header_logo' => $logoRule,
'footer_logo' => $logoRule,
'hero_bg_image' => ['nullable', new ImageOrBase64Rule()],
'hero_bg_image' => ['nullable', new ImageOrBase64Rule],
'main_carousel_images' => ['sometimes', 'array'],
'main_carousel_images.*' => ['required', 'distinct', new ImageOrBase64Rule],
'hero_config' => ['nullable', 'array'],
'hero_config.title_html' => ['nullable', 'string'],
'hero_config.description_html' => ['nullable', 'string'],

View File

@@ -2,11 +2,12 @@
namespace App\Domains\Tenant\Resources;
use App\Domains\Tenant\Models\Tenant;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
/**
* @mixin \App\Domains\Tenant\Models\Tenant
* @mixin Tenant
*/
class TenantResource extends JsonResource
{
@@ -34,9 +35,15 @@ class TenantResource extends JsonResource
'footer_bg_color' => $this->footer_bg_color,
// 1 day
'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440 ),
'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440),
'hero_config' => $heroConfig,
'event_config' => $this->event_config,
'main_carousel_images' => $this->whenLoaded(
'mainCarouselImages',
fn () => $this->mainCarouselImages
->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
->values()
),
'menues' => $this->whenLoaded('menues'),
];
}

View File

@@ -2,22 +2,22 @@
namespace App\Domains\Tenant\Services;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Attachable\Services\AttachmentService;
use App\Domains\Tenant\Models\Tenant;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
class TenantService
{
public function __construct(protected AttachmentService $attachmentService)
{
}
public function __construct(protected AttachmentService $attachmentService) {}
/**
* Create a new tenant and store its logos.
*
* @param array<string, mixed> $data
* @return Tenant
*/
public function create(array $data): Tenant
{
@@ -25,13 +25,19 @@ class TenantService
$headerLogo = $data['header_logo'] ?? null;
$footerLogo = $data['footer_logo'] ?? null;
$heroBgImage = $data['hero_bg_image'] ?? null;
$mainCarouselImages = $data['main_carousel_images'] ?? [];
unset($data['header_logo'], $data['footer_logo'], $data['hero_bg_image']);
unset(
$data['header_logo'],
$data['footer_logo'],
$data['hero_bg_image'],
$data['main_carousel_images']
);
$headerAttachmentId = null;
if ($headerLogo) {
$attachment = Str::isUuid($headerLogo)
? \App\Domains\Attachable\Models\Attachment::query()->where('key', $headerLogo)->first()
? Attachment::query()->where('key', $headerLogo)->first()
: $this->attachmentService->store($headerLogo, 'tenants');
if ($attachment) {
@@ -42,7 +48,7 @@ class TenantService
$footerAttachmentId = null;
if ($footerLogo) {
$attachment = Str::isUuid($footerLogo)
? \App\Domains\Attachable\Models\Attachment::query()->where('key', $footerLogo)->first()
? Attachment::query()->where('key', $footerLogo)->first()
: $this->attachmentService->store($footerLogo, 'tenants');
if ($attachment) {
@@ -55,7 +61,7 @@ class TenantService
if ($heroBgImage) {
$attachment = Str::isUuid($heroBgImage)
? \App\Domains\Attachable\Models\Attachment::query()->where('key', $heroBgImage)->first()
? Attachment::query()->where('key', $heroBgImage)->first()
: $this->attachmentService->store($heroBgImage, 'tenants');
if ($attachment) {
@@ -67,6 +73,7 @@ class TenantService
/** @var Tenant $tenant */
$tenant = Tenant::query()->create($data);
$this->syncMainCarouselImages($tenant, $mainCarouselImages);
return $tenant;
});
@@ -75,9 +82,7 @@ class TenantService
/**
* Update an existing tenant and store new logos if uploaded.
*
* @param Tenant $tenant
* @param array<string, mixed> $data
* @return Tenant
*/
public function update(Tenant $tenant, array $data): Tenant
{
@@ -85,11 +90,18 @@ class TenantService
$hasHeaderLogoKey = array_key_exists('header_logo', $data);
$hasFooterLogoKey = array_key_exists('footer_logo', $data);
$hasHeroBgImageKey = array_key_exists('hero_bg_image', $data);
$hasMainCarouselImagesKey = array_key_exists('main_carousel_images', $data);
$headerLogo = $data['header_logo'] ?? null;
$footerLogo = $data['footer_logo'] ?? null;
$heroBgImage = $data['hero_bg_image'] ?? null;
$mainCarouselImages = $data['main_carousel_images'] ?? [];
unset($data['header_logo'], $data['footer_logo'], $data['hero_bg_image']);
unset(
$data['header_logo'],
$data['footer_logo'],
$data['hero_bg_image'],
$data['main_carousel_images']
);
$oldHeroBgId = $tenant->hero_bg_image_id;
@@ -98,7 +110,7 @@ class TenantService
if ($hasHeaderLogoKey) {
if ($headerLogo) {
$attachment = Str::isUuid($headerLogo)
? \App\Domains\Attachable\Models\Attachment::query()->where('key', $headerLogo)->first()
? Attachment::query()->where('key', $headerLogo)->first()
: $this->attachmentService->store($headerLogo, 'tenants');
if ($attachment) {
@@ -114,7 +126,7 @@ class TenantService
if ($hasFooterLogoKey) {
if ($footerLogo) {
$attachment = Str::isUuid($footerLogo)
? \App\Domains\Attachable\Models\Attachment::query()->where('key', $footerLogo)->first()
? Attachment::query()->where('key', $footerLogo)->first()
: $this->attachmentService->store($footerLogo, 'tenants');
if ($attachment) {
@@ -131,7 +143,7 @@ class TenantService
if ($hasHeroBgImageKey) {
if ($heroBgImage) {
$attachment = Str::isUuid($heroBgImage)
? \App\Domains\Attachable\Models\Attachment::query()->where('key', $heroBgImage)->first()
? Attachment::query()->where('key', $heroBgImage)->first()
: $this->attachmentService->store($heroBgImage, 'tenants');
if ($attachment) {
@@ -151,7 +163,48 @@ class TenantService
$tenant->save();
if ($hasMainCarouselImagesKey) {
$this->syncMainCarouselImages($tenant, $mainCarouselImages);
}
return $tenant;
});
}
/**
* @param array<int, mixed> $images
*/
private function syncMainCarouselImages(Tenant $tenant, array $images): void
{
$attachments = [];
foreach (array_values($images) as $order => $image) {
$attachment = $this->resolveMainCarouselImage($image, $order);
$attachments[$attachment->id] = ['orden' => $order];
}
$tenant->mainCarouselImages()->sync($attachments);
}
private function resolveMainCarouselImage(mixed $image, int $order): Attachment
{
if (is_string($image) && Str::isUuid($image)) {
$attachment = Attachment::query()
->where('key', $image)
->where('type', AttachmentType::Image->value)
->first();
if ($attachment === null) {
throw ValidationException::withMessages([
"main_carousel_images.{$order}" => [
'La imagen indicada no existe o no es un attachment de tipo imagen.',
],
]);
}
return $attachment;
}
return $this->attachmentService->store($image, 'tenants/main-carousel');
}
}

View File

@@ -0,0 +1,25 @@
<?php
use App\Domains\Catalog\Enums\GroupLayout;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::table('featured_groups', function (Blueprint $table): void {
$table->enum('group_layout', GroupLayout::values())
->default(GroupLayout::Paginated->value)
->after('product_layout');
});
}
public function down(): void
{
Schema::table('featured_groups', function (Blueprint $table): void {
$table->dropColumn('group_layout');
});
}
};

View File

@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::create('tenant_main_carousel_images', function (Blueprint $table): void {
$table->id();
$table->foreignId('tenant_id')
->constrained('tenants')
->cascadeOnDelete();
$table->foreignId('attachment_id')
->constrained('attachments')
->cascadeOnDelete();
$table->unsignedInteger('orden')->default(0);
$table->timestamps();
$table->unique(['tenant_id', 'attachment_id']);
$table->index(['tenant_id', 'orden']);
});
}
public function down(): void
{
Schema::dropIfExists('tenant_main_carousel_images');
}
};

View File

@@ -0,0 +1,43 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::create('social_media', function (Blueprint $table): void {
$table->id();
$table->string('code')->unique();
$table->string('icon');
$table->string('name');
$table->timestamps();
});
Schema::create('tenant_social_media', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code');
$table->string('social_media_code');
$table->string('url');
$table->timestamps();
$table->foreign('tenant_code')
->references('codigo')
->on('tenants')
->cascadeOnDelete();
$table->foreign('social_media_code')
->references('code')
->on('social_media')
->cascadeOnDelete();
$table->unique(['tenant_code', 'social_media_code']);
});
}
public function down(): void
{
Schema::dropIfExists('tenant_social_media');
Schema::dropIfExists('social_media');
}
};

View File

@@ -3,6 +3,7 @@
namespace Database\Seeders;
use App\Domains\Catalog\Enums\CatalogItemType;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Enums\InventoryPolicy;
use App\Domains\Catalog\Enums\ProductLayout;
use App\Domains\Catalog\Models\CatalogItem;
@@ -167,6 +168,7 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
$featuredGroup = FeaturedGroup::query()->create([
'tenant_code' => $tenant->codigo,
'product_layout' => ProductLayout::Row,
'group_layout' => GroupLayout::Paginated,
'group_name' => $groupName,
'group_order' => $groupOrder++,
]);

View File

@@ -2,6 +2,7 @@
namespace Database\Seeders;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Enums\InventoryPolicy;
use App\Domains\Catalog\Enums\ProductLayout;
use App\Domains\Catalog\Models\Attribute;
@@ -167,11 +168,12 @@ class ProductCatalogFromImagesSeeder extends Seeder
{
FeaturedGroup::query()->where('tenant_code', $tenant->codigo)->delete();
$group = FeaturedGroup::query()->create([
$paginatedGroup = FeaturedGroup::query()->create([
'tenant_code' => $tenant->codigo,
'product_layout' => ProductLayout::ColumnWithImage,
'group_layout' => GroupLayout::Paginated,
'group_name' => 'Productos',
'group_order' => 0,
'group_order' => 2,
]);
$items = CatalogItem::query()
@@ -179,7 +181,7 @@ class ProductCatalogFromImagesSeeder extends Seeder
->orderBy('id')
->get('id');
$group->featuredItems()->createMany(
$paginatedGroup->featuredItems()->createMany(
$items->values()->map(
fn (CatalogItem $item, int $order): array => [
'catalog_item_id' => $item->id,
@@ -187,6 +189,29 @@ class ProductCatalogFromImagesSeeder extends Seeder
]
)->all()
);
$carouselGroup = FeaturedGroup::query()->create([
'tenant_code' => $tenant->codigo,
'product_layout' => ProductLayout::ColumnWithImage,
'group_layout' => GroupLayout::Carousel,
'group_name' => 'Productos destacados',
'group_order' => 1,
]);
$randomItems = CatalogItem::query()
->where('tenant_code', $tenant->codigo)
->inRandomOrder()
->limit(5)
->get('id');
$carouselGroup->featuredItems()->createMany(
$randomItems->values()->map(
fn (CatalogItem $item, int $order): array => [
'catalog_item_id' => $item->id,
'order' => $order,
]
)->all()
);
}
/**

View File

@@ -2,6 +2,7 @@
namespace Database\Seeders;
use App\Domains\Attachable\Services\AttachmentService;
use App\Domains\Tenant\Models\Tenant;
use App\Domains\Tenant\Services\TenantService;
use Illuminate\Database\Seeder;
@@ -9,9 +10,16 @@ use Illuminate\Http\UploadedFile;
class TenantSeeder extends Seeder
{
public function __construct(protected TenantService $tenantService)
{
}
private const SONDER_MAIN_CAROUSEL_IMAGES = [
'01-urban-team.png',
'02-running-shoes.png',
'03-streetwear.png',
'04-football-training.png',
'05-activewear-essentials.png',
'06-city-runners.png',
];
public function __construct(protected TenantService $tenantService) {}
/**
* Run the database seeds.
@@ -21,7 +29,7 @@ class TenantSeeder extends Seeder
// Check if tenant 'sonder' already exists and delete it to prevent duplicates
$existing = Tenant::query()->where('codigo', 'sonder')->first();
if ($existing) {
$attachmentService = app(\App\Domains\Attachable\Services\AttachmentService::class);
$attachmentService = app(AttachmentService::class);
if ($existing->headerLogo) {
try {
$attachmentService->delete($existing->headerLogo);
@@ -36,6 +44,13 @@ class TenantSeeder extends Seeder
// Ignore exception on cleanup
}
}
foreach ($existing->mainCarouselImages as $mainCarouselImage) {
try {
$attachmentService->delete($mainCarouselImage);
} catch (\Throwable $e) {
// Ignore exception on cleanup
}
}
$existing->delete();
}
@@ -72,7 +87,24 @@ class TenantSeeder extends Seeder
true
);
$tenant = $this->tenantService->create([
$mainCarouselImages = [];
foreach (self::SONDER_MAIN_CAROUSEL_IMAGES as $filename) {
$imagePath = public_path("images/sonder-main-carousel/{$filename}");
if (! file_exists($imagePath)) {
throw new \RuntimeException("Image not found at path: {$imagePath}");
}
$mainCarouselImages[] = new UploadedFile(
$imagePath,
$filename,
'image/png',
null,
true
);
}
$this->tenantService->create([
'codigo' => 'sonder',
'nombre' => 'Sonder',
'dominio' => 'localhost',
@@ -84,26 +116,30 @@ class TenantSeeder extends Seeder
'footer_bg_color' => '#313131',
'header_logo' => $headerLogo,
'footer_logo' => $footerLogo,
'main_carousel_images' => $mainCarouselImages,
]);
// Check if tenant 'fiesta_futbol_infantil' already exists
$existingFiesta = Tenant::query()->where('codigo', 'fiesta_futbol_infantil')->first();
if ($existingFiesta) {
$attachmentService = app(\App\Domains\Attachable\Services\AttachmentService::class);
$attachmentService = app(AttachmentService::class);
if ($existingFiesta->headerLogo) {
try {
$attachmentService->delete($existingFiesta->headerLogo);
} catch (\Throwable $e) {}
} catch (\Throwable $e) {
}
}
if ($existingFiesta->footerLogo && $existingFiesta->footer_logo_id !== $existingFiesta->header_logo_id) {
try {
$attachmentService->delete($existingFiesta->footerLogo);
} catch (\Throwable $e) {}
} catch (\Throwable $e) {
}
}
if ($existingFiesta->heroBgImage) {
try {
$attachmentService->delete($existingFiesta->heroBgImage);
} catch (\Throwable $e) {}
} catch (\Throwable $e) {
}
}
$existingFiesta->delete();
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

View File

@@ -4,6 +4,7 @@ namespace Tests\Feature\Catalog;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Enums\ProductLayout;
use App\Domains\Catalog\Models\CatalogItem;
use App\Domains\Catalog\Models\FeaturedGroup;
@@ -21,7 +22,13 @@ class CatalogControllerTest extends TestCase
{
$tenant = $this->createTenant('catalog-index');
$row = $this->createGroup($tenant, ProductLayout::Row, 'Row', 2);
$cart = $this->createGroup($tenant, ProductLayout::ColumnWithCart, 'Cart', 1);
$cart = $this->createGroup(
$tenant,
ProductLayout::ColumnWithCart,
'Cart',
1,
GroupLayout::SimpleVertical,
);
$directInventory = Inventory::query()->create([
'real_stock' => 10,
@@ -50,14 +57,14 @@ class CatalogControllerTest extends TestCase
->assertJsonCount(2)
->assertJsonPath('0.title', 'Cart')
->assertJsonPath('0.layout', ProductLayout::ColumnWithCart->value)
->assertJsonPath('0.items.meta.current_page', 1)
->assertJsonPath('0.items.data.0.nombre', 'Variants')
->assertJsonPath('0.items.data.0.descripcion', 'Variants description')
->assertJsonPath('0.items.data.0.precio', '100.00')
->assertJsonPath('0.items.data.0.stock_tecnico', 7)
->assertJsonCount(2, '0.items.data.0.variants')
->assertJsonPath('0.items.data.0.variants.0.stock_tecnico', 4)
->assertJsonPath('0.items.data.0.variants.1.stock_tecnico', 3)
->assertJsonPath('0.group_layout', GroupLayout::SimpleVertical->value)
->assertJsonPath('0.items.0.nombre', 'Variants')
->assertJsonPath('0.items.0.descripcion', 'Variants description')
->assertJsonPath('0.items.0.precio', '100.00')
->assertJsonPath('0.items.0.stock_tecnico', 7)
->assertJsonCount(2, '0.items.0.variants')
->assertJsonPath('0.items.0.variants.0.stock_tecnico', 4)
->assertJsonPath('0.items.0.variants.1.stock_tecnico', 3)
->assertJsonPath('1.title', 'Row')
->assertJsonPath('1.items.data.0.stock_tecnico', 8)
->assertJsonCount(0, '1.items.data.0.variants');
@@ -137,15 +144,71 @@ class CatalogControllerTest extends TestCase
->assertJsonPath('data.0.nombre', 'Item 13');
}
public function test_non_paginated_group_layouts_return_all_items_as_a_plain_array(): void
{
$tenant = $this->createTenant('catalog-simple-layouts');
$layouts = [
GroupLayout::Simple,
GroupLayout::SimpleVertical,
GroupLayout::Carousel,
];
foreach ($layouts as $order => $groupLayout) {
$group = $this->createGroup(
$tenant,
ProductLayout::Row,
$groupLayout->value,
$order,
$groupLayout,
);
foreach (range(1, 13) as $number) {
$item = $this->createItem($tenant, "{$groupLayout->value} Item {$number}");
$group->featuredItems()->create([
'catalog_item_id' => $item->id,
'order' => $number,
]);
}
}
$response = $this->getJson("/api/tenants/{$tenant->codigo}/catalog")->assertOk();
$groups = $response->json();
foreach ($layouts as $index => $groupLayout) {
$this->assertSame($groupLayout->value, $groups[$index]['group_layout']);
$this->assertCount(13, $groups[$index]['items']);
$this->assertSame(
"{$groupLayout->value} Item 1",
$groups[$index]['items'][0]['nombre'],
);
$this->assertArrayNotHasKey('data', $groups[$index]['items']);
$this->assertArrayNotHasKey('meta', $groups[$index]['items']);
}
$carouselGroup = FeaturedGroup::query()
->where('tenant_code', $tenant->codigo)
->where('group_layout', GroupLayout::Carousel)
->sole();
$this->getJson(
"/api/tenants/{$tenant->codigo}/catalog/featured-groups/{$carouselGroup->id}/items?page=2"
)
->assertOk()
->assertJsonCount(13)
->assertJsonPath('0.nombre', 'carousel Item 1');
}
private function createGroup(
Tenant $tenant,
ProductLayout $layout,
string $name,
int $order = 0,
GroupLayout $groupLayout = GroupLayout::Paginated,
): FeaturedGroup {
return FeaturedGroup::query()->create([
'tenant_code' => $tenant->codigo,
'product_layout' => $layout,
'group_layout' => $groupLayout,
'group_name' => $name,
'group_order' => $order,
]);

View File

@@ -78,6 +78,7 @@ class CatalogSchemaTest extends TestCase
'id',
'tenant_code',
'product_layout',
'group_layout',
'group_name',
'group_order',
], Schema::getColumnListing('featured_groups'));

View File

@@ -5,6 +5,7 @@ namespace Tests\Feature\Seeders;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Catalog\Enums\CatalogItemType;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Models\Attribute;
use App\Domains\Catalog\Models\CatalogItem;
use App\Domains\Catalog\Models\FeaturedGroup;
@@ -133,6 +134,10 @@ class FiestaFutbolInfantilProductSeederTest extends TestCase
->with('featuredItems.catalogItem')
->orderBy('group_order')
->get()
->each(fn (FeaturedGroup $group) => $this->assertSame(
GroupLayout::Paginated,
$group->group_layout,
))
->mapWithKeys(fn (FeaturedGroup $group): array => [
$group->group_name => $group->featuredItems->pluck('catalogItem.slug')->all(),
])

View File

@@ -4,6 +4,7 @@ namespace Tests\Feature\Seeders;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Enums\ProductLayout;
use App\Domains\Catalog\Models\CatalogItem;
use App\Domains\Catalog\Models\FeaturedGroup;
@@ -20,7 +21,7 @@ class ProductCatalogFromImagesSeederTest extends TestCase
{
use RefreshDatabase;
public function test_it_features_every_sonder_product_in_a_single_image_column(): void
public function test_it_creates_paginated_and_random_carousel_groups_for_sonder(): void
{
Storage::fake('s3');
@@ -51,18 +52,44 @@ class ProductCatalogFromImagesSeederTest extends TestCase
ProductCatalogFromImagesSeeder::class,
]);
$group = FeaturedGroup::query()
$groups = FeaturedGroup::query()
->where('tenant_code', $tenant->codigo)
->with('featuredItems.catalogItem')
->sole();
->orderBy('group_order')
->get()
->keyBy('group_name');
$this->assertSame('Productos', $group->group_name);
$this->assertSame(ProductLayout::ColumnWithImage, $group->product_layout);
$this->assertSame(0, $group->group_order);
$paginatedGroup = $groups->get('Productos');
$carouselGroup = $groups->get('Productos destacados');
$catalogItemIds = CatalogItem::query()
->where('tenant_code', $tenant->codigo)
->orderBy('id')
->pluck('id');
$this->assertNotNull($paginatedGroup);
$this->assertSame(ProductLayout::ColumnWithImage, $paginatedGroup->product_layout);
$this->assertSame(GroupLayout::Paginated, $paginatedGroup->group_layout);
$this->assertSame(0, $paginatedGroup->group_order);
$this->assertSame(
CatalogItem::query()->where('tenant_code', $tenant->codigo)->orderBy('id')->pluck('slug')->all(),
$group->featuredItems->pluck('catalogItem.slug')->all(),
$paginatedGroup->featuredItems->pluck('catalogItem.slug')->all(),
);
$this->assertCount(10, $paginatedGroup->featuredItems);
$this->assertNotNull($carouselGroup);
$this->assertSame(ProductLayout::ColumnWithImage, $carouselGroup->product_layout);
$this->assertSame(GroupLayout::Carousel, $carouselGroup->group_layout);
$this->assertSame(1, $carouselGroup->group_order);
$this->assertCount(5, $carouselGroup->featuredItems);
$this->assertCount(
5,
$carouselGroup->featuredItems->pluck('catalog_item_id')->unique(),
);
$this->assertCount(
0,
$carouselGroup->featuredItems
->pluck('catalog_item_id')
->diff($catalogItemIds),
);
$this->assertCount(10, $group->featuredItems);
}
}

View File

@@ -0,0 +1,38 @@
<?php
namespace Tests\Feature\Seeders;
use App\Domains\Tenant\Models\Tenant;
use Database\Seeders\TenantSeeder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Storage;
use Tests\TestCase;
class TenantSeederTest extends TestCase
{
use RefreshDatabase;
public function test_it_loads_the_sonder_main_carousel_images_in_order(): void
{
Storage::fake('s3');
$this->seed(TenantSeeder::class);
$tenant = Tenant::query()->where('codigo', 'sonder')->firstOrFail();
$images = $tenant->mainCarouselImages()->get();
$this->assertSame([
'01-urban-team.png',
'02-running-shoes.png',
'03-streetwear.png',
'04-football-training.png',
'05-activewear-essentials.png',
'06-city-runners.png',
], $images->pluck('filename')->all());
$this->assertSame([0, 1, 2, 3, 4, 5], $images->pluck('pivot.orden')->all());
foreach ($images as $image) {
Storage::disk('s3')->assertExists($image->path);
}
}
}

View File

@@ -0,0 +1,191 @@
<?php
namespace Tests\Feature\Tenant;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Tenant\Models\Tenant;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Tests\TestCase;
class TenantMainCarouselImagesTest extends TestCase
{
use RefreshDatabase;
public function test_a_tenant_has_ordered_main_carousel_images(): void
{
$tenant = $this->createTenant();
$firstAttachment = $this->createAttachment('first.png');
$secondAttachment = $this->createAttachment('second.png');
$tenant->mainCarouselImages()->attach([
$secondAttachment->id => ['orden' => 2],
$firstAttachment->id => ['orden' => 1],
]);
$attachments = $tenant->mainCarouselImages()->get();
$this->assertCount(2, $attachments);
$this->assertTrue($attachments[0]->is($firstAttachment));
$this->assertTrue($attachments[1]->is($secondAttachment));
$this->assertSame([1, 2], $attachments->pluck('pivot.orden')->all());
}
public function test_bootstrap_returns_all_main_carousel_image_urls_in_order(): void
{
$tenant = $this->createTenant();
$firstAttachment = $this->createAttachment('first.png');
$secondAttachment = $this->createAttachment('second.png');
$tenant->mainCarouselImages()->attach([
$secondAttachment->id => ['orden' => 20],
$firstAttachment->id => ['orden' => 10],
]);
$response = $this->getJson('/api/tenants/bootstrap/acme.com');
$response
->assertOk()
->assertJsonCount(2, 'data.main_carousel_images');
$urls = $response->json('data.main_carousel_images');
$this->assertStringContainsString($firstAttachment->key, $urls[0]);
$this->assertStringContainsString($secondAttachment->key, $urls[1]);
}
public function test_show_returns_an_empty_main_carousel_images_array_when_the_tenant_has_no_images(): void
{
$tenant = $this->createTenant();
$this->getJson("/api/tenants/{$tenant->codigo}")
->assertOk()
->assertJsonPath('data.main_carousel_images', []);
}
public function test_store_uploads_and_attaches_main_carousel_images_in_request_order(): void
{
Storage::fake('s3');
$headerLogo = $this->createAttachment('header.png');
$footerLogo = $this->createAttachment('footer.png');
$response = $this
->withHeader('Accept', 'application/json')
->post('/api/tenants', [
...$this->tenantPayload(),
'header_logo' => $headerLogo->key,
'footer_logo' => $footerLogo->key,
'main_carousel_images' => [
UploadedFile::fake()->image('first-carousel.png', 1200, 300),
UploadedFile::fake()->image('second-carousel.png', 1200, 300),
],
]);
$response
->assertCreated()
->assertJsonCount(2, 'data.main_carousel_images');
$tenant = Tenant::query()->where('codigo', 'new-acme')->firstOrFail();
$images = $tenant->mainCarouselImages()->get();
$this->assertSame(
['first-carousel.png', 'second-carousel.png'],
$images->pluck('filename')->all()
);
$this->assertSame([0, 1], $images->pluck('pivot.orden')->all());
Storage::disk('s3')->assertExists($images[0]->path);
Storage::disk('s3')->assertExists($images[1]->path);
}
public function test_update_replaces_and_can_clear_main_carousel_images(): void
{
$tenant = $this->createTenant();
$oldImage = $this->createAttachment('old.png');
$firstImage = $this->createAttachment('first.png');
$secondImage = $this->createAttachment('second.png');
$tenant->mainCarouselImages()->attach($oldImage->id, ['orden' => 0]);
$this->putJson("/api/tenants/{$tenant->codigo}", [
'main_carousel_images' => [$secondImage->key, $firstImage->key],
])
->assertOk()
->assertJsonCount(2, 'data.main_carousel_images');
$this->assertSame(
[$secondImage->id, $firstImage->id],
$tenant->mainCarouselImages()->pluck('attachments.id')->all()
);
$this->assertDatabaseMissing('tenant_main_carousel_images', [
'tenant_id' => $tenant->id,
'attachment_id' => $oldImage->id,
]);
$this->putJson("/api/tenants/{$tenant->codigo}", [
'main_carousel_images' => [],
])
->assertOk()
->assertJsonPath('data.main_carousel_images', []);
$this->assertDatabaseMissing('tenant_main_carousel_images', [
'tenant_id' => $tenant->id,
]);
}
/**
* @return array<string, string>
*/
private function tenantPayload(): array
{
return [
'codigo' => 'new-acme',
'nombre' => 'New Acme',
'dominio' => 'new-acme.com',
'primary_color' => '#111111',
'secondary_color' => '#222222',
'danger_color' => '#333333',
'success_color' => '#444444',
'header_bg_color' => '#ffffff',
'footer_bg_color' => '#ffffff',
];
}
private function createTenant(): Tenant
{
$headerLogo = $this->createAttachment('header.png');
$footerLogo = $this->createAttachment('footer.png');
return Tenant::query()->create([
'codigo' => 'acme',
'nombre' => 'Acme',
'dominio' => 'acme.com',
'primary_color' => '#111111',
'secondary_color' => '#222222',
'danger_color' => '#333333',
'success_color' => '#444444',
'header_bg_color' => '#ffffff',
'footer_bg_color' => '#ffffff',
'header_logo_id' => $headerLogo->id,
'footer_logo_id' => $footerLogo->id,
]);
}
private function createAttachment(string $filename): Attachment
{
$key = (string) Str::uuid();
return Attachment::query()->create([
'key' => $key,
'path' => "tenants/main-carousel/{$key}.png",
'filename' => $filename,
'type' => AttachmentType::Image,
'mime_type' => 'image/png',
'extension' => 'png',
'size' => 100,
]);
}
}

View File

@@ -0,0 +1,108 @@
<?php
namespace Tests\Feature\Tenant;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Tenant\Models\SocialMedia;
use App\Domains\Tenant\Models\Tenant;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Schema;
use Tests\TestCase;
class TenantSocialMediaTest extends TestCase
{
use RefreshDatabase;
public function test_social_media_tables_have_the_expected_columns(): void
{
$this->assertEqualsCanonicalizing([
'id',
'code',
'icon',
'name',
'created_at',
'updated_at',
], Schema::getColumnListing('social_media'));
$this->assertEqualsCanonicalizing([
'id',
'tenant_code',
'social_media_code',
'url',
'created_at',
'updated_at',
], Schema::getColumnListing('tenant_social_media'));
}
public function test_a_tenant_can_have_social_media_with_its_own_url(): void
{
$tenant = $this->createTenant();
$instagram = SocialMedia::query()->create([
'code' => 'instagram',
'icon' => 'instagram',
'name' => 'Instagram',
]);
$tenant->socialMedia()->attach($instagram->code, [
'url' => 'https://instagram.com/acme',
]);
$this->assertTrue($tenant->socialMedia()->firstOrFail()->is($instagram));
$this->assertSame(
'https://instagram.com/acme',
$tenant->socialMedia()->firstOrFail()->pivot->url
);
$this->assertTrue($instagram->tenants()->firstOrFail()->is($tenant));
}
public function test_deleting_a_social_media_deletes_its_tenant_associations(): void
{
$tenant = $this->createTenant();
$instagram = SocialMedia::query()->create([
'code' => 'instagram',
'icon' => 'instagram',
'name' => 'Instagram',
]);
$tenant->socialMedia()->attach($instagram->code, [
'url' => 'https://instagram.com/acme',
]);
$instagram->delete();
$this->assertDatabaseMissing('tenant_social_media', [
'tenant_code' => $tenant->codigo,
'social_media_code' => $instagram->code,
]);
}
private function createTenant(): Tenant
{
$headerLogo = $this->createAttachment('header.png');
$footerLogo = $this->createAttachment('footer.png');
return Tenant::query()->create([
'codigo' => 'acme',
'nombre' => 'Acme',
'dominio' => 'acme.com',
'primary_color' => '#111111',
'secondary_color' => '#222222',
'danger_color' => '#333333',
'success_color' => '#444444',
'header_bg_color' => '#ffffff',
'footer_bg_color' => '#ffffff',
'header_logo_id' => $headerLogo->id,
'footer_logo_id' => $footerLogo->id,
]);
}
private function createAttachment(string $filename): Attachment
{
return Attachment::query()->create([
'path' => "test/{$filename}",
'filename' => $filename,
'type' => AttachmentType::Image,
'mime_type' => 'image/png',
]);
}
}

View File

@@ -4,6 +4,7 @@ namespace Tests\Unit\Catalog;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Catalog\Enums\CatalogItemType;
use App\Domains\Catalog\Enums\GroupLayout;
use App\Domains\Catalog\Enums\InventoryPolicy;
use App\Domains\Catalog\Enums\ProductLayout;
use App\Domains\Catalog\Models\Attribute;
@@ -25,6 +26,16 @@ use Tests\TestCase;
class CatalogModelsTest extends TestCase
{
public function test_group_layout_has_all_supported_values(): void
{
$this->assertSame([
'paginated',
'simple',
'simple_vertical',
'carousel',
], GroupLayout::values());
}
public function test_attribute_maps_its_values_and_relations(): void
{
$attribute = new Attribute;
@@ -83,6 +94,7 @@ class CatalogModelsTest extends TestCase
$group = new FeaturedGroup;
$group->setRawAttributes([
'product_layout' => ProductLayout::ColumnWithImage->value,
'group_layout' => GroupLayout::SimpleVertical->value,
'group_order' => '2',
]);
$featuredItem = new FeaturedItem;
@@ -95,6 +107,7 @@ class CatalogModelsTest extends TestCase
$this->assertSame('featured_groups', $group->getTable());
$this->assertFalse($group->usesTimestamps());
$this->assertSame(ProductLayout::ColumnWithImage, $group->product_layout);
$this->assertSame(GroupLayout::SimpleVertical, $group->group_layout);
$this->assertSame(2, $group->group_order);
$this->assertInstanceOf(Tenant::class, $group->tenant()->getRelated());
$this->assertInstanceOf(FeaturedItem::class, $group->featuredItems()->getRelated());