From 6768ecc0e29a67a771a3a9b5a6cc169d29ea84b5 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Wed, 25 May 2022 12:48:14 +0800 Subject: [PATCH] server: fix get recent view --- packages/server/src/helpers/date.helper.ts | 17 ----------------- packages/server/src/services/view.service.ts | 6 ------ 2 files changed, 23 deletions(-) diff --git a/packages/server/src/helpers/date.helper.ts b/packages/server/src/helpers/date.helper.ts index 060444d1..e95825a9 100644 --- a/packages/server/src/helpers/date.helper.ts +++ b/packages/server/src/helpers/date.helper.ts @@ -9,20 +9,3 @@ export const dateFormat = (date = null, format = 'yyyy-MM-dd HH:mm:ss') => { return dateFormatFn(t, format); }; - -export const convertDateToMysqlTimestamp = (time) => { - const date = new Date(time); - return ( - date.getUTCFullYear() + - '-' + - ('00' + (date.getUTCMonth() + 1)).slice(-2) + - '-' + - ('00' + date.getUTCDate()).slice(-2) + - ' ' + - ('00' + date.getUTCHours()).slice(-2) + - ':' + - ('00' + date.getUTCMinutes()).slice(-2) + - ':' + - ('00' + date.getUTCSeconds()).slice(-2) - ); -}; diff --git a/packages/server/src/services/view.service.ts b/packages/server/src/services/view.service.ts index 2f0de576..794216ad 100644 --- a/packages/server/src/services/view.service.ts +++ b/packages/server/src/services/view.service.ts @@ -1,6 +1,4 @@ import { ViewEntity } from '@entities/view.entity'; -import { convertDateToMysqlTimestamp } from '@helpers/date.helper'; -import { ONE_DAY } from '@helpers/log.helper'; import { parseUserAgent } from '@helpers/ua.helper'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; @@ -65,9 +63,6 @@ export class ViewService { visitedAt: Date; }> > { - const now = Date.now(); - const from = convertDateToMysqlTimestamp(now - 3 * ONE_DAY); - const end = convertDateToMysqlTimestamp(now); const count = 20; const ret = await this.viewRepo.query( @@ -76,7 +71,6 @@ export class ViewService { SELECT ANY_VALUE(documentId) as documentId, ANY_VALUE(created_at) as visitedAt FROM view WHERE view.userId = '${userId}' - AND (view.created_at BETWEEN '${from}' AND '${end}') GROUP BY visitedAt ORDER BY visitedAt DESC ) v