Skip to content

Enabled the new sortings for application table #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Dec 4, 2023
Merged

Enabled the new sortings for application table #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1a71050
Changed vm package to isolated-vm
fcv-iteratorIt Nov 9, 2023
9e2cf2b
Deleted old using from vm2
fcv-iteratorIt Nov 10, 2023
ab8ccec
Updated all vulnerable packages
fcv-iteratorIt Nov 10, 2023
364258c
Updated the last debrick packages
fcv-iteratorIt Nov 10, 2023
4012130
Added datatarget name and id to error message when failing
fcv-iteratorIt Nov 10, 2023
9e7a251
Changed validation types for gatewayId
fcv-iteratorIt Nov 15, 2023
f05cabd
Added email in use error text to updating user
fcv-iteratorIt Nov 15, 2023
e40c568
Fixed kombit signout flow
fcv-iteratorIt Nov 16, 2023
b264da7
Merge branch 'bugfix/fix-broken-kombit-logout-flow' into feature/add-…
fcv-iteratorIt Nov 16, 2023
528f7fe
Updated github action node version
fcv-iteratorIt Nov 16, 2023
5986301
Merge branch 'feature/add-datatarget-id-to-error-message' into featur…
fcv-iteratorIt Nov 16, 2023
febda8d
Merge branch 'feature/IOT-1380-update-gateway-eui-input' into feature…
fcv-iteratorIt Nov 16, 2023
957d0c5
Changed logic of getOrgAdminEmails to always add global admin emails …
fcv-iteratorIt Nov 17, 2023
3380258
Added better validation of IotDeviceType
fcv-iteratorIt Nov 17, 2023
71a947d
Enabled the new sortings for application table
fcv-iteratorIt Nov 22, 2023
2a6da05
Merge remote-tracking branch 'origin/stage' into feature/IOT-1403-Col…
fcv-iteratorIt Dec 4, 2023
7f5847e
Changed == to === in application.service.ts
fcv-iteratorIt Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/entities/dto/list-all-entities.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,12 @@ export class ListAllEntitiesDto {
| "active"
| "groupName"
| "rssi"
| "snr";
| "snr"
| "status"
| "startDate"
| "endDate"
| "owner"
| "contactPerson"
| "personalData"
| "openDataDkEnabled";
}
126 changes: 48 additions & 78 deletions src/services/device-management/application.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ import { ControlledProperty } from "@entities/controlled-property.entity";
import { IoTDevice } from "@entities/iot-device.entity";
import { LoRaWANDevice } from "@entities/lorawan-device.entity";
import { ControlledPropertyTypes } from "@enum/controlled-property.enum";
import {
ApplicationDeviceTypes,
ApplicationDeviceTypeUnion,
IoTDeviceType,
} from "@enum/device-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";
Expand All @@ -28,6 +24,7 @@ import { PermissionService } from "@services/user-management/permission.service"
import { DeleteResult, In, Repository } from "typeorm";
import { MulticastService } from "./multicast.service";
import { DataTargetService } from "@services/data-targets/data-target.service";
import { DataTargetType } from "@enum/data-target-type.enum";

