Fixed bug that the model cache cannot created when using find many …

…to get non-exists models. (#5642)
hyperf · Apr 14, 2023 · 37ef3ea · 37ef3ea
1 parent d663d7b
commit 37ef3ea
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
@@ -1,5 +1,9 @@
 # v3.0.17 - TBD
 
+## Fixed
+
+- [#5642](https://github.com/hyperf/hyperf/pull/5642) Fixed bug that the model cache cannot created when using `find many` to get non-exists models.
+
 ## Added
 
 - [#5634](https://github.com/hyperf/hyperf/pull/5634) Added `Hyperf\Stringable\str()` helper function.

diff --git a/src/model-cache/src/Manager.php b/src/model-cache/src/Manager.php
@@ -130,13 +130,18 @@ public function findManyFromCache(array $ids, string $class): Collection
             // Get ids that not exist in cache handler.
             $targetIds = array_diff($ids, $fetchIds);
             if ($targetIds) {
+                /** @var Collection<int, Model> $models */
                 $models = $instance->newQuery()->whereIn($primaryKey, $targetIds)->get();
+                $dictionary = $models->getDictionary();
                 $ttl = $this->getCacheTTL($instance, $handler);
-                /** @var Model $model */
-                foreach ($models as $model) {
-                    $id = $model->getKey();
+                $emptyTtl = $handler->getConfig()->getEmptyModelTtl();
+                foreach ($targetIds as $id) {
                     $key = $this->getCacheKey($id, $instance, $handler->getConfig());
-                    $handler->set($key, $this->formatModel($model), $ttl);
+                    if ($model = $dictionary[$id] ?? null) {
+                        $handler->set($key, $this->formatModel($model), $ttl);
+                    } else {
+                        $handler->set($key, [], $emptyTtl);
+                    }
                 }
 
                 $items = array_merge($items, $this->formatModels($models));

diff --git a/src/model-cache/tests/ModelCacheTest.php b/src/model-cache/tests/ModelCacheTest.php
@@ -167,6 +167,22 @@ public function testFindNullBeforeCreate()
         UserModel::query(true)->where('id', $id)->delete();
     }
 
+    public function testFindManyNullBeforeCreate()
+    {
+        $container = ContainerStub::mockContainer();
+
+        $id = 207;
+
+        $models = UserModel::findManyFromCache([$id]);
+        /** @var Redis $redis */
+        $redis = $container->make(RedisProxy::class, ['pool' => 'default']);
+        $this->assertEquals(1, $redis->exists('{mc:default:m:user}:id:' . $id));
+        $this->assertSame(0, $models->count());
+
+        $this->assertEquals(1, $redis->del('{mc:default:m:user}:id:' . $id));
+        UserModel::query(true)->where('id', $id)->delete();
+    }
+
     public function testIncrNotExist()
     {
         $container = ContainerStub::mockContainer();