🚀Bumped version to v0.14.2

.drone.yml

@@ -26,13 +26,6 @@ get:
   path: odit-ci-bot
   name: apikey
 
----
-kind: secret
-name: npm_url
-get:
-  path: odit-npm-cache
-  name: url
-
 ---
 kind: pipeline
 type: kubernetes
@@ -48,12 +41,8 @@ steps:
   - name: run tests
     image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
     commands:
-      - npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
+      - yarn
-      - pnpm i
+      - yarn test:ci
-      - pnpm test:ci
-    environment:
-      NPM_REGISTRY_URL:
-        from_secret: npm_url
 trigger:
   event:
     - pull_request
@@ -80,8 +69,10 @@ steps:
       password:
         from_secret: docker_password
       build_args:
-        - NPM_REGISTRY_URL:
+        - NPM_REGISTRY_DOMAIN:
-          from_secret: npm_url
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
       repo: lfk/backend
       tags:
         - dev
@@ -118,8 +109,10 @@ steps:
       password:
         from_secret: docker_password
       build_args:
-        - NPM_REGISTRY_URL:
+        - NPM_REGISTRY_DOMAIN:
-          from_secret: npm_url
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
       repo: lfk/backend
       tags:
         - latest
@@ -156,13 +149,21 @@ steps:
       password:
         from_secret: docker_password
       build_args:
-        - NPM_REGISTRY_URL:
+        - NPM_REGISTRY_DOMAIN:
-          from_secret: npm_url
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
       repo: lfk/backend
       tags:
         - "${DRONE_TAG}"
       cache: true
       registry: registry.odit.services
+  - name: trigger node lib build
+    image: idcooldi/drone-webhook
+    settings:
+      urls: https://ci.odit.services/api/repos/lfk/lfk-client-node/builds?SOURCE_TAG=${DRONE_TAG}
+      bearer:
+        from_secret: ci_token
   - name: trigger js lib build
     image: idcooldi/drone-webhook
     settings:

.gitignore

@@ -136,3 +136,4 @@ build
 lib
 /oss-attribution
 *.tmp
+pnpm-lock.yaml

CHANGELOG.md

