Merge pull request #15 from CropWatchDevelopment/develop

adding the ability to search, and filter values

Author: CropWatchDevelopment

src/v1/devices/devices.controller.ts

@@ -65,12 +65,20 @@ export class DevicesController {
     description: `
     Returns all devices for the authenticated user.`,
   })
+  @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 })
   findAll(@Req() req) {
     const parsedSkip = parseInt(req.query.skip, 10);
     const parsedTake = parseInt(req.query.take, 10);
     const skip = Number.isNaN(parsedSkip) ? 0 : parsedSkip;
     const take = Math.min(Number.isNaN(parsedTake) ? 100 : parsedTake, 1000);
-    return this.devicesService.findAll(req.user, req.headers.authorization, skip, take);
+    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.findAll(req.user, req.headers.authorization, skip, take, searchGroup, searchName, searchLocation);
   }
 
   @Get('status')
@@ -101,8 +109,8 @@ export class DevicesController {
 
   @Get('latest-primary-data')
   @UseGuards(JwtAuthGuard)
-  @ApiParam({ name: 'skip (0)', description: 'Number of records to skip for pagination', required: false })
-  @ApiParam({ name: 'take (10)', description: 'Number of records to take for pagination', required: false })
+  @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 })
   @ApiOperation({
     summary: 'Get the latest primary data for all devices (paginated)',
     description: `

src/v1/devices/devices.service.ts

@@ -26,6 +26,9 @@ export class DevicesService {
     authHeader: string,
     skip: number = 0,
     take?: number,
+    searchGroup?: string,
+    searchName?: string,
+    searchLocation?: string,
   ): Promise<PagedDevicesResponse<TableRow<'cw_devices'>>> {
     const accessToken = getAccessToken(authHeader);
     const client = this.supabaseService.getClient(accessToken);
@@ -51,8 +54,19 @@ export class DevicesService {
   `)
       .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) {
+      devicesQuery = devicesQuery.ilike('group', `%${searchGroup}%`);
+    }
+    if (searchName) {
+      devicesQuery = devicesQuery.ilike('name', `%${searchName}%`);
+    }
+    if (searchLocation) {
+      devicesQuery = devicesQuery.ilike('location', `%${searchLocation}%`);
+    }
+
+    devicesQuery = devicesQuery.order('name', { ascending: true });
 
     if (resolvedTake > 0) {
       devicesQuery = devicesQuery
@@ -94,7 +108,9 @@ export class DevicesService {
       .select(`
     *,
     owner_match:cw_device_owners(),
-    cw_device_owners(*)
+    cw_device_owners(*),
+    cw_locations(name, location_id),
+    cw_device_type(*)
   `)
       .eq('dev_eui', normalizedDevEui)
       .eq('owner_match.user_id', userId)