Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,6 @@ WEBHOOK_TIMEOUT=10
WEBHOOK_INFO=false

FLAG_VALIDATE_ADDRESS_FULLNAME=true

MEDIA_CACHE_CORE_ID=core_id
MEDIA_CACHE_TTL=86400
36 changes: 36 additions & 0 deletions app/Console/Commands/MediaCache.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

namespace App\Console\Commands;

use App\Models\Media;
use App\Services\Contracts\MediaServiceContract;
use Illuminate\Console\Command;

class MediaCache extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'media:cache';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Command description';

/**
* Execute the console command.
*/
public function handle(MediaServiceContract $mediaService): void
{
$query = Media::query();

foreach ($query->cursor() as $media) {
$mediaService->addMediaToCache($media);
}
}
}
3 changes: 3 additions & 0 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Console;

use App\Console\Commands\MediaCache;
use App\Jobs\CheckActiveSales;
use App\Jobs\GoogleCategoryJob;
use App\Jobs\StopShippingUnlimitedStockDateJob;
Expand Down Expand Up @@ -33,5 +34,7 @@ protected function schedule(Schedule $schedule): void
$schedule->job(new GoogleCategoryJob())
->weekly()
->sentryMonitor('google-category');

$schedule->command(MediaCache::class)->dailyAt('01:00');
}
}
24 changes: 24 additions & 0 deletions app/Http/Resources/MediaCacheResource.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace App\Http\Resources;

use App\Models\Media;
use Illuminate\Http\Request;

/**
* @property Media $resource
*/
class MediaCacheResource extends Resource
{
public function base(Request $request): array
{
return [
'id' => $this->resource->getKey(),
'type' => $this->resource->type->value,
'source' => $this->resource->source->value,
'url' => $this->resource->url,
'slug' => $this->resource->slug,
'alt' => $this->resource->alt,
];
}
}
2 changes: 2 additions & 0 deletions app/Services/Contracts/MediaServiceContract.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ public function store(MediaDto $dto, bool $private = false): Media;
public function update(Media $media, MediaDto $dto): Media;

public function destroy(Media $media): void;

public function addMediaToCache(Media $media): void;
}
24 changes: 24 additions & 0 deletions app/Services/MediaService.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use App\Dtos\MediaDto;
use App\Enums\MediaSource;
use App\Enums\MediaType;
use App\Http\Resources\MediaCacheResource;
use App\Models\Media;
use App\Models\Product;
use App\Services\Contracts\MediaServiceContract;
Expand All @@ -13,6 +14,8 @@
use App\Services\Contracts\SilverboxServiceContract;
use Heseya\Dto\Missing;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Redis;

final readonly class MediaService implements MediaServiceContract
{
Expand Down Expand Up @@ -49,6 +52,7 @@ public function syncRewards(Product $product, array $media): void
public function destroy(Media $media): void
{
$this->silverboxService->delete($media->url);
$this->removeMediaFromCache($media);
$media->forceDelete();
}

Expand Down Expand Up @@ -89,6 +93,8 @@ public function store(MediaDto $dto, bool $private = false): Media
$this->metadataService->sync($media, $dto->getMetadata());
}

$this->addMediaToCache($media);

return $media;
}

Expand All @@ -108,6 +114,8 @@ public function update(Media $media, MediaDto $dto): Media

$media->save();

$this->addMediaToCache($media);

return $media;
}

Expand All @@ -120,4 +128,20 @@ private function getMediaType(string $extension): MediaType
default => MediaType::OTHER,
};
}

public function addMediaToCache(Media $media): void
{
$redis = Redis::connection('noprefix');
$key = 'm_' . Config::get('cache.media_cache_core_id') . '_' . $media->getKey();

$redis->del($key);
$redis->hmset($key, ['d' => json_encode(MediaCacheResource::make($media)->resolve())]);
$redis->expire($key, Config::get('cache.media_cache_ttl'));
}

public function removeMediaFromCache(Media $media): void
{
$key = 'm_' . Config::get('cache.media_cache_core_id') . '_' . $media->getKey();
Redis::connection('noprefix')->del($key);
}
}
3 changes: 3 additions & 0 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,7 @@
*/

'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'heseya_store'), '_') . '_cache'),

'media_cache_core_id' => env('MEDIA_CACHE_CORE_ID', 'core_id'),
'media_cache_ttl' => env('MEDIA_CACHE_TTL', 3600),
];
11 changes: 11 additions & 0 deletions config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,16 @@
'scheme' => env('REDIS_CACHE_SCHEME', 'tcp'),
'path' => env('REDIS_CACHE_PATH', ''),
],

'noprefix' => [
'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => env('REDIS_DB', 0),
'scheme' => env('REDIS_SCHEME', 'tcp'),
'path' => env('REDIS_PATH', ''),
'prefix' => '',
]
],
];