From c87c97c90f5e1229f92671b1f2ebe1fa0d2307cd Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Mar 2021 14:00:04 +0100 Subject: [PATCH 1/3] =?UTF-8?q?The=20basic=20bugfix=20=F0=9F=90=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit REF '!&ยง --- src/models/actions/update/UpdateTrackScan.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/models/actions/update/UpdateTrackScan.ts b/src/models/actions/update/UpdateTrackScan.ts index 6bdc83e..0e0a2e5 100644 --- a/src/models/actions/update/UpdateTrackScan.ts +++ b/src/models/actions/update/UpdateTrackScan.ts @@ -1,9 +1,9 @@ import { IsBoolean, IsInt, IsOptional, IsPositive } from 'class-validator'; import { getConnection } from 'typeorm'; import { RunnerNotFoundError } from '../../../errors/RunnerErrors'; -import { ScanStationNotFoundError } from '../../../errors/ScanStationErrors'; +import { TrackNotFoundError } from '../../../errors/TrackErrors'; import { Runner } from '../../entities/Runner'; -import { ScanStation } from '../../entities/ScanStation'; +import { Track } from '../../entities/Track'; import { TrackScan } from '../../entities/TrackScan'; /** @@ -38,7 +38,7 @@ export abstract class UpdateTrackScan { */ @IsInt() @IsPositive() - public station: number; + public track: number; /** * Update a TrackScan entity based on this. @@ -47,8 +47,7 @@ export abstract class UpdateTrackScan { public async update(scan: TrackScan): Promise { scan.valid = this.valid; scan.runner = await this.getRunner(); - scan.station = await this.getStation(); - scan.track = scan.station.track; + scan.track = await this.getTrack(); return scan; } @@ -67,11 +66,11 @@ export abstract class UpdateTrackScan { /** * Gets a runner based on the runner id provided via this.runner. */ - public async getStation(): Promise { - const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ['track'] }); - if (!station) { - throw new ScanStationNotFoundError(); + public async getTrack(): Promise { + const track = await getConnection().getRepository(Track).findOne({ id: this.track }); + if (!track) { + throw new TrackNotFoundError(); } - return station; + return track; } } \ No newline at end of file From fbdadbef1f9eb835e1914e8d3770cca836b4c443 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Mar 2021 14:00:04 +0100 Subject: [PATCH 2/3] =?UTF-8?q?The=20basic=20bugfix=20=F0=9F=90=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #163 --- src/models/actions/update/UpdateTrackScan.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/models/actions/update/UpdateTrackScan.ts b/src/models/actions/update/UpdateTrackScan.ts index 6bdc83e..0e0a2e5 100644 --- a/src/models/actions/update/UpdateTrackScan.ts +++ b/src/models/actions/update/UpdateTrackScan.ts @@ -1,9 +1,9 @@ import { IsBoolean, IsInt, IsOptional, IsPositive } from 'class-validator'; import { getConnection } from 'typeorm'; import { RunnerNotFoundError } from '../../../errors/RunnerErrors'; -import { ScanStationNotFoundError } from '../../../errors/ScanStationErrors'; +import { TrackNotFoundError } from '../../../errors/TrackErrors'; import { Runner } from '../../entities/Runner'; -import { ScanStation } from '../../entities/ScanStation'; +import { Track } from '../../entities/Track'; import { TrackScan } from '../../entities/TrackScan'; /** @@ -38,7 +38,7 @@ export abstract class UpdateTrackScan { */ @IsInt() @IsPositive() - public station: number; + public track: number; /** * Update a TrackScan entity based on this. @@ -47,8 +47,7 @@ export abstract class UpdateTrackScan { public async update(scan: TrackScan): Promise { scan.valid = this.valid; scan.runner = await this.getRunner(); - scan.station = await this.getStation(); - scan.track = scan.station.track; + scan.track = await this.getTrack(); return scan; } @@ -67,11 +66,11 @@ export abstract class UpdateTrackScan { /** * Gets a runner based on the runner id provided via this.runner. */ - public async getStation(): Promise { - const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ['track'] }); - if (!station) { - throw new ScanStationNotFoundError(); + public async getTrack(): Promise { + const track = await getConnection().getRepository(Track).findOne({ id: this.track }); + if (!track) { + throw new TrackNotFoundError(); } - return station; + return track; } } \ No newline at end of file From f347b7ad4982ed3760117c08e11dca5c3f72d495 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Mar 2021 14:05:13 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Updated=20tests=20=F0=9F=A7=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #163 --- src/tests/trackscans/trackscans_update.spec.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/trackscans/trackscans_update.spec.ts b/src/tests/trackscans/trackscans_update.spec.ts index 071f7a2..475d92c 100644 --- a/src/tests/trackscans/trackscans_update.spec.ts +++ b/src/tests/trackscans/trackscans_update.spec.ts @@ -86,7 +86,7 @@ describe('adding + updating illegally', () => { it('updating with wrong id should return 406', async () => { const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { "id": added_scan.id + 1, - "station": added_station.id, + "track": added_track.id, "runner": added_runner.id }, axios_config); expect(res2.status).toEqual(406); @@ -95,7 +95,7 @@ describe('adding + updating illegally', () => { it('updating with invalid station should return 404', async () => { const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { "id": added_scan.id, - "station": 9999999999999999, + "track": 9999999999999999, "runner": added_runner.id }, axios_config); expect(res2.status).toEqual(404); @@ -104,7 +104,7 @@ describe('adding + updating illegally', () => { it('updating with invalid runner should return 404', async () => { const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { "id": added_scan.id, - "station": added_station.id, + "track": added_station.id, "runner": 9999999999999999999 }, axios_config); expect(res2.status).toEqual(404); @@ -211,7 +211,7 @@ describe('adding + updating successfilly', () => { it('updating with new runner should return 200', async () => { const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { "id": added_scan.id, - "station": added_station.id, + "track": added_track.id, "runner": added_runner2.id }, axios_config); expect(res2.status).toEqual(200); @@ -220,7 +220,7 @@ describe('adding + updating successfilly', () => { it('updating with new station should return 200', async () => { const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { "id": added_scan.id, - "station": added_station2.id, + "track": added_track2.id, "runner": added_runner.id }, axios_config); expect(res2.status).toEqual(200); @@ -229,7 +229,7 @@ describe('adding + updating successfilly', () => { it('updating with valid=false should return 200', async () => { const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { "id": added_scan.id, - "station": added_station2.id, + "track": added_track2.id, "runner": added_runner.id, "valid": false }, axios_config);