* changed the location of check encrypt in filters

* changed the collection name for testing the encrypt checking in e2e tests

Author: ArnabChatterjee20k

src/Database/Validator/Query/Filter.php

@@ -41,6 +41,13 @@ public function __construct(
      */
     protected function isValidAttribute(string $attribute): bool
     {
+        if (
+            \in_array('encrypt', $this->schema[$attribute]['filters'] ?? [])
+        ) {
+            $this->message = 'Cannot query encrypted attribute: ' . $attribute;
+            return false;
+        }
+
         if (\str_contains($attribute, '.')) {
             // Check for special symbol `.`
             if (isset($this->schema[$attribute])) {
@@ -74,13 +81,6 @@ protected function isValidAttribute(string $attribute): bool
      */
     protected function isValidAttributeAndValues(string $attribute, array $values, string $method): bool
     {
-        if (
-            isset($this->schema[$attribute]['filters'])
-            && in_array('encrypt', $this->schema[$attribute]['filters'])
-        ) {
-            $this->message = 'Cannot select encrypted attribute: ' . $attribute;
-            return false;
-        }
         if (!$this->isValidAttribute($attribute)) {
             return false;
         }

tests/e2e/Adapter/Base.php

@@ -2069,7 +2069,6 @@ public function testCreateCollectionValidator(): void
 
     public function testCreateDocument(): Document
     {
-
         static::getDatabase()->createCollection('documents');
 
         $this->assertEquals(true, static::getDatabase()->createAttribute('documents', 'string', Database::VAR_STRING, 128, true));
@@ -2836,27 +2835,28 @@ function (mixed $value) {
             }
         );
 
-        static::getDatabase()->createCollection('test_documents');
+        $col = static::getDatabase()->createCollection(__FUNCTION__);
+        $this->assertNotNull($col->getId());
 
-        static::getDatabase()->createAttribute('test_documents', 'title', Database::VAR_STRING, 255, true);
-        static::getDatabase()->createAttribute('test_documents', 'encrypt', Database::VAR_STRING, 128, true, filters: ['encrypt']);
+        static::getDatabase()->createAttribute($col->getId(), 'title', Database::VAR_STRING, 255, true);
+        static::getDatabase()->createAttribute($col->getId(), 'encrypt', Database::VAR_STRING, 128, true, filters: ['encrypt']);
 
-        static::getDatabase()->createDocument('test_documents', new Document([
+        static::getDatabase()->createDocument($col->getId(), new Document([
             'title' => 'Sample Title',
             'encrypt' => 'secret',
         ]));
         // query against encrypt
         try {
             $queries = [Query::equal('encrypt', ['test'])];
-            $doc = static::getDatabase()->find('test_documents', $queries);
+            $doc = static::getDatabase()->find($col->getId(), $queries);
             $this->fail('Queried against encrypt field. Failed to throw exeception.');
         } catch (Throwable $e) {
             $this->assertTrue($e instanceof QueryException);
         }
 
         try {
             $queries = [Query::equal('title', ['test'])];
-            static::getDatabase()->find('test_documents', $queries);
+            static::getDatabase()->find($col->getId(), $queries);
         } catch (Throwable $e) {
             $this->fail('Should not have thrown error');
         }