Compare commits
	
		
			40 Commits
		
	
	
		
			v0.10.0
			...
			87f444c30d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 87f444c30d | |||
| 4a73eab134 | |||
| f8baca5ab2 | |||
| 10221b9f2e | |||
| 1d8c8c8e9c | |||
| 4603a84f16 | |||
| 2cd8f3f7f3 | |||
| 107eeeae7f | |||
| b8767b8bd4 | |||
| bf686e89e0 | |||
| 6163f0a90b | |||
| 8f0f795a70 | |||
| 22cae39bd3 | |||
| 0b07a53ed2 | |||
| d4a02e7db2 | |||
| b9a7dc84f0 | |||
| 7111068361 | |||
| 63964fbf2c | |||
| cbcb829fbd | |||
| 057ae0d797 | |||
| 257f320ee3 | |||
| 7b15c2d88b | |||
| 988f17a795 | |||
| 4471e57438 | |||
| 51daf969cf | |||
| cb71fcd13b | |||
| a6a526dc5d | |||
| dd6d799c84 | |||
| e89e07d0fc | |||
| c28843c405 | |||
| 4834a6698b | |||
| 69afd4d587 | |||
| 24d152fdc8 | |||
| 4279e43743 | |||
| d837654617 | |||
| 0767943721 | |||
| ca87774767 | |||
| f693f2cde9 | |||
| d70c5b1bbc | |||
| 71e3d0efe2 | 
| @@ -22,7 +22,7 @@ get: | ||||
| --- | ||||
| kind: pipeline | ||||
| type: kubernetes | ||||
| name: tests:node_latest | ||||
| name: tests:node_14.15.1-alpine3.12 | ||||
| clone: | ||||
|   disable: true | ||||
| steps: | ||||
| @@ -32,7 +32,7 @@ steps: | ||||
|       - git clone $DRONE_REMOTE_URL . | ||||
|       - git checkout $DRONE_SOURCE_BRANCH | ||||
|   - name: run tests | ||||
|     image: node:latest | ||||
|     image: node:14.15.1-alpine3.12 | ||||
|     commands: | ||||
|       - yarn | ||||
|       - yarn test:ci | ||||
|   | ||||
							
								
								
									
										23
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,13 +2,32 @@ | ||||
|  | ||||
| All notable changes to this project will be documented in this file. Dates are displayed in UTC. | ||||
|  | ||||
| #### [v0.10.1](https://git.odit.services/lfk/backend/compare/v0.10.0...v0.10.1) | ||||
|  | ||||
| - Merge pull request 'Release 0.10.1' (#189) from dev into main [`e89e07d`](https://git.odit.services/lfk/backend/commit/e89e07d0fc99f14148b01204fb8ed39e2da77e38) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`69afd4d`](https://git.odit.services/lfk/backend/commit/69afd4d5877401eb46df430f43a7feb273abda1e) | ||||
| - 🚀Bumped version to v0.10.1 [`24d152f`](https://git.odit.services/lfk/backend/commit/24d152fdc8fe17fffa2f2a718d7145ba8a91d79c) | ||||
| - New class: ResponseSelfServiceDonor [`d70c5b1`](https://git.odit.services/lfk/backend/commit/d70c5b1bbc9f02782f8755b6929e2d3458e10221) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`4279e43`](https://git.odit.services/lfk/backend/commit/4279e4374304887e8db40eab77763b20bbce91a1) | ||||
| - Removed duplicate openapi statement [`4834a66`](https://git.odit.services/lfk/backend/commit/4834a6698b0958602421c1478a95fec7edda910b) | ||||
| - Switched selfservice donation.donor from string to object [`0767943`](https://git.odit.services/lfk/backend/commit/0767943721b6964d542f580c541e744f86444ac6) | ||||
| - Adjusted runner property names [`ca87774`](https://git.odit.services/lfk/backend/commit/ca87774767807a2c4bc869b0de95cc73832a8405) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`71e3d0e`](https://git.odit.services/lfk/backend/commit/71e3d0efe2cbde47aea0f26cb5a8b5cd3312707d) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`c28843c`](https://git.odit.services/lfk/backend/commit/c28843c405dc4fd06a10f0fb85814acede15a769) | ||||
| - Merge pull request 'Selfservice donations reformatting feature/187-selfservice_donation' (#188) from feature/187-selfservice_donation into dev [`d837654`](https://git.odit.services/lfk/backend/commit/d837654617f7de5d055ffb06c65e2cd52f65c604) | ||||
| - Added new responsetype for new class [`f693f2c`](https://git.odit.services/lfk/backend/commit/f693f2cde9a04147155aea4de5d52e1d19d722ca) | ||||
|  | ||||
| #### [v0.10.0](https://git.odit.services/lfk/backend/compare/v0.9.2...v0.10.0) | ||||
|  | ||||
| > 1 April 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.10.0' (#186) from dev into main [`b517dff`](https://git.odit.services/lfk/backend/commit/b517dff8a82c960836d9f0be90fd89f3ba2fae7d) | ||||
| - 🚀Bumped version to v0.10.0 [`dc3071f`](https://git.odit.services/lfk/backend/commit/dc3071f7d2be298f0bb02d86ec67ed1125cd3b49) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`5fb355f`](https://git.odit.services/lfk/backend/commit/5fb355f450f19e96d3671b1a46e94d564495942b) | ||||
| - Merge pull request 'Mail locales feature/184-mail_locales' (#185) from feature/184-mail_locales into dev [`33c13de`](https://git.odit.services/lfk/backend/commit/33c13de32c68a3d9e87e4fd9ad12a815ed8c9fde) | ||||
| - Added locale to mail related runner endpoints [`7af883f`](https://git.odit.services/lfk/backend/commit/7af883f27198206af542bcaff4686221d3788e87) | ||||
| - Added locale to mail related runner endpoints [`f543307`](https://git.odit.services/lfk/backend/commit/f5433076b01c743ed9af085fccadb8f1edc26419) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`5fb355f`](https://git.odit.services/lfk/backend/commit/5fb355f450f19e96d3671b1a46e94d564495942b) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`114c246`](https://git.odit.services/lfk/backend/commit/114c246aceba566cc0dd6daab51a77b951b031cc) | ||||
| - Merge pull request 'Mail locales feature/184-mail_locales' (#185) from feature/184-mail_locales into dev [`33c13de`](https://git.odit.services/lfk/backend/commit/33c13de32c68a3d9e87e4fd9ad12a815ed8c9fde) | ||||
| - Added locale to mail related user endpoints [`1be073a`](https://git.odit.services/lfk/backend/commit/1be073a4fa39f0332a46f567ee6af10a9137844c) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`6aafe4a`](https://git.odit.services/lfk/backend/commit/6aafe4a6ae7d253ab39220e551c52ae067cc481a) | ||||
|  | ||||
|   | ||||
| @@ -11,8 +11,12 @@ services: | ||||
|       DB_PORT: bla | ||||
|       DB_USER: bla | ||||
|       DB_PASSWORD: bla | ||||
|       DB_NAME: dev.sqlite | ||||
|       DB_NAME: ./db.sqlite | ||||
|       NODE_ENV: production | ||||
|       POSTALCODE_COUNTRYCODE: DE | ||||
|       SEED_TEST_DATA: "false" | ||||
|       MAILER_URL: https://dev.lauf-fuer-kaya.de/mailer | ||||
|       MAILER_KEY: asdasd | ||||
|       # APP_PORT: 4010 | ||||
|       # DB_TYPE: postgres | ||||
|       # DB_HOST: backend_db | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@odit/lfk-backend", | ||||
|   "version": "0.10.0", | ||||
|   "version": "0.10.1", | ||||
|   "main": "src/app.ts", | ||||
|   "repository": "https://git.odit.services/lfk/backend", | ||||
|   "author": { | ||||
|   | ||||
| @@ -87,7 +87,7 @@ export class AuthController { | ||||
| 	@ResponseSchema(UserNotFoundError, { statusCode: 404 }) | ||||
| 	@ResponseSchema(UsernameOrEmailNeededError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(MailSendingError, { statusCode: 500 }) | ||||
| 	@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}.", parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] }) | ||||
| 	@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}." }) | ||||
| 	async getResetToken(@Body({ validate: true }) passwordReset: CreateResetToken, @QueryParam("locale") locale: string = "en") { | ||||
| 		const reset_token: string = await passwordReset.toResetToken(); | ||||
| 		await Mailer.sendResetMail(passwordReset.email, reset_token, locale); | ||||
|   | ||||
| @@ -119,7 +119,7 @@ export class RunnerSelfServiceController { | ||||
| 	@Post('/runners/forgot') | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@OnUndefined(ResponseEmpty) | ||||
| 	@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice token/link to be sent to your mail address (rate limited to one mail every 24hrs).', parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] }) | ||||
| 	@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice token/link to be sent to your mail address (rate limited to one mail every 24hrs).' }) | ||||
| 	async requestNewToken(@QueryParam('mail') mail: string, @QueryParam("locale") locale: string = "en") { | ||||
| 		if (!mail) { | ||||
| 			throw new RunnerNotFoundError(); | ||||
| @@ -145,7 +145,7 @@ export class RunnerSelfServiceController { | ||||
| 	@Post('/runners/register') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@ResponseSchema(RunnerEmailNeededError, { statusCode: 406 }) | ||||
| 	@OpenAPI({ description: 'Create a new selfservice runner in the citizen org. <br> This endpoint shoud be used to allow "everyday citizen" to register themselves. <br> You have to provide a mail address, b/c the future we\'ll implement email verification.', parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] }) | ||||
| 	@OpenAPI({ description: 'Create a new selfservice runner in the citizen org. <br> This endpoint shoud be used to allow "everyday citizen" to register themselves. <br> You have to provide a mail address, b/c the future we\'ll implement email verification.' }) | ||||
| 	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner, @QueryParam("locale") locale: string = "en") { | ||||
| 		let runner = await createRunner.toEntity(); | ||||
|  | ||||
| @@ -165,7 +165,7 @@ export class RunnerSelfServiceController { | ||||
| 	@Post('/runners/register/:token') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@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 /organizations endpoint.', parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] }) | ||||
| 	@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 registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner, @QueryParam("locale") locale: string = "en") { | ||||
| 		const org = await this.getOrgansisation(token); | ||||
|  | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { Get, JsonController, UseBefore } from 'routing-controllers'; | ||||
| import { Get, JsonController, QueryParam, UseBefore } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnection } from 'typeorm'; | ||||
| import StatsAuth from '../middlewares/StatsAuth'; | ||||
| @@ -7,6 +7,7 @@ import { Runner } from '../models/entities/Runner'; | ||||
| import { RunnerOrganization } from '../models/entities/RunnerOrganization'; | ||||
| import { RunnerTeam } from '../models/entities/RunnerTeam'; | ||||
| import { Scan } from '../models/entities/Scan'; | ||||
| import { TrackScan } from '../models/entities/TrackScan'; | ||||
| import { User } from '../models/entities/User'; | ||||
| import { ResponseStats } from '../models/responses/ResponseStats'; | ||||
| import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganization'; | ||||
| @@ -36,7 +37,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten runners by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopRunnersByDistance() { | ||||
|         let runners = await getConnection().getRepository(Runner).find({ relations: ['scans', 'group', 'distanceDonations', 'scans.track'] }); | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner1.distance - runner2.distance).slice(0, 9); | ||||
|         if (!runners || runners.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner2.distance - runner1.distance).slice(0, 10); | ||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||
|         topRunners.forEach(runner => { | ||||
|             responseRunners.push(new ResponseStatsRunner(runner)); | ||||
| @@ -49,8 +53,11 @@ export class StatsController { | ||||
|     @ResponseSchema(ResponseStatsRunner, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten runners by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopRunnersByDonations() { | ||||
|         let runners = await getConnection().getRepository(Runner).find({ relations: ['scans', 'group', 'distanceDonations', 'scans.track'] }); | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner1.distanceDonationAmount - runner2.distanceDonationAmount).slice(0, 9); | ||||
|         let runners = await getConnection().getRepository(Runner).find({ relations: ['group', 'distanceDonations', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }); | ||||
|         if (!runners || runners.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner2.distanceDonationAmount - runner1.distanceDonationAmount).slice(0, 10); | ||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||
|         topRunners.forEach(runner => { | ||||
|             responseRunners.push(new ResponseStatsRunner(runner)); | ||||
| @@ -58,6 +65,34 @@ export class StatsController { | ||||
|         return responseRunners; | ||||
|     } | ||||
|  | ||||
|     @Get("/runners/laptime") | ||||
|     @UseBefore(StatsAuth) | ||||
|     @ResponseSchema(ResponseStatsRunner, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten runners by fastest laptime on your selected track (track by id).", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopRunnersByLaptime(@QueryParam("track") track: number) { | ||||
|         let scans = await getConnection().getRepository(TrackScan).find({ relations: ['track', 'runner', 'runner.group', 'runner.scans', 'runner.scans.track', 'runner.distanceDonations'] }); | ||||
|         if (!scans || scans.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         scans = scans.filter((s) => { return s.track.id == track && s.valid == true && s.lapTime != 0 }).sort((scan1, scan2) => scan1.lapTime - scan2.lapTime); | ||||
|  | ||||
|         let topScans = new Array<TrackScan>(); | ||||
|         let knownRunners = new Array<number>(); | ||||
|         for (let i = 0; i < scans.length && topScans.length < 10; i++) { | ||||
|             const element = scans[i]; | ||||
|             if (!knownRunners.includes(element.runner.id)) { | ||||
|                 topScans.push(element); | ||||
|                 knownRunners.push(element.runner.id); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||
|         topScans.forEach(scan => { | ||||
|             responseRunners.push(new ResponseStatsRunner(scan.runner, scan.lapTime)); | ||||
|         }); | ||||
|         return responseRunners; | ||||
|     } | ||||
|  | ||||
|     @Get("/scans") | ||||
|     @UseBefore(StatsAuth) | ||||
|     @ResponseSchema(ResponseStatsRunner, { isArray: true }) | ||||
| @@ -72,7 +107,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten teams by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopTeamsByDistance() { | ||||
|         let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] }); | ||||
|         let topTeams = teams.sort((team1, team2) => team1.distance - team2.distance).slice(0, 9); | ||||
|         if (!teams || teams.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topTeams = teams.sort((team1, team2) => team2.distance - team1.distance).slice(0, 10); | ||||
|         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); | ||||
|         topTeams.forEach(team => { | ||||
|             responseTeams.push(new ResponseStatsTeam(team)); | ||||
| @@ -86,7 +124,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten teams by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopTeamsByDonations() { | ||||
|         let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] }); | ||||
|         let topTeams = teams.sort((team1, team2) => team1.distanceDonationAmount - team2.distanceDonationAmount).slice(0, 9); | ||||
|         if (!teams || teams.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topTeams = teams.sort((team1, team2) => team2.distanceDonationAmount - team1.distanceDonationAmount).slice(0, 10); | ||||
|         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); | ||||
|         topTeams.forEach(team => { | ||||
|             responseTeams.push(new ResponseStatsTeam(team)); | ||||
| @@ -100,7 +141,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten organizations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopOrgsByDistance() { | ||||
|         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); | ||||
|         if (!orgs || orgs.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topOrgs = orgs.sort((org1, org2) => org2.distance - org1.distance).slice(0, 10); | ||||
|         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); | ||||
|         topOrgs.forEach(org => { | ||||
|             responseOrgs.push(new ResponseStatsOrgnisation(org)); | ||||
| @@ -114,7 +158,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten organizations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopOrgsByDonations() { | ||||
|         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); | ||||
|         if (!orgs || orgs.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topOrgs = orgs.sort((org1, org2) => org2.distanceDonationAmount - org1.distanceDonationAmount).slice(0, 10); | ||||
|         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); | ||||
|         topOrgs.forEach(org => { | ||||
|             responseOrgs.push(new ResponseStatsOrgnisation(org)); | ||||
|   | ||||
| @@ -35,4 +35,5 @@ export enum ResponseObjectType { | ||||
|     USER = 'USER', | ||||
|     USERGROUP = 'USERGROUP', | ||||
|     USERPERMISSIONS = 'USERPERMISSIONS', | ||||
|     SELFSERVICEDONOR = 'SELFSERVICEDONOR' | ||||
| } | ||||
| @@ -2,6 +2,7 @@ import { IsInt, IsNotEmpty, IsPositive } from 'class-validator'; | ||||
| import { DistanceDonation } from '../entities/DistanceDonation'; | ||||
| import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||
| import { IResponse } from './IResponse'; | ||||
| import { ResponseSelfServiceDonor } from './ResponseSelfServiceDonor'; | ||||
|  | ||||
| /** | ||||
|  * Defines the runner selfservice donation response. | ||||
| @@ -18,7 +19,7 @@ export class ResponseSelfServiceDonation implements IResponse { | ||||
|      * The donation's donor. | ||||
|      */ | ||||
|     @IsNotEmpty() | ||||
|     donor: string; | ||||
|     donor: ResponseSelfServiceDonor; | ||||
|  | ||||
|     /** | ||||
|      * The donation's amount in the smalles unit of your currency (default: euro cent). | ||||
| @@ -35,9 +36,7 @@ export class ResponseSelfServiceDonation implements IResponse { | ||||
|     amountPerDistance: number; | ||||
|  | ||||
|     public constructor(donation: DistanceDonation) { | ||||
|         if (!donation.donor.middlename) { this.donor = donation.donor.firstname + " " + donation.donor.lastname; } | ||||
|         else { this.donor = donation.donor.firstname + " " + donation.donor.middlename + " " + donation.donor.lastname; } | ||||
|  | ||||
|         this.donor = new ResponseSelfServiceDonor(donation.donor); | ||||
|         this.amountPerDistance = donation.amountPerDistance; | ||||
|         this.amount = donation.amount; | ||||
|     } | ||||
|   | ||||
							
								
								
									
										51
									
								
								src/models/responses/ResponseSelfServiceDonor.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								src/models/responses/ResponseSelfServiceDonor.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,51 @@ | ||||
| import { IsInt, IsString } from "class-validator"; | ||||
| import { Donor } from '../entities/Donor'; | ||||
| import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||
| import { IResponse } from './IResponse'; | ||||
|  | ||||
| /** | ||||
|  * Defines the donor selfservice response. | ||||
|  * Why? B/C runner's are not allowed to view all information available to admin users. | ||||
| */ | ||||
| export class ResponseSelfServiceDonor implements IResponse { | ||||
|     /** | ||||
|     * The responseType. | ||||
|     * This contains the type of class/entity this response contains. | ||||
|     */ | ||||
|     responseType: ResponseObjectType = ResponseObjectType.SELFSERVICEDONOR; | ||||
|  | ||||
|     /** | ||||
|      * The participant's id. | ||||
|      */ | ||||
|     @IsInt() | ||||
|     id: number; | ||||
|  | ||||
|     /** | ||||
|      * The participant's first name. | ||||
|      */ | ||||
|     @IsString() | ||||
|     firstname: string; | ||||
|  | ||||
|     /** | ||||
|      * The participant's middle name. | ||||
|      */ | ||||
|     @IsString() | ||||
|     middlename?: string; | ||||
|  | ||||
|     /** | ||||
|      * The participant's last name. | ||||
|      */ | ||||
|     @IsString() | ||||
|     lastname: string; | ||||
|  | ||||
|     /** | ||||
|      * Creates a ResponseSelfServiceDonor object from a runner. | ||||
|      * @param donor The donor the response shall be build for. | ||||
|      */ | ||||
|     public constructor(donor: Donor) { | ||||
|         this.id = donor.id; | ||||
|         this.firstname = donor.firstname; | ||||
|         this.middlename = donor.middlename; | ||||
|         this.lastname = donor.lastname; | ||||
|     } | ||||
| } | ||||
| @@ -38,10 +38,10 @@ export class ResponseSelfServiceRunner extends ResponseParticipant implements IR | ||||
|     group: string; | ||||
|  | ||||
|     /** | ||||
|      * The runner's associated donations. | ||||
|      * The runner's associated distance donations. | ||||
|      */ | ||||
|     @IsString() | ||||
|     donations: ResponseSelfServiceDonation[] | ||||
|     distanceDonations: ResponseSelfServiceDonation[] | ||||
|  | ||||
|     /** | ||||
|      * The runner's self-service jwt for auth. | ||||
| @@ -60,7 +60,7 @@ export class ResponseSelfServiceRunner extends ResponseParticipant implements IR | ||||
|         this.distance = runner.distance; | ||||
|         this.donationAmount = runner.distanceDonationAmount; | ||||
|         this.group = this.getTeamString(runner.group); | ||||
|         this.donations = this.getDonations(runner.distanceDonations); | ||||
|         this.distanceDonations = this.getDonations(runner.distanceDonations); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| import { | ||||
|     IsInt, | ||||
|     IsObject, | ||||
|     IsOptional, | ||||
|     IsString | ||||
| } from "class-validator"; | ||||
| import { Runner } from '../entities/Runner'; | ||||
| @@ -55,6 +56,13 @@ export class ResponseStatsRunner implements IResponse { | ||||
|     @IsInt() | ||||
|     donationAmount: number; | ||||
|  | ||||
|     /** | ||||
|      * The runner's fastest laptime in seconds. | ||||
|      */ | ||||
|     @IsInt() | ||||
|     @IsOptional() | ||||
|     minLaptime?: number; | ||||
|  | ||||
|     /** | ||||
|      * The runner's group. | ||||
|      */ | ||||
| @@ -65,13 +73,28 @@ export class ResponseStatsRunner implements IResponse { | ||||
|      * Creates a new runner stats response from a runner | ||||
|      * @param runner The runner whoes response shall be generated - the following relations have to be resolved: scans, group, distanceDonations, scans.track | ||||
|      */ | ||||
|     public constructor(runner: Runner) { | ||||
|     public constructor(runner: Runner, laptime?: number) { | ||||
|         this.id = runner.id; | ||||
|         this.firstname = runner.firstname; | ||||
|         if (runner.firstname) { | ||||
|             this.middlename = runner.middlename; | ||||
|         } | ||||
|         this.lastname = runner.lastname; | ||||
|         try { | ||||
|             this.distance = runner.distance; | ||||
|         } | ||||
|         catch { | ||||
|             this.distance = -1; | ||||
|         } | ||||
|         try { | ||||
|             this.donationAmount = runner.distanceDonationAmount; | ||||
|         } | ||||
|         catch { | ||||
|             this.donationAmount = -1; | ||||
|         } | ||||
|         if (laptime) { | ||||
|             this.minLaptime = laptime; | ||||
|         } | ||||
|         this.group = runner.group.toResponse(); | ||||
|     } | ||||
| } | ||||
|   | ||||
							
								
								
									
										97
									
								
								src/tests/stats/stats_get.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										97
									
								
								src/tests/stats/stats_get.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,97 @@ | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let axios_config_full; | ||||
| let axios_config_stats; | ||||
|  | ||||
| beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     let access_token = res.data["access_token"]; | ||||
|     axios_config_full = { | ||||
|         headers: { "authorization": "Bearer " + access_token }, | ||||
|         validateStatus: undefined | ||||
|     }; | ||||
|     const res2 = await axios.post(base + '/api/statsclients', { username: "demo", password: "demo" }, axios_config_full); | ||||
|     access_token = res2.data["key"]; | ||||
|     axios_config_stats = { | ||||
|         headers: { "authorization": "Bearer " + access_token }, | ||||
|         validateStatus: undefined | ||||
|     }; | ||||
| }); | ||||
|  | ||||
| describe('GET /api/stats/runners/distance w/o auth should return 200', () => { | ||||
|     it('get with invalid token should return 401', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/distance', { | ||||
|             headers: { "authorization": "Bearer 123123123123123123" }, | ||||
|             validateStatus: undefined | ||||
|         }); | ||||
|         expect(res.status).toEqual(401); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats should return 200', () => { | ||||
|     it('get w/o auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats', { validateStatus: undefined }); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats/runners/* should return 200', () => { | ||||
|     it('get by distance w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/distance', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by donations w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/donations', axios_config_stats); | ||||
|         console.log("################# Runners by donations #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by laptime w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/laptime', axios_config_stats); | ||||
|         console.log("################# Runners by laptime #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats/teams/* should return 200', () => { | ||||
|     it('get by distance w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/teams/distance', axios_config_stats); | ||||
|         console.log("################# Teams by distance #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by donations w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/teams/donations', axios_config_stats); | ||||
|         console.log("################# Teams by donations #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats/organizations/* should return 200', () => { | ||||
|     it('get by distance w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/organizations/distance', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by donations w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/organizations/donations', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
		Reference in New Issue
	
	Block a user