Set attribute type based on validations used, or fallback to default (limosa-io#115)

Closes limosa-io#114

Author: arietimmerman

src/Attribute/Attribute.php

@@ -9,8 +9,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Tmilos\ScimFilterParser\Ast\AttributePath;
-use Tmilos\ScimFilterParser\Ast\ComparisonExpression;
-use Tmilos\ScimSchema\Model\Resource;
+use Illuminate\Support\Str;
 
 class Attribute
 {
@@ -36,7 +35,7 @@ class Attribute
 
     protected $multiValued = false;
     protected $mutability = 'readWrite';
-    protected $type = 'string';
+    protected $type;
     protected $description = null;
     protected $defaultValue = null;
     protected $returned = 'default';
@@ -64,10 +63,11 @@ public function getValidations()
     /**
      * Return SCIM schema for this attribute
      */
-    public function generateSchema(){
+    public function generateSchema()
+    {
         return [
             'name' => $this->name,
-            'type' => $this->type,
+            'type' => $this->getType(),
             'mutability' => $this->mutability,
             'returned' => $this->returned,
             'uniqueness' => 'server',
@@ -103,7 +103,8 @@ public function ensure(...$validations)
         return $this;
     }
 
-    public function default($value){
+    public function default($value)
+    {
         $this->defaultValue = $value;
 
         return $this;
@@ -119,6 +120,23 @@ public function nullable()
         return in_array('nullable', $this->validations);
     }
 
+    public function getType()
+    {
+        $result = $this->type;
+
+        if ($result == null) {
+            if (in_array('boolean', $this->validations)) {
+                $result = 'boolean';
+            } elseif (in_array('integer', $this->validations)) {
+                $result = 'integer';
+            } else {
+                $result = 'string';
+            }
+        }
+
+        return $result;
+    }
+
     public function isReadSupported()
     {
         return $this->readEnabled;
@@ -134,7 +152,8 @@ public function shouldReturn(&$object)
         return true;
     }
 
-    public function setReturned($returned){
+    public function setReturned($returned)
+    {
         $this->returned = $returned;
         return $this;
     }
@@ -145,7 +164,8 @@ public function setParent($parent)
         return $this;
     }
 
-    protected function isRequested($attributes){
+    protected function isRequested($attributes)
+    {
         return empty($attributes) || in_array($this->name, $attributes) || in_array($this->getFullKey(), $attributes) || ($this->parent != null && $this->parent->isRequested($attributes));
     }
 
@@ -156,7 +176,7 @@ public function read(&$object, array $attributes = []): ?AttributeValue
             return null;
         }
 
-        if($this->returned == 'never'){
+        if ($this->returned == 'never') {
             return null;
         }
 

tests/SchemaTest.php

@@ -37,6 +37,33 @@ public function testGet()
     {
         $response = $this->get('/scim/v2/Schemas');
         $response->assertStatus(200);
+
+        $jsonResponse = $response->json();
+        $this->assertNotEmpty($jsonResponse);
+
+        // Find the User schema
+        $userSchema = null;
+        foreach ($jsonResponse['Resources'] as $schema) {
+            if ($schema['id'] === 'urn:ietf:params:scim:schemas:core:2.0:User') {
+                $userSchema = $schema;
+                break;
+            }
+        }
+
+        $this->assertNotNull($userSchema, "User schema not found");
+
+        // Find the active attribute in the schema attributes
+        $activeAttribute = null;
+        foreach ($userSchema['attributes'] as $attribute) {
+            if ($attribute['name'] === 'active') {
+                $activeAttribute = $attribute;
+                break;
+            }
+        }
+
+        $this->assertNotNull($activeAttribute, "Active attribute not found");
+        $this->assertEquals('boolean', $activeAttribute['type'], "Active attribute is not of type boolean");
+
     }
 
     public function getSchemaGenerator(){