Merge branch 'stage'

Author: fcv-iteratorIt

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

@@ -30,18 +30,21 @@ import { ComposeAuthGuard } from "@auth/compose-auth.guard";
 import { ApplicationAdmin, Read } from "@auth/roles.decorator";
 import { RolesGuard } from "@auth/roles.guard";
 import { ApiAuth } from "@auth/swagger-auth-decorator";
+import { ApplicationDashboardResponseDto } from "@dto/applications-dashboard-responses";
 import { CreateApplicationDto } from "@dto/create-application.dto";
 import { DeleteResponseDto } from "@dto/delete-application-response.dto";
 import { ListAllApplicationsResponseDto } from "@dto/list-all-applications-response.dto";
 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,
@@ -60,10 +63,10 @@ import { ApplicationService } from "@services/device-management/application.serv
 @ApiForbiddenResponse()
 @ApiUnauthorizedResponse()
 export class ApplicationController {
-  constructor(private applicationService: ApplicationService) {}
-
   private readonly logger = new Logger(ApplicationController.name);
 
+  constructor(private applicationService: ApplicationService) {}
+
   @Read()
   @Get()
   @ApiProduces("application/json")
@@ -78,15 +81,62 @@ export class ApplicationController {
     @Query() query?: ListAllApplicationsDto
   ): Promise<ListAllApplicationsResponseDto> {
     if (req.user.permissions.isGlobalAdmin) {
-      return this.applicationService.findAndCountWithPagination(
-        query,
-        query.organizationId ? [+query.organizationId] : null
-      );
+      return this.applicationService.findAndCountInList(query);
     }
 
     return await this.getApplicationsForNonGlobalAdmin(req, query);
   }
 
+  @Read()
+  @Get(":id/filter-information")
+  @ApiProduces("application/json")
+  @ApiOperation({ summary: "returns filter information for application" })
+  @ApiNotFoundResponse()
+  async findFilterInformation(
+    @Req() req: AuthenticatedRequest,
+    @Param("id", new ParseIntPipe()) id: number
+  ): Promise<string[]> {
+    try {
+      const allOrgs = req.user.permissions.getAllOrganizationsWithUserAdmin();
+
+      return await this.applicationService.getFilterInformationInOrganization(
+        allOrgs,
+        id,
+        req.user.permissions.isGlobalAdmin
+      );
+    } catch (err) {
+      throw new NotFoundException(ErrorCodes.IdDoesNotExists);
+    }
+  }
+
+  @Read()
+  @Get(":id/application-dashboard-data")
+  @ApiProduces("application/json")
+  @ApiOperation({ summary: "returns applications dashboard data" })
+  @ApiNotFoundResponse()
+  async countApplicationWithError(
+    @Req() req: AuthenticatedRequest,
+    @Param("id", new ParseIntPipe()) organizationId: number
+  ): Promise<ApplicationDashboardResponseDto> {
+    try {
+      checkIfUserHasAccessToOrganization(req, organizationId, OrganizationAccessScope.ApplicationRead);
+      const whitelist = req.user.permissions.getAllApplicationsWithAtLeastRead();
+
+      return {
+        ...(await this.applicationService.countApplicationsWithError(
+          organizationId,
+          req.user.permissions.isGlobalAdmin ? "admin" : whitelist
+        )),
+        totalDevices: await this.applicationService.countAllDevices(
+          organizationId,
+          req.user.permissions.isGlobalAdmin ? "admin" : whitelist
+        ),
+      };
+    } catch (err) {
+      throw new NotFoundException(ErrorCodes.IdDoesNotExists);
+    }
+  }
+
   @Read()
   @Get(":id")
   @ApiOperation({ summary: "Find one Application by id" })
@@ -119,6 +169,27 @@ 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 allOrgs = req.user.permissions.getAllOrganizationsWithUserAdmin();
+      return await this.applicationService.getAllDevices(
+        organizationId,
+        query,
+        req.user.permissions.isGlobalAdmin ? "admin" : allOrgs
+      );
+    } catch (err) {
+      throw new NotFoundException(ErrorCodes.IdDoesNotExists);
+    }
+  }
+
   @Read()
   @Get(":id/iot-devices-map")
   @ApiOperation({ summary: "Find the IoTDevices of an Application" })