@Injectable()
export class ApplicationService {
Expand All @@ -53,9 +50,7 @@ export class ApplicationService {
): Promise<ListAllApplicationsResponseDto> {
const sorting = this.getSortingForApplications(query);
const orgCondition =
allFromOrgs != null
? { id: In(whitelist), belongsTo: In(allFromOrgs) }
: { id: In(whitelist) };
allFromOrgs != null ? { id: In(whitelist), belongsTo: In(allFromOrgs) } : { id: In(whitelist) };
const [result, total] = await this.applicationRepository.findAndCount({
where: orgCondition,
take: query.limit,
Expand Down Expand Up @@ -98,16 +93,23 @@ export class ApplicationService {
): Promise<ListAllApplicationsResponseDto> {
const sorting = this.getSortingForApplications(query);
const [result, total] = await this.applicationRepository.findAndCount({
where:
allowedOrganisations != null
? { belongsTo: In(allowedOrganisations) }
: {},
where: allowedOrganisations != null ? { belongsTo: In(allowedOrganisations) } : {},
take: +query.limit,
skip: +query.offset,
relations: ["iotDevices"],
relations: ["iotDevices", "dataTargets", "controlledProperties", "deviceTypes"],
order: sorting,
});

// Since openDataDkEnabled is not a database attribute sorting has to be done manually after reading
if (query.orderOn === "openDataDkEnabled") {
result.sort(
(a, b) =>
(query.sort.toLowerCase() === "asc" ? -1 : 1) *
(Number(!!a.dataTargets.find(t => t.type === DataTargetType.OpenDataDK)) -
Number(!!b.dataTargets.find(t => t.type === DataTargetType.OpenDataDK)))
);
}

return {
data: result,
count: total,
Expand All @@ -121,14 +123,11 @@ export class ApplicationService {
let orderBy = `application.id`;
if (
query.orderOn != null &&
(query.orderOn == "id" ||
query.orderOn == "name" ||
query.orderOn == "updatedAt")
(query.orderOn === "id" || query.orderOn === "name" || query.orderOn === "updatedAt")
) {
orderBy = `application.${query.orderOn}`;
}
const order: "DESC" | "ASC" =
query?.sort?.toLocaleUpperCase() == "DESC" ? "DESC" : "ASC";
const order: "DESC" | "ASC" = query?.sort?.toLocaleUpperCase() === "DESC" ? "DESC" : "ASC";
const [result, total] = await this.applicationRepository
.createQueryBuilder("application")
.innerJoin("application.permissions", "perm")
Expand Down Expand Up @@ -180,7 +179,7 @@ export class ApplicationService {
relations: ["createdBy", "updatedBy"],
},
});
if (app.iotDevices.some(x => x.type == IoTDeviceType.LoRaWAN)) {
if (app.iotDevices.some(x => x.type === IoTDeviceType.LoRaWAN)) {
await this.matchWithChirpstackStatusData(app);
}

Expand All @@ -190,40 +189,29 @@ export class ApplicationService {
private async matchWithChirpstackStatusData(app: Application) {
const allFromChirpstack = await this.chirpstackDeviceService.getAllDevicesStatus();
app.iotDevices.forEach(x => {
if (x.type == IoTDeviceType.LoRaWAN) {
if (x.type === IoTDeviceType.LoRaWAN) {
const loraDevice = x as LoRaWANDeviceWithChirpstackDataDto;
const matchingDevice = allFromChirpstack.result.find(
cs => cs.devEUI == loraDevice.deviceEUI
);
const matchingDevice = allFromChirpstack.result.find(cs => cs.devEUI === loraDevice.deviceEUI);
if (matchingDevice) {
loraDevice.lorawanSettings = new CreateLoRaWANSettingsDto();
loraDevice.lorawanSettings.deviceStatusBattery =
matchingDevice.deviceStatusBattery;
loraDevice.lorawanSettings.deviceStatusMargin =
matchingDevice.deviceStatusMargin;
loraDevice.lorawanSettings.deviceStatusBattery = matchingDevice.deviceStatusBattery;
loraDevice.lorawanSettings.deviceStatusMargin = matchingDevice.deviceStatusMargin;
}
}
});
}

async findManyByIds(ids: number[]): Promise<Application[]> {
if (ids == null || ids?.length == 0) {
if (ids === null || ids?.length === 0) {
return [];
}
return await this.applicationRepository.findBy({ id: In(ids) });
}

async create(
createApplicationDto: CreateApplicationDto,
userId: number
): Promise<Application> {
async create(createApplicationDto: CreateApplicationDto, userId: number): Promise<Application> {
const application = new Application();

const mappedApplication = await this.mapApplicationDtoToApplication(
createApplicationDto,
application,
userId
);
const mappedApplication = await this.mapApplicationDtoToApplication(createApplicationDto, application, userId);
mappedApplication.iotDevices = [];
mappedApplication.dataTargets = [];
mappedApplication.multicasts = [];
Expand All @@ -237,11 +225,7 @@ export class ApplicationService {
return app;
}

async update(
id: number,
updateApplicationDto: UpdateApplicationDto,
userId: number
): Promise<Application> {
async update(id: number, updateApplicationDto: UpdateApplicationDto, userId: number): Promise<Application> {
const existingApplication = await this.applicationRepository.findOneOrFail({
where: { id },
relations: [
Expand Down Expand Up @@ -271,7 +255,7 @@ export class ApplicationService {
// Don't allow delete if this application contains any sigfox devices.
if (
application.iotDevices.some(iotDevice => {
return iotDevice.type == IoTDeviceType.SigFox;
return iotDevice.type === IoTDeviceType.SigFox;
})
) {
throw new ConflictException(ErrorCodes.DeleteNotAllowedHasSigfoxDevice);
Expand All @@ -282,9 +266,7 @@ export class ApplicationService {
}

// Delete all LoRaWAN devices in ChirpStack
const loRaWANDevices = application.iotDevices.filter(
device => device.type === IoTDeviceType.LoRaWAN
);
const loRaWANDevices = application.iotDevices.filter(device => device.type === IoTDeviceType.LoRaWAN);

for (const device of loRaWANDevices) {
const lwDevice = device as LoRaWANDevice;
Expand Down Expand Up @@ -312,10 +294,10 @@ export class ApplicationService {
if (id) {
// If id is given then this id is allowed to have the name already (i.e. it's being changed)
return applicationsWithName.every(app => {
return app.id == id;
return app.id === id;
});
} else {
return applicationsWithName.length == 0;
return applicationsWithName.length === 0;
}
}

Expand All @@ -329,9 +311,7 @@ export class ApplicationService {
): Promise<Application> {
application.name = applicationDto.name;
application.description = applicationDto.description;
application.belongsTo = await this.organizationService.findById(
applicationDto.organizationId
);
application.belongsTo = await this.organizationService.findById(applicationDto.organizationId);
application.status = applicationDto.status;
// Setting a date to 'undefined' will set it to today in the database
application.startDate = applicationDto.startDate ?? null;
Expand All @@ -343,9 +323,7 @@ export class ApplicationService {
application.contactPhone = applicationDto.contactPhone;
application.personalData = applicationDto.personalData;
application.hardware = applicationDto.hardware;
application.permissions = await this.permissionService.findManyByIds(
applicationDto.permissionIds
);
application.permissions = await this.permissionService.findManyByIds(applicationDto.permissionIds);

// Set metadata dependencies
application.controlledProperties = applicationDto.controlledProperties
Expand All @@ -371,12 +349,7 @@ export class ApplicationService {
buildControlledPropertyDeviceType<
T extends Record<string, string>,
Entity extends ControlledProperty | ApplicationDeviceType
>(
validKeys: T,
clientTypes: string[],
userId: number,
entity: { new (): Entity }
): Entity[] {
>(validKeys: T, clientTypes: string[], userId: number, entity: { new (): Entity }): Entity[] {
// Filter out invalid client values
const matchingValues = findValuesInRecord(validKeys, clientTypes);

Expand All @@ -390,12 +363,9 @@ export class ApplicationService {
});
}

async findDevicesForApplication(
appId: number,
query: ListAllEntitiesDto
): Promise<ListAllIoTDevicesResponseDto> {
async findDevicesForApplication(appId: number, query: ListAllEntitiesDto): Promise<ListAllIoTDevicesResponseDto> {
const orderByColumn = this.getSortingForIoTDevices(query);
const direction = query?.sort?.toUpperCase() == "DESC" ? "DESC" : "ASC";
const direction = query?.sort?.toUpperCase() === "DESC" ? "DESC" : "ASC";

const [data, count] = await this.iotDeviceRepository
.createQueryBuilder("iot_device")
Expand All @@ -412,16 +382,11 @@ export class ApplicationService {
const loraDevices = data.filter(
device => device.type === IoTDeviceType.LoRaWAN
) as LoRaWANDeviceWithChirpstackDataDto[];
const applications = await this.chirpstackDeviceService.getLoRaWANApplications(
loraDevices
);
const applications = await this.chirpstackDeviceService.getLoRaWANApplications(loraDevices);
const loraApplications = applications.map(app => app.application);

for (const device of loraDevices) {
await this.chirpstackDeviceService.enrichLoRaWANDevice(
device,
loraApplications
);
await this.chirpstackDeviceService.enrichLoRaWANDevice(device, loraApplications);
}

return {
Expand Down Expand Up @@ -450,15 +415,20 @@ export class ApplicationService {
return orderBy;
}

private getSortingForApplications(
query: ListAllEntitiesDto
): Record<string, string | number> {
private getSortingForApplications(query: ListAllEntitiesDto): Record<string, string | number> {
const sorting: Record<string, string | number> = {};
if (
// TODO: Make this nicer
Copy link
Contributor

@augusthjerrild augusthjerrild Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be removed or is it for the future? :-)

Copy link
Contributor Author

@fcv-iteratorIt fcv-iteratorIt Dec 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Future, a bit more research for a nice way of doing it if it is possible

query.orderOn != null &&
(query.orderOn == "id" ||
query.orderOn == "name" ||
query.orderOn == "updatedAt")
(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")
) {
sorting[query.orderOn] = query.sort.toLocaleUpperCase();
} else {
Expand Down