appwrite · eldadfux · Mar 17, 2021 · Mar 11, 2021 · Mar 12, 2021 · Mar 12, 2021
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,8 +1,8 @@
 # Version 0.8.0 (Not Released Yet)
 
 ## Features
-
-- Anonymous login
+- Anonymous login (#914)
+- Added events for functions and executions (#971)
 
 ## Breaking Changes
 

diff --git a/app/config/events.php b/app/config/events.php
@@ -97,6 +97,46 @@
         'model' => Response::MODEL_ANY,
         'note' => '',
     ],
+    'functions.create' => [
+        'description' => 'This event triggers when a function is created.',
+        'model' => Response::MODEL_FUNCTION,
+        'note' => 'version >= 0.7',
+    ],
+    'functions.update' => [
+        'description' => 'This event triggers when a function is updated.',
+        'model' => Response::MODEL_FUNCTION,
+        'note' => 'version >= 0.7',
+    ],
+    'functions.delete' => [
+        'description' => 'This event triggers when a function is deleted.',
+        'model' => Response::MODEL_ANY,
+        'note' => 'version >= 0.7',
+    ],
+    'functions.tags.create' => [
+        'description' => 'This event triggers when a function tag is created.',
+        'model' => Response::MODEL_TAG,
+        'note' => 'version >= 0.7',
+    ],
+    'functions.tags.update' => [
+        'description' => 'This event triggers when a function tag is updated.',
+        'model' => Response::MODEL_FUNCTION,
+        'note' => 'version >= 0.7',
+    ],
+    'functions.tags.delete' => [
+        'description' => 'This event triggers when a function tag is deleted.',
+        'model' => Response::MODEL_ANY,
+        'note' => 'version >= 0.7',
+    ],
+    'functions.executions.create' => [
+        'description' => 'This event triggers when a function execution is created.',
+        'model' => Response::MODEL_EXECUTION,
+        'note' => 'version >= 0.7',
+    ],
+    'functions.executions.update' => [
+        'description' => 'This event triggers when a function execution is updated.',
+        'model' => Response::MODEL_EXECUTION,
+        'note' => 'version >= 0.7',
+    ],
     'storage.files.create' => [
         'description' => 'This event triggers when a storage file is created.',
         'model' => Response::MODEL_FILE,
@@ -167,4 +207,4 @@
         'model' => Response::MODEL_MEMBERSHIP,
         'note' => 'version >= 0.7',
     ],
-];
+];
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
@@ -27,6 +27,7 @@
     ->groups(['api', 'functions'])
     ->desc('Create Function')
     ->label('scope', 'functions.write')
+    ->label('event', 'functions.create')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'create')
@@ -265,6 +266,7 @@
     ->groups(['api', 'functions'])
     ->desc('Update Function')
     ->label('scope', 'functions.write')
+    ->label('event', 'functions.update')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'update')
@@ -330,6 +332,7 @@
     ->groups(['api', 'functions'])
     ->desc('Update Function Tag')
     ->label('scope', 'functions.write')
+    ->label('event', 'functions.tags.update')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'updateTag')
@@ -387,6 +390,7 @@
     ->groups(['api', 'functions'])
     ->desc('Delete Function')
     ->label('scope', 'functions.write')
+    ->label('event', 'functions.delete')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'delete')
@@ -424,6 +428,7 @@
     ->groups(['api', 'functions'])
     ->desc('Create Tag')
     ->label('scope', 'functions.write')
+    ->label('event', 'functions.tags.create')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'createTag')
@@ -601,6 +606,7 @@
     ->groups(['api', 'functions'])
     ->desc('Delete Tag')
     ->label('scope', 'functions.write')
+    ->label('event', 'functions.tags.delete')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'deleteTag')
@@ -662,6 +668,7 @@
     ->groups(['api', 'functions'])
     ->desc('Create Execution')
     ->label('scope', 'execution.write')
+    ->label('event', 'functions.executions.create')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'createExecution')

diff --git a/app/workers/functions.php b/app/workers/functions.php
@@ -148,6 +148,7 @@ public function perform()
         $event = $this->args['event'] ?? '';
         $scheduleOriginal = $this->args['scheduleOriginal'] ?? '';
         $payload = (!empty($this->args['payload'])) ? json_encode($this->args['payload']) : '';
+        $userId = $this->args['userId'] ?? '';
 
         $database = new Database();
         $database->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
@@ -195,7 +196,7 @@ public function perform()
 
                         Console::success('Triggered function: '.$event);
 
-                        $this->execute('event', $projectId, '', $database, $function, $event, $payload);
+                        $this->execute('event', $projectId, '', $database, $function, $event, $payload, $userId);
                     }
                 }
                 break;
@@ -251,8 +252,8 @@ public function perform()
                     'scheduleOriginal' => $function->getAttribute('schedule', ''),
                 ]);  // Async task rescheduale
 
-                $this->execute($trigger, $projectId, $executionId, $database, $function);
 
+                $this->execute($trigger, $projectId, $executionId, $database, $function, $userId);
                 break;
 
             case 'http':
@@ -264,7 +265,7 @@ public function perform()
                     throw new Exception('Function not found ('.$functionId.')');
                 }
 
-                $this->execute($trigger, $projectId, $executionId, $database, $function);
+                $this->execute($trigger, $projectId, $executionId, $database, $function, $userId);
                 break;
 
             default:
@@ -286,7 +287,7 @@ public function perform()
      * 
      * @return void
      */
-    public function execute(string $trigger, string $projectId, string $executionId, Database $database, Document $function, string $event = '', string $payload = ''): void
+    public function execute(string $trigger, string $projectId, string $executionId, Database $database, Document $function, string $event = '', string $payload = '', string $userId = ''): void
     {
         global $list;
 
@@ -469,6 +470,26 @@ public function execute(string $trigger, string $projectId, string $executionId,
             throw new Exception('Failed saving execution to DB', 500);
         }
 
+        $executionUpdate = new Event('v1-webhooks', 'WebhooksV1');
+
+        $executionUpdate
+            ->setParam('projectId', $projectId)
+            ->setParam('userId', $userId)
+            ->setParam('event', 'functions.executions.update')
+            ->setParam('payload', [
+                '$id' => $execution['$id'],
+                'functionId' => $execution['functionId'],
+                'dateCreated' => $execution['dateCreated'],
+                'trigger' => $execution['trigger'],
+                'status' => $execution['status'],
+                'exitCode' => $execution['exitCode'],
+                'stdout' => $execution['stdout'],
+                'stderr' => $execution['stderr'],
+                'time' => $execution['time']
+            ]);
+
+        $executionUpdate->trigger();
+
         $usage = new Event('v1-usage', 'UsageV1');
 
         $usage

diff --git a/tests/e2e/Scopes/ProjectCustom.php b/tests/e2e/Scopes/ProjectCustom.php
@@ -113,6 +113,14 @@ public function getProject(): array
                 'database.documents.create',
                 'database.documents.update',
                 'database.documents.delete',
+                'functions.create',
+                'functions.update',
+                'functions.delete',
+                'functions.tags.create',
+                'functions.tags.update',
+                'functions.tags.delete',
+                'functions.executions.create',
+                'functions.executions.update',
                 'storage.files.create',
                 'storage.files.update',
                 'storage.files.delete',