@@ -2,151 +2,8 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v1.1.3](https://git.odit.services/lfk/backend/compare/v1.1.2...v1.1.3)
-
-- feat(orgs): Also resolve child-teams' distances and add them to org total [`8d94186`](https://git.odit.services/lfk/backend/commit/8d9418635d3e381c0f55a2521a3334ba497c169a)
-- fix(orgs): Removed unused log [`f2832a2`](https://git.odit.services/lfk/backend/commit/f2832a2daecc7bc7bbee4d4fceeab8db194730cf)
-
-#### [v1.1.2](https://git.odit.services/lfk/backend/compare/v1.1.1...v1.1.2)
-
-> 10 May 2023
-
-- 🚀Bumped version to v1.1.2 [`0d21596`](https://git.odit.services/lfk/backend/commit/0d21596e2b64a99258d4925ae2ad627d5cdbd984)
-- feat(groups): Resolve the total group distance on group get single (aka get org and get team) [`245827e`](https://git.odit.services/lfk/backend/commit/245827e9c659cf76183dc33ab253becc22ddf032)
-- chore(package): Formatting [`4608a36`](https://git.odit.services/lfk/backend/commit/4608a36df6b187520ca0c331b8dce615205257be)
-
-#### [v1.1.1](https://git.odit.services/lfk/backend/compare/v1.1.0...v1.1.1)
-
-> 19 April 2023
-
-- feat(donors): Resolve donations with donors via pagination [`12a9ae2`](https://git.odit.services/lfk/backend/commit/12a9ae24933117acb3ff9815a7d72abca5eea7a7)
-- 🚀Bumped version to v1.1.1 [`cb1305a`](https://git.odit.services/lfk/backend/commit/cb1305aa77c36aa9d7900f09e7413bc6d45f2c89)
-
-#### [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)
-
-> 15 April 2023
-
-- Faster stats (not including donations) [`b2ac70e`](https://git.odit.services/lfk/backend/commit/b2ac70e0aec1064e54a5043a104e7892984b2338)
-- 🚀Bumped version to v0.15.3 [`3909ed3`](https://git.odit.services/lfk/backend/commit/3909ed34f739e9fee90828f16757c75da90bab0f)
-
-#### [v0.15.2](https://git.odit.services/lfk/backend/compare/v0.15.1...v0.15.2)
-
-> 15 April 2023
-
-- 🚀Bumped version to v0.15.2 [`5f17e7f`](https://git.odit.services/lfk/backend/commit/5f17e7f783a7e8e2efc8f7dbbf2c98bcd1d80240)
-- Don't resolve runner group and parten with get all card requests [`2d8f752`](https://git.odit.services/lfk/backend/commit/2d8f7528d98144832e7609f5aa6fac8de4723c4a)
-- Resolve groups again for card generation [`a5a56a2`](https://git.odit.services/lfk/backend/commit/a5a56a263a01dbd911a799ab57084166e17b80ac)
-
-#### [v0.15.1](https://git.odit.services/lfk/backend/compare/v0.15.0...v0.15.1)
-
-> 15 April 2023
-
-- 🚀Bumped version to v0.15.1 [`9581185`](https://git.odit.services/lfk/backend/commit/9581185b24039338e7f238ecdcc3881bb5203759)
-- Faster trackscan creation by only loading the latest scan [`e9914e3`](https://git.odit.services/lfk/backend/commit/e9914e317b7fd78863cfd8549bad65da9292b7ca)
-- Log batch time in mass scan script [`2905884`](https://git.odit.services/lfk/backend/commit/2905884c024d7f275b3ad2c2858a2f0911adb95b)
-- Dont load cards with get all runners request [`702070d`](https://git.odit.services/lfk/backend/commit/702070da669cc605b93e6f5b62d712c28f079dd0)
-
-#### [v0.15.0](https://git.odit.services/lfk/backend/compare/v0.14.6...v0.15.0)
-
-> 15 April 2023
-
-- Added test script for creating mass scans [`8007117`](https://git.odit.services/lfk/backend/commit/80071174342d87199fcbd981cd8c92300b0a51e4)
-- 🚀Bumped version to v0.15.0 [`cc89ba8`](https://git.odit.services/lfk/backend/commit/cc89ba8afb3120569613a889baf962555612e95a)
-- Get all scans speed improvement [`23fa78e`](https://git.odit.services/lfk/backend/commit/23fa78eb9dcc01ecc036347f6703aacc0d163d7d)
-- More scan request optimizations [`7c4ff42`](https://git.odit.services/lfk/backend/commit/7c4ff42a3b3e7b186e16c85a97d9ecc854a32cb0)
-
-#### [v0.14.6](https://git.odit.services/lfk/backend/compare/v0.14.5...v0.14.6)
-
-> 15 April 2023
-
-- 🚀Bumped version to v0.14.6 [`3b3e689`](https://git.odit.services/lfk/backend/commit/3b3e68900beca16cfff88dbef22540f77750d29b)
-- Missing orm file [`3ff666f`](https://git.odit.services/lfk/backend/commit/3ff666fd3e84ac8cf41b30e9e17082b10548d55b)
-
-#### [v0.14.5](https://git.odit.services/lfk/backend/compare/v0.14.4...v0.14.5)
-
-> 15 April 2023
-
-- 🚀Bumped version to v0.14.5 [`4e44350`](https://git.odit.services/lfk/backend/commit/4e4435010fd7095e3b9742e207cba1b68cd6da3b)
-- Entrypoint fix [`de9af5a`](https://git.odit.services/lfk/backend/commit/de9af5a90907dcfc9bfb1d5a56420eed8bb59922)
-- Fixed copy [`ac631f0`](https://git.odit.services/lfk/backend/commit/ac631f0af467446552478873b7b4802a9310f865)
-
-#### [v0.14.4](https://git.odit.services/lfk/backend/compare/v0.14.3...v0.14.4)
-
-> 15 April 2023
-
-- Switched ci over to pnpm + cache [`6275aaa`](https://git.odit.services/lfk/backend/commit/6275aaa326f1c02c8dd42aa31608978408c44ab7)
-- 🚀Bumped version to v0.14.4 [`6bbdd5b`](https://git.odit.services/lfk/backend/commit/6bbdd5bb04a1c38e4b3a150db24b76e9c96490dd)
-- Back to ean13 based codes [`a8fc755`](https://git.odit.services/lfk/backend/commit/a8fc7558408b97da4b2c469ae5e73ab502b4fda0)
-- install prod in first step [`d027439`](https://git.odit.services/lfk/backend/commit/d02743984dfea8057be3081bd3a32a8f67e610aa)
-- Switched dockerfile to pnpm 8 with cache [`93d43b7`](https://git.odit.services/lfk/backend/commit/93d43b76843d7cb411f37fd2066c6a5364c05415)
-- COPY by stage name [`a64f6c9`](https://git.odit.services/lfk/backend/commit/a64f6c9822af2b927e91b0b55f1f50176de30169)
-- pinned pnpm version [`2a94bfa`](https://git.odit.services/lfk/backend/commit/2a94bfa6227d14f635b5fc2789b59c36d490937e)
-- custom pnpm cache [`85dc344`](https://git.odit.services/lfk/backend/commit/85dc3444acc677ddd242f9f2543ce477fe427a7c)
-- added missing ci env [`734c826`](https://git.odit.services/lfk/backend/commit/734c826face58dd5c3bb2607bda6e7f6d051012e)
-- pinned pnpm to 8 [`27e74e8`](https://git.odit.services/lfk/backend/commit/27e74e824cd1e23d4d53c1a983a1668dd87f5d59)
-- coherent baseimage [`b5c0a28`](https://git.odit.services/lfk/backend/commit/b5c0a288ac3c020f5d753c558aee160fea0bae14)
-- bumped final pnpm version [`33b25c9`](https://git.odit.services/lfk/backend/commit/33b25c9743abb7cefb3538f08cc2f78a646905c8)
-
-#### [v0.14.3](https://git.odit.services/lfk/backend/compare/v0.14.2...v0.14.3)
-
-> 18 March 2023
-
-- 🚀Bumped version to v0.14.3 [`16ce0a8`](https://git.odit.services/lfk/backend/commit/16ce0a848050b74c4b6dd93f17e5a6e9024cdb7d)
-- Adjusted modulo for new fixed card length [`9a8d618`](https://git.odit.services/lfk/backend/commit/9a8d618ae4584640e8be1ce9fe4bddd2ef7a92ae)
-
 #### [v0.14.2](https://git.odit.services/lfk/backend/compare/v0.14.1...v0.14.2)
 
-> 18 March 2023
-
-- 🚀Bumped version to v0.14.2 [`38da2d3`](https://git.odit.services/lfk/backend/commit/38da2d33187f4b24eef878642e153663ecd95de1)
 - Back to modulo [`068deb4`](https://git.odit.services/lfk/backend/commit/068deb4960bd16decf99887ffbda7a7d3dd9ff0b)
 
 #### [v0.14.1](https://git.odit.services/lfk/backend/compare/v0.14.0...v0.14.1)

Dockerfile

@@ -1,23 +1,15 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as build
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16
-ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app
-
 COPY package.json ./
-RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
+RUN npx pnpm@7.26.3 i
-RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
-
 COPY tsconfig.json ormconfig.js ./
 COPY src ./src
-RUN pnpm run build \
+RUN npm run build
-    && rm -rf /app/node_modules \
-    && pnpm i --production --prefer-offline
 
 # final image
-FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as final
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16
-WORKDIR /app
+COPY package.json ormconfig.js ./
-COPY --from=build /app/package.json /app/package.json
+RUN npx pnpm@7.26.3 i --prod
-COPY --from=build /app/ormconfig.js /app/ormconfig.js
+COPY --from=0 /app/dist dist
-COPY --from=build /app/dist /app/dist
+ENTRYPOINT ["node", "dist/app.js"]
-COPY --from=build /app/node_modules /app/node_modules
-ENTRYPOINT ["node", "/app/dist/app.js"]

README.md

@@ -15,24 +15,24 @@ Backend Server
 
 1. Rename the .env.example file to .env (you can adjust app port and other settings, if needed)
 2. Install Dependencies
-```bash
+   ```bash
-pnpm i
+   yarn
-```
+   ```
 3. Start the server
-```bash
+   ```bash
-pnpm dev
+   yarn dev
-```
+   ```
 
 ### Run Tests
 ```bash
 # Run tests once (server has to run)
-pnpm test
+yarn test
 
 # Run test in watch mode (reruns on change)
-pnpm test:watch
+yarn test:watch
 
 # Run test in ci mode (automaticly starts the dev server)
-pnpm test:ci
+yarn test:ci
 ```
 
 ### Use your own mail templates
@@ -44,7 +44,7 @@ Currently the following templates exist:
 
 ### Generate Docs
 ```bash
-pnpm docs
+yarn docs
 ```
 
 ## ENV Vars
@@ -90,5 +90,5 @@ pnpm docs
    * The dev tag of the docker image get's build from this
    * Only push minor changes to this branch!
    * To merge a feature branch into this please create a pull request
-* feature/xyz: Feature branches - naming scheme: `feature/issueid-title`
+* feature/xyz: Feature branches - nameing scheme: `feature/issueid-title`
-* bugfix/xyz: Branches for bugfixes - naming scheme:`bugfix/issueid-title`
+* bugfix/xyz: Branches for bugfixes - nameing scheme:`bugfix/issueid-title`

package.json

@@ -1,11 +1,8 @@
 {
   "name": "@odit/lfk-backend",
-  "version": "1.1.3",
+  "version": "0.14.2",
   "main": "src/app.ts",
   "repository": "https://git.odit.services/lfk/backend",
-  "engines": {
-    "pnpm": "8"
-  },
   "author": {
     "name": "ODIT.Services",
     "email": "info@odit.services",
@@ -54,7 +51,7 @@
     "validator": "13.5.2"
   },
   "devDependencies": {
-    "@faker-js/faker": "7.6.0",
+    "@faker-js/faker": "^7.6.0",
     "@odit/license-exporter": "0.0.9",
     "@types/cors": "2.8.9",
     "@types/csvtojson": "1.1.5",
@@ -63,7 +60,7 @@
     "@types/jsonwebtoken": "8.5.0",
     "@types/node": "14.14.22",
     "@types/uuid": "8.3.0",
-    "auto-changelog": "2.4.0",
+    "auto-changelog": "^2.4.0",
     "cp-cli": "2.0.0",
     "jest": "26.6.3",
     "nodemon": "2.0.7",
@@ -114,4 +111,4 @@
       "docs/*"
     ]
   }
-}
+}

src/controllers/DonationController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { DonationIdsNotMatchingError, DonationNotFoundError } from '../errors/DonationErrors';
 import { DonorNotFoundError } from '../errors/DonorErrors';
 import { RunnerNotFoundError } from '../errors/RunnerErrors';
@@ -36,16 +36,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseDonations: ResponseDonation[] = new Array<ResponseDonation>();
-		let donations: Array<Donation>;
+		const donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] });
-
-		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());
 		});

src/controllers/DonorController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { DonorHasDonationsError, DonorIdsNotMatchingError, DonorNotFoundError } from '../errors/DonorErrors';
 import { CreateDonor } from '../models/actions/create/CreateDonor';
 import { UpdateDonor } from '../models/actions/update/UpdateDonor';
@@ -25,16 +25,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseDonors: ResponseDonor[] = new Array<ResponseDonor>();
-		let donors: Array<Donor>;
+		const donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'] });
-
-		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));
 		});

src/controllers/GroupContactController.ts

@@ -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 { Repository, getConnection, getConnectionManager } from 'typeorm';
+import { getConnection, getConnectionManager, Repository } from 'typeorm';
 import { GroupContactIdsNotMatchingError, GroupContactNotFoundError } from '../errors/GroupContactErrors';
 import { RunnerGroupNotFoundError } from '../errors/RunnerGroupErrors';
 import { CreateGroupContact } from '../models/actions/create/CreateGroupContact';
@@ -26,16 +26,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>();
-		let contacts: Array<GroupContact>;
+		const contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] });
-
-		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());
 		});

src/controllers/PermissionController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { PermissionIdsNotMatchingError, PermissionNeedsPrincipalError, PermissionNotFoundError } from '../errors/PermissionErrors';
 import { PrincipalNotFoundError } from '../errors/PrincipalErrors';
 import { CreatePermission } from '../models/actions/create/CreatePermission';
@@ -27,16 +27,9 @@ export class PermissionController {
     @Authorized("PERMISSION:GET")
     @ResponseSchema(ResponsePermission, { isArray: true })
     @OpenAPI({ description: 'Lists all permissions for all users and groups.' })
-    async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+    async getAll() {
         let responsePermissions: ResponsePermission[] = new Array<ResponsePermission>();
-        let permissions: Array<Permission>;
+        const permissions = await this.permissionRepository.find({ relations: ['principal'] });
-
-        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));
         });

src/controllers/RunnerCardController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors';
 import { RunnerNotFoundError } from '../errors/RunnerErrors';
 import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
@@ -26,16 +26,9 @@ export class RunnerCardController {
 	@Authorized("CARD:GET")
 	@ResponseSchema(ResponseRunnerCard, { isArray: true })
 	@OpenAPI({ description: 'Lists all card.' })
-	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
-		let cards: Array<RunnerCard>;
+		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
-
-		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));
 		});

src/controllers/RunnerController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerGroupNeededError, RunnerHasDistanceDonationsError, RunnerIdsNotMatchingError, RunnerNotFoundError } from '../errors/RunnerErrors';
 import { RunnerGroupNotFoundError } from '../errors/RunnerGroupErrors';
 import { CreateRunner } from '../models/actions/create/CreateRunner';
@@ -30,16 +30,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
-		let runners: Array<Runner>;
+		const runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] });
-
-		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));
 		});

src/controllers/RunnerOrganizationController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } 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,20 +29,13 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
-		let responseOrgs: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
+		let responseTeams: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
-		let orgs: Array<RunnerOrganization>;
+		const runners = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] });
-
+		runners.forEach(runner => {
-		if (page != undefined) {
+			responseTeams.push(new ResponseRunnerOrganization(runner));
-			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 responseOrgs;
+		return responseTeams;
 	}
 
 	@Get('/:id')
@@ -52,7 +45,7 @@ export class RunnerOrganizationController {
 	@OnUndefined(RunnerOrganizationNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the organization whose id got provided.' })
 	async getOne(@Param('id') id: number) {
-		let runnerOrg = await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['contact', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.scans.track', 'runners', 'runners.scans', 'runners.scans.track'] });
+		let runnerOrg = await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['contact', 'teams'] });
 		if (!runnerOrg) { throw new RunnerOrganizationNotFoundError(); }
 		return new ResponseRunnerOrganization(runnerOrg);
 	}

src/controllers/RunnerTeamController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerTeamHasRunnersError, RunnerTeamIdsNotMatchingError, RunnerTeamNotFoundError } from '../errors/RunnerTeamErrors';
 import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam';
 import { UpdateRunnerTeam } from '../models/actions/update/UpdateRunnerTeam';
@@ -27,18 +27,11 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
-		let teams: Array<RunnerTeam>;
+		const runners = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });
-
+		runners.forEach(runner => {
-		if (page != undefined) {
+			responseTeams.push(new ResponseRunnerTeam(runner));
-			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;
 	}
@@ -50,7 +43,7 @@ export class RunnerTeamController {
 	@OnUndefined(RunnerTeamNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the team whose id got provided.' })
 	async getOne(@Param('id') id: number) {
-		let runnerTeam = await this.runnerTeamRepository.findOne({ id: id }, { relations: ['parentGroup', 'contact', 'runners', 'runners.scans', 'runners.scans.track'] });
+		let runnerTeam = await this.runnerTeamRepository.findOne({ id: id }, { relations: ['parentGroup', 'contact'] });
 		if (!runnerTeam) { throw new RunnerTeamNotFoundError(); }
 		return new ResponseRunnerTeam(runnerTeam);
 	}

src/controllers/ScanController.ts

@@ -1,7 +1,7 @@
 import { Request } from "express";
 import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam, Req, UseBefore } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerNotFoundError } from '../errors/RunnerErrors';
 import { ScanIdsNotMatchingError, ScanNotFoundError } from '../errors/ScanErrors';
 import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
@@ -34,16 +34,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseScans: ResponseScan[] = new Array<ResponseScan>();
-		let scans: Array<Scan>;
+		const scans = await this.scanRepository.find({ relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] });
-
-		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());
 		});
@@ -58,7 +51,7 @@ export class ScanController {
 	@OnUndefined(ScanNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the scan whose id got provided. This includes the scan\'s runner\'s distance ran.' })
 	async getOne(@Param('id') id: number) {
-		let scan = await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.group', 'card', 'station'] })
+		let scan = await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })
 		if (!scan) { throw new ScanNotFoundError(); }
 		return scan.toResponse();
 	}

src/controllers/ScanStationController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { ScanStationHasScansError, ScanStationIdsNotMatchingError, ScanStationNotFoundError } from '../errors/ScanStationErrors';
 import { TrackNotFoundError } from '../errors/TrackErrors';
 import { CreateScanStation } from '../models/actions/create/CreateScanStation';
@@ -26,16 +26,9 @@ export class ScanStationController {
 	@Authorized("STATION:GET")
 	@ResponseSchema(ResponseScanStation, { isArray: true })
 	@OpenAPI({ description: 'Lists all stations. <br> This includes their associated tracks.' })
-	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseStations: ResponseScanStation[] = new Array<ResponseScanStation>();
-		let stations: Array<ScanStation>;
+		const stations = await this.stationRepository.find({ relations: ['track'] });
-
-		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());
 		});

