From 5ce6fa67d212823be43c796e8632b721ede065bb Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 2 Apr 2018 23:19:07 +0900 Subject: Make migration scripts and use createdAt instead of _id --- src/models/followed-log.ts | 1 + src/models/following-log.ts | 1 + src/processor/http/follow.ts | 2 ++ src/server/api/endpoints/aggregation/users/followers.ts | 4 ++-- src/server/api/endpoints/aggregation/users/following.ts | 4 ++-- 5 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/models/followed-log.ts b/src/models/followed-log.ts index 4d8ecf684e..9e3ca17822 100644 --- a/src/models/followed-log.ts +++ b/src/models/followed-log.ts @@ -6,6 +6,7 @@ export default FollowedLog; export type IFollowedLog = { _id: ObjectID; + createdAt: Date; userId: ObjectID; count: number; }; diff --git a/src/models/following-log.ts b/src/models/following-log.ts index f18707db80..045ff7bf02 100644 --- a/src/models/following-log.ts +++ b/src/models/following-log.ts @@ -6,6 +6,7 @@ export default FollowingLog; export type IFollowingLog = { _id: ObjectID; + createdAt: Date; userId: ObjectID; count: number; }; diff --git a/src/processor/http/follow.ts b/src/processor/http/follow.ts index 29ac9fa552..cbb7838c68 100644 --- a/src/processor/http/follow.ts +++ b/src/processor/http/follow.ts @@ -24,6 +24,7 @@ export default ({ data }, done) => Following.findOne({ _id: data.following }).th }), promisedFollower.then(({ followingCount }) => FollowingLog.insert({ + createdAt: data.following.createdAt, userId: followerId, count: followingCount + 1 })), @@ -36,6 +37,7 @@ export default ({ data }, done) => Following.findOne({ _id: data.following }).th }), promisedFollowee.then(({ followersCount }) => FollowedLog.insert({ + createdAt: data.following.createdAt, userId: followerId, count: followersCount + 1 })), diff --git a/src/server/api/endpoints/aggregation/users/followers.ts b/src/server/api/endpoints/aggregation/users/followers.ts index 580d31a3f2..f9a5e8dca8 100644 --- a/src/server/api/endpoints/aggregation/users/followers.ts +++ b/src/server/api/endpoints/aggregation/users/followers.ts @@ -42,10 +42,10 @@ module.exports = (params) => new Promise(async (res, rej) => { for (let i = 0; i < 30; i++) { graph.push(FollowedLog.findOne({ - _id: { $lt: ObjectID.createFromTime(cursorTime / 1000) }, + createdAt: { $lt: new Date(cursorTime / 1000) }, userId: user._id }, { - sort: { _id: -1 }, + sort: { createdAt: -1 }, }).then(log => { cursorDate = new Date(today.getTime()); cursorTime = cursorDate.setDate(today.getDate() - i); diff --git a/src/server/api/endpoints/aggregation/users/following.ts b/src/server/api/endpoints/aggregation/users/following.ts index 3ac0e3a539..b30b1282ba 100644 --- a/src/server/api/endpoints/aggregation/users/following.ts +++ b/src/server/api/endpoints/aggregation/users/following.ts @@ -42,10 +42,10 @@ module.exports = (params) => new Promise(async (res, rej) => { for (let i = 0; i < 30; i++) { graph.push(FollowingLog.findOne({ - _id: { $lt: ObjectID.createFromTime(cursorTime / 1000) }, + createdAt: { $lt: new Date(cursorTime / 1000) }, userId: user._id }, { - sort: { _id: -1 }, + sort: { createdAt: -1 }, }).then(log => { cursorDate = new Date(today.getTime()); cursorTime = cursorDate.setDate(today.getDate() - i); -- cgit v1.2.3-freya