From 8639091d06383d83e62f90dc209a6679c2e43b9f Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Sat, 3 Sep 2022 11:19:20 +1200
Subject: [PATCH] Fix attribute models

---
 src/Appwrite/Utopia/Response/Model/Attribute.php         | 1 +
 src/Appwrite/Utopia/Response/Model/AttributeBoolean.php  | 1 +
 src/Appwrite/Utopia/Response/Model/AttributeDatetime.php | 3 +--
 src/Appwrite/Utopia/Response/Model/AttributeEmail.php    | 6 +++---
 src/Appwrite/Utopia/Response/Model/AttributeEnum.php     | 6 +++---
 src/Appwrite/Utopia/Response/Model/AttributeFloat.php    | 3 +++
 src/Appwrite/Utopia/Response/Model/AttributeIP.php       | 6 +++---
 src/Appwrite/Utopia/Response/Model/AttributeInteger.php  | 3 +++
 src/Appwrite/Utopia/Response/Model/AttributeString.php   | 1 +
 src/Appwrite/Utopia/Response/Model/AttributeURL.php      | 6 +++---
 src/Appwrite/Utopia/Response/Model/Index.php             | 1 +
 11 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/Appwrite/Utopia/Response/Model/Attribute.php b/src/Appwrite/Utopia/Response/Model/Attribute.php
index ee1b8628ed..a05a40766e 100644
--- a/src/Appwrite/Utopia/Response/Model/Attribute.php
+++ b/src/Appwrite/Utopia/Response/Model/Attribute.php
@@ -38,6 +38,7 @@ class Attribute extends Model
                 'type' => self::TYPE_BOOLEAN,
                 'description' => 'Is attribute an array?',
                 'default' => false,
+                'required' => false,
                 'example' => false,
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeBoolean.php b/src/Appwrite/Utopia/Response/Model/AttributeBoolean.php
index e31b517de6..94902aa9eb 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeBoolean.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeBoolean.php
@@ -28,6 +28,7 @@ class AttributeBoolean extends Attribute
                 'type' => self::TYPE_BOOLEAN,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => false
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php b/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php
index 4fae89384f..5c1c99337b 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php
@@ -29,7 +29,6 @@ class AttributeDatetime extends Attribute
                 'default' => APP_DATABASE_ATTRIBUTE_DATETIME,
                 'example' => APP_DATABASE_ATTRIBUTE_DATETIME,
                 'array' => false,
