changes from pr

Author: Lauest-Iterator

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

@@ -97,7 +97,13 @@ export class ApplicationController {
     @Param("id", new ParseIntPipe()) id: number
   ): Promise<string[]> {
     try {
-      return await this.getFilterInformationInOrganization(req, id, req.user.permissions.isGlobalAdmin);
+      const allOrgs = req.user.permissions.getAllOrganizationsWithUserAdmin();
+
+      return await this.applicationService.getFilterInformationInOrganization(
+        allOrgs,
+        id,
+        req.user.permissions.isGlobalAdmin
+      );
     } catch (err) {
       throw new NotFoundException(ErrorCodes.IdDoesNotExists);
     }
@@ -113,10 +119,17 @@ export class ApplicationController {
     @Param("id", new ParseIntPipe()) id: number
   ): Promise<ApplicationDashboardResponseDto> {
     try {
-      const whitelist = await this.getApplicationsWhiteList(req, id, req.user.permissions.isGlobalAdmin);
+      const allOrgs = req.user.permissions.getAllOrganizationsWithUserAdmin();
+
       return {
-        ...(await this.applicationService.countApplicationsWithError(id, whitelist)),
-        totalDevices: await this.applicationService.countAllDevices(id, whitelist),
+        ...(await this.applicationService.countApplicationsWithError(
+          id,
+          req.user.permissions.isGlobalAdmin ? "admin" : allOrgs
+        )),
+        totalDevices: await this.applicationService.countAllDevices(
+          id,
+          req.user.permissions.isGlobalAdmin ? "admin" : allOrgs
+        ),
       };
     } catch (err) {
       throw new NotFoundException(ErrorCodes.IdDoesNotExists);
@@ -165,8 +178,12 @@ export class ApplicationController {
     @Query() query?: ListAllIotDevicesDto
   ): Promise<IoTDevice[]> {
     try {
-      const whitelist = await this.getApplicationsWhiteList(req, organizationId, req.user.permissions.isGlobalAdmin);
-      return await this.applicationService.getAllDevices(organizationId, query);
+      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);
     }
@@ -316,41 +333,4 @@ export class ApplicationController {
     const allowedApplications = req.user.permissions.getAllApplicationsWithAtLeastRead();
     return await this.applicationService.findAndCountInList(query, allowedApplications);
   }
-
-  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);
-  }
-
-  private async getApplicationsWhiteList(
-    req: AuthenticatedRequest,
-    organizationId: number,
-    isGlobalAdmin: boolean
-  ): Promise<number[] | null> {
-    if (isGlobalAdmin) {
-      return null;
-    }
-
-    const allFromOrg = req.user.permissions.getAllOrganizationsWithUserAdmin();
-
-    if (allFromOrg.some(x => x === organizationId)) {
-      return null;
-    }
-
-    return req.user.permissions.getAllApplicationsWithAtLeastRead();
-  }
 }

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

