Compare commits
	
		
			28 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| cb1305aa77 | |||
| 12a9ae2493 | |||
| b9fe9f1c24 | |||
| b25b0db760 | |||
| fe59e3a557 | |||
| 42c23a5883 | |||
| 6ee5328dbc | |||
| 6f39ac42da | |||
| 301f334674 | |||
| fcee3909f4 | |||
| f0e20e4130 | |||
| 80de188565 | |||
| 2f305e127c | |||
| 513d7f6fba | |||
| 244da61892 | |||
| 2a72aea10e | |||
| 71ebce6f8e | |||
| f60025b6de | |||
| 0fa663a341 | |||
| 538622aa18 | |||
| 86a21dbfa4 | |||
| 1e9e24d99d | |||
| 4493c0e3d9 | |||
| f5d48fc638 | |||
| b35a2dd2fa | |||
| a28ffe06e5 | |||
| d873674819 | |||
| 37b2ac974b | 
							
								
								
									
										48
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,9 +2,57 @@ | ||||
|  | ||||
| All notable changes to this project will be documented in this file. Dates are displayed in UTC. | ||||
|  | ||||
| #### [v1.1.1](https://git.odit.services/lfk/backend/compare/v1.1.0...v1.1.1) | ||||
|  | ||||
| - feat(donors): Resolve donations with donors via pagination [`12a9ae2`](https://git.odit.services/lfk/backend/commit/12a9ae24933117acb3ff9815a7d72abca5eea7a7) | ||||
|  | ||||
| #### [v1.1.0](https://git.odit.services/lfk/backend/compare/v1.0.1...v1.1.0) | ||||
|  | ||||
| > 19 April 2023 | ||||
|  | ||||
| - feat(stats): Added donation count and donor count to stats [`6f39ac4`](https://git.odit.services/lfk/backend/commit/6f39ac42dafc2a589bbb2256b0417f3e774ae174) | ||||
| - 🚀Bumped version to v1.1.0 [`b9fe9f1`](https://git.odit.services/lfk/backend/commit/b9fe9f1c24653b91255a6dbbdc32c30b1b411eeb) | ||||
| - Added average donation per distance to stats [`fe59e3a`](https://git.odit.services/lfk/backend/commit/fe59e3a557903cf555d4c50098e935c49ca1fac4) | ||||
| - Added hints [`b25b0db`](https://git.odit.services/lfk/backend/commit/b25b0db76071ef8d50cc60e950a399dc060a2a9f) | ||||
| - Added calls to controller [`6ee5328`](https://git.odit.services/lfk/backend/commit/6ee5328dbc404603d19db3a5173ae4def560a9c9) | ||||
| - Formatting [`42c23a5`](https://git.odit.services/lfk/backend/commit/42c23a5883dacda4e0147842d448b3ad35b197b1) | ||||
|  | ||||
| #### [v1.0.1](https://git.odit.services/lfk/backend/compare/v1.0.0...v1.0.1) | ||||
|  | ||||
| > 18 April 2023 | ||||
|  | ||||
| - fix(pagination) page=0 resulted in false thx JS [`fcee390`](https://git.odit.services/lfk/backend/commit/fcee3909f4c4664115cc7ecb94f30e0dd8e78ce0) | ||||
| - 🚀Bumped version to v1.0.1 [`301f334`](https://git.odit.services/lfk/backend/commit/301f33467489a8533bdac11fbd10efd1b791f5e3) | ||||
|  | ||||
| ### [v1.0.0](https://git.odit.services/lfk/backend/compare/v0.15.4...v1.0.0) | ||||
|  | ||||
| > 18 April 2023 | ||||
|  | ||||
| - 🚀Bumped version to v1.0.0 [`f0e20e4`](https://git.odit.services/lfk/backend/commit/f0e20e413014fe446c97754d2765cdad92c2cc3b) | ||||
| - Merge pull request 'feature/205-pagination' (#206) from feature/205-pagination into dev [`80de188`](https://git.odit.services/lfk/backend/commit/80de188565523d642407612272432ef07672b890) | ||||
| - Added pagination for runner orgs [`538622a`](https://git.odit.services/lfk/backend/commit/538622aa1841e27256f304e15b4204c2f6d24d76) | ||||
| - RunnerTeam Pagination [`0fa663a`](https://git.odit.services/lfk/backend/commit/0fa663a34104d438dd8fc9ab02458fdf289329f8) | ||||
| - users pagination [`244da61`](https://git.odit.services/lfk/backend/commit/244da618926377f58bb12dbbd89b7bb39d84596e) | ||||
| - Track pagination [`2a72aea`](https://git.odit.services/lfk/backend/commit/2a72aea10ef940fbdd4a9e6137b22933fdec7734) | ||||
| - usergroup pagination [`513d7f6`](https://git.odit.services/lfk/backend/commit/513d7f6fbaebe39beab6ec95e6e42eb10c62296d) | ||||
| - statsclient pagination [`71ebce6`](https://git.odit.services/lfk/backend/commit/71ebce6f8eebf110bb973a53b91dd6a49e1def99) | ||||
| - scanstation pagination [`f60025b`](https://git.odit.services/lfk/backend/commit/f60025b6de79b0f5f89995bf59260194f5de9af0) | ||||
| - Get all pagination for permissions [`86a21db`](https://git.odit.services/lfk/backend/commit/86a21dbfa4b50d8e80c611ea6e3eabfc2b8ae365) | ||||
| - Pagination for group contacts [`1e9e24d`](https://git.odit.services/lfk/backend/commit/1e9e24d99d75ce6dc846ff662e62c886646ea974) | ||||
| - Added pagination for get all donors [`4493c0e`](https://git.odit.services/lfk/backend/commit/4493c0e3d9beebbf7f601b39e1a2579771b4d152) | ||||
| - Added pagination for donations [`f5d48fc`](https://git.odit.services/lfk/backend/commit/f5d48fc638080c9333efe474d86f131794c809af) | ||||
| - Added pagination for runnercards [`b35a2dd`](https://git.odit.services/lfk/backend/commit/b35a2dd2fab708253373b3326f11ab574be18371) | ||||
| - Added pagination for runners [`d873674`](https://git.odit.services/lfk/backend/commit/d873674819e6cb33cf89da4f8fdc30a0b41707e4) | ||||
| - Added pagination for get all scans [`37b2ac9`](https://git.odit.services/lfk/backend/commit/37b2ac974b2276efd13538c127ba5ddda2537fe3) | ||||
| - Updated test for attribute [`2f305e1`](https://git.odit.services/lfk/backend/commit/2f305e127c75e9e6ff8e9fc0cfc10cc3db44759d) | ||||
| - Formatting [`a28ffe0`](https://git.odit.services/lfk/backend/commit/a28ffe06e5f3f69e4af6fdf0c66c9a1dfda10cfa) | ||||
|  | ||||
| #### [v0.15.4](https://git.odit.services/lfk/backend/compare/v0.15.3...v0.15.4) | ||||
|  | ||||
| > 15 April 2023 | ||||
|  | ||||
| - Fixed possible null [`0f0c3c7`](https://git.odit.services/lfk/backend/commit/0f0c3c7214f357d991518aafd015ffc4d387ce59) | ||||
| - 🚀Bumped version to v0.15.4 [`81aed1d`](https://git.odit.services/lfk/backend/commit/81aed1de40166f4cefabdb478d7638017127b25c) | ||||
|  | ||||
| #### [v0.15.3](https://git.odit.services/lfk/backend/compare/v0.15.2...v0.15.3) | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@odit/lfk-backend", | ||||
|   "version": "0.15.4", | ||||
|   "version": "1.1.1", | ||||
|   "main": "src/app.ts", | ||||
|   "repository": "https://git.odit.services/lfk/backend", | ||||
|   "engines": { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { DonationIdsNotMatchingError, DonationNotFoundError } from '../errors/DonationErrors'; | ||||
| import { DonorNotFoundError } from '../errors/DonorErrors'; | ||||
| import { RunnerNotFoundError } from '../errors/RunnerErrors'; | ||||
| @@ -36,9 +36,16 @@ export class DonationController { | ||||
| 	@ResponseSchema(ResponseDonation, { isArray: true }) | ||||
| 	@ResponseSchema(ResponseDistanceDonation, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all donations (fixed or distance based) from all donors. <br> This includes the donations\'s runner\'s distance ran(if distance donation).' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseDonations: ResponseDonation[] = new Array<ResponseDonation>(); | ||||
| 		const donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] }); | ||||
| 		let donations: Array<Donation>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] }); | ||||
| 		} | ||||
|  | ||||
| 		donations.forEach(donation => { | ||||
| 			responseDonations.push(donation.toResponse()); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { DonorHasDonationsError, DonorIdsNotMatchingError, DonorNotFoundError } from '../errors/DonorErrors'; | ||||
| import { CreateDonor } from '../models/actions/create/CreateDonor'; | ||||
| import { UpdateDonor } from '../models/actions/update/UpdateDonor'; | ||||
| @@ -25,9 +25,16 @@ export class DonorController { | ||||
| 	@Authorized("DONOR:GET") | ||||
| 	@ResponseSchema(ResponseDonor, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all donor. <br> This includes the donor\'s current donation amount.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseDonors: ResponseDonor[] = new Array<ResponseDonor>(); | ||||
| 		const donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'] }); | ||||
| 		let donors: Array<Donor>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'] }); | ||||
| 		} | ||||
|  | ||||
| 		donors.forEach(donor => { | ||||
| 			responseDonors.push(new ResponseDonor(donor)); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnection, getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnection, getConnectionManager } from 'typeorm'; | ||||
| import { GroupContactIdsNotMatchingError, GroupContactNotFoundError } from '../errors/GroupContactErrors'; | ||||
| import { RunnerGroupNotFoundError } from '../errors/RunnerGroupErrors'; | ||||
| import { CreateGroupContact } from '../models/actions/create/CreateGroupContact'; | ||||
| @@ -26,9 +26,16 @@ export class GroupContactController { | ||||
| 	@Authorized("CONTACT:GET") | ||||
| 	@ResponseSchema(ResponseGroupContact, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all contacts. <br> This includes the contact\'s associated groups.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>(); | ||||
| 		const contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] }); | ||||
| 		let contacts: Array<GroupContact>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] }); | ||||
| 		} | ||||
|  | ||||
| 		contacts.forEach(contact => { | ||||
| 			responseContacts.push(contact.toResponse()); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { PermissionIdsNotMatchingError, PermissionNeedsPrincipalError, PermissionNotFoundError } from '../errors/PermissionErrors'; | ||||
| import { PrincipalNotFoundError } from '../errors/PrincipalErrors'; | ||||
| import { CreatePermission } from '../models/actions/create/CreatePermission'; | ||||
| @@ -27,9 +27,16 @@ export class PermissionController { | ||||
|     @Authorized("PERMISSION:GET") | ||||
|     @ResponseSchema(ResponsePermission, { isArray: true }) | ||||
|     @OpenAPI({ description: 'Lists all permissions for all users and groups.' }) | ||||
|     async getAll() { | ||||
|     async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
|         let responsePermissions: ResponsePermission[] = new Array<ResponsePermission>(); | ||||
|         const permissions = await this.permissionRepository.find({ relations: ['principal'] }); | ||||
|         let permissions: Array<Permission>; | ||||
|  | ||||
|         if (page != undefined) { | ||||
|             permissions = await this.permissionRepository.find({ relations: ['principal'], skip: page * page_size, take: page_size }); | ||||
|         } else { | ||||
|             permissions = await this.permissionRepository.find({ relations: ['principal'] }); | ||||
|         } | ||||
|  | ||||
|         permissions.forEach(permission => { | ||||
|             responsePermissions.push(new ResponsePermission(permission)); | ||||
|         }); | ||||
|   | ||||
| @@ -26,9 +26,16 @@ export class RunnerCardController { | ||||
| 	@Authorized("CARD:GET") | ||||
| 	@ResponseSchema(ResponseRunnerCard, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all card.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); | ||||
| 		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||
| 		let cards: Array<RunnerCard>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||
| 		} | ||||
|  | ||||
| 		cards.forEach(card => { | ||||
| 			responseCards.push(new ResponseRunnerCard(card)); | ||||
| 		}); | ||||
|   | ||||
| @@ -30,9 +30,16 @@ export class RunnerController { | ||||
| 	@Authorized("RUNNER:GET") | ||||
| 	@ResponseSchema(ResponseRunner, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all runners from all teams/orgs. <br> This includes the runner\'s group and distance ran.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>(); | ||||
| 		const runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'] }); | ||||
| 		let runners: Array<Runner>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'] }); | ||||
| 		} | ||||
|  | ||||
| 		runners.forEach(runner => { | ||||
| 			responseRunners.push(new ResponseRunner(runner)); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, BadRequestError, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { RunnerOrganizationHasRunnersError, RunnerOrganizationHasTeamsError, RunnerOrganizationIdsNotMatchingError, RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors'; | ||||
| import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization'; | ||||
| import { UpdateRunnerOrganization } from '../models/actions/update/UpdateRunnerOrganization'; | ||||
| @@ -29,13 +29,20 @@ export class RunnerOrganizationController { | ||||
| 	@Authorized("ORGANIZATION:GET") | ||||
| 	@ResponseSchema(ResponseRunnerOrganization, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all organizations. <br> This includes their address, contact and teams (if existing/associated).' }) | ||||
| 	async getAll() { | ||||
| 		let responseTeams: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>(); | ||||
| 		const runners = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] }); | ||||
| 		runners.forEach(runner => { | ||||
| 			responseTeams.push(new ResponseRunnerOrganization(runner)); | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseOrgs: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>(); | ||||
| 		let orgs: Array<RunnerOrganization>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] }); | ||||
| 		} | ||||
|  | ||||
| 		orgs.forEach(org => { | ||||
| 			responseOrgs.push(new ResponseRunnerOrganization(org)); | ||||
| 		}); | ||||
| 		return responseTeams; | ||||
| 		return responseOrgs; | ||||
| 	} | ||||
|  | ||||
| 	@Get('/:id') | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { RunnerTeamHasRunnersError, RunnerTeamIdsNotMatchingError, RunnerTeamNotFoundError } from '../errors/RunnerTeamErrors'; | ||||
| import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam'; | ||||
| import { UpdateRunnerTeam } from '../models/actions/update/UpdateRunnerTeam'; | ||||
| @@ -27,11 +27,18 @@ export class RunnerTeamController { | ||||
| 	@Authorized("TEAM:GET") | ||||
| 	@ResponseSchema(ResponseRunnerTeam, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organization and contact (if existing/associated).' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>(); | ||||
| 		const runners = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] }); | ||||
| 		runners.forEach(runner => { | ||||
| 			responseTeams.push(new ResponseRunnerTeam(runner)); | ||||
| 		let teams: Array<RunnerTeam>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] }); | ||||
| 		} | ||||
|  | ||||
| 		teams.forEach(team => { | ||||
| 			responseTeams.push(new ResponseRunnerTeam(team)); | ||||
| 		}); | ||||
| 		return responseTeams; | ||||
| 	} | ||||
|   | ||||
| @@ -34,9 +34,16 @@ export class ScanController { | ||||
| 	@ResponseSchema(ResponseScan, { isArray: true }) | ||||
| 	@ResponseSchema(ResponseTrackScan, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all scans (normal or track) from all runners. <br> This includes the scan\'s runner\'s distance ran.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseScans: ResponseScan[] = new Array<ResponseScan>(); | ||||
| 		const scans = await this.scanRepository.find({ relations: ['runner', 'track'] }); | ||||
| 		let scans: Array<Scan>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			scans = await this.scanRepository.find({ relations: ['runner', 'track'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			scans = await this.scanRepository.find({ relations: ['runner', 'track'] }); | ||||
| 		} | ||||
|  | ||||
| 		scans.forEach(scan => { | ||||
| 			responseScans.push(scan.toResponse()); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { ScanStationHasScansError, ScanStationIdsNotMatchingError, ScanStationNotFoundError } from '../errors/ScanStationErrors'; | ||||
| import { TrackNotFoundError } from '../errors/TrackErrors'; | ||||
| import { CreateScanStation } from '../models/actions/create/CreateScanStation'; | ||||
| @@ -26,9 +26,16 @@ export class ScanStationController { | ||||
| 	@Authorized("STATION:GET") | ||||
| 	@ResponseSchema(ResponseScanStation, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all stations. <br> This includes their associated tracks.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseStations: ResponseScanStation[] = new Array<ResponseScanStation>(); | ||||
| 		const stations = await this.stationRepository.find({ relations: ['track'] }); | ||||
| 		let stations: Array<ScanStation>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			stations = await this.stationRepository.find({ relations: ['track'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			stations = await this.stationRepository.find({ relations: ['track'] }); | ||||
| 		} | ||||
|  | ||||
| 		stations.forEach(station => { | ||||
| 			responseStations.push(station.toResponse()); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { StatsClientNotFoundError } from '../errors/StatsClientErrors'; | ||||
| import { TrackNotFoundError } from "../errors/TrackErrors"; | ||||
| import { CreateStatsClient } from '../models/actions/create/CreateStatsClient'; | ||||
| @@ -24,9 +24,16 @@ export class StatsClientController { | ||||
| 	@Authorized("STATSCLIENT:GET") | ||||
| 	@ResponseSchema(ResponseStatsClient, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all stats clients. Please remember that the key can only be viewed on creation.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseClients: ResponseStatsClient[] = new Array<ResponseStatsClient>(); | ||||
| 		const clients = await this.clientRepository.find(); | ||||
| 		let clients: Array<StatsClient>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			clients = await this.clientRepository.find({ skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			clients = await this.clientRepository.find(); | ||||
| 		} | ||||
|  | ||||
| 		clients.forEach(clients => { | ||||
| 			responseClients.push(new ResponseStatsClient(clients)); | ||||
| 		}); | ||||
|   | ||||
| @@ -3,6 +3,7 @@ import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnection } from 'typeorm'; | ||||
| import StatsAuth from '../middlewares/StatsAuth'; | ||||
| import { Donation } from '../models/entities/Donation'; | ||||
| import { Donor } from '../models/entities/Donor'; | ||||
| import { Runner } from '../models/entities/Runner'; | ||||
| import { RunnerOrganization } from '../models/entities/RunnerOrganization'; | ||||
| import { RunnerTeam } from '../models/entities/RunnerTeam'; | ||||
| @@ -27,6 +28,7 @@ export class StatsController { | ||||
|         const orgs = await connection.getRepository(RunnerOrganization).count(); | ||||
|         const users = await connection.getRepository(User).count(); | ||||
|         const scans = await connection.getRepository(Scan).count({ where: { valid: true } }); | ||||
|  | ||||
|         const distance_query = await connection.getRepository(Scan).createQueryBuilder('scan') | ||||
|             .leftJoinAndSelect("scan.track", "track").where("scan.valid = TRUE") | ||||
|             .select("SUM(track.distance)", "sum_track").addSelect("SUM(_distance)", "sum_distance") | ||||
| @@ -35,8 +37,11 @@ export class StatsController { | ||||
|         if (distance_query.sum_distance) { | ||||
|             distace += parseInt(distance_query.sum_distance) | ||||
|         } | ||||
|  | ||||
|         let donations = await connection.getRepository(Donation).find({ relations: ['runner', 'runner.scans', 'runner.scans.track'] }); | ||||
|         return new ResponseStats(runners, teams, orgs, users, scans, donations, distace) | ||||
|         const donors = await connection.getRepository(Donor).count(); | ||||
|  | ||||
|         return new ResponseStats(runners, teams, orgs, users, scans, donations, distace, donors) | ||||
|     } | ||||
|  | ||||
|     @Get("/runners/distance") | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { TrackHasScanStationsError, TrackIdsNotMatchingError, TrackLapTimeCantBeNegativeError, TrackNotFoundError } from "../errors/TrackErrors"; | ||||
| import { CreateTrack } from '../models/actions/create/CreateTrack'; | ||||
| import { UpdateTrack } from '../models/actions/update/UpdateTrack'; | ||||
| @@ -25,9 +25,17 @@ export class TrackController { | ||||
| 	@Authorized("TRACK:GET") | ||||
| 	@ResponseSchema(ResponseTrack, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all tracks.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseTracks: ResponseTrack[] = new Array<ResponseTrack>(); | ||||
| 		const tracks = await this.trackRepository.find(); | ||||
| 		let tracks: Array<Track>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			tracks = await this.trackRepository.find({ skip: page * page_size, take: page_size }); | ||||
| 		} | ||||
| 		else { | ||||
| 			tracks = await this.trackRepository.find(); | ||||
| 		} | ||||
|  | ||||
| 		tracks.forEach(track => { | ||||
| 			responseTracks.push(new ResponseTrack(track)); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UserNotFoundError, UsernameContainsIllegalCharacterError } from '../errors/UserErrors'; | ||||
| import { UserGroupNotFoundError } from '../errors/UserGroupErrors'; | ||||
| import { CreateUser } from '../models/actions/create/CreateUser'; | ||||
| import { UpdateUser } from '../models/actions/update/UpdateUser'; | ||||
| @@ -28,9 +28,17 @@ export class UserController { | ||||
| 	@Authorized("USER:GET") | ||||
| 	@ResponseSchema(ResponseUser, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all users. <br> This includes their groups and permissions granted to them.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseUsers: ResponseUser[] = new Array<ResponseUser>(); | ||||
| 		const users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'] }); | ||||
| 		let users: Array<User>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'], skip: page * page_size, take: page_size }); | ||||
| 		} | ||||
| 		else { | ||||
| 			users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'] }); | ||||
| 		} | ||||
|  | ||||
| 		users.forEach(user => { | ||||
| 			responseUsers.push(new ResponseUser(user)); | ||||
| 		}); | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { Repository, getConnectionManager } from 'typeorm'; | ||||
| import { UserGroupIdsNotMatchingError, UserGroupNotFoundError } from '../errors/UserGroupErrors'; | ||||
| import { CreateUserGroup } from '../models/actions/create/CreateUserGroup'; | ||||
| import { UpdateUserGroup } from '../models/actions/update/UpdateUserGroup'; | ||||
| @@ -27,9 +27,16 @@ export class UserGroupController { | ||||
| 	@Authorized("USERGROUP:GET") | ||||
| 	@ResponseSchema(ResponseUserGroup, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all groups. <br> The information provided might change while the project continues to evolve.' }) | ||||
| 	async getAll() { | ||||
| 	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) { | ||||
| 		let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>(); | ||||
| 		const groups = await this.userGroupsRepository.find({ relations: ['permissions'] }); | ||||
| 		let groups: Array<UserGroup>; | ||||
|  | ||||
| 		if (page != undefined) { | ||||
| 			groups = await this.userGroupsRepository.find({ relations: ['permissions'], skip: page * page_size, take: page_size }); | ||||
| 		} else { | ||||
| 			groups = await this.userGroupsRepository.find({ relations: ['permissions'] }); | ||||
| 		} | ||||
|  | ||||
| 		groups.forEach(group => { | ||||
| 			responseGroups.push(group.toResponse()); | ||||
| 		}); | ||||
|   | ||||
| @@ -53,7 +53,9 @@ export class ResponseDonation implements IResponse { | ||||
|      */ | ||||
|     public constructor(donation: Donation) { | ||||
|         this.id = donation.id; | ||||
|         if (donation.donor) { | ||||
|             this.donor = donation.donor.toResponse(); | ||||
|         } | ||||
|         this.amount = donation.amount; | ||||
|         this.paidAmount = donation.paidAmount || 0; | ||||
|         if (this.paidAmount < this.amount) { | ||||
|   | ||||
| @@ -4,6 +4,7 @@ import { | ||||
| import { Donor } from '../entities/Donor'; | ||||
| import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||
| import { IResponse } from './IResponse'; | ||||
| import { ResponseDonation } from './ResponseDonation'; | ||||
| import { ResponseParticipant } from './ResponseParticipant'; | ||||
|  | ||||
| /** | ||||
| @@ -34,6 +35,8 @@ export class ResponseDonor extends ResponseParticipant implements IResponse { | ||||
|     @IsInt() | ||||
|     paidDonationAmount: number; | ||||
|  | ||||
|     donations: Array<ResponseDonation>; | ||||
|  | ||||
|     /** | ||||
|      * Creates a ResponseRunner object from a runner. | ||||
|      * @param runner The user the response shall be build for. | ||||
| @@ -43,5 +46,11 @@ export class ResponseDonor extends ResponseParticipant implements IResponse { | ||||
|         this.receiptNeeded = donor.receiptNeeded; | ||||
|         this.donationAmount = donor.donationAmount; | ||||
|         this.paidDonationAmount = donor.paidDonationAmount; | ||||
|         this.donations = new Array<ResponseDonation>(); | ||||
|         if (donor.donations?.length > 0) { | ||||
|             for (const donation of donor.donations) { | ||||
|                 this.donations.push(donation.toResponse()) | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -58,12 +58,30 @@ export class ResponseStats implements IResponse { | ||||
|     @IsInt() | ||||
|     total_donation: number; | ||||
|  | ||||
|     /** | ||||
|      * The total donation count (cent). | ||||
|      */ | ||||
|     @IsInt() | ||||
|     total_donations: number; | ||||
|  | ||||
|     /** | ||||
|      * The total donor count. | ||||
|      */ | ||||
|     @IsInt() | ||||
|     total_donors: number; | ||||
|  | ||||
|     /** | ||||
|      * The average distance ran per runner. | ||||
|      */ | ||||
|     @IsInt() | ||||
|     average_distance: number; | ||||
|  | ||||
|     /** | ||||
|      * The average donation per distance (cent). | ||||
|      */ | ||||
|     @IsInt() | ||||
|     average_donation: number; | ||||
|  | ||||
|     /** | ||||
|      * Creates a new stats response containing some basic statistics for a dashboard or public display. | ||||
|      * @param runners Array containing all runners - the following relations have to be resolved: scans, scans.track | ||||
| @@ -73,7 +91,7 @@ export class ResponseStats implements IResponse { | ||||
|      * @param scans Array containing all scans - no relations have to be resolved. | ||||
|      * @param donations Array containing all donations - the following relations have to be resolved: runner, runner.scans, runner.scans.track | ||||
|      */ | ||||
|     public constructor(runners: number, teams: number, orgs: number, users: number, scans: number, donations: Donation[], distance: number) { | ||||
|     public constructor(runners: number, teams: number, orgs: number, users: number, scans: number, donations: Donation[], distance: number, donors: number) { | ||||
|         this.total_runners = runners; | ||||
|         this.total_teams = teams; | ||||
|         this.total_orgs = orgs; | ||||
| @@ -81,6 +99,9 @@ export class ResponseStats implements IResponse { | ||||
|         this.total_scans = scans; | ||||
|         this.total_distance = distance; | ||||
|         this.total_donation = donations.reduce((sum, current) => sum + current.amount, 0); | ||||
|         this.total_donations = donations.length; | ||||
|         this.average_donation = this.total_donation / this.total_donations | ||||
|         this.total_donors = donors; | ||||
|         this.average_distance = this.total_distance / this.total_runners; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -66,6 +66,8 @@ describe('adding + getting scans', () => { | ||||
| 		const res = await axios.get(base + '/api/scans/' + added_scan.id, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.runner.distance; | ||||
| 		delete added_scan.runner.distance; | ||||
| 		expect(res.data).toEqual(added_scan); | ||||
| 	}); | ||||
| 	it('check if scans was added via the runner/scans endpoint.', async () => { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user