change from pr

Author: Lauest-Iterator

src/controllers/admin-controller/application.controller.ts

@@ -38,11 +38,13 @@ import { ListAllApplicationsDto } from "@dto/list-all-applications.dto";
 import { ListAllEntitiesDto } from "@dto/list-all-entities.dto";
 import { ListAllIoTDevicesResponseDto } from "@dto/list-all-iot-devices-response.dto";
 import { IoTDevicesListToMapResponseDto } from "@dto/list-all-iot-devices-to-map-response.dto";
+import { ListAllIotDevicesDto } from "@dto/list-all-iot-devices.dto";
 import { UpdateApplicationOrganizationDto } from "@dto/update-application-organization.dto";
 import { UpdateApplicationDto } from "@dto/update-application.dto";
 import { Application } from "@entities/application.entity";
 import { ActionType } from "@entities/audit-log-entry";
 import { AuthenticatedRequest } from "@entities/dto/internal/authenticated-request";
+import { IoTDevice } from "@entities/iot-device.entity";
 import { ErrorCodes } from "@enum/error-codes.enum";
 import {
   ApplicationAccessScope,
@@ -111,7 +113,11 @@ export class ApplicationController {
     @Param("id", new ParseIntPipe()) id: number
   ): Promise<ApplicationDashboardResponseDto> {
     try {
-      return await this.getApplicationsWithError(req, id, req.user.permissions.isGlobalAdmin);
+      const whitelist = await this.getApplicationsWhiteList(req, id, req.user.permissions.isGlobalAdmin);
+      return {
+        ...(await this.applicationService.countApplicationsWithError(id, whitelist)),
+        totalDevices: await this.applicationService.countAllDevices(id, whitelist),
+      };
     } catch (err) {
       throw new NotFoundException(ErrorCodes.IdDoesNotExists);
     }
@@ -149,6 +155,23 @@ export class ApplicationController {
     }
   }
 
+  @Read()
+  @Get(":id/iot-devices-org")
+  @ApiOperation({ summary: "Find the IoTDevice of an organization" })
+  @ApiNotFoundResponse()
+  async findIoTDevicesForOrganization(
+    @Req() req: AuthenticatedRequest,
+    @Param("id", new ParseIntPipe()) organizationId: number,
+    @Query() query?: ListAllIotDevicesDto
+  ): Promise<IoTDevice[]> {
+    try {
+      const whitelist = await this.getApplicationsWhiteList(req, organizationId, req.user.permissions.isGlobalAdmin);
+      return await this.applicationService.getAllDevices(organizationId, query);
+    } catch (err) {
+      throw new NotFoundException(ErrorCodes.IdDoesNotExists);
+    }
+  }
+
   @Read()
   @Get(":id/iot-devices-map")
   @ApiOperation({ summary: "Find the IoTDevices of an Application" })
@@ -313,27 +336,21 @@ export class ApplicationController {
     return await this.applicationService.findFilterInformation(allowedApplications, organizationId);
   }
 
-  private async getApplicationsWithError(req: AuthenticatedRequest, organizationId: number, isGlobalAdmin: boolean) {
+  private async getApplicationsWhiteList(
+    req: AuthenticatedRequest,
+    organizationId: number,
+    isGlobalAdmin: boolean
+  ): Promise<number[] | null> {
     if (isGlobalAdmin) {
-      return {
-        ...(await this.applicationService.countApplicationsWithError(organizationId)),
-        totalDevices: await this.applicationService.countAllDevices(organizationId),
-      };
+      return null;
     }
 
     const allFromOrg = req.user.permissions.getAllOrganizationsWithUserAdmin();
 
     if (allFromOrg.some(x => x === organizationId)) {
-      return {
-        ...(await this.applicationService.countApplicationsWithError(organizationId)),
-        totalDevices: await this.applicationService.countAllDevices(organizationId),
-      };
+      return null;
     }
 
-    const allowedApplications = req.user.permissions.getAllApplicationsWithAtLeastRead();
-    return {
-      ...(await this.applicationService.countApplicationsWithError(organizationId, allowedApplications)),
-      totalDevices: await this.applicationService.countAllDevices(organizationId, allowedApplications),
-    };
+    return req.user.permissions.getAllApplicationsWithAtLeastRead();
   }
 }

src/entities/dto/list-all-iot-devices.dto.ts

@@ -0,0 +1,25 @@
+import { ApplicationStatus } from "@enum/application-status.enum";
+import { NullableApplicationStatus, NullableString } from "@helpers/string-to-number-validator";
+import { ApiProperty } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
+import { IsOptional, IsString } from "class-validator";
+
+export class ListAllIotDevicesDto {
+  @ApiProperty({ type: Number, required: false })
+  @IsOptional()
+  @IsString()
+  @Transform(({ value }) => NullableApplicationStatus(value))
+  status?: ApplicationStatus | undefined;
+
+  @ApiProperty({ type: String, required: false })
+  @IsOptional()
+  @IsString()
+  @Transform(({ value }) => NullableString(value))
+  statusCheck?: "stable" | "alert" | null;
+
+  @ApiProperty({ type: Number, required: false })
+  @IsOptional()
+  @IsString()
+  @Transform(({ value }) => NullableString(value))
+  owner?: string | null;
+}

src/services/device-management/application.service.ts

@@ -8,6 +8,7 @@ import { ListAllApplicationsDto } from "@dto/list-all-applications.dto";
 import { ListAllEntitiesDto } from "@dto/list-all-entities.dto";
 import { ListAllIoTDevicesResponseDto } from "@dto/list-all-iot-devices-response.dto";
 import { IoTDevicesListToMapResponseDto } from "@dto/list-all-iot-devices-to-map-response.dto";
+import { ListAllIotDevicesDto } from "@dto/list-all-iot-devices.dto";
 import { LoRaWANDeviceWithChirpstackDataDto } from "@dto/lorawan-device-with-chirpstack-data.dto";
 import { UpdateApplicationOrganizationDto } from "@dto/update-application-organization.dto";
 import { UpdateApplicationDto } from "@dto/update-application.dto";
@@ -105,6 +106,57 @@ export class ApplicationService {
       throw new Error("Database query failed");
     }
   }