@@ -56,7 +56,7 @@ export class ApplicationService {
 
   async countApplicationsWithError(
     organizationId: number,
-    whitelist?: number[]
+    whitelist?: number[] | "admin"
   ): Promise<ApplicationsWithErrorsResponseDto> {
     const queryBuilder = this.applicationRepository
       .createQueryBuilder("app")
@@ -66,7 +66,7 @@ export class ApplicationService {
       .leftJoin("app.dataTargets", "dataTargets")
       .andWhere("app.belongsToId = :organizationId", { organizationId: organizationId });
 
-    if (whitelist && whitelist.length > 0) {
+    if (whitelist !== "admin" && whitelist.length > 0) {
       queryBuilder.where("app.id IN (:...whitelist)", { whitelist });
     }
 
@@ -87,14 +87,15 @@ export class ApplicationService {
       throw new Error("Database query failed");
     }
   }
-  async countAllDevices(organizationId: number, whitelist?: number[]): Promise<number> {
+
+  async countAllDevices(organizationId: number, whitelist?: number[] | "admin"): Promise<number> {
     const queryBuilder = this.applicationRepository
       .createQueryBuilder("app")
       .leftJoinAndSelect("app.iotDevices", "device")
       .leftJoin("app.dataTargets", "dataTargets")
       .where("app.belongsToId = :organizationId", { organizationId });
 
-    if (whitelist && whitelist.length > 0) {
+    if (whitelist != "admin" && whitelist.length > 0) {
       queryBuilder.andWhere("app.id IN (:...whitelist)", { whitelist });
     }
 
@@ -110,7 +111,7 @@ export class ApplicationService {
   async getAllDevices(
     organizationId: number,
     query?: ListAllIotDevicesDto,
-    whitelist?: number[] | null
+    whitelist?: number[] | "admin"
   ): Promise<IoTDevice[]> {
     const queryBuilder = this.iotDeviceRepository
       .createQueryBuilder("device")
@@ -120,7 +121,7 @@ export class ApplicationService {
       .addSelect(["latestMessage.id", "latestMessage.sentTime"])
       .where("app.belongsToId = :organizationId", { organizationId });
 
-    if (whitelist && whitelist.length > 0) {
+    if (whitelist !== "admin" && whitelist.length > 0) {
       queryBuilder.andWhere("app.id IN (:...whitelist)", { whitelist });
     }
 
@@ -149,8 +150,7 @@ export class ApplicationService {
     }
 
     try {
-      const test = await queryBuilder.getMany();
-      return test;
+      return await queryBuilder.getMany();
     } catch (error) {
       console.error("Database query failed:", error);
       throw new Error("Database query failed");
@@ -168,16 +168,13 @@ export class ApplicationService {
       .leftJoinAndSelect("app.iotDevices", "device")
       .leftJoinAndSelect("app.belongsTo", "organization")
       .leftJoinAndSelect("device.latestReceivedMessage", "latestMessage")
-      .leftJoinAndSelect("app.dataTargets", "dataTargets");
+      .leftJoinAndSelect("app.dataTargets", "dataTargets")
+      .andWhere("app.belongsToId = :organizationId", { organizationId: query.organizationId });
 
     if (whitelist && whitelist.length > 0) {
       queryBuilder.where("app.id IN (:...whitelist)", { whitelist });
     }
 
-    if (query.organizationId) {
-      queryBuilder.andWhere("app.belongsToId = :organizationId", { organizationId: query.organizationId });
-    }
-
     if (query.status) {
       queryBuilder.andWhere("app.status = :status", { status: query.status });
     }
@@ -338,7 +335,7 @@ export class ApplicationService {
     return await this.applicationRepository.findOneByOrFail({ id });
   }
 
-  async findFilterInformation(applicationIds: number[] | "admin", organizationId: number) {
+  async findOwnerFilterInformation(applicationIds: number[] | "admin", organizationId: number) {
     const query = this.applicationRepository
       .createQueryBuilder("application")
       .leftJoinAndSelect("application.belongsTo", "organization")
@@ -676,14 +673,22 @@ export class ApplicationService {
     }
     return orderBy;
   }
+
   private getSortingForApplications(query: ListAllEntitiesDto): Record<string, "ASC" | "DESC"> {
     const sorting: Record<string, "ASC" | "DESC"> = {};
 
-    if (query.orderOn === "statusCheck") {
-      return sorting;
-    }
-
-    if (query.orderOn) {
+    if (
+      query.orderOn != null &&
+      (query.orderOn === "id" ||
+        query.orderOn === "name" ||
+        query.orderOn === "updatedAt" ||
+        query.orderOn === "status" ||
+        query.orderOn === "startDate" ||
+        query.orderOn === "endDate" ||
+        query.orderOn === "owner" ||
+        query.orderOn === "contactPerson" ||
+        query.orderOn === "personalData")
+    ) {
       const sortOrder = query.sort.toUpperCase() === "DESC" ? "DESC" : "ASC";
 
       sorting[`app.${query.orderOn}`] = sortOrder;
@@ -695,4 +700,16 @@ export class ApplicationService {
 
     return sorting;
   }
+
+  public async getFilterInformationInOrganization(
+    allowedOrganizations: number[],
+    organizationId: number,
+    isGlobalAdmin: boolean
+  ) {
+    if (isGlobalAdmin || allowedOrganizations.some(x => x === organizationId)) {
+      return await this.findOwnerFilterInformation("admin", organizationId);
+    }
+
+    return await this.findOwnerFilterInformation(allowedOrganizations, organizationId);
+  }
 }