Moved to a "cleaner" directory structure

ref #11

src/models/creation/CreateRunner.ts

@@ -1,11 +1,11 @@
 import { IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsPositive, IsString } from 'class-validator';
-import { Runner } from '../models/Runner';
+import { Runner } from '../entities/Runner';
 import { getConnectionManager, Repository } from 'typeorm';
 import { group } from 'console';
-import { RunnerOnlyOneGroupAllowedError, RunnerGroupNeededError, RunnerGroupNotFoundError } from '../errors/RunnerErrors';
-import { RunnerOrganisation } from './RunnerOrganisation';
-import { RunnerTeam } from './RunnerTeam';
-import { RunnerGroup } from './RunnerGroup';
+import { RunnerOnlyOneGroupAllowedError, RunnerGroupNeededError, RunnerGroupNotFoundError } from '../../errors/RunnerErrors';
+import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerTeam } from '../entities/RunnerTeam';
+import { RunnerGroup } from '../entities/RunnerGroup';
 import { Address } from 'cluster';
 
 export class CreateRunner {

src/models/creation/CreateRunnerOrganisation.ts

@@ -1,5 +1,5 @@
 import { IsString } from 'class-validator';
-import { RunnerOrganisation } from './RunnerOrganisation';
+import { RunnerOrganisation } from '../entities/RunnerOrganisation';
 
 export class CreateRunnerOrganisation {
     @IsString()

src/models/creation/CreateTrack.ts

@@ -1,5 +1,5 @@
 import { IsInt, IsNotEmpty, IsPositive, IsString } from 'class-validator';
-import { Track } from './Track';
+import { Track } from '../entities/Track';
 
 export class CreateTrack {
     /**

src/models/entities/User.ts

@@ -1,130 +1,130 @@
-import { Entity, Column, OneToMany, ManyToOne, PrimaryGeneratedColumn, Generated, Unique, JoinTable, ManyToMany } from "typeorm";
-import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, isUUID, } from "class-validator";
-import { UserGroup } from './UserGroup';
-import { Permission } from './Permission';
-import { UserAction } from './UserAction';
-
-/**
- * Defines a admin user.
-*/
-@Entity()
-export class User {
-  /**
-  * autogenerated unique id (primary key).
-  */
-  @PrimaryGeneratedColumn()
-  @IsOptional()
-  @IsInt()
-  id: number;
-
-  /**
-  * autogenerated uuid
-  */
-  @IsOptional()
-  @IsInt()
-  @Generated("uuid")
-  uuid: string;
-
-  /**
-  * user email
-  */
-  @IsEmail()
-  email: string;
-
-  /**
-  * user phone
-  */
-  @IsPhoneNumber("ZZ")
-  @IsOptional()
-  phone: string;
-
-  /**
-  * username
-  */
-  @IsString()
-  username: string;
-
-  /**
-  * firstname
-  */
-  @IsString()
-  @IsNotEmpty()
-  firstname: string;
-
-  /**
-  * middlename
-  */
-  @IsString()
-  @IsOptional()
-  middlename: string;
-
-  /**
-  * lastname
-  */
-  @IsString()
-  @IsNotEmpty()
-  lastname: string;
-
-  /**
-  * password
-  */
-  @IsString()
-  @IsNotEmpty()
-  password: string;
-
-  /**
-  * permissions
-  */
-  @ManyToOne(() => Permission, permission => permission.users, { nullable: true })
-  permissions: Permission[];
-
-  /**
-  * groups
-  */
-  @ManyToMany(() => UserGroup)
-  @JoinTable()
-  groups: UserGroup[];
-
-  /**
-  * is user enabled?
-  */
-  @IsBoolean()
-  enabled: boolean;
-
-  /**
-  * jwt refresh count
-  */
-  @IsInt()
-  @Column({ default: 1 })
-  refreshTokenCount: number;
-
-  /**
-  * profilepic
-  */
-  @IsString()
-  profilepic: string;
-
-  /**
-   * actions
-   */
-  @OneToMany(() => UserAction, action => action.user)
-  actions: UserAction
-
-  /**
-   * calculate all permissions
-   */
-  public get calc_permissions(): Permission[] {
-    let final_permissions = []
-    this.groups.forEach((permission) => {
-      if (!final_permissions.includes(permission)) {
-        final_permissions.push(permission)
-      }
-    })
-    this.permissions.forEach((permission) => {
-      if (!final_permissions.includes(permission)) {
-        final_permissions.push(permission)
-      }
-    })
-    return final_permissions
-  }
-}
+import { Entity, Column, OneToMany, ManyToOne, PrimaryGeneratedColumn, Generated, Unique, JoinTable, ManyToMany } from "typeorm";
+import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, isUUID, } from "class-validator";
+import { UserGroup } from './UserGroup';
+import { Permission } from './Permission';
+import { UserAction } from './UserAction';
+
+/**
+ * Defines a admin user.
+*/
+@Entity()
+export class User {
+  /**
+  * autogenerated unique id (primary key).
+  */
+  @PrimaryGeneratedColumn()
+  @IsOptional()
+  @IsInt()
+  id: number;
+
+  /**
+  * autogenerated uuid
+  */
+  @IsOptional()
+  @IsInt()
+  @Generated("uuid")
+  uuid: string;
+
+  /**
+  * user email
+  */
+  @IsEmail()
+  email: string;
+
+  /**
+  * user phone
+  */
+  @IsPhoneNumber("ZZ")
+  @IsOptional()
+  phone: string;
+
+  /**
+  * username
+  */
+  @IsString()
+  username: string;
+
+  /**
+  * firstname
+  */
+  @IsString()
+  @IsNotEmpty()
+  firstname: string;
+
+  /**
+  * middlename
+  */
+  @IsString()
+  @IsOptional()
+  middlename: string;
+
+  /**
+  * lastname
+  */
+  @IsString()
+  @IsNotEmpty()
+  lastname: string;
+
+  /**
+  * password
+  */
+  @IsString()
+  @IsNotEmpty()
+  password: string;
+
+  /**
+  * permissions
+  */
+  @ManyToOne(() => Permission, permission => permission.users, { nullable: true })
+  permissions: Permission[];
+
+  /**
+  * groups
+  */
+  @ManyToMany(() => UserGroup)
+  @JoinTable()
+  groups: UserGroup[];
+
+  /**
+  * is user enabled?
+  */
+  @IsBoolean()
+  enabled: boolean;
+
+  /**
+  * jwt refresh count
+  */
+  @IsInt()
+  @Column({ default: 1 })
+  refreshTokenCount: number;
+
+  /**
+  * profilepic
+  */
+  @IsString()
+  profilepic: string;
+
+  /**
+   * actions
+   */
+  @OneToMany(() => UserAction, action => action.user)
+  actions: UserAction
+
+  /**
+   * calculate all permissions
+   */
+  public get calc_permissions(): Permission[] {
+    let final_permissions = []
+    this.groups.forEach((permission) => {
+      if (!final_permissions.includes(permission)) {
+        final_permissions.push(permission)
+      }
+    })
+    this.permissions.forEach((permission) => {
+      if (!final_permissions.includes(permission)) {
+        final_permissions.push(permission)
+      }
+    })
+    return final_permissions
+  }
+}