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

Reverted simplification that created loops
All checks were successful
continuous-integration/drone/pr Build is passing
Details

Browse Source 
ref #39
This commit is contained in:
Nicolai Ort 2020-12-21 17:22:07 +01:00
parent 0ef6d9cc48
commit 7d5f3b092f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/models/actions/ImportRunner.ts
View File

@ -75,19 +75,20 @@ export class ImportRunner {
throw new RunnerGroupNeededError(); throw new RunnerGroupNeededError();
} }
let group = await getConnectionManager().get().getRepository(RunnerGroup).findOne({ id: groupID }); let team = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ id: groupID });
if (group instanceof RunnerTeam) { return group; } if (team) { return team; }
if (!(group instanceof RunnerOrganisation) || !group) {
let org = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: groupID });
if (!org) {
throw new RunnerOrganisationNotFoundError(); throw new RunnerOrganisationNotFoundError();
} }
if (this.team === undefined) { return org; }
if (this.team === undefined) { return group; } team = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ name: this.team, parentGroup: org });
let team = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ name: this.team, parentGroup: group });
if (!team) { if (!team) {
let newRunnerTeam: RunnerTeam = new RunnerTeam(); let newRunnerTeam: RunnerTeam = new RunnerTeam();
newRunnerTeam.name = this.team; newRunnerTeam.name = this.team;
newRunnerTeam.parentGroup = group; newRunnerTeam.parentGroup = org;
team = await getConnectionManager().get().getRepository(RunnerTeam).save(newRunnerTeam); team = await getConnectionManager().get().getRepository(RunnerTeam).save(newRunnerTeam);
} }