From 9b6fc440d944016d7102b10cfc485eafce07ffa4 Mon Sep 17 00:00:00 2001
From: prateek banga <prateekbanga12@gmail.com>
Date: Wed, 13 Sep 2023 16:57:59 +0530
Subject: [PATCH] Review changes and adds enabled in providers collection

---
 app/config/collections.php                        | 11 +++++++++++
 src/Appwrite/Utopia/Response/Model/Message.php    | 14 +++++++-------
 src/Appwrite/Utopia/Response/Model/Project.php    |  2 +-
 src/Appwrite/Utopia/Response/Model/Provider.php   | 11 +++++++----
 src/Appwrite/Utopia/Response/Model/Subscriber.php |  5 -----
 src/Appwrite/Utopia/Response/Model/Target.php     | 11 -----------
 src/Appwrite/Utopia/Response/Model/Topic.php      |  5 -----
 7 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/app/config/collections.php b/app/config/collections.php
index 6050afd95f..ed73c222a7 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -1427,6 +1427,17 @@ $commonCollections = [
                 'default' => false,
                 'array' => false,
             ],
+            [
+                '$id' => ID::custom('enabled'),
+                'type' => Database::VAR_BOOLEAN,
+                'signed' => true,
+                'size' => 0,
+                'format' => '',
+                'filters' => [],
+                'required' => true,
+                'default' => true,
+                'array' => false,
+            ],
             [
                 '$id' => ID::custom('credentials'),
                 'type' => Database::VAR_STRING,
diff --git a/src/Appwrite/Utopia/Response/Model/Message.php b/src/Appwrite/Utopia/Response/Model/Message.php
index 150e837853..08d8af55ff 100644
--- a/src/Appwrite/Utopia/Response/Model/Message.php
+++ b/src/Appwrite/Utopia/Response/Model/Message.php
@@ -24,7 +24,7 @@ class Message extends Any
             ])
             ->addRule('providerId', [
                 'type' => self::TYPE_STRING,
-                'description' => 'Provider Id for the message.',
+                'description' => 'Provider ID for the message.',
                 'default' => '',
                 'example' => '5e5ea5c16897e',
             ])
@@ -40,26 +40,26 @@ class Message extends Any
                 'description' => 'Recipient of message.',
                 'required' => false,
                 'default' => DateTime::now(),
-                'example' => DateTime::now(),
+                'example' => self::TYPE_DATETIME_EXAMPLE,
             ])
-            ->addRule('deliveryError', [
+            ->addRule('deliveryErrors', [
                 'type' => self::TYPE_STRING,
-                'description' => 'Delivery error if any.',
+                'description' => 'Delivery errors if any.',
                 'required' => false,
                 'default' => '',
                 'array' => true,
-                'example' => 'Provider not valid.',
+                'example' => 'Credentials not valid.',
             ])
             ->addRule('deliveredTo', [
                 'type' => self::TYPE_INTEGER,
                 'description' => 'Number of recipients the message was delivered to.',
-                'default' => '',
+                'default' => 0,
                 'example' => 1,
             ])
             ->addRule('delivered', [
                 'type' => self::TYPE_BOOLEAN,
                 'description' => 'Status of delivery.',
-                'default' => '',
+                'default' => false,
                 'example' => true,
             ]);
     }
diff --git a/src/Appwrite/Utopia/Response/Model/Project.php b/src/Appwrite/Utopia/Response/Model/Project.php
index ae199d77f7..807c1fb574 100644
--- a/src/Appwrite/Utopia/Response/Model/Project.php
+++ b/src/Appwrite/Utopia/Response/Model/Project.php
@@ -348,7 +348,7 @@ class Project extends Model
             ]);
         }
 
-        $document->setAttribute("authProviders", $projectProviders);
+        $document->setAttribute('authProviders', $projectProviders);
 
         return $document;
     }
diff --git a/src/Appwrite/Utopia/Response/Model/Provider.php b/src/Appwrite/Utopia/Response/Model/Provider.php
index 668db553fc..7921786394 100644
--- a/src/Appwrite/Utopia/Response/Model/Provider.php
+++ b/src/Appwrite/Utopia/Response/Model/Provider.php
@@ -7,9 +7,6 @@ use Appwrite\Utopia\Response\Model;
 
 class Provider extends Model
 {
-    /**
-     * @var bool
-     */
     protected bool $public = false;
 
     public function __construct()
@@ -36,7 +33,13 @@ class Provider extends Model
             ->addRule('default', [
                 'type' => self::TYPE_BOOLEAN,
                 'description' => 'Is this a pre-configured provider instance?',
-                'default' => '',
+                'default' => false,
+                'example' => true,
+            ])
+            ->addRule('enabled', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'Is provider enabled?',
+                'default' => true,
                 'example' => true,
             ])
             ->addRule('type', [
diff --git a/src/Appwrite/Utopia/Response/Model/Subscriber.php b/src/Appwrite/Utopia/Response/Model/Subscriber.php
index 8e4ef74d74..2f34619cb4 100644
--- a/src/Appwrite/Utopia/Response/Model/Subscriber.php
+++ b/src/Appwrite/Utopia/Response/Model/Subscriber.php
@@ -7,11 +7,6 @@ use Appwrite\Utopia\Response\Model;
 
 class Subscriber extends Model
 {
-    /**
-     * @var bool
-     */
-    protected bool $public = false;
-
     public function __construct()
     {
         $this
diff --git a/src/Appwrite/Utopia/Response/Model/Target.php b/src/Appwrite/Utopia/Response/Model/Target.php
index 272c929e11..5750f57eba 100644
--- a/src/Appwrite/Utopia/Response/Model/Target.php
+++ b/src/Appwrite/Utopia/Response/Model/Target.php
@@ -7,11 +7,6 @@ use Appwrite\Utopia\Response\Model;
 
 class Target extends Model
 {
-    /**
-     * @var bool
-     */
-    protected bool $public = false;
-
     public function __construct()
     {
         $this
@@ -34,12 +29,6 @@ class Target extends Model
                 'default' => '',
                 'example' => '259125845563242502',
             ])
-            ->addRule('providerType', [
-                'type' => self::TYPE_STRING,
-                'description' => 'The type of provider supported by this target.',
-                'default' => '',
-                'example' => 'sms',
-            ])
             ->addRule('identifier', [
                 'type' => self::TYPE_STRING,
                 'description' => 'The target identifier.',
diff --git a/src/Appwrite/Utopia/Response/Model/Topic.php b/src/Appwrite/Utopia/Response/Model/Topic.php
index c0996fcf55..3a6e832f5c 100644
--- a/src/Appwrite/Utopia/Response/Model/Topic.php
+++ b/src/Appwrite/Utopia/Response/Model/Topic.php
@@ -7,11 +7,6 @@ use Appwrite\Utopia\Response\Model;
 
 class Topic extends Model
 {
-    /**
-     * @var bool
-     */
-    protected bool $public = false;
-
     public function __construct()
     {
         $this