Update Index Duplicate check to work with ordering

utopia-php · Jun 8, 2023 · e10a336 · e10a336
1 parent 39143b3
commit e10a336
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 8 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Database/Validator/Index.php b/src/Database/Validator/Index.php
@@ -58,9 +58,16 @@ public function checkDuplicatedAttributes(Document $collection): bool
     {
         foreach ($collection->getAttribute('indexes', []) as $index) {
             $attributes = $index->getAttribute('attributes', []);
-            if (count($attributes) !== count(array_unique($attributes))) {
-                $this->message = 'Duplicate attributes provided';
-                return false;
+            $orders = $index->getAttribute('orders', []);
+            $stack = [];
+            foreach ($attributes as $key => $attribute) {
+                $direction = $orders[$key] ?? 'asc';
+                $value = strtolower($attribute . '|' . $direction);
+                if (in_array($value, $stack)) {
+                    $this->message = 'Duplicate attributes provided';
+                    return false;
+                }
+                $stack[] = $value;
             }
         }
 

diff --git a/tests/Database/Validator/IndexTest.php b/tests/Database/Validator/IndexTest.php
@@ -181,4 +181,41 @@ public function testDuplicatedAttributes(): void
         $this->assertFalse($validator->isValid($collection));
         $this->assertEquals('Duplicate attributes provided', $validator->getDescription());
     }
+
+    /**
+     * @throws Exception
+     */
+    public function testDuplicatedAttributesDifferentOrder(): void
+    {
+        $validator = new Index(768);
+
+        $collection = new Document([
+            '$id' => ID::custom('test'),
+            'name' => 'test',
+            'attributes' => [
+                new Document([
+                    '$id' => ID::custom('title'),
+                    'type' => Database::VAR_STRING,
+                    'format' => '',
+                    'size' => 255,
+                    'signed' => true,
+                    'required' => false,
+                    'default' => null,
+                    'array' => false,
+                    'filters' => [],
+                ])
+            ],
+            'indexes' => [
+                new Document([
+                    '$id' => ID::custom('index1'),
+                    'type' => Database::INDEX_FULLTEXT,
+                    'attributes' => ['title', 'title'],
+                    'lengths' => [],
+                    'orders' => ['asc', 'desc'],
+                ]),
+            ],
+        ]);
+
+        $this->assertTrue($validator->isValid($collection));
+    }
 }