All things deletion for runner* now are clean af and cascadeing

ref #13
This commit is contained in:
2020-12-05 12:15:51 +01:00
parent 9c63a34fe1
commit 45675b0699
6 changed files with 33 additions and 70 deletions

View File

@@ -1,7 +1,7 @@
import { Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
import { getConnectionManager, Repository } from 'typeorm';
import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions';
import { RunnerTeamHasRunnersError, RunnerTeamIdsNotMatchingError, RunnerTeamNotFoundError } from '../errors/RunnerTeamErrors';
import { CreateRunnerTeam } from '../models/creation/CreateRunnerTeam';
import { RunnerTeam } from '../models/entities/RunnerTeam';
@@ -87,8 +87,8 @@ export class RunnerTeamController {
@ResponseSchema(RunnerTeamNotFoundError, { statusCode: 404 })
@ResponseSchema(RunnerTeamHasRunnersError, { statusCode: 406 })
@OpenAPI({ description: 'Delete a specified runnerTeam (if it exists).' })
async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
let runnerTeam = await this.runnerTeamRepository.findOne({ id: id }, { relations: ['parentGroup', 'contact', 'runners'] });
async remove(@EntityFromParam('id') team: RunnerTeam, @QueryParam("force") force: boolean) {
let runnerTeam = await this.runnerTeamRepository.findOne(team, { relations: ['parentGroup', 'contact', 'runners'] });
if (!runnerTeam) {
throw new RunnerTeamNotFoundError();
@@ -100,12 +100,12 @@ export class RunnerTeamController {
}
}
const runnerController = new RunnerController()
await runnerTeam.runners.forEach(async runner => {
await runnerController.remove(runner.id, true);
});
for (let runner of runnerTeam.runners) {
await runnerController.remove(runner, true);
}
const responseTeam = new ResponseRunnerTeam(runnerTeam);
await this.runnerTeamRepository.delete({ id: runnerTeam.id });
await this.runnerTeamRepository.delete(team);
return responseTeam;
}
}