src/controllers/RunnerController.ts

@@ -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, EntityFromParam } from 'typeorm-routing-controllers-extensions';
+import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
 import { RunnerGroupNeededError, RunnerGroupNotFoundError, RunnerIdsNotMatchingError, RunnerNotFoundError, RunnerOnlyOneGroupAllowedError } from '../errors/RunnerErrors';
 import { CreateRunner } from '../models/creation/CreateRunner';
 import { Runner } from '../models/entities/Runner';
@@ -55,8 +55,7 @@ export class RunnerController {
 			return error;
 		}
 
-		runner = await this.runnerRepository.save(runner)
+		return new ResponseRunner(await this.runnerRepository.save(runner));
-		return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group'] }));
 	}
 
 	@Put('/:id')
@@ -65,7 +64,7 @@ export class RunnerController {
 	@ResponseSchema(RunnerIdsNotMatchingError, { statusCode: 406 })
 	@OpenAPI({ description: "Update a runner object (id can't be changed)." })
 	async put(@Param('id') id: number, @EntityFromBody() runner: Runner) {
-		let oldRunner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group'] });
+		let oldRunner = await this.runnerRepository.findOne({ id: id });
 
 		if (!oldRunner) {
 			throw new RunnerNotFoundError();
@@ -83,15 +82,14 @@ export class RunnerController {
 	@ResponseSchema(ResponseRunner)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: 'Delete a specified runner (if it exists).' })
-	async remove(@EntityFromParam('id') runner: Runner, @QueryParam("force") force: boolean) {
+	async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
-		if (!runner) { throw new RunnerNotFoundError(); }
+		let runner = await this.runnerRepository.findOne({ id: id });
-		const responseRunner = await this.runnerRepository.findOne(runner, { relations: ['scans', 'group'] });
 
 		if (!runner) {
 			throw new RunnerNotFoundError();
 		}
 
 		await this.runnerRepository.delete(runner);
-		return new ResponseRunner(responseRunner);
+		return new ResponseRunner(runner);
 	}
 }

src/controllers/RunnerOrganisationController.ts

@@ -1,10 +1,12 @@
 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, EntityFromParam } from 'typeorm-routing-controllers-extensions';
+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 { ResponseRunnerOrganisation } from '../models/responses/ResponseRunnerOrganisation';
 import { RunnerController } from './RunnerController';
 import { RunnerTeamController } from './RunnerTeamController';
@@ -56,8 +58,9 @@ export class RunnerOrganisationController {
 		}
 
 		runnerOrganisation = await this.runnerOrganisationRepository.save(runnerOrganisation);
+		runnerOrganisation = await this.runnerOrganisationRepository.findOne(runnerOrganisation, { relations: ['address', 'contact', 'teams'] });
 
-		return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(runnerOrganisation, { relations: ['address', 'contact', 'teams'] }));
+		return new ResponseRunnerOrganisation(runnerOrganisation);
 	}
 
 	@Put('/:id')
