From 3f7b0f6563f2446508257d09ca87e119c6383ea8 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sun, 10 Jan 2021 16:35:52 +0100 Subject: [PATCH] Renamed the update>Entity Name>() functiuons to update() ref #76 --- src/controllers/DonorController.ts | 2 +- src/controllers/PermissionController.ts | 2 +- src/controllers/RunnerController.ts | 2 +- src/controllers/RunnerOrganisationController.ts | 2 +- src/controllers/RunnerTeamController.ts | 2 +- src/controllers/ScanController.ts | 4 ++-- src/controllers/ScanStationController.ts | 2 +- src/controllers/TrackController.ts | 2 +- src/controllers/UserController.ts | 2 +- src/models/actions/update/UpdateDonor.ts | 2 +- src/models/actions/update/UpdatePermission.ts | 2 +- src/models/actions/update/UpdateRunner.ts | 2 +- src/models/actions/update/UpdateRunnerOrganisation.ts | 2 +- src/models/actions/update/UpdateRunnerTeam.ts | 2 +- src/models/actions/update/UpdateScan.ts | 2 +- src/models/actions/update/UpdateScanStation.ts | 2 +- src/models/actions/update/UpdateTrack.ts | 2 +- src/models/actions/update/UpdateTrackScan.ts | 2 +- src/models/actions/update/UpdateUser.ts | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/controllers/DonorController.ts b/src/controllers/DonorController.ts index 5b17c1d..f6b8527 100644 --- a/src/controllers/DonorController.ts +++ b/src/controllers/DonorController.ts @@ -78,7 +78,7 @@ export class DonorController { throw new DonorIdsNotMatchingError(); } - await this.donorRepository.save(await donor.updateDonor(oldDonor)); + await this.donorRepository.save(await donor.update(oldDonor)); return new ResponseDonor(await this.donorRepository.findOne({ id: id })); } diff --git a/src/controllers/PermissionController.ts b/src/controllers/PermissionController.ts index 37085f1..e123e81 100644 --- a/src/controllers/PermissionController.ts +++ b/src/controllers/PermissionController.ts @@ -96,7 +96,7 @@ export class PermissionController { return new ResponsePermission(existingPermission); } - await this.permissionRepository.save(await permission.updatePermission(oldPermission)); + await this.permissionRepository.save(await permission.update(oldPermission)); return new ResponsePermission(await this.permissionRepository.findOne({ id: permission.id }, { relations: ['principal'] })); } diff --git a/src/controllers/RunnerController.ts b/src/controllers/RunnerController.ts index 184cc38..2d83a02 100644 --- a/src/controllers/RunnerController.ts +++ b/src/controllers/RunnerController.ts @@ -83,7 +83,7 @@ export class RunnerController { throw new RunnerIdsNotMatchingError(); } - await this.runnerRepository.save(await runner.updateRunner(oldRunner)); + await this.runnerRepository.save(await runner.update(oldRunner)); return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'scans.track', 'cards'] })); } diff --git a/src/controllers/RunnerOrganisationController.ts b/src/controllers/RunnerOrganisationController.ts index 4717d3c..15c12ff 100644 --- a/src/controllers/RunnerOrganisationController.ts +++ b/src/controllers/RunnerOrganisationController.ts @@ -82,7 +82,7 @@ export class RunnerOrganisationController { throw new RunnerOrganisationIdsNotMatchingError(); } - await this.runnerOrganisationRepository.save(await updateOrganisation.updateRunnerOrganisation(oldRunnerOrganisation)); + await this.runnerOrganisationRepository.save(await updateOrganisation.update(oldRunnerOrganisation)); return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(id, { relations: ['address', 'contact', 'teams'] })); } diff --git a/src/controllers/RunnerTeamController.ts b/src/controllers/RunnerTeamController.ts index 6587a84..d06ccce 100644 --- a/src/controllers/RunnerTeamController.ts +++ b/src/controllers/RunnerTeamController.ts @@ -82,7 +82,7 @@ export class RunnerTeamController { throw new RunnerTeamIdsNotMatchingError(); } - await this.runnerTeamRepository.save(await runnerTeam.updateRunnerTeam(oldRunnerTeam)); + await this.runnerTeamRepository.save(await runnerTeam.update(oldRunnerTeam)); return new ResponseRunnerTeam(await this.runnerTeamRepository.findOne({ id: runnerTeam.id }, { relations: ['parentGroup', 'contact'] })); } diff --git a/src/controllers/ScanController.ts b/src/controllers/ScanController.ts index e098a21..0de844c 100644 --- a/src/controllers/ScanController.ts +++ b/src/controllers/ScanController.ts @@ -96,7 +96,7 @@ export class ScanController { throw new ScanIdsNotMatchingError(); } - await this.scanRepository.save(await scan.updateScan(oldScan)); + await this.scanRepository.save(await scan.update(oldScan)); return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse(); } @@ -119,7 +119,7 @@ export class ScanController { throw new ScanIdsNotMatchingError(); } - await this.trackScanRepository.save(await scan.updateScan(oldScan)); + await this.trackScanRepository.save(await scan.update(oldScan)); return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse(); } diff --git a/src/controllers/ScanStationController.ts b/src/controllers/ScanStationController.ts index 2666b64..80aa6e3 100644 --- a/src/controllers/ScanStationController.ts +++ b/src/controllers/ScanStationController.ts @@ -77,7 +77,7 @@ export class ScanStationController { throw new ScanStationIdsNotMatchingError(); } - await this.stationRepository.save(await station.updateStation(oldStation)); + await this.stationRepository.save(await station.update(oldStation)); return (await this.stationRepository.findOne({ id: id }, { relations: ['track'] })).toResponse(); } diff --git a/src/controllers/TrackController.ts b/src/controllers/TrackController.ts index a47972f..b9f8d30 100644 --- a/src/controllers/TrackController.ts +++ b/src/controllers/TrackController.ts @@ -75,7 +75,7 @@ export class TrackController { if (oldTrack.id != updateTrack.id) { throw new TrackIdsNotMatchingError(); } - await this.trackRepository.save(await updateTrack.updateTrack(oldTrack)); + await this.trackRepository.save(await updateTrack.update(oldTrack)); return new ResponseTrack(await this.trackRepository.findOne({ id: id })); } diff --git a/src/controllers/UserController.ts b/src/controllers/UserController.ts index 195b66a..57083db 100644 --- a/src/controllers/UserController.ts +++ b/src/controllers/UserController.ts @@ -81,7 +81,7 @@ export class UserController { if (oldUser.id != updateUser.id) { throw new UserIdsNotMatchingError(); } - await this.userRepository.save(await updateUser.updateUser(oldUser)); + await this.userRepository.save(await updateUser.update(oldUser)); return new ResponseUser(await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] })); } diff --git a/src/models/actions/update/UpdateDonor.ts b/src/models/actions/update/UpdateDonor.ts index 4c62c98..8c77ff1 100644 --- a/src/models/actions/update/UpdateDonor.ts +++ b/src/models/actions/update/UpdateDonor.ts @@ -26,7 +26,7 @@ export class UpdateDonor extends CreateParticipant { /** * Updates a provided Donor entity based on this. */ - public async updateDonor(donor: Donor): Promise { + public async update(donor: Donor): Promise { donor.firstname = this.firstname; donor.middlename = this.middlename; donor.lastname = this.lastname; diff --git a/src/models/actions/update/UpdatePermission.ts b/src/models/actions/update/UpdatePermission.ts index 8e012b8..e591e20 100644 --- a/src/models/actions/update/UpdatePermission.ts +++ b/src/models/actions/update/UpdatePermission.ts @@ -42,7 +42,7 @@ export class UpdatePermission { /** * Updates a provided Permission entity based on this. */ - public async updatePermission(permission: Permission): Promise { + public async update(permission: Permission): Promise { permission.principal = await this.getPrincipal(); permission.target = this.target; permission.action = this.action; diff --git a/src/models/actions/update/UpdateRunner.ts b/src/models/actions/update/UpdateRunner.ts index 79c92b1..29a2423 100644 --- a/src/models/actions/update/UpdateRunner.ts +++ b/src/models/actions/update/UpdateRunner.ts @@ -29,7 +29,7 @@ export class UpdateRunner extends CreateParticipant { /** * Updates a provided Runner entity based on this. */ - public async updateRunner(runner: Runner): Promise { + public async update(runner: Runner): Promise { runner.firstname = this.firstname; runner.middlename = this.middlename; runner.lastname = this.lastname; diff --git a/src/models/actions/update/UpdateRunnerOrganisation.ts b/src/models/actions/update/UpdateRunnerOrganisation.ts index bdc0d33..7270923 100644 --- a/src/models/actions/update/UpdateRunnerOrganisation.ts +++ b/src/models/actions/update/UpdateRunnerOrganisation.ts @@ -41,7 +41,7 @@ export class UpdateRunnerOrganisation extends CreateRunnerGroup { /** * Updates a provided RunnerOrganisation entity based on this. */ - public async updateRunnerOrganisation(organisation: RunnerOrganisation): Promise { + public async update(organisation: RunnerOrganisation): Promise { organisation.name = this.name; organisation.contact = await this.getContact(); diff --git a/src/models/actions/update/UpdateRunnerTeam.ts b/src/models/actions/update/UpdateRunnerTeam.ts index 8420473..d7e435d 100644 --- a/src/models/actions/update/UpdateRunnerTeam.ts +++ b/src/models/actions/update/UpdateRunnerTeam.ts @@ -45,7 +45,7 @@ export class UpdateRunnerTeam extends CreateRunnerGroup { /** * Updates a provided RunnerTeam entity based on this. */ - public async updateRunnerTeam(team: RunnerTeam): Promise { + public async update(team: RunnerTeam): Promise { team.name = this.name; team.parentGroup = await this.getParent(); diff --git a/src/models/actions/update/UpdateScan.ts b/src/models/actions/update/UpdateScan.ts index 157f8b5..a0d6633 100644 --- a/src/models/actions/update/UpdateScan.ts +++ b/src/models/actions/update/UpdateScan.ts @@ -41,7 +41,7 @@ export abstract class UpdateScan { * Update a Scan entity based on this. * @param scan The scan that shall be updated. */ - public async updateScan(scan: Scan): Promise { + public async update(scan: Scan): Promise { scan.distance = this.distance; scan.valid = this.valid; scan.runner = await this.getRunner(); diff --git a/src/models/actions/update/UpdateScanStation.ts b/src/models/actions/update/UpdateScanStation.ts index e6121c3..b7557e3 100644 --- a/src/models/actions/update/UpdateScanStation.ts +++ b/src/models/actions/update/UpdateScanStation.ts @@ -30,7 +30,7 @@ export class UpdateScanStation { * Update a ScanStation entity based on this. * @param station The station that shall be updated. */ - public async updateStation(station: ScanStation): Promise { + public async update(station: ScanStation): Promise { station.description = this.description; station.enabled = this.enabled; diff --git a/src/models/actions/update/UpdateTrack.ts b/src/models/actions/update/UpdateTrack.ts index a4456cb..c9935f5 100644 --- a/src/models/actions/update/UpdateTrack.ts +++ b/src/models/actions/update/UpdateTrack.ts @@ -37,7 +37,7 @@ export class UpdateTrack { * Update a Track entity based on this. * @param track The track that shall be updated. */ - public updateTrack(track: Track): Track { + public update(track: Track): Track { track.name = this.name; track.distance = this.distance; track.minimumLapTime = this.minimumLapTime; diff --git a/src/models/actions/update/UpdateTrackScan.ts b/src/models/actions/update/UpdateTrackScan.ts index d5fc8f9..1280e94 100644 --- a/src/models/actions/update/UpdateTrackScan.ts +++ b/src/models/actions/update/UpdateTrackScan.ts @@ -44,7 +44,7 @@ export abstract class UpdateTrackScan { * Update a TrackScan entity based on this. * @param scan The scan that shall be updated. */ - public async updateScan(scan: TrackScan): Promise { + public async update(scan: TrackScan): Promise { scan.valid = this.valid; if (this.runner) { scan.runner = await this.getRunner(); diff --git a/src/models/actions/update/UpdateUser.ts b/src/models/actions/update/UpdateUser.ts index a9ae5fe..59d95a4 100644 --- a/src/models/actions/update/UpdateUser.ts +++ b/src/models/actions/update/UpdateUser.ts @@ -98,7 +98,7 @@ export class UpdateUser { * Updates a user entity based on this. * @param user The user that shall be updated. */ - public async updateUser(user: User): Promise { + public async update(user: User): Promise { user.email = this.email; user.username = this.username; if ((user.email === undefined || user.email === null) && (user.username === undefined || user.username === null)) {