Merge branch 'dev' into feature/12-jwt-creation

src/models/creation/CreateAddress.ts

@@ -0,0 +1,64 @@
+import { IsNotEmpty, IsOptional, IsPostalCode, IsString } from 'class-validator';
+import { Address } from '../entities/Address';
+
+export class CreateAddress {
+    /**
+   * The address's description.
+   */
+    @IsString()
+    @IsOptional()
+    description?: string;
+
+    /**
+     * The address's first line.
+     * Containing the street and house number.
+     */
+    @IsString()
+    @IsNotEmpty()
+    address1: string;
+
+    /**
+     * The address's second line.
+     * Containing optional information.
+     */
+    @IsString()
+    @IsOptional()
+    address2?: string;
+
+    /**
+     * The address's postal code.
+     */
+    @IsString()
+    @IsNotEmpty()
+    @IsPostalCode("DE")
+    postalcode: string;
+
+    /**
+     * The address's city.
+     */
+    @IsString()
+    @IsNotEmpty()
+    city: string;
+
+    /**
+     * The address's country.
+     */
+    @IsString()
+    @IsNotEmpty()
+    country: string;
+
+    /**
+     * Creates a Address object based on this.
+     */
+    public toAddress(): Address {
+        let newAddress: Address = new Address();
+
+        newAddress.address1 = this.address1;
+        newAddress.address2 = this.address2;
+        newAddress.postalcode = this.postalcode;
+        newAddress.city = this.city;
+        newAddress.country = this.country;
+
+        return newAddress;
+    }
+}

src/models/creation/CreateParticipant.ts

@@ -0,0 +1,83 @@
+import { IsEmail, IsInt, IsNotEmpty, IsObject, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
+import { getConnectionManager } from 'typeorm';
+import { ParticipantOnlyOneAddressAllowedError } from '../../errors/ParticipantErrors';
+import { Address } from '../entities/Address';
+import { CreateAddress } from './CreateAddress';
+
+export abstract class CreateParticipant {
+    /**
+     * The new participant's first name.
+     */
+    @IsString()
+    @IsNotEmpty()
+    firstname: string;
+
+    /**
+     * The new participant's middle name.
+     * Optional.
+     */
+    @IsString()
+    @IsNotEmpty()
+    middlename?: string;
+
+    /**
+     * The new participant's last name.
+     */
+    @IsString()
+    @IsNotEmpty()
+    lastname: string;
+
+    /**
+     * The new participant's phone number.
+     * Optional.
+     */
+    @IsString()
+    @IsOptional()
+    @IsPhoneNumber("ZZ")
+    phone?: string;
+
+    /**
+     * The new participant's e-mail address.
+     * Optional.
+     */
+    @IsString()
+    @IsOptional()
+    @IsEmail()
+    email?: string;
+
+    /**
+     * The new participant's address's id.
+     * Optional - please provide either addressId or address.
+     */
+    @IsInt()
+    @IsOptional()
+    addressId?: number;
+
+    /**
+     * 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();
+    }
+}

src/models/creation/CreateRunner.ts

@@ -1,34 +1,52 @@
-import { IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsPositive, IsString } from 'class-validator';
+import { IsInt, IsOptional } from 'class-validator';
+import { getConnectionManager } from 'typeorm';
+import { RunnerGroupNeededError, RunnerGroupNotFoundError, RunnerOnlyOneGroupAllowedError } from '../../errors/RunnerErrors';
 import { Runner } from '../entities/Runner';
-import { getConnectionManager, Repository } from 'typeorm';
-import { group } from 'console';
-import { RunnerOnlyOneGroupAllowedError, RunnerGroupNeededError, RunnerGroupNotFoundError } from '../../errors/RunnerErrors';
+import { RunnerGroup } from '../entities/RunnerGroup';
 import { RunnerOrganisation } from '../entities/RunnerOrganisation';
 import { RunnerTeam } from '../entities/RunnerTeam';
-import { RunnerGroup } from '../entities/RunnerGroup';
-import { Address } from 'cluster';
+import { CreateParticipant } from './CreateParticipant';
 
-export class CreateRunner {
-    @IsString()
-    firstname: string;
-    @IsString()
-    middlename?: string;
-    @IsString()
-    lastname: string;
-    @IsString()
-    phone?: string;
-    @IsString()
-    email?: string;
+export class CreateRunner extends CreateParticipant {
+
+    /**
+     * The new runner's team's id.
+     * Either provide this or his organisation's id.
+     */
     @IsInt()
     @IsOptional()
-    teamId?: number
+    teamId?: number;
+
+    /**
+     * The new runner's organisation's id.
+     * Either provide this or his teams's id.
+     */
     @IsInt()
     @IsOptional()
-    orgId?: number
+    orgId?: number;
 
+    /**
+     * Creates a Runner entity from this.
+     */
     public async toRunner(): Promise<Runner> {
         let newRunner: Runner = new Runner();
 
+        newRunner.firstname = this.firstname;
+        newRunner.middlename = this.middlename;
+        newRunner.lastname = this.lastname;
+        newRunner.phone = this.phone;
+        newRunner.email = this.email;
+        newRunner.group = await this.getGroup();
+        newRunner.address = await this.getAddress();
+
+        return newRunner;
+    }
+
+    /**
+     * Manages all the different ways a group can be provided.
+     */
+    public async getGroup(): Promise<RunnerGroup> {
+        let group: RunnerGroup;
         if (this.teamId !== undefined && this.orgId !== undefined) {
             throw new RunnerOnlyOneGroupAllowedError();
         }
@@ -37,22 +55,14 @@ export class CreateRunner {
         }
 
         if (this.teamId) {
-            newRunner.group = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ id: this.teamId });
+            group = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ id: this.teamId });
         }
         if (this.orgId) {
-            newRunner.group = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.orgId });
+            group = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.orgId });
         }
