Merge branch 'dev' into feature/17-automated_tests
# Conflicts: # src/app.ts # src/controllers/RunnerController.ts # src/controllers/RunnerOrganisationController.ts # src/controllers/RunnerTeamController.ts # src/models/actions/CreateParticipant.ts
This commit is contained in:
		@@ -26,6 +26,6 @@ async function main() {
 | 
			
		||||
if (errors === 0) {
 | 
			
		||||
  main();
 | 
			
		||||
} else {
 | 
			
		||||
  console.log("error");
 | 
			
		||||
  consola.error("error");
 | 
			
		||||
  // something's wrong
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,6 @@ const authchecker = async (action: Action, permissions: string | string[]) => {
 | 
			
		||||
    try {
 | 
			
		||||
        jwtPayload = <any>jwt.verify(provided_token, config.jwt_secret);
 | 
			
		||||
    } catch (error) {
 | 
			
		||||
        console.log(error);
 | 
			
		||||
        throw new IllegalJWTError()
 | 
			
		||||
    }
 | 
			
		||||
    const count = await getConnectionManager().get().getRepository(User).count({ id: jwtPayload["userdetails"]["id"], refreshTokenCount: jwtPayload["userdetails"]["refreshTokenCount"] })
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,6 @@ export class RunnerController {
 | 
			
		||||
	async getAll() {
 | 
			
		||||
		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
 | 
			
		||||
		const runners = await this.runnerRepository.find({ relations: ['scans', 'group'] });
 | 
			
		||||
		console.log(runners);
 | 
			
		||||
		runners.forEach(runner => {
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner));
 | 
			
		||||
		});
 | 
			
		||||
 
 | 
			
		||||
@@ -29,7 +29,6 @@ export class RunnerOrganisationController {
 | 
			
		||||
	async getAll() {
 | 
			
		||||
		let responseTeams: ResponseRunnerOrganisation[] = new Array<ResponseRunnerOrganisation>();
 | 
			
		||||
		const runners = await this.runnerOrganisationRepository.find({ relations: ['address', 'contact', 'teams'] });
 | 
			
		||||
		console.log(runners);
 | 
			
		||||
		runners.forEach(runner => {
 | 
			
		||||
			responseTeams.push(new ResponseRunnerOrganisation(runner));
 | 
			
		||||
		});
 | 
			
		||||
 
 | 
			
		||||
@@ -28,7 +28,6 @@ export class RunnerTeamController {
 | 
			
		||||
	async getAll() {
 | 
			
		||||
		let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
 | 
			
		||||
		const runners = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });
 | 
			
		||||
		console.log(runners);
 | 
			
		||||
		runners.forEach(runner => {
 | 
			
		||||
			responseTeams.push(new ResponseRunnerTeam(runner));
 | 
			
		||||
		});
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@ export abstract class CreateParticipant {
 | 
			
		||||
     * Optional.
 | 
			
		||||
     */
 | 
			
		||||
    @IsString()
 | 
			
		||||
    @IsNotEmpty()
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    middlename?: string;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user