@@ -85,35 +88,39 @@ export class RunnerOrganisationController {
 	@Delete('/:id')
 	@ResponseSchema(ResponseRunnerOrganisation)
 	@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
-	@ResponseSchema(RunnerOrganisationHasTeamsError, { statusCode: 406 })
 	@ResponseSchema(RunnerOrganisationHasRunnersError, { statusCode: 406 })
 	@OpenAPI({ description: 'Delete a specified runnerOrganisation (if it exists).' })
-	async remove(@EntityFromParam('id') organisation: RunnerOrganisation, @QueryParam("force") force: boolean) {
+	async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
-		if (!organisation) { throw new RunnerOrganisationNotFoundError() }
+		let runnerOrganisation = await this.runnerOrganisationRepository.findOne({ id: id }, { relations: ['address', 'contact', 'teams'] });
-		let runnerOrganisation = await this.runnerOrganisationRepository.findOne(organisation, { relations: ['address', 'contact', 'runners', 'teams'] });
 
-		if (!force) {
+		if (!runnerOrganisation) {
-			if (runnerOrganisation.teams.length != 0) {
+			throw new RunnerOrganisationNotFoundError();
-				throw new RunnerOrganisationHasTeamsError();
-			}
-		}
-		const teamController = new RunnerTeamController()
-		for (let team of runnerOrganisation.teams) {
-			await teamController.remove(team, true);
 		}
 
+		let runners: Runner[] = await runnerOrganisation.getRunners()
 		if (!force) {
-			if (runnerOrganisation.runners.length != 0) {
+			if (runners.length != 0) {
 				throw new RunnerOrganisationHasRunnersError();
 			}
 		}
 		const runnerController = new RunnerController()
-		for (let runner of runnerOrganisation.runners) {
+		runners.forEach(runner => {
-			await runnerController.remove(runner, true);
+			runnerController.remove(runner.id, true)
+		});
+
+		let teams: RunnerTeam[] = await runnerOrganisation.getTeams()
+		if (!force) {
+			if (teams.length != 0) {
+				throw new RunnerOrganisationHasTeamsError();
+			}
 		}
+		const teamController = new RunnerTeamController()
+		teams.forEach(team => {
+			teamController.remove(team.id, true)
+		});
 
 		const responseOrganisation = new ResponseRunnerOrganisation(runnerOrganisation);
-		await this.runnerOrganisationRepository.delete(organisation);
+		await this.runnerOrganisationRepository.delete({ id: runnerOrganisation.id });
 		return responseOrganisation;
 	}
 }

src/controllers/RunnerTeamController.ts

@@ -1,9 +1,10 @@
 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, EntityFromParam } from 'typeorm-routing-controllers-extensions';
+import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
 import { RunnerTeamHasRunnersError, RunnerTeamIdsNotMatchingError, RunnerTeamNotFoundError } from '../errors/RunnerTeamErrors';
 import { CreateRunnerTeam } from '../models/creation/CreateRunnerTeam';
+import { Runner } from '../models/entities/Runner';
 import { RunnerTeam } from '../models/entities/RunnerTeam';
 import { ResponseRunnerTeam } from '../models/responses/ResponseRunnerTeam';
 import { RunnerController } from './RunnerController';
@@ -87,22 +88,26 @@ export class RunnerTeamController {
 	@ResponseSchema(RunnerTeamNotFoundError, { statusCode: 404 })
 	@ResponseSchema(RunnerTeamHasRunnersError, { statusCode: 406 })
 	@OpenAPI({ description: 'Delete a specified runnerTeam (if it exists).' })
-	async remove(@EntityFromParam('id') team: RunnerTeam, @QueryParam("force") force: boolean) {
+	async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
-		if (!team) { throw new RunnerTeamNotFoundError(); }
+		let runnerTeam = await this.runnerTeamRepository.findOne({ id: id }, { relations: ['parentGroup', 'contact'] });
-		let runnerTeam = await this.runnerTeamRepository.findOne(team, { relations: ['parentGroup', 'contact', 'runners'] });
 
+		if (!runnerTeam) {
+			throw new RunnerTeamNotFoundError();
+		}
+
+		let runners: Runner[] = await runnerTeam.getRunners()
 		if (!force) {
-			if (runnerTeam.runners.length != 0) {
+			if (runners.length != 0) {
 				throw new RunnerTeamHasRunnersError();
 			}
 		}
 		const runnerController = new RunnerController()
-		for (let runner of runnerTeam.runners) {
+		runners.forEach(runner => {
-			await runnerController.remove(runner, true);
+			runnerController.remove(runner.id, true)
-		}
+		});
 
 		const responseTeam = new ResponseRunnerTeam(runnerTeam);
-		await this.runnerTeamRepository.delete(team);
+		await this.runnerTeamRepository.delete({ id: runnerTeam.id });
 		return responseTeam;
 	}
 }

src/controllers/TrackController.ts

@@ -1,7 +1,7 @@
 import { Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
-import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions';
+import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
 import { TrackIdsNotMatchingError, TrackNotFoundError } from "../errors/TrackErrors";
 import { CreateTrack } from '../models/creation/CreateTrack';
 import { Track } from '../models/entities/Track';
@@ -74,8 +74,12 @@ export class TrackController {
 	@ResponseSchema(ResponseTrack)
 	@ResponseSchema(TrackNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: "Delete a specified track (if it exists)." })
-	async remove(@EntityFromParam('id') track: Track) {
+	async remove(@Param('id') id: number) {
-		if (!track) { throw new TrackNotFoundError(); }
+		let track = await this.trackRepository.findOne({ id: id });
+
+		if (!track) {
+			throw new TrackNotFoundError();
+		}
 
 		await this.trackRepository.delete(track);
 		return new ResponseTrack(track);

src/models/creation/CreateRunnerGroup.ts

@@ -1,30 +0,0 @@
-import { IsNotEmpty, IsObject, IsOptional, IsString } from 'class-validator';
-import { GroupContact } from '../entities/GroupContact';
-
-export abstract class CreateRunnerGroup {
-    /**
-     * The group's name.
-     */
-    @IsNotEmpty()
-    @IsString()
-    name: string;
-
-    /**
-     * The group's contact.
-     * Optional
-     */
-    @IsObject()
-    @IsOptional()
-    contact?: GroupContact;
-
-    /**
-     * Deals with the contact for groups this.
-     */
-    public async getContact(): Promise<GroupContact> {
-        let newGroupContact: GroupContact;
-
-        //TODO:
-
-        return newGroupContact;
-    }
-}

src/models/creation/CreateRunnerOrganisation.ts

@@ -1,47 +1,13 @@
-import { IsInt, IsObject, IsOptional } from 'class-validator';
+import { IsNotEmpty, IsString } from 'class-validator';
-import { getConnectionManager } from 'typeorm';
-import { ParticipantOnlyOneAddressAllowedError } from '../../errors/ParticipantErrors';
-import { Address } from '../entities/Address';
 import { RunnerOrganisation } from '../entities/RunnerOrganisation';
-import { CreateAddress } from './CreateAddress';
-import { CreateRunnerGroup } from './CreateRunnerGroup';
 
-export class CreateRunnerOrganisation extends CreateRunnerGroup {
+export class CreateRunnerOrganisation {
     /**
-     * The new participant's address's id.
+     * The Organisation's name.
-     * Optional - please provide either addressId or address.
      */
-    @IsInt()
+    @IsString()
-    @IsOptional()
+    @IsNotEmpty()
-    addressId?: number;
+    name: string;
-
-    /**
-     * The new participant's address.
-     * Optional - please provide either addressId or address.
-     */
-    @IsObject()
-    @IsOptional()
-    address?: CreateAddress;
-
-    /**
-     * Creates a Participant entity from this.
-     */
-    public async getAddress(): Promise<Address> {
-        let address: Address;
-
-        if (this.addressId !== undefined && this.address !== undefined) {
-            throw new ParticipantOnlyOneAddressAllowedError
-        }
-        if (this.addressId === undefined && this.address === undefined) {
-            return null;
-        }
-
-        if (this.addressId) {
-            return await getConnectionManager().get().getRepository(Address).findOne({ id: this.addressId });
-        }
-
-        return this.address.toAddress();
-    }
 
     /**
      * Creates a RunnerOrganisation entity from this.
@@ -50,8 +16,6 @@ export class CreateRunnerOrganisation extends CreateRunnerGroup {
         let newRunnerOrganisation: RunnerOrganisation = new RunnerOrganisation();
 
         newRunnerOrganisation.name = this.name;
-        newRunnerOrganisation.contact = await this.getContact();
-        newRunnerOrganisation.address = await this.getAddress();
 
         return newRunnerOrganisation;
     }

src/models/creation/CreateUser.ts

@@ -7,71 +7,26 @@ import { User } from '../entities/User';
 import { UserGroup } from '../entities/UserGroup';
 
 export class CreateUser {
-    /**
-     * The new user's first name.
-     */
     @IsString()
     firstname: string;
-
-    /**
-     * The new user's middle name.
-     * Optinal.
-     */
     @IsString()
-    @IsOptional()
     middlename?: string;
-
-    /**
-     * The new user's last name.
-     */
-    @IsString()
-    lastname: string;
-
-    /**
-     * The new user's username.
-     * You have to provide at least one of: {email, username}.
-     */
     @IsOptional()
     @IsString()
     username?: string;
-
-    /**
-     * The new user's email address.
-     * You have to provide at least one of: {email, username}.
-     */
-    @IsEmail()
-    @IsString()
-    @IsOptional()
-    email?: string;
-
-    /**
-     * The new user's phone number.
-     * Optional
-     */
     @IsPhoneNumber("ZZ")
     @IsOptional()
     phone?: string;
-
-    /**
-     * The new user's password.
-     * This will of course not be saved in plaintext :)
-     */
     @IsString()
     password: string;
-
+    @IsString()
-    /**
+    lastname: string;
-     * The new user's groups' id(s).
+    @IsEmail()
-     * You can provide either one groupId or an array of groupIDs.
+    @IsString()
-     * Optional.
+    email?: string;
-     */
     @IsOptional()
     groupId?: number[] | number
 
-    //TODO: ProfilePics
-
-    /**
-     * Converts this to a User Entity.
-     */
     public async toUser(): Promise<User> {
         let newUser: User = new User();
 
@@ -103,16 +58,17 @@ export class CreateUser {
             }
         }
 
+        const new_uuid = uuid.v4()
+
         newUser.email = this.email
         newUser.username = this.username
         newUser.firstname = this.firstname
         newUser.middlename = this.middlename
         newUser.lastname = this.lastname
-        newUser.uuid = uuid.v4()
+        newUser.uuid = new_uuid
-        newUser.phone = this.phone
+        newUser.password = await argon2.hash(this.password + new_uuid);
-        newUser.password = await argon2.hash(this.password + newUser.uuid);
-        //TODO: ProfilePics
 
+        console.log(newUser)
         return newUser;
     }
 }

src/models/creation/CreateUserGroup.ts

@@ -1,30 +1,28 @@
 import { IsOptional, IsString } from 'class-validator';
+import { GroupNameNeededError } from '../../errors/UserGroupErrors';
 import { UserGroup } from '../entities/UserGroup';
 
 export class CreateUserGroup {
-    /**
+    @IsOptional()
-     * The new group's name.
-     */
     @IsString()
     name: string;
-
-    /**
-     * The new group's description.
-     * Optinal.
-     */
     @IsOptional()
     @IsString()
     description?: string;
 
-    /**
-     * Converts this to a UserGroup entity.
-     */
     public async toUserGroup(): Promise<UserGroup> {
         let newUserGroup: UserGroup = new UserGroup();
 
-        newUserGroup.name = this.name;
+        if (this.name === undefined) {
-        newUserGroup.description = this.description;
+            throw new GroupNameNeededError();
+        }
 
+        newUserGroup.name = this.name
+        if (this.description) {
+            newUserGroup.description = this.description
+        }
+
+        console.log(newUserGroup)
         return newUserGroup;
     }
 }

src/models/entities/Address.ts

@@ -1,11 +1,11 @@
+import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from "typeorm";
 import {
   IsInt,
   IsNotEmpty,
   IsOptional,
   IsPostalCode,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
 import { Participant } from "./Participant";
 import { RunnerOrganisation } from "./RunnerOrganisation";
 
@@ -18,13 +18,14 @@ export class Address {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 
   /**
    * The address's description.
    */
-  @Column({ nullable: true })
+  @Column({nullable: true})
   @IsString()
   @IsOptional()
   description?: string;
@@ -42,7 +43,7 @@ export class Address {
    * The address's second line.
    * Containing optional information.
    */
-  @Column({ nullable: true })
+  @Column({nullable: true})
   @IsString()
   @IsOptional()
   address2?: string;

src/models/entities/DistanceDonation.ts

@@ -13,7 +13,7 @@ export class DistanceDonation extends Donation {
    * The runner associated.
    */
   @IsNotEmpty()
-  @ManyToOne(() => Runner, runner => runner.distanceDonations)
+  @ManyToOne(() => Runner, runner => runner.distanceDonations, { nullable: true })
   runner: Runner;
 
   /**
@@ -28,10 +28,18 @@ export class DistanceDonation extends Donation {
    * The donation's amount in cents (or whatever your currency's smallest unit is.).
    * The exact implementation may differ for each type of donation.
    */
-  public get amount(): number {
+  @IsInt()
+  public get amount() {
+    return this.getAmount();
+  }
+
+  /**
+   * The function that calculates the amount based on the runner object's distance.
+   */
+  public async getAmount(): Promise<number> {
     let calculatedAmount = -1;
     try {
-      calculatedAmount = this.amountPerDistance * this.runner.distance;
+      calculatedAmount = this.amountPerDistance * await this.runner.distance();
     } catch (error) {
       throw error;
     }

src/models/entities/Donation.ts

@@ -1,6 +1,7 @@
 import {
   IsInt,
-  IsNotEmpty
+  IsNotEmpty,
+  IsOptional
 } from "class-validator";
 import { Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
 import { Participant } from "./Participant";
@@ -15,6 +16,7 @@ export abstract class Donation {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 
@@ -22,7 +24,7 @@ export abstract class Donation {
    * The donations's donor.
    */
   @IsNotEmpty()
-  @ManyToOne(() => Participant, donor => donor.donations)
+  @ManyToOne(() => Participant, donor => donor.donations, { nullable: true })
   donor: Participant;
 
   /**

src/models/entities/Donor.ts

@@ -1,5 +1,5 @@
+import { Entity, Column, ChildEntity } from "typeorm";
 import { IsBoolean } from "class-validator";
-import { ChildEntity, Column } from "typeorm";
 import { Participant } from "./Participant";
 
 /**

src/models/entities/FixedDonation.ts

@@ -1,5 +1,5 @@
-import { IsInt, IsPositive } from "class-validator";
+import { Entity, Column, ChildEntity } from "typeorm";
-import { ChildEntity, Column } from "typeorm";
+import { IsInt, IsPositive, } from "class-validator";
 import { Donation } from "./Donation";
 
 /**

src/models/entities/GroupContact.ts

@@ -1,14 +1,15 @@
+import { PrimaryGeneratedColumn, Column, OneToMany, ManyToOne, Entity } from "typeorm";
 import {
   IsEmail,
   IsInt,
   IsNotEmpty,
   IsOptional,
   IsPhoneNumber,
-
+  IsPositive,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
 import { Address } from "./Address";
+import { Donation } from "./Donation";
 import { RunnerGroup } from "./RunnerGroup";
 
 /**
@@ -16,10 +17,11 @@ import { RunnerGroup } from "./RunnerGroup";
 */
 @Entity()
 export class GroupContact {
-  /**
+    /**
- * Autogenerated unique id (primary key).
+   * Autogenerated unique id (primary key).
- */
+   */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 
@@ -35,7 +37,7 @@ export class GroupContact {
    * The contact's middle name.
    * Optional
    */
-  @Column({ nullable: true })
+  @Column({nullable: true})
   @IsOptional()
   @IsString()
   middlename?: string;
@@ -60,7 +62,7 @@ export class GroupContact {
    * The contact's phone number.
    * Optional
    */
-  @Column({ nullable: true })
+  @Column({nullable: true})
   @IsOptional()
   @IsPhoneNumber("DE")
   phone?: string;
@@ -69,13 +71,19 @@ export class GroupContact {
    * The contact's email address.
    * Optional
    */
-  @Column({ nullable: true })
+  @Column({nullable: true})
   @IsOptional()
   @IsEmail()
   email?: string;
 
   /**
-    * Used to link contacts to groups.
+   * Used to link the contact as the donor of a donation.
+   */
+  @OneToMany(() => Donation, donation => donation.donor, { nullable: true })
+  donations: Donation[];
+
+  /**
+    * Used to link runners to donations.
     */
   @OneToMany(() => RunnerGroup, group => group.contact, { nullable: true })
   groups: RunnerGroup[];

src/models/entities/Participant.ts

@@ -1,13 +1,13 @@
+import { PrimaryGeneratedColumn, Column, OneToMany, ManyToOne, Entity, TableInheritance } from "typeorm";
 import {
   IsEmail,
   IsInt,
   IsNotEmpty,
   IsOptional,
   IsPhoneNumber,
-
+  IsPositive,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
 import { Address } from "./Address";
 import { Donation } from "./Donation";
 
@@ -21,6 +21,7 @@ export abstract class Participant {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 

src/models/entities/Permission.ts

@@ -1,10 +1,10 @@
+import { PrimaryGeneratedColumn, Column, OneToMany, Entity, ManyToOne } from "typeorm";
 import {
   IsInt,
   IsNotEmpty,
-
+  IsOptional,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
 import { User } from './User';
 import { UserGroup } from './UserGroup';
 /**
@@ -16,6 +16,7 @@ export abstract class Permission {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 

src/models/entities/Runner.ts

@@ -1,5 +1,5 @@
 import { IsInt, IsNotEmpty } from "class-validator";
-import { ChildEntity, ManyToOne, OneToMany } from "typeorm";
+import { ChildEntity, getConnectionManager, ManyToOne, OneToMany } from "typeorm";
 import { DistanceDonation } from "./DistanceDonation";
 import { Participant } from "./Participant";
 import { RunnerCard } from "./RunnerCard";
@@ -15,7 +15,7 @@ export class Runner extends Participant {
    * The runner's associated group.
    */
   @IsNotEmpty()
-  @ManyToOne(() => RunnerGroup, group => group.runners, { nullable: false })
+  @ManyToOne(() => RunnerGroup, group => group.runners, { nullable: true })
   group: RunnerGroup;
 
   /**
@@ -36,18 +36,25 @@ export class Runner extends Participant {
   @OneToMany(() => Scan, scan => scan.runner, { nullable: true })
   scans: Scan[];
 
+  /**
+   * Returns all scans associated with this runner.
+   */
+  public async getScans(): Promise<Scan[]> {
+    return await getConnectionManager().get().getRepository(Scan).find({ runner: this });
+  }
+
   /**
    * Returns all valid scans associated with this runner.
    */
-  public get validScans(): Scan[] {
+  public async getValidScans(): Promise<Scan[]> {
-    return this.scans.filter(scan => { scan.valid === true });
+    return (await this.getScans()).filter(scan => { scan.valid === true });
   }
 
   /**
    * Returns the total distance ran by this runner.
   */
   @IsInt()
-  public get distance(): number {
+  public async distance(): Promise<number> {
-    return this.validScans.reduce((sum, current) => sum + current.distance, 0);
+    return await (await this.getValidScans()).reduce((sum, current) => sum + current.distance, 0);
   }
 }

src/models/entities/RunnerCard.ts

@@ -1,12 +1,12 @@
+import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, OneToMany } from "typeorm";
 import {
   IsBoolean,
   IsEAN,
   IsInt,
   IsNotEmpty,
   IsOptional,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
 import { Runner } from "./Runner";
 import { TrackScan } from "./TrackScan";
 
@@ -19,6 +19,7 @@ export class RunnerCard {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 

src/models/entities/RunnerGroup.ts

@@ -18,11 +18,12 @@ export abstract class RunnerGroup {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 
   /**
-   * The group's name.
+   * The group's first name.
    */
   @Column()
   @IsNotEmpty()
@@ -42,4 +43,6 @@ export abstract class RunnerGroup {
    */
   @OneToMany(() => Runner, runner => runner.group, { nullable: true })
   runners: Runner[];
+
+  public abstract getRunners();
 }

src/models/entities/RunnerOrganisation.ts

@@ -1,6 +1,7 @@
 import { IsOptional } from "class-validator";
-import { ChildEntity, ManyToOne, OneToMany } from "typeorm";
+import { ChildEntity, getConnectionManager, ManyToOne, OneToMany } from "typeorm";
 import { Address } from "./Address";
+import { Runner } from './Runner';
 import { RunnerGroup } from "./RunnerGroup";
 import { RunnerTeam } from "./RunnerTeam";
 
@@ -23,4 +24,27 @@ export class RunnerOrganisation extends RunnerGroup {
  */
   @OneToMany(() => RunnerTeam, team => team.parentGroup, { nullable: true })
   teams: RunnerTeam[];
+
+
+  /**
+   * Returns all runners associated with this organisation or it's teams.
+   */
+  public async getRunners() {
+    let runners: Runner[] = new Array<Runner>();
+    const teams = await this.getTeams();
+
+    await teams.forEach(async team => {
+      runners.push(... await team.getRunners());
+    });
+    await runners.push(... await getConnectionManager().get().getRepository(Runner).find({ group: this }));
+
+    return runners;
+  }
+
+  /**
+   * Returns all teams associated with this organisation.
+   */
+  public async getTeams() {
+    return await getConnectionManager().get().getRepository(RunnerTeam).find({ parentGroup: this });
+  }
 }

src/models/entities/RunnerTeam.ts

@@ -1,5 +1,6 @@
 import { IsNotEmpty } from "class-validator";
-import { ChildEntity, ManyToOne } from "typeorm";
+import { ChildEntity, getConnectionManager, ManyToOne } from "typeorm";
+import { Runner } from './Runner';
 import { RunnerGroup } from "./RunnerGroup";
 import { RunnerOrganisation } from "./RunnerOrganisation";
 
@@ -16,4 +17,11 @@ export class RunnerTeam extends RunnerGroup {
   @IsNotEmpty()
   @ManyToOne(() => RunnerOrganisation, org => org.teams, { nullable: true })
   parentGroup?: RunnerOrganisation;
+
+  /**
+   * Returns all runners associated with this team.
+   */
+  public async getRunners() {
+    return await getConnectionManager().get().getRepository(Runner).find({ group: this });
+  }
 }

src/models/entities/Scan.ts

@@ -1,11 +1,11 @@
+import { PrimaryGeneratedColumn, Column, ManyToOne, Entity, TableInheritance } from "typeorm";
 import {
   IsBoolean,
   IsInt,
   IsNotEmpty,
-
+  IsOptional,
-  IsPositive
+  IsPositive,
 } from "class-validator";
-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
 import { Runner } from "./Runner";
 
 /**
@@ -18,6 +18,7 @@ export abstract class Scan {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 
@@ -25,7 +26,7 @@ export abstract class Scan {
    * The associated runner.
    */
   @IsNotEmpty()
-  @ManyToOne(() => Runner, runner => runner.scans, { nullable: false })
+  @ManyToOne(() => Runner, runner => runner.scans, { nullable: true })
   runner: Runner;
 
   /**
@@ -42,4 +43,12 @@ export abstract class Scan {
   @Column()
   @IsBoolean()
   valid: boolean = true;
+
+  /**
+   * seconds since last scan
+   */
+  @IsInt()
+  @IsOptional()
+  secondsSinceLastScan: number;
+
 }

src/models/entities/ScanStation.ts

@@ -1,11 +1,11 @@
+import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, OneToMany } from "typeorm";
 import {
   IsBoolean,
   IsInt,
   IsNotEmpty,
   IsOptional,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
 import { Track } from "./Track";
 import { TrackScan } from "./TrackScan";
 
@@ -18,13 +18,14 @@ export class ScanStation {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 
   /**
    * The station's description.
    */
-  @Column({ nullable: true })
+  @Column({nullable: true})
   @IsOptional()
   @IsString()
   description?: string;
@@ -33,7 +34,7 @@ export class ScanStation {
    * The track this station is associated with.
    */
   @IsNotEmpty()
-  @ManyToOne(() => Track, track => track.stations, { nullable: false })
+  @ManyToOne(() => Track, track => track.stations, { nullable: true })
   track: Track;
 
   /**

src/models/entities/Track.ts

@@ -1,11 +1,11 @@
+import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from "typeorm";
 import {
   IsInt,
   IsNotEmpty,
-
+  IsOptional,
   IsPositive,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
 import { ScanStation } from "./ScanStation";
 import { TrackScan } from "./TrackScan";
 
@@ -18,6 +18,7 @@ export class Track {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;;
 

src/models/entities/TrackScan.ts

@@ -1,15 +1,17 @@
+import { PrimaryGeneratedColumn, Column, ManyToOne, Entity, ChildEntity } from "typeorm";
 import {
+  IsBoolean,
   IsDateString,
   IsInt,
   IsNotEmpty,
-
+  IsOptional,
-  IsPositive
+  IsPositive,
 } from "class-validator";
-import { ChildEntity, Column, ManyToOne } from "typeorm";
-import { RunnerCard } from "./RunnerCard";
 import { Scan } from "./Scan";
-import { ScanStation } from "./ScanStation";
+import { Runner } from "./Runner";
 import { Track } from "./Track";
+import { RunnerCard } from "./RunnerCard";
+import { ScanStation } from "./ScanStation";
 
 /**
  * Defines the scan interface.

src/models/entities/User.ts

@@ -13,6 +13,7 @@ export class User {
   * autogenerated unique id (primary key).
   */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 
@@ -20,30 +21,30 @@ export class User {
   * uuid
   */
   @Column()
-  @IsUUID(4)
+  @IsUUID("4")
   uuid: string;
 
   /**
   * user email
   */
-  @Column({ nullable: true })
+  @Column()
   @IsEmail()
-  email?: string;
+  email: string;
 
   /**
   * user phone
   */
-  @Column({ nullable: true })
+  @Column()
-  @IsOptional()
   @IsPhoneNumber("ZZ")
-  phone?: string;
+  @IsOptional()
+  phone: string;
 
   /**
   * username
   */
-  @Column({ nullable: true })
+  @Column()
   @IsString()
-  username?: string;
+  username: string;
 
   /**
   * firstname
@@ -56,10 +57,10 @@ export class User {
   /**
   * middlename
   */
-  @Column({ nullable: true })
+  @Column()
   @IsString()
   @IsOptional()
-  middlename?: string;
+  middlename: string;
 
   /**
   * lastname
@@ -82,7 +83,7 @@ export class User {
   */
   @IsOptional()
   @ManyToOne(() => Permission, permission => permission.users, { nullable: true })
-  permissions?: Permission[];
+  permissions: Permission[];
 
   /**
   * groups
@@ -104,22 +105,21 @@ export class User {
   */
   @IsInt()
   @Column({ default: 1 })
-  refreshTokenCount?: number;
+  refreshTokenCount: number;
 
   /**
   * profilepic
   */
-  @Column({ nullable: true })
+  @Column()
   @IsString()
-  @IsOptional()
+  profilePic: string;
-  profilePic?: string;
 
   /**
    * actions
    */
   @IsOptional()
   @OneToMany(() => UserAction, action => action.user, { nullable: true })
-  actions: UserAction[]
+  actions: UserAction
 
   /**
    * calculate all permissions

src/models/entities/UserAction.ts

@@ -1,10 +1,10 @@
+import { PrimaryGeneratedColumn, Column, OneToMany, Entity, ManyToOne } from "typeorm";
 import {
   IsInt,
   IsNotEmpty,
   IsOptional,
-  IsString
+  IsString,
 } from "class-validator";
-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
 import { User } from './User';
 
 /**
@@ -16,6 +16,7 @@ export class UserAction {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;
 

src/models/entities/UserGroup.ts

@@ -16,6 +16,7 @@ export class UserGroup {
    * Autogenerated unique id (primary key).
    */
   @PrimaryGeneratedColumn()
+  @IsOptional()
   @IsInt()
   id: number;