src/controllers/StatsClientController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { StatsClientNotFoundError } from '../errors/StatsClientErrors';
 import { TrackNotFoundError } from "../errors/TrackErrors";
 import { CreateStatsClient } from '../models/actions/create/CreateStatsClient';
@@ -24,16 +24,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseClients: ResponseStatsClient[] = new Array<ResponseStatsClient>();
-		let clients: Array<StatsClient>;
+		const clients = await this.clientRepository.find();
-
-		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));
 		});

src/controllers/StatsController.ts

@@ -3,7 +3,6 @@ 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';
@@ -22,26 +21,14 @@ export class StatsController {
     @ResponseSchema(ResponseStats)
     @OpenAPI({ description: "A very basic stats endpoint providing basic counters for a dashboard or simmilar" })
     async get() {
-        const connection = getConnection();
+        let connection = getConnection();
-        const runners = await connection.getRepository(Runner).count();
+        let runners = await connection.getRepository(Runner).find({ relations: ['scans', 'scans.track'] });
-        const teams = await connection.getRepository(RunnerTeam).count();
+        let teams = await connection.getRepository(RunnerTeam).find();
-        const orgs = await connection.getRepository(RunnerOrganization).count();
+        let orgs = await connection.getRepository(RunnerOrganization).find();
-        const users = await connection.getRepository(User).count();
+        let users = await connection.getRepository(User).find();
-        const scans = await connection.getRepository(Scan).count({ where: { valid: true } });
+        let scans = await connection.getRepository(Scan).find();
-
-        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")
-            .getRawOne();
-        let distace = parseInt(distance_query.sum_track)
-        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'] });
-        const donors = await connection.getRepository(Donor).count();
+        return new ResponseStats(runners, teams, orgs, users, scans, donations)
-
-        return new ResponseStats(runners, teams, orgs, users, scans, donations, distace, donors)
     }
 
     @Get("/runners/distance")

src/controllers/TrackController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } 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,17 +25,9 @@ export class TrackController {
 	@Authorized("TRACK:GET")
 	@ResponseSchema(ResponseTrack, { isArray: true })
 	@OpenAPI({ description: 'Lists all tracks.' })
-	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseTracks: ResponseTrack[] = new Array<ResponseTrack>();
-		let tracks: Array<Track>;
+		const tracks = await this.trackRepository.find();
-
-		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));
 		});