@@ -257,10 +328,10 @@ export class ApplicationController {
     // User admins have access to all applications in the organization
     const allFromOrg = req.user.permissions.getAllOrganizationsWithUserAdmin();
     if (allFromOrg.some(x => x === query?.organizationId)) {
-      return await this.applicationService.findAndCountWithPagination(query, [query.organizationId]);
+      return await this.applicationService.findAndCountInList(query, null);
     }
 
     const allowedApplications = req.user.permissions.getAllApplicationsWithAtLeastRead();
-    return await this.applicationService.findAndCountInList(query, allowedApplications, [query.organizationId]);
+    return await this.applicationService.findAndCountInList(query, allowedApplications);
   }
 }

src/entities/dto/applications-dashboard-responses.ts

@@ -0,0 +1,10 @@
+export type ApplicationsWithErrorsResponseDto = {
+  total: number;
+  withError: number;
+};
+
+export type ApplicationDashboardResponseDto = {
+  total: number;
+  withError: number;
+  totalDevices: number;
+};

src/entities/dto/list-all-applications-response.dto.ts

@@ -1,4 +1,7 @@
 import { ListAllEntitiesResponseDto } from "@dto/list-all-entities-response.dto";
 import { Application } from "@entities/application.entity";
 
+export type ApplicationWithStatus = Application & { statusCheck?: "stable" | "alert" };
+
+export class ListAllApplicationsWithStatusResponseDto extends ListAllEntitiesResponseDto<ApplicationWithStatus> {}
 export class ListAllApplicationsResponseDto extends ListAllEntitiesResponseDto<Application> {}

src/entities/dto/list-all-applications.dto.ts

@@ -1,10 +1,16 @@
 import { DefaultLimit, DefaultOffset } from "@config/constants/pagination-constants";
 import { ListAllEntitiesDto } from "@dto/list-all-entities.dto";
+import { ApplicationStatus } from "@enum/application-status.enum";
 import { IsSwaggerOptional } from "@helpers/optional-validator";
-import { NullableStringToNumber, StringToNumber } from "@helpers/string-to-number-validator";
+import {
+  NullableApplicationStatus,
+  NullableString,
+  NullableStringToNumber,
+  StringToNumber,
+} from "@helpers/string-to-number-validator";
 import { ApiProperty, OmitType } from "@nestjs/swagger";
 import { Transform } from "class-transformer";
-import { IsOptional, IsNumber } from "class-validator";
+import { IsNumber, IsOptional, IsString } from "class-validator";
 
 export class ListAllApplicationsDto extends OmitType(ListAllEntitiesDto, ["limit", "offset"]) {
   @IsSwaggerOptional({ description: "Filter to one organization" })
@@ -22,4 +28,22 @@ export class ListAllApplicationsDto extends OmitType(ListAllEntitiesDto, ["limit
   @IsNumber()
   @Transform(({ value }) => NullableStringToNumber(value))
   offset? = DefaultOffset;
+
+  @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/entities/dto/list-all-entities.dto.ts

@@ -42,5 +42,6 @@ export class ListAllEntitiesDto {
     | "devices"
     | "dataTargets"
     | "organizationName"
-    | "commentOnLocation";
+    | "commentOnLocation"
+    | "statusCheck";
 }

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/helpers/string-to-number-validator.ts

@@ -1,3 +1,4 @@
+import { ApplicationStatus } from "@enum/application-status.enum";
 import { Type } from "class-transformer";
 import { IsNumber } from "class-validator";
 
@@ -26,3 +27,19 @@ export const NullableStringToNumber = (value: unknown): number | null => {
 
   return Number(value);
 };
+
+export const NullableString = (value: unknown): string | null => {
+  if (value === null || value === "null") {
+    return null;
+  }
+
+  return value as string;
+};
+
+export const NullableApplicationStatus = (value: unknown): ApplicationStatus | null => {
+  if (value === null || value === "null") {
+    return null;
+  }
+
+  return value as ApplicationStatus;
+};