parent
9013b9492c
commit
3d07aac944
|
@ -97,7 +97,7 @@ export class RunnerCardController {
|
||||||
}
|
}
|
||||||
const scanController = new ScanController;
|
const scanController = new ScanController;
|
||||||
for (let scan of cardScans) {
|
for (let scan of cardScans) {
|
||||||
scanController.remove(scan.id, force);
|
await scanController.remove(scan.id, force);
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.cardRepository.delete(card);
|
await this.cardRepository.delete(card);
|
||||||
|
|
|
@ -8,6 +8,8 @@ import { UpdateRunner } from '../models/actions/UpdateRunner';
|
||||||
import { Runner } from '../models/entities/Runner';
|
import { Runner } from '../models/entities/Runner';
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
||||||
import { ResponseRunner } from '../models/responses/ResponseRunner';
|
import { ResponseRunner } from '../models/responses/ResponseRunner';
|
||||||
|
import { RunnerCardController } from './RunnerCardController';
|
||||||
|
import { ScanController } from './ScanController';
|
||||||
|
|
||||||
@JsonController('/runners')
|
@JsonController('/runners')
|
||||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
|
@ -100,6 +102,18 @@ export class RunnerController {
|
||||||
throw new RunnerNotFoundError();
|
throw new RunnerNotFoundError();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const runnerCards = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["cards"] })).cards;
|
||||||
|
const cardController = new RunnerCardController;
|
||||||
|
for (let scan of runnerCards) {
|
||||||
|
await cardController.remove(scan.id, force);
|
||||||
|
}
|
||||||
|
|
||||||
|
const runnerScans = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["scans"] })).scans;
|
||||||
|
const scanController = new ScanController;
|
||||||
|
for (let scan of runnerScans) {
|
||||||
|
await scanController.remove(scan.id, force);
|
||||||
|
}
|
||||||
|
|
||||||
await this.runnerRepository.delete(runner);
|
await this.runnerRepository.delete(runner);
|
||||||
return new ResponseRunner(responseRunner);
|
return new ResponseRunner(responseRunner);
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,7 +98,7 @@ export class ScanStationController {
|
||||||
}
|
}
|
||||||
const scanController = new ScanController;
|
const scanController = new ScanController;
|
||||||
for (let scan of stationScans) {
|
for (let scan of stationScans) {
|
||||||
scanController.remove(scan.id, force);
|
await scanController.remove(scan.id, force);
|
||||||
}
|
}
|
||||||
|
|
||||||
const responseStation = await this.stationRepository.findOne({ id: station.id }, { relations: ["track"] });
|
const responseStation = await this.stationRepository.findOne({ id: station.id }, { relations: ["track"] });
|
||||||
|
|
|
@ -94,9 +94,9 @@ export class TrackController {
|
||||||
if (trackStations.length != 0 && !force) {
|
if (trackStations.length != 0 && !force) {
|
||||||
throw new TrackHasScanStationsError();
|
throw new TrackHasScanStationsError();
|
||||||
}
|
}
|
||||||
const scanController = new ScanStationController;
|
const stationController = new ScanStationController;
|
||||||
for (let station of trackStations) {
|
for (let station of trackStations) {
|
||||||
scanController.remove(station.id, force);
|
await stationController.remove(station.id, force);
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.trackRepository.delete(track);
|
await this.trackRepository.delete(track);
|
||||||
|
|
|
@ -88,9 +88,9 @@ export class UserGroupController {
|
||||||
if (!group) { return null; }
|
if (!group) { return null; }
|
||||||
const responseGroup = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions'] });
|
const responseGroup = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions'] });
|
||||||
|
|
||||||
const permissionControler = new PermissionController();
|
const permissionController = new PermissionController();
|
||||||
for (let permission of responseGroup.permissions) {
|
for (let permission of responseGroup.permissions) {
|
||||||
await permissionControler.remove(permission.id, true);
|
await permissionController.remove(permission.id, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.userGroupsRepository.delete(group);
|
await this.userGroupsRepository.delete(group);
|
||||||
|
|
Loading…
Reference in New Issue