Merge pull request #17 from mostafaznv/dev

Dev
mostafaznv · Jun 13, 2023 · 73581d4 · 73581d4
2 parents 540dedd + 6eb3009
commit 73581d4
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -315,7 +315,7 @@ php artisan laracache:update -m Article -e latest -e featured
 php artisan laracache:update -m Article -m Product
 
 # defines model with full namespace
-php artisan laracache:update -m Domain\Article\Models\Article
+php artisan laracache:update -m "Domain\Article\Models\Article"
 ```
 
 ### Delete Cache
@@ -330,7 +330,7 @@ php artisan laracache:delete -m Article -e latest -e featured
 php artisan laracache:delete -m Article -m Product
 
 # defines model with full namespace
-php artisan laracache:delete -m Domain\Article\Models\Article
+php artisan laracache:delete -m "Domain\Article\Models\Article"
 ```
 
 > **Note**: If you don't specify any entity, all entities will be operated.

diff --git a/src/DTOs/CacheEvent.php b/src/DTOs/CacheEvent.php
@@ -5,6 +5,7 @@
 use Mostafaznv\LaraCache\Utils\CacheEnum;
 
 /**
+ * @method static self RETRIEVED()
  * @method static self CREATED()
  * @method static self UPDATED()
  * @method static self DELETED()

diff --git a/src/Traits/InteractsWithCache.php b/src/Traits/InteractsWithCache.php
@@ -9,6 +9,7 @@
 use Mostafaznv\LaraCache\DTOs\CacheEvent;
 use Mostafaznv\LaraCache\DTOs\CacheStatus;
 use Mostafaznv\LaraCache\Exceptions\CacheEntityDoesNotExist;
+use Mostafaznv\LaraCache\Jobs\RefreshCache;
 use Mostafaznv\LaraCache\Jobs\UpdateLaraCacheModelsList;
 
 trait InteractsWithCache
@@ -162,6 +163,13 @@ private function retrieve(string $name): CacheData
         $cache = CacheData::fromCache($entity, $this->prefix);
 
         if ($cache->status->equals(CacheStatus::NOT_CREATED())) {
+            if ($entity->isQueueable) {
+                $this->initCache($entity, $entity->getTtl());
+                RefreshCache::dispatch($this->model, $entity->name, CacheEvent::RETRIEVED());
+
+                return CacheData::fromCache($entity, $this->prefix, $entity->ttl);
+            }
+
             return $this->updateCacheEntity($name, null, $entity);
         }
 

diff --git a/tests/Feature/QueueCacheTest.php b/tests/Feature/QueueCacheTest.php
@@ -8,6 +8,7 @@
 use Mostafaznv\LaraCache\Jobs\UpdateLaraCacheModelsList;
 use Mostafaznv\LaraCache\Tests\TestSupport\TestModels\QueueTestModel;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\DB;
 
 beforeEach(function() {
     Bus::fake([
@@ -61,6 +62,53 @@
         ->and($isCreated)->toBeTrue();
 });
 
+it('will return default value and dispatch cache creation job on retrieving entity [without-model]', function() {
+    Queue::fake();
+    DB::table('test_models')
+        ->insert([
+            'name'       => 'queue-test-name',
+            'content'    => 'content',
+            'created_at' => now()
+        ]);
+
+    $cache = QueueTestModel::cache()->get('latest', true);
+    $isCreating = $cache->status->equals(CacheStatus::CREATING());
+
+    expect($isCreating)->toBeTrue()
+        ->and($cache->value)->toBe(-1);
+
+    expect(Queue::assertPushed(RefreshCache::class));
+});
+
+it('will create cache in background on retrieving entity [without-model]', function() {
+    $name = 'queue-test-name';
+    $before = now();
+
+    DB::table('test_models')
+        ->insert([
+            'name'       => $name,
+            'content'    => 'content',
+            'created_at' => now()
+        ]);
+
+    $cache = QueueTestModel::cache()->get('latest', true);
+    $isCreating = $cache->status->equals(CacheStatus::CREATING());
+
+    expect($isCreating)->toBeTrue()
+        ->and($cache->value)->toBe(-1);
+
+    Artisan::call('queue:work --once');
+
+    $cache = QueueTestModel::cache()->get('latest', true);
+    $isCreated = $cache->status->equals(CacheStatus::CREATED());
+    $after = now();
+
+    expect($before->diffInSeconds($after) >= 1)->toBeTrue()
+        ->and($cache->value)->toBeInstanceOf(QueueTestModel::class)
+        ->and($cache->value->name)->toBe($name)
+        ->and($isCreated)->toBeTrue();
+});
+
 it('will change cache status to creating on model update [without-model]', function() {
     $model = createQueueModel();