From f6b18d3f826becb6398b332ea1526459e732de43 Mon Sep 17 00:00:00 2001 From: Thanu Poptiphueng Date: Mon, 24 Jun 2024 00:23:42 +0700 Subject: [PATCH] apply limit to resulting array --- src/userRoute.ts | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/userRoute.ts b/src/userRoute.ts index acd35d7..fa62103 100644 --- a/src/userRoute.ts +++ b/src/userRoute.ts @@ -177,7 +177,7 @@ async function getAllUser( }, }, }); - const topThree = await db.query.user.findMany({ + const topTen = await db.query.user.findMany({ with: { group: true, opinions: { @@ -187,7 +187,7 @@ async function getAllUser( with: { province: true }, }, }, - limit: 3, + limit: 10, orderBy: user.rank, where: (user, { eq, and }) => { const conditions: SQL[] = []; @@ -247,17 +247,19 @@ async function getAllUser( ]; } else { resultUser = [ - ...topThree, - ...users.filter((u) => topThree.filter((v) => v.id == u.id).length == 0), + ...topTen, + ...users.filter((u) => topTen.filter((v) => v.id == u.id).length == 0), ]; } - return resultUser.map((u) => ({ - ...u, - phone: hidePhone(u.phone), - verified: true, - image: u.image ? `${Config.minioPublicBucketEndpoint}${u.image}` : null, - })); + return resultUser + .map((u) => ({ + ...u, + phone: hidePhone(u.phone), + verified: true, + image: u.image ? `${Config.minioPublicBucketEndpoint}${u.image}` : null, + })) + .slice(0, limit); } async function getUser(userId: number, showPhone: boolean) {