src/controllers/UserController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
-import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UserNotFoundError, UsernameContainsIllegalCharacterError } from '../errors/UserErrors';
+import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
 import { UserGroupNotFoundError } from '../errors/UserGroupErrors';
 import { CreateUser } from '../models/actions/create/CreateUser';
 import { UpdateUser } from '../models/actions/update/UpdateUser';
@@ -28,17 +28,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseUsers: ResponseUser[] = new Array<ResponseUser>();
-		let users: Array<User>;
+		const users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'] });
-
-		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));
 		});

src/controllers/UserGroupController.ts

@@ -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 { Repository, getConnectionManager } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
 import { UserGroupIdsNotMatchingError, UserGroupNotFoundError } from '../errors/UserGroupErrors';
 import { CreateUserGroup } from '../models/actions/create/CreateUserGroup';
 import { UpdateUserGroup } from '../models/actions/update/UpdateUserGroup';
@@ -27,16 +27,9 @@ 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(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
+	async getAll() {
 		let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>();
-		let groups: Array<UserGroup>;
+		const groups = await this.userGroupsRepository.find({ relations: ['permissions'] });
-
-		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());
 		});

src/models/actions/create/CreateTrackScan.ts

@@ -57,7 +57,7 @@ export class CreateTrackScan {
      * @returns The runnerCard whom's id you provided.
      */
     public async getCard(): Promise<RunnerCard> {
-        const id = this.card % 200000000000;
+        const id = this.card % 20000000;
         const runnerCard = await getConnection().getRepository(RunnerCard).findOne({ id: id }, { relations: ["runner"] });
         if (!runnerCard) {
             throw new RunnerCardNotFoundError();
@@ -86,13 +86,14 @@ export class CreateTrackScan {
      * @returns The validated scan with it's laptime set.
      */
     public async validateScan(scan: TrackScan): Promise<TrackScan> {
-        const latestScan = await getConnection().getRepository(TrackScan).findOne({ where: { runner: scan.runner, valid: true }, relations: ["track"], order: { id: 'DESC' } });
+        const scans = await getConnection().getRepository(TrackScan).find({ where: { runner: scan.runner, valid: true }, relations: ["track"] });
-        if (!latestScan) {
+        if (scans.length == 0) {
             scan.lapTime = 0;
             scan.valid = true;
         }
         else {
-            scan.lapTime = scan.timestamp - latestScan.timestamp;
+            const newestScan = scans[scans.length - 1];
+            scan.lapTime = scan.timestamp - newestScan.timestamp;
             scan.valid = (scan.lapTime > scan.track.minimumLapTime);
         }
         return scan;

src/models/entities/RunnerCard.ts

@@ -52,7 +52,13 @@ export class RunnerCard {
    * Generates a ean-13 compliant string for barcode generation.
    */
   public get code(): string {
-    return this.paddedId
+    const multiply = [1, 3];
+    let total = 0;
+    this.paddedId.split('').forEach((letter, index) => {
+      total += parseInt(letter, 10) * multiply[index % 2];
+    });
+    const checkSum = (Math.ceil(total / 10) * 10) - total;
+    return this.paddedId + checkSum.toString();
   }
 
   /**
@@ -61,10 +67,10 @@ export class RunnerCard {
   private get paddedId(): string {
     let id: string = this.id.toString();
 
-    if (id.length > 11) {
+    if (id.length > 6) {
       throw new RunnerCardIdOutOfRangeError();
     }
-    while (id.length < 11) { id = '0' + id; }
+    while (id.length < 6) { id = '0' + id; }
     id = '2' + id;
 
     return id;

src/models/responses/ResponseDonation.ts

@@ -53,9 +53,7 @@ export class ResponseDonation implements IResponse {
      */
     public constructor(donation: Donation) {
         this.id = donation.id;
-        if (donation.donor) {
+        this.donor = donation.donor.toResponse();
-            this.donor = donation.donor.toResponse();
-        }
         this.amount = donation.amount;
         this.paidAmount = donation.paidAmount || 0;
         if (this.paidAmount < this.amount) {

src/models/responses/ResponseDonor.ts

@@ -4,7 +4,6 @@ import {
 import { Donor } from '../entities/Donor';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
-import { ResponseDonation } from './ResponseDonation';
 import { ResponseParticipant } from './ResponseParticipant';
 
 /**
@@ -35,8 +34,6 @@ 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.
@@ -46,11 +43,5 @@ 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())
-            }
-        }
     }
 }

src/models/responses/ResponseRunnerGroup.ts

@@ -1,4 +1,4 @@
-import { IsInt, IsNotEmpty, IsNumber, IsObject, IsOptional, IsString } from "class-validator";
+import { IsInt, IsNotEmpty, IsObject, IsOptional, IsString } from "class-validator";
 import { RunnerGroup } from '../entities/RunnerGroup';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
@@ -36,10 +36,6 @@ export abstract class ResponseRunnerGroup implements IResponse {
     @IsOptional()
     contact?: ResponseGroupContact;
 
-    @IsOptional()
-    @IsNumber()
-    total_distance: number
-
     /**
      * Creates a ResponseRunnerGroup object from a runnerGroup.
      * @param group The runnerGroup the response shall be build for.
@@ -48,6 +44,5 @@ export abstract class ResponseRunnerGroup implements IResponse {
         this.id = group.id;
         this.name = group.name;
         if (group.contact) { this.contact = group.contact.toResponse(); };
-        if (group.runners) { this.total_distance = group.runners.reduce((p, c) => p + c.distance, 0) }
     }
 }

src/models/responses/ResponseRunnerOrganization.ts

@@ -67,9 +67,6 @@ export class ResponseRunnerOrganization extends ResponseRunnerGroup implements I
             for (let team of org.teams) {
                 this.teams.push(team.toResponse());
             }
-            for (const team of this.teams) {
-                this.total_distance += team.total_distance;
-            }
         }
 
         if (!org.key) { this.registrationEnabled = false; }

src/models/responses/ResponseStats.ts

@@ -2,6 +2,11 @@ import {
     IsInt
 } from "class-validator";
 import { Donation } from '../entities/Donation';
+import { Runner } from '../entities/Runner';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
+import { RunnerTeam } from '../entities/RunnerTeam';
+import { Scan } from '../entities/Scan';
+import { User } from '../entities/User';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 
@@ -58,30 +63,12 @@ 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
@@ -91,17 +78,14 @@ 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, donors: number) {
+    public constructor(runners: Runner[], teams: RunnerTeam[], orgs: RunnerOrganization[], users: User[], scans: Scan[], donations: Donation[]) {
-        this.total_runners = runners;
+        this.total_runners = runners.length;
-        this.total_teams = teams;
+        this.total_teams = teams.length;
-        this.total_orgs = orgs;
+        this.total_orgs = orgs.length;
-        this.total_users = users;
+        this.total_users = users.length;
-        this.total_scans = scans;
+        this.total_scans = scans.filter(scan => { scan.valid === true }).length;
-        this.total_distance = distance;
+        this.total_distance = runners.reduce((sum, current) => sum + current.distance, 0);
         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;
     }
 }

src/seeds/SeedUsers.ts

@@ -11,7 +11,7 @@ import { PermissionAction } from '../models/enums/PermissionAction';
 import { PermissionTarget } from '../models/enums/PermissionTargets';
 /**
  * Seeds a admin group with a demo user into the database for initial setup and auto recovery.
- * We know that the naming isn't perfectly fitting. Feel free to change it.
+ * We know that the nameing isn't perfectly fitting. Feel free to change it.
  */
 export default class SeedUsers implements Seeder {
     public async run(factory: Factory, connection: Connection): Promise<any> {

src/tests/create_mass_scans.ts

@@ -1,19 +0,0 @@
-import axios from 'axios';
-
-async function main() {
-    console.time("batches")
-    for (let i = 0; i < 100; i++) {
-        const batch = [];
-        for (let i = 0; i < 6; i++) {
-            batch.push(axios.post('http://localhost:4010/api/scans/trackscans', { card: 200000000001, station: 2 }, {
-                headers: {
-                    Authorization: 'Bearer 10F2E64.BB4F6CC5-2148-4CCF-88B5-0AA85D0508A9'
-                }
-            }))
-        }
-        await Promise.all(batch)
-        console.timeLog("batches", `Finished batch ${i}`)
-    }
-    console.timeEnd("batches")
-}
-main();

src/tests/scans/scans_get.spec.ts

@@ -66,8 +66,6 @@ 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 () => {