From 319e905bf9e5398cb62eaeee7da80ff6e942c094 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 2 Apr 2018 21:57:36 +0900 Subject: Introduce followed log and following log --- src/models/followed-log.ts | 11 +++++++++++ src/models/following-log.ts | 11 +++++++++++ src/models/following.ts | 1 - src/models/user.ts | 12 ++++-------- 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 src/models/followed-log.ts create mode 100644 src/models/following-log.ts (limited to 'src/models') diff --git a/src/models/followed-log.ts b/src/models/followed-log.ts new file mode 100644 index 0000000000..4d8ecf684e --- /dev/null +++ b/src/models/followed-log.ts @@ -0,0 +1,11 @@ +import { ObjectID } from 'mongodb'; +import db from '../db/mongodb'; + +const FollowedLog = db.get('followedLogs'); +export default FollowedLog; + +export type IFollowedLog = { + _id: ObjectID; + userId: ObjectID; + count: number; +}; diff --git a/src/models/following-log.ts b/src/models/following-log.ts new file mode 100644 index 0000000000..f18707db80 --- /dev/null +++ b/src/models/following-log.ts @@ -0,0 +1,11 @@ +import { ObjectID } from 'mongodb'; +import db from '../db/mongodb'; + +const FollowingLog = db.get('followingLogs'); +export default FollowingLog; + +export type IFollowingLog = { + _id: ObjectID; + userId: ObjectID; + count: number; +}; diff --git a/src/models/following.ts b/src/models/following.ts index fe9ce550d3..b4090d8c7e 100644 --- a/src/models/following.ts +++ b/src/models/following.ts @@ -8,7 +8,6 @@ export default Following; export type IFollowing = { _id: mongo.ObjectID; createdAt: Date; - deletedAt: Date; followeeId: mongo.ObjectID; followerId: mongo.ObjectID; }; diff --git a/src/models/user.ts b/src/models/user.ts index d3c94cab3e..f817c33aa2 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -234,8 +234,7 @@ export const pack = ( _user.isFollowing = (async () => { const follow = await Following.findOne({ followerId: meId, - followeeId: _user.id, - deletedAt: { $exists: false } + followeeId: _user.id }); return follow !== null; })(); @@ -244,8 +243,7 @@ export const pack = ( _user.isFollowed = (async () => { const follow2 = await Following.findOne({ followerId: _user.id, - followeeId: meId, - deletedAt: { $exists: false } + followeeId: meId }); return follow2 !== null; })(); @@ -275,15 +273,13 @@ export const pack = ( // Get following you know count _user.followingYouKnowCount = Following.count({ followeeId: { $in: myFollowingIds }, - followerId: _user.id, - deletedAt: { $exists: false } + followerId: _user.id }); // Get followers you know count _user.followersYouKnowCount = Following.count({ followeeId: _user.id, - followerId: { $in: myFollowingIds }, - deletedAt: { $exists: false } + followerId: { $in: myFollowingIds } }); } } -- cgit v1.2.3-freya