+
+  async getAllDevices(
+    organizationId: number,
+    query?: ListAllIotDevicesDto,
+    whitelist?: number[] | null
+  ): Promise<IoTDevice[]> {
+    const queryBuilder = this.iotDeviceRepository
+      .createQueryBuilder("device")
+      .leftJoin("device.application", "app")
+      .leftJoin("app.dataTargets", "dataTargets")
+      .leftJoinAndSelect("device.latestReceivedMessage", "latestMessage")
+      .addSelect(["latestMessage.id", "latestMessage.sentTime"])
+      .where("app.belongsToId = :organizationId", { organizationId });
+
+    if (whitelist && whitelist.length > 0) {
+      queryBuilder.andWhere("app.id IN (:...whitelist)", { whitelist });
+    }
+
+    if (query.status) {
+      queryBuilder.andWhere("app.status = :status", { status: query.status });
+    }
+
+    if (query.owner) {
+      queryBuilder.andWhere("app.owner = :owner", { owner: query.owner });
+    }
+
+    if (query.statusCheck === "alert") {
+      queryBuilder.andWhere(
+        new Brackets(qb => {
+          qb.where("dataTargets.id IS NULL").orWhere("latestMessage.sentTime < NOW() - INTERVAL '24 HOURS'");
+        })
+      );
+    }
+
+    if (query.statusCheck === "stable") {
+      queryBuilder.andWhere(
+        new Brackets(qb => {
+          qb.where("dataTargets.id IS NOT NULL").orWhere("latestMessage.sentTime > NOW() - INTERVAL '24 HOURS'");
+        })
+      );
+    }
+
+    try {
+      const test = await queryBuilder.getMany();
+      return test;
+    } catch (error) {
+      console.error("Database query failed:", error);
+      throw new Error("Database query failed");
+    }
+  }
+
   async findAndCountInList(
     query?: ListAllApplicationsDto,
     whitelist?: number[]