Merge branch 'dev' of git.odit.services:lfk/backend into dev

CHANGELOG.md

@@ -4,17 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d
 
 #### [v0.2.1](https://git.odit.services/lfk/backend/compare/v0.2.1...v0.2.1)
 
-- Merge pull request 'Self service registration feature/112-selfservice_registration' (#120) from feature/112-selfservice_registration into dev [`6a66dd8`](https://git.odit.services/lfk/backend/commit/6a66dd803becb59172e8645c6b55898fb4b4c0b5)
+- Merge pull request 'OrganiZation rename feature/117-organization' (#121) from feature/117-organization into dev [`161feaf`](https://git.odit.services/lfk/backend/commit/161feaf364195c7b85041e06cdefef72d75b8951)
-- Added registration valid company tests [`20e102e`](https://git.odit.services/lfk/backend/commit/20e102ec5c52c6a01144d064c96b8b2bd1ccfd00)
+- Renamed files and classed from *Organisation* to *Organization*📝 [`c6c643e`](https://git.odit.services/lfk/backend/commit/c6c643ecf125f5fdf58b105f97efad32e8545dd4)
+- Changed organisation* to organization* in descriptions, comments and endoints ✏ [`ef15d0d`](https://git.odit.services/lfk/backend/commit/ef15d0d57619d79e014e0c0331965ca2bc664254)
 - Added registration invalid citizen tests [`81d2197`](https://git.odit.services/lfk/backend/commit/81d2197a3e978ca43bc79720c32d75f8490f08df)
 - Implemented registration key generation [`ad44650`](https://git.odit.services/lfk/backend/commit/ad446500f90f945aadc3510377bcfd2123440da0)
 - Implemented a runner selfservice registration creation action [`10af1ba`](https://git.odit.services/lfk/backend/commit/10af1ba34148c992e94fa580e1c0210bfaea5112)
 - Created a citizenrunner selfservice create action [`6df195b`](https://git.odit.services/lfk/backend/commit/6df195b6ec5fde27f84cbe54992558715b843b87)
-- Added registration invalid company tests [`29aeb04`](https://git.odit.services/lfk/backend/commit/29aeb046de769e37fd7257507e36337237697ea0)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`5660aec`](https://git.odit.services/lfk/backend/commit/5660aecb50c0e6dd538850c6375d2f692fb7a1f2)
 - Implemented a registration key for organisations [`d490247`](https://git.odit.services/lfk/backend/commit/d490247d1e337a680b385d2115e82f79ba54a601)
 - Updates old tests to the new ss-ktokens [`a9843ed`](https://git.odit.services/lfk/backend/commit/a9843ed4598485e6e3d18e78b876b6e000ea6e38)
-- Added registration valid citizentests [`72941da`](https://git.odit.services/lfk/backend/commit/72941da1cb1c31fd6bfcba2ee3704f34bdd73ef0)
 - Added self-service get invalid tests [`e964a8e`](https://git.odit.services/lfk/backend/commit/e964a8ed44109899516c4d3b0dc35fe4990107a1)
+- Renamedpermisssions from *Organisation* to *Organization*📝 [`cd7e9b8`](https://git.odit.services/lfk/backend/commit/cd7e9b86b4b9d3e1ef0312f6fff436fcef4a5c94)
+- Merge pull request 'Self service registration feature/112-selfservice_registration' (#120) from feature/112-selfservice_registration into dev [`6a66dd8`](https://git.odit.services/lfk/backend/commit/6a66dd803becb59172e8645c6b55898fb4b4c0b5)
+- Added registration valid company tests [`20e102e`](https://git.odit.services/lfk/backend/commit/20e102ec5c52c6a01144d064c96b8b2bd1ccfd00)
+- Added registration invalid company tests [`29aeb04`](https://git.odit.services/lfk/backend/commit/29aeb046de769e37fd7257507e36337237697ea0)
+- Added registration valid citizentests [`72941da`](https://git.odit.services/lfk/backend/commit/72941da1cb1c31fd6bfcba2ee3704f34bdd73ef0)
 - Implemented runner selfservice token generation [`c39a59e`](https://git.odit.services/lfk/backend/commit/c39a59e54ef0b1cc891684283422805af38969e3)
 - Citizen runners now have to provide an email address for verification [`dee3639`](https://git.odit.services/lfk/backend/commit/dee36395a69da6c5e1bc4e94bd705b0418a6a3ff)
 - Implemented the basics for the runner selfservice registration endpoint [`5288c70`](https://git.odit.services/lfk/backend/commit/5288c701c1ac880f3c8b7ece01457aae4bac87d7)

src/controllers/ImportController.ts

@@ -36,7 +36,7 @@ export class ImportController {
         return responseRunners;
     }
 
-    @Post('/organisations/:id/import')
+    @Post('/organizations/:id/import')
     @ContentType("application/json")
     @ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })
     @ResponseSchema(RunnerGroupNotFoundError, { statusCode: 404 })
@@ -78,7 +78,7 @@ export class ImportController {
         return await this.postJSON(importRunners, groupID);
     }
 
-    @Post('/organisations/:id/import/csv')
+    @Post('/organizations/:id/import/csv')
     @ContentType("application/json")
     @UseBefore(RawBodyMiddleware)
     @ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })

src/controllers/RunnerOrganisationController.ts

@@ -1,127 +0,0 @@
-import { Authorized, 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 { RunnerOrganisationHasRunnersError, RunnerOrganisationHasTeamsError, RunnerOrganisationIdsNotMatchingError, RunnerOrganisationNotFoundError } from '../errors/RunnerOrganisationErrors';
-import { CreateRunnerOrganisation } from '../models/actions/create/CreateRunnerOrganisation';
-import { UpdateRunnerOrganisation } from '../models/actions/update/UpdateRunnerOrganisation';
-import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
-import { ResponseEmpty } from '../models/responses/ResponseEmpty';
-import { ResponseRunnerOrganisation } from '../models/responses/ResponseRunnerOrganisation';
-import { RunnerController } from './RunnerController';
-import { RunnerTeamController } from './RunnerTeamController';
-
-
-@JsonController('/organisations')
-@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
-export class RunnerOrganisationController {
-	private runnerOrganisationRepository: Repository<RunnerOrganisation>;
-
-	/**
-	 * Gets the repository of this controller's model/entity.
-	 */
-	constructor() {
-		this.runnerOrganisationRepository = getConnectionManager().get().getRepository(RunnerOrganisation);
-	}
-
-	@Get()
-	@Authorized("ORGANISATION:GET")
-	@ResponseSchema(ResponseRunnerOrganisation, { isArray: true })
-	@OpenAPI({ description: 'Lists all organisations. <br> This includes their address, contact and teams (if existing/associated).' })
-	async getAll() {
-		let responseTeams: ResponseRunnerOrganisation[] = new Array<ResponseRunnerOrganisation>();
-		const runners = await this.runnerOrganisationRepository.find({ relations: ['contact', 'teams'] });
-		runners.forEach(runner => {
-			responseTeams.push(new ResponseRunnerOrganisation(runner));
-		});
-		return responseTeams;
-	}
-
-	@Get('/:id')
-	@Authorized("ORGANISATION:GET")
-	@ResponseSchema(ResponseRunnerOrganisation)
-	@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
-	@OnUndefined(RunnerOrganisationNotFoundError)
-	@OpenAPI({ description: 'Lists all information about the organisation whose id got provided.' })
-	async getOne(@Param('id') id: number) {
-		let runnerOrg = await this.runnerOrganisationRepository.findOne({ id: id }, { relations: ['contact', 'teams'] });
-		if (!runnerOrg) { throw new RunnerOrganisationNotFoundError(); }
-		return new ResponseRunnerOrganisation(runnerOrg);
-	}
-
-	@Post()
-	@Authorized("ORGANISATION:CREATE")
-	@ResponseSchema(ResponseRunnerOrganisation)
-	@OpenAPI({ description: 'Create a new organsisation.' })
-	async post(@Body({ validate: true }) createRunnerOrganisation: CreateRunnerOrganisation) {
-		let runnerOrganisation;
-		try {
-			runnerOrganisation = await createRunnerOrganisation.toEntity();
-		} catch (error) {
-			throw error;
-		}
-
-		runnerOrganisation = await this.runnerOrganisationRepository.save(runnerOrganisation);
-
-		return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(runnerOrganisation, { relations: ['contact', 'teams'] }));
-	}
-
-	@Put('/:id')
-	@Authorized("ORGANISATION:UPDATE")
-	@ResponseSchema(ResponseRunnerOrganisation)
-	@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
-	@ResponseSchema(RunnerOrganisationIdsNotMatchingError, { statusCode: 406 })
-	@OpenAPI({ description: "Update the organisation whose id you provided. <br> Please remember that ids can't be changed." })
-	async put(@Param('id') id: number, @Body({ validate: true }) updateOrganisation: UpdateRunnerOrganisation) {
-		let oldRunnerOrganisation = await this.runnerOrganisationRepository.findOne({ id: id });
-
-		if (!oldRunnerOrganisation) {
-			throw new RunnerOrganisationNotFoundError();
-		}
-
-		if (oldRunnerOrganisation.id != updateOrganisation.id) {
-			throw new RunnerOrganisationIdsNotMatchingError();
-		}
-
-		await this.runnerOrganisationRepository.save(await updateOrganisation.update(oldRunnerOrganisation));
-
-		return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(id, { relations: ['contact', 'teams'] }));
-	}
-
-	@Delete('/:id')
-	@Authorized("ORGANISATION:DELETE")
-	@ResponseSchema(ResponseRunnerOrganisation)
-	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
-	@ResponseSchema(RunnerOrganisationHasTeamsError, { statusCode: 406 })
-	@ResponseSchema(RunnerOrganisationHasRunnersError, { statusCode: 406 })
-	@OnUndefined(204)
-	@OpenAPI({ description: 'Delete the organsisation whose id you provided. <br> If the organisation still has runners and/or teams associated this will fail. <br> To delete the organisation with all associated runners and teams set the force QueryParam to true (cascading deletion might take a while). <br> This won\'t delete the associated contact. <br> If no organisation with this id exists it will just return 204(no content).' })
-	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
-		let organisation = await this.runnerOrganisationRepository.findOne({ id: id });
-		if (!organisation) { return null; }
-		let runnerOrganisation = await this.runnerOrganisationRepository.findOne(organisation, { relations: ['contact', 'runners', 'teams'] });
-
-		if (!force) {
-			if (runnerOrganisation.teams.length != 0) {
-				throw new RunnerOrganisationHasTeamsError();
-			}
-		}
-		const teamController = new RunnerTeamController()
-		for (let team of runnerOrganisation.teams) {
-			await teamController.remove(team.id, true);
-		}
-
-		if (!force) {
-			if (runnerOrganisation.runners.length != 0) {
-				throw new RunnerOrganisationHasRunnersError();
-			}
-		}
-		const runnerController = new RunnerController()
-		for (let runner of runnerOrganisation.runners) {
-			await runnerController.remove(runner.id, true);
-		}
-
-		const responseOrganisation = new ResponseRunnerOrganisation(runnerOrganisation);
-		await this.runnerOrganisationRepository.delete(organisation);
-		return responseOrganisation;
-	}
-}

src/controllers/RunnerOrganizationController.ts

@@ -0,0 +1,127 @@
+import { Authorized, 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 { RunnerOrganizationHasRunnersError, RunnerOrganizationHasTeamsError, RunnerOrganizationIdsNotMatchingError, RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
+import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization';
+import { UpdateRunnerOrganization } from '../models/actions/update/UpdateRunnerOrganization';
+import { RunnerOrganization } from '../models/entities/RunnerOrganization';
+import { ResponseEmpty } from '../models/responses/ResponseEmpty';
+import { ResponseRunnerOrganization } from '../models/responses/ResponseRunnerOrganization';
+import { RunnerController } from './RunnerController';
+import { RunnerTeamController } from './RunnerTeamController';
+
+
+@JsonController('/organizations')
+@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+export class RunnerOrganizationController {
+	private runnerOrganizationRepository: Repository<RunnerOrganization>;
+
+	/**
+	 * Gets the repository of this controller's model/entity.
+	 */
+	constructor() {
+		this.runnerOrganizationRepository = getConnectionManager().get().getRepository(RunnerOrganization);
+	}
+
+	@Get()
+	@Authorized("ORGANIZATION:GET")
+	@ResponseSchema(ResponseRunnerOrganization, { isArray: true })
+	@OpenAPI({ description: 'Lists all organizations. <br> This includes their address, contact and teams (if existing/associated).' })
+	async getAll() {
+		let responseTeams: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
+		const runners = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] });
+		runners.forEach(runner => {
+			responseTeams.push(new ResponseRunnerOrganization(runner));
+		});
+		return responseTeams;
+	}
+
+	@Get('/:id')
+	@Authorized("ORGANIZATION:GET")
+	@ResponseSchema(ResponseRunnerOrganization)
+	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
+	@OnUndefined(RunnerOrganizationNotFoundError)
+	@OpenAPI({ description: 'Lists all information about the organization whose id got provided.' })
+	async getOne(@Param('id') id: number) {
+		let runnerOrg = await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['contact', 'teams'] });
+		if (!runnerOrg) { throw new RunnerOrganizationNotFoundError(); }
+		return new ResponseRunnerOrganization(runnerOrg);
+	}
+
+	@Post()
+	@Authorized("ORGANIZATION:CREATE")
+	@ResponseSchema(ResponseRunnerOrganization)
+	@OpenAPI({ description: 'Create a new organsisation.' })
+	async post(@Body({ validate: true }) createRunnerOrganization: CreateRunnerOrganization) {
+		let runnerOrganization;
+		try {
+			runnerOrganization = await createRunnerOrganization.toEntity();
+		} catch (error) {
+			throw error;
+		}
+
+		runnerOrganization = await this.runnerOrganizationRepository.save(runnerOrganization);
+
+		return new ResponseRunnerOrganization(await this.runnerOrganizationRepository.findOne(runnerOrganization, { relations: ['contact', 'teams'] }));
+	}
+
+	@Put('/:id')
+	@Authorized("ORGANIZATION:UPDATE")
+	@ResponseSchema(ResponseRunnerOrganization)
+	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerOrganizationIdsNotMatchingError, { statusCode: 406 })
+	@OpenAPI({ description: "Update the organization whose id you provided. <br> Please remember that ids can't be changed." })
+	async put(@Param('id') id: number, @Body({ validate: true }) updateOrganization: UpdateRunnerOrganization) {
+		let oldRunnerOrganization = await this.runnerOrganizationRepository.findOne({ id: id });
+
+		if (!oldRunnerOrganization) {
+			throw new RunnerOrganizationNotFoundError();
+		}
+
+		if (oldRunnerOrganization.id != updateOrganization.id) {
+			throw new RunnerOrganizationIdsNotMatchingError();
+		}
+
+		await this.runnerOrganizationRepository.save(await updateOrganization.update(oldRunnerOrganization));
+
+		return new ResponseRunnerOrganization(await this.runnerOrganizationRepository.findOne(id, { relations: ['contact', 'teams'] }));
+	}
+
+	@Delete('/:id')
+	@Authorized("ORGANIZATION:DELETE")
+	@ResponseSchema(ResponseRunnerOrganization)
+	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
+	@ResponseSchema(RunnerOrganizationHasTeamsError, { statusCode: 406 })
+	@ResponseSchema(RunnerOrganizationHasRunnersError, { statusCode: 406 })
+	@OnUndefined(204)
+	@OpenAPI({ description: 'Delete the organsisation whose id you provided. <br> If the organization still has runners and/or teams associated this will fail. <br> To delete the organization with all associated runners and teams set the force QueryParam to true (cascading deletion might take a while). <br> This won\'t delete the associated contact. <br> If no organization with this id exists it will just return 204(no content).' })
+	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
+		let organization = await this.runnerOrganizationRepository.findOne({ id: id });
+		if (!organization) { return null; }
+		let runnerOrganization = await this.runnerOrganizationRepository.findOne(organization, { relations: ['contact', 'runners', 'teams'] });
+
+		if (!force) {
+			if (runnerOrganization.teams.length != 0) {
+				throw new RunnerOrganizationHasTeamsError();
+			}
+		}
+		const teamController = new RunnerTeamController()
+		for (let team of runnerOrganization.teams) {
+			await teamController.remove(team.id, true);
+		}
+
+		if (!force) {
+			if (runnerOrganization.runners.length != 0) {
+				throw new RunnerOrganizationHasRunnersError();
+			}
+		}
+		const runnerController = new RunnerController()
+		for (let runner of runnerOrganization.runners) {
+			await runnerController.remove(runner.id, true);
+		}
+
+		const responseOrganization = new ResponseRunnerOrganization(runnerOrganization);
+		await this.runnerOrganizationRepository.delete(organization);
+		return responseOrganization;
+	}
+}

src/controllers/RunnerSelfServiceController.ts

@@ -5,27 +5,27 @@ import { getConnectionManager, Repository } from 'typeorm';
 import { config } from '../config';
 import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError';
 import { RunnerEmailNeededError, RunnerNotFoundError } from '../errors/RunnerErrors';
-import { RunnerOrganisationNotFoundError } from '../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
 import { JwtCreator } from '../jwtcreator';
 import { CreateSelfServiceCitizenRunner } from '../models/actions/create/CreateSelfServiceCitizenRunner';
 import { CreateSelfServiceRunner } from '../models/actions/create/CreateSelfServiceRunner';
 import { Runner } from '../models/entities/Runner';
 import { RunnerGroup } from '../models/entities/RunnerGroup';
-import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
+import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner';
 
 
 @JsonController('/runners')
 export class RunnerSelfServiceController {
 	private runnerRepository: Repository<Runner>;
-	private orgRepository: Repository<RunnerOrganisation>;
+	private orgRepository: Repository<RunnerOrganization>;
 
 	/**
 	 * Gets the repository of this controller's model/entity.
 	 */
 	constructor() {
 		this.runnerRepository = getConnectionManager().get().getRepository(Runner);
-		this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganisation);
+		this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganization);
 	}
 
 	@Get('/me/:jwt')
@@ -52,9 +52,9 @@ export class RunnerSelfServiceController {
 
 	@Post('/register/:token')
 	@ResponseSchema(ResponseSelfServiceRunner)
-	@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
-	@OpenAPI({ description: 'Create a new selfservice runner in a provided org. <br> The orgs get provided and authorized via api tokens that can be optained via the /organisations endpoint.' })
+	@OpenAPI({ description: 'Create a new selfservice runner in a provided org. <br> The orgs get provided and authorized via api tokens that can be optained via the /organizations endpoint.' })
-	async registerOrganisationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner) {
+	async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner) {
 		const org = await this.getOrgansisation(token);
 
 		let runner = await createRunner.toEntity(org);
@@ -85,14 +85,14 @@ export class RunnerSelfServiceController {
 
 	/**
 	 * Get's a runner org by a provided registration api key.
-	 * @param token The organisation's registration api token.
+	 * @param token The organization's registration api token.
 	 */
 	private async getOrgansisation(token: string): Promise<RunnerGroup> {
 		token = Buffer.from(token, 'base64').toString('utf8');
 
-		const organisation = await this.orgRepository.findOne({ key: token });
+		const organization = await this.orgRepository.findOne({ key: token });
-		if (!organisation) { throw new RunnerOrganisationNotFoundError; }
+		if (!organization) { throw new RunnerOrganizationNotFoundError; }
 
-		return organisation;
+		return organization;
 	}
 }

src/controllers/RunnerTeamController.ts

@@ -25,7 +25,7 @@ export class RunnerTeamController {
 	@Get()
 	@Authorized("TEAM:GET")
 	@ResponseSchema(ResponseRunnerTeam, { isArray: true })
-	@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organisation and contact (if existing/associated).' })
+	@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organization and contact (if existing/associated).' })
 	async getAll() {
 		let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
 		const runners = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });

src/controllers/StatsController.ts

@@ -4,12 +4,12 @@ import { getConnection } from 'typeorm';
 import StatsAuth from '../middlewares/StatsAuth';
 import { Donation } from '../models/entities/Donation';
 import { Runner } from '../models/entities/Runner';
-import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
+import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 import { RunnerTeam } from '../models/entities/RunnerTeam';
 import { Scan } from '../models/entities/Scan';
 import { User } from '../models/entities/User';
 import { ResponseStats } from '../models/responses/ResponseStats';
-import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganisation';
+import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganization';
 import { ResponseStatsRunner } from '../models/responses/ResponseStatsRunner';
 import { ResponseStatsTeam } from '../models/responses/ResponseStatsTeam';
 
@@ -23,7 +23,7 @@ export class StatsController {
         let connection = getConnection();
         let runners = await connection.getRepository(Runner).find({ relations: ['scans', 'scans.track'] });
         let teams = await connection.getRepository(RunnerTeam).find();
-        let orgs = await connection.getRepository(RunnerOrganisation).find();
+        let orgs = await connection.getRepository(RunnerOrganization).find();
         let users = await connection.getRepository(User).find();
         let scans = await connection.getRepository(Scan).find();
         let donations = await connection.getRepository(Donation).find({ relations: ['runner', 'runner.scans', 'runner.scans.track'] });
@@ -94,12 +94,12 @@ export class StatsController {
         return responseTeams;
     }
 
-    @Get("/organisations/distance")
+    @Get("/organizations/distance")
     @UseBefore(StatsAuth)
     @ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
-    @OpenAPI({ description: "Returns the top ten organisations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+    @OpenAPI({ description: "Returns the top ten organizations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
     async getTopOrgsByDistance() {
-        let orgs = await getConnection().getRepository(RunnerOrganisation).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
+        let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
         let topOrgs = orgs.sort((org1, org2) => org1.distance - org2.distance).slice(0, 9);
         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
         topOrgs.forEach(org => {
@@ -108,12 +108,12 @@ export class StatsController {
         return responseOrgs;
     }
 
-    @Get("/organisations/donations")
+    @Get("/organizations/donations")
     @UseBefore(StatsAuth)
     @ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
-    @OpenAPI({ description: "Returns the top ten organisations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+    @OpenAPI({ description: "Returns the top ten organizations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
     async getTopOrgsByDonations() {
-        let orgs = await getConnection().getRepository(RunnerOrganisation).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
+        let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
         let topOrgs = orgs.sort((org1, org2) => org1.distanceDonationAmount - org2.distanceDonationAmount).slice(0, 9);
         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
         topOrgs.forEach(org => {

src/errors/RunnerErrors.ts

@@ -32,7 +32,7 @@ export class RunnerGroupNeededError extends NotAcceptableError {
 	name = "RunnerGroupNeededError"
 
 	@IsString()
-	message = "Runner's need to be part of one group (team or organisation)! \n You provided neither."
+	message = "Runner's need to be part of one group (team or organization)! \n You provided neither."
 }
 
 /**

src/errors/RunnerOrganisationErrors.ts

@@ -1,58 +0,0 @@
-import { IsString } from 'class-validator';
-import { NotAcceptableError, NotFoundError } from 'routing-controllers';
-
-/**
- * Error to throw when a runner organisation couldn't be found.
- */
-export class RunnerOrganisationNotFoundError extends NotFoundError {
-	@IsString()
-	name = "RunnerOrganisationNotFoundError"
-
-	@IsString()
-	message = "RunnerOrganisation not found!"
-}
-
-/**
- * Error to throw when two runner organisation's ids don't match.
- * Usually occurs when a user tries to change a runner organisation's id.
- */
-export class RunnerOrganisationIdsNotMatchingError extends NotAcceptableError {
-	@IsString()
-	name = "RunnerOrganisationIdsNotMatchingError"
-
-	@IsString()
-	message = "The ids don't match! \n And if you wanted to change a runner organisation's id: This isn't allowed!"
-}
-
-/**
- * Error to throw when a organisation still has runners associated.
- */
-export class RunnerOrganisationHasRunnersError extends NotAcceptableError {
-	@IsString()
-	name = "RunnerOrganisationHasRunnersError"
-
-	@IsString()
-	message = "This organisation still has runners associated with it. \n If you want to delete this organisation with all it's runners and teams add `?force` to your query."
-}
-
-/**
- * Error to throw when a organisation still has teams associated.
- */
-export class RunnerOrganisationHasTeamsError extends NotAcceptableError {
-	@IsString()
-	name = "RunnerOrganisationHasTeamsError"
-
-	@IsString()
-	message = "This organisation still has teams associated with it. \n If you want to delete this organisation with all it's runners and teams add `?force` to your query."
-}
-
-/**
- * Error to throw, when a provided runnerOrganisation doesn't belong to the accepted types.
- */
-export class RunnerOrganisationWrongTypeError extends NotAcceptableError {
-	@IsString()
-	name = "RunnerOrganisationWrongTypeError"
-
-	@IsString()
-	message = "The runner organisation must be an existing organisation's id. \n You provided a object of another type."
-}

src/errors/RunnerOrganizationErrors.ts

@@ -0,0 +1,58 @@
+import { IsString } from 'class-validator';
+import { NotAcceptableError, NotFoundError } from 'routing-controllers';
+
+/**
+ * Error to throw when a runner organization couldn't be found.
+ */
+export class RunnerOrganizationNotFoundError extends NotFoundError {
+	@IsString()
+	name = "RunnerOrganizationNotFoundError"
+
+	@IsString()
+	message = "RunnerOrganization not found!"
+}
+
+/**
+ * Error to throw when two runner organization's ids don't match.
+ * Usually occurs when a user tries to change a runner organization's id.
+ */
+export class RunnerOrganizationIdsNotMatchingError extends NotAcceptableError {
+	@IsString()
+	name = "RunnerOrganizationIdsNotMatchingError"
+
+	@IsString()
+	message = "The ids don't match! \n And if you wanted to change a runner organization's id: This isn't allowed!"
+}
+
+/**
+ * Error to throw when a organization still has runners associated.
+ */
+export class RunnerOrganizationHasRunnersError extends NotAcceptableError {
+	@IsString()
+	name = "RunnerOrganizationHasRunnersError"
+
+	@IsString()
+	message = "This organization still has runners associated with it. \n If you want to delete this organization with all it's runners and teams add `?force` to your query."
+}
+
+/**
+ * Error to throw when a organization still has teams associated.
+ */
+export class RunnerOrganizationHasTeamsError extends NotAcceptableError {
+	@IsString()
+	name = "RunnerOrganizationHasTeamsError"
+
+	@IsString()
+	message = "This organization still has teams associated with it. \n If you want to delete this organization with all it's runners and teams add `?force` to your query."
+}
+
+/**
+ * Error to throw, when a provided runnerOrganization doesn't belong to the accepted types.
+ */
+export class RunnerOrganizationWrongTypeError extends NotAcceptableError {
+	@IsString()
+	name = "RunnerOrganizationWrongTypeError"
+
+	@IsString()
+	message = "The runner organization must be an existing organization's id. \n You provided a object of another type."
+}

src/errors/RunnerTeamErrors.ts

@@ -43,5 +43,5 @@ export class RunnerTeamNeedsParentError extends NotAcceptableError {
 	name = "RunnerTeamNeedsParentError"
 
 	@IsString()
-	message = "You provided no runner organisation as this team's parent group."
+	message = "You provided no runner organization as this team's parent group."
 }

src/middlewares/StatsAuth.ts

@@ -42,7 +42,7 @@ const StatsAuth = async (req: Request, res: Response, next: () => void) => {
         let user_authorized = false;
         try {
             let action = { request: req, response: res, context: null, next: next }
-            user_authorized = await authchecker(action, ["RUNNER:GET", "TEAM:GET", "ORGANISATION:GET"]);
+            user_authorized = await authchecker(action, ["RUNNER:GET", "TEAM:GET", "ORGANIZATION:GET"]);
         }
         finally {
             if (user_authorized == false) {

src/models/actions/ImportRunner.ts

@@ -1,9 +1,9 @@
 import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
 import { RunnerGroupNeededError } from '../../errors/RunnerErrors';
-import { RunnerOrganisationNotFoundError } from '../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationNotFoundError } from '../../errors/RunnerOrganizationErrors';
 import { RunnerGroup } from '../entities/RunnerGroup';
-import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { CreateRunner } from './create/CreateRunner';
 
@@ -78,9 +78,9 @@ export class ImportRunner {
         let team = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ id: groupID });
         if (team) { return team; }
 
-        let org = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: groupID });
+        let org = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: groupID });
         if (!org) {
-            throw new RunnerOrganisationNotFoundError();
+            throw new RunnerOrganizationNotFoundError();
         }
         if (this.team === undefined) { return org; }
 

src/models/actions/create/CreateRunner.ts

@@ -1,7 +1,7 @@
 import { IsInt } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
 import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
-import { RunnerOrganisationWrongTypeError } from '../../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationWrongTypeError } from '../../../errors/RunnerOrganizationErrors';
 import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
 import { Address } from '../../entities/Address';
 import { Runner } from '../../entities/Runner';
@@ -50,6 +50,6 @@ export class CreateRunner extends CreateParticipant {
             return group;
         }
 
-        throw new RunnerOrganisationWrongTypeError;
+        throw new RunnerOrganizationWrongTypeError;
     }
 }

src/models/actions/create/CreateRunnerOrganisation.ts

@@ -1,43 +0,0 @@
-import { IsBoolean, IsObject, IsOptional } from 'class-validator';
-import * as uuid from 'uuid';
-import { Address } from '../../entities/Address';
-import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
-import { CreateRunnerGroup } from './CreateRunnerGroup';
-
-
-/**
- * This classed is used to create a new RunnerOrganisation entity from a json body (post request).
- */
-export class CreateRunnerOrganisation extends CreateRunnerGroup {
-    /**
-     * The new organisation's address.
-     */
-    @IsOptional()
-    @IsObject()
-    address?: Address;
-
-    /**
-     * Is registration enabled for the new organisation?
-     */
-    @IsOptional()
-    @IsBoolean()
-    registrationEnabled?: boolean = false;
-
-    /**
-     * Creates a new RunnerOrganisation entity from this.
-     */
-    public async toEntity(): Promise<RunnerOrganisation> {
-        let newRunnerOrganisation: RunnerOrganisation = new RunnerOrganisation();
-
-        newRunnerOrganisation.name = this.name;
-        newRunnerOrganisation.contact = await this.getContact();
-        newRunnerOrganisation.address = this.address;
-        Address.validate(newRunnerOrganisation.address);
-
-        if (this.registrationEnabled) {
-            newRunnerOrganisation.key = uuid.v4().toUpperCase();
-        }
-
-        return newRunnerOrganisation;
-    }
-}

src/models/actions/create/CreateRunnerOrganization.ts

@@ -0,0 +1,43 @@
+import { IsBoolean, IsObject, IsOptional } from 'class-validator';
+import * as uuid from 'uuid';
+import { Address } from '../../entities/Address';
+import { RunnerOrganization } from '../../entities/RunnerOrganization';
+import { CreateRunnerGroup } from './CreateRunnerGroup';
+
+
+/**
+ * This classed is used to create a new RunnerOrganization entity from a json body (post request).
+ */
+export class CreateRunnerOrganization extends CreateRunnerGroup {
+    /**
+     * The new organization's address.
+     */
+    @IsOptional()
+    @IsObject()
+    address?: Address;
+
+    /**
+     * Is registration enabled for the new organization?
+     */
+    @IsOptional()
+    @IsBoolean()
+    registrationEnabled?: boolean = false;
+
+    /**
+     * Creates a new RunnerOrganization entity from this.
+     */
+    public async toEntity(): Promise<RunnerOrganization> {
+        let newRunnerOrganization: RunnerOrganization = new RunnerOrganization();
+
+        newRunnerOrganization.name = this.name;
+        newRunnerOrganization.contact = await this.getContact();
+        newRunnerOrganization.address = this.address;
+        Address.validate(newRunnerOrganization.address);
+
+        if (this.registrationEnabled) {
+            newRunnerOrganization.key = uuid.v4().toUpperCase();
+        }
+
+        return newRunnerOrganization;
+    }
+}

src/models/actions/create/CreateRunnerTeam.ts

@@ -1,8 +1,8 @@
 import { IsInt, IsNotEmpty } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
-import { RunnerOrganisationNotFoundError } from '../../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationNotFoundError } from '../../../errors/RunnerOrganizationErrors';
 import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
-import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { RunnerTeam } from '../../entities/RunnerTeam';
 import { CreateRunnerGroup } from './CreateRunnerGroup';
 
@@ -21,12 +21,12 @@ export class CreateRunnerTeam extends CreateRunnerGroup {
     /**
      * Gets the new team's parent org based on it's id.
      */
-    public async getParent(): Promise<RunnerOrganisation> {
+    public async getParent(): Promise<RunnerOrganization> {
         if (this.parentGroup === undefined || this.parentGroup === null) {
             throw new RunnerTeamNeedsParentError();
         }
-        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.parentGroup });
+        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: this.parentGroup });
-        if (!parentGroup) { throw new RunnerOrganisationNotFoundError();; }
+        if (!parentGroup) { throw new RunnerOrganizationNotFoundError();; }
         return parentGroup;
     }
 

src/models/actions/create/CreateSelfServiceCitizenRunner.ts

@@ -3,7 +3,7 @@ import { getConnection } from 'typeorm';
 import { RunnerEmailNeededError } from '../../../errors/RunnerErrors';
 import { Address } from '../../entities/Address';
 import { Runner } from '../../entities/Runner';
-import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { CreateParticipant } from './CreateParticipant';
 
 /**
@@ -46,7 +46,7 @@ export class CreateSelfServiceCitizenRunner extends CreateParticipant {
     /**
      * Gets the new runner's group by it's id.
      */
-    public async getGroup(): Promise<RunnerOrganisation> {
+    public async getGroup(): Promise<RunnerOrganization> {
-        return await getConnection().getRepository(RunnerOrganisation).findOne({ id: 1 });
+        return await getConnection().getRepository(RunnerOrganization).findOne({ id: 1 });
     }
 }

src/models/actions/update/UpdateRunnerOrganisation.ts

@@ -1,53 +0,0 @@
-import { IsBoolean, IsInt, IsObject, IsOptional } from 'class-validator';
-import * as uuid from 'uuid';
-import { Address } from '../../entities/Address';
-import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
-import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
-
-/**
- * This class is used to update a RunnerOrganisation entity (via put request).
- */
-export class UpdateRunnerOrganisation extends CreateRunnerGroup {
-
-    /**
-     * The updated orgs's id.
-     * This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
-     */
-    @IsInt()
-    id: number;
-
-    /**
-     * The updated organisation's address.
-     */
-    @IsOptional()
-    @IsObject()
-    address?: Address;
-
-    /**
-     * Is registration enabled for the updated organisation?
-     */
-    @IsOptional()
-    @IsBoolean()
-    registrationEnabled?: boolean = false;
-
-    /**
-     * Updates a provided RunnerOrganisation entity based on this.
-     */
-    public async update(organisation: RunnerOrganisation): Promise<RunnerOrganisation> {
-
-        organisation.name = this.name;
-        organisation.contact = await this.getContact();
-        if (!this.address) { organisation.address.reset(); }
-        else { organisation.address = this.address; }
-        Address.validate(organisation.address);
-
-        if (this.registrationEnabled && !organisation.key) {
-            organisation.key = uuid.v4().toUpperCase();
-        }
-        else {
-            organisation.key = null;
-        }
-
-        return organisation;
-    }
-}

src/models/actions/update/UpdateRunnerOrganization.ts

@@ -0,0 +1,53 @@
+import { IsBoolean, IsInt, IsObject, IsOptional } from 'class-validator';
+import * as uuid from 'uuid';
+import { Address } from '../../entities/Address';
+import { RunnerOrganization } from '../../entities/RunnerOrganization';
+import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
+
+/**
+ * This class is used to update a RunnerOrganization entity (via put request).
+ */
+export class UpdateRunnerOrganization extends CreateRunnerGroup {
+
+    /**
+     * The updated orgs's id.
+     * This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
+     */
+    @IsInt()
+    id: number;
+
+    /**
+     * The updated organization's address.
+     */
+    @IsOptional()
+    @IsObject()
+    address?: Address;
+
+    /**
+     * Is registration enabled for the updated organization?
+     */
+    @IsOptional()
+    @IsBoolean()
+    registrationEnabled?: boolean = false;
+
+    /**
+     * Updates a provided RunnerOrganization entity based on this.
+     */
+    public async update(organization: RunnerOrganization): Promise<RunnerOrganization> {
+
+        organization.name = this.name;
+        organization.contact = await this.getContact();
+        if (!this.address) { organization.address.reset(); }
+        else { organization.address = this.address; }
+        Address.validate(organization.address);
+
+        if (this.registrationEnabled && !organization.key) {
+            organization.key = uuid.v4().toUpperCase();
+        }
+        else {
+            organization.key = null;
+        }
+
+        return organization;
+    }
+}

src/models/actions/update/UpdateRunnerTeam.ts

@@ -1,8 +1,8 @@
 import { IsInt, IsPositive } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
-import { RunnerOrganisationNotFoundError } from '../../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationNotFoundError } from '../../../errors/RunnerOrganizationErrors';
 import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
-import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { RunnerTeam } from '../../entities/RunnerTeam';
 import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
 
@@ -28,12 +28,12 @@ export class UpdateRunnerTeam extends CreateRunnerGroup {
     /**
      * Loads the updated teams's parentGroup based on it's id.
      */
-    public async getParent(): Promise<RunnerOrganisation> {
+    public async getParent(): Promise<RunnerOrganization> {
         if (this.parentGroup === undefined || this.parentGroup === null) {
             throw new RunnerTeamNeedsParentError();
         }
-        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.parentGroup });
+        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: this.parentGroup });
-        if (!parentGroup) { throw new RunnerOrganisationNotFoundError();; }
+        if (!parentGroup) { throw new RunnerOrganizationNotFoundError();; }
         return parentGroup;
     }
 

src/models/entities/Runner.ts

@@ -16,7 +16,7 @@ import { Scan } from "./Scan";
 export class Runner extends Participant {
   /**
    * The runner's associated group.
-   * Can be a runner team or organisation.
+   * Can be a runner team or organization.
    */
   @IsNotEmpty()
   @ManyToOne(() => RunnerGroup, group => group.runners)

src/models/entities/RunnerOrganization.ts

@@ -1,34 +1,34 @@
 import { IsInt, IsOptional, IsString } from "class-validator";
 import { ChildEntity, Column, OneToMany } from "typeorm";
-import { ResponseRunnerOrganisation } from '../responses/ResponseRunnerOrganisation';
+import { ResponseRunnerOrganization } from '../responses/ResponseRunnerOrganization';
 import { Address } from './Address';
 import { Runner } from './Runner';
 import { RunnerGroup } from "./RunnerGroup";
 import { RunnerTeam } from "./RunnerTeam";
 
 /**
- * Defines the RunnerOrganisation entity.
+ * Defines the RunnerOrganization entity.
  * This usually is a school, club or company.
 */
 @ChildEntity()
-export class RunnerOrganisation extends RunnerGroup {
+export class RunnerOrganization extends RunnerGroup {
 
   /**
-   * The organisations's address.
+   * The organizations's address.
    */
   @IsOptional()
   @Column(type => Address)
   address?: Address;
 
   /**
-   * The organisation's teams.
+   * The organization's teams.
-   * Used to link teams to a organisation.
+   * Used to link teams to a organization.
    */
   @OneToMany(() => RunnerTeam, team => team.parentGroup, { nullable: true })
   teams: RunnerTeam[];
 
   /**
-   * The organisation's api key for self-service registration.
+   * The organization's api key for self-service registration.
    * The api key can be used for the /runners/register/:token endpoint.
    * Is has to be base64 encoded if used via the api (to keep url-safety).
    */
@@ -38,7 +38,7 @@ export class RunnerOrganisation extends RunnerGroup {
   key?: string;
 
   /**
-   * Returns all runners associated with this organisation (directly or indirectly via teams).
+   * Returns all runners associated with this organization (directly or indirectly via teams).
    */
   public get allRunners(): Runner[] {
     let returnRunners: Runner[] = new Array<Runner>();
@@ -68,7 +68,7 @@ export class RunnerOrganisation extends RunnerGroup {
   /**
    * Turns this entity into it's response class.
    */
-  public toResponse(): ResponseRunnerOrganisation {
+  public toResponse(): ResponseRunnerOrganization {
-    return new ResponseRunnerOrganisation(this);
+    return new ResponseRunnerOrganization(this);
   }
 }

src/models/entities/RunnerTeam.ts

@@ -2,7 +2,7 @@ import { IsNotEmpty } from "class-validator";
 import { ChildEntity, ManyToOne } from "typeorm";
 import { ResponseRunnerTeam } from '../responses/ResponseRunnerTeam';
 import { RunnerGroup } from "./RunnerGroup";
-import { RunnerOrganisation } from "./RunnerOrganisation";
+import { RunnerOrganization } from "./RunnerOrganization";
 
 /**
  * Defines the RunnerTeam entity.
@@ -13,11 +13,11 @@ export class RunnerTeam extends RunnerGroup {
 
   /**
    * The team's parent group.
-   * Every team has to be part of a runnerOrganisation - this get's checked on creation and update.
+   * Every team has to be part of a runnerOrganization - this get's checked on creation and update.
    */
   @IsNotEmpty()
-  @ManyToOne(() => RunnerOrganisation, org => org.teams, { nullable: true })
+  @ManyToOne(() => RunnerOrganization, org => org.teams, { nullable: true })
-  parentGroup?: RunnerOrganisation;
+  parentGroup?: RunnerOrganization;
 
   /**
    * Turns this entity into it's response class.

src/models/enums/PermissionTargets.ts

@@ -3,7 +3,7 @@
  */
 export enum PermissionTarget {
     RUNNER = 'RUNNER',
-    ORGANISATION = 'ORGANISATION',
+    ORGANIZATION = 'ORGANIZATION',
     TEAM = 'TEAM',
     TRACK = 'TRACK',
     USER = 'USER',

src/models/responses/ResponseRunnerOrganization.ts

@@ -10,30 +10,30 @@ import {
     IsString
 } from "class-validator";
 import { Address } from '../entities/Address';
-import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 
 /**
- * Defines the runnerOrganisation response.
+ * Defines the runnerOrganization response.
 */
-export class ResponseRunnerOrganisation extends ResponseRunnerGroup {
+export class ResponseRunnerOrganization extends ResponseRunnerGroup {
 
     /**
-     * The runnerOrganisation's address.
+     * The runnerOrganization's address.
      */
     @IsObject()
     @IsOptional()
     address?: Address;
 
     /**
-     * The runnerOrganisation associated teams.
+     * The runnerOrganization associated teams.
      */
     @IsArray()
     teams: RunnerTeam[];
 
     /**
-     * The organisation's registration key.
+     * The organization's registration key.
      * If registration is disabled this is null.
      */
     @IsString()
@@ -42,17 +42,17 @@ export class ResponseRunnerOrganisation extends ResponseRunnerGroup {
     registrationKey?: string;
 
     /**
-     * Is registration enabled for the organisation?
+     * Is registration enabled for the organization?
      */
     @IsOptional()
     @IsBoolean()
     registrationEnabled?: boolean = true;
 
     /**
-     * Creates a ResponseRunnerOrganisation object from a runnerOrganisation.
+     * Creates a ResponseRunnerOrganization object from a runnerOrganization.
-     * @param org The runnerOrganisation the response shall be build for.
+     * @param org The runnerOrganization the response shall be build for.
      */
-    public constructor(org: RunnerOrganisation) {
+    public constructor(org: RunnerOrganization) {
         super(org);
         this.address = org.address;
         this.teams = org.teams;

src/models/responses/ResponseRunnerTeam.ts

@@ -1,7 +1,7 @@
 import { IsNotEmpty, IsObject } from "class-validator";
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
-import { ResponseRunnerOrganisation } from './ResponseRunnerOrganisation';
+import { ResponseRunnerOrganization } from './ResponseRunnerOrganization';
 
 /**
  * Defines the runnerTeam response.
@@ -9,11 +9,11 @@ import { ResponseRunnerOrganisation } from './ResponseRunnerOrganisation';
 export class ResponseRunnerTeam extends ResponseRunnerGroup {
 
     /**
-     * The runnerTeam's parent group (organisation).
+     * The runnerTeam's parent group (organization).
      */
     @IsObject()
     @IsNotEmpty()
-    parentGroup: ResponseRunnerOrganisation;
+    parentGroup: ResponseRunnerOrganization;
 
     /**
      * Creates a ResponseRunnerTeam object from a runnerTeam.

src/models/responses/ResponseStats.ts

@@ -3,7 +3,7 @@ import {
 } from "class-validator";
 import { Donation } from '../entities/Donation';
 import { Runner } from '../entities/Runner';
-import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { Scan } from '../entities/Scan';
 import { User } from '../entities/User';
@@ -26,7 +26,7 @@ export class ResponseStats {
     total_teams: number;
 
     /**
-     * The amount of organisations registered in the system.
+     * The amount of organizations registered in the system.
      */
     @IsInt()
     total_orgs: number;
@@ -70,7 +70,7 @@ export class ResponseStats {
      * @param scans Array containing all scans - no relations have to be resolved.
      * @param donations Array containing all donations - the following relations have to be resolved: runner, runner.scans, runner.scans.track
      */
-    public constructor(runners: Runner[], teams: RunnerTeam[], orgs: RunnerOrganisation[], users: User[], scans: Scan[], donations: Donation[]) {
+    public constructor(runners: Runner[], teams: RunnerTeam[], orgs: RunnerOrganization[], users: User[], scans: Scan[], donations: Donation[]) {
         this.total_runners = runners.length;
         this.total_teams = teams.length;
         this.total_orgs = orgs.length;

src/models/responses/ResponseStatsOrganization.ts

@@ -3,7 +3,7 @@ import {
 
     IsString
 } from "class-validator";
-import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
 
 /**
  * Defines the org stats response.
@@ -35,10 +35,10 @@ export class ResponseStatsOrgnisation {
     donationAmount: number;
 
     /**
-     * Creates a new organisation stats response from a organisation
+     * Creates a new organization stats response from a organization
-     * @param org The organisation whoes response shall be generated - the following relations have to be resolved: runners, runners.scans, runners.distanceDonations, runners.scans.track, teams, teams.runners, teams.runners.scans, teams.runners.distanceDonations, teams.runners.scans.track
+     * @param org The organization whoes response shall be generated - the following relations have to be resolved: runners, runners.scans, runners.distanceDonations, runners.scans.track, teams, teams.runners, teams.runners.scans, teams.runners.distanceDonations, teams.runners.scans.track
      */
-    public constructor(org: RunnerOrganisation) {
+    public constructor(org: RunnerOrganization) {
         this.name = org.name;
         this.id = org.id;
         this.distance = org.distance;

src/seeds/SeedPublicOrg.ts

@@ -1,15 +1,15 @@
 import { Connection } from 'typeorm';
 import { Factory, Seeder } from 'typeorm-seeding';
-import { CreateRunnerOrganisation } from '../models/actions/create/CreateRunnerOrganisation';
+import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization';
-import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
+import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 
 /**
  * Seeds the public runner org (named: "Citizen" by default).
  */
 export default class SeedPublicOrg implements Seeder {
     public async run(factory: Factory, connection: Connection): Promise<any> {
-        let publicOrg = new CreateRunnerOrganisation();
+        let publicOrg = new CreateRunnerOrganization();
         publicOrg.name = "Citizen";
-        await connection.getRepository(RunnerOrganisation).save(await publicOrg.toEntity());
+        await connection.getRepository(RunnerOrganization).save(await publicOrg.toEntity());
     }
 }

src/seeds/SeedTestRunners.ts

@@ -2,13 +2,13 @@ import { Connection } from 'typeorm';
 import { Factory, Seeder } from 'typeorm-seeding';
 import { CreateGroupContact } from '../models/actions/create/CreateGroupContact';
 import { CreateRunner } from '../models/actions/create/CreateRunner';
-import { CreateRunnerOrganisation } from '../models/actions/create/CreateRunnerOrganisation';
+import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization';
 import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam';
 import { Address } from '../models/entities/Address';
 import { GroupContact } from '../models/entities/GroupContact';
 import { Runner } from '../models/entities/Runner';
 import { RunnerGroup } from '../models/entities/RunnerGroup';
-import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
+import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 import { RunnerTeam } from '../models/entities/RunnerTeam';
 
 /**
@@ -17,15 +17,15 @@ import { RunnerTeam } from '../models/entities/RunnerTeam';
  */
 export default class SeedTestRunners implements Seeder {
     public async run(factory: Factory, connection: Connection): Promise<any> {
-        let testOrg: RunnerOrganisation = await this.createTestOrg(connection);
+        let testOrg: RunnerOrganization = await this.createTestOrg(connection);
         let testTeam: RunnerTeam = await this.createTestTeam(connection, testOrg);
         await this.createTestContact(connection, testOrg);
         await this.createTestRunners(connection, testOrg);
         await this.createTestRunners(connection, testTeam);
     }
 
-    public async createTestOrg(connection: Connection): Promise<RunnerOrganisation> {
+    public async createTestOrg(connection: Connection): Promise<RunnerOrganization> {
-        let testOrg = new CreateRunnerOrganisation();
+        let testOrg = new CreateRunnerOrganization();
         testOrg.name = "Test Org";
 
         testOrg.address = new Address();
@@ -34,10 +34,10 @@ export default class SeedTestRunners implements Seeder {
         testOrg.address.country = "Germany";
         testOrg.address.postalcode = "90174";
 
-        return await connection.getRepository(RunnerOrganisation).save(await testOrg.toEntity());
+        return await connection.getRepository(RunnerOrganization).save(await testOrg.toEntity());
     }
 
-    public async createTestTeam(connection: Connection, org: RunnerOrganisation): Promise<RunnerTeam> {
+    public async createTestTeam(connection: Connection, org: RunnerOrganization): Promise<RunnerTeam> {
         let testTeam = new CreateRunnerTeam();
         testTeam.name = "Test Team";
         testTeam.parentGroup = org.id;

src/tests/cards/cards_add.spec.ts

@@ -69,7 +69,7 @@ describe('POST /api/cards successfully (with runner)', () => {
 	let added_org;
 	let added_runner;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/cards/cards_update.spec.ts

@@ -50,7 +50,7 @@ describe('adding + updating card.runner successfully', () => {
 	let added_runner2;
 	let added_card;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/contacts/contact_add.spec.ts

@@ -108,7 +108,7 @@ describe('POST /api/contacts working (with group)', () => {
     let added_team;
     let added_contact;
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         delete res.data.contact;

src/tests/contacts/contact_delete.spec.ts

@@ -50,7 +50,7 @@ describe('add+delete (with org)', () => {
     let added_org;
     let added_contact;
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         delete res.data.contact;
@@ -88,7 +88,7 @@ describe('add+delete (with team)', () => {
     let added_team;
     let added_contact;
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         delete res.data.contact;
@@ -137,7 +137,7 @@ describe('add+delete (with org&team)', () => {
     let added_team;
     let added_contact;
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         delete res.data.contact;

src/tests/contacts/contact_update.spec.ts

@@ -59,7 +59,7 @@ describe('Update contact group after adding (should work)', () => {
     let added_team;
     let added_contact;
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         delete res.data.contact;
@@ -189,7 +189,7 @@ describe('Update contact group invalid after adding (should fail)', () => {
     let added_org;
     let added_contact;
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         delete res.data.contact;

src/tests/donations/donations_add.spec.ts

@@ -83,7 +83,7 @@ describe('POST /api/donations/distance illegally', () => {
 		expect(res.headers['content-type']).toContain("application/json")
 	});
 	it('creating a new org with just a name should return 200', async () => {
-		const res = await axios.post(base + '/api/organisations', {
+		const res = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res.data
@@ -199,7 +199,7 @@ describe('POST /api/donations/distance successfully', () => {
 		expect(res.headers['content-type']).toContain("application/json")
 	});
 	it('creating a new org with just a name should return 200', async () => {
-		const res = await axios.post(base + '/api/organisations', {
+		const res = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res.data

src/tests/donations/donations_delete.spec.ts

@@ -70,7 +70,7 @@ describe('DELETE distance donation', () => {
 		expect(res.headers['content-type']).toContain("application/json")
 	});
 	it('creating a new org with just a name should return 200', async () => {
-		const res = await axios.post(base + '/api/organisations', {
+		const res = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res.data

src/tests/donations/donations_get.spec.ts

@@ -73,7 +73,7 @@ describe('adding + getting distance donation', () => {
 		expect(res.headers['content-type']).toContain("application/json")
 	});
 	it('creating a new org with just a name should return 200', async () => {
-		const res = await axios.post(base + '/api/organisations', {
+		const res = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res.data

src/tests/donations/donations_update.spec.ts

@@ -84,7 +84,7 @@ describe('adding + updating distance donation illegally', () => {
 		expect(res.headers['content-type']).toContain("application/json")
 	});
 	it('creating a new org with just a name should return 200', async () => {
-		const res = await axios.post(base + '/api/organisations', {
+		const res = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res.data
@@ -253,7 +253,7 @@ describe('adding + updating distance donation valid', () => {
 		expect(res.headers['content-type']).toContain("application/json")
 	});
 	it('creating a new org with just a name should return 200', async () => {
-		const res = await axios.post(base + '/api/organisations', {
+		const res = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res.data

src/tests/donors/donor_delete.spec.ts

@@ -60,7 +60,7 @@ describe('DELETE donor with donations invalid', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data
@@ -115,7 +115,7 @@ describe('DELETE donor with donations valid', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data

src/tests/runnerOrgs/org_add.spec.ts

@@ -14,24 +14,24 @@ beforeAll(async () => {
     };
 });
 
-describe('GET /api/organisations', () => {
+describe('GET /api/organizations', () => {
     it('basic get should return 200', async () => {
-        const res = await axios.get(base + '/api/organisations', axios_config);
+        const res = await axios.get(base + '/api/organizations', axios_config);
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json")
     });
 });
 // ---------------
-describe('POST /api/organisations', () => {
+describe('POST /api/organizations', () => {
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('creating a new org with without a name should return 400', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": null
         }, axios_config);
         expect(res.status).toEqual(400);
@@ -41,14 +41,14 @@ describe('POST /api/organisations', () => {
 // ---------------
 describe('adding + getting from all orgs', () => {
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('check if org was added', async () => {
-        const res = await axios.get(base + '/api/organisations', axios_config);
+        const res = await axios.get(base + '/api/organizations', axios_config);
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json")
         let added_org = res.data[res.data.length - 1]
@@ -72,7 +72,7 @@ describe('adding + getting from all orgs', () => {
 describe('adding + getting explicitly', () => {
     let added_org_id
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         let added_org = res1.data
@@ -81,7 +81,7 @@ describe('adding + getting explicitly', () => {
         expect(res1.headers['content-type']).toContain("application/json")
     });
     it('check if org was added', async () => {
-        const res2 = await axios.get(base + '/api/organisations/' + added_org_id, axios_config);
+        const res2 = await axios.get(base + '/api/organizations/' + added_org_id, axios_config);
         expect(res2.status).toEqual(200);
         expect(res2.headers['content-type']).toContain("application/json")
         let added_org2 = res2.data

src/tests/runnerOrgs/org_delete.spec.ts

@@ -17,7 +17,7 @@ beforeAll(async () => {
 // ---------------
 describe('adding + deletion (non-existant)', () => {
     it('delete', async () => {
-        const res2 = await axios.delete(base + '/api/organisations/0', axios_config);
+        const res2 = await axios.delete(base + '/api/organizations/0', axios_config);
         expect(res2.status).toEqual(204);
     });
 });
@@ -26,7 +26,7 @@ describe('adding + deletion (successfull)', () => {
     let added_org_id
     let added_org
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data
@@ -35,7 +35,7 @@ describe('adding + deletion (successfull)', () => {
         expect(res1.headers['content-type']).toContain("application/json")
     });
     it('delete', async () => {
-        const res2 = await axios.delete(base + '/api/organisations/' + added_org_id, axios_config);
+        const res2 = await axios.delete(base + '/api/organizations/' + added_org_id, axios_config);
         expect(res2.status).toEqual(200);
         expect(res2.headers['content-type']).toContain("application/json")
         let added_org2 = res2.data
@@ -56,7 +56,7 @@ describe('adding + deletion (successfull)', () => {
         });
     });
     it('check if org really was deleted', async () => {
-        const res3 = await axios.get(base + '/api/organisations/' + added_org_id, axios_config);
+        const res3 = await axios.get(base + '/api/organizations/' + added_org_id, axios_config);
         expect(res3.status).toEqual(404);
         expect(res3.headers['content-type']).toContain("application/json")
     });
@@ -68,7 +68,7 @@ describe('adding + deletion with teams still existing (without force)', () => {
     let added_team;
     let added_team_id
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data;
@@ -87,7 +87,7 @@ describe('adding + deletion with teams still existing (without force)', () => {
         expect(res2.headers['content-type']).toContain("application/json")
     });
     it('delete org - this should fail with a 406', async () => {
-        const res2 = await axios.delete(base + '/api/organisations/' + added_org_id, axios_config);
+        const res2 = await axios.delete(base + '/api/organizations/' + added_org_id, axios_config);
         expect(res2.status).toEqual(406);
         expect(res2.headers['content-type']).toContain("application/json")
     });
@@ -99,7 +99,7 @@ describe('adding + deletion with teams still existing (with force)', () => {
     let added_team;
     let added_team_id
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data;
@@ -118,7 +118,7 @@ describe('adding + deletion with teams still existing (with force)', () => {
         expect(res2.headers['content-type']).toContain("application/json")
     });
     it('delete', async () => {
-        const res2 = await axios.delete(base + '/api/organisations/' + added_org_id + '?force=true', axios_config);
+        const res2 = await axios.delete(base + '/api/organizations/' + added_org_id + '?force=true', axios_config);
         expect(res2.status).toEqual(200);
         expect(res2.headers['content-type']).toContain("application/json")
         let added_org2 = res2.data
@@ -139,7 +139,7 @@ describe('adding + deletion with teams still existing (with force)', () => {
         });
     });
     it('check if org really was deleted', async () => {
-        const res3 = await axios.get(base + '/api/organisations/' + added_org_id, axios_config);
+        const res3 = await axios.get(base + '/api/organizations/' + added_org_id, axios_config);
         expect(res3.status).toEqual(404);
         expect(res3.headers['content-type']).toContain("application/json")
     });

src/tests/runnerOrgs/org_get.spec.ts

@@ -14,15 +14,15 @@ beforeAll(async () => {
     };
 });
 
-describe('GET /api/organisations', () => {
+describe('GET /api/organizations', () => {
     it('basic get should return 200', async () => {
-        const res = await axios.get(base + '/api/organisations', axios_config);
+        const res = await axios.get(base + '/api/organizations', axios_config);
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json")
     });
 });
 // ---------------
-describe('GET /api/organisations/0', () => {
+describe('GET /api/organizations/0', () => {
     it('basic get should return 404', async () => {
         const res = await axios.get(base + '/api/runners/0', axios_config);
         expect(res.status).toEqual(404);

src/tests/runnerOrgs/org_update.spec.ts

@@ -19,7 +19,7 @@ describe('adding + updating name', () => {
     let added_org_id
     let added_org
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data
@@ -28,7 +28,7 @@ describe('adding + updating name', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('update org', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -59,7 +59,7 @@ describe('adding + try updating id (should return 406)', () => {
     let added_org_id
     let added_org
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data
@@ -68,7 +68,7 @@ describe('adding + try updating id (should return 406)', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('update org', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id + 1,
             "name": "testlelele",
             "contact": null,
@@ -83,7 +83,7 @@ describe('adding + updateing address valid)', () => {
     let added_org_id
     let added_org
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data
@@ -92,7 +92,7 @@ describe('adding + updateing address valid)', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('adding address to org should return 200', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -122,7 +122,7 @@ describe('adding + updateing address valid)', () => {
         });
     });
     it('updateing address\'s first line should return 200', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -152,7 +152,7 @@ describe('adding + updateing address valid)', () => {
         });
     });
     it('updateing address\'s second line should return 200', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -182,7 +182,7 @@ describe('adding + updateing address valid)', () => {
         });
     });
     it('updateing address\'s city should return 200', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -212,7 +212,7 @@ describe('adding + updateing address valid)', () => {
         });
     });
     it('updateing address\'s country should return 200', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -242,7 +242,7 @@ describe('adding + updateing address valid)', () => {
         });
     });
     it('updateing address\'s postal code should return 200', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -272,7 +272,7 @@ describe('adding + updateing address valid)', () => {
         });
     });
     it('removing org\'s address should return 200', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -300,7 +300,7 @@ describe('adding + updateing address invalid)', () => {
     let added_org_id
     let added_org
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data
@@ -309,7 +309,7 @@ describe('adding + updateing address invalid)', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('adding address to org w/o address1 should return 400', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -325,7 +325,7 @@ describe('adding + updateing address invalid)', () => {
         expect(res.headers['content-type']).toContain("application/json");
     });
     it('adding address to org w/o city should return 400', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -341,7 +341,7 @@ describe('adding + updateing address invalid)', () => {
         expect(res.headers['content-type']).toContain("application/json");
     });
     it('adding address to org w/o country should return 400', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -357,7 +357,7 @@ describe('adding + updateing address invalid)', () => {
         expect(res.headers['content-type']).toContain("application/json");
     });
     it('adding address to org w/o postal code should return 400', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,
@@ -373,7 +373,7 @@ describe('adding + updateing address invalid)', () => {
         expect(res.headers['content-type']).toContain("application/json");
     });
     it('adding address to org w/ invalid postal code should return 400', async () => {
-        const res = await axios.put(base + '/api/organisations/' + added_org_id, {
+        const res = await axios.put(base + '/api/organizations/' + added_org_id, {
             "id": added_org_id,
             "name": "testlelele",
             "contact": null,

src/tests/runnerTeams/team_add.spec.ts

@@ -58,7 +58,7 @@ describe('POST /api/teams with errors', () => {
 describe('POST /api/teams working', () => {
     let added_org_id;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         let added_org = res1.data

src/tests/runnerTeams/team_delete.spec.ts

@@ -21,7 +21,7 @@ describe('adding org', () => {
     let added_team;
     let added_team_id
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data;

src/tests/runnerTeams/team_update.spec.ts

@@ -20,7 +20,7 @@ describe('adding + updating name', () => {
     let added_team;
     let added_team_id
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data;
@@ -59,7 +59,7 @@ describe('adding + try updating id (should return 406)', () => {
     let added_team;
     let added_team_id
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data;
@@ -92,7 +92,7 @@ describe('add+update parent org (valid)', () => {
     let added_team;
     let added_team_id
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data;
@@ -110,7 +110,7 @@ describe('add+update parent org (valid)', () => {
         expect(res2.headers['content-type']).toContain("application/json")
     });
     it('creating a new org with just a name should return 200', async () => {
-        const res3 = await axios.post(base + '/api/organisations', {
+        const res3 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org2 = res3.data;

src/tests/runners/runner_add.spec.ts

@@ -80,7 +80,7 @@ describe('POST /api/runners with errors', () => {
 describe('POST /api/runners working', () => {
     let added_org_id;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         let added_org = res1.data

src/tests/runners/runner_delete.spec.ts

@@ -25,7 +25,7 @@ describe('add+delete', () => {
     let added_org_id;
     let added_runner;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         let added_org = res1.data
@@ -71,7 +71,7 @@ describe('DELETE donor with donations invalid', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data
@@ -118,7 +118,7 @@ describe('DELETE donor with donations valid', () => {
         expect(res.headers['content-type']).toContain("application/json")
     });
     it('creating a new org with just a name should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res.data

src/tests/runners/runner_get.spec.ts

@@ -33,7 +33,7 @@ describe('GET /api/runners after adding', () => {
     let added_org_id;
     let added_runner;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         let added_org = res1.data

src/tests/runners/runner_update.spec.ts

@@ -18,7 +18,7 @@ describe('Update runner name after adding', () => {
     let added_org;
     let added_runner;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         delete res1.data.registrationEnabled;
@@ -58,7 +58,7 @@ describe('Update runner group after adding', () => {
     let added_org_2;
     let added_runner;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         let added_org = res1.data
@@ -77,7 +77,7 @@ describe('Update runner group after adding', () => {
         expect(res2.headers['content-type']).toContain("application/json")
     });
     it('creating a new org with just a name should return 200', async () => {
-        const res3 = await axios.post(base + '/api/organisations', {
+        const res3 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org_2 = res3.data
@@ -103,7 +103,7 @@ describe('Update runner id after adding(should fail)', () => {
     let added_runner;
     let added_runner_id;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         let added_org = res1.data
@@ -135,7 +135,7 @@ describe('Update runner group with invalid group after adding', () => {
     let added_org;
     let added_runner;
     it('creating a new org with just a name should return 200', async () => {
-        const res1 = await axios.post(base + '/api/organisations', {
+        const res1 = await axios.post(base + '/api/organizations', {
             "name": "test123"
         }, axios_config);
         added_org = res1.data

src/tests/scans/scans_add.spec.ts

@@ -19,7 +19,7 @@ describe('POST /api/scans illegally', () => {
 	let added_org;
 	let added_runner;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data
@@ -70,7 +70,7 @@ describe('POST /api/scans successfully', () => {
 	let added_org;
 	let added_runner;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data
@@ -144,7 +144,7 @@ describe('POST /api/scans successfully via scan station', () => {
 	let added_track;
 	let added_station;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/scans/scans_delete.spec.ts

@@ -21,7 +21,7 @@ describe('DELETE scan', () => {
 	let added_runner;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/scans/scans_get.spec.ts

@@ -35,7 +35,7 @@ describe('adding + getting scans', () => {
 	let added_runner;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/scans/scans_update.spec.ts

@@ -19,7 +19,7 @@ describe('adding + updating illegally', () => {
 	let added_runner;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data
@@ -86,7 +86,7 @@ describe('adding + updating successfilly', () => {
 	let added_runner2;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/selfservice/selfservice_register.spec.ts

@@ -98,7 +98,7 @@ describe('register citizen valid', () => {
 describe('register invalid company', () => {
     let added_org;
     it('creating a new org with just a name and registration enabled should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123",
             "registrationEnabled": true
         }, axios_config);
@@ -156,7 +156,7 @@ describe('register valid company', () => {
     let added_org;
     let added_team;
     it('creating a new org with just a name and registration enabled should return 200', async () => {
-        const res = await axios.post(base + '/api/organisations', {
+        const res = await axios.post(base + '/api/organizations', {
             "name": "test123",
             "registrationEnabled": true
         }, axios_config);

src/tests/trackscans/trackscans_add.spec.ts

@@ -22,7 +22,7 @@ describe('POST /api/scans illegally', () => {
 	let added_track;
 	let added_station;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data
@@ -109,7 +109,7 @@ describe('POST /api/scans successfully', () => {
 	let added_track;
 	let added_station;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data
@@ -179,7 +179,7 @@ describe('POST /api/scans successfully via scan station', () => {
 	let added_track;
 	let added_station;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/trackscans/trackscans_delete.spec.ts

@@ -24,7 +24,7 @@ describe('DELETE scan', () => {
 	let added_station;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/trackscans/trackscans_get.spec.ts

@@ -38,7 +38,7 @@ describe('adding + getting scans', () => {
 	let added_station;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data

src/tests/trackscans/trackscans_update.spec.ts

@@ -22,7 +22,7 @@ describe('adding + updating illegally', () => {
 	let added_station;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data
@@ -123,7 +123,7 @@ describe('adding + updating successfilly', () => {
 	let added_station2;
 	let added_scan;
 	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organisations', {
+		const res1 = await axios.post(base + '/api/organizations', {
 			"name": "test123"
 		}, axios_config);
 		added_org = res1.data