Fix return response and add list

server/routers/target/createTarget.ts

@@ -32,7 +32,7 @@ export async function createTarget(req: Request, res: Response, next: NextFuncti
     const newTarget = await db.insert(targets).values(targetData).returning();
 
     return res.status(HttpCode.CREATED).send(
-      response({
+      response(res, {
         data: newTarget[0],
         success: true,
         error: false,

server/routers/target/deleteTarget.ts

@@ -39,7 +39,7 @@ export async function deleteTarget(req: Request, res: Response, next: NextFuncti
     }
 
     return res.status(HttpCode.OK).send(
-      response({
+      response(res, {
         data: null,
         success: true,
         error: false,

server/routers/target/getTarget.ts

@@ -40,7 +40,7 @@ export async function getTarget(req: Request, res: Response, next: NextFunction)
     }
 
     return res.status(HttpCode.OK).send(
-      response({
+      response(res, {
         data: target[0],
         success: true,
         error: false,

server/routers/target/listTargets.ts

@@ -0,0 +1,73 @@
+import { Request, Response, NextFunction } from 'express';
+import { z } from 'zod';
+import { db } from '@server/db';
+import { targets, resources } from '@server/db/schema';
+import response from "@server/utils/response";
+import HttpCode from '@server/types/HttpCode';
+import createHttpError from 'http-errors';
+import { sql, eq } from 'drizzle-orm';
+
+const listTargetsSchema = z.object({
+  limit: z.string().optional().transform(Number).pipe(z.number().int().positive().default(10)),
+  offset: z.string().optional().transform(Number).pipe(z.number().int().nonnegative().default(0)),
+  resourceId: z.string().optional(),
+});
+
+export async function listTargets(req: Request, res: Response, next: NextFunction): Promise<any> {
+  try {
+    const parsedQuery = listTargetsSchema.safeParse(req.query);
+    if (!parsedQuery.success) {
+      return next(
+        createHttpError(
+          HttpCode.BAD_REQUEST,
+          parsedQuery.error.errors.map(e => e.message).join(', ')
+        )
+      );
+    }
+
+    const { limit, offset, resourceId } = parsedQuery.data;
+
+    let baseQuery: any = db
+      .select({
+        targetId: targets.targetId,
+        ip: targets.ip,
+        method: targets.method,
+        port: targets.port,
+        protocol: targets.protocol,
+        enabled: targets.enabled,
+        resourceName: resources.name,
+      })
+      .from(targets)
+      .leftJoin(resources, eq(targets.resourceId, resources.resourceId));
+
+    let countQuery: any = db.select({ count: sql<number>`cast(count(*) as integer)` }).from(targets);
+
+    if (resourceId) {
+      baseQuery = baseQuery.where(eq(targets.resourceId, resourceId));
+      countQuery = countQuery.where(eq(targets.resourceId, resourceId));
+    }
+
+    const targetsList = await baseQuery.limit(limit).offset(offset);
+    const totalCountResult = await countQuery;
+    const totalCount = totalCountResult[0].count;
+
+    return res.status(HttpCode.OK).send(
+      response(res, {
+        data: {
+          targets: targetsList,
+          pagination: {
+            total: totalCount,
+            limit,
+            offset,
+          },
+        },
+        success: true,
+        error: false,
+        message: "Targets retrieved successfully",
+        status: HttpCode.OK,
+      })
+    );
+  } catch (error) {
+    next(error);
+  }
+}

server/routers/target/updateTarget.ts

@@ -61,7 +61,7 @@ export async function updateTarget(req: Request, res: Response, next: NextFuncti
     }
 
     return res.status(HttpCode.OK).send(
-      response({
+      response(res, {
         data: updatedTarget[0],
         success: true,
         error: false,