From 860a2c761654700547ec2bc1f7fa458cf93f52b3 Mon Sep 17 00:00:00 2001
From: kodumbeats <brandon.leckemby@gmail.com>
Date: Fri, 2 Jul 2021 20:20:09 -0400
Subject: [PATCH] Fix index and attribute routes for tests

---
 app/controllers/api/database.php             | 23 +++++++++++---------
 tests/e2e/Services/Webhooks/WebhooksBase.php |  4 +++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index f4dd544be0..6d31a20516 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -459,7 +459,9 @@ App::post('/v1/database/collections/:collectionId/indexes')
     ->param('id', null, new Key(), 'Index ID.')
     ->param('type', null, new WhiteList([Database::INDEX_KEY, Database::INDEX_FULLTEXT, Database::INDEX_UNIQUE, Database::INDEX_SPATIAL, Database::INDEX_ARRAY]), 'Index type.')
     ->param('attributes', null, new ArrayList(new Key()), 'Array of attributes to index.')
-    ->param('orders', [], new ArrayList(new WhiteList(['ASC', 'DESC'])), 'Array of index orders.', true)
+    // TODO@kodumbeats debug below
+    // ->param('orders', [], new ArrayList(new WhiteList(['ASC', 'DESC'], false, Database::VAR_STRING)), 'Array of index orders.', true)
+    ->param('orders', [], new ArrayList(new Text(4)), 'Array of index orders.', true)
     ->inject('response')
     ->inject('dbForExternal')
     ->inject('database')
@@ -476,17 +478,18 @@ App::post('/v1/database/collections/:collectionId/indexes')
             throw new Exception('Collection not found', 404);
         }
 
-        if (\count($attributes) !== \count($orders)) {
-            throw new Exception('Must have one order per attribute', 400);
-        }
-
-        $oldAttributes = $collection->getAttribute('attributes');
+        // Convert Document[] to array of attribute metadata
+        $oldAttributes = \array_map(function ($a) {
+            return $a->getArrayCopy();
+        }, $collection->getAttribute('attributes'));
 
         // lengths hidden by default
         $lengths = [];
 
+        var_dump($oldAttributes);
+
         // set attribute size as length for strings, null otherwise
-        foreach ($attributes as $key => &$attribute) {
+        foreach ($attributes as $key => $attribute) {
             // find attribute metadata in collection document
             $attributeIndex = \array_search($attribute, array_column($oldAttributes, '$id'));
 
@@ -494,11 +497,11 @@ App::post('/v1/database/collections/:collectionId/indexes')
                 throw new Exception('Unknown attribute: ' . $attribute, 400);
             }
 
-            $type = $oldAttributes[$attributeIndex]['type'];
-            $size = $oldAttributes[$attributeIndex]['size'];
+            $attributeType = $oldAttributes[$attributeIndex]['type'];
+            $attributeSize = $oldAttributes[$attributeIndex]['size'];
 
             // Only set length for indexes on strings
-            $length[$key] = ($type === Database::VAR_STRING) ? $size : null;
+            $lengths[$key] = ($attributeType === Database::VAR_STRING) ? $attributeSize : null;
         }
 
         $success = $dbForExternal->addIndexInQueue($collectionId, $id, $type, $attributes, $lengths, $orders);
diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index 1dd8cbd483..bda83bb06c 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -80,7 +80,7 @@ trait WebhooksBase
         $this->assertEquals($lastName['body']['$id'], 'lastName');
 
         // wait for database worker to kick in
-        sleep(5);
+        sleep(10);
 
         $webhook = $this->getLastRequest();
 
@@ -93,6 +93,8 @@ trait WebhooksBase
         $this->assertEquals($webhook['headers']['X-Appwrite-Webhook-Project-Id'] ?? '', $this->getProject()['$id']);
         $this->assertNotEmpty($webhook['data']['$id']);
         $this->assertEquals($webhook['data']['$id'], 'lastName');
+        
+        // TODO@kodumbeats test webhook for removing attribute
 
         return $data;
     }