lfk/backend
2
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases 40 Activity

Working(tm) implementation of group and team deletion

Browse Source 
ref #13
This commit is contained in:
Nicolai Ort
2020-12-04 18:15:38 +01:00
parent c4f02023b9
commit 795599fd38
5 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/RunnerController.ts
View File

@@ -1,10 +1,10 @@
import { JsonController, Param, Body, Get, Post, Put, Delete, OnUndefined } from 'routing-controllers';
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 { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
import { Runner } from '../models/entities/Runner';
import { RunnerGroupNeededError, RunnerGroupNotFoundError, RunnerIdsNotMatchingError, RunnerNotFoundError, RunnerOnlyOneGroupAllowedError } from '../errors/RunnerErrors';
import { CreateRunner } from '../models/creation/CreateRunner';
import { Runner } from '../models/entities/Runner';
@JsonController('/runners')
@@ -76,7 +76,7 @@ export class RunnerController {
@ResponseSchema(Runner)
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
@OpenAPI({ description: 'Delete a specified runner (if it exists).' })
async remove(@Param('id') id: number) {
async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
let runner = await this.runnerRepository.findOne({ id: id });
if (!runner) {

31
src/controllers/RunnerOrganisationController.ts
View File

@@ -4,7 +4,11 @@ import { getConnectionManager, Repository } from 'typeorm';
import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
import { RunnerOrganisationHasRunnersError, RunnerOrganisationHasTeamsError, RunnerOrganisationIdsNotMatchingError, RunnerOrganisationNotFoundError } from '../errors/RunnerOrganisationErrors';
import { CreateRunnerOrganisation } from '../models/creation/CreateRunnerOrganisation';
import { Runner } from '../models/entities/Runner';
import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
import { RunnerTeam } from '../models/entities/RunnerTeam';
import { RunnerController } from './RunnerController';
import { RunnerTeamController } from './RunnerTeamController';
@JsonController('/organisations')
@@ -72,25 +76,34 @@ export class RunnerOrganisationController {
@Delete('/:id')
@ResponseSchema(RunnerOrganisation)
@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
@ResponseSchema(RunnerOrganisationHasRunnersError, { statusCode: 406 })
@ResponseSchema(RunnerOrganisationHasTeamsError, { statusCode: 406 })
@OpenAPI({ description: 'Delete a specified runnerOrganisation (if it exists).' })
async remove(@Param('id') id: number, @QueryParam("force") force) {
async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
let runnerOrganisation = await this.runnerOrganisationRepository.findOne({ id: id });
if (!runnerOrganisation) {
throw new RunnerOrganisationNotFoundError();
}
if (!force) {
if (runnerOrganisation.runners.length != 0) {
throw new RunnerOrganisationHasRunnersError();
}
let runners: Runner[] = await runnerOrganisation.getRunners()
if (runnerOrganisation.teams.length != 0) {
throw new RunnerOrganisationHasTeamsError();
}
if (!force && runners.length != 0) {
throw new RunnerOrganisationHasRunnersError();
}
const runnerController = new RunnerController()
await runners.forEach(async runner => {
await runnerController.remove(runner.id, true);
});
//TODO: Delete runner and teams
let teams: RunnerTeam[] = await runnerOrganisation.getTeams()
if (!force && teams.length != 0) {
throw new RunnerOrganisationHasTeamsError();
}
const teamController = new RunnerTeamController()
await teams.forEach(async team => {
await teamController.remove(team.id, true);
});
await this.runnerOrganisationRepository.delete(runnerOrganisation);
return runnerOrganisation;

6
src/controllers/RunnerTeamController.ts
View File

@@ -76,7 +76,7 @@ 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) {
async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
let runnerTeam = await this.runnerTeamRepository.findOne({ id: id });
if (!runnerTeam) {
@@ -84,16 +84,14 @@ export class RunnerTeamController {
}
let runners: Runner[] = await runnerTeam.getRunners()
if (!force) {
if (runners.length != 0) {
throw new RunnerTeamHasRunnersError();
}
}
const runnerController = new RunnerController()
runners.forEach(runner => {
runnerController.remove(runner.id)
runnerController.remove(runner.id, true)
});
await this.runnerTeamRepository.delete(runnerTeam);