gio
/
think
mirror of https://github.com/fantasticit/think.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sever: fix sql to select recent documents

This commit is contained in:
fantasticit 2022-05-25 12:39:44 +08:00
parent d1f51707a8
commit f37820f79f
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/server/src/services/view.service.ts
View File

@ -19,21 +19,12 @@ export class ViewService {
* @returns * @returns
*/ */
async create({ userId = 'public', documentId, userAgent }) { async create({ userId = 'public', documentId, userAgent }) {
const old = await this.viewRepo.findOne({ documentId, userId }); const data = await this.viewRepo.create({
let data;
if (old) {
data = await this.viewRepo.merge(old, {
updatedAt: convertDateToMysqlTimestamp(Date.now()),
});
} else {
data = await this.viewRepo.create({
userId, userId,
documentId, documentId,
originUserAgent: userAgent, originUserAgent: userAgent,
parsedUserAgent: parseUserAgent(userAgent).text, parsedUserAgent: parseUserAgent(userAgent).text,
}); });
}
const ret = await this.viewRepo.save(data); const ret = await this.viewRepo.save(data);
return ret; return ret;
} }
@ -80,11 +71,16 @@ export class ViewService {
const count = 20; const count = 20;
const ret = await this.viewRepo.query( const ret = await this.viewRepo.query(
`SELECT documentId, ANY_VALUE(updated_at) as visitedAt `
SELECT v.documentId, v.visitedAt FROM (
SELECT ANY_VALUE(documentId) as documentId, ANY_VALUE(created_at) as visitedAt
FROM view FROM view
WHERE view.userId = '${userId}' WHERE view.userId = '${userId}'
AND (view.updated_at BETWEEN '${from}' AND '${end}') AND (view.created_at BETWEEN '${from}' AND '${end}')
GROUP BY documentId GROUP BY visitedAt
ORDER BY visitedAt DESC
) v
GROUP BY v.documentId
LIMIT ${count} LIMIT ${count}
` `
); );