Update and fix tests

Author: lohanidamodar

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   mariadb:
     image: mariadb:10.7
@@ -16,6 +14,24 @@ services:
       - MYSQL_DATABASE=utopiaTests
       - MYSQL_USER=user
       - MYSQL_PASSWORD=password
+  clickhouse:
+    image: clickhouse/clickhouse-server:25.11-alpine
+    environment:
+      - CLICKHOUSE_DB=default
+      - CLICKHOUSE_USER=default
+      - CLICKHOUSE_PASSWORD=clickhouse
+      - CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1
+    networks:
+      - usage
+    ports:
+      - "8123:8123"
+      - "9000:9000"
+    healthcheck:
+      test: ["CMD", "clickhouse-client", "--host=localhost", "--port=9000", "-q", "SELECT 1"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 15s
 
   usage:
     container_name: utopia-usage

src/Usage/Adapter/Database.php

@@ -144,7 +144,9 @@ public function log(string $metric, int $value, string $period = '1h', array $ta
         }
 
         $now = new \DateTime();
-        $time = $now->format(self::PERIODS[$period]);
+        $time = $period === 'inf'
+            ? '1000-01-01 00:00:00'
+            : $now->format(self::PERIODS[$period]);
 
         $this->db->getAuthorization()->skip(function () use ($metric, $value, $period, $time, $tags) {
             $this->db->createDocument(self::COLLECTION, new Document([
@@ -171,7 +173,9 @@ public function logBatch(array $metrics): bool
                 }
 
                 $now = new \DateTime();
-                $time = $now->format(self::PERIODS[$period]);
+                $time = $period === 'inf'
+                    ? '1000-01-01 00:00:00'
+                    : $now->format(self::PERIODS[$period]);
 
                 return new Document([
                     '$permissions' => [],

tests/Usage/Adapter/ClickHouseTest.php

@@ -15,11 +15,11 @@ protected function initializeUsage(): void
     {
         $host = getenv('CLICKHOUSE_HOST') ?: 'clickhouse';
         $username = getenv('CLICKHOUSE_USER') ?: 'default';
-        $password = getenv('CLICKHOUSE_PASSWORD') ?: '';
+        $password = getenv('CLICKHOUSE_PASSWORD') ?: 'clickhouse';
         $port = (int) (getenv('CLICKHOUSE_PORT') ?: 8123);
         $secure = (bool) (getenv('CLICKHOUSE_SECURE') ?: false);
 
-        if ($host === null) {
+        if ($host === null || $host === '') {
             $this->markTestSkipped('CLICKHOUSE_HOST not set; skipping ClickHouse adapter tests.');
         }
 

tests/Usage/Adapter/DatabaseTest.php

@@ -9,6 +9,7 @@
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
+use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Query;
 use Utopia\Tests\Usage\UsageBase;
 use Utopia\Usage\Adapter\Database as AdapterDatabase;
@@ -34,9 +35,17 @@ protected function initializeUsage(): void
 
         $this->usage = new Usage(new AdapterDatabase($this->database));
 
-        // Create database and collection if needed
-        $this->database->create();
+        // Create database if missing
+        if (! $this->database->exists($this->database->getDatabase())) {
+            $this->database->create();
+        }
+
         // Always run setup to ensure collection exists
-        $this->usage->setup();
+        try {
+
+            $this->usage->setup();
+        } catch (Duplicate $ex) {
+            // ignore duplicate exception
+        }
     }
 }