Merge pull request #16 from CropWatchDevelopment/develop

implemented filter by group, location in latest-primary-data route

Author: CropWatchDevelopment

src/v1/devices/devices.controller.ts

@@ -111,6 +111,9 @@ export class DevicesController {
   @UseGuards(JwtAuthGuard)
   @ApiQuery({ name: 'skip', description: 'Number of records to skip for pagination', required: false })
   @ApiQuery({ name: 'take', description: 'Number of records to take for pagination', required: false })
+  @ApiQuery({ name: 'group', description: 'Filter by device group', required: false })
+  @ApiQuery({ name: 'name', description: 'Filter by device name', required: false })
+  @ApiQuery({ name: 'location', description: 'Filter by device location', required: false })
   @ApiOperation({
     summary: 'Get the latest primary data for all devices (paginated)',
     description: `
@@ -119,7 +122,10 @@ export class DevicesController {
   allLatestPrimaryData(@Req() req) {
     const skip = parseInt(req.query.skip, 10) || 0;
     const take = parseInt(req.query.take, 10) || 10;
-    return this.devicesService.findAllLatestData(req.user, skip, take, req.headers.authorization);
+    const searchGroup = req.query.group ? String(req.query.group) : undefined;
+    const searchName = req.query.name ? String(req.query.name) : undefined;
+    const searchLocation = req.query.location ? String(req.query.location) : undefined;
+    return this.devicesService.findAllLatestData(req.user, skip, take, req.headers.authorization, searchGroup, searchName, searchLocation);
   }
 
   @Get('location/:location_id')

src/v1/devices/devices.service.ts

@@ -399,32 +399,57 @@ export class DevicesService {
     skip: number = 0,
     take: number = 10,
     authHeader: string,
+    searchGroup?: string,
+    searchName?: string,
+    searchLocation?: string,
   ): Promise<PagedDevicesResponse<any>> {
     const accessToken = getAccessToken(authHeader);
     const client = this.supabaseService.getClient(accessToken);
     const userId = getUserId(jwtPayload);
 
-    const { count, error: countError } = await client
+    let countQuery = client
       .from('cw_devices')
-      .select('*, owner_match:cw_device_owners()', { count: 'exact', head: true })
+      .select('owner_match:cw_device_owners(), cw_locations(name)', { count: 'exact', head: true })
       .eq('owner_match.user_id', userId)
       .gt('owner_match.permission_level', 4)
-      .or(`user_id.eq.${userId},owner_match.not.is.null`)
-      .order('name', { ascending: true });
+      .or(`user_id.eq.${userId},owner_match.not.is.null`);
+
+    if (searchGroup) {
+      countQuery = countQuery.ilike('group', `%${searchGroup}%`);
+    }
+    if (searchName) {
+      countQuery = countQuery.ilike('name', `%${searchName}%`);
+    }
+    if (searchLocation) {
+      countQuery = countQuery.ilike('cw_locations.name', `%${searchLocation}%`);
+    }
+
+    const { count, error: countError } = await countQuery;
 
     if (countError) {
       throw new InternalServerErrorException('Failed to fetch device');
     }
 
-    const { data: device, error: deviceError } = await client
+    let devicesQuery = client
       .from('cw_devices')
       .select('*, cw_device_type(*), cw_locations(name), owner_match:cw_device_owners()')
       .eq('owner_match.user_id', userId)
       .gt('owner_match.permission_level', 4)
-      .or(`user_id.eq.${userId},owner_match.not.is.null`)
-      .range(skip, skip + take - 1)
-      .limit(take)
-      .order('name', { ascending: false });
+      .or(`user_id.eq.${userId},owner_match.not.is.null`);
+
+    if (searchGroup) {
+      devicesQuery = devicesQuery.ilike('group', `%${searchGroup}%`);
+    }
+    if (searchName) {
+      devicesQuery = devicesQuery.ilike('name', `%${searchName}%`);
+    }
+    if (searchLocation) {
+      devicesQuery = devicesQuery.ilike('cw_locations.name', `%${searchLocation}%`);
+    }
+
+    const { data: device, error: deviceError } = await devicesQuery
+      .order('name', { ascending: false })
+      .range(skip, skip + take - 1);
 
     if (deviceError) {
       throw new InternalServerErrorException('Failed to fetch device');