Compare commits
	
		
			6 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0ad9eeb52f | |||
| 4494afc64b | |||
| f4747c51de | |||
| 07a0195f12 | |||
| 7ac98229d1 | |||
| dd5b538783 | 
							
								
								
									
										21
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,11 +2,32 @@ | ||||
|  | ||||
| All notable changes to this project will be documented in this file. Dates are displayed in UTC. | ||||
|  | ||||
| #### [1.4.3](https://git.odit.services/lfk/backend/compare/1.4.2...1.4.3) | ||||
|  | ||||
| - feat(runners): Include collected distance donation amount in runner detail [`4494afc`](https://git.odit.services/lfk/backend/commit/4494afc64b433d26b54a293fe156d13c40faad95) | ||||
|  | ||||
| #### [1.4.2](https://git.odit.services/lfk/backend/compare/1.4.1...1.4.2) | ||||
|  | ||||
| > 1 May 2025 | ||||
|  | ||||
| - fix(donations): Fixed creation bug [`07a0195`](https://git.odit.services/lfk/backend/commit/07a0195f125519f239d255a0cc081ddbde8f1da3) | ||||
| - chore(release): 1.4.2 [`f4747c5`](https://git.odit.services/lfk/backend/commit/f4747c51de71d9b28cca1b00a91de3cfd6f0f56e) | ||||
|  | ||||
| #### [1.4.1](https://git.odit.services/lfk/backend/compare/1.4.0...1.4.1) | ||||
|  | ||||
| > 28 April 2025 | ||||
|  | ||||
| - chore(release): 1.4.1 [`7ac9822`](https://git.odit.services/lfk/backend/commit/7ac98229d17e7cb019d5dcc5402870490a97f910) | ||||
| - refactor(auth): Increased token timeouts to 24hrs/7days [`dd5b538`](https://git.odit.services/lfk/backend/commit/dd5b538783f9c806f0c883cd391754fb5c842ec8) | ||||
|  | ||||
| #### [1.4.0](https://git.odit.services/lfk/backend/compare/1.3.12...1.4.0) | ||||
|  | ||||
| > 28 April 2025 | ||||
|  | ||||
| - feat(donations): Implement response type to indicate possible missing donor [`f4bf309`](https://git.odit.services/lfk/backend/commit/f4bf309821c140f2bc0ae8b6d96c7458fcc80978) | ||||
| - wip [`9875b4f`](https://git.odit.services/lfk/backend/commit/9875b4f3926e04b502e7af64c17f54fd3c1d8e3e) | ||||
| - refactor(donations): Make anon prepaid [`02b1cb9`](https://git.odit.services/lfk/backend/commit/02b1cb9904cc593faeac025ae302a8684f650f5e) | ||||
| - chore(release): 1.4.0 [`8e6d674`](https://git.odit.services/lfk/backend/commit/8e6d67428c85b6ee504a379ff13a3a951f7b9543) | ||||
| - fix(donations): Move donor over to the types that need it [`7697acf`](https://git.odit.services/lfk/backend/commit/7697acff82b23d0c05dbbd17fee6e70eb1b7061c) | ||||
|  | ||||
| #### [1.3.12](https://git.odit.services/lfk/backend/compare/1.3.11...1.3.12) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@odit/lfk-backend", | ||||
|   "version": "1.4.0", | ||||
|   "version": "1.4.3", | ||||
|   "main": "src/app.ts", | ||||
|   "repository": "https://git.odit.services/lfk/backend", | ||||
|   "author": { | ||||
|   | ||||
| @@ -60,7 +60,7 @@ export class RunnerController { | ||||
| 	@OnUndefined(RunnerNotFoundError) | ||||
| 	@OpenAPI({ description: 'Lists all information about the runner whose id got provided.' }) | ||||
| 	async getOne(@Param('id') id: number) { | ||||
| 		let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }) | ||||
| 		let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations'] }) | ||||
| 		if (!runner) { throw new RunnerNotFoundError(); } | ||||
| 		return new ResponseRunner(runner, true); | ||||
| 	} | ||||
|   | ||||
| @@ -61,11 +61,11 @@ export class CreateAuth { | ||||
|         } | ||||
|  | ||||
|         //Create the access token | ||||
|         const timestamp_accesstoken_expiry = Math.floor(Date.now() / 1000) + 5 * 60 | ||||
|         const timestamp_accesstoken_expiry = Math.floor(Date.now() / 1000) + 24 * 60 * 60 | ||||
|         newAuth.access_token = JwtCreator.createAccess(found_user, timestamp_accesstoken_expiry); | ||||
|         newAuth.access_token_expires_at = timestamp_accesstoken_expiry | ||||
|         //Create the refresh token | ||||
|         const timestamp_refresh_expiry = Math.floor(Date.now() / 1000) + 10 * 36000 | ||||
|         const timestamp_refresh_expiry = Math.floor(Date.now() / 1000) + 7 * 24 * 60 * 60 | ||||
|         newAuth.refresh_token = JwtCreator.createRefresh(found_user, timestamp_refresh_expiry); | ||||
|         newAuth.refresh_token_expires_at = timestamp_refresh_expiry | ||||
|         return newAuth; | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { IsInt, IsPositive } from 'class-validator'; | ||||
| import { IsInt, IsOptional, IsPositive } from 'class-validator'; | ||||
| import { getConnection } from 'typeorm'; | ||||
| import { RunnerNotFoundError } from '../../../errors/RunnerErrors'; | ||||
| import { DistanceDonation } from '../../entities/DistanceDonation'; | ||||
| @@ -22,6 +22,7 @@ export class CreateDistanceDonation extends CreateDonation { | ||||
|      * The donation's paid amount in the smalles unit of your currency (default: euro cent). | ||||
|      */ | ||||
|     @IsInt() | ||||
|     @IsOptional() | ||||
|     paidAmount?: number; | ||||
|  | ||||
|     /** | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { Exclude } from 'class-transformer'; | ||||
| import { IsInt, IsOptional } from 'class-validator'; | ||||
| import { getConnection } from 'typeorm'; | ||||
| import { Donation } from '../../entities/Donation'; | ||||
| import { Donor } from '../../entities/Donor'; | ||||
| @@ -7,10 +7,12 @@ import { Donor } from '../../entities/Donor'; | ||||
|  * This class is used to create a new Donation entity from a json body (post request). | ||||
|  */ | ||||
| export abstract class CreateDonation { | ||||
|     @Exclude() | ||||
|     @IsInt() | ||||
|     @IsOptional() | ||||
|     donor: number; | ||||
|  | ||||
|     @Exclude() | ||||
|     @IsInt() | ||||
|     @IsOptional() | ||||
|     paidAmount?: number; | ||||
|  | ||||
|     /** | ||||
|   | ||||
| @@ -27,6 +27,13 @@ export class ResponseRunner extends ResponseParticipant implements IResponse { | ||||
|     @IsInt() | ||||
|     distance: number; | ||||
|  | ||||
|     /** | ||||
|      * The runner's current donation amount based on distance. | ||||
|      * Only available for queries for single runners. | ||||
|      */ | ||||
|     @IsInt() | ||||
|     donationAmount: number; | ||||
|  | ||||
|     /** | ||||
|      * The runner's group. | ||||
|      */ | ||||
| @@ -50,6 +57,10 @@ export class ResponseRunner extends ResponseParticipant implements IResponse { | ||||
|         else { this.distance = runner.validScans.reduce((sum, current) => sum + current.distance, 0); } | ||||
|         if (runner.group) { this.group = runner.group.toResponse(); } | ||||
|  | ||||
|         if (runner.distanceDonations) { | ||||
|             this.donationAmount = runner.distanceDonations.reduce((sum, current) => sum + (current.amountPerDistance * runner.distance / 1000), 0); | ||||
|         } | ||||
|  | ||||
|         if (generateSelfServiceLink) { | ||||
|             const token = JwtCreator.createSelfService(runner); | ||||
|             this.selfserviceLink = `${process.env.SELFSERVICE_URL}/profile/${token}`; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user