Use DB helper methods everywhere

Author: brandonkelly

src/Plugin.php

@@ -285,8 +285,6 @@ public function getCpNavItem()
      */
     public function request(string $method, string $url, array $headers = null, string $body = null, int $webhookId = null, string $debounceKey = null)
     {
-        $db = Craft::$app->getDb();
-
         if ($debounceKey !== null) {
             // See if there is an existing pending request with the same key
             $requestId = (new Query())
@@ -314,22 +312,20 @@ public function request(string $method, string $url, array $headers = null, stri
             }
         }
 
-        $db->createCommand()
-            ->insert('{{%webhookrequests}}', [
-                'webhookId' => $webhookId,
-                'debounceKey' => $debounceKey,
-                'status' => self::STATUS_PENDING,
-                'method' => $method,
-                'url' => $url,
-                'requestHeaders' => $headers ? Json::encode($headers) : null,
-                'requestBody' => $body,
-                'dateCreated' => Db::prepareDateForDb(new DateTime()),
-                'uid' => StringHelper::UUID(),
-            ], false)
-            ->execute();
+        Db::insert('{{%webhookrequests}}', [
+            'webhookId' => $webhookId,
+            'debounceKey' => $debounceKey,
+            'status' => self::STATUS_PENDING,
+            'method' => $method,
+            'url' => $url,
+            'requestHeaders' => $headers ? Json::encode($headers) : null,
+            'requestBody' => $body,
+            'dateCreated' => Db::prepareDateForDb(new DateTime()),
+            'uid' => StringHelper::UUID(),
+        ], false);
 
         $this->_pendingJobs[] = new SendRequestJob([
-            'requestId' => $db->getLastInsertID('{{%webhookrequests}}'),
+            'requestId' => Craft::$app->getDb()->getLastInsertID('{{%webhookrequests}}'),
             'webhookId' => $webhookId,
         ]);
 
@@ -404,13 +400,10 @@ public function sendRequest(int $requestId): bool
         }
 
         // Update the request
-        $db = Craft::$app->getDb();
-        $db->createCommand()
-            ->update('{{%webhookrequests}}', [
-                'status' => self::STATUS_REQUESTED,
-                'dateRequested' => Db::prepareDateForDb(new DateTime()),
-            ], ['id' => $requestId], [], false)
-            ->execute();
+        Db::update('{{%webhookrequests}}', [
+            'status' => self::STATUS_REQUESTED,
+            'dateRequested' => Db::prepareDateForDb(new DateTime()),
+        ], ['id' => $requestId], [], false);
 
         $startTime = microtime(true);
         $response = null;
@@ -431,17 +424,14 @@ public function sendRequest(int $requestId): bool
         $time = round(1000 * (microtime(true) - $startTime));
         $attempt = ($data['attempts'] ?? 0) + 1;
 
-        $db = Craft::$app->getDb();
-        $db->createCommand()
-            ->update('{{%webhookrequests}}', [
-                'status' => self::STATUS_DONE,
-                'attempts' => $attempt,
-                'responseStatus' => $response ? $response->getStatusCode() : null,
-                'responseHeaders' => $response ? Json::encode($response->getHeaders()) : null,
-                'responseBody' => $response ? (string)$response->getBody() : null,
-                'responseTime' => $time,
-            ], ['id' => $requestId], [], false)
-            ->execute();
+        Db::update('{{%webhookrequests}}', [
+            'status' => self::STATUS_DONE,
+            'attempts' => $attempt,
+            'responseStatus' => $response ? $response->getStatusCode() : null,
+            'responseHeaders' => $response ? Json::encode($response->getHeaders()) : null,
+            'responseBody' => $response ? (string)$response->getBody() : null,
+            'responseTime' => $time,
+        ], ['id' => $requestId], [], false);
 
         // Release the lock
         $this->_unlockRequest($requestId);

src/WebhookManager.php

@@ -4,6 +4,7 @@
 
 use Craft;
 use craft\db\Query;
+use craft\helpers\Db;
 use craft\helpers\Json;
 use craft\helpers\StringHelper;
 use yii\base\InvalidArgumentException;
@@ -69,19 +70,15 @@ public function saveGroup(Group $group, bool $runValidation = true): bool
         }
 
         if ($group->id) {
-            $db->createCommand()
-                ->update('{{%webhookgroups}}', [
-                    'name' => $name,
-                ], [
-                    'id' => $group->id,
-                ])
-                ->execute();
+            Db::update('{{%webhookgroups}}', [
+                'name' => $name,
+            ], [
+                'id' => $group->id,
+            ]);
         } else {
-            $db->createCommand()
-                ->insert('{{%webhookgroups}}', [
-                    'name' => $name,
-                ])
-                ->execute();
+            Db::insert('{{%webhookgroups}}', [
+                'name' => $name,
+            ]);
 
             $group->id = (int)$db->getLastInsertID('{{%webhookgroups}}');
         }
@@ -96,11 +93,9 @@ public function saveGroup(Group $group, bool $runValidation = true): bool
      */
     public function deleteGroupById(int $id)
     {
-        Craft::$app->getDb()->createCommand()
-            ->delete('{{%webhookgroups}}', [
-                'id' => $id,
-            ])
-            ->execute();
+        Db::delete('{{%webhookgroups}}', [
+            'id' => $id,
+        ]);
     }
 
     // Webhooks
@@ -209,13 +204,9 @@ public function saveWebhook(Webhook $webhook, bool $runValidation = true): bool
         ];
 
         if ($webhook->id) {
-            $db->createCommand()
-                ->update('{{%webhooks}}', $data, ['id' => $webhook->id])
-                ->execute();
+            Db::update('{{%webhooks}}', $data, ['id' => $webhook->id]);
         } else {
-            $db->createCommand()
-                ->insert('{{%webhooks}}', $data)
-                ->execute();
+            Db::insert('{{%webhooks}}', $data);
             $webhook->id = (int)$db->getLastInsertID('{{%webhooks}}');
         }
 
@@ -229,9 +220,7 @@ public function saveWebhook(Webhook $webhook, bool $runValidation = true): bool
      */
     public function deleteWebhookById(int $id)
     {
-        Craft::$app->getDb()->createCommand()
-            ->delete('{{%webhooks}}', ['id' => $id])
-            ->execute();
+        Db::delete('{{%webhooks}}', ['id' => $id]);
     }
 
     /**

src/controllers/ActivityController.php

@@ -5,6 +5,7 @@
 use Craft;
 use craft\db\Paginator;
 use craft\db\Query;
+use craft\helpers\Db;
 use craft\helpers\Json;
 use craft\web\twig\variables\Paginate;
 use craft\webhooks\assets\activity\ActivityAsset;
@@ -58,10 +59,7 @@ public function actionIndex(): Response
      */
     public function actionClear(): Response
     {
-        Craft::$app->getDb()->createCommand()
-            ->delete('{{%webhookrequests}}', ['status' => Plugin::STATUS_DONE])
-            ->execute();
-
+        Db::delete('{{%webhookrequests}}', ['status' => Plugin::STATUS_DONE]);
         return $this->redirect('webhooks/activity');
     }