فهرست منبع

Import activity model to get types in activity logic

arvid-e 4 روز پیش
والد
کامیت
5c7017301c
1فایلهای تغییر یافته به همراه2 افزوده شده و 1 حذف شده
  1. 2 1
      apps/app/src/server/service/activity/update-activity-logic.ts

+ 2 - 1
apps/app/src/server/service/activity/update-activity-logic.ts

@@ -3,6 +3,7 @@ import { getIdStringForRef } from '@growi/core';
 import mongoose from 'mongoose';
 
 import { SupportedAction } from '~/interfaces/activity';
+import Activity from '~/server/models/activity';
 
 type GenerateUpdatePayload = {
   currentUserId: string | undefined;
@@ -21,7 +22,6 @@ export const shouldGenerateUpdate = async (payload: GenerateUpdatePayload) => {
   }
 
   // Get most recent update or create activity on the page
-  const Activity = mongoose.model('Activity');
   const lastContentActivity = await Activity.findOne({
     target: targetPageId,
     action: {
@@ -34,6 +34,7 @@ export const shouldGenerateUpdate = async (payload: GenerateUpdatePayload) => {
   }).sort({ createdAt: -1 });
 
   const isLastActivityByMe =
+    lastContentActivity != null &&
     getIdStringForRef(lastContentActivity?.user) === currentUserId;
   const lastActivityTime = lastContentActivity?.createdAt?.getTime?.() ?? 0;
   const timeSinceLastActivityMs = Date.now() - lastActivityTime;