kaori 4 лет назад
Родитель
Сommit
6bdee962e9

+ 2 - 1
packages/app/src/server/models/in-app-notification.ts

@@ -25,8 +25,9 @@ export interface InAppNotificationDocument extends Document {
 
 export interface InAppNotificationModel extends Model<InAppNotificationDocument> {
   findLatestInAppNotificationsByUser(user: Types.ObjectId, skip: number, offset: number): Promise<InAppNotificationDocument[]>
-
+  getUnreadCountByUser(user: Types.ObjectId): Promise<number | undefined>
   open(user, id: Types.ObjectId): Promise<InAppNotificationDocument | null>
+  read(user) /* : Promise<Query<any>> */
 
   STATUS_UNREAD: string
   STATUS_UNOPENED: string

+ 2 - 2
packages/app/src/server/service/activity.ts

@@ -30,8 +30,8 @@ class ActivityService {
       target: page,
       action: ActivityDefine.ACTION_UPDATE,
     };
-    const Activity = getModelSafely('Activity') || require('../models/activity')(this.crowi);
-    const savedActivity = await Activity.createByParameters(parameters);
+
+    const savedActivity = await this.createByParameters(parameters);
     return savedActivity;
   };