src/controllers/RunnerOrganizationController.ts

@@ -1,6 +1,6 @@
 import { Authorized, BadRequestError, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { Repository, getConnectionManager } from 'typeorm';
+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';
@@ -29,20 +29,13 @@ export class RunnerOrganizationController {
 	@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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
-		let responseOrgs: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
-		let orgs: Array<RunnerOrganization>;
-
-		if (page) {
-			orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'], skip: page * page_size, take: page_size });
-		} else {
-			orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] });
-		}
-
-		orgs.forEach(org => {
-			responseOrgs.push(new ResponseRunnerOrganization(org));
+	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 responseOrgs;
+		return responseTeams;
 	}
 
 	@Get('/:id')

src/controllers/RunnerTeamController.ts

@@ -1,6 +1,6 @@
 import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerTeamHasRunnersError, RunnerTeamIdsNotMatchingError, RunnerTeamNotFoundError } from '../errors/RunnerTeamErrors';
 import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam';
 import { UpdateRunnerTeam } from '../models/actions/update/UpdateRunnerTeam';
@@ -27,18 +27,11 @@ export class RunnerTeamController {
 	@Authorized("TEAM:GET")
 	@ResponseSchema(ResponseRunnerTeam, { isArray: true })
 	@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organization and contact (if existing/associated).' })
-	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
-		let teams: Array<RunnerTeam>;
-
-		if (page) {
-			teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'], skip: page * page_size, take: page_size });
-		} else {
-			teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });
-		}
-
-		teams.forEach(team => {
-			responseTeams.push(new ResponseRunnerTeam(team));
+		const runners = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });
+		runners.forEach(runner => {
+			responseTeams.push(new ResponseRunnerTeam(runner));
 		});
 		return responseTeams;
 	}