perf: enhance perf when query

conganhhcmus · Mar 23, 2024 · bfd61e8 · bfd61e8
1 parent b7d0f55
commit bfd61e8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/src/models/transaction.ts b/src/models/transaction.ts
@@ -4,11 +4,11 @@ import mongoose, { Types } from 'mongoose';
 const TransactionSchema = new mongoose.Schema({
     amount: { type: Number, required: true },
     sourceId: { type: Types.ObjectId, required: false },
-    targetId: { type: Types.ObjectId, required: true },
+    targetId: { type: Types.ObjectId, required: true, index: true },
     type: { type: Number, required: true, index: true },
     status: { type: Number, required: true, index: true },
     createTime: { type: Date, required: true },
-    updateTime: { type: Date, required: false, default: moment().utc().toDate() },
+    updateTime: { type: Date, required: false, default: moment().utc().toDate(), index: true },
     updateBy: { type: Types.ObjectId, required: false },
 });
 

diff --git a/src/repositories/comics.ts b/src/repositories/comics.ts
@@ -7,6 +7,10 @@ import { ComicStatus } from '@/constants/comic';
 const getComicByPageAndQuery = async (page: number, query: {}, sort: {}, pageSize: number = DEFAULT_COMIC_PAGE_SIZE) => {
     const total = await ComicsModel.countDocuments(query).exec();
     const comics = await ComicsModel.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: pageSize * page - pageSize },
+        { $limit: pageSize },
         {
             $lookup: {
                 from: 'chapters',
@@ -30,10 +34,6 @@ const getComicByPageAndQuery = async (page: number, query: {}, sort: {}, pageSiz
                 as: 'genres',
             },
         },
-        { $match: query },
-        { $sort: sort },
-        { $skip: pageSize * page - pageSize },
-        { $limit: pageSize },
     ]);
 
     return { data: comics, totalPage: Math.ceil(total / pageSize), currentPage: page };
@@ -54,7 +54,7 @@ export const getAllComics = async (page: number, q: string) => {
 };
 
 export const getComicsByGenres = async (type: string, page: number) => {
-    const query = type == 'all' ? {} : { 'genres._id': new Types.ObjectId(type) };
+    const query = type == 'all' ? {} : { genres: { $in: [new Types.ObjectId(type)] } };
     const sort = { createTime: -1, updateTime: -1 };
 
     return getComicByPageAndQuery(page, query, sort);
@@ -84,6 +84,7 @@ export const getTopComics = async (type: string, page: number, status: string) =
 export const getComicById = async (id: string) => {
     const query = { _id: new Types.ObjectId(id) };
     const comics = await ComicsModel.aggregate([
+        { $match: query },
         {
             $lookup: {
                 from: 'chapters',
@@ -107,7 +108,6 @@ export const getComicById = async (id: string) => {
                 as: 'genres',
             },
         },
-        { $match: query },
     ]);
 
     return comics[0] || undefined;

diff --git a/src/repositories/transaction.ts b/src/repositories/transaction.ts
@@ -10,11 +10,10 @@ export const createTransaction = (values: Record<string, any>): Promise<Transact
 
 export const getAllTransaction = async (option: number, status: number[], page: number, q: string, sort: {}) => {
     const date = moment().utc().endOf('day').subtract(option, 'days').toDate();
-    const query =
-        option !== 0
-            ? { status: { $in: status }, updateTime: { $gt: date }, 'users.username': { $regex: '.*' + q + '.*', $options: 'i' } }
-            : { status: { $in: status }, 'users.username': { $regex: '.*' + q + '.*', $options: 'i' } };
+    const queryOption = option !== 0 ? { status: { $in: status }, updateTime: { $gt: date } } : { status: { $in: status } };
+    const querySearch = !!q ? { 'users.username': { $regex: '.*' + q + '.*', $options: 'i' } } : {};
     const total = await TransactionModel.aggregate([
+        { $match: queryOption },
         {
             $lookup: {
                 from: 'users',
@@ -23,6 +22,7 @@ export const getAllTransaction = async (option: number, status: number[], page:
                 as: 'users',
             },
         },
+        { $match: querySearch },
         {
             $lookup: {
                 from: 'users',
@@ -31,10 +31,10 @@ export const getAllTransaction = async (option: number, status: number[], page:
                 as: 'updateUsers',
             },
         },
-        { $match: query },
     ]);
 
     let transaction = await TransactionModel.aggregate([
+        { $match: queryOption },
         {
             $lookup: {
                 from: 'users',
@@ -43,6 +43,9 @@ export const getAllTransaction = async (option: number, status: number[], page:
                 as: 'users',
             },
         },
+        { $match: querySearch },
+        { $sort: sort },
+        { $skip: DEFAULT_PAGE_SIZE * page - DEFAULT_PAGE_SIZE },
         {
             $lookup: {
                 from: 'users',
@@ -51,9 +54,6 @@ export const getAllTransaction = async (option: number, status: number[], page:
                 as: 'updateUsers',
             },
         },
-        { $match: query },
-        { $sort: sort },
-        { $skip: DEFAULT_PAGE_SIZE * page - DEFAULT_PAGE_SIZE },
     ]);
     const limit = Math.min(DEFAULT_PAGE_SIZE, transaction.length);
 

diff --git a/src/repositories/users.ts b/src/repositories/users.ts
@@ -6,8 +6,9 @@ import { Types } from 'mongoose';
 
 export const getUsers = async (page: number, q: string, type: string) => {
     const queryType = type === '0' ? {} : { 'transactions.0': { $exists: type === '1' } };
-    const query = !!q ? { username: { $regex: '.*' + q + '.*', $options: 'i' }, ...queryType } : { ...queryType };
+    const queryUsername = !!q ? { username: { $regex: '.*' + q + '.*', $options: 'i' } } : {};
     const total = await UserModel.aggregate([
+        { $match: queryUsername },
         {
             $lookup: {
                 from: 'transactions',
@@ -23,9 +24,10 @@ export const getUsers = async (page: number, q: string, type: string) => {
                 as: 'transactions',
             },
         },
-        { $match: query },
+        { $match: queryType },
     ]);
     const users = await UserModel.aggregate([
+        { $match: queryUsername },
         {
             $lookup: {
                 from: 'transactions',
@@ -41,7 +43,7 @@ export const getUsers = async (page: number, q: string, type: string) => {
                 as: 'transactions',
             },
         },
-        { $match: query },
+        { $match: queryType },
         { $sort: { createTime: -1 } },
         { $skip: DEFAULT_PAGE_SIZE * page - DEFAULT_PAGE_SIZE },
         { $limit: DEFAULT_PAGE_SIZE },