-                'require' => true,
             ])
             ->addRule('default', [
                 'type' => self::TYPE_STRING,
@@ -37,7 +36,7 @@ class AttributeDatetime extends Attribute
                 'default' => null,
                 'example' => self::TYPE_DATETIME_EXAMPLE,
                 'array' => false,
-                'require' => false,
+                'required' => false,
             ])
         ;
     }
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeEmail.php b/src/Appwrite/Utopia/Response/Model/AttributeEmail.php
index ee7a5b70f0..cdbd1056ba 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeEmail.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeEmail.php
@@ -27,14 +27,14 @@ class AttributeEmail extends Attribute
             ->addRule('format', [
                 'type' => self::TYPE_STRING,
                 'description' => 'String format.',
-                'default' => 'email',
-                'example' => 'email',
-                'required' => true,
+                'default' => APP_DATABASE_ATTRIBUTE_EMAIL,
+                'example' => APP_DATABASE_ATTRIBUTE_EMAIL,
             ])
             ->addRule('default', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => 'default@example.com',
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeEnum.php b/src/Appwrite/Utopia/Response/Model/AttributeEnum.php
index 93c7f8e763..3eab7dfdff 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeEnum.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeEnum.php
@@ -34,14 +34,14 @@ class AttributeEnum extends Attribute
             ->addRule('format', [
                 'type' => self::TYPE_STRING,
                 'description' => 'String format.',
-                'default' => 'enum',
-                'example' => 'enum',
-                'required' => true,
+                'default' => APP_DATABASE_ATTRIBUTE_ENUM,
+                'example' => APP_DATABASE_ATTRIBUTE_ENUM,
             ])
             ->addRule('default', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => 'element',
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeFloat.php b/src/Appwrite/Utopia/Response/Model/AttributeFloat.php
index e2d0594e7b..1318b8c7b2 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeFloat.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeFloat.php
@@ -28,18 +28,21 @@ class AttributeFloat extends Attribute
                 'type' => self::TYPE_FLOAT,
                 'description' => 'Minimum value to enforce for new documents.',
                 'default' => null,
+                'required' => false,
                 'example' => 1.5,
             ])
             ->addRule('max', [
                 'type' => self::TYPE_FLOAT,
                 'description' => 'Maximum value to enforce for new documents.',
                 'default' => null,
+                'required' => false,
                 'example' => 10.5,
             ])
             ->addRule('default', [
                 'type' => self::TYPE_FLOAT,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => 2.5,
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeIP.php b/src/Appwrite/Utopia/Response/Model/AttributeIP.php
index b6d816d4b8..a692664c34 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeIP.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeIP.php
@@ -27,14 +27,14 @@ class AttributeIP extends Attribute
             ->addRule('format', [
                 'type' => self::TYPE_STRING,
                 'description' => 'String format.',
-                'default' => 'ip',
-                'example' => 'ip',
-                'required' => true,
+                'default' => APP_DATABASE_ATTRIBUTE_IP,
+                'example' => APP_DATABASE_ATTRIBUTE_IP,
             ])
             ->addRule('default', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => '192.0.2.0',
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeInteger.php b/src/Appwrite/Utopia/Response/Model/AttributeInteger.php
index 35fd955a5e..50c3641445 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeInteger.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeInteger.php
@@ -28,18 +28,21 @@ class AttributeInteger extends Attribute
                 'type' => self::TYPE_INTEGER,
                 'description' => 'Minimum value to enforce for new documents.',
                 'default' => null,
+                'required' => false,
                 'example' => 1,
             ])
             ->addRule('max', [
                 'type' => self::TYPE_INTEGER,
                 'description' => 'Maximum value to enforce for new documents.',
                 'default' => null,
+                'required' => false,
                 'example' => 10,
             ])
             ->addRule('default', [
                 'type' => self::TYPE_INTEGER,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => 10,
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeString.php b/src/Appwrite/Utopia/Response/Model/AttributeString.php
index 75c3a71019..fa36836050 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeString.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeString.php
@@ -22,6 +22,7 @@ class AttributeString extends Attribute
                 'type' => self::TYPE_STRING,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => 'default',
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/AttributeURL.php b/src/Appwrite/Utopia/Response/Model/AttributeURL.php
index ec7739c166..332654f342 100644
--- a/src/Appwrite/Utopia/Response/Model/AttributeURL.php
+++ b/src/Appwrite/Utopia/Response/Model/AttributeURL.php
@@ -27,14 +27,14 @@ class AttributeURL extends Attribute
             ->addRule('format', [
                 'type' => self::TYPE_STRING,
                 'description' => 'String format.',
-                'default' => 'url',
-                'example' => 'url',
-                'required' => true,
+                'default' => APP_DATABASE_ATTRIBUTE_URL,
+                'example' => APP_DATABASE_ATTRIBUTE_URL,
             ])
             ->addRule('default', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Default value for attribute when not provided. Cannot be set when attribute is required.',
                 'default' => null,
+                'required' => false,
                 'example' => 'http://example.com',
             ])
         ;
diff --git a/src/Appwrite/Utopia/Response/Model/Index.php b/src/Appwrite/Utopia/Response/Model/Index.php
index 9f27613669..b7ac626be9 100644
--- a/src/Appwrite/Utopia/Response/Model/Index.php
+++ b/src/Appwrite/Utopia/Response/Model/Index.php
@@ -41,6 +41,7 @@ class Index extends Model
                 'default' => [],
                 'example' => [],
                 'array' => true,
+                'required' => false,
             ])
         ;
     }