From 7c577c98ef298af6cefb5f6e3c0f93a884feac78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 2 Jul 2024 10:03:09 +0200 Subject: [PATCH] fix(webhook_listeners): Allow null for user_id_filter for oracle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Empty string and null are the same thing on oracle databases so we have to allow it. Signed-off-by: Côme Chilliet --- apps/webhook_listeners/lib/Db/WebhookListener.php | 3 ++- apps/webhook_listeners/lib/Db/WebhookListenerMapper.php | 2 +- .../lib/Migration/Version1000Date20240527153425.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/webhook_listeners/lib/Db/WebhookListener.php b/apps/webhook_listeners/lib/Db/WebhookListener.php index 680d47798d5..a59549d0c4a 100644 --- a/apps/webhook_listeners/lib/Db/WebhookListener.php +++ b/apps/webhook_listeners/lib/Db/WebhookListener.php @@ -60,8 +60,9 @@ class WebhookListener extends Entity implements \JsonSerializable { protected $eventFilter; /** - * @var string + * @var ?string * If not empty, id of the user that needs to be connected for the webhook to trigger + * @psalm-suppress PropertyNotSetInConstructor */ protected $userIdFilter; diff --git a/apps/webhook_listeners/lib/Db/WebhookListenerMapper.php b/apps/webhook_listeners/lib/Db/WebhookListenerMapper.php index 55086f95668..f4a475b7028 100644 --- a/apps/webhook_listeners/lib/Db/WebhookListenerMapper.php +++ b/apps/webhook_listeners/lib/Db/WebhookListenerMapper.php @@ -233,7 +233,7 @@ class WebhookListenerMapper extends QBMapper { return $this->findEntities($qb); } - private function buildCacheKey(?string $userIdFilter = ''): string { + private function buildCacheKey(?string $userIdFilter): string { return self::EVENTS_CACHE_KEY_PREFIX.'_'.($userIdFilter ?? ''); } } diff --git a/apps/webhook_listeners/lib/Migration/Version1000Date20240527153425.php b/apps/webhook_listeners/lib/Migration/Version1000Date20240527153425.php index 6693c8ecf3f..eee778db3bb 100755 --- a/apps/webhook_listeners/lib/Migration/Version1000Date20240527153425.php +++ b/apps/webhook_listeners/lib/Migration/Version1000Date20240527153425.php @@ -54,7 +54,7 @@ class Version1000Date20240527153425 extends SimpleMigrationStep { 'notnull' => false, ]); $table->addColumn('user_id_filter', Types::STRING, [ - 'notnull' => true, + 'notnull' => false, 'length' => 64, ]); $table->addColumn('headers', Types::TEXT, [