clean code

packages/app/src/server/models/activity.ts

@@ -8,7 +8,6 @@ import loggerFactory from '../../utils/logger';
 import ActivityDefine from '../util/activityDefine';
 
 import Subscription from './subscription';
-// import { InAppNotification } from './in-app-notification';
 
 const logger = loggerFactory('growi:models:activity');
 
@@ -72,58 +71,6 @@ module.exports = function(crowi: Crowi) {
     user: 1, target: 1, action: 1, createdAt: 1,
   }, { unique: true });
 
-  // /**
-  //    * @param {object} parameters
-  //    * @return {Promise}
-  //    */
-  // activitySchema.statics.createByParameters = function(parameters) {
-  //   return this.create(parameters);
-  // };
-
-  // /**
-  //    * @param {Comment} comment
-  //    * @return {Promise}
-  //    */
-  // activitySchema.statics.createByPageComment = function(comment) {
-  //   const parameters = {
-  //     user: comment.creator,
-  //     targetModel: ActivityDefine.MODEL_PAGE,
-  //     target: comment.page,
-  //     eventModel: ActivityDefine.MODEL_COMMENT,
-  //     event: comment._id,
-  //     action: ActivityDefine.ACTION_COMMENT,
-  //   };
-
-  //   return this.createByParameters(parameters);
-  // };
-
-  // /**
-  //    * @param {Page} page
-  //    * @param {User} user
-  //    * @return {Promise}
-  //    */
-  // activitySchema.statics.createByPageLike = function(page, user) {
-  //   const parameters = {
-  //     user: user._id,
-  //     targetModel: ActivityDefine.MODEL_PAGE,
-  //     target: page,
-  //     action: ActivityDefine.ACTION_LIKE,
-  //   };
-
-  //   return this.createByParameters(parameters);
-  // };
-
-  // /**
-  //    * @param {User} user
-  //    * @return {Promise}
-  //    */
-  // activitySchema.statics.findByUser = function(user) {
-  //   return this.find({ user }).sort({ createdAt: -1 }).exec();
-  // };
-
-  // activitySchema.statics.getActionUsersFromActivities = function(activities) {
-  //   return activities.map(({ user }) => user).filter((user, i, self) => self.indexOf(user) === i);
-  // };
 
   activitySchema.methods.getNotificationTargetUsers = async function() {
     const User = getModelSafely('User') || require('~/server/models/user')();

packages/app/src/server/models/in-app-notification.ts

@@ -27,7 +27,6 @@ export interface InAppNotificationModel extends Model<InAppNotificationDocument>
   findLatestInAppNotificationsByUser(user: Types.ObjectId, skip: number, offset: number): Promise<InAppNotificationDocument[]>
 
   open(user, id: Types.ObjectId): Promise<InAppNotificationDocument | null>
-  getUnreadCountByUser(user: Types.ObjectId): Promise<number | undefined>
 
   STATUS_UNREAD: string
   STATUS_UNOPENED: string

packages/app/src/server/service/activity.ts

@@ -1,8 +1,6 @@
-import { Types } from 'mongoose';
 import Crowi from '../crowi';
 
 import ActivityDefine from '../util/activityDefine';
-import Subscription from '../models/subscription';
 import { getModelSafely } from '../util/mongoose-utils';
 
 
@@ -37,8 +35,6 @@ class ActivityService {
     return savedActivity;
   };
 
-  // ================================↓移動==========================
-
   /**
      * @param {object} parameters
      * @return {Promise}
@@ -69,11 +65,11 @@ class ActivityService {
    * @param {User} user
    * @return {Promise}
    */
-  static findByUser = function(user) {
+  findByUser = function(user) {
     return this.find({ user }).sort({ createdAt: -1 }).exec();
   };
 
-  static getActionUsersFromActivities = function(activities) {
+  getActionUsersFromActivities = function(activities) {
     return activities.map(({ user }) => user).filter((user, i, self) => self.indexOf(user) === i);
   };
 

packages/app/src/server/service/in-app-notification.ts

@@ -70,6 +70,8 @@ export default class InAppNotificationService {
     return;
   }
 
+  // ======================= ↓移動 ============================================
+
   // inAppNotificationSchema.virtual('actionUsers').get(function(this: InAppNotificationDocument) {
   //   const Activity = getModelSafely('Activity') || require('../models/activity')(this.crowi);
   //   return Activity.getActionUsersFromActivities((this.activities as any) as ActivityDocument[]);
@@ -83,7 +85,7 @@ export default class InAppNotificationService {
     return;
   };
 
-  getUnreadCountByUser = async function(user: Types.ObjectId): Promise<number> {
+  getUnreadCountByUser = async function(user: Types.ObjectId): Promise<number| undefined> {
     const query = { user, status: STATUS_UNREAD };
 
     try {