Merge branch 'dev' into feature/17-automated_tests

src/models/entities/GroupContact.ts

@@ -1,82 +1,83 @@
-import {
-  IsEmail,
-  IsInt,
-  IsNotEmpty,
-  IsOptional,
-  IsPhoneNumber,
-
-  IsString
-} from "class-validator";
-import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
-import { Address } from "./Address";
-import { RunnerGroup } from "./RunnerGroup";
-
-/**
- * Defines a group's contact.
-*/
-@Entity()
-export class GroupContact {
-  /**
- * Autogenerated unique id (primary key).
- */
-  @PrimaryGeneratedColumn()
-  @IsInt()
-  id: number;
-
-  /**
-   * The contact's first name.
-   */
-  @Column()
-  @IsNotEmpty()
-  @IsString()
-  firstname: string;
-
-  /**
-   * The contact's middle name.
-   * Optional
-   */
-  @Column({ nullable: true })
-  @IsOptional()
-  @IsString()
-  middlename?: string;
-
-  /**
-   * The contact's last name.
-   */
-  @Column()
-  @IsNotEmpty()
-  @IsString()
-  lastname: string;
-
-  /**
-   * The contact's address.
-   * Optional
-   */
-  @IsOptional()
-  @ManyToOne(() => Address, address => address.participants, { nullable: true })
-  address?: Address;
-
-  /**
-   * The contact's phone number.
-   * Optional
-   */
-  @Column({ nullable: true })
-  @IsOptional()
-  @IsPhoneNumber("DE")
-  phone?: string;
-
-  /**
-   * The contact's email address.
-   * Optional
-   */
-  @Column({ nullable: true })
-  @IsOptional()
-  @IsEmail()
-  email?: string;
-
-  /**
-    * Used to link contacts to groups.
-    */
-  @OneToMany(() => RunnerGroup, group => group.contact, { nullable: true })
-  groups: RunnerGroup[];
+import {
+  IsEmail,
+  IsInt,
+  IsNotEmpty,
+  IsOptional,
+  IsPhoneNumber,
+
+  IsString
+} from "class-validator";
+import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
+import { config } from '../../config';
+import { Address } from "./Address";
+import { RunnerGroup } from "./RunnerGroup";
+
+/**
+ * Defines a group's contact.
+*/
+@Entity()
+export class GroupContact {
+  /**
+ * Autogenerated unique id (primary key).
+ */
+  @PrimaryGeneratedColumn()
+  @IsInt()
+  id: number;
+
+  /**
+   * The contact's first name.
+   */
+  @Column()
+  @IsNotEmpty()
+  @IsString()
+  firstname: string;
+
+  /**
+   * The contact's middle name.
+   * Optional
+   */
+  @Column({ nullable: true })
+  @IsOptional()
+  @IsString()
+  middlename?: string;
+
+  /**
+   * The contact's last name.
+   */
+  @Column()
+  @IsNotEmpty()
+  @IsString()
+  lastname: string;
+
+  /**
+   * The contact's address.
+   * Optional
+   */
+  @IsOptional()
+  @ManyToOne(() => Address, address => address.participants, { nullable: true })
+  address?: Address;
+
+  /**
+   * The contact's phone number.
+   * Optional
+   */
+  @Column({ nullable: true })
+  @IsOptional()
+  @IsPhoneNumber(config.phone_validation_countrycode)
+  phone?: string;
+
+  /**
+   * The contact's email address.
+   * Optional
+   */
+  @Column({ nullable: true })
+  @IsOptional()
+  @IsEmail()
+  email?: string;
+
+  /**
+    * Used to link contacts to groups.
+    */
+  @OneToMany(() => RunnerGroup, group => group.contact, { nullable: true })
+  groups: RunnerGroup[];
 }

src/models/entities/Participant.ts

@@ -1,82 +1,83 @@
-import {
-  IsEmail,
-  IsInt,
-  IsNotEmpty,
-  IsOptional,
-  IsPhoneNumber,
-
-  IsString
-} from "class-validator";
-import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
-import { Address } from "./Address";
-import { Donation } from "./Donation";
-
-/**
- * Defines the participant interface.
-*/
-@Entity()
-@TableInheritance({ column: { name: "type", type: "varchar" } })
-export abstract class Participant {
-  /**
-   * Autogenerated unique id (primary key).
-   */
-  @PrimaryGeneratedColumn()
-  @IsInt()
-  id: number;
-
-  /**
-   * The participant's first name.
-   */
-  @Column()
-  @IsNotEmpty()
-  @IsString()
-  firstname: string;
-
-  /**
-   * The participant's middle name.
-   * Optional
-   */
-  @Column({ nullable: true })
-  @IsOptional()
-  @IsString()
-  middlename?: string;
-
-  /**
-   * The participant's last name.
-   */
-  @Column()
-  @IsNotEmpty()
-  @IsString()
-  lastname: string;
-
-  /**
-   * The participant's address.
-   * Optional
-   */
-  @ManyToOne(() => Address, address => address.participants, { nullable: true })
-  address?: Address;
-
-  /**
-   * The participant's phone number.
-   * Optional
-   */
-  @Column({ nullable: true })
-  @IsOptional()
-  @IsPhoneNumber("DE")
-  phone?: string;
-
-  /**
-   * The participant's email address.
-   * Optional
-   */
-  @Column({ nullable: true })
-  @IsOptional()
-  @IsEmail()
-  email?: string;
-
-  /**
-   * Used to link the participant as the donor of a donation.
-   */
-  @OneToMany(() => Donation, donation => donation.donor, { nullable: true })
-  donations: Donation[];
+import {
+  IsEmail,
+  IsInt,
+  IsNotEmpty,
+  IsOptional,
+  IsPhoneNumber,
+
+  IsString
+} from "class-validator";
+import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
+import { config } from '../../config';
+import { Address } from "./Address";
+import { Donation } from "./Donation";
+
+/**
+ * Defines the participant interface.
+*/
+@Entity()
+@TableInheritance({ column: { name: "type", type: "varchar" } })
+export abstract class Participant {
+  /**
+   * Autogenerated unique id (primary key).
+   */
+  @PrimaryGeneratedColumn()
+  @IsInt()
+  id: number;
+
+  /**
+   * The participant's first name.
+   */
+  @Column()
+  @IsNotEmpty()
+  @IsString()
+  firstname: string;
+
+  /**
+   * The participant's middle name.
+   * Optional
+   */
+  @Column({ nullable: true })
+  @IsOptional()
+  @IsString()
+  middlename?: string;
+
+  /**
+   * The participant's last name.
+   */
+  @Column()
+  @IsNotEmpty()
+  @IsString()
+  lastname: string;
+
+  /**
+   * The participant's address.
+   * Optional
+   */
+  @ManyToOne(() => Address, address => address.participants, { nullable: true })
+  address?: Address;
+
+  /**
+   * The participant's phone number.
+   * Optional
+   */
+  @Column({ nullable: true })
+  @IsOptional()
+  @IsPhoneNumber(config.phone_validation_countrycode)
+  phone?: string;
+
+  /**
+   * The participant's email address.
+   * Optional
+   */
+  @Column({ nullable: true })
+  @IsOptional()
+  @IsEmail()
+  email?: string;
+
+  /**
+   * Used to link the participant as the donor of a donation.
+   */
+  @OneToMany(() => Donation, donation => donation.donor, { nullable: true })
+  donations: Donation[];
 }

src/models/entities/User.ts

@@ -1,5 +1,6 @@
 import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUUID } from "class-validator";
 import { Column, Entity, JoinTable, ManyToMany, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
+import { config } from '../../config';
 import { Permission } from './Permission';
 import { UserAction } from './UserAction';
 import { UserGroup } from './UserGroup';
@@ -35,7 +36,7 @@ export class User {
   */
   @Column({ nullable: true })
   @IsOptional()
-  @IsPhoneNumber("ZZ")
+  @IsPhoneNumber(config.phone_validation_countrycode)
   phone?: string;
 
   /**