Merge branch 'develop' into sw-notification-action

This commit is contained in:
tamaina 2021-07-13 22:17:26 +09:00
commit 29dfc92b67
14 changed files with 266 additions and 135 deletions

View file

@ -5,9 +5,6 @@ import { Notification } from '../../../models/entities/notification';
import { Notifications, Users } from '../../../models';
import { In } from 'typeorm';
/**
* Mark notifications as read
*/
export async function readNotification(
userId: User['id'],
notificationIds: Notification['id'][]
@ -20,6 +17,26 @@ export async function readNotification(
isRead: true
});
post(userId);
}
export async function readNotificationByQuery(
userId: User['id'],
query: Record<string, any>
) {
// Update documents
await Notifications.update({
...query,
notifieeId: userId,
isRead: false
}, {
isRead: true
});
post(userId);
}
async function post(userId: User['id']) {
if (!await Users.getHasUnreadNotification(userId)) {
// ユーザーのすべての通知が既読だったら、
// 全ての(いままで未読だった)通知を(これで)読みましたよというイベントを発行