-        if (!newRunner.group) {
+        if (!group) {
             throw new RunnerGroupNotFoundError();
         }
-
-        newRunner.firstname = this.firstname;
-        newRunner.middlename = this.middlename;
-        newRunner.lastname = this.lastname;
-        newRunner.phone = this.phone;
-        newRunner.email = this.email;
-
-        console.log(newRunner)
-        return newRunner;
+        return group;
     }
 }

src/models/creation/CreateRunnerOrganisation.ts

@@ -1,10 +1,17 @@
-import { IsString } from 'class-validator';
+import { IsNotEmpty, IsString } from 'class-validator';
 import { RunnerOrganisation } from '../entities/RunnerOrganisation';
 
 export class CreateRunnerOrganisation {
+    /**
+     * The Organisation's name.
+     */
     @IsString()
+    @IsNotEmpty()
     name: string;
 
+    /**
+     * Creates a RunnerOrganisation entity from this.
+     */
     public async toRunnerOrganisation(): Promise<RunnerOrganisation> {
         let newRunnerOrganisation: RunnerOrganisation = new RunnerOrganisation();
 

src/models/creation/CreateRunnerTeam.ts

@@ -0,0 +1,36 @@
+import { IsInt, IsNotEmpty, IsString } from 'class-validator';
+import { getConnectionManager } from 'typeorm';
+import { RunnerOrganisationNotFoundError } from '../../errors/RunnerOrganisationErrors';
+import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerTeam } from '../entities/RunnerTeam';
+
+export class CreateRunnerTeam {
+    /**
+     * The teams's name.
+     */
+    @IsString()
+    @IsNotEmpty()
+    name: string;
+
+    /**
+     * The team's parent group (organisation).
+     */
+    @IsInt()
+    @IsNotEmpty()
+    parentId: number
+
+    /**
+     * Creates a RunnerTeam entity from this.
+     */
+    public async toRunnerTeam(): Promise<RunnerTeam> {
+        let newRunnerTeam: RunnerTeam = new RunnerTeam();
+
+        newRunnerTeam.name = this.name;
+        newRunnerTeam.parentGroup = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.parentId });
+        if (!newRunnerTeam.parentGroup) {
+            throw new RunnerOrganisationNotFoundError();
+        }
+
+        return newRunnerTeam;
+    }
+}