Merge pull request #2 from utopia-php/use-utopia-query

feat: integrate Utopia\Query for usage metrics queries and remove leg…

Author: lohanidamodar

composer.json

@@ -18,7 +18,8 @@
     "require": {
         "php": ">=8.0",
         "utopia-php/fetch": "0.5.*",
-        "utopia-php/database": "5.*"
+        "utopia-php/database": "5.*",
+        "utopia-php/query": "0.1.*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
@@ -42,4 +43,4 @@
             "tbachert/spi": false
         }
     }
-}
+}

composer.lock

@@ -102,30 +102,30 @@ abstract public function setBatch(array $metrics, int $batchSize = 1000): bool;
     /**
      * Get usage metrics by period
      *
-     * @param  array<\Utopia\Usage\Query>  $queries
+     * @param  array<\Utopia\Query\Query>  $queries
      * @return array<Metric>
      */
     abstract public function getByPeriod(string $metric, string $period, array $queries = []): array;
 
     /**
      * Get usage metrics between dates
      *
-     * @param  array<\Utopia\Usage\Query>  $queries
+     * @param  array<\Utopia\Query\Query>  $queries
      * @return array<Metric>
      */
     abstract public function getBetweenDates(string $metric, string $startDate, string $endDate, array $queries = []): array;
 
     /**
      * Count usage metrics by period
      *
-     * @param  array<\Utopia\Usage\Query>  $queries
+     * @param  array<\Utopia\Query\Query>  $queries
      */
     abstract public function countByPeriod(string $metric, string $period, array $queries = []): int;
 
     /**
      * Sum usage metrics by period
      *
-     * @param  array<\Utopia\Usage\Query>  $queries
+     * @param  array<\Utopia\Query\Query>  $queries
      */
     abstract public function sumByPeriod(string $metric, string $period, array $queries = []): int;
 
@@ -136,7 +136,7 @@ abstract public function sumByPeriod(string $metric, string $period, array $quer
      * Metrics not found will have a value of 0.
      *
      * @param  array<string>  $metrics  List of metric names
-     * @param  array<\Utopia\Usage\Query>  $queries
+     * @param  array<\Utopia\Query\Query>  $queries
      * @return array<string, int>
      */
     abstract public function sumByPeriodBatch(array $metrics, string $period, array $queries = []): array;
@@ -147,7 +147,7 @@ abstract public function sumByPeriodBatch(array $metrics, string $period, array
      * Returns an associative array keyed by metric name with arrays of Metric objects as values.
      *
      * @param  array<string>  $metrics  List of metric names
-     * @param  array<\Utopia\Usage\Query>  $queries
+     * @param  array<\Utopia\Query\Query>  $queries
      * @return array<string, array<Metric>>
      */
     abstract public function getByPeriodBatch(array $metrics, string $period, array $queries = []): array;
@@ -156,22 +156,22 @@ abstract public function getByPeriodBatch(array $metrics, string $period, array
      * Purge usage metrics matching the given queries.
      * When no queries are provided, all metrics are deleted.
      *
-     * @param array<\Utopia\Usage\Query> $queries
+     * @param array<\Utopia\Query\Query> $queries
      */
     abstract public function purge(array $queries = []): bool;
 
     /**
      * Find metrics using Query objects.
      *
-     * @param array<\Utopia\Usage\Query> $queries
+     * @param array<\Utopia\Query\Query> $queries
      * @return array<Metric>
      */
     abstract public function find(array $queries = []): array;
 
     /**
      * Count metrics using Query objects.
      *
-     * @param array<\Utopia\Usage\Query> $queries
+     * @param array<\Utopia\Query\Query> $queries
      * @return int
      */
     abstract public function count(array $queries = []): int;

src/Usage/Adapter.php

@@ -3,7 +3,7 @@
 namespace Utopia\Usage\Adapter;
 
 use Exception;
-use Utopia\Usage\Query;
+use Utopia\Query\Query;
 use Utopia\Fetch\Client;
 use Utopia\Usage\Metric;
 use Utopia\Usage\Usage;

src/Usage/Adapter/ClickHouse.php

@@ -7,7 +7,7 @@
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Query as DatabaseQuery;
 use Utopia\Usage\Metric;
-use Utopia\Usage\Query;
+use Utopia\Query\Query;
 use Utopia\Usage\Usage;
 
 class Database extends SQL
@@ -202,7 +202,7 @@ public function setBatch(array $metrics, int $batchSize = 1000): bool
     }
 
     /**
-     * Convert Utopia\Usage\Query to Utopia\Database\Query for use with the Database class.
+     * Convert Utopia\Query\Query to Utopia\Database\Query for use with the Database class.
      *
      * @param array<Query> $queries
      * @return array<DatabaseQuery>