paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 39 Packages Projects Releases Wiki Activity

fix: conflicts with severity filter

Browse Source 
Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>
This commit is contained in:
Heikki Hellgren
2024-03-14 13:21:58 +02:00
parent ba14657b41
commit f1676ca73b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/notifications-backend/src/database/DatabaseNotificationsStore.ts
+6 -6
View File
@@ -66,7 +66,7 @@ export const normalizeSeverity = (input?: string): NotificationSeverity => {
/** @internal */
export class DatabaseNotificationsStore implements NotificationsStore {
private isSQLite = false;
private readonly isSQLite = false;
private constructor(private readonly db: Knex) {
this.isSQLite = this.db.client.config.client.includes('sqlite3');
@@ -141,7 +141,7 @@ export class DatabaseNotificationsStore implements NotificationsStore {
link: notification.payload?.link,
title: notification.payload?.title,
description: notification.payload?.description,
severity: notification.payload?.severity,
severity: normalizeSeverity(notification.payload?.severity),
scope: notification.payload?.scope,
};
};
@@ -219,7 +219,7 @@ export class DatabaseNotificationsStore implements NotificationsStore {
if (options.minimumSeverity !== undefined) {
const idx = severities.indexOf(options.minimumSeverity);
const equalOrHigher = severities.slice(0, idx + 1);
query.whereIn('notification.severity', equalOrHigher);
query.whereIn('severity', equalOrHigher);
}
return query;
@@ -338,9 +338,9 @@ export class DatabaseNotificationsStore implements NotificationsStore {
};
const notificationQuery = this.db('notification')
.where('id', options.id)
.where('user', options.notification.user);
const broadcastQuery = this.db('broadcast').where('id', options.id);
.where('id', id)
.where('user', notification.user);
const broadcastQuery = this.db('broadcast').where('id', id);
await Promise.all([
notificationQuery.update(updateColumns),