Merge pull request #150 from limosa-io/codex/verify-filtering-support-for-extension-schema

Allow enterprise employeeNumber filtering. Fixes #149

Author: arietimmerman

.devcontainer/devcontainer.json

@@ -17,7 +17,6 @@
 				"mikestead.dotenv",
 				"mehedidracula.php-namespace-resolver",
 				"recca0120.vscode-phpunit",
-				"formulahendry.terminal",
 				"junstyle.php-cs-fixer"
 			],
 			"settings": {

src/Attribute/Complex.php

@@ -361,7 +361,20 @@ public function applyComparison(Builder &$query, Path $path, $parentAttribute =
             $attributeNames = $path->getValuePathAttributes();
 
             if (!empty($attributeNames)) {
-                // TODO: search for schema node
+                $schemaIdentifier = $path->getValuePath()?->getAttributePath()?->path?->schema ?? null;
+
+                if ($schemaIdentifier !== null && $this->parent === null) {
+                    $schemaNode = $this->getSubNode($schemaIdentifier);
+
+                    if ($schemaNode instanceof Schema) {
+                        $schemaNode->applyComparison($query, $path);
+
+                        return;
+                    }
+
+                    throw new SCIMException('Unknown path: ' . (string)$path . ", in object: " . $this->getFullKey());
+                }
+
                 $attribute = $this->getSubNode($attributeNames[0]);
                 if ($attribute != null) {
                     // ($operation, $value, $object, $path->shiftValuePathAttributes());
@@ -379,6 +392,20 @@ public function applyComparison(Builder &$query, Path $path, $parentAttribute =
                 $attributeNames = $path?->getAttributePath()?->getAttributeNames() ?? [];
 
                 if (!empty($attributeNames)) {
+                    $schemaIdentifier = $path->getAttributePath()?->path?->schema ?? null;
+
+                    if ($schemaIdentifier !== null && $this->parent === null) {
+                        $schemaNode = $this->getSubNode($schemaIdentifier);
+
+                        if ($schemaNode instanceof Schema) {
+                            $schemaNode->applyComparison($query, $path);
+
+                            return;
+                        }
+
+                        throw new SCIMException('Unknown path: ' . (string)$path . ", in object: " . $this->getFullKey());
+                    }
+
                     $attribute = $this->getSubNode($attributeNames[0]);
                     if ($attribute != null) {
                         $attribute->applyComparison($query, $path->shiftAttributePathAttributes());

tests/CustomSchemaTest.php

@@ -29,10 +29,6 @@ class CustomSchemaTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-
-        Schema::table('users', function (Blueprint $table) {
-            $table->string('employeeNumber')->nullable();
-        });
     }
 
     protected function getEnvironmentSetUp($app)

tests/FilterQueryTest.php

@@ -108,4 +108,32 @@ public function testMultiConditionFilterCombinesCriteriaWithAnd(): void
             'User matching only the userName condition should be excluded.'
         );
     }
+
+    public function testExtensionAttributeFilterMatchesEmployeeNumber(): void
+    {
+        $matchingUser = factory(User::class)->create([
+            'employeeNumber' => '1234',
+        ]);
+
+        $nonMatchingUser = factory(User::class)->create([
+            'employeeNumber' => '5678',
+        ]);
+
+        $filter = rawurlencode('urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:employeeNumber eq "1234"');
+
+        $response = $this->get("/scim/v2/Users?filter={$filter}&count=200");
+        $response->assertStatus(200);
+
+        $ids = collect($response->json('Resources'))->pluck('id');
+
+        $this->assertTrue(
+            $ids->contains((string)$matchingUser->id),
+            'Expected filter to return the user matching the enterprise extension employeeNumber.'
+        );
+
+        $this->assertFalse(
+            $ids->contains((string)$nonMatchingUser->id),
+            'Filter should exclude users whose enterprise extension employeeNumber does not match.'
+        );
+    }
 }

tests/GroupsTest.php

@@ -12,10 +12,6 @@ class GroupsTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-
-        Schema::table('users', function (Blueprint $table) {
-            $table->string('employeeNumber')->nullable();
-        });
     }
 
     protected function getEnvironmentSetUp($app)

tests/TestCase.php

@@ -46,6 +46,7 @@ protected function setUp(): void
         Schema::table('users', function (Blueprint $table) {
             $table->string('formatted')->nullable();
             $table->boolean('active')->default(false);
+            $table->string('employeeNumber')->nullable();
         });
 
         $this->withFactories(realpath(dirname(__DIR__) . '/database/factories'));