ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-23 14:54:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: some errors from the performance optimization (#5196)

Browse source
This commit is contained in:
Peace 2024-10-16 13:25:35 +02:00 committed by GitHub
parent b719d11500
commit 85dfe1f5d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
server/model/monitor.js
View file

@ -1508,10 +1508,8 @@ class Monitor extends BeanModel {
return await R.getAll(` return await R.getAll(`
SELECT monitor_notification.monitor_id, monitor_notification.notification_id SELECT monitor_notification.monitor_id, monitor_notification.notification_id
FROM monitor_notification FROM monitor_notification
WHERE monitor_notification.monitor_id IN (?) WHERE monitor_notification.monitor_id IN (${monitorIDs.map((_) => "?").join(",")})
`, [ `, monitorIDs);
monitorIDs,
]);
} }
/** /**
@ -1521,13 +1519,11 @@ class Monitor extends BeanModel {
*/ */
static async getMonitorTag(monitorIDs) { static async getMonitorTag(monitorIDs) {
return await R.getAll(` return await R.getAll(`
SELECT monitor_tag.monitor_id, tag.name, tag.color SELECT monitor_tag.monitor_id, monitor_tag.tag_id, tag.name, tag.color
FROM monitor_tag FROM monitor_tag
JOIN tag ON monitor_tag.tag_id = tag.id JOIN tag ON monitor_tag.tag_id = tag.id
WHERE monitor_tag.monitor_id IN (?) WHERE monitor_tag.monitor_id IN (${monitorIDs.map((_) => "?").join(",")})
`, [ `, monitorIDs);
monitorIDs,
]);
} }
/** /**
@ -1567,6 +1563,7 @@ class Monitor extends BeanModel {
tagsMap.set(row.monitor_id, []); tagsMap.set(row.monitor_id, []);
} }
tagsMap.get(row.monitor_id).push({ tagsMap.get(row.monitor_id).push({
tag_id: row.tag_id,
name: row.name, name: row.name,
color: row.color color: row.color
}); });