added filter endpoint on application.controller

Author: Lauest-Iterator

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

@@ -87,6 +87,22 @@ export class ApplicationController {
     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 {
+      return await this.getFilterInformationInOrganization(req, id, req.user.permissions.isGlobalAdmin);
+    } catch (err) {
+      throw new NotFoundException(ErrorCodes.IdDoesNotExists);
+    }
+  }
+
   @Read()
   @Get(":id")
   @ApiOperation({ summary: "Find one Application by id" })
@@ -263,4 +279,23 @@ export class ApplicationController {
     const allowedApplications = req.user.permissions.getAllApplicationsWithAtLeastRead();
     return await this.applicationService.findAndCountInList(query, allowedApplications, [query.organizationId]);
   }
+
+  private async getFilterInformationInOrganization(
+    req: AuthenticatedRequest,
+    organizationId: number,
+    isGlobalAdmin: boolean
+  ) {
+    if (isGlobalAdmin) {
+      return await this.applicationService.findFilterInformation("admin", organizationId);
+    }
+
+    const allFromOrg = req.user.permissions.getAllOrganizationsWithUserAdmin();
+
+    if (allFromOrg.some(x => x === organizationId)) {
+      return await this.applicationService.findFilterInformation("admin", organizationId);
+    }
+
+    const allowedApplications = req.user.permissions.getAllApplicationsWithAtLeastRead();
+    return await this.applicationService.findFilterInformation(allowedApplications, organizationId);
+  }
 }

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

@@ -4,7 +4,7 @@ import { IsSwaggerOptional } from "@helpers/optional-validator";
 import { 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 +22,19 @@ export class ListAllApplicationsDto extends OmitType(ListAllEntitiesDto, ["limit
   @IsNumber()
   @Transform(({ value }) => NullableStringToNumber(value))
   offset? = DefaultOffset;
+
+  @ApiProperty({ type: Number, required: false })
+  @IsOptional()
+  @IsString()
+  status? = "";
+
+  @ApiProperty({ type: String, required: false })
+  @IsOptional()
+  @IsString()
+  state? = "";
+
+  @ApiProperty({ type: Number, required: false })
+  @IsOptional()
+  @IsString()
+  owner? = "";
 }

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

@@ -3,31 +3,31 @@ import { ListAllApplicationsResponseDto } from "@dto/list-all-applications-respo
 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 { LoRaWANDeviceWithChirpstackDataDto } from "@dto/lorawan-device-with-chirpstack-data.dto";
+import { UpdateApplicationOrganizationDto } from "@dto/update-application-organization.dto";
 import { UpdateApplicationDto } from "@dto/update-application.dto";
 import { ApplicationDeviceType } from "@entities/application-device-type.entity";
 import { Application } from "@entities/application.entity";
 import { ControlledProperty } from "@entities/controlled-property.entity";
 import { IoTDevice } from "@entities/iot-device.entity";
 import { LoRaWANDevice } from "@entities/lorawan-device.entity";
+import { Permission } from "@entities/permissions/permission.entity";
 import { ControlledPropertyTypes } from "@enum/controlled-property.enum";
+import { DataTargetType } from "@enum/data-target-type.enum";
 import { ApplicationDeviceTypes, ApplicationDeviceTypeUnion, IoTDeviceType } from "@enum/device-type.enum";
 import { ErrorCodes } from "@enum/error-codes.enum";
 import { findValuesInRecord } from "@helpers/record.helper";
 import { nameof } from "@helpers/type-helper";
 import { BadRequestException, ConflictException, forwardRef, Inject, Injectable } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
+import { ApplicationChirpstackService } from "@services/chirpstack/chirpstack-application.service";
 import { ChirpstackDeviceService } from "@services/chirpstack/chirpstack-device.service";
+import { MulticastService } from "@services/chirpstack/multicast.service";
+import { DataTargetService } from "@services/data-targets/data-target.service";
 import { OrganizationService } from "@services/user-management/organization.service";
 import { PermissionService } from "@services/user-management/permission.service";
 import { DeleteResult, In, Repository } from "typeorm";
-import { DataTargetService } from "@services/data-targets/data-target.service";
-import { DataTargetType } from "@enum/data-target-type.enum";
-import { MulticastService } from "@services/chirpstack/multicast.service";
-import { ApplicationChirpstackService } from "@services/chirpstack/chirpstack-application.service";
-import { IoTDevicesListToMapResponseDto } from "@dto/list-all-iot-devices-to-map-response.dto";
-import { UpdateApplicationOrganizationDto } from "@dto/update-application-organization.dto";
-import { Permission } from "@entities/permissions/permission.entity";
 
 @Injectable()
 export class ApplicationService {
@@ -172,6 +172,23 @@ export class ApplicationService {
     return await this.applicationRepository.findOneByOrFail({ id });
   }
 
+  async findFilterInformation(applicationIds: number[] | "admin", organizationId: number) {
+    console.log(applicationIds);
+
+    const query = this.applicationRepository
+      .createQueryBuilder("application")
+      .leftJoinAndSelect("application.belongsTo", "organization")
+      .where("organization.id = :organizationId", { organizationId });
+
+    if (applicationIds !== "admin") {
+      query.where("application.id IN (:...applicationIds)", { applicationIds });
+    }
+
+    const result = await query.getMany();
+
+    return [...new Set(result.map(app => app.owner))];
+  }
+
   async findOneWithOrganisation(id: number): Promise<Application> {
     return await this.applicationRepository.findOneOrFail({
       where: { id },