Query remove extra find query

composer.json

@@ -18,7 +18,7 @@
         "php": ">=8.0",
         "ext-pdo": "*",
         "ext-curl": "*",
-        "utopia-php/database": "0.28.*"
+        "utopia-php/database": "dev-increment as 0.28.99"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.4",

docker-compose.yml

@@ -18,6 +18,10 @@ services:
       - abuse
     depends_on:
       - mysql
+    volumes:
+      - ./phpunit.xml:/code/phpunit.xml
+      - ./src:/code/src
+      - ./tests:/code/tests
 
 networks:
   abuse:

src/Abuse/Adapters/TimeLimit.php

@@ -39,9 +39,9 @@ class TimeLimit implements Adapter
     protected int $limit = 0;
 
     /**
-     * @var int|null
+     * @var Document|null
      */
-    protected ?int $count = null;
+    protected ?Document $document = null;
 
     /**
      * @var array
@@ -64,7 +64,6 @@ public function __construct(string $key, int $limit, int $seconds, Database $db)
     }
 
     /**
-     * @throws Limit
      * @throws Duplicate
      * @throws Exception|\Exception
      */
@@ -183,26 +182,16 @@ protected function count(string $key, string $datetime): int
             return 0;
         }
 
-        if (!\is_null($this->count)) { // Get fetched result
-            return $this->count;
+        if (!\is_null($this->document)) { // Get fetched result
+            return $this->document['count'];
         }
 
-        $result = Authorization::skip(function () use ($key, $datetime) {
-            return $this->db->find(TimeLimit::COLLECTION, [
-                Query::equal('key', [$key]),
-                Query::equal('time', [$datetime]),
-            ]);
-        });
-
-        if (\count($result) === 1) {
-            $result = $result[0]->getAttribute('count', 0);
-        } else {
-            $result = 0;
+        $this->document = $this->getDocument($key, $datetime);
+        if (\is_null($this->document)) {
+            return 0;
         }
 
-        $this->count = (int)$result;
-
-        return $this->count;
+        return $this->document->getAttribute('count', 0);
     }
 
     /**
@@ -214,32 +203,26 @@ protected function count(string $key, string $datetime): int
      */
     protected function hit(string $key, string $datetime): void
     {
-        if (0 == $this->limit) { // No limit no point for counting
-            return;
-        }
-
-        Authorization::skip(function () use ($datetime, $key) {
-            $data = $this->db->findOne(TimeLimit::COLLECTION, [
-                Query::equal('key', [$key]),
-                Query::equal('time', [$datetime]),
-            ]);
+        $data = $this->getDocument($key, $datetime);
 
-            if ($data === false) {
-                $data = [
+        Authorization::skip(function () use ($datetime, $key, $data) {
+            if (empty($data)) {
+                $document = new Document([
                     '$permissions' => [],
                     'key' => $key,
                     'time' => $datetime,
                     'count' => 1,
                     '$collection' => TimeLimit::COLLECTION,
-                ];
-                $this->db->createDocument(TimeLimit::COLLECTION, new Document($data));
+                ]);
+
+                $this->db->createDocument(TimeLimit::COLLECTION, $document);
+                $this->document = $document;
+
             } else {
-                $data->setAttribute('count', $data->getAttribute('count', 0) + 1);
-                $this->db->updateDocument(TimeLimit::COLLECTION, $data->getId(), $data);
+                $this->db->increaseDocumentAttribute(TimeLimit::COLLECTION, $data->getId(),'count');
+                $this->document['count']++;
             }
         });
-
-        $this->count++;
     }
 
     /**
@@ -348,4 +331,29 @@ public function time(): string
     {
         return $this->time;
     }
+
+    /**
+     * Return the unique document from database
+     * @param $key
+     * @param $datetime
+     * @return Document|null
+     * @throws \Exception
+     */
+    protected function getDocument($key, $datetime): ?Document
+    {
+        if(!empty($this->document)){
+            return $this->document;
+        }
+
+        $result = Authorization::skip(function () use ($key, $datetime) {
+            return $this->db->findOne(TimeLimit::COLLECTION, [
+                Query::equal('key', [$key]),
+                Query::equal('time', [$datetime]),
+            ]);
+        });
+
+        $this->document = $result === false ? null :$result;
+        return $this->document;
+    }
+
 }