From dce89663b08d87a96a8ab63c5ce56211508c0cee Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 27 Dec 2020 23:27:35 +0530
Subject: [PATCH] patch: review comments

---
 app/controllers/api/health.php | 11 ++++++-----
 app/init.php                   |  2 +-
 app/tasks/maintenance.php      |  2 +-
 app/workers/deletes.php        |  2 +-
 src/Appwrite/Event/Event.php   | 13 +++++++++++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index e49084357..0131969ea 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -5,6 +5,7 @@ use Utopia\Exception;
 use Appwrite\Storage\Device\Local;
 use Appwrite\Storage\Storage;
 use Appwrite\ClamAV\Network;
+use Appwrite\Event\Event;
 
 App::get('/v1/health')
     ->desc('Get HTTP')
@@ -122,7 +123,7 @@ App::get('/v1/health/queue/webhooks')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size('v1-webhooks')]);
+        $response->json(['size' => Resque::size(Event::WEBHOOK_QUEUE_NAME)]);
     }, ['response']);
 
 App::get('/v1/health/queue/tasks')
@@ -136,7 +137,7 @@ App::get('/v1/health/queue/tasks')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size('v1-tasks')]);
+        $response->json(['size' => Resque::size(Event::TASK_QUEUE_NAME)]);
     }, ['response']);
 
 App::get('/v1/health/queue/logs')
@@ -150,7 +151,7 @@ App::get('/v1/health/queue/logs')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size('v1-audit')]);
+        $response->json(['size' => Resque::size(Event::AUDITS_QUEUE_NAME)]);
     }, ['response']);
 
 App::get('/v1/health/queue/usage')
@@ -178,7 +179,7 @@ App::get('/v1/health/queue/certificates')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size('v1-certificates')]);
+        $response->json(['size' => Resque::size(Event::CERTIFICATES_QUEUE_NAME)]);
     }, ['response']);
 
 App::get('/v1/health/queue/functions')
@@ -192,7 +193,7 @@ App::get('/v1/health/queue/functions')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size('v1-functions')]);
+        $response->json(['size' => Resque::size(Event::FUNCTIONS_QUEUE_NAME)]);
     }, ['response']);
 
 App::get('/v1/health/storage/local')
diff --git a/app/init.php b/app/init.php
index 3307d8a9a..9ac7876e0 100644
--- a/app/init.php
+++ b/app/init.php
@@ -55,7 +55,7 @@ const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite'; 
 // Deletion Types
 const DELETE_TYPE_DOCUMENT = 'document';
-const DELETE_TYPE_EXECUTION = 'execution';
+const DELETE_TYPE_EXECUTIONS = 'executions';
 const DELETE_TYPE_AUDIT = 'audit';
 const DELETE_TYPE_ABUSE = 'abuse';
 
diff --git a/app/tasks/maintenance.php b/app/tasks/maintenance.php
index 9486b0def..0d711ecb6 100644
--- a/app/tasks/maintenance.php
+++ b/app/tasks/maintenance.php
@@ -25,7 +25,7 @@ function getConsoleDB() {
 function notifyDeleteExecutionLogs()
 {
     Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
-        'type' => DELETE_TYPE_EXECUTION
+        'type' => DELETE_TYPE_EXECUTIONS
     ]);
 }
 
diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 2e6d21652..3a7d7b52d 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -58,7 +58,7 @@ class DeletesV1
                 }
                 break;
 
-            case DELETE_TYPE_EXECUTION:
+            case DELETE_TYPE_EXECUTIONS:
                 $this->deleteExecutionLogs();
                 break;
 
diff --git a/src/Appwrite/Event/Event.php b/src/Appwrite/Event/Event.php
index 2ce929f92..b2c69337a 100644
--- a/src/Appwrite/Event/Event.php
+++ b/src/Appwrite/Event/Event.php
@@ -18,6 +18,19 @@ class Event
 
     const MAILS_QUEUE_NAME = 'v1-mails';
     const MAILS_CLASS_NAME = 'MailsV1';
+
+    const FUNCTIONS_QUEUE_NAME = 'v1-functions';
+    const FUNCTIONS_CLASS_NAME = 'FunctionsV1';
+
+    const WEBHOOK_QUEUE_NAME = 'v1-webhooks';
+    const WEBHOOK_CLASS_NAME = 'WebhooksV1';
+
+    const TASK_QUEUE_NAME = 'v1-tasks';
+    const TASK_CLASS_NAME = 'TasksV1';
+
+    const CERTIFICATES_QUEUE_NAME = 'v1-certificates';
+    const CERTIFICATES_CLASS_NAME = 'CertificatesV1';
+    
     
     /**
      * @var string