apps/backend/src/routes/managementAspect/route.ts

@@ -80,9 +80,19 @@ const managementAspectRoute = new Hono<HonoEnv>()
     async (c) => {
       const { includeTrashed, page, limit, q } = c.req.valid("query");
   
-      const totalCountQuery = includeTrashed
-        ? sql<number>`(SELECT count(DISTINCT ${aspects.id}) FROM ${aspects})`
-        : sql<number>`(SELECT count(DISTINCT ${aspects.id}) FROM ${aspects} WHERE ${aspects.deletedAt} IS NULL)`;
+      const aspectCountQuery = await db
+        .select({
+          count: sql<number>`count(*)`,
+        })
+        .from(aspects)
+        .where(
+          and(
+            includeTrashed ? undefined : isNull(aspects.deletedAt),
+            q ? or(ilike(aspects.name, q), eq(aspects.id, q)) : undefined
+          )
+        );
+  
+      const totalItems = Number(aspectCountQuery[0]?.count) || 0;
   
       const aspectIdsQuery = await db
         .select({
@@ -129,7 +139,6 @@ const managementAspectRoute = new Hono<HonoEnv>()
             FROM ${questions}
             WHERE ${questions.subAspectId} = ${subAspects.id}
           )`.as('questionCount'),
-          fullCount: totalCountQuery,
         })
         .from(aspects)
         .leftJoin(subAspects, eq(subAspects.aspectId, aspects.id))
@@ -178,13 +187,13 @@ const managementAspectRoute = new Hono<HonoEnv>()
         data: groupedArray,
         _metadata: {
           currentPage: page,
-          totalPages: Math.ceil((Number(result[0]?.fullCount) ?? 0) / limit),
-          totalItems: Number(result[0]?.fullCount) ?? 0,
+          totalPages: Math.ceil(totalItems / limit),
+          totalItems,
           perPage: limit,
         },
       });
     }
-  )
+  )  
 
   // Get aspect by id
   .get(