Compare commits
No commits in common. "main" and "v0.1.1" have entirely different histories.
144
.drone.yml
144
.drone.yml
@ -1,42 +1,6 @@
|
|||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: docker_username
|
|
||||||
get:
|
|
||||||
path: odit-registry-builder
|
|
||||||
name: username
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: docker_password
|
|
||||||
get:
|
|
||||||
path: odit-registry-builder
|
|
||||||
name: password
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: git_ssh
|
|
||||||
get:
|
|
||||||
path: odit-git-bot
|
|
||||||
name: sshkey
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: ci_token
|
|
||||||
get:
|
|
||||||
path: odit-ci-bot
|
|
||||||
name: apikey
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: npm_url
|
|
||||||
get:
|
|
||||||
path: odit-npm-cache
|
|
||||||
name: url
|
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
name: tests:node_latest
|
||||||
name: tests:node
|
|
||||||
clone:
|
clone:
|
||||||
disable: true
|
disable: true
|
||||||
steps:
|
steps:
|
||||||
@ -45,22 +9,19 @@ steps:
|
|||||||
commands:
|
commands:
|
||||||
- git clone $DRONE_REMOTE_URL .
|
- git clone $DRONE_REMOTE_URL .
|
||||||
- git checkout $DRONE_SOURCE_BRANCH
|
- git checkout $DRONE_SOURCE_BRANCH
|
||||||
|
- mv .env.ci .env
|
||||||
- name: run tests
|
- name: run tests
|
||||||
image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
|
image: node:latest
|
||||||
commands:
|
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:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- pull_request
|
- pull_request
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
type: docker
|
||||||
name: build:dev
|
name: build:dev
|
||||||
clone:
|
clone:
|
||||||
disable: true
|
disable: true
|
||||||
@ -72,21 +33,52 @@ steps:
|
|||||||
- git clone $DRONE_REMOTE_URL .
|
- git clone $DRONE_REMOTE_URL .
|
||||||
- git checkout dev
|
- git checkout dev
|
||||||
- name: build dev
|
- name: build dev
|
||||||
depends_on: ["clone"]
|
image: plugins/docker
|
||||||
image: registry.odit.services/library/drone-kaniko
|
depends_on: [clone]
|
||||||
settings:
|
settings:
|
||||||
username:
|
username:
|
||||||
from_secret: docker_username
|
from_secret: DOCKER_REGISTRY_USER
|
||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: DOCKER_REGISTRY_PASSWORD
|
||||||
build_args:
|
repo: registry.odit.services/lfk/backend
|
||||||
- NPM_REGISTRY_URL:
|
|
||||||
from_secret: npm_url
|
|
||||||
repo: lfk/backend
|
|
||||||
tags:
|
tags:
|
||||||
- dev
|
- dev
|
||||||
cache: true
|
|
||||||
registry: registry.odit.services
|
registry: registry.odit.services
|
||||||
|
- name: run changelog export
|
||||||
|
depends_on: ["clone"]
|
||||||
|
image: node:latest
|
||||||
|
commands:
|
||||||
|
- npx auto-changelog --commit-limit false -p -u --hide-credit
|
||||||
|
- name: push new changelog to repo
|
||||||
|
depends_on: ["run changelog export"]
|
||||||
|
image: appleboy/drone-git-push
|
||||||
|
settings:
|
||||||
|
branch: dev
|
||||||
|
commit: true
|
||||||
|
commit_message: 🧾New changelog file version [CI SKIP] [skip ci]
|
||||||
|
author_email: bot@odit.services
|
||||||
|
remote: git@git.odit.services:lfk/backend.git
|
||||||
|
ssh_key:
|
||||||
|
from_secret: GITLAB_SSHKEY
|
||||||
|
- name: run full license export
|
||||||
|
depends_on: ["clone"]
|
||||||
|
image: node:14.15.1-alpine3.12
|
||||||
|
commands:
|
||||||
|
- yarn
|
||||||
|
- yarn licenses:export
|
||||||
|
- name: push new licenses file to repo
|
||||||
|
depends_on: ["run full license export"]
|
||||||
|
image: appleboy/drone-git-push
|
||||||
|
settings:
|
||||||
|
branch: dev
|
||||||
|
commit: true
|
||||||
|
commit_message: 📖New license file version [CI SKIP] [skip ci]
|
||||||
|
author_email: bot@odit.services
|
||||||
|
remote: git@git.odit.services:lfk/backend.git
|
||||||
|
skip_verify: true
|
||||||
|
ssh_key:
|
||||||
|
from_secret: GITLAB_SSHKEY
|
||||||
|
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
@ -96,7 +88,7 @@ trigger:
|
|||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
type: docker
|
||||||
name: build:latest
|
name: build:latest
|
||||||
clone:
|
clone:
|
||||||
disable: true
|
disable: true
|
||||||
@ -111,19 +103,15 @@ steps:
|
|||||||
- git checkout main
|
- git checkout main
|
||||||
- name: build latest
|
- name: build latest
|
||||||
depends_on: ["clone"]
|
depends_on: ["clone"]
|
||||||
image: registry.odit.services/library/drone-kaniko
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
username:
|
username:
|
||||||
from_secret: docker_username
|
from_secret: DOCKER_REGISTRY_USER
|
||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: DOCKER_REGISTRY_PASSWORD
|
||||||
build_args:
|
repo: registry.odit.services/lfk/backend
|
||||||
- NPM_REGISTRY_URL:
|
|
||||||
from_secret: npm_url
|
|
||||||
repo: lfk/backend
|
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
cache: true
|
|
||||||
registry: registry.odit.services
|
registry: registry.odit.services
|
||||||
- name: push merge to repo
|
- name: push merge to repo
|
||||||
depends_on: ["clone"]
|
depends_on: ["clone"]
|
||||||
@ -133,7 +121,7 @@ steps:
|
|||||||
commit: false
|
commit: false
|
||||||
remote: git@git.odit.services:lfk/backend.git
|
remote: git@git.odit.services:lfk/backend.git
|
||||||
ssh_key:
|
ssh_key:
|
||||||
from_secret: git_ssh
|
from_secret: GITLAB_SSHKEY
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
@ -143,32 +131,34 @@ trigger:
|
|||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
type: docker
|
||||||
name: build:tags
|
name: build:tags
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build $DRONE_TAG
|
- name: build $DRONE_TAG
|
||||||
depends_on: ["clone"]
|
image: plugins/docker
|
||||||
image: registry.odit.services/library/drone-kaniko
|
depends_on: [clone]
|
||||||
settings:
|
settings:
|
||||||
username:
|
username:
|
||||||
from_secret: docker_username
|
from_secret: DOCKER_REGISTRY_USER
|
||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: DOCKER_REGISTRY_PASSWORD
|
||||||
build_args:
|
repo: registry.odit.services/lfk/backend
|
||||||
- NPM_REGISTRY_URL:
|
|
||||||
from_secret: npm_url
|
|
||||||
repo: lfk/backend
|
|
||||||
tags:
|
tags:
|
||||||
- "${DRONE_TAG}"
|
- '${DRONE_TAG}'
|
||||||
cache: true
|
|
||||||
registry: registry.odit.services
|
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: BOT_DRONE_KEY
|
||||||
- name: trigger js lib build
|
- name: trigger js lib build
|
||||||
image: idcooldi/drone-webhook
|
image: idcooldi/drone-webhook
|
||||||
settings:
|
settings:
|
||||||
urls: https://ci.odit.services/api/repos/lfk/lfk-client-js/builds?SOURCE_TAG=${DRONE_TAG}
|
urls: https://ci.odit.services/api/repos/lfk/lfk-client-js/builds?SOURCE_TAG=${DRONE_TAG}
|
||||||
bearer:
|
bearer:
|
||||||
from_secret: ci_token
|
from_secret: BOT_DRONE_KEY
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- tag
|
- tag
|
2
.env.ci
2
.env.ci
@ -6,4 +6,4 @@ DB_USER=unused
|
|||||||
DB_PASSWORD=bla
|
DB_PASSWORD=bla
|
||||||
DB_NAME=./test.sqlite
|
DB_NAME=./test.sqlite
|
||||||
NODE_ENV=dev
|
NODE_ENV=dev
|
||||||
POSTALCODE_COUNTRYCODE=DE
|
POSTALCODE_COUNTRYCODE=null
|
@ -1,10 +1,9 @@
|
|||||||
APP_PORT=4010
|
APP_PORT=4010
|
||||||
DB_TYPE=sqlite
|
DB_TYPE=bla
|
||||||
DB_HOST=bla
|
DB_HOST=bla
|
||||||
DB_PORT=bla
|
DB_PORT=bla
|
||||||
DB_USER=bla
|
DB_USER=bla
|
||||||
DB_PASSWORD=bla
|
DB_PASSWORD=bla
|
||||||
DB_NAME=./test.sqlite
|
DB_NAME=bla
|
||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
POSTALCODE_COUNTRYCODE=DE
|
POSTALCODE_COUNTRYCODE=null
|
||||||
SEED_TEST_DATA=false
|
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -135,4 +135,4 @@ build
|
|||||||
/docs
|
/docs
|
||||||
lib
|
lib
|
||||||
/oss-attribution
|
/oss-attribution
|
||||||
*.tmp
|
*.tmp
|
895
CHANGELOG.md
895
CHANGELOG.md
@ -2,896 +2,8 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
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)
|
|
||||||
|
|
||||||
> 18 March 2023
|
|
||||||
|
|
||||||
- 🚀Bumped version to v0.14.1 [`13f093b`](https://git.odit.services/lfk/backend/commit/13f093bb6138a498f93a05ef6dd812ae92f2676a)
|
|
||||||
- Switched from card prefix replacement via modulo to regex [`6289f30`](https://git.odit.services/lfk/backend/commit/6289f307400aacaa9cfe03f3024c1e0d5554d4f2)
|
|
||||||
|
|
||||||
#### [v0.14.0](https://git.odit.services/lfk/backend/compare/v0.13.3...v0.14.0)
|
|
||||||
|
|
||||||
> 15 March 2023
|
|
||||||
|
|
||||||
- 🚀Bumped version to v0.14.0 [`6ff764b`](https://git.odit.services/lfk/backend/commit/6ff764bc340ca25b3bdd62c6892259e228723973)
|
|
||||||
- Updated default length [`ea87cc7`](https://git.odit.services/lfk/backend/commit/ea87cc793b163bf0d4405a25bbe83fbc8e31c206)
|
|
||||||
- breaking(runnercards): shorter runnercard codes (padding to 12 was a bit tooo ambitious) [`ffee887`](https://git.odit.services/lfk/backend/commit/ffee887ddf6a71102ee39533d7cd504d1fd6698f)
|
|
||||||
- Removed sqlite journal [`92517e3`](https://git.odit.services/lfk/backend/commit/92517e365393f4baac3814f5668874b5752dc7c8)
|
|
||||||
|
|
||||||
#### [v0.13.3](https://git.odit.services/lfk/backend/compare/v0.13.2...v0.13.3)
|
|
||||||
|
|
||||||
> 15 February 2023
|
|
||||||
|
|
||||||
- 🚀Bumped version to v0.13.3 [`3bac75e`](https://git.odit.services/lfk/backend/commit/3bac75e7ab9f16ecab1fbfa9915a7edb923883f6)
|
|
||||||
- Merge pull request 'feature/201-no_citizen-deletion' (#202) from feature/201-no_citizen-deletion into dev [`d05eddc`](https://git.odit.services/lfk/backend/commit/d05eddcae198427ce9a334096563b3aadcff2b56)
|
|
||||||
- Updated tests [`d5c689d`](https://git.odit.services/lfk/backend/commit/d5c689d6937288df7dca14ce26fbbd4f46a8752a)
|
|
||||||
- Added delete check for citizen org [`8fedd4e`](https://git.odit.services/lfk/backend/commit/8fedd4ef3bdd48dc42abc1d53006eefc145175e3)
|
|
||||||
|
|
||||||
#### [v0.13.2](https://git.odit.services/lfk/backend/compare/v0.13.1...v0.13.2)
|
|
||||||
|
|
||||||
> 3 February 2023
|
|
||||||
|
|
||||||
- 🚀Bumped version to v0.13.2 [`e8b2e6f`](https://git.odit.services/lfk/backend/commit/e8b2e6f26140a18c06b017e4461742d7e7942f08)
|
|
||||||
- Merge pull request 'move selfservice magic link endpoint to 15min rate limit' (#200) from feature/runner-selfservice-login-link-rate-limit into dev [`39f3b0e`](https://git.odit.services/lfk/backend/commit/39f3b0e01f03bfbcfcb0ea08d697268ce068e63d)
|
|
||||||
- move to 15min limit [`edaf255`](https://git.odit.services/lfk/backend/commit/edaf255e8f609185dcd6c2c0cd2e8b007b785e0c)
|
|
||||||
- Merge pull request 'Releases 0.12.0 and 0.13.0' (#199) from dev into main [`41c4ed4`](https://git.odit.services/lfk/backend/commit/41c4ed4d0faaed382801bbe480f31dafa6f3912d)
|
|
||||||
|
|
||||||
#### [v0.13.1](https://git.odit.services/lfk/backend/compare/v0.13.0...v0.13.1)
|
|
||||||
|
|
||||||
> 2 February 2023
|
|
||||||
|
|
||||||
- 🚀Bumped version to v0.13.1 [`f2bd88a`](https://git.odit.services/lfk/backend/commit/f2bd88aadfcb6ffa0485ea6afac8c7664a37f5f4)
|
|
||||||
- Updated description [`67a3661`](https://git.odit.services/lfk/backend/commit/67a36614485b2ea83c2de41e0684708b95a05b32)
|
|
||||||
|
|
||||||
#### [v0.13.0](https://git.odit.services/lfk/backend/compare/v0.12.0...v0.13.0)
|
|
||||||
|
|
||||||
> 2 February 2023
|
|
||||||
|
|
||||||
- Added faker for testing [`e184673`](https://git.odit.services/lfk/backend/commit/e1846739638905aab6ba7e059fd2cbf8ff467bf3)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`2b641fa`](https://git.odit.services/lfk/backend/commit/2b641faa29c47d95f69983770dc4ab37e674604f)
|
|
||||||
- 🚀Bumped version to v0.13.0 [`0c763a2`](https://git.odit.services/lfk/backend/commit/0c763a2dfd39607b480d9aff7d3c883791f41700)
|
|
||||||
- Updated selfservice tests to prevent email duplication [`9bc80aa`](https://git.odit.services/lfk/backend/commit/9bc80aac8aab9b4dedc26c9bc3ce705d7fe9c0bf)
|
|
||||||
- Moved license and changelog export to releaseit hooks [`77c6303`](https://git.odit.services/lfk/backend/commit/77c6303014578edbbadeeaa790f7974bde2a9764)
|
|
||||||
- Updated readme [`4cdba8b`](https://git.odit.services/lfk/backend/commit/4cdba8bc77ce543f6fb636711b8728bce794eac7)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`ae14d6c`](https://git.odit.services/lfk/backend/commit/ae14d6c74f9205440b41ca5fdbd052ca449148fc)
|
|
||||||
- Added selfservice runner create check to prevent duplicate email [`68cd746`](https://git.odit.services/lfk/backend/commit/68cd746a9f3360b3630a9ba570213d2aa62497b4)
|
|
||||||
- Updated tests for new login in selfservice [`39aa759`](https://git.odit.services/lfk/backend/commit/39aa7598b7cd0ecb0f077f50ebdd31c6e205f06d)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`9fa8b93`](https://git.odit.services/lfk/backend/commit/9fa8b93c08ee52335b18e743f9d205b19e6095c6)
|
|
||||||
- Moved changelog generation to package script [`a7297ff`](https://git.odit.services/lfk/backend/commit/a7297ff933ae1372a9d508cdae1a54d2ebbcc647)
|
|
||||||
- Merge pull request 'feature/197-duplicate_runner_mail' (#198) from feature/197-duplicate_runner_mail into dev [`4b676bc`](https://git.odit.services/lfk/backend/commit/4b676bc85336c2d494e9e74823d38deec5cc0400)
|
|
||||||
- Updated logo url [`4433ddb`](https://git.odit.services/lfk/backend/commit/4433ddb1e15a35481728670e22049200644bf337)
|
|
||||||
- depends_on: ["clone"] [`9cc66ee`](https://git.odit.services/lfk/backend/commit/9cc66eebdfe8e7a2888bbc97197d1756ff44de30)
|
|
||||||
- Fixed typo [`19a290c`](https://git.odit.services/lfk/backend/commit/19a290c3a931ead0d9ae9ebb0985bfbaac54df59)
|
|
||||||
- Rename selfservice forgot to login [`69651d9`](https://git.odit.services/lfk/backend/commit/69651d9f6cd826b6d4720f164897a2a72a57c851)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`6fd246f`](https://git.odit.services/lfk/backend/commit/6fd246f43cb3f4d0ccb6e017ee699889ba17daac)
|
|
||||||
- Add git for changelog fun [`2fa56b8`](https://git.odit.services/lfk/backend/commit/2fa56b82d1e082a1deae943e5fca5101f24e3ef5)
|
|
||||||
|
|
||||||
#### [v0.12.0](https://git.odit.services/lfk/backend/compare/v0.11.1...v0.12.0)
|
|
||||||
|
|
||||||
> 2 February 2023
|
|
||||||
|
|
||||||
- Pinned versions [`a6d5693`](https://git.odit.services/lfk/backend/commit/a6d5693ccdeb25b15a09af8f7438142114268807)
|
|
||||||
- Drone -> Kaniko based builds [`0e78951`](https://git.odit.services/lfk/backend/commit/0e789513008085d0db94fc3b2dd9e74a5e583049)
|
|
||||||
- Drone images to odit registry [`6ad56b3`](https://git.odit.services/lfk/backend/commit/6ad56b31269bf19a740c1b6b1a303a8a9d7d59d0)
|
|
||||||
- Bumped container base images [`d95c6d3`](https://git.odit.services/lfk/backend/commit/d95c6d33657f6aa977a8ebfefad7e199bb1cc9c3)
|
|
||||||
- Enabled tag via release script [`9217421`](https://git.odit.services/lfk/backend/commit/92174212213f874e41c9472a927bcf87b963ac94)
|
|
||||||
- Pinned pnpm for builds [`4570845`](https://git.odit.services/lfk/backend/commit/4570845b3e1bd00c228fe1b09b658c24e20aba7f)
|
|
||||||
- 🚀Bumped version to v0.12.0 [`4c10e20`](https://git.odit.services/lfk/backend/commit/4c10e20b91a8101ee37b230373ceb3e024582b41)
|
|
||||||
- Ignore pnpm lock [`1f2c8ab`](https://git.odit.services/lfk/backend/commit/1f2c8abb22f3ff1e61b7350b517bd699c3e315f6)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`31b258b`](https://git.odit.services/lfk/backend/commit/31b258b4ce82213144160a4233b7fd127e456776)
|
|
||||||
|
|
||||||
#### [v0.11.1](https://git.odit.services/lfk/backend/compare/v0.11.0...v0.11.1)
|
|
||||||
|
|
||||||
> 22 April 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.11.1' (#196) from dev into main [`f19f280`](https://git.odit.services/lfk/backend/commit/f19f2808d88414f1877c01f10996dac68b6f9617)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`2229cdf`](https://git.odit.services/lfk/backend/commit/2229cdf20db1a98f9f76a99fa9d3f463cdf6d804)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`348fe52`](https://git.odit.services/lfk/backend/commit/348fe52c42cfa32239b703041820f725e147154e)
|
|
||||||
- Now prefixing runnercards with 2 [`8a82e05`](https://git.odit.services/lfk/backend/commit/8a82e059b74ceabf43c9cbfe9c9b89ef6ce15a28)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3b9cd2e`](https://git.odit.services/lfk/backend/commit/3b9cd2e1bbbe8e69c3883233a98f286d768c2b79)
|
|
||||||
- Added fix for the appended 2 [`eb526fb`](https://git.odit.services/lfk/backend/commit/eb526fb57faf631fd6e84af99af738ab1b3481c7)
|
|
||||||
- 🚀Bumped version to v0.11.1 [`95320ca`](https://git.odit.services/lfk/backend/commit/95320ca1bccc2886553accea6a428aadffda0a27)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`f2d127f`](https://git.odit.services/lfk/backend/commit/f2d127fc98d75ce658424624abd382c087737ca0)
|
|
||||||
|
|
||||||
#### [v0.11.0](https://git.odit.services/lfk/backend/compare/v0.10.2...v0.11.0)
|
|
||||||
|
|
||||||
> 14 April 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.11.0' (#195) from dev into main [`3220b19`](https://git.odit.services/lfk/backend/commit/3220b194d4c704835d6d106ec4d9d54a17a38b62)
|
|
||||||
- Fixed spelling [`da266a8`](https://git.odit.services/lfk/backend/commit/da266a8dd68dbb575997ae343624982b690486ec)
|
|
||||||
- Updated tests [`01ed514`](https://git.odit.services/lfk/backend/commit/01ed51489eb92fff907d46a930ecf0b0eb5cad2b)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`520608a`](https://git.odit.services/lfk/backend/commit/520608aef05b21f4daadf55cfc8caddba06b8f01)
|
|
||||||
- Added payedDonationAmount to donor and responsedonor [`8ae4b85`](https://git.odit.services/lfk/backend/commit/8ae4b8582749332f4fb081eee0c520293347001f)
|
|
||||||
- Responses now contain the donation status [`34dbaaa`](https://git.odit.services/lfk/backend/commit/34dbaaafe0422234848eabe3f52b26879c9e5a49)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`278c4a6`](https://git.odit.services/lfk/backend/commit/278c4a6a415434487a92ff66f8114bb2547aac48)
|
|
||||||
- Marked payedAmount as optional during creation and/or update [`0636616`](https://git.odit.services/lfk/backend/commit/0636616dad5afb41ffe47a857d91ac75b4f2f20a)
|
|
||||||
- Added payed amount fileld to donation class [`b8fbb72`](https://git.odit.services/lfk/backend/commit/b8fbb72fa0b659c9acc406c72a8a59c2174351b4)
|
|
||||||
- Added status to tests [`30c6d3d`](https://git.odit.services/lfk/backend/commit/30c6d3d8db9fe37a51e596a73add8b87e8616e54)
|
|
||||||
- Added payed amount to response class [`d64f470`](https://git.odit.services/lfk/backend/commit/d64f470b608b3f179ec77da0210de51c328ef3f2)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`a2f0d81`](https://git.odit.services/lfk/backend/commit/a2f0d814fc782ad440500e7d6ec779b6ab7f0ac6)
|
|
||||||
- 🚀Bumped version to v0.11.0 [`3558e99`](https://git.odit.services/lfk/backend/commit/3558e9909088647bd4f1f4334f50c07a5ef00214)
|
|
||||||
- Merge pull request 'Donation payment management feature/193-donation_payments' (#194) from feature/193-donation_payments into dev [`6df5f63`](https://git.odit.services/lfk/backend/commit/6df5f634f3123e04c015889573ccc5674a8bab27)
|
|
||||||
- Added payed amount to crealte classes [`71542bc`](https://git.odit.services/lfk/backend/commit/71542bc3887b97c15436d03280e49f7b3f0fcb06)
|
|
||||||
- Added donation status enum [`b4c31ee`](https://git.odit.services/lfk/backend/commit/b4c31ee9b5b35d6e11b07f50f3d30ca12e0f7728)
|
|
||||||
- Added payed amount to update classes [`9930742`](https://git.odit.services/lfk/backend/commit/99307423c533f8cde847b59a80bffc2ff42c9769)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`0c61ff4`](https://git.odit.services/lfk/backend/commit/0c61ff457d02f750efa457dd75464187683b037a)
|
|
||||||
- Added mssing check to tests [`6c14ed9`](https://git.odit.services/lfk/backend/commit/6c14ed9c89eadc1a10db8c912d8ea2711a518766)
|
|
||||||
- No longer answering with null, but 0 [`49b174f`](https://git.odit.services/lfk/backend/commit/49b174f29f63e963e600d74b6923a20211d832eb)
|
|
||||||
- Saved missing file [`8fe3243`](https://git.odit.services/lfk/backend/commit/8fe32436935d7cd6c17eae1e138383d3b714e1ba)
|
|
||||||
|
|
||||||
#### [v0.10.2](https://git.odit.services/lfk/backend/compare/v0.10.1...v0.10.2)
|
|
||||||
|
|
||||||
> 7 April 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.10.2' (#192) from dev into main [`1d82f65`](https://git.odit.services/lfk/backend/commit/1d82f65b0d3a32d10c1a10c991353c18696d58bf)
|
|
||||||
- Added first selfservice test [`057ae0d`](https://git.odit.services/lfk/backend/commit/057ae0d79758cd627d6d128406a0d201b6b7ad9b)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`b7ad5d3`](https://git.odit.services/lfk/backend/commit/b7ad5d3a31b8b4f5960852d3ac38af133719ebcd)
|
|
||||||
- First try of the laptime sort [`4471e57`](https://git.odit.services/lfk/backend/commit/4471e57438582d55ff846fd69c2cfcc26b40df2a)
|
|
||||||
- Potential fix for all remaining errors [`377d5da`](https://git.odit.services/lfk/backend/commit/377d5dadb2a14cb2d70e0b2dc77026f51b3fb51c)
|
|
||||||
- At least one fewer test should fail now [`87f444c`](https://git.odit.services/lfk/backend/commit/87f444c30d69d65a9f918c63631a859a389eeee3)
|
|
||||||
- Tried workaround for no availdable stats [`8f0f795`](https://git.odit.services/lfk/backend/commit/8f0f795a709db216396998b68b8bbd64ff4d44ff)
|
|
||||||
- Reverted temp bugfix [`4603a84`](https://git.odit.services/lfk/backend/commit/4603a84f16fb53a14d1792447100f5b470969dd0)
|
|
||||||
- Fixed sorting algo [`988f17a`](https://git.odit.services/lfk/backend/commit/988f17a795bb2d867e9d1d8e78051dff1a14ec30)
|
|
||||||
- Added runners stats tests [`7111068`](https://git.odit.services/lfk/backend/commit/7111068361e00cc1308664a3ae650a56e28c015c)
|
|
||||||
- Added basic laptime endpoint [`cb71fcd`](https://git.odit.services/lfk/backend/commit/cb71fcd13bc61e6214e2fd7b70e72094749463d3)
|
|
||||||
- Added orgs by donations stats tests [`d4a02e7`](https://git.odit.services/lfk/backend/commit/d4a02e7db2ff4976be21605e31aac2f3c82a49c0)
|
|
||||||
- Added teams stats endpoint tests [`b9a7dc8`](https://git.odit.services/lfk/backend/commit/b9a7dc84f05441445453193974b2a793b5197fa5)
|
|
||||||
- Now resolving all missing relations [`257f320`](https://git.odit.services/lfk/backend/commit/257f320ee3bf6429c4314c64023520366f9f730b)
|
|
||||||
- Added min laptime to StatsRunner [`51daf96`](https://git.odit.services/lfk/backend/commit/51daf969cf74792b2c2f2f16ce4359d9fca47bc8)
|
|
||||||
- Fixed sorting [`7b15c2d`](https://git.odit.services/lfk/backend/commit/7b15c2d88b14e7279aad97b0c950202ddb5acaaa)
|
|
||||||
- Fixed top-ten bein top 9 [`a6a526d`](https://git.odit.services/lfk/backend/commit/a6a526dc5d8b1613ea34e82e477081349e764aec)
|
|
||||||
- added new ci secret [`5633e85`](https://git.odit.services/lfk/backend/commit/5633e85f41cb69b10fd8a86f57f1bd2f50848f7b)
|
|
||||||
- Added temp console log for test [`22cae39`](https://git.odit.services/lfk/backend/commit/22cae39bd351ca285880e50187ea0d46a7a26437)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`610988e`](https://git.odit.services/lfk/backend/commit/610988ec16b8df61cca61cf2252a469d30318d81)
|
|
||||||
- Added temp console log for ci debugging [`4a73eab`](https://git.odit.services/lfk/backend/commit/4a73eab134c3a9f58771be996bc8811b62cf378e)
|
|
||||||
- Temp disabled runners by donations test [`0b07a53`](https://git.odit.services/lfk/backend/commit/0b07a53ed209c6193ead3c4d199545e22333ab32)
|
|
||||||
- Updated default docker-compose [`f8baca5`](https://git.odit.services/lfk/backend/commit/f8baca5ab2c56b906751bc7edd71477456ad91f3)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`dd6d799`](https://git.odit.services/lfk/backend/commit/dd6d799c847fc96aec1be8f2667ad371890076fb)
|
|
||||||
- Resolved missing parentgroup relation [`23bd432`](https://git.odit.services/lfk/backend/commit/23bd432c5f33a0863217120d97e2e4ea52a08baf)
|
|
||||||
- Removed console logs for now working tests [`71b33ab`](https://git.odit.services/lfk/backend/commit/71b33ab05b53b62c8b271bd2995c94b2fc212dfd)
|
|
||||||
- Fixed typo in test [`cbcb829`](https://git.odit.services/lfk/backend/commit/cbcb829fbde3a4a5e7f94de5dcf24d854c5fc257)
|
|
||||||
- Ptotential fix for stats failing [`dcdbdd1`](https://git.odit.services/lfk/backend/commit/dcdbdd15acfe6eef4220b7ed66db60d78107d1f9)
|
|
||||||
- 🚀Bumped version to v0.10.2 [`6e236ed`](https://git.odit.services/lfk/backend/commit/6e236ede145e164ee84543fb62404b4776550973)
|
|
||||||
- Merge pull request 'stats/runners/laptime feature/190-runners_laptime' (#191) from feature/190-runners_laptime into dev [`a694ad2`](https://git.odit.services/lfk/backend/commit/a694ad225c68fa23152402acba871c857433cc70)
|
|
||||||
- Removed all useless console.logs [`95e1eec`](https://git.odit.services/lfk/backend/commit/95e1eec313a79458dd75307a9d0f8319af0d0904)
|
|
||||||
- Pinned testing container tag to prod container tag [`10221b9`](https://git.odit.services/lfk/backend/commit/10221b9f2e4493080f3ff095d9772bcfd0ac50eb)
|
|
||||||
- Now resolving all relations for orgs by distance [`4a294b1`](https://git.odit.services/lfk/backend/commit/4a294b1e17c44294274b06748ec8141812c2d217)
|
|
||||||
- Added temp console log [`720774f`](https://git.odit.services/lfk/backend/commit/720774fcf47c38601ab88d5d74cfcd0e47b21acf)
|
|
||||||
- Removed console log for passing tests [`132b48c`](https://git.odit.services/lfk/backend/commit/132b48cf2a9e990a5e830c744ed8244bd25e8b3a)
|
|
||||||
- Removed console log [`1d8c8c8`](https://git.odit.services/lfk/backend/commit/1d8c8c8e9cefa58449f7abb2481d9396fe37ba20)
|
|
||||||
- Temp test logging workaround [`bf686e8`](https://git.odit.services/lfk/backend/commit/bf686e89e02998ccc80c838ef890c736c252634c)
|
|
||||||
- Temp test logging workaround [`6163f0a`](https://git.odit.services/lfk/backend/commit/6163f0a90b3721d3a1488f89cbb39ddff7152241)
|
|
||||||
- Removed test for content type [`63964fb`](https://git.odit.services/lfk/backend/commit/63964fbf2c41d9b90f995f056e9db65ab07d54a8)
|
|
||||||
|
|
||||||
#### [v0.10.1](https://git.odit.services/lfk/backend/compare/v0.10.0...v0.10.1)
|
|
||||||
|
|
||||||
> 3 April 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.10.1' (#189) from dev into main [`e89e07d`](https://git.odit.services/lfk/backend/commit/e89e07d0fc99f14148b01204fb8ed39e2da77e38)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`69afd4d`](https://git.odit.services/lfk/backend/commit/69afd4d5877401eb46df430f43a7feb273abda1e)
|
|
||||||
- 🚀Bumped version to v0.10.1 [`24d152f`](https://git.odit.services/lfk/backend/commit/24d152fdc8fe17fffa2f2a718d7145ba8a91d79c)
|
|
||||||
- New class: ResponseSelfServiceDonor [`d70c5b1`](https://git.odit.services/lfk/backend/commit/d70c5b1bbc9f02782f8755b6929e2d3458e10221)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`4279e43`](https://git.odit.services/lfk/backend/commit/4279e4374304887e8db40eab77763b20bbce91a1)
|
|
||||||
- Removed duplicate openapi statement [`4834a66`](https://git.odit.services/lfk/backend/commit/4834a6698b0958602421c1478a95fec7edda910b)
|
|
||||||
- Switched selfservice donation.donor from string to object [`0767943`](https://git.odit.services/lfk/backend/commit/0767943721b6964d542f580c541e744f86444ac6)
|
|
||||||
- Adjusted runner property names [`ca87774`](https://git.odit.services/lfk/backend/commit/ca87774767807a2c4bc869b0de95cc73832a8405)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`71e3d0e`](https://git.odit.services/lfk/backend/commit/71e3d0efe2cbde47aea0f26cb5a8b5cd3312707d)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`c28843c`](https://git.odit.services/lfk/backend/commit/c28843c405dc4fd06a10f0fb85814acede15a769)
|
|
||||||
- Merge pull request 'Selfservice donations reformatting feature/187-selfservice_donation' (#188) from feature/187-selfservice_donation into dev [`d837654`](https://git.odit.services/lfk/backend/commit/d837654617f7de5d055ffb06c65e2cd52f65c604)
|
|
||||||
- Added new responsetype for new class [`f693f2c`](https://git.odit.services/lfk/backend/commit/f693f2cde9a04147155aea4de5d52e1d19d722ca)
|
|
||||||
|
|
||||||
#### [v0.10.0](https://git.odit.services/lfk/backend/compare/v0.9.2...v0.10.0)
|
|
||||||
|
|
||||||
> 1 April 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.10.0' (#186) from dev into main [`b517dff`](https://git.odit.services/lfk/backend/commit/b517dff8a82c960836d9f0be90fd89f3ba2fae7d)
|
|
||||||
- 🚀Bumped version to v0.10.0 [`dc3071f`](https://git.odit.services/lfk/backend/commit/dc3071f7d2be298f0bb02d86ec67ed1125cd3b49)
|
|
||||||
- Added locale to mail related runner endpoints [`7af883f`](https://git.odit.services/lfk/backend/commit/7af883f27198206af542bcaff4686221d3788e87)
|
|
||||||
- Added locale to mail related runner endpoints [`f543307`](https://git.odit.services/lfk/backend/commit/f5433076b01c743ed9af085fccadb8f1edc26419)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`5fb355f`](https://git.odit.services/lfk/backend/commit/5fb355f450f19e96d3671b1a46e94d564495942b)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`114c246`](https://git.odit.services/lfk/backend/commit/114c246aceba566cc0dd6daab51a77b951b031cc)
|
|
||||||
- Merge pull request 'Mail locales feature/184-mail_locales' (#185) from feature/184-mail_locales into dev [`33c13de`](https://git.odit.services/lfk/backend/commit/33c13de32c68a3d9e87e4fd9ad12a815ed8c9fde)
|
|
||||||
- Added locale to mail related user endpoints [`1be073a`](https://git.odit.services/lfk/backend/commit/1be073a4fa39f0332a46f567ee6af10a9137844c)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`6aafe4a`](https://git.odit.services/lfk/backend/commit/6aafe4a6ae7d253ab39220e551c52ae067cc481a)
|
|
||||||
|
|
||||||
#### [v0.9.2](https://git.odit.services/lfk/backend/compare/v0.9.1...v0.9.2)
|
|
||||||
|
|
||||||
> 29 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.9.2' (#183) from dev into main [`bdeeb03`](https://git.odit.services/lfk/backend/commit/bdeeb036459c2a2131e843d8a5a6b338e0ba46ea)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`675c876`](https://git.odit.services/lfk/backend/commit/675c8762e8e4cf28d2f334d5ab2e1cb6b594e33c)
|
|
||||||
- Fixed bug in return creation [`6c9b91d`](https://git.odit.services/lfk/backend/commit/6c9b91d75a0d08fc4ab0e72c7a09bd0133566368)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`8c00aef`](https://git.odit.services/lfk/backend/commit/8c00aefd6ce3723d9f83d1c94e6491d5d597391f)
|
|
||||||
- 🚀Bumped version to v0.9.2 [`89e3924`](https://git.odit.services/lfk/backend/commit/89e392473c52a3f328545699a0f4df89be33ba89)
|
|
||||||
|
|
||||||
#### [v0.9.1](https://git.odit.services/lfk/backend/compare/v0.9.0...v0.9.1)
|
|
||||||
|
|
||||||
> 29 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release v0.9.1' (#182) from dev into main [`3afd785`](https://git.odit.services/lfk/backend/commit/3afd785a54fac91c12af789af19b45e6124e0e39)
|
|
||||||
- 🚀Bumped version to v0.9.1 [`a139554`](https://git.odit.services/lfk/backend/commit/a139554e059e9a10acb1733ce1a82b610cc99269)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`8099999`](https://git.odit.services/lfk/backend/commit/8099999e2cdfc8046f9ff4a90681281b671e402d)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`0290b0e`](https://git.odit.services/lfk/backend/commit/0290b0e5f531364d37d8157e639614cf5a6b4189)
|
|
||||||
- Merge pull request 'Return cards generated in bulk feature/180-blank_generation_return' (#181) from feature/180-blank_generation_return into dev [`0f7fa99`](https://git.odit.services/lfk/backend/commit/0f7fa990d473ce2dce032c47c39f79c1d0e8df90)
|
|
||||||
- Added query param to return created runenrcards [`5a36c8d`](https://git.odit.services/lfk/backend/commit/5a36c8dcae3d79b3b05ffb30a7ebb0d31dc8183a)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`58f4d21`](https://git.odit.services/lfk/backend/commit/58f4d2151f459bc72692cc70e02a59b77abfb9f0)
|
|
||||||
- Added test for returnCards=true array length [`1cb2dc9`](https://git.odit.services/lfk/backend/commit/1cb2dc9d53b530435f5798f9cdf7ee866eb7416e)
|
|
||||||
- Added test for single card generation with returnCards=true [`6005b06`](https://git.odit.services/lfk/backend/commit/6005b0661f1d5c461bb102e243cc209a8adc21fa)
|
|
||||||
- Fixed copy-paste oversight [`2f568c9`](https://git.odit.services/lfk/backend/commit/2f568c9cb8ae39ce40ec8df6d9acbaf0d5ae1a26)
|
|
||||||
|
|
||||||
#### [v0.9.0](https://git.odit.services/lfk/backend/compare/v0.8.0...v0.9.0)
|
|
||||||
|
|
||||||
> 26 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.9.0' (#179) from dev into main [`95135dd`](https://git.odit.services/lfk/backend/commit/95135ddc893dcf64be67b47b0ef2b0d9041253bd)
|
|
||||||
- Reenabled user tests [`4c66650`](https://git.odit.services/lfk/backend/commit/4c6665062fe6717242e43b58e66c1f1d030c018d)
|
|
||||||
- Moved to tmp files to better check for other problems [`7a64f23`](https://git.odit.services/lfk/backend/commit/7a64f2393783f97a9729356bc1dfd831927dd312)
|
|
||||||
- Added user creation invalid tests [`888cab5`](https://git.odit.services/lfk/backend/commit/888cab5898caf9e552c421346934bf90f717a653)
|
|
||||||
- Updated auth test to comply with the new pw requirements [`63f6526`](https://git.odit.services/lfk/backend/commit/63f6526e4f59621edbf1fad59fc569b4bd6acbf2)
|
|
||||||
- Added user deletion tests [`e6a8ebc`](https://git.odit.services/lfk/backend/commit/e6a8ebcb5b4f430254da4afe159141b21d8da0ed)
|
|
||||||
- Added user creation valid tests [`383a809`](https://git.odit.services/lfk/backend/commit/383a8095b8286d51fb2fb24ae2fd0156230e56ab)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`bd7b81e`](https://git.odit.services/lfk/backend/commit/bd7b81efe795c02512c87f3b5dd5eec796580144)
|
|
||||||
- Added password errors [`24c38cc`](https://git.odit.services/lfk/backend/commit/24c38cce26da41ccf375e1ccf04afa1868aad8df)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`274a146`](https://git.odit.services/lfk/backend/commit/274a146b9bccfe5e1a879ca137ebb4f51eaa5d57)
|
|
||||||
- Fixed test params [`070560e`](https://git.odit.services/lfk/backend/commit/070560e8632e833dd26505c02ccb2474462b63ac)
|
|
||||||
- No longer using createuser in seeding process [`96ba25e`](https://git.odit.services/lfk/backend/commit/96ba25ec6c6c397cd2aa322afa79024395f658fe)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`a7fe1e1`](https://git.odit.services/lfk/backend/commit/a7fe1e175918edd7a98983ece570b47075e85e9a)
|
|
||||||
- 🚀Bumped version to v0.8.0 [`c23b4d9`](https://git.odit.services/lfk/backend/commit/c23b4d907f20ed7af37a6de6ea4c61433e30b29b)
|
|
||||||
- 🚀Bumped version to v0.9.0 [`56a5f41`](https://git.odit.services/lfk/backend/commit/56a5f4168621263daeab5d2fda97b944cdc6ab31)
|
|
||||||
- Merge pull request 'Password security feature/99-password_checks' (#177) from feature/99-password_checks into dev [`5a3fc5b`](https://git.odit.services/lfk/backend/commit/5a3fc5b2bd06b3e26177d017d3503f4f627be3f2)
|
|
||||||
- Added pw errors to user controller [`b24e24f`](https://git.odit.services/lfk/backend/commit/b24e24ff7dd75d972cdab0fd1e2fe6c532ca2b2f)
|
|
||||||
- Now checking password rules on user creation [`5daaa3a`](https://git.odit.services/lfk/backend/commit/5daaa3a73c4eca2817d67e226679d125928a3645)
|
|
||||||
- Now checking password rules on user update [`48a87e8`](https://git.odit.services/lfk/backend/commit/48a87e8936e13c48f4baa3f4b10f781ad2f55a44)
|
|
||||||
- Fixed pw not getting hashed currectly; [`cb3ea9b`](https://git.odit.services/lfk/backend/commit/cb3ea9b1ebb82c650abd83d4be8629cfe29a5b21)
|
|
||||||
- Added pw errors to me controller [`9ce35d8`](https://git.odit.services/lfk/backend/commit/9ce35d8eb78a01f40af8c70e640eca3bcb142304)
|
|
||||||
- Now forceing user deletion in tests [`8154e71`](https://git.odit.services/lfk/backend/commit/8154e715bbf18938bd5d1031656a88d39231fa81)
|
|
||||||
- Added password checker dependency [`bd00f4f`](https://git.odit.services/lfk/backend/commit/bd00f4f8d585fb6878874810f7de0b8b9f3950d5)
|
|
||||||
- Fixed empty object getting called [`5369000`](https://git.odit.services/lfk/backend/commit/536900091afd7366128f21058490d0d4f15c6c89)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`03d76e6`](https://git.odit.services/lfk/backend/commit/03d76e6d0bc5b4655f7f441232681c9462815526)
|
|
||||||
- Formatting [`b8c28eb`](https://git.odit.services/lfk/backend/commit/b8c28ebb0808395218b5fb9031f477ae1d48e65e)
|
|
||||||
|
|
||||||
#### [v0.8.0](https://git.odit.services/lfk/backend/compare/v0.7.1...v0.8.0)
|
|
||||||
|
|
||||||
> 26 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.8.0' (#176) from dev into main [`3f8e8ce`](https://git.odit.services/lfk/backend/commit/3f8e8ce3a66a943801c0c8e17885e71feeee744f)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`c9bd6de`](https://git.odit.services/lfk/backend/commit/c9bd6de4762fec04e1e02cd3b667838d05ef39a7)
|
|
||||||
- Merge pull request 'Selfservice deletion feature/174-selfservice_deletion' (#175) from feature/174-selfservice_deletion into dev [`e702118`](https://git.odit.services/lfk/backend/commit/e702118d4d80e362e41bb88c74343d50530d1338)
|
|
||||||
- Added tests for the new endpoint [`20aeed8`](https://git.odit.services/lfk/backend/commit/20aeed87780247dc6401bba725801fc1874e50b5)
|
|
||||||
- Removed param from test [`97159dd`](https://git.odit.services/lfk/backend/commit/97159dd9f81aed080c174a3eb8da9e66dfea9b10)
|
|
||||||
- Added selfservice deletion endpoint [`dcb12b0`](https://git.odit.services/lfk/backend/commit/dcb12b0ac289f8df148ba10ae6389727c16f53fd)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`88844e1`](https://git.odit.services/lfk/backend/commit/88844e1a44d87a7dc253bf9aedf2fb3f6cdd1cfe)
|
|
||||||
- Fixed response bug [`ccb7ae2`](https://git.odit.services/lfk/backend/commit/ccb7ae29a39387c0f2762861565dc22996a2493a)
|
|
||||||
- Updated old hint [`dd12583`](https://git.odit.services/lfk/backend/commit/dd1258333ef67243f8a8df97c176ec5a054a5e3b)
|
|
||||||
|
|
||||||
#### [v0.7.1](https://git.odit.services/lfk/backend/compare/v0.7.0...v0.7.1)
|
|
||||||
|
|
||||||
> 26 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.7.1' (#173) from dev into main [`e76a9ce`](https://git.odit.services/lfk/backend/commit/e76a9cef956b00de7bbb11b6d863d4f33e3d5a34)
|
|
||||||
- Revert "Set timeout even higher b/c sqlite just kills itself during these tests" [`f159252`](https://git.odit.services/lfk/backend/commit/f159252651942e442026dbcaae09b242e05d8204)
|
|
||||||
- Set timeout even higher b/c sqlite just kills itself during these tests [`6ab6099`](https://git.odit.services/lfk/backend/commit/6ab60998d4f716aded93bb3b5d15594fc5e0434a)
|
|
||||||
- Adjusted jest timeout to mitigate sqlite from invalidateing all tests⏱ [`30d220b`](https://git.odit.services/lfk/backend/commit/30d220bc36a28f224406e49ed27ff3f6b4f409e9)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`963253c`](https://git.odit.services/lfk/backend/commit/963253cbc84ed07af13ed0925952ec1b7dcc53ad)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3ef3a94`](https://git.odit.services/lfk/backend/commit/3ef3a94b20c1abf6fd2f19472e5f448b4c72bd7f)
|
|
||||||
- 🚀Bumped version to v0.7.1 [`135852e`](https://git.odit.services/lfk/backend/commit/135852eb9a91010a4ab972ba9efc7b71dfe4d68f)
|
|
||||||
- Merge pull request 'RESPONSERUNNERCARD fix bugfix/171-responserunnercards' (#172) from bugfix/171-responserunnercards into dev [`539a650`](https://git.odit.services/lfk/backend/commit/539a6509b17cfd373eef8e443eaa7d41168ac7a9)
|
|
||||||
- Now resolveing runnercards [`24aff3b`](https://git.odit.services/lfk/backend/commit/24aff3bac458a9886ca40163484bc72733dc766a)
|
|
||||||
- Tests now keep the group [`f3d73d5`](https://git.odit.services/lfk/backend/commit/f3d73d53467a4d00011d280c24e1e12fbb8e443d)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`ce63043`](https://git.odit.services/lfk/backend/commit/ce63043887769e1f92a8c064d6647e0deb81b7fa)
|
|
||||||
|
|
||||||
#### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.6.4...v0.7.0)
|
|
||||||
|
|
||||||
> 23 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.7.0' (#170) from dev into main [`e40017a`](https://git.odit.services/lfk/backend/commit/e40017a6b88d83d5bfc57ff4603abeaca7a9a37b)
|
|
||||||
- Added bulk card creation tests [`438ff0f`](https://git.odit.services/lfk/backend/commit/438ff0fc3f246f83b1fa04cb11828f4a61dfcd1e)
|
|
||||||
- Added new "bulk" endpoint [`c1bbda5`](https://git.odit.services/lfk/backend/commit/c1bbda51f067cbd9ac1a9a5378ae3f5d7b9f4eca)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`7a49e7c`](https://git.odit.services/lfk/backend/commit/7a49e7c5c98eb23af1cd0d2084914641e9a1bf90)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`e843a46`](https://git.odit.services/lfk/backend/commit/e843a464e747c0d41280484cb54495cb2de2a9e8)
|
|
||||||
- 🚀Bumped version to v0.7.0 [`d0ae50d`](https://git.odit.services/lfk/backend/commit/d0ae50d5579e969ad33d6b9cfd66dac7fa472223)
|
|
||||||
- Merge pull request 'Bulk card creation feature/168-runnercards_bulk' (#169) from feature/168-runnercards_bulk into dev [`1dd6420`](https://git.odit.services/lfk/backend/commit/1dd64204cc63fb1a8a4a4aa503c21da42945eafd)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`4705a39`](https://git.odit.services/lfk/backend/commit/4705a39aabaad894d332a5062df03840c23c6bfa)
|
|
||||||
|
|
||||||
#### [v0.6.4](https://git.odit.services/lfk/backend/compare/v0.6.3...v0.6.4)
|
|
||||||
|
|
||||||
> 19 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.6.4' (#167) from dev into main [`4d721f6`](https://git.odit.services/lfk/backend/commit/4d721f62d9a5f6a1361ef2811a3a2ff63011b2ad)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`b0328ff`](https://git.odit.services/lfk/backend/commit/b0328ffdaffc8ef2e6e01e808c29748f58f42cac)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`cc6568c`](https://git.odit.services/lfk/backend/commit/cc6568c3810fed3ff2597df0db73a6ca9e072413)
|
|
||||||
- 🚀Bumped version to v0.6.4 [`031cede`](https://git.odit.services/lfk/backend/commit/031cede5426742dc3c2b9dc6b049951d7c14871c)
|
|
||||||
- Adjsuted endpoint [`3c69f8c`](https://git.odit.services/lfk/backend/commit/3c69f8c4a824e588977b06dbb45119cccb03c6bc)
|
|
||||||
|
|
||||||
#### [v0.6.3](https://git.odit.services/lfk/backend/compare/v0.6.2...v0.6.3)
|
|
||||||
|
|
||||||
> 18 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.6.3' (#165) from dev into main [`a3a1395`](https://git.odit.services/lfk/backend/commit/a3a1395a46d7970cff1b8cc2e84306a97791ed88)
|
|
||||||
- The basic bugfix 🐞 [`fbdadbe`](https://git.odit.services/lfk/backend/commit/fbdadbef1f9eb835e1914e8d3770cca836b4c443)
|
|
||||||
- The basic bugfix 🐞 [`c87c97c`](https://git.odit.services/lfk/backend/commit/c87c97c90f5e1229f92671b1f2ebe1fa0d2307cd)
|
|
||||||
- Updated tests 🧪 [`f347b7a`](https://git.odit.services/lfk/backend/commit/f347b7ad4982ed3760117c08e11dca5c3f72d495)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3f9a704`](https://git.odit.services/lfk/backend/commit/3f9a7049e31a6948125a07e847233b804f27ba31)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`b08acc6`](https://git.odit.services/lfk/backend/commit/b08acc666035ed766cc6ccfa9a410a54db4d7321)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`a6bca59`](https://git.odit.services/lfk/backend/commit/a6bca59ffe06a37f03af21500c442cebeaa74c7e)
|
|
||||||
- 🚀Bumped version to v0.6.3 [`7a303c2`](https://git.odit.services/lfk/backend/commit/7a303c2b2c267d6dd566b1470649e65bc1c1b2ee)
|
|
||||||
- Merge pull request 'TrackScan Update bug 🐞bugfix/163-trackscan_updates' (#164) from bugfix/163-trackscan_updates into dev [`6249419`](https://git.odit.services/lfk/backend/commit/6249419fae22e0203c046c1a3cd82c07f94f510c)
|
|
||||||
|
|
||||||
#### [v0.6.2](https://git.odit.services/lfk/backend/compare/v0.6.1...v0.6.2)
|
|
||||||
|
|
||||||
> 17 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release 0.6.2' (#162) from dev into main [`732a1b8`](https://git.odit.services/lfk/backend/commit/732a1b88d916720ea82cd4b192fc696640ade2aa)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`fcb43f9`](https://git.odit.services/lfk/backend/commit/fcb43f92b0b7a8fa2ed3772357c3eab8e6564eef)
|
|
||||||
- Fixed trackscan vaildation [`a8ea4fa`](https://git.odit.services/lfk/backend/commit/a8ea4fa659732ca2c922fc3c75d2238be2feb5c7)
|
|
||||||
- Added comments✏ [`289f9e2`](https://git.odit.services/lfk/backend/commit/289f9e219692789f86c631f52c67b578216acb48)
|
|
||||||
- Added comments✏ [`937a9fa`](https://git.odit.services/lfk/backend/commit/937a9fad4d8914b83fc6300f776c0720b756a9f4)
|
|
||||||
- Removed duplicate openapi declarations 🗑 [`c8882ae`](https://git.odit.services/lfk/backend/commit/c8882ae6a18188a9c98a237dd594548ebac6f460)
|
|
||||||
- Now defining security per endpoint 🔐 [`d709ee7`](https://git.odit.services/lfk/backend/commit/d709ee74795b785599cda50b4351bd566a0b8573)
|
|
||||||
- Changed the method of getting a parameter from the headers🛠 [`1d38d30`](https://git.odit.services/lfk/backend/commit/1d38d308ad8ae00d67c2b807b584da4f00bd9a58)
|
|
||||||
- Now auto-etting the station token🔥🔥🔥 [`aae042c`](https://git.odit.services/lfk/backend/commit/aae042c041e325626b89b146d005e900bd880453)
|
|
||||||
- Marked station as optional (quality of life improvements incoming) [`1f32ed0`](https://git.odit.services/lfk/backend/commit/1f32ed0727cb1117e5d201b5530b2f2d7f0323d8)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`4c960fe`](https://git.odit.services/lfk/backend/commit/4c960feeb22f819d1c618ced73f5799a3c7e4f00)
|
|
||||||
- Fixed missing renameing🛠 [`0ed7f78`](https://git.odit.services/lfk/backend/commit/0ed7f78b2c284909d47fa0533424c279adef0ba3)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`c1dd451`](https://git.odit.services/lfk/backend/commit/c1dd4518d128edd8b8e36981a513744471241a25)
|
|
||||||
- 🚀Bumped version to v0.6.2 [`5ba8f1d`](https://git.odit.services/lfk/backend/commit/5ba8f1dd4451c1a1b38fdd36cf632c9e6efa829c)
|
|
||||||
- Merge pull request 'Bugfixes for trackscans feature/160-responseTrackScan_total_distance' (#161) from feature/160-responseTrackScan_total_distance into dev [`3d3790c`](https://git.odit.services/lfk/backend/commit/3d3790c2eb6a92bb5b1d2c7e44c75aef4e1b015f)
|
|
||||||
- Fixed wrong error type 👀👀 [`1fa3fa7`](https://git.odit.services/lfk/backend/commit/1fa3fa75ee447b9919585e02c7997e3f1de9c8a7)
|
|
||||||
- Added missing discription [`673e896`](https://git.odit.services/lfk/backend/commit/673e896aa3dc853b301a2e560e785c464a449b6f)
|
|
||||||
|
|
||||||
#### [v0.6.1](https://git.odit.services/lfk/backend/compare/v0.6.0...v0.6.1)
|
|
||||||
|
|
||||||
> 17 March 2021
|
|
||||||
|
|
||||||
#### [v0.6.0](https://git.odit.services/lfk/backend/compare/v0.5.0...v0.6.0)
|
|
||||||
|
|
||||||
> 17 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Release v0.6.0' (#159) from dev into main [`bdc7bb6`](https://git.odit.services/lfk/backend/commit/bdc7bb67e7e21769d95a762c3b6dfbf82e7e38d0)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`5f5c8a0`](https://git.odit.services/lfk/backend/commit/5f5c8a061eb94361e4cd02e9a6469194a9092513)
|
|
||||||
- As requested by @philpp [`2cb7ec7`](https://git.odit.services/lfk/backend/commit/2cb7ec7317d8a48364261506facb2c11c7cf895f)
|
|
||||||
- Updated ci with new kubernetes secrets 🚀🚀🚀 [`5541ae6`](https://git.odit.services/lfk/backend/commit/5541ae6ebd7f36f4482ae752f358102a18b95de0)
|
|
||||||
- Added selfservice forgott positive tests [`bf1ec97`](https://git.odit.services/lfk/backend/commit/bf1ec976e3732b6ac052a55a51ee2ee18a8b1d3d)
|
|
||||||
- Added all "negative" tests [`d0a7e34`](https://git.odit.services/lfk/backend/commit/d0a7e34de8095fca282adefff01fa5f72e7cdba3)
|
|
||||||
- Added mailer functions [`8376513`](https://git.odit.services/lfk/backend/commit/83765136ccacd82ba6a8f9fb43eed78191ee0aa5)
|
|
||||||
- Added tests for the new endpoint [`757332e`](https://git.odit.services/lfk/backend/commit/757332ed2b3325d8730ef1b284ac6ba40356df93)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`e4ed20d`](https://git.odit.services/lfk/backend/commit/e4ed20da3e0a9e32a2e4664d50f316f9131564f0)
|
|
||||||
- Added first selfservice forgotten test [`a95a9b4`](https://git.odit.services/lfk/backend/commit/a95a9b4ec4a3012a91f6f622cfb9f5bff3376344)
|
|
||||||
- Created basic endpoint for user forgotten mails [`d709971`](https://git.odit.services/lfk/backend/commit/d7099717c2eee8aaf1b580345717cc5acc06dbd2)
|
|
||||||
- Implemented the "real" errors [`e26b7d4`](https://git.odit.services/lfk/backend/commit/e26b7d4923777a3013368e29c122709de7e1d9da)
|
|
||||||
- Runner controller now uses the Mailer functions [`a343747`](https://git.odit.services/lfk/backend/commit/a3437475caf6b435ae4bdf6d48aeb7da7d43b25f)
|
|
||||||
- Added scanstation me endpoint [`c5178e0`](https://git.odit.services/lfk/backend/commit/c5178e01814cedaa4402773b10f24d186714c1d2)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`54988ba`](https://git.odit.services/lfk/backend/commit/54988ba0fe012ce87d44c9068f7546a9be73723c)
|
|
||||||
- Added last reset requested timestamp to runners [`66d6023`](https://git.odit.services/lfk/backend/commit/66d6023335c7a9d1a145c4189b610940ef5a525a)
|
|
||||||
- Scanauth return objects [`46b7ace`](https://git.odit.services/lfk/backend/commit/46b7aceb0b86b03688faf0ec6661e4c9fbc6115c)
|
|
||||||
- Revert "Switched normal images to chached registry" [`ca6fa63`](https://git.odit.services/lfk/backend/commit/ca6fa633a156a265d8f643a5f23090b6ab32260d)
|
|
||||||
- Switched normal images to chached registry [`cba4455`](https://git.odit.services/lfk/backend/commit/cba4455d53f9a39b6f9993c36b5abd281201dfa1)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`a7958ee`](https://git.odit.services/lfk/backend/commit/a7958eecd65116ab937f640cbebcae1962cb86c8)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`076aa87`](https://git.odit.services/lfk/backend/commit/076aa87dba1d6fc544e76c16f99c64d37fc82ea0)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`486e450`](https://git.odit.services/lfk/backend/commit/486e450a58d3671dc867ae1a99d052d9fe814c1a)
|
|
||||||
- Updated request timeout [`ffcd45e`](https://git.odit.services/lfk/backend/commit/ffcd45e5724fccdec9b1dbc48f1320525dcd7288)
|
|
||||||
- Added testing env check [`3f37212`](https://git.odit.services/lfk/backend/commit/3f372123fd2e1fae467e9cb20985de1eeb9f6a57)
|
|
||||||
- 🚀Bumped version to v0.6.1 [`ce3ca9f`](https://git.odit.services/lfk/backend/commit/ce3ca9f1c86a6fe72e4dd77e3a0d60bf1e1bf542)
|
|
||||||
- 🚀Bumped version to v0.6.0 [`623b5a1`](https://git.odit.services/lfk/backend/commit/623b5a1873afa73a984251543995b7da1cfdb5c9)
|
|
||||||
- Merge pull request 'Scanstation "me" endpoint feature/157-scanstation_me' (#158) from feature/157-scanstation_me into dev [`13e8399`](https://git.odit.services/lfk/backend/commit/13e839902c063057e902fdb52b403be081d1667e)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`a1a94ec`](https://git.odit.services/lfk/backend/commit/a1a94ec9dafecd9b4c453cc8cfe32c2e90acccf5)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`d5930f7`](https://git.odit.services/lfk/backend/commit/d5930f7c46f4fc8ed56b6eeec9f784d435fd3b2b)
|
|
||||||
- Changed ci pipeline type to kubernetes [`6c43872`](https://git.odit.services/lfk/backend/commit/6c43872198c3dba44b3af3a7cfc7b628d5b304a3)
|
|
||||||
- Mailer now ignores mailing erros when env is set to test [`6bb3ae8`](https://git.odit.services/lfk/backend/commit/6bb3ae8ba992bd6c4d5809d75a264c710999cdcf)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`bf71e35`](https://git.odit.services/lfk/backend/commit/bf71e35ecd333d888d63213d69b04fc681a9d0bd)
|
|
||||||
- Adjusted tests for the new testing env [`9292027`](https://git.odit.services/lfk/backend/commit/92920273bec409563d1e38ea27f4d30f893598e8)
|
|
||||||
- Applied Docker MTU fix 🛠 [`f7af777`](https://git.odit.services/lfk/backend/commit/f7af77710421d7aae5efb048e0622cd067fc20eb)
|
|
||||||
- Updated description [`94001a4`](https://git.odit.services/lfk/backend/commit/94001a48f1b314e91ea5ec982e5585124f9541b6)
|
|
||||||
- Now adding station id to headers of request for scan auth [`8ba7ee1`](https://git.odit.services/lfk/backend/commit/8ba7ee1d481e44e686489e237980b21aaaf6071c)
|
|
||||||
- Merge pull request 'selfservice forgotten mails feature/154-selfservice_forgotten' (#155) from feature/154-selfservice_forgotten into dev [`cb6e78f`](https://git.odit.services/lfk/backend/commit/cb6e78fc176ec9efe94311b64286020b3c5bf633)
|
|
||||||
- Changed endpoint url to avoid conflicts [`e5dab34`](https://git.odit.services/lfk/backend/commit/e5dab3469c3cef6298fc8deb1192a38f7d18406b)
|
|
||||||
- Added console logging when a testing env get's discovered [`c01233b`](https://git.odit.services/lfk/backend/commit/c01233b4d663aefece26dbb86f8b6bcd5c916325)
|
|
||||||
- Added not found error logic [`e7f0cb4`](https://git.odit.services/lfk/backend/commit/e7f0cb45c9ac3aa06e2a57786aa1cc51c9d66598)
|
|
||||||
- Updated to new responsetype [`08957d4`](https://git.odit.services/lfk/backend/commit/08957d4dc2951cfeec56a54680c2ae4ef1525ab2)
|
|
||||||
- Added readme description for testing env [`cedc175`](https://git.odit.services/lfk/backend/commit/cedc1750c21ad256c3337f293f06e894e2c2ef9f)
|
|
||||||
- Renamed test [`1d762f5`](https://git.odit.services/lfk/backend/commit/1d762f56628eff47f4e1a910c7152bd0158283bd)
|
|
||||||
|
|
||||||
#### [v0.5.0](https://git.odit.services/lfk/backend/compare/v0.4.6...v0.5.0)
|
|
||||||
|
|
||||||
> 4 March 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.5.0' (#153) from dev into main [`64da0ea`](https://git.odit.services/lfk/backend/commit/64da0eadb313f3bd3ae20a66bcaf4401528008d9)
|
|
||||||
- Removed mail templates [`c2fdfee`](https://git.odit.services/lfk/backend/commit/c2fdfeed4f5fc454b02bc4b198965889c173bbaa)
|
|
||||||
- Removed mail config [`0342757`](https://git.odit.services/lfk/backend/commit/0342757d929b12635c88e74f17495df656865b1a)
|
|
||||||
- Added selfservice scan response class [`6074ac5`](https://git.odit.services/lfk/backend/commit/6074ac5b3a8e43fd98394c1fb70c6e1dea8fcd5e)
|
|
||||||
- Removed old mailer code [`0fcc729`](https://git.odit.services/lfk/backend/commit/0fcc729b56430f0fdb56242857aa1d883d5a4866)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`5272829`](https://git.odit.services/lfk/backend/commit/52728290b477d3f90ee7c14e0d438c4c74415322)
|
|
||||||
- Added the new mailer code [`1551a44`](https://git.odit.services/lfk/backend/commit/1551a444babc025cde6e894c66d2be2c84ab26da)
|
|
||||||
- Removed (now useless) mail controller [`485c247`](https://git.odit.services/lfk/backend/commit/485c247cd3305c4c4422d5582b1d61cc7af84989)
|
|
||||||
- Trackscans now have a laptime that get's calculated on creation [`aa83373`](https://git.odit.services/lfk/backend/commit/aa833736d32993b1656abeeb02a4f8b021ec6252)
|
|
||||||
- Removed useless functions and updated comments [`ada6798`](https://git.odit.services/lfk/backend/commit/ada679823cda8bc31d45c0ff6905f3d270cfd729)
|
|
||||||
- Added new selfservice scans endpoint [`771a205`](https://git.odit.services/lfk/backend/commit/771a205fe634fc5c07e794b3245c59483ff14bd8)
|
|
||||||
- Updated mail errors [`f289afd`](https://git.odit.services/lfk/backend/commit/f289afd8bc47f6eae9f12f765322b2db974ba918)
|
|
||||||
- Laptime is now a part of the response [`a2c97a1`](https://git.odit.services/lfk/backend/commit/a2c97a11a3dc82543076e3844f20d1218943bbf9)
|
|
||||||
- Updated readme env section [`db58a28`](https://git.odit.services/lfk/backend/commit/db58a280b3792b768eb2b1c82a76d9a9836978b1)
|
|
||||||
- Added locale to pw reset endpoint [`a5d2a6e`](https://git.odit.services/lfk/backend/commit/a5d2a6ecd31dc9c186d4201aef5c52e34cbef3b5)
|
|
||||||
- Now using mailer as static funtion [`9a1678a`](https://git.odit.services/lfk/backend/commit/9a1678acf0929dab9f84bd2c6a961b52e36172ce)
|
|
||||||
- Updated readme env section [`149f3a8`](https://git.odit.services/lfk/backend/commit/149f3a83b2e9d59bfbf36c7ea9e27bc7f514856d)
|
|
||||||
- Now checking for mails being set [`bb9bad6`](https://git.odit.services/lfk/backend/commit/bb9bad6d90370e768d4baffaae23ec756cc8353b)
|
|
||||||
- Updated auth reset test for new mailer [`ae7d617`](https://git.odit.services/lfk/backend/commit/ae7d6176902699f82ea127194908ee360233e7b4)
|
|
||||||
- Added scans returns 200 test [`82c65b6`](https://git.odit.services/lfk/backend/commit/82c65b632cdf44165b083494702b836c74e46a41)
|
|
||||||
- 🚀Bumped version to v0.4.7 [`f1d85cf`](https://git.odit.services/lfk/backend/commit/f1d85cfb855c2aae581ade69751b3969ce38f020)
|
|
||||||
- Now generateing bs mailer config in test env [`bf6b701`](https://git.odit.services/lfk/backend/commit/bf6b70106eb735d9ad6f6ad89f09194680af5ae1)
|
|
||||||
- Added new mailer settings to config [`ddea02d`](https://git.odit.services/lfk/backend/commit/ddea02db574cc348685558f3fa3ecc84adbd6b65)
|
|
||||||
- 🚀Bumped version to v0.5.0 [`3f2a2d2`](https://git.odit.services/lfk/backend/commit/3f2a2d292979c7f8162d92465b60b220f2634e7a)
|
|
||||||
- Merge pull request 'Features for the new selfservice feature/151-selfservice_scans_mails' (#152) from feature/151-selfservice_scans_mails into dev [`15356c1`](https://git.odit.services/lfk/backend/commit/15356c1030988d03e3739f3ffe770669789759f2)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`be397c8`](https://git.odit.services/lfk/backend/commit/be397c8899d5b4406c17e8f9951555c54f852901)
|
|
||||||
- Promoted axios to dependency [`a9e06c9`](https://git.odit.services/lfk/backend/commit/a9e06c905537b6da24706389e304e825a33a28ad)
|
|
||||||
- Removed nodemailer from backend [`5833f42`](https://git.odit.services/lfk/backend/commit/5833f4218f9a4c97b69021814df92470a1816917)
|
|
||||||
- Added another resonse type [`030b225`](https://git.odit.services/lfk/backend/commit/030b2255d42aab21d8974fc3a7235285934d53b7)
|
|
||||||
- Added new selfservice response type [`f7f6df4`](https://git.odit.services/lfk/backend/commit/f7f6df41ff74708482db3ea2db717ffb562131c0)
|
|
||||||
|
|
||||||
#### [v0.4.6](https://git.odit.services/lfk/backend/compare/v0.4.5...v0.4.6)
|
|
||||||
|
|
||||||
> 26 February 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.4.6' (#148) from dev into main [`dd3c927`](https://git.odit.services/lfk/backend/commit/dd3c9275d60cb5bb1a40fbe91f666f17a8e0c8d3)
|
|
||||||
- Added tests for the new org selfservice endpoints [`28ef139`](https://git.odit.services/lfk/backend/commit/28ef139a70e0c063982b2eb9167b7abe41db1621)
|
|
||||||
- Added selfservice org response model [`ba3b5ee`](https://git.odit.services/lfk/backend/commit/ba3b5eeefc45f9bd94aef24f9f509f6835f5ea7c)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`764b7ff`](https://git.odit.services/lfk/backend/commit/764b7ffe00086248e1f1cccb265ca920a568c0a0)
|
|
||||||
- Merge pull request 'Fixed wrong body acceptance type' (#150) from bugfix/146-usergroup_update into dev [`d870b2f`](https://git.odit.services/lfk/backend/commit/d870b2fd01b11b1732fcbb6feecaf6a6155fa702)
|
|
||||||
- Added selfservice team response model [`ba396e0`](https://git.odit.services/lfk/backend/commit/ba396e0eba15647b3004437a5a9949c7a69e828d)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`bce8811`](https://git.odit.services/lfk/backend/commit/bce8811925e7f77c64fc507d55335ac45b0e5572)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`b1fced7`](https://git.odit.services/lfk/backend/commit/b1fced77640b6c26438331474f368f2b0708b672)
|
|
||||||
- Added selfservice org info endpoint [`656f63d`](https://git.odit.services/lfk/backend/commit/656f63dfd5fdbe13554fc98440e416be7e56d909)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`c0cafb4`](https://git.odit.services/lfk/backend/commit/c0cafb4d510116773fed12592cad1efc2ef09f38)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`09fe47b`](https://git.odit.services/lfk/backend/commit/09fe47b9aaac47b65d4e910ef89d558c47fd7364)
|
|
||||||
- Fixed wrong body acceptance type [`aaec09d`](https://git.odit.services/lfk/backend/commit/aaec09d2ab08a76e9d367fdfefc01cea5588f1b9)
|
|
||||||
- Pinned package version to avoid dependency conflicts 📌 [`39ebfbf`](https://git.odit.services/lfk/backend/commit/39ebfbf0b633ecc479a33fdf851cd6550616bfee)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3736b29`](https://git.odit.services/lfk/backend/commit/3736b29e5435abb05de03e5d99d9adb438cd7d7e)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`305fa00`](https://git.odit.services/lfk/backend/commit/305fa0078d44b39b0391e84ba67b048285cf77b9)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3afc207`](https://git.odit.services/lfk/backend/commit/3afc207903c9cf1e62e6f4a62601b4213f608192)
|
|
||||||
- Quick bugfix [`5d6c8c9`](https://git.odit.services/lfk/backend/commit/5d6c8c957acd098a20e674ce5529f60cbc9f4151)
|
|
||||||
- 🚀Bumped version to v0.4.6 [`b4acd15`](https://git.odit.services/lfk/backend/commit/b4acd157fc075154a60946c1ee8876ee5f5dfbee)
|
|
||||||
- Merge pull request 'New org selfservice endpoint feature/146-more_selfservice_endpoints' (#147) from feature/146-more_selfservice_endpoints into dev [`45d61b4`](https://git.odit.services/lfk/backend/commit/45d61b487e8e6fdd8e00c184a08c9d6e34a1b6bf)
|
|
||||||
- Added new response types [`3c11d88`](https://git.odit.services/lfk/backend/commit/3c11d88557a2612bf4320ff669323bc048634e94)
|
|
||||||
|
|
||||||
#### [v0.4.5](https://git.odit.services/lfk/backend/compare/v0.4.4...v0.4.5)
|
|
||||||
|
|
||||||
> 9 February 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha release 0.4.5' (#145) from dev into main [`a46d142`](https://git.odit.services/lfk/backend/commit/a46d14278b9a084ca54f8f90e5e70b04739c2dd7)
|
|
||||||
- 🚀Bumped version to v0.4.5 [`cc869f6`](https://git.odit.services/lfk/backend/commit/cc869f69add1f1a175ff94510d52888f81bccb69)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`680ae8e`](https://git.odit.services/lfk/backend/commit/680ae8ebbb39d103085fe1fe8781d71b3c3ed055)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`b9aac71`](https://git.odit.services/lfk/backend/commit/b9aac7167681ff0945e538dd177abd6f97771bf2)
|
|
||||||
- Merge pull request 'usergroups/permissions endpoint feature/143-usergroup_permissions_endpoint' (#144) from feature/143-usergroup_permissions_endpoint into dev [`a30a342`](https://git.odit.services/lfk/backend/commit/a30a342e00ba944f8014044bba28141c0657a17f)
|
|
||||||
- Implemented /groups/permissions endpoint [`0c9867d`](https://git.odit.services/lfk/backend/commit/0c9867d70616615c8f3c72bbec37a4441e4868ef)
|
|
||||||
- Now all /usergroups endpoints return ResponseUserGroup [`bdcfce8`](https://git.odit.services/lfk/backend/commit/bdcfce88cbe069f9ba1925fcaac06367a109d2b7)
|
|
||||||
- The ResponseUserGroup now returns their permisssions as a string array [`416f2a1`](https://git.odit.services/lfk/backend/commit/416f2a1366c570998011d022ebd7f5f44276b2c9)
|
|
||||||
- The ResponseUserGroup now returns their permisssions as a string array [`5e353db`](https://git.odit.services/lfk/backend/commit/5e353db2061c30b4d10965c47f0dcbecb7f59fc5)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`8379c3e`](https://git.odit.services/lfk/backend/commit/8379c3e29c45f0d7c4c84bce1f3abc718158fa84)
|
|
||||||
|
|
||||||
#### [v0.4.4](https://git.odit.services/lfk/backend/compare/v0.4.3...v0.4.4)
|
|
||||||
|
|
||||||
> 9 February 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha release 0.4.4' (#142) from dev into main [`c4edcca`](https://git.odit.services/lfk/backend/commit/c4edccace78765dd5caa0f0e79c52f07c8a3568e)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`ca3d093`](https://git.odit.services/lfk/backend/commit/ca3d093e54bfaaa77c97e96738a74eeb25aee440)
|
|
||||||
- Now loading runner's group's parentgroup with every runner controller request [`701706c`](https://git.odit.services/lfk/backend/commit/701706c0289b357439608b4e2eaa66c617d16e9d)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`74de655`](https://git.odit.services/lfk/backend/commit/74de6559d7c5e8c6d257d41dc91396b53bf0c071)
|
|
||||||
- The group/runners endpoints now also deliver the runner's group's parentGroup [`906a1dc`](https://git.odit.services/lfk/backend/commit/906a1dc9e79ea4eb298a561cf98e6ae42b3ae4ec)
|
|
||||||
- 🚀Bumped version to v0.4.4 [`a6f73c7`](https://git.odit.services/lfk/backend/commit/a6f73c733c8cfc8d84beb7e0bbd5bcd1313df9d0)
|
|
||||||
- Merge pull request 'Expanded runner response feature/140-runner_group_parent' (#141) from feature/140-runner_group_parent into dev [`28cfbaa`](https://git.odit.services/lfk/backend/commit/28cfbaa6624d0bc65e2a9b72ffed17060e828735)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`09bbc70`](https://git.odit.services/lfk/backend/commit/09bbc70f5fd1f026148be07fe889a6907bc3f75a)
|
|
||||||
- Adjusted test for the new response depth [`90e1ad7`](https://git.odit.services/lfk/backend/commit/90e1ad7db72732d13002c87461c33560b74befa6)
|
|
||||||
- Adjusted test for the new response depth [`5872c63`](https://git.odit.services/lfk/backend/commit/5872c6335be573d849cdc3746b261c6cf476c3de)
|
|
||||||
|
|
||||||
#### [v0.4.3](https://git.odit.services/lfk/backend/compare/v0.4.2...v0.4.3)
|
|
||||||
|
|
||||||
> 7 February 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.4.3' (#139) from dev into main [`dd9cb6d`](https://git.odit.services/lfk/backend/commit/dd9cb6d3ef60cb118391abc2ba17fd0f83db0b1c)
|
|
||||||
- 🚀Bumped version to v0.4.3 [`656d564`](https://git.odit.services/lfk/backend/commit/656d564baa8c8bf1f63523b0301ad9ff23e08aa4)
|
|
||||||
- Bugfix for @lfk/frontend/#43 [`8f0a396`](https://git.odit.services/lfk/backend/commit/8f0a396dd07937fb7ccfb345d1acbac86eb5d9bb)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`f3f5cb4`](https://git.odit.services/lfk/backend/commit/f3f5cb462e4ecf932ad55eb519815222b4e5dd17)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`23c732b`](https://git.odit.services/lfk/backend/commit/23c732b6905cc9f6479a53a7744b72d01e345ecb)
|
|
||||||
- Merge pull request 'Bugfix for @lfk/frontend/#43' (#138) from bugfix/118-encode_jwt_in_mail into dev [`9959172`](https://git.odit.services/lfk/backend/commit/9959172f2ae11cbb7a2b8e97bad432956fc70a80)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`a18d4d3`](https://git.odit.services/lfk/backend/commit/a18d4d3cee58f8eb9dc428b051a2394bd3ece5c2)
|
|
||||||
|
|
||||||
#### [v0.4.2](https://git.odit.services/lfk/backend/compare/v0.4.1...v0.4.2)
|
|
||||||
|
|
||||||
> 2 February 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.4.2' (#137) from dev into main [`390b36d`](https://git.odit.services/lfk/backend/commit/390b36dfd46cf8829126581bd62dd3d4ce8558fa)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3b718f3`](https://git.odit.services/lfk/backend/commit/3b718f3ce58f12007b6068e5db00a00dbe1c5398)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`f7a0ec7`](https://git.odit.services/lfk/backend/commit/f7a0ec7174521b1863a4bc58c7ff2b86cafdee66)
|
|
||||||
- 🚀Bumped version to v0.4.2 [`321b20b`](https://git.odit.services/lfk/backend/commit/321b20b073b6debd605a92544779d0dfc0449f10)
|
|
||||||
- Merge pull request 'Imprint&Privacy Links feature/135-imprint_and_privacy' (#136) from feature/135-imprint_and_privacy into dev [`110a847`](https://git.odit.services/lfk/backend/commit/110a84783e023407cbcf81506deb7cc204db9659)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`74791df`](https://git.odit.services/lfk/backend/commit/74791df68b40355e1d1a1f7f5ae4f64422571dc9)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`8425043`](https://git.odit.services/lfk/backend/commit/84250430996920ada15af23b68756daba8f99257)
|
|
||||||
- Added new url env vars to config [`bcad691`](https://git.odit.services/lfk/backend/commit/bcad691045d00c9630bedb0936c123610b655946)
|
|
||||||
- fixed license-exporter call [`74b982a`](https://git.odit.services/lfk/backend/commit/74b982afba3ec82a038c4748420920732fe32a51)
|
|
||||||
- Added documentation about the new env vars to the readme [`333e806`](https://git.odit.services/lfk/backend/commit/333e806da42d7654e2b9fc13abae984726c689e7)
|
|
||||||
- Added imprint and privacy to the api spec [`f4f6219`](https://git.odit.services/lfk/backend/commit/f4f621973aa98645dee3d43252bb18f125087c54)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3aefa75`](https://git.odit.services/lfk/backend/commit/3aefa754128fc58a8200b280ee036c49cdaaac4a)
|
|
||||||
|
|
||||||
#### [v0.4.1](https://git.odit.services/lfk/backend/compare/v0.4.0...v0.4.1)
|
|
||||||
|
|
||||||
> 30 January 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.4.1' (#134) from dev into main [`71cab4e`](https://git.odit.services/lfk/backend/commit/71cab4e836dca2e2072b62676337f5f90796f105)
|
|
||||||
- Deleted useless file [ci skip] [`94dd796`](https://git.odit.services/lfk/backend/commit/94dd7963b73d98089f086175ed79002f59195c26)
|
|
||||||
- Implemented the interface in all responses [`9d5e486`](https://git.odit.services/lfk/backend/commit/9d5e486c6ddb4db87d36409fbd8bca1bf9659e9f)
|
|
||||||
- Adjusted tests for the new responseType parameter (part 1) [`bcc15e4`](https://git.odit.services/lfk/backend/commit/bcc15e42863b641b97cd03440f141332e112c889)
|
|
||||||
- Cleaned up realations regarding response classes [`ff7406e`](https://git.odit.services/lfk/backend/commit/ff7406e71a4a76670d381b415bfb66f602e1206b)
|
|
||||||
- Added Responseobjecttype enum [`581ca5f`](https://git.odit.services/lfk/backend/commit/581ca5ff6c67ed1c701c06532671441293ee0706)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`0229534`](https://git.odit.services/lfk/backend/commit/02295346dad109745faa492dc968abbc98522804)
|
|
||||||
- Dependency bump🔝 [skip ci] [`3d1baae`](https://git.odit.services/lfk/backend/commit/3d1baae0cce26b0c1f6948778b15f4b0097a77a9)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`7ba67b9`](https://git.odit.services/lfk/backend/commit/7ba67b9dcab7692c8c1e548ccbc3895eb084eedd)
|
|
||||||
- Adjusted tests for the new responseType parameter (part 3) [`8dc2810`](https://git.odit.services/lfk/backend/commit/8dc2810c0c4097e26bf1b517bb9d0b102494f6c1)
|
|
||||||
- Added a Response interface [`e44cc4c`](https://git.odit.services/lfk/backend/commit/e44cc4c4cbecdf7c8d90f0af73fffd8b01eba61e)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`4e10077`](https://git.odit.services/lfk/backend/commit/4e100779017c5ce542b59cf2156bd6ab5fdceed2)
|
|
||||||
- Adjusted tests for the new responseType parameter (part 2) [`ff8af09`](https://git.odit.services/lfk/backend/commit/ff8af090e3ea1760fb6110284cff870a0b4cbf84)
|
|
||||||
- 🚀Bumped version to v0.4.1 [`c32fa93`](https://git.odit.services/lfk/backend/commit/c32fa93673010ab18e009ab24fc139ed4f67310e)
|
|
||||||
- Merge pull request 'Response object types feature/132-object_types' (#133) from feature/132-object_types into dev [`6e5f1bd`](https://git.odit.services/lfk/backend/commit/6e5f1bd5ff217a88ec2dfaf154e5e26dee588e12)
|
|
||||||
- Fixed typos and missing types [`2a87819`](https://git.odit.services/lfk/backend/commit/2a878194865d406123805659c011c329c955f669)
|
|
||||||
|
|
||||||
#### [v0.4.0](https://git.odit.services/lfk/backend/compare/v0.3.1...v0.4.0)
|
|
||||||
|
|
||||||
> 30 January 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.4.0' (#131) from dev into main [`c4ea808`](https://git.odit.services/lfk/backend/commit/c4ea808e06bdc68add5636346f99a7d292852ab0)
|
|
||||||
- Added pw reset template provided by @philipp [`c116338`](https://git.odit.services/lfk/backend/commit/c116338cd74cf726362f8fa0ae5eea7ec9fabac4)
|
|
||||||
- Added test mail templates [`8270029`](https://git.odit.services/lfk/backend/commit/827002989ee6e3f0d776b5b55b8fb6d65f10c898)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`09b24aa`](https://git.odit.services/lfk/backend/commit/09b24aa6094a980debf4428a1c32583cdb7b606f)
|
|
||||||
- Implemented automatic ci env generation [`536de2a`](https://git.odit.services/lfk/backend/commit/536de2a3199b1befed54b6fe520a2e3fcefe0d90)
|
|
||||||
- Implemented a basic mailer with reset link sending [`6379753`](https://git.odit.services/lfk/backend/commit/637975305f1adf9bf505507790638cf1e229cfb1)
|
|
||||||
- Table fix [`1f0c842`](https://git.odit.services/lfk/backend/commit/1f0c842d9e086456f1ae0f6908e474258a04beb4)
|
|
||||||
- Implemented the test-mail endpoint via a new mailcontroller [`54ed313`](https://git.odit.services/lfk/backend/commit/54ed313342a72b029b9545bc5ea193e3f0c2166d)
|
|
||||||
- Added documentation for the env vars [`13ccab5`](https://git.odit.services/lfk/backend/commit/13ccab5e289d0a629cefb7fe281a85a46058ae97)
|
|
||||||
- Added comments [`9bd7636`](https://git.odit.services/lfk/backend/commit/9bd7636a23b5a9662ea2b965d2a2407727a188fb)
|
|
||||||
- Added test mail sending test [`ae74b39`](https://git.odit.services/lfk/backend/commit/ae74b3963fddb847aed4a828031b93b26cf551db)
|
|
||||||
- Password reset now enforces email [`979d36e`](https://git.odit.services/lfk/backend/commit/979d36ea9147dc575e9e989f6833388828285176)
|
|
||||||
- Implementes mail sending on pw reset request [`e26744b`](https://git.odit.services/lfk/backend/commit/e26744b7925d32d65ef4cc3911651758cfc9274f)
|
|
||||||
- Added a txt variant of the pw-reset mail [`d3647e3`](https://git.odit.services/lfk/backend/commit/d3647e339990d989dbca4d91aa8c3fe5789dd24a)
|
|
||||||
- Changed order [`583a4bc`](https://git.odit.services/lfk/backend/commit/583a4bc0dd0de8026bb2eb6a9b0c31f59344e813)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`fea4857`](https://git.odit.services/lfk/backend/commit/fea485768570eb5de2bbd2783e339794a67db2de)
|
|
||||||
- Translated the pw reset mail to english [`5cade25`](https://git.odit.services/lfk/backend/commit/5cade25eeb137eb5890b3fd450646acfbdff2e8b)
|
|
||||||
- The auth tests now use mail to identify the user [`c43334b`](https://git.odit.services/lfk/backend/commit/c43334bf96901bfd5116301ff7cf4b2ae1dfcbd3)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`e07f258`](https://git.odit.services/lfk/backend/commit/e07f258a315898d1183c311e7fcd8f65a415504c)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`b972395`](https://git.odit.services/lfk/backend/commit/b972395ae8bb06184baa56296a3b8bfc16ae96a7)
|
|
||||||
- 🚀Bumped version to v0.4.0 [`e5f4f6e`](https://git.odit.services/lfk/backend/commit/e5f4f6ee590e0885d6eef9151ce7eb76578b70ca)
|
|
||||||
- Merge pull request 'Implemented testmail endpoint feature/124-testmail' (#130) from feature/124-testmail into dev [`f9e75d0`](https://git.odit.services/lfk/backend/commit/f9e75d06b8ee8ff79f60fb384cb2c35ccf19811d)
|
|
||||||
- Merge pull request 'Email Basics feature/118-emails' (#128) from feature/118-emails into dev [`348e6cd`](https://git.odit.services/lfk/backend/commit/348e6cdec7411345953243edfb5322a17ad7614d)
|
|
||||||
- Merge pull request 'Mail+Env documentation feature/123-mail_documentation' (#129) from feature/123-mail_documentation into dev [`61bbeb0`](https://git.odit.services/lfk/backend/commit/61bbeb0d8f3fd6bfafb65bd11eb4c076a27b4a53)
|
|
||||||
- Added a test mail sending function [`b94179e`](https://git.odit.services/lfk/backend/commit/b94179e3caaf4be0654ca3372f57a490fb32e208)
|
|
||||||
- Added the first mail error [`c418603`](https://git.odit.services/lfk/backend/commit/c4186034233a296b5971fbef16e7ef6809fbac51)
|
|
||||||
- Now also sending txt mail body [`b92f633`](https://git.odit.services/lfk/backend/commit/b92f633d68604636cecc5e9fdd0d6990b9cb83fe)
|
|
||||||
- Removed tests working directly with the old pw-reset response [`d02e9de`](https://git.odit.services/lfk/backend/commit/d02e9dec5637aedefdf2ed3cd2c6d73216b6464b)
|
|
||||||
- Added the basics about mail templates to the readme [`b5018eb`](https://git.odit.services/lfk/backend/commit/b5018eb11492884db9f4ec969c767c3cce53f105)
|
|
||||||
- Cleaned up the replacements [`389e423`](https://git.odit.services/lfk/backend/commit/389e423850d68a5fe440b62413a6c662353ac9c6)
|
|
||||||
- Added mail env vars [`d7ea928`](https://git.odit.services/lfk/backend/commit/d7ea928714f94814695cbd2815c8730df58033f6)
|
|
||||||
- Added a barebones class for handleing mail stuff [`cf012c0`](https://git.odit.services/lfk/backend/commit/cf012c0b7efffb81b03497a04b0fdad0423c72f7)
|
|
||||||
- Added a Mail permisssion target [`ad4b903`](https://git.odit.services/lfk/backend/commit/ad4b903c258820f14df28d56b12e099075ca7d78)
|
|
||||||
- Added env vars [`470703c`](https://git.odit.services/lfk/backend/commit/470703c4de954da94726879becd57986b59e1f69)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`2071c4d`](https://git.odit.services/lfk/backend/commit/2071c4db33bbb9fd41ef650b409cac789732225f)
|
|
||||||
- Added a hint to ethereal.email [`53fcff7`](https://git.odit.services/lfk/backend/commit/53fcff77d00fc2b205ada0bcee7bdfe83d94a9f4)
|
|
||||||
- Fixed missing app_url protocol [`46af786`](https://git.odit.services/lfk/backend/commit/46af7865165bbfb97ed3e6cdfef15dfb72add611)
|
|
||||||
- Removed the duplicate env copy/create from ci tests [`08e6e59`](https://git.odit.services/lfk/backend/commit/08e6e5965544906f5033f2080166bddc37cc30c7)
|
|
||||||
- Removed bs console.log [`71c4caa`](https://git.odit.services/lfk/backend/commit/71c4caae8ba67e253d893409b3c5c3a39b08060a)
|
|
||||||
- Added nodemailer types [`78d2ac3`](https://git.odit.services/lfk/backend/commit/78d2ac3027f7109161ee36e9b3dda628a7039468)
|
|
||||||
- Added nodemailer dependecy [`908ac4f`](https://git.odit.services/lfk/backend/commit/908ac4f1ce9d78749268353c668e67b57eae6f94)
|
|
||||||
- Fixed wrong file location [`b4c117b`](https://git.odit.services/lfk/backend/commit/b4c117b7dc326d212598b6e720d0a422134e383d)
|
|
||||||
- Renamed the template [`fb77f4d`](https://git.odit.services/lfk/backend/commit/fb77f4d798550fdb6fe6b2c8a81198db0328f71e)
|
|
||||||
- Added a folder for the mail templates [`6b0155f`](https://git.odit.services/lfk/backend/commit/6b0155f01464f5ef73ab679b9e3219743e9db66b)
|
|
||||||
- Added a folder for the mail templates [`33890b5`](https://git.odit.services/lfk/backend/commit/33890b544b77272ab1c4797e91375d24568eae58)
|
|
||||||
|
|
||||||
#### [v0.3.1](https://git.odit.services/lfk/backend/compare/v0.3.0...v0.3.1)
|
|
||||||
|
|
||||||
> 27 January 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.3.1' (#127) from dev into main [`20f960e`](https://git.odit.services/lfk/backend/commit/20f960ed6700fe58c0556895e6485d26c4a4f5e2)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`e6fe8fc`](https://git.odit.services/lfk/backend/commit/e6fe8fcd587751392970d3ee412559b4c1d60f21)
|
|
||||||
- Merge pull request 'new advanced endpoints feature/125-team_runner' (#126) from feature/125-team_runner into dev [`870fd47`](https://git.odit.services/lfk/backend/commit/870fd47c83389345d7b24a15df6a4e61e930d140)
|
|
||||||
- Added get runners by team test [`69417e9`](https://git.odit.services/lfk/backend/commit/69417e93c081422561db1e211b12f32e539010ce)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`71898d5`](https://git.odit.services/lfk/backend/commit/71898d576c2620d2f2e2b4336e62f1d04a443201)
|
|
||||||
- Created the organizations/runners endpoint [`570c34b`](https://git.odit.services/lfk/backend/commit/570c34bed04e359f389a8f427486bf92891f1dcb)
|
|
||||||
- Created the runnerTeam/runners endpoint [`7be2971`](https://git.odit.services/lfk/backend/commit/7be2971a9e02bf0e784f7fe5cdd82afbbbf7f854)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`aedfcfc`](https://git.odit.services/lfk/backend/commit/aedfcfcc8359afd7dba4fa5e515e8e77fbb3fc6e)
|
|
||||||
- Added get runners by org test [`f71a22f`](https://git.odit.services/lfk/backend/commit/f71a22f4dd9bf14d39ced91908f6f6a5d8395e56)
|
|
||||||
- 🚀Bumped version to v0.3.1 [`db08760`](https://git.odit.services/lfk/backend/commit/db0876015bf0599dabb21357f172735888c79aa8)
|
|
||||||
|
|
||||||
#### [v0.3.0](https://git.odit.services/lfk/backend/compare/v0.2.1...v0.3.0)
|
|
||||||
|
|
||||||
> 24 January 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.3.0' (#122) from dev into main [`c964591`](https://git.odit.services/lfk/backend/commit/c9645918398e62a80341d038b6b6b5c60ee4b1c7)
|
|
||||||
- Renamed files and classed from *Organisation* to *Organization*📝 [`c6c643e`](https://git.odit.services/lfk/backend/commit/c6c643ecf125f5fdf58b105f97efad32e8545dd4)
|
|
||||||
- Changed organisation* to organization* in descriptions, comments and endoints ✏ [`ef15d0d`](https://git.odit.services/lfk/backend/commit/ef15d0d57619d79e014e0c0331965ca2bc664254)
|
|
||||||
- Added registration invalid citizen tests [`81d2197`](https://git.odit.services/lfk/backend/commit/81d2197a3e978ca43bc79720c32d75f8490f08df)
|
|
||||||
- Implemented registration key generation [`ad44650`](https://git.odit.services/lfk/backend/commit/ad446500f90f945aadc3510377bcfd2123440da0)
|
|
||||||
- Implemented a runner selfservice registration creation action [`10af1ba`](https://git.odit.services/lfk/backend/commit/10af1ba34148c992e94fa580e1c0210bfaea5112)
|
|
||||||
- Created a citizenrunner selfservice create action [`6df195b`](https://git.odit.services/lfk/backend/commit/6df195b6ec5fde27f84cbe54992558715b843b87)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`5660aec`](https://git.odit.services/lfk/backend/commit/5660aecb50c0e6dd538850c6375d2f692fb7a1f2)
|
|
||||||
- Implemented a registration key for organisations [`d490247`](https://git.odit.services/lfk/backend/commit/d490247d1e337a680b385d2115e82f79ba54a601)
|
|
||||||
- Updates old tests to the new ss-ktokens [`a9843ed`](https://git.odit.services/lfk/backend/commit/a9843ed4598485e6e3d18e78b876b6e000ea6e38)
|
|
||||||
- Added self-service get invalid tests [`e964a8e`](https://git.odit.services/lfk/backend/commit/e964a8ed44109899516c4d3b0dc35fe4990107a1)
|
|
||||||
- Implemented runner selfservice token generation [`c39a59e`](https://git.odit.services/lfk/backend/commit/c39a59e54ef0b1cc891684283422805af38969e3)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`cc4bf44`](https://git.odit.services/lfk/backend/commit/cc4bf4451cf4eac0e0f1bab02119c2dd5e300f48)
|
|
||||||
- Renamedpermisssions from *Organisation* to *Organization*📝 [`cd7e9b8`](https://git.odit.services/lfk/backend/commit/cd7e9b86b4b9d3e1ef0312f6fff436fcef4a5c94)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3697783`](https://git.odit.services/lfk/backend/commit/3697783e190e36f1168132d75da1eca7be27b4f6)
|
|
||||||
- Merge pull request 'OrganiZation rename feature/117-organization' (#121) from feature/117-organization into dev [`161feaf`](https://git.odit.services/lfk/backend/commit/161feaf364195c7b85041e06cdefef72d75b8951)
|
|
||||||
- Added registration valid company tests [`20e102e`](https://git.odit.services/lfk/backend/commit/20e102ec5c52c6a01144d064c96b8b2bd1ccfd00)
|
|
||||||
- Added registration invalid company tests [`29aeb04`](https://git.odit.services/lfk/backend/commit/29aeb046de769e37fd7257507e36337237697ea0)
|
|
||||||
- Added registration valid citizentests [`72941da`](https://git.odit.services/lfk/backend/commit/72941da1cb1c31fd6bfcba2ee3704f34bdd73ef0)
|
|
||||||
- Citizen runners now have to provide an email address for verification [`dee3639`](https://git.odit.services/lfk/backend/commit/dee36395a69da6c5e1bc4e94bd705b0418a6a3ff)
|
|
||||||
- Implemented the basics for the runner selfservice registration endpoint [`5288c70`](https://git.odit.services/lfk/backend/commit/5288c701c1ac880f3c8b7ece01457aae4bac87d7)
|
|
||||||
- Added selfservice get positive test [`0c87906`](https://git.odit.services/lfk/backend/commit/0c87906cc3fa5feaf1d7c186f68d978d4ed7fa8e)
|
|
||||||
- Fixed tests testing for a old responseclass [`45c8bb8`](https://git.odit.services/lfk/backend/commit/45c8bb83be0814bed8856a617de435f4694db76c)
|
|
||||||
- Fixed typo [`46f9503`](https://git.odit.services/lfk/backend/commit/46f9503543ee011d0780caeefa95748e4be45f58)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`c5d0646`](https://git.odit.services/lfk/backend/commit/c5d0646c425f83689bffd862edd568ca0c1b5ad8)
|
|
||||||
- Added registration invalid company tests [`e5b6f65`](https://git.odit.services/lfk/backend/commit/e5b6f650b25af776a543f7f9c7ccf0000bf07a66)
|
|
||||||
- Marked param as optional (default: false) [`f8d7544`](https://git.odit.services/lfk/backend/commit/f8d754451769e8361ec2367df7bc586f8fffe8eb)
|
|
||||||
- Bugfix: turned old entity in response to responseclass [`10f98e9`](https://git.odit.services/lfk/backend/commit/10f98e9c992b1fb45334e65082d7c47af214b6ac)
|
|
||||||
- Resolved missing relation [`3b2ed3f`](https://git.odit.services/lfk/backend/commit/3b2ed3f0f2557dccddf6ba656b201c196cc24bf0)
|
|
||||||
- Fixed fluctuating test bahaviour [`1227408`](https://git.odit.services/lfk/backend/commit/1227408407ac66b9689446c1f318b453a9d45069)
|
|
||||||
- 🚀Bumped version to v0.3.0 [`75e2a44`](https://git.odit.services/lfk/backend/commit/75e2a44c9c7f720d1a5a20611b305e5d56a9155b)
|
|
||||||
- Merge pull request 'Self service registration feature/112-selfservice_registration' (#120) from feature/112-selfservice_registration into dev [`6a66dd8`](https://git.odit.services/lfk/backend/commit/6a66dd803becb59172e8645c6b55898fb4b4c0b5)
|
|
||||||
- Implemented the citizen runner self-registration endpoint [`1b5465b`](https://git.odit.services/lfk/backend/commit/1b5465bea810f59cbf8bb1a3e82c062176f79c49)
|
|
||||||
- Citizen registration now returns tokens [`9dd9304`](https://git.odit.services/lfk/backend/commit/9dd9304a71eae94978710cf9db82dc030ca7a37d)
|
|
||||||
- Fixed wrong error getting thrown [`6469e3b`](https://git.odit.services/lfk/backend/commit/6469e3bc976c589b42fbac4a95bbee84f67244ee)
|
|
||||||
- Updated response schema error to a more fitting one [`5a00394`](https://git.odit.services/lfk/backend/commit/5a003945ac7d1a8d446c1bcc8007523b675ab6f5)
|
|
||||||
- Added check for empty token for runner self-service get [`6434b4d`](https://git.odit.services/lfk/backend/commit/6434b4dfce2da307d66ec5670d570d66ea8af8f8)
|
|
||||||
- Specified uft-8 format for string [`34c852b`](https://git.odit.services/lfk/backend/commit/34c852b12aaa88e64efa1e0575361c09652e22e1)
|
|
||||||
- MAde uuid column unique [`7b00b19`](https://git.odit.services/lfk/backend/commit/7b00b19fce3189069bcdbe0d2bcf91322506eb2b)
|
|
||||||
- Updated Method of removeing the team of citizen runners [`946efef`](https://git.odit.services/lfk/backend/commit/946efef2523c5ceb627b5c465343422cd985832d)
|
|
||||||
- Added openapi description [`73b1114`](https://git.odit.services/lfk/backend/commit/73b1114883ed2b87ef523130de4c5ca90a11c856)
|
|
||||||
|
|
||||||
#### [v0.2.1](https://git.odit.services/lfk/backend/compare/v0.2.0...v0.2.1)
|
|
||||||
|
|
||||||
> 21 January 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.2.1' (#119) from dev into main [`b441658`](https://git.odit.services/lfk/backend/commit/b44165857016c3ecdf0dffe8d324d572524d10ed)
|
|
||||||
- Created a donation runner response class for the runner selfservice [`88a7089`](https://git.odit.services/lfk/backend/commit/88a7089289e35be4468cb952b311fcb15c54c5a1)
|
|
||||||
- Readme reorganisation [skip ci] [`e2ec0a3`](https://git.odit.services/lfk/backend/commit/e2ec0a3b64a7388ae85d557dfb66354d70cd1b72)
|
|
||||||
- Added a seeder for runner test data [`9df9d9a`](https://git.odit.services/lfk/backend/commit/9df9d9ae80277d5ccc753639badb48c4afb13088)
|
|
||||||
- Created a donation respoinse class for the runner selfservice [`b89f7ac`](https://git.odit.services/lfk/backend/commit/b89f7ac1b4ddd6e53e6e2e8330c1fa2170b48591)
|
|
||||||
- Added barebones controller for the runner info selfservice [`2274b47`](https://git.odit.services/lfk/backend/commit/2274b476d6caa1de91bb13b6944f8dc233cf446e)
|
|
||||||
- Implemented a method for getting the runner object from a jwt [`8079769`](https://git.odit.services/lfk/backend/commit/80797698818f456c7746523d5a4f66267fdab10d)
|
|
||||||
- Added key-value like db table for config flags [`b15967f`](https://git.odit.services/lfk/backend/commit/b15967ff3162e9fe3a634a6f4fc5669f2314cc21)
|
|
||||||
- Added a /runners/id/scans endpoint [`a82fc0f`](https://git.odit.services/lfk/backend/commit/a82fc0fb9e9c3cbdc6be299b27164c0811e58775)
|
|
||||||
- Now creating a test contact [`1837336`](https://git.odit.services/lfk/backend/commit/1837336865893ca39d3bc628ff3c57e018a8555d)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`02677de`](https://git.odit.services/lfk/backend/commit/02677de5c07b2ac5dcff5567655130ba1b1d48cf)
|
|
||||||
- The data seeding now only get's triggered on the first time thx to using the key-value [`7bc6030`](https://git.odit.services/lfk/backend/commit/7bc603028dc60d26ffc5327868afbce512966d4d)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3a93c9c`](https://git.odit.services/lfk/backend/commit/3a93c9c078af38ba837b55bf4590867dfd401955)
|
|
||||||
- Added a "onlyValid" query param [`b5f3dec`](https://git.odit.services/lfk/backend/commit/b5f3dec93bfe4180abbe9ce74094cb1269d0e686)
|
|
||||||
- Added a citizen org seeder [`2db6510`](https://git.odit.services/lfk/backend/commit/2db6510a8ad83300b286a3bd35ca4db103da72d1)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`d528134`](https://git.odit.services/lfk/backend/commit/d5281348b6f3bd6f2e6936ee4497860699b8c3c6)
|
|
||||||
- 📖New license file version [CI SKIP] [skip ci] [`d8b6669`](https://git.odit.services/lfk/backend/commit/d8b6669d126e64d9e434b5f841ae17a02117822b)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`e95c457`](https://git.odit.services/lfk/backend/commit/e95c457e444e9d2e99c2af8b6ee369c36d4ca8ea)
|
|
||||||
- Beautified import [`c5f7cb2`](https://git.odit.services/lfk/backend/commit/c5f7cb2c68dbee0ab1e0361754f4d4b876666c82)
|
|
||||||
- 🚀Bumped version to v0.2.1 [`6de9d54`](https://git.odit.services/lfk/backend/commit/6de9d547b736c4538dac5254353d483576337290)
|
|
||||||
- Merge pull request 'Runner scans endpoint feature/113-runner_scans' (#116) from feature/113-runner_scans into dev [`36d01a0`](https://git.odit.services/lfk/backend/commit/36d01a0a890eb74428679ec6c4fcb14708aaa9fe)
|
|
||||||
- Added get tests for the /runner/scans endpoint [`26dff4f`](https://git.odit.services/lfk/backend/commit/26dff4f41829e8571231aff3c5d0e3a7c53559d8)
|
|
||||||
- Implemented the get part of the runner selfservice (no jwts are availdable yet (tm) [`da1fe34`](https://git.odit.services/lfk/backend/commit/da1fe34249a741115c1aeedcade16c5c852e896b)
|
|
||||||
- Fixed the bool converter for null values [`e12aedd`](https://git.odit.services/lfk/backend/commit/e12aedd1aad6de1f934e9593dda4607a303b2eb5)
|
|
||||||
- Added a config option for test data seeding [`67ba489`](https://git.odit.services/lfk/backend/commit/67ba489fe2f2a2706d640a668cd0e675ded6a7df)
|
|
||||||
- SEED_TEST_DATA is now false by default [`8870ebd`](https://git.odit.services/lfk/backend/commit/8870ebdb5e6d9045222440abc2c047929a74b520)
|
|
||||||
- Added sqlite as to env.sample db of choice [skip ci] [`f4668b6`](https://git.odit.services/lfk/backend/commit/f4668b6e81d7aeac62e24291ffcb39b00ea44aac)
|
|
||||||
- Merge pull request 'Runner selfservice info endpoint feature/111-runner_selfservic_info' (#115) from feature/111-runner_selfservic_info into dev [`1717df1`](https://git.odit.services/lfk/backend/commit/1717df113edeab2d2628041ee1eccc27380fd379)
|
|
||||||
- Merge pull request 'Implemented more seeding feature/110-seeding' (#114) from feature/110-seeding into dev [`886c109`](https://git.odit.services/lfk/backend/commit/886c1092d60f8e39357e3b841ed01bb082ede2c4)
|
|
||||||
- Updated the openapi description [`1915697`](https://git.odit.services/lfk/backend/commit/191569792c9a5cee93718555bba4e7679e4391af)
|
|
||||||
- Fixed wrong amount calculation [`4ee8079`](https://git.odit.services/lfk/backend/commit/4ee807973e1995681ec549f7c482bc5514a6ec55)
|
|
||||||
- Added bool conversion for testdata seeding env var [`c18012f`](https://git.odit.services/lfk/backend/commit/c18012f65a704e07acd56870c9ed9f6d06cf97a9)
|
|
||||||
- Now also seeding runners to the test org [`eab0e63`](https://git.odit.services/lfk/backend/commit/eab0e634a26c1a80e7fa2ccb9dc368f0760b2fd8)
|
|
||||||
|
|
||||||
#### [v0.2.0](https://git.odit.services/lfk/backend/compare/v0.1.1...v0.2.0)
|
|
||||||
|
|
||||||
> 20 January 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.2.0' (#109) from dev into main [`dd3d93e`](https://git.odit.services/lfk/backend/commit/dd3d93edc7db7ca7f133cb2d8f60c3eaf30bcbf0)
|
|
||||||
- Updated contact update tests [`c3d008e`](https://git.odit.services/lfk/backend/commit/c3d008ec0ff92f80addbdb93ffc1fa2b3278a8a6)
|
|
||||||
- Added contact delete tests [`dd7e5da`](https://git.odit.services/lfk/backend/commit/dd7e5dae368a8decd79357f658dda2164fa6f1e7)
|
|
||||||
- Added contact add valid tests [`e165f01`](https://git.odit.services/lfk/backend/commit/e165f019307e7745357493eacf3e2fa31538122b)
|
|
||||||
- Cleaned up var names [`a3c93f0`](https://git.odit.services/lfk/backend/commit/a3c93f0d394833f1a6f78d862b094ca751c85561)
|
|
||||||
- Added address update ivalid tests [`427dfaa`](https://git.odit.services/lfk/backend/commit/427dfaafabd243e94aba27c2dec2705fd8ed5d64)
|
|
||||||
- Added barebones contact controller from donor-controller [`3e7190e`](https://git.odit.services/lfk/backend/commit/3e7190e279181c5f99d890ca141489b24908b904)
|
|
||||||
- Added first address update tests [`4d40225`](https://git.odit.services/lfk/backend/commit/4d40225a4491e8eb3f41ef0fd558a599f63729be)
|
|
||||||
- Added a contact update class [`c172aa8`](https://git.odit.services/lfk/backend/commit/c172aa8bf8083500828743ed696955a1fe3caef2)
|
|
||||||
- Added address update valid tests [`230cdb0`](https://git.odit.services/lfk/backend/commit/230cdb0e37e2b7a21e7feb156f2b91a69ad200fd)
|
|
||||||
- Implemented deep address validation [`9dc9ce3`](https://git.odit.services/lfk/backend/commit/9dc9ce37d8fbfc92842e4e05bbde68398324a186)
|
|
||||||
- Added contact add invalid tests [`940d62c`](https://git.odit.services/lfk/backend/commit/940d62cde4cf7be7780904d681a5e4c9efaa2ba5)
|
|
||||||
- Added a contact response class [`1407fe3`](https://git.odit.services/lfk/backend/commit/1407fe36f3637d6c53024c48788b318d985f8960)
|
|
||||||
- Removed old create address class [`2a465f8`](https://git.odit.services/lfk/backend/commit/2a465f88c58c0b4be3ecd99d96a04c177a40b312)
|
|
||||||
- Switched the create classes over to the new address implementation [`2cd15d2`](https://git.odit.services/lfk/backend/commit/2cd15d25e934a5439bfea4de901f136e360e17f6)
|
|
||||||
- Added contact get tests [`b002cf2`](https://git.odit.services/lfk/backend/commit/b002cf2df1eafc722fbfb51b3bffb02bee002305)
|
|
||||||
- Test's now accept the new address format [`8dbee32`](https://git.odit.services/lfk/backend/commit/8dbee32eeec8ee3d013e4446e8f53544ee4cb577)
|
|
||||||
- Implemented the get endpoints [`ab70f7e`](https://git.odit.services/lfk/backend/commit/ab70f7e49893344dde8f5af93f571a5d67818e19)
|
|
||||||
- Implemented contact deletion [`0379786`](https://git.odit.services/lfk/backend/commit/0379786cbda057ad95d709fa135d34beb0db8de1)
|
|
||||||
- Removed the IAddressUser Interface entity [`e265172`](https://git.odit.services/lfk/backend/commit/e2651728c5abf2273bf51a7652c51d55d8fa0a2f)
|
|
||||||
- Implemented contact updateing [`28fb983`](https://git.odit.services/lfk/backend/commit/28fb9834e18bde012c5b51cc49a39585d20f7cc1)
|
|
||||||
- Fixed key null constraint [`de82437`](https://git.odit.services/lfk/backend/commit/de824375d3a1da6ee4d78ea39b7da66fc05f2a02)
|
|
||||||
- Implemented contact posting [`11af9c0`](https://git.odit.services/lfk/backend/commit/11af9c02d977dcd6919652256dbdb9fd5438cabd)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`8960aa5`](https://git.odit.services/lfk/backend/commit/8960aa5545ddeb57d4ef42c21c0ca6001dfeaea9)
|
|
||||||
- Implemented contact group setting on creation [`3b06d1a`](https://git.odit.services/lfk/backend/commit/3b06d1a6ef3c95eb5bb7d485accddabba0a8e4f7)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`32e054e`](https://git.odit.services/lfk/backend/commit/32e054eb84c869210fd483583ae5a6d0e2249cf9)
|
|
||||||
- Switched Address to embedded entity [`7fbe649`](https://git.odit.services/lfk/backend/commit/7fbe649dc90f4bb9f240c5a80fed447048e5e105)
|
|
||||||
- Removed the address errors [`58ae9b5`](https://git.odit.services/lfk/backend/commit/58ae9b589aef3580f4b8558c3d5ddbd7171e7915)
|
|
||||||
- Switched the update classes over to the new address implementation [`d0df5dd`](https://git.odit.services/lfk/backend/commit/d0df5dd641ac17f1fd8ad6bd8b46afa9dd2745c3)
|
|
||||||
- Updated the contact errors [`a9a5eb6`](https://git.odit.services/lfk/backend/commit/a9a5eb673570bb3c0d1a55bb1292e208493663bd)
|
|
||||||
- Implemented adress deletion (through reset) [`57b9c2b`](https://git.odit.services/lfk/backend/commit/57b9c2babcd68d69d1cbb240a86c2897717ba758)
|
|
||||||
- Fixed donor address check [`4824547`](https://git.odit.services/lfk/backend/commit/4824547dde4d7f90e9e2377a26df34cabf082fdb)
|
|
||||||
- Updated contact delete tests [`8ae53f1`](https://git.odit.services/lfk/backend/commit/8ae53f1c4930e2fd72eb230a5314336f3a45a611)
|
|
||||||
- Added address to contact response [`09e429f`](https://git.odit.services/lfk/backend/commit/09e429fc676c7dd370bba0495b072f81867bd250)
|
|
||||||
- Updated the responseclasses to use the new address implementation [`dafac06`](https://git.odit.services/lfk/backend/commit/dafac06bc84d1b237096a561b3adcd3ca5cb1dd8)
|
|
||||||
- Added address validity check [`ae7c5ff`](https://git.odit.services/lfk/backend/commit/ae7c5ff0c387e9337d01a9dd819a4dddc208f6dd)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`da9a359`](https://git.odit.services/lfk/backend/commit/da9a3592510eacd2d67a127dc61e954343e0444b)
|
|
||||||
- 🚀Bumped version to v0.2.0 [`ddafd90`](https://git.odit.services/lfk/backend/commit/ddafd90d3e41fb9ee37172a8306c30d8483dfe2c)
|
|
||||||
- Merge pull request 'Implemented group contacts feature/104-contacts' (#108) from feature/104-contacts into dev [`a0c2b5a`](https://git.odit.services/lfk/backend/commit/a0c2b5ade8d198ec16d33b39e47205e8b03a669f)
|
|
||||||
- Updated comments [`a4e8311`](https://git.odit.services/lfk/backend/commit/a4e8311cbd22588ecb4dc2fdbe05397b07d336f8)
|
|
||||||
- Removed (now useless) relations [`673dea2`](https://git.odit.services/lfk/backend/commit/673dea2e5754e99ff77f7556d4fc03d4cca28a94)
|
|
||||||
- Added missing id property [`6b4b16c`](https://git.odit.services/lfk/backend/commit/6b4b16c13b0c2f55745ded3431cad2f4986be296)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`f53894b`](https://git.odit.services/lfk/backend/commit/f53894b16ac1c06ecbeeb0b63a56ac438b2fbe1b)
|
|
||||||
- Updated comments [`8bc01d3`](https://git.odit.services/lfk/backend/commit/8bc01d3f2406ce8e58c2ab2963c858495c510dcf)
|
|
||||||
- Fixed contact cascading [`179c2a5`](https://git.odit.services/lfk/backend/commit/179c2a5157fca036acf8d0e6a51821d377860bc1)
|
|
||||||
- Added openapi description about non-deletion [`56c73c2`](https://git.odit.services/lfk/backend/commit/56c73c2555d4d12ffb088ec5550667022d3a8694)
|
|
||||||
- Added contact permission target [`d12801e`](https://git.odit.services/lfk/backend/commit/d12801e34d57cec0e867f69123e3be39ed2fe2f5)
|
|
||||||
- Adjusted env sample [`a1acd35`](https://git.odit.services/lfk/backend/commit/a1acd3519f66965202da0cd15df61a807230619c)
|
|
||||||
- Renamed controller to better fit the overall nameing scheme [`d743f7e`](https://git.odit.services/lfk/backend/commit/d743f7ee1277256ada8fe39f900349ff2643118a)
|
|
||||||
- Fixed column not getting resolved [`2b658ac`](https://git.odit.services/lfk/backend/commit/2b658ac381f318cf37fc2051ea3e83976e3c5773)
|
|
||||||
- Fixed column not getting resolved [`321d291`](https://git.odit.services/lfk/backend/commit/321d291b4bf983ff4930cadecf3a013430a97649)
|
|
||||||
- Set country code for the ci env to DE [`30b585c`](https://git.odit.services/lfk/backend/commit/30b585c0c12b3b9818778110d33d5b3ab84d4192)
|
|
||||||
- Implemented postal code validation for the validaton function [`f245840`](https://git.odit.services/lfk/backend/commit/f245840cde5726611197b00730aca72ea133c427)
|
|
||||||
- Fixed push undefined eror [`2eb26e4`](https://git.odit.services/lfk/backend/commit/2eb26e4e381a97fd829a294501fa42ac7b712b56)
|
|
||||||
- Merge pull request 'Fully implemented addresses feature/105-addresses' (#107) from feature/105-addresses into dev [`5e36855`](https://git.odit.services/lfk/backend/commit/5e368552ea810ea1d3963b1207ba98f7b46c4abc)
|
|
||||||
|
|
||||||
#### [v0.1.1](https://git.odit.services/lfk/backend/compare/v0.1.0...v0.1.1)
|
#### [v0.1.1](https://git.odit.services/lfk/backend/compare/v0.1.0...v0.1.1)
|
||||||
|
|
||||||
> 16 January 2021
|
|
||||||
|
|
||||||
- Merge pull request 'Alpha Release 0.1.1 - Hotfix release' (#106) from dev into main [`7533c34`](https://git.odit.services/lfk/backend/commit/7533c349ef98ed328151259fca68621b3eb5fd98)
|
|
||||||
- 🚀Bumped version to v0.1.1 [`9445c6f`](https://git.odit.services/lfk/backend/commit/9445c6f21e376329b9200664a44a94ba1f1dd463)
|
- 🚀Bumped version to v0.1.1 [`9445c6f`](https://git.odit.services/lfk/backend/commit/9445c6f21e376329b9200664a44a94ba1f1dd463)
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`1b9d296`](https://git.odit.services/lfk/backend/commit/1b9d2969ebdca4dca84898b1e8307be7b781b90b)
|
- 🧾New changelog file version [CI SKIP] [skip ci] [`1b9d296`](https://git.odit.services/lfk/backend/commit/1b9d2969ebdca4dca84898b1e8307be7b781b90b)
|
||||||
- Implemented the /me controller that allows a user to get and update themselves [`8ef5f90`](https://git.odit.services/lfk/backend/commit/8ef5f90abda97a73d5c5a7767a144ac3fb5288c1)
|
- Implemented the /me controller that allows a user to get and update themselves [`8ef5f90`](https://git.odit.services/lfk/backend/commit/8ef5f90abda97a73d5c5a7767a144ac3fb5288c1)
|
||||||
@ -902,13 +14,12 @@ All notable changes to this project will be documented in this file. Dates are d
|
|||||||
- automaticly merge main into dev after building a latest image [`02efb9a`](https://git.odit.services/lfk/backend/commit/02efb9a8e55831ecce4109e17b2f07a56e491fd5)
|
- automaticly merge main into dev after building a latest image [`02efb9a`](https://git.odit.services/lfk/backend/commit/02efb9a8e55831ecce4109e17b2f07a56e491fd5)
|
||||||
- User deletion now requires confirmation [`6b7ecd3`](https://git.odit.services/lfk/backend/commit/6b7ecd3044c45b2eed46ee5010bed4dab4f02df9)
|
- User deletion now requires confirmation [`6b7ecd3`](https://git.odit.services/lfk/backend/commit/6b7ecd3044c45b2eed46ee5010bed4dab4f02df9)
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`3766899`](https://git.odit.services/lfk/backend/commit/3766899c8393545a89986a98dafd542edc4a1d39)
|
- 🧾New changelog file version [CI SKIP] [skip ci] [`3766899`](https://git.odit.services/lfk/backend/commit/3766899c8393545a89986a98dafd542edc4a1d39)
|
||||||
- Created barebones file for the userchecker [`e586a11`](https://git.odit.services/lfk/backend/commit/e586a11e2ad42af9c9bb5d2a47f48e3306fe49b2)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`6febb99`](https://git.odit.services/lfk/backend/commit/6febb994990b4cab7ee54b0368f74dd95664bfdf)
|
- 🧾New changelog file version [CI SKIP] [skip ci] [`6febb99`](https://git.odit.services/lfk/backend/commit/6febb994990b4cab7ee54b0368f74dd95664bfdf)
|
||||||
|
- 🧾New changelog file version [CI SKIP] [skip ci] [`de36a24`](https://git.odit.services/lfk/backend/commit/de36a24191a8cdc4ff6b23637ea9f91109b59bbb)
|
||||||
|
- Merge pull request 'User self-management feature/100-me_endpoints' (#103) from feature/100-me_endpoints into dev [`a6c7d54`](https://git.odit.services/lfk/backend/commit/a6c7d54fe72ffe23add926afa0be150a7a370099)
|
||||||
|
- Created barebones file for the userchecker [`e586a11`](https://git.odit.services/lfk/backend/commit/e586a11e2ad42af9c9bb5d2a47f48e3306fe49b2)
|
||||||
- Updated descriptions and responses [`fc7b8f4`](https://git.odit.services/lfk/backend/commit/fc7b8f4c16cef0e72b04f096d5a17d4144b5feb7)
|
- Updated descriptions and responses [`fc7b8f4`](https://git.odit.services/lfk/backend/commit/fc7b8f4c16cef0e72b04f096d5a17d4144b5feb7)
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`50b893f`](https://git.odit.services/lfk/backend/commit/50b893f5370902ccc40f8bb45ed160103400f529)
|
- 🧾New changelog file version [CI SKIP] [skip ci] [`50b893f`](https://git.odit.services/lfk/backend/commit/50b893f5370902ccc40f8bb45ed160103400f529)
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`de36a24`](https://git.odit.services/lfk/backend/commit/de36a24191a8cdc4ff6b23637ea9f91109b59bbb)
|
|
||||||
- 🧾New changelog file version [CI SKIP] [skip ci] [`91569ce`](https://git.odit.services/lfk/backend/commit/91569ced40402a63017a90a01efaf48578b5c806)
|
|
||||||
- Merge pull request 'User self-management feature/100-me_endpoints' (#103) from feature/100-me_endpoints into dev [`a6c7d54`](https://git.odit.services/lfk/backend/commit/a6c7d54fe72ffe23add926afa0be150a7a370099)
|
|
||||||
- Moved the me endpoints to /users/me [`f9834b5`](https://git.odit.services/lfk/backend/commit/f9834b5f4d80b11ee5f7773b339dd421341c6e7f)
|
- Moved the me endpoints to /users/me [`f9834b5`](https://git.odit.services/lfk/backend/commit/f9834b5f4d80b11ee5f7773b339dd421341c6e7f)
|
||||||
- Moved optional param to being optional [`a334adf`](https://git.odit.services/lfk/backend/commit/a334adffc6d07c8ab340263123e00a96f21acecb)
|
- Moved optional param to being optional [`a334adf`](https://git.odit.services/lfk/backend/commit/a334adffc6d07c8ab340263123e00a96f21acecb)
|
||||||
|
|
||||||
|
27
Dockerfile
27
Dockerfile
@ -1,23 +1,16 @@
|
|||||||
# Typescript Build
|
# Typescript Build
|
||||||
FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as build
|
FROM node:14.15.1-alpine3.12
|
||||||
ARG NPM_REGISTRY_URL=https://registry.npmjs.org
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY package.json ./
|
COPY package.json ./
|
||||||
RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
|
RUN npm i -g pnpm
|
||||||
RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
|
RUN pnpm i
|
||||||
|
|
||||||
COPY tsconfig.json ormconfig.js ./
|
COPY tsconfig.json ormconfig.js ./
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
RUN pnpm run build \
|
RUN pnpm run build
|
||||||
&& rm -rf /app/node_modules \
|
|
||||||
&& pnpm i --production --prefer-offline
|
|
||||||
|
|
||||||
# final image
|
# final image
|
||||||
FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as final
|
FROM node:14.15.1-alpine3.12
|
||||||
WORKDIR /app
|
COPY package.json ormconfig.js ./
|
||||||
COPY --from=build /app/package.json /app/package.json
|
RUN npm i -g pnpm
|
||||||
COPY --from=build /app/ormconfig.js /app/ormconfig.js
|
RUN pnpm i --prod
|
||||||
COPY --from=build /app/dist /app/dist
|
COPY --from=0 /app/dist dist
|
||||||
COPY --from=build /app/node_modules /app/node_modules
|
ENTRYPOINT ["node", "dist/app.js"]
|
||||||
ENTRYPOINT ["node", "/app/dist/app.js"]
|
|
115
README.md
115
README.md
@ -2,73 +2,39 @@
|
|||||||
|
|
||||||
Backend Server
|
Backend Server
|
||||||
|
|
||||||
## Quickstart 🐳
|
|
||||||
> Use this to run the backend with a postgresql db in docker
|
|
||||||
|
|
||||||
1. Clone the repo or copy the docker-compose
|
|
||||||
2. Run in toe folder that contains the docker-compose file: `docker-compose up -d`
|
|
||||||
3. Visit http://127.0.0.1:4010/api/docs to check if the server is running
|
|
||||||
4. You can now use the default admin user (`demo:demo`)
|
|
||||||
|
|
||||||
## Dev Setup 🛠
|
## Dev Setup 🛠
|
||||||
> Local dev setup utilizing sqlite3 as the database.
|
|
||||||
|
|
||||||
1. Rename the .env.example file to .env (you can adjust app port and other settings, if needed)
|
### Local w/ sqlite
|
||||||
|
|
||||||
|
1. Create a .env file in the project root containing:
|
||||||
|
```
|
||||||
|
APP_PORT=4010
|
||||||
|
DB_TYPE=sqlite
|
||||||
|
DB_HOST=bla
|
||||||
|
DB_PORT=bla
|
||||||
|
DB_USER=bla
|
||||||
|
DB_PASSWORD=bla
|
||||||
|
DB_NAME=./test.sqlite
|
||||||
|
```
|
||||||
2. Install Dependencies
|
2. Install Dependencies
|
||||||
```bash
|
```bash
|
||||||
pnpm i
|
yarn
|
||||||
```
|
```
|
||||||
3. Start the server
|
3. Start the server
|
||||||
```bash
|
```bash
|
||||||
pnpm dev
|
yarn dev
|
||||||
```
|
```
|
||||||
|
|
||||||
### Run Tests
|
|
||||||
```bash
|
|
||||||
# Run tests once (server has to run)
|
|
||||||
pnpm test
|
|
||||||
|
|
||||||
# Run test in watch mode (reruns on change)
|
|
||||||
pnpm test:watch
|
|
||||||
|
|
||||||
# Run test in ci mode (automaticly starts the dev server)
|
|
||||||
pnpm test:ci
|
|
||||||
```
|
|
||||||
|
|
||||||
### Use your own mail templates
|
|
||||||
> You use your own mail templates by replacing the default ones we provided (either in-code or by mounting them into the /app/static/mail_templates folder).
|
|
||||||
|
|
||||||
The mail templates always come in a .html and a .txt variant to provide compatability with legacy mail clients.
|
|
||||||
Currently the following templates exist:
|
|
||||||
* pw-reset.(html/txt)
|
|
||||||
|
|
||||||
### Generate Docs
|
### Generate Docs
|
||||||
```bash
|
```
|
||||||
pnpm docs
|
yarn docs
|
||||||
```
|
```
|
||||||
|
|
||||||
## ENV Vars
|
### Docker w/ postgres 🐳
|
||||||
> You can provide them via .env file or docker env vars.
|
|
||||||
> You can use the `test:ci:generate_env` package script to generate a example env (uses bs data as test server and ignores the errors).
|
|
||||||
|
|
||||||
| Name | Type | Default | Description |
|
|
||||||
| ---------------------- | ------------------ | -------------------- | -------------------------------------------------------------------------------------------------------------- |
|
|
||||||
| APP_PORT | Number | 4010 | The port the backend server listens on. Is optional. |
|
|
||||||
| DB_TYPE | String | N/A | The type of the db u want to use. It has to be supported by typeorm. Possible: `sqlite`, `mysql`, `postgresql` |
|
|
||||||
| DB_HOST | String | N/A | The db's host's ip-address/fqdn or file path for sqlite |
|
|
||||||
| DB_PORT | String | N/A | The db's port |
|
|
||||||
| DB_USER | String | N/A | The user for accessing the db |
|
|
||||||
| DB_PASSWORD | String | N/A | The user's password for accessing the db |
|
|
||||||
| DB_NAME | String | N/A | The db's name |
|
|
||||||
| NODE_ENV | String | dev | The apps env - influences debug info. Also when the env is set to "test", mailing errors get ignored. |
|
|
||||||
| POSTALCODE_COUNTRYCODE | String/CountryCode | N/A | The countrycode used to validate address's postal codes |
|
|
||||||
| PHONE_COUNTRYCODE | String/CountryCode | null (international) | The countrycode used to validate phone numers |
|
|
||||||
| SEED_TEST_DATA | Boolean | False | If you want the app to seed some example data set this to true |
|
|
||||||
| MAILER_URL | String(Url) | N/A | The mailer's base url (no trailing slash) |
|
|
||||||
| MAILER_KEY | String | N/A | The mailer's api key. |
|
|
||||||
| IMPRINT_URL | String(Url) | /imprint | The link to a imprint page for the system (Defaults to the frontend's imprint) |
|
|
||||||
| PRIVACY_URL | String(Url) | /privacy | The link to a privacy page for the system (Defaults to the frontend's privacy page) |
|
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker-compose up --build
|
||||||
|
```
|
||||||
|
|
||||||
## Recommended Editor
|
## Recommended Editor
|
||||||
|
|
||||||
@ -76,19 +42,22 @@ pnpm docs
|
|||||||
|
|
||||||
### Recommended Extensions
|
### Recommended Extensions
|
||||||
|
|
||||||
* will be automatically recommended via ./vscode/extensions.json
|
- will be automatically recommended via ./vscode/extensions.json
|
||||||
|
|
||||||
## Staging
|
## Branches
|
||||||
### Branches & Tags
|
- main: Protected "release" branch
|
||||||
* vX.Y.Z: Release tags created from the main branch
|
- dev: Current dev branch for merging the different features - only push for merges or minor changes!
|
||||||
* The version numbers follow the semver standard
|
- feature/xyz: Feature branches - `feature/issueid-title`
|
||||||
* A new release tag automaticly triggers the release ci pipeline
|
- bugfix/xyz: Branches for bugfixes - `bugfix/issueid-title` (no id for readme changes needed)
|
||||||
* main: Protected "release" branch
|
|
||||||
* The latest tag of the docker image get's build from this
|
|
||||||
* dev: Current dev branch for merging the different feature branches and bugfixes
|
## File Structure
|
||||||
* New releases get created as tags from this
|
|
||||||
* The dev tag of the docker image get's build from this
|
- src/models/entities\* - database models (typeorm entities)
|
||||||
* Only push minor changes to this branch!
|
- src/models/actions\* - actions models
|
||||||
* To merge a feature branch into this please create a pull request
|
- src/models/responses\* - response models
|
||||||
* feature/xyz: Feature branches - naming scheme: `feature/issueid-title`
|
- src/controllers/\* - routing-controllers
|
||||||
* bugfix/xyz: Branches for bugfixes - naming scheme:`bugfix/issueid-title`
|
- src/loaders/\* - loaders for the different init steps of the api server
|
||||||
|
- src/middlewares/\* - express middlewares (mainly auth r/n)
|
||||||
|
- src/errors/* - our custom (http) errors
|
||||||
|
- src/routes/\* - express routes for everything we don't do via routing-controllers (depreciated)
|
@ -11,12 +11,8 @@ services:
|
|||||||
DB_PORT: bla
|
DB_PORT: bla
|
||||||
DB_USER: bla
|
DB_USER: bla
|
||||||
DB_PASSWORD: bla
|
DB_PASSWORD: bla
|
||||||
DB_NAME: ./db.sqlite
|
DB_NAME: dev.sqlite
|
||||||
NODE_ENV: production
|
NODE_ENV: production
|
||||||
POSTALCODE_COUNTRYCODE: DE
|
|
||||||
SEED_TEST_DATA: "false"
|
|
||||||
MAILER_URL: https://dev.lauf-fuer-kaya.de/mailer
|
|
||||||
MAILER_KEY: asdasd
|
|
||||||
# APP_PORT: 4010
|
# APP_PORT: 4010
|
||||||
# DB_TYPE: postgres
|
# DB_TYPE: postgres
|
||||||
# DB_HOST: backend_db
|
# DB_HOST: backend_db
|
||||||
|
267
licenses.md
267
licenses.md
@ -1,32 +1,3 @@
|
|||||||
# @odit/class-validator-jsonschema
|
|
||||||
**Author**: Aleksi Pekkala <aleksipekkala@gmail.com>
|
|
||||||
**Repo**: git@github.com:epiphone/class-validator-jsonschema.git
|
|
||||||
**License**: MIT
|
|
||||||
**Description**: Convert class-validator-decorated classes into JSON schema
|
|
||||||
## License Text
|
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2017 Aleksi Pekkala
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
|
|
||||||
# argon2
|
# argon2
|
||||||
**Author**: Ranieri Althoff <ranisalt+argon2@gmail.com>
|
**Author**: Ranieri Althoff <ranisalt+argon2@gmail.com>
|
||||||
**Repo**: [object Object]
|
**Repo**: [object Object]
|
||||||
@ -57,33 +28,6 @@ SOFTWARE.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
# axios
|
|
||||||
**Author**: Matt Zabriskie
|
|
||||||
**Repo**: [object Object]
|
|
||||||
**License**: MIT
|
|
||||||
**Description**: Promise based HTTP client for the browser and node.js
|
|
||||||
## License Text
|
|
||||||
Copyright (c) 2014-present Matt Zabriskie
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
|
||||||
|
|
||||||
|
|
||||||
# body-parser
|
# body-parser
|
||||||
**Author**: undefined
|
**Author**: undefined
|
||||||
**Repo**: expressjs/body-parser
|
**Repo**: expressjs/body-parser
|
||||||
@ -115,35 +59,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|||||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
# check-password-strength
|
|
||||||
**Author**: deanilvincent
|
|
||||||
**Repo**: [object Object]
|
|
||||||
**License**: MIT
|
|
||||||
**Description**: A NPM Password strength checker based from Javascript RegExp. Check passphrase if it's "Weak", "Medium" or "Strong"
|
|
||||||
## License Text
|
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2020 Mark Deanil Vicente
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
|
|
||||||
# class-transformer
|
# class-transformer
|
||||||
**Author**: [object Object]
|
**Author**: [object Object]
|
||||||
**Repo**: [object Object]
|
**Repo**: [object Object]
|
||||||
@ -173,15 +88,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|||||||
THE SOFTWARE.
|
THE SOFTWARE.
|
||||||
|
|
||||||
# class-validator
|
# class-validator
|
||||||
**Author**: TypeStack contributors
|
**Author**: [object Object]
|
||||||
**Repo**: [object Object]
|
**Repo**: [object Object]
|
||||||
**License**: MIT
|
**License**: MIT
|
||||||
**Description**: Decorator-based property validation for classes.
|
**Description**: Class-based validation with Typescript / ES6 / ES5 using decorators or validation schemas. Supports both node.js and browser
|
||||||
## License Text
|
## License Text
|
||||||
|
|
||||||
|
|
||||||
The MIT License
|
# class-validator-jsonschema
|
||||||
|
**Author**: Aleksi Pekkala <aleksipekkala@gmail.com>
|
||||||
|
**Repo**: git@github.com:epiphone/class-validator-jsonschema.git
|
||||||
|
**License**: MIT
|
||||||
|
**Description**: Convert class-validator-decorated classes into JSON schema
|
||||||
|
## License Text
|
||||||
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2015-2020 TypeStack
|
Copyright (c) 2017 Aleksi Pekkala
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
@ -190,16 +112,17 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|||||||
copies of the Software, and to permit persons to whom the Software is
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
furnished to do so, subject to the following conditions:
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
The above copyright notice and this permission notice shall be included in all
|
||||||
all copies or substantial portions of the Software.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
THE SOFTWARE.
|
SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
# consola
|
# consola
|
||||||
**Author**: undefined
|
**Author**: undefined
|
||||||
@ -409,60 +332,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
# libphonenumber-js
|
|
||||||
**Author**: catamphetamine <purecatamphetamine@gmail.com>
|
|
||||||
**Repo**: [object Object]
|
|
||||||
**License**: MIT
|
|
||||||
**Description**: A simpler (and smaller) rewrite of Google Android's libphonenumber library in javascript
|
|
||||||
## License Text
|
|
||||||
(The MIT License)
|
|
||||||
|
|
||||||
Copyright (c) 2016 @catamphetamine <purecatamphetamine@gmail.com>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
'Software'), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
||||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
||||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
||||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
# mysql
|
# mysql
|
||||||
**Author**: Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)
|
**Author**: Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)
|
||||||
**Repo**: mysqljs/mysql
|
**Repo**: mysqljs/mysql
|
||||||
**License**: MIT
|
**License**: MIT
|
||||||
**Description**: A node.js driver for mysql. It is written in JavaScript, does not require compiling, and is 100% MIT licensed.
|
**Description**: A node.js driver for mysql. It is written in JavaScript, does not require compiling, and is 100% MIT licensed.
|
||||||
## License Text
|
## License Text
|
||||||
Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
|
||||||
|
|
||||||
|
|
||||||
# pg
|
# pg
|
||||||
@ -715,80 +590,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|||||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
# @faker-js/faker
|
|
||||||
**Author**: undefined
|
|
||||||
**Repo**: [object Object]
|
|
||||||
**License**: MIT
|
|
||||||
**Description**: Generate massive amounts of fake contextual data
|
|
||||||
## License Text
|
|
||||||
Faker - Copyright (c) 2022
|
|
||||||
|
|
||||||
This software consists of voluntary contributions made by many individuals.
|
|
||||||
For exact contribution history, see the revision history
|
|
||||||
available at https://github.com/faker-js/faker
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
"Software"), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
||||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
||||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
||||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
===
|
|
||||||
|
|
||||||
From: https://github.com/faker-js/faker/commit/a9f98046c7d5eeaabe12fc587024c06d683800b8
|
|
||||||
To: https://github.com/faker-js/faker/commit/29234378807c4141588861f69421bf20b5ac635e
|
|
||||||
|
|
||||||
Based on faker.js, copyright Marak Squires and contributor, what follows below is the original license.
|
|
||||||
|
|
||||||
===
|
|
||||||
|
|
||||||
faker.js - Copyright (c) 2020
|
|
||||||
Marak Squires
|
|
||||||
http://github.com/marak/faker.js/
|
|
||||||
|
|
||||||
faker.js was inspired by and has used data definitions from:
|
|
||||||
|
|
||||||
* https://github.com/stympy/faker/ - Copyright (c) 2007-2010 Benjamin Curtis
|
|
||||||
* http://search.cpan.org/~jasonk/Data-Faker-0.07/ - Copyright 2004-2005 by Jason Kohles
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
"Software"), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
||||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
||||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
||||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
|
|
||||||
# @odit/license-exporter
|
# @odit/license-exporter
|
||||||
**Author**: ODIT.Services
|
**Author**: ODIT.Services
|
||||||
**Repo**: [object Object]
|
**Repo**: [object Object]
|
||||||
**License**: MIT
|
**License**: MIT
|
||||||
**Description**: A simple license crawler for crediting open source work
|
**Description**: A simple license crawler
|
||||||
## License Text
|
## License Text
|
||||||
MIT License Copyright (c) 2020 ODIT.Services (info@odit.services)
|
MIT License Copyright (c) 2020 ODIT.Services (info@odit.services)
|
||||||
|
|
||||||
@ -1014,15 +820,13 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||||||
SOFTWARE
|
SOFTWARE
|
||||||
|
|
||||||
|
|
||||||
# auto-changelog
|
# axios
|
||||||
**Author**: Pete Cook <pete@cookpete.com> (https://github.com/cookpete)
|
**Author**: Matt Zabriskie
|
||||||
**Repo**: [object Object]
|
**Repo**: [object Object]
|
||||||
**License**: MIT
|
**License**: MIT
|
||||||
**Description**: Command line tool for generating a changelog from git tags and commit history
|
**Description**: Promise based HTTP client for the browser and node.js
|
||||||
## License Text
|
## License Text
|
||||||
The MIT License
|
Copyright (c) 2014-present Matt Zabriskie
|
||||||
|
|
||||||
Copyright (c) 2017 Pete Cook https://cookpete.com
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
@ -1130,35 +934,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
# release-it
|
|
||||||
**Author**: [object Object]
|
|
||||||
**Repo**: [object Object]
|
|
||||||
**License**: MIT
|
|
||||||
**Description**: Generic CLI tool to automate versioning and package publishing related tasks.
|
|
||||||
## License Text
|
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2018 Lars Kappert
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
|
|
||||||
# rimraf
|
# rimraf
|
||||||
**Author**: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
|
**Author**: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
|
||||||
**Repo**: git://github.com/isaacs/rimraf.git
|
**Repo**: git://github.com/isaacs/rimraf.git
|
||||||
|
220
package.json
220
package.json
@ -1,117 +1,103 @@
|
|||||||
{
|
{
|
||||||
"name": "@odit/lfk-backend",
|
"name": "@odit/lfk-backend",
|
||||||
"version": "1.1.3",
|
"version": "0.1.1",
|
||||||
"main": "src/app.ts",
|
"main": "src/app.ts",
|
||||||
"repository": "https://git.odit.services/lfk/backend",
|
"repository": "https://git.odit.services/lfk/backend",
|
||||||
"engines": {
|
"author": {
|
||||||
"pnpm": "8"
|
"name": "ODIT.Services",
|
||||||
},
|
"email": "info@odit.services",
|
||||||
"author": {
|
"url": "https://odit.services"
|
||||||
"name": "ODIT.Services",
|
},
|
||||||
"email": "info@odit.services",
|
"contributors": [
|
||||||
"url": "https://odit.services"
|
{
|
||||||
},
|
"name": "Philipp Dormann",
|
||||||
"contributors": [
|
"email": "philipp@philippdormann.de",
|
||||||
{
|
"url": "https://philippdormann.de"
|
||||||
"name": "Philipp Dormann",
|
},
|
||||||
"email": "philipp@philippdormann.de",
|
{
|
||||||
"url": "https://philippdormann.de"
|
"name": "Nicolai Ort",
|
||||||
},
|
"email": "info@nicolai-ort.com",
|
||||||
{
|
"url": "https://nicolai-ort.com"
|
||||||
"name": "Nicolai Ort",
|
}
|
||||||
"email": "info@nicolai-ort.com",
|
],
|
||||||
"url": "https://nicolai-ort.com"
|
"license": "CC-BY-NC-SA-4.0",
|
||||||
}
|
"dependencies": {
|
||||||
],
|
"@odit/class-validator-jsonschema": "2.1.1",
|
||||||
"license": "CC-BY-NC-SA-4.0",
|
"argon2": "^0.27.1",
|
||||||
"dependencies": {
|
"body-parser": "^1.19.0",
|
||||||
"@odit/class-validator-jsonschema": "2.1.1",
|
"class-transformer": "0.3.1",
|
||||||
"argon2": "0.27.1",
|
"class-validator": "^0.13.1",
|
||||||
"axios": "0.21.1",
|
"consola": "^2.15.0",
|
||||||
"body-parser": "1.19.0",
|
"cookie": "^0.4.1",
|
||||||
"check-password-strength": "2.0.2",
|
"cookie-parser": "^1.4.5",
|
||||||
"class-transformer": "0.3.1",
|
"cors": "^2.8.5",
|
||||||
"class-validator": "0.13.1",
|
"csvtojson": "^2.0.10",
|
||||||
"consola": "2.15.0",
|
"dotenv": "^8.2.0",
|
||||||
"cookie": "0.4.1",
|
"express": "^4.17.1",
|
||||||
"cookie-parser": "1.4.5",
|
"jsonwebtoken": "^8.5.1",
|
||||||
"cors": "2.8.5",
|
"libphonenumber-js": "^1.9.7",
|
||||||
"csvtojson": "2.0.10",
|
"mysql": "^2.18.1",
|
||||||
"dotenv": "8.2.0",
|
"pg": "^8.5.1",
|
||||||
"express": "4.17.1",
|
"reflect-metadata": "^0.1.13",
|
||||||
"jsonwebtoken": "8.5.1",
|
"routing-controllers": "^0.9.0-alpha.6",
|
||||||
"libphonenumber-js": "1.9.9",
|
"routing-controllers-openapi": "^2.2.0",
|
||||||
"mysql": "2.18.1",
|
"sqlite3": "5.0.0",
|
||||||
"pg": "8.5.1",
|
"typeorm": "^0.2.29",
|
||||||
"reflect-metadata": "0.1.13",
|
"typeorm-routing-controllers-extensions": "^0.2.0",
|
||||||
"routing-controllers": "0.9.0-alpha.6",
|
"typeorm-seeding": "^1.6.1",
|
||||||
"routing-controllers-openapi": "2.2.0",
|
"uuid": "^8.3.2",
|
||||||
"sqlite3": "5.0.0",
|
"validator": "^13.5.2"
|
||||||
"typeorm": "0.2.30",
|
},
|
||||||
"typeorm-routing-controllers-extensions": "0.2.0",
|
"devDependencies": {
|
||||||
"typeorm-seeding": "1.6.1",
|
"@odit/license-exporter": "^0.0.9",
|
||||||
"uuid": "8.3.2",
|
"@types/cors": "^2.8.9",
|
||||||
"validator": "13.5.2"
|
"@types/csvtojson": "^1.1.5",
|
||||||
},
|
"@types/express": "^4.17.9",
|
||||||
"devDependencies": {
|
"@types/jest": "^26.0.16",
|
||||||
"@faker-js/faker": "7.6.0",
|
"@types/jsonwebtoken": "^8.5.0",
|
||||||
"@odit/license-exporter": "0.0.9",
|
"@types/node": "^14.14.20",
|
||||||
"@types/cors": "2.8.9",
|
"@types/uuid": "^8.3.0",
|
||||||
"@types/csvtojson": "1.1.5",
|
"axios": "^0.21.1",
|
||||||
"@types/express": "4.17.11",
|
"cp-cli": "^2.0.0",
|
||||||
"@types/jest": "26.0.20",
|
"jest": "^26.6.3",
|
||||||
"@types/jsonwebtoken": "8.5.0",
|
"nodemon": "^2.0.7",
|
||||||
"@types/node": "14.14.22",
|
"release-it": "^14.2.2",
|
||||||
"@types/uuid": "8.3.0",
|
"rimraf": "^3.0.2",
|
||||||
"auto-changelog": "2.4.0",
|
"start-server-and-test": "^1.11.7",
|
||||||
"cp-cli": "2.0.0",
|
"ts-jest": "^26.4.4",
|
||||||
"jest": "26.6.3",
|
"ts-node": "^9.1.1",
|
||||||
"nodemon": "2.0.7",
|
"typedoc": "^0.20.14",
|
||||||
"release-it": "14.2.2",
|
"typescript": "^4.1.3"
|
||||||
"rimraf": "3.0.2",
|
},
|
||||||
"start-server-and-test": "1.11.7",
|
"scripts": {
|
||||||
"ts-jest": "26.5.0",
|
"dev": "nodemon src/app.ts",
|
||||||
"ts-node": "9.1.1",
|
"build": "rimraf ./dist && tsc && cp-cli ./src/static ./dist/static",
|
||||||
"typedoc": "0.20.19",
|
"docs": "typedoc --out docs src",
|
||||||
"typescript": "4.1.3"
|
"test": "jest",
|
||||||
},
|
"test:watch": "jest --watchAll",
|
||||||
"scripts": {
|
"test:ci": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test",
|
||||||
"dev": "nodemon src/app.ts",
|
"seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed",
|
||||||
"build": "rimraf ./dist && tsc && cp-cli ./src/static ./dist/static",
|
"openapi:export": "ts-node scripts/openapi_export.ts",
|
||||||
"docs": "typedoc --out docs src",
|
"licenses:export": "license-exporter --md",
|
||||||
"test": "jest",
|
"release": "release-it --only-version"
|
||||||
"test:watch": "jest --watchAll",
|
},
|
||||||
"test:ci:generate_env": "ts-node scripts/create_testenv.ts",
|
"release-it": {
|
||||||
"test:ci:run": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test",
|
"git": {
|
||||||
"test:ci": "npm run test:ci:generate_env && npm run test:ci:run",
|
"commit": true,
|
||||||
"seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed",
|
"requireCleanWorkingDir": false,
|
||||||
"openapi:export": "ts-node scripts/openapi_export.ts",
|
"commitMessage": "🚀Bumped version to v${version}",
|
||||||
"licenses:export": "license-exporter --markdown",
|
"requireBranch": "dev",
|
||||||
"changelog:export": "auto-changelog --commit-limit false -p -u --hide-credit",
|
"push": false,
|
||||||
"release": "release-it --only-version"
|
"tag": false
|
||||||
},
|
},
|
||||||
"release-it": {
|
"npm": {
|
||||||
"git": {
|
"publish": false
|
||||||
"commit": true,
|
}
|
||||||
"requireCleanWorkingDir": false,
|
},
|
||||||
"commitMessage": "🚀Bumped version to v${version}",
|
"nodemonConfig": {
|
||||||
"requireBranch": "dev",
|
"ignore": [
|
||||||
"push": true,
|
"src/tests/*",
|
||||||
"tag": true,
|
"docs/*"
|
||||||
"tagName": "v${version}",
|
]
|
||||||
"tagAnnotation": "v${version}"
|
}
|
||||||
},
|
}
|
||||||
"npm": {
|
|
||||||
"publish": false
|
|
||||||
},
|
|
||||||
"hooks": {
|
|
||||||
"after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nodemonConfig": {
|
|
||||||
"ignore": [
|
|
||||||
"src/tests/*",
|
|
||||||
"docs/*"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
7803
pnpm-lock.yaml
generated
7803
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -1,24 +0,0 @@
|
|||||||
import consola from "consola";
|
|
||||||
import fs from "fs";
|
|
||||||
|
|
||||||
|
|
||||||
const env = `
|
|
||||||
APP_PORT=4010
|
|
||||||
DB_TYPE=sqlite
|
|
||||||
DB_HOST=bla
|
|
||||||
DB_PORT=bla
|
|
||||||
DB_USER=bla
|
|
||||||
DB_PASSWORD=bla
|
|
||||||
DB_NAME=./test.sqlite
|
|
||||||
NODE_ENV=test
|
|
||||||
POSTALCODE_COUNTRYCODE=DE
|
|
||||||
SEED_TEST_DATA=true
|
|
||||||
MAILER_URL=https://dev.lauf-fuer-kaya.de/mailer
|
|
||||||
MAILER_KEY=asdasd`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
fs.writeFileSync("./.env", env, { encoding: "utf-8" });
|
|
||||||
consola.success("Exported ci env to .env");
|
|
||||||
} catch (error) {
|
|
||||||
consola.error("Couldn't export the ci env");
|
|
||||||
}
|
|
@ -42,7 +42,7 @@ export function generateSpec(storage: MetadataArgsStorage, schemas) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
info: {
|
info: {
|
||||||
description: `The the backend API for the LfK! runner system. <br>[Imprint](${config.imprint_url}) & [Privacy](${config.privacy_url})`,
|
description: "The the backend API for the LfK! runner system.",
|
||||||
title: "LfK! Backend API",
|
title: "LfK! Backend API",
|
||||||
version: config.version
|
version: config.version
|
||||||
},
|
},
|
||||||
|
@ -20,9 +20,6 @@ const app = createExpressServer({
|
|||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
await loaders(app);
|
await loaders(app);
|
||||||
if (config.testing) {
|
|
||||||
consola.info("🛠[config]: Discovered testing env. Mailing errors will get ignored!")
|
|
||||||
}
|
|
||||||
app.listen(config.internal_port, () => {
|
app.listen(config.internal_port, () => {
|
||||||
consola.success(
|
consola.success(
|
||||||
`⚡️[server]: Server is running at http://localhost:${config.internal_port}`
|
`⚡️[server]: Server is running at http://localhost:${config.internal_port}`
|
||||||
|
@ -6,17 +6,10 @@ configDotenv();
|
|||||||
export const config = {
|
export const config = {
|
||||||
internal_port: parseInt(process.env.APP_PORT) || 4010,
|
internal_port: parseInt(process.env.APP_PORT) || 4010,
|
||||||
development: process.env.NODE_ENV === "production",
|
development: process.env.NODE_ENV === "production",
|
||||||
testing: process.env.NODE_ENV === "test",
|
|
||||||
jwt_secret: process.env.JWT_SECRET || "secretjwtsecret",
|
jwt_secret: process.env.JWT_SECRET || "secretjwtsecret",
|
||||||
phone_validation_countrycode: getPhoneCodeLocale(),
|
phone_validation_countrycode: getPhoneCodeLocale(),
|
||||||
postalcode_validation_countrycode: getPostalCodeLocale(),
|
postalcode_validation_countrycode: getPostalCodeLocale(),
|
||||||
version: process.env.VERSION || require('../package.json').version,
|
version: process.env.VERSION || require('../package.json').version
|
||||||
seedTestData: getDataSeeding(),
|
|
||||||
app_url: process.env.APP_URL || "http://localhost:8080",
|
|
||||||
privacy_url: process.env.PRIVACY_URL || "/privacy",
|
|
||||||
imprint_url: process.env.IMPRINT_URL || "/imprint",
|
|
||||||
mailer_url: process.env.MAILER_URL || "",
|
|
||||||
mailer_key: process.env.MAILER_KEY || ""
|
|
||||||
}
|
}
|
||||||
let errors = 0
|
let errors = 0
|
||||||
if (typeof config.internal_port !== "number") {
|
if (typeof config.internal_port !== "number") {
|
||||||
@ -25,9 +18,6 @@ if (typeof config.internal_port !== "number") {
|
|||||||
if (typeof config.development !== "boolean") {
|
if (typeof config.development !== "boolean") {
|
||||||
errors++
|
errors++
|
||||||
}
|
}
|
||||||
if (config.mailer_url == "" || config.mailer_key == "") {
|
|
||||||
errors++;
|
|
||||||
}
|
|
||||||
function getPhoneCodeLocale(): CountryCode {
|
function getPhoneCodeLocale(): CountryCode {
|
||||||
return (process.env.PHONE_COUNTRYCODE as CountryCode);
|
return (process.env.PHONE_COUNTRYCODE as CountryCode);
|
||||||
}
|
}
|
||||||
@ -40,11 +30,4 @@ function getPostalCodeLocale(): any {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function getDataSeeding(): Boolean {
|
|
||||||
try {
|
|
||||||
return JSON.parse(process.env.SEED_TEST_DATA);
|
|
||||||
} catch (error) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
export let e = errors
|
export let e = errors
|
@ -1,106 +1,103 @@
|
|||||||
import { Body, CookieParam, JsonController, Param, Post, QueryParam, Req, Res } from 'routing-controllers';
|
import { Body, CookieParam, JsonController, Param, Post, Req, Res } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
||||||
import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError';
|
import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError';
|
||||||
import { MailSendingError } from '../errors/MailErrors';
|
import { UserNotFoundError } from '../errors/UserErrors';
|
||||||
import { UserNotFoundError } from '../errors/UserErrors';
|
import { CreateAuth } from '../models/actions/create/CreateAuth';
|
||||||
import { Mailer } from '../mailer';
|
import { CreateResetToken } from '../models/actions/create/CreateResetToken';
|
||||||
import { CreateAuth } from '../models/actions/create/CreateAuth';
|
import { HandleLogout } from '../models/actions/HandleLogout';
|
||||||
import { CreateResetToken } from '../models/actions/create/CreateResetToken';
|
import { RefreshAuth } from '../models/actions/RefreshAuth';
|
||||||
import { HandleLogout } from '../models/actions/HandleLogout';
|
import { ResetPassword } from '../models/actions/ResetPassword';
|
||||||
import { RefreshAuth } from '../models/actions/RefreshAuth';
|
import { ResponseAuth } from '../models/responses/ResponseAuth';
|
||||||
import { ResetPassword } from '../models/actions/ResetPassword';
|
import { Logout } from '../models/responses/ResponseLogout';
|
||||||
import { ResponseAuth } from '../models/responses/ResponseAuth';
|
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
@JsonController('/auth')
|
||||||
import { Logout } from '../models/responses/ResponseLogout';
|
export class AuthController {
|
||||||
|
constructor() {
|
||||||
@JsonController('/auth')
|
}
|
||||||
export class AuthController {
|
|
||||||
|
@Post("/login")
|
||||||
@Post("/login")
|
@ResponseSchema(ResponseAuth)
|
||||||
@ResponseSchema(ResponseAuth)
|
@ResponseSchema(InvalidCredentialsError)
|
||||||
@ResponseSchema(InvalidCredentialsError)
|
@ResponseSchema(UserNotFoundError)
|
||||||
@ResponseSchema(UserNotFoundError)
|
@ResponseSchema(UsernameOrEmailNeededError)
|
||||||
@ResponseSchema(UsernameOrEmailNeededError)
|
@ResponseSchema(PasswordNeededError)
|
||||||
@ResponseSchema(PasswordNeededError)
|
@ResponseSchema(InvalidCredentialsError)
|
||||||
@ResponseSchema(InvalidCredentialsError)
|
@OpenAPI({ description: 'Login with your username/email and password. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)' })
|
||||||
@OpenAPI({ description: 'Login with your username/email and password. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)' })
|
async login(@Body({ validate: true }) createAuth: CreateAuth, @Res() response: any) {
|
||||||
async login(@Body({ validate: true }) createAuth: CreateAuth, @Res() response: any) {
|
let auth;
|
||||||
let auth;
|
try {
|
||||||
try {
|
auth = await createAuth.toAuth();
|
||||||
auth = await createAuth.toAuth();
|
response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
||||||
response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
||||||
response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
return response.send(auth)
|
||||||
return response.send(auth)
|
} catch (error) {
|
||||||
} catch (error) {
|
throw error;
|
||||||
throw error;
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
@Post("/logout")
|
||||||
@Post("/logout")
|
@ResponseSchema(Logout)
|
||||||
@ResponseSchema(Logout)
|
@ResponseSchema(InvalidCredentialsError)
|
||||||
@ResponseSchema(InvalidCredentialsError)
|
@ResponseSchema(UserNotFoundError)
|
||||||
@ResponseSchema(UserNotFoundError)
|
@ResponseSchema(UsernameOrEmailNeededError)
|
||||||
@ResponseSchema(UsernameOrEmailNeededError)
|
@ResponseSchema(PasswordNeededError)
|
||||||
@ResponseSchema(PasswordNeededError)
|
@ResponseSchema(InvalidCredentialsError)
|
||||||
@ResponseSchema(InvalidCredentialsError)
|
@OpenAPI({ description: 'Logout using your refresh token. <br> This instantly invalidates all your access and refresh tokens.', security: [{ "RefreshTokenCookie": [] }] })
|
||||||
@OpenAPI({ description: 'Logout using your refresh token. <br> This instantly invalidates all your access and refresh tokens.', security: [{ "RefreshTokenCookie": [] }] })
|
async logout(@Body({ validate: true }) handleLogout: HandleLogout, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) {
|
||||||
async logout(@Body({ validate: true }) handleLogout: HandleLogout, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) {
|
if (refresh_token && refresh_token.length != 0 && handleLogout.token == undefined) {
|
||||||
if (refresh_token && refresh_token.length != 0 && handleLogout.token == undefined) {
|
handleLogout.token = refresh_token;
|
||||||
handleLogout.token = refresh_token;
|
}
|
||||||
}
|
|
||||||
|
let logout;
|
||||||
let logout;
|
try {
|
||||||
try {
|
logout = await handleLogout.logout()
|
||||||
logout = await handleLogout.logout()
|
await response.cookie('lfk_backend__refresh_token', "expired", { expires: new Date(Date.now()), httpOnly: true });
|
||||||
await response.cookie('lfk_backend__refresh_token', "expired", { expires: new Date(Date.now()), httpOnly: true });
|
response.cookie('lfk_backend__refresh_token_expires_at', "expired", { expires: new Date(Date.now()), httpOnly: true });
|
||||||
response.cookie('lfk_backend__refresh_token_expires_at', "expired", { expires: new Date(Date.now()), httpOnly: true });
|
} catch (error) {
|
||||||
} catch (error) {
|
throw error;
|
||||||
throw error;
|
}
|
||||||
}
|
return response.send(logout)
|
||||||
return response.send(logout)
|
}
|
||||||
}
|
|
||||||
|
@Post("/refresh")
|
||||||
@Post("/refresh")
|
@ResponseSchema(ResponseAuth)
|
||||||
@ResponseSchema(ResponseAuth)
|
@ResponseSchema(JwtNotProvidedError)
|
||||||
@ResponseSchema(JwtNotProvidedError)
|
@ResponseSchema(IllegalJWTError)
|
||||||
@ResponseSchema(IllegalJWTError)
|
@ResponseSchema(UserNotFoundError)
|
||||||
@ResponseSchema(UserNotFoundError)
|
@ResponseSchema(RefreshTokenCountInvalidError)
|
||||||
@ResponseSchema(RefreshTokenCountInvalidError)
|
@OpenAPI({ description: 'Refresh your access and refresh tokens using a valid refresh token. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)', security: [{ "RefreshTokenCookie": [] }] })
|
||||||
@OpenAPI({ description: 'Refresh your access and refresh tokens using a valid refresh token. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)', security: [{ "RefreshTokenCookie": [] }] })
|
async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any, @Req() req: any) {
|
||||||
async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any, @Req() req: any) {
|
if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) {
|
||||||
if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) {
|
refreshAuth.token = refresh_token;
|
||||||
refreshAuth.token = refresh_token;
|
}
|
||||||
}
|
let auth;
|
||||||
let auth;
|
try {
|
||||||
try {
|
auth = await refreshAuth.toAuth();
|
||||||
auth = await refreshAuth.toAuth();
|
response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
||||||
response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
||||||
response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
|
} catch (error) {
|
||||||
} catch (error) {
|
throw error;
|
||||||
throw error;
|
}
|
||||||
}
|
return response.send(auth)
|
||||||
return response.send(auth)
|
}
|
||||||
}
|
|
||||||
|
@Post("/reset")
|
||||||
@Post("/reset")
|
@ResponseSchema(ResponseAuth)
|
||||||
@ResponseSchema(ResponseEmpty, { statusCode: 200 })
|
@ResponseSchema(UserNotFoundError)
|
||||||
@ResponseSchema(UserNotFoundError, { statusCode: 404 })
|
@ResponseSchema(UsernameOrEmailNeededError)
|
||||||
@ResponseSchema(UsernameOrEmailNeededError, { statusCode: 406 })
|
@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}." })
|
||||||
@ResponseSchema(MailSendingError, { statusCode: 500 })
|
async getResetToken(@Body({ validate: true }) passwordReset: CreateResetToken) {
|
||||||
@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}." })
|
//This really shouldn't just get returned, but sent via mail or sth like that. But for dev only this is fine.
|
||||||
async getResetToken(@Body({ validate: true }) passwordReset: CreateResetToken, @QueryParam("locale") locale: string = "en") {
|
return { "resetToken": await passwordReset.toResetToken() };
|
||||||
const reset_token: string = await passwordReset.toResetToken();
|
}
|
||||||
await Mailer.sendResetMail(passwordReset.email, reset_token, locale);
|
|
||||||
return new ResponseEmpty();
|
@Post("/reset/:token")
|
||||||
}
|
@ResponseSchema(ResponseAuth)
|
||||||
|
@ResponseSchema(UserNotFoundError)
|
||||||
@Post("/reset/:token")
|
@ResponseSchema(UsernameOrEmailNeededError)
|
||||||
@ResponseSchema(ResponseAuth)
|
@OpenAPI({ description: "Reset a user's utilising a valid password reset token. <br> This will set the user's password to the one you provided in the body. <br> To get a reset token post to /api/auth/reset with your username." })
|
||||||
@ResponseSchema(UserNotFoundError)
|
async resetPassword(@Param("token") token: string, @Body({ validate: true }) passwordReset: ResetPassword) {
|
||||||
@ResponseSchema(UsernameOrEmailNeededError)
|
passwordReset.resetToken = token;
|
||||||
@OpenAPI({ description: "Reset a user's utilising a valid password reset token. <br> This will set the user's password to the one you provided in the body. <br> To get a reset token post to /api/auth/reset with your username." })
|
return await passwordReset.resetPassword();
|
||||||
async resetPassword(@Param("token") token: string, @Body({ validate: true }) passwordReset: ResetPassword) {
|
}
|
||||||
passwordReset.resetToken = token;
|
}
|
||||||
return await passwordReset.resetPassword();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
||||||
import { Repository, getConnectionManager } from 'typeorm';
|
import { getConnectionManager, Repository } from 'typeorm';
|
||||||
import { DonationIdsNotMatchingError, DonationNotFoundError } from '../errors/DonationErrors';
|
import { DonationIdsNotMatchingError, DonationNotFoundError } from '../errors/DonationErrors';
|
||||||
import { DonorNotFoundError } from '../errors/DonorErrors';
|
import { DonorNotFoundError } from '../errors/DonorErrors';
|
||||||
import { RunnerNotFoundError } from '../errors/RunnerErrors';
|
import { RunnerNotFoundError } from '../errors/RunnerErrors';
|
||||||
@ -36,16 +36,9 @@ export class DonationController {
|
|||||||
@ResponseSchema(ResponseDonation, { isArray: true })
|
@ResponseSchema(ResponseDonation, { isArray: true })
|
||||||
@ResponseSchema(ResponseDistanceDonation, { 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).' })
|
@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 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 => {
|
donations.forEach(donation => {
|
||||||
responseDonations.push(donation.toResponse());
|
responseDonations.push(donation.toResponse());
|
||||||
});
|
});
|
||||||
@ -85,7 +78,7 @@ export class DonationController {
|
|||||||
async postDistance(@Body({ validate: true }) createDonation: CreateDistanceDonation) {
|
async postDistance(@Body({ validate: true }) createDonation: CreateDistanceDonation) {
|
||||||
let donation = await createDonation.toEntity();
|
let donation = await createDonation.toEntity();
|
||||||
donation = await this.distanceDonationRepository.save(donation);
|
donation = await this.distanceDonationRepository.save(donation);
|
||||||
return (await this.distanceDonationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
|
return (await this.donationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('/fixed/:id')
|
@Put('/fixed/:id')
|
||||||
@ -131,7 +124,7 @@ export class DonationController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.distanceDonationRepository.save(await donation.update(oldDonation));
|
await this.distanceDonationRepository.save(await donation.update(oldDonation));
|
||||||
return (await this.distanceDonationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
|
return (await this.donationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete('/:id')
|
@Delete('/:id')
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { DonorHasDonationsError, DonorIdsNotMatchingError, DonorNotFoundError } from '../errors/DonorErrors';
|
||||||
import { CreateDonor } from '../models/actions/create/CreateDonor';
|
import { CreateDonor } from '../models/actions/create/CreateDonor';
|
||||||
import { UpdateDonor } from '../models/actions/update/UpdateDonor';
|
import { UpdateDonor } from '../models/actions/update/UpdateDonor';
|
||||||
@ -25,16 +25,9 @@ export class DonorController {
|
|||||||
@Authorized("DONOR:GET")
|
@Authorized("DONOR:GET")
|
||||||
@ResponseSchema(ResponseDonor, { isArray: true })
|
@ResponseSchema(ResponseDonor, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all donor. <br> This includes the donor\'s current donation amount.' })
|
@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 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 => {
|
donors.forEach(donor => {
|
||||||
responseDonors.push(new ResponseDonor(donor));
|
responseDonors.push(new ResponseDonor(donor));
|
||||||
});
|
});
|
||||||
|
@ -1,114 +0,0 @@
|
|||||||
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 { GroupContactIdsNotMatchingError, GroupContactNotFoundError } from '../errors/GroupContactErrors';
|
|
||||||
import { RunnerGroupNotFoundError } from '../errors/RunnerGroupErrors';
|
|
||||||
import { CreateGroupContact } from '../models/actions/create/CreateGroupContact';
|
|
||||||
import { UpdateGroupContact } from '../models/actions/update/UpdateGroupContact';
|
|
||||||
import { GroupContact } from '../models/entities/GroupContact';
|
|
||||||
import { RunnerGroup } from '../models/entities/RunnerGroup';
|
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
|
||||||
import { ResponseGroupContact } from '../models/responses/ResponseGroupContact';
|
|
||||||
|
|
||||||
@JsonController('/contacts')
|
|
||||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
|
||||||
export class GroupContactController {
|
|
||||||
private contactRepository: Repository<GroupContact>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the repository of this controller's model/entity.
|
|
||||||
*/
|
|
||||||
constructor() {
|
|
||||||
this.contactRepository = getConnectionManager().get().getRepository(GroupContact);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get()
|
|
||||||
@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) {
|
|
||||||
let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>();
|
|
||||||
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());
|
|
||||||
});
|
|
||||||
return responseContacts;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/:id')
|
|
||||||
@Authorized("CONTACT:GET")
|
|
||||||
@ResponseSchema(ResponseGroupContact)
|
|
||||||
@ResponseSchema(GroupContactNotFoundError, { statusCode: 404 })
|
|
||||||
@OnUndefined(GroupContactNotFoundError)
|
|
||||||
@OpenAPI({ description: 'Lists all information about the contact whose id got provided. <br> This includes the contact\'s associated groups.' })
|
|
||||||
async getOne(@Param('id') id: number) {
|
|
||||||
let contact = await this.contactRepository.findOne({ id: id }, { relations: ['groups', 'groups.parentGroup'] })
|
|
||||||
if (!contact) { throw new GroupContactNotFoundError(); }
|
|
||||||
return contact.toResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post()
|
|
||||||
@Authorized("CONTACT:CREATE")
|
|
||||||
@ResponseSchema(ResponseGroupContact)
|
|
||||||
@ResponseSchema(RunnerGroupNotFoundError, { statusCode: 404 })
|
|
||||||
@OpenAPI({ description: 'Create a new contact.' })
|
|
||||||
async post(@Body({ validate: true }) createContact: CreateGroupContact) {
|
|
||||||
let contact;
|
|
||||||
try {
|
|
||||||
contact = await createContact.toEntity();
|
|
||||||
} catch (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
|
|
||||||
contact = await this.contactRepository.save(contact)
|
|
||||||
return (await this.contactRepository.findOne({ id: contact.id }, { relations: ['groups', 'groups.parentGroup'] })).toResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Put('/:id')
|
|
||||||
@Authorized("CONTACT:UPDATE")
|
|
||||||
@ResponseSchema(ResponseGroupContact)
|
|
||||||
@ResponseSchema(GroupContactNotFoundError, { statusCode: 404 })
|
|
||||||
@ResponseSchema(GroupContactIdsNotMatchingError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(RunnerGroupNotFoundError, { statusCode: 404 })
|
|
||||||
@OpenAPI({ description: "Update the contact whose id you provided. <br> Please remember that ids can't be changed." })
|
|
||||||
async put(@Param('id') id: number, @Body({ validate: true }) contact: UpdateGroupContact) {
|
|
||||||
let oldContact = await this.contactRepository.findOne({ id: id });
|
|
||||||
|
|
||||||
if (!oldContact) {
|
|
||||||
throw new GroupContactNotFoundError();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldContact.id != contact.id) {
|
|
||||||
throw new GroupContactIdsNotMatchingError();
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.contactRepository.save(await contact.update(oldContact));
|
|
||||||
return (await this.contactRepository.findOne({ id: contact.id }, { relations: ['groups', 'groups.parentGroup'] })).toResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Delete('/:id')
|
|
||||||
@Authorized("CONTACT:DELETE")
|
|
||||||
@ResponseSchema(ResponseGroupContact)
|
|
||||||
@ResponseSchema(ResponseEmpty, { statusCode: 204 })
|
|
||||||
@OnUndefined(204)
|
|
||||||
@OpenAPI({ description: 'Delete the contact whose id you provided. <br> If no contact with this id exists it will just return 204(no content). <br> This won\'t delete any groups associated with the contact.' })
|
|
||||||
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
|
||||||
let contact = await this.contactRepository.findOne({ id: id });
|
|
||||||
if (!contact) { return null; }
|
|
||||||
const responseContact = await this.contactRepository.findOne(contact, { relations: ['groups', 'groups.parentGroup'] });
|
|
||||||
for (let group of responseContact.groups) {
|
|
||||||
group.contact = null;
|
|
||||||
await getConnection().getRepository(RunnerGroup).save(group);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.contactRepository.delete(contact);
|
|
||||||
return responseContact.toResponse();
|
|
||||||
}
|
|
||||||
}
|
|
@ -36,7 +36,7 @@ export class ImportController {
|
|||||||
return responseRunners;
|
return responseRunners;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('/organizations/:id/import')
|
@Post('/organisations/:id/import')
|
||||||
@ContentType("application/json")
|
@ContentType("application/json")
|
||||||
@ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })
|
@ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })
|
||||||
@ResponseSchema(RunnerGroupNotFoundError, { statusCode: 404 })
|
@ResponseSchema(RunnerGroupNotFoundError, { statusCode: 404 })
|
||||||
@ -78,7 +78,7 @@ export class ImportController {
|
|||||||
return await this.postJSON(importRunners, groupID);
|
return await this.postJSON(importRunners, groupID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('/organizations/:id/import/csv')
|
@Post('/organisations/:id/import/csv')
|
||||||
@ContentType("application/json")
|
@ContentType("application/json")
|
||||||
@UseBefore(RawBodyMiddleware)
|
@UseBefore(RawBodyMiddleware)
|
||||||
@ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })
|
@ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Body, CurrentUser, Delete, Get, JsonController, OnUndefined, Put, QueryParam } from 'routing-controllers';
|
import { Body, CurrentUser, Delete, Get, JsonController, OnUndefined, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
||||||
import { getConnectionManager, Repository } from 'typeorm';
|
import { getConnectionManager, Repository } from 'typeorm';
|
||||||
import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
|
import { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
|
||||||
import { UpdateUser } from '../models/actions/update/UpdateUser';
|
import { UpdateUser } from '../models/actions/update/UpdateUser';
|
||||||
import { User } from '../models/entities/User';
|
import { User } from '../models/entities/User';
|
||||||
import { ResponseUser } from '../models/responses/ResponseUser';
|
import { ResponseUser } from '../models/responses/ResponseUser';
|
||||||
@ -32,7 +32,7 @@ export class MeController {
|
|||||||
return new ResponseUser(user);
|
return new ResponseUser(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('/permissions')
|
@Get('/')
|
||||||
@ResponseSchema(ResponseUserPermissions)
|
@ResponseSchema(ResponseUserPermissions)
|
||||||
@ResponseSchema(UserNotFoundError, { statusCode: 404 })
|
@ResponseSchema(UserNotFoundError, { statusCode: 404 })
|
||||||
@OnUndefined(UserNotFoundError)
|
@OnUndefined(UserNotFoundError)
|
||||||
@ -48,10 +48,6 @@ export class MeController {
|
|||||||
@ResponseSchema(UserNotFoundError, { statusCode: 404 })
|
@ResponseSchema(UserNotFoundError, { statusCode: 404 })
|
||||||
@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 })
|
@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 })
|
||||||
@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
|
@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
|
||||||
@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordTooShortError, { statusCode: 406 })
|
|
||||||
@OpenAPI({ description: "Update the yourself. <br> You can't edit your own permissions or group memberships here - Please use the /api/users/:id enpoint instead. <br> Please remember that ids can't be changed." })
|
@OpenAPI({ description: "Update the yourself. <br> You can't edit your own permissions or group memberships here - Please use the /api/users/:id enpoint instead. <br> Please remember that ids can't be changed." })
|
||||||
async put(@CurrentUser() currentUser: User, @Body({ validate: true }) updateUser: UpdateUser) {
|
async put(@CurrentUser() currentUser: User, @Body({ validate: true }) updateUser: UpdateUser) {
|
||||||
let oldUser = await this.userRepository.findOne({ id: currentUser.id }, { relations: ['groups'] });
|
let oldUser = await this.userRepository.findOne({ id: currentUser.id }, { relations: ['groups'] });
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { PermissionIdsNotMatchingError, PermissionNeedsPrincipalError, PermissionNotFoundError } from '../errors/PermissionErrors';
|
||||||
import { PrincipalNotFoundError } from '../errors/PrincipalErrors';
|
import { PrincipalNotFoundError } from '../errors/PrincipalErrors';
|
||||||
import { CreatePermission } from '../models/actions/create/CreatePermission';
|
import { CreatePermission } from '../models/actions/create/CreatePermission';
|
||||||
@ -27,16 +27,9 @@ export class PermissionController {
|
|||||||
@Authorized("PERMISSION:GET")
|
@Authorized("PERMISSION:GET")
|
||||||
@ResponseSchema(ResponsePermission, { isArray: true })
|
@ResponseSchema(ResponsePermission, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all permissions for all users and groups.' })
|
@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 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 => {
|
permissions.forEach(permission => {
|
||||||
responsePermissions.push(new ResponsePermission(permission));
|
responsePermissions.push(new ResponsePermission(permission));
|
||||||
});
|
});
|
||||||
|
@ -1,138 +1,106 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors';
|
||||||
import { RunnerNotFoundError } from '../errors/RunnerErrors';
|
import { RunnerNotFoundError } from '../errors/RunnerErrors';
|
||||||
import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
|
import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
|
||||||
import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
|
import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
|
||||||
import { RunnerCard } from '../models/entities/RunnerCard';
|
import { RunnerCard } from '../models/entities/RunnerCard';
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
||||||
import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
|
import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
|
||||||
import { ScanController } from './ScanController';
|
import { ScanController } from './ScanController';
|
||||||
|
|
||||||
@JsonController('/cards')
|
@JsonController('/cards')
|
||||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
export class RunnerCardController {
|
export class RunnerCardController {
|
||||||
private cardRepository: Repository<RunnerCard>;
|
private cardRepository: Repository<RunnerCard>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the repository of this controller's model/entity.
|
* Gets the repository of this controller's model/entity.
|
||||||
*/
|
*/
|
||||||
constructor() {
|
constructor() {
|
||||||
this.cardRepository = getConnectionManager().get().getRepository(RunnerCard);
|
this.cardRepository = getConnectionManager().get().getRepository(RunnerCard);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
@Authorized("CARD:GET")
|
@Authorized("CARD:GET")
|
||||||
@ResponseSchema(ResponseRunnerCard, { isArray: true })
|
@ResponseSchema(ResponseRunnerCard, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all card.' })
|
@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 responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
|
||||||
let cards: Array<RunnerCard>;
|
const cards = await this.cardRepository.find({ relations: ['runner'] });
|
||||||
|
cards.forEach(card => {
|
||||||
if (page != undefined) {
|
responseCards.push(new ResponseRunnerCard(card));
|
||||||
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'], skip: page * page_size, take: page_size });
|
});
|
||||||
} else {
|
return responseCards;
|
||||||
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
|
}
|
||||||
}
|
|
||||||
|
@Get('/:id')
|
||||||
cards.forEach(card => {
|
@Authorized("CARD:GET")
|
||||||
responseCards.push(new ResponseRunnerCard(card));
|
@ResponseSchema(ResponseRunnerCard)
|
||||||
});
|
@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
|
||||||
return responseCards;
|
@OnUndefined(RunnerCardNotFoundError)
|
||||||
}
|
@OpenAPI({ description: "Lists all information about the card whose id got provided." })
|
||||||
|
async getOne(@Param('id') id: number) {
|
||||||
@Get('/:id')
|
let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner'] });
|
||||||
@Authorized("CARD:GET")
|
if (!card) { throw new RunnerCardNotFoundError(); }
|
||||||
@ResponseSchema(ResponseRunnerCard)
|
return card.toResponse();
|
||||||
@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
|
}
|
||||||
@OnUndefined(RunnerCardNotFoundError)
|
|
||||||
@OpenAPI({ description: "Lists all information about the card whose id got provided." })
|
@Post()
|
||||||
async getOne(@Param('id') id: number) {
|
@Authorized("CARD:CREATE")
|
||||||
let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
|
@ResponseSchema(ResponseRunnerCard)
|
||||||
if (!card) { throw new RunnerCardNotFoundError(); }
|
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
||||||
return card.toResponse();
|
@OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." })
|
||||||
}
|
async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
|
||||||
|
let card = await createCard.toEntity();
|
||||||
@Post('/bulk')
|
card = await this.cardRepository.save(card);
|
||||||
@Authorized("CARD:CREATE")
|
return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner'] })).toResponse();
|
||||||
@ResponseSchema(ResponseEmpty, { statusCode: 200 })
|
}
|
||||||
@OpenAPI({ description: "Create blank cards in bulk. <br> Just provide the count as a query param and wait for the 200 response. <br> You can provide the 'returnCards' query param if you want to receive the RESPONSERUNNERCARD objects in the response." })
|
|
||||||
async postBlancoBulk(@QueryParam("count") count: number, @QueryParam("returnCards") returnCards: boolean = false) {
|
@Put('/:id')
|
||||||
let createPromises = new Array<any>();
|
@Authorized("CARD:UPDATE")
|
||||||
for (let index = 0; index < count; index++) {
|
@ResponseSchema(ResponseRunnerCard)
|
||||||
createPromises.push(this.cardRepository.save({ runner: null, enabled: true }))
|
@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
|
||||||
}
|
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
||||||
|
@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
|
||||||
const cards = await Promise.all(createPromises);
|
@OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." })
|
||||||
|
async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) {
|
||||||
if (returnCards) {
|
let oldCard = await this.cardRepository.findOne({ id: id });
|
||||||
let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
|
|
||||||
for await (let card of cards) {
|
if (!oldCard) {
|
||||||
let dbCard = await this.cardRepository.findOne({ id: card.id });
|
throw new RunnerCardNotFoundError();
|
||||||
responseCards.push(new ResponseRunnerCard(dbCard));
|
}
|
||||||
}
|
|
||||||
return responseCards;
|
if (oldCard.id != card.id) {
|
||||||
}
|
throw new RunnerCardIdsNotMatchingError();
|
||||||
let response = new ResponseEmpty();
|
}
|
||||||
response.response = `Created ${count} new blanco cards.`
|
|
||||||
return response;
|
await this.cardRepository.save(await card.update(oldCard));
|
||||||
}
|
return (await this.cardRepository.findOne({ id: id }, { relations: ['runner'] })).toResponse();
|
||||||
|
}
|
||||||
@Post()
|
|
||||||
@Authorized("CARD:CREATE")
|
@Delete('/:id')
|
||||||
@ResponseSchema(ResponseRunnerCard)
|
@Authorized("CARD:DELETE")
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
@ResponseSchema(ResponseRunnerCard)
|
||||||
@OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." })
|
@ResponseSchema(ResponseEmpty, { statusCode: 204 })
|
||||||
async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
|
@ResponseSchema(RunnerCardHasScansError, { statusCode: 406 })
|
||||||
let card = await createCard.toEntity();
|
@OnUndefined(204)
|
||||||
card = await this.cardRepository.save(card);
|
@OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." })
|
||||||
return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
|
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
||||||
}
|
let card = await this.cardRepository.findOne({ id: id });
|
||||||
|
if (!card) { return null; }
|
||||||
@Put('/:id')
|
|
||||||
@Authorized("CARD:UPDATE")
|
const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans;
|
||||||
@ResponseSchema(ResponseRunnerCard)
|
if (cardScans.length != 0 && !force) {
|
||||||
@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
|
throw new RunnerCardHasScansError();
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
}
|
||||||
@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
|
const scanController = new ScanController;
|
||||||
@OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." })
|
for (let scan of cardScans) {
|
||||||
async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) {
|
await scanController.remove(scan.id, force);
|
||||||
let oldCard = await this.cardRepository.findOne({ id: id });
|
}
|
||||||
|
|
||||||
if (!oldCard) {
|
await this.cardRepository.delete(card);
|
||||||
throw new RunnerCardNotFoundError();
|
return card.toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (oldCard.id != card.id) {
|
|
||||||
throw new RunnerCardIdsNotMatchingError();
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.cardRepository.save(await card.update(oldCard));
|
|
||||||
return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Delete('/:id')
|
|
||||||
@Authorized("CARD:DELETE")
|
|
||||||
@ResponseSchema(ResponseRunnerCard)
|
|
||||||
@ResponseSchema(ResponseEmpty, { statusCode: 204 })
|
|
||||||
@ResponseSchema(RunnerCardHasScansError, { statusCode: 406 })
|
|
||||||
@OnUndefined(204)
|
|
||||||
@OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." })
|
|
||||||
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
|
||||||
let card = await this.cardRepository.findOne({ id: id });
|
|
||||||
if (!card) { return null; }
|
|
||||||
|
|
||||||
const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans;
|
|
||||||
if (cardScans.length != 0 && !force) {
|
|
||||||
throw new RunnerCardHasScansError();
|
|
||||||
}
|
|
||||||
const scanController = new ScanController;
|
|
||||||
for (let scan of cardScans) {
|
|
||||||
await scanController.remove(scan.id, force);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.cardRepository.delete(card);
|
|
||||||
return card.toResponse();
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { RunnerGroupNeededError, RunnerHasDistanceDonationsError, RunnerIdsNotMatchingError, RunnerNotFoundError } from '../errors/RunnerErrors';
|
||||||
import { RunnerGroupNotFoundError } from '../errors/RunnerGroupErrors';
|
import { RunnerGroupNotFoundError } from '../errors/RunnerGroupErrors';
|
||||||
import { CreateRunner } from '../models/actions/create/CreateRunner';
|
import { CreateRunner } from '../models/actions/create/CreateRunner';
|
||||||
@ -8,8 +8,6 @@ import { UpdateRunner } from '../models/actions/update/UpdateRunner';
|
|||||||
import { Runner } from '../models/entities/Runner';
|
import { Runner } from '../models/entities/Runner';
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
||||||
import { ResponseRunner } from '../models/responses/ResponseRunner';
|
import { ResponseRunner } from '../models/responses/ResponseRunner';
|
||||||
import { ResponseScan } from '../models/responses/ResponseScan';
|
|
||||||
import { ResponseTrackScan } from '../models/responses/ResponseTrackScan';
|
|
||||||
import { DonationController } from './DonationController';
|
import { DonationController } from './DonationController';
|
||||||
import { RunnerCardController } from './RunnerCardController';
|
import { RunnerCardController } from './RunnerCardController';
|
||||||
import { ScanController } from './ScanController';
|
import { ScanController } from './ScanController';
|
||||||
@ -30,16 +28,9 @@ export class RunnerController {
|
|||||||
@Authorized("RUNNER:GET")
|
@Authorized("RUNNER:GET")
|
||||||
@ResponseSchema(ResponseRunner, { isArray: true })
|
@ResponseSchema(ResponseRunner, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all runners from all teams/orgs. <br> This includes the runner\'s group and distance ran.' })
|
@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 responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
|
||||||
let runners: Array<Runner>;
|
const runners = await this.runnerRepository.find({ relations: ['scans', 'group', '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 => {
|
runners.forEach(runner => {
|
||||||
responseRunners.push(new ResponseRunner(runner));
|
responseRunners.push(new ResponseRunner(runner));
|
||||||
});
|
});
|
||||||
@ -53,36 +44,11 @@ export class RunnerController {
|
|||||||
@OnUndefined(RunnerNotFoundError)
|
@OnUndefined(RunnerNotFoundError)
|
||||||
@OpenAPI({ description: 'Lists all information about the runner whose id got provided.' })
|
@OpenAPI({ description: 'Lists all information about the runner whose id got provided.' })
|
||||||
async getOne(@Param('id') id: number) {
|
async getOne(@Param('id') id: number) {
|
||||||
let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] })
|
let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'scans.track', 'cards'] })
|
||||||
if (!runner) { throw new RunnerNotFoundError(); }
|
if (!runner) { throw new RunnerNotFoundError(); }
|
||||||
return new ResponseRunner(runner);
|
return new ResponseRunner(runner);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('/:id/scans')
|
|
||||||
@Authorized(["RUNNER:GET", "SCAN:GET"])
|
|
||||||
@ResponseSchema(ResponseScan, { isArray: true })
|
|
||||||
@ResponseSchema(ResponseTrackScan, { isArray: true })
|
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
|
||||||
@OpenAPI({ description: 'Lists all scans of the runner whose id got provided. <br> If you only want the valid scans just add the ?onlyValid=true query param.' })
|
|
||||||
async getScans(@Param('id') id: number, onlyValid?: boolean) {
|
|
||||||
let responseScans: ResponseScan[] = new Array<ResponseScan>();
|
|
||||||
let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'scans.track', 'scans.station', 'scans.runner'] })
|
|
||||||
if (!runner) { throw new RunnerNotFoundError(); }
|
|
||||||
|
|
||||||
if (!onlyValid) {
|
|
||||||
for (let scan of runner.scans) {
|
|
||||||
responseScans.push(scan.toResponse());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for (let scan of runner.validScans) {
|
|
||||||
responseScans.push(scan.toResponse());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return responseScans;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@Authorized("RUNNER:CREATE")
|
@Authorized("RUNNER:CREATE")
|
||||||
@ResponseSchema(ResponseRunner)
|
@ResponseSchema(ResponseRunner)
|
||||||
@ -98,7 +64,7 @@ export class RunnerController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
runner = await this.runnerRepository.save(runner)
|
runner = await this.runnerRepository.save(runner)
|
||||||
return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
|
return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'scans.track', 'cards'] }));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('/:id')
|
@Put('/:id')
|
||||||
@ -119,7 +85,7 @@ export class RunnerController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.runnerRepository.save(await runner.update(oldRunner));
|
await this.runnerRepository.save(await runner.update(oldRunner));
|
||||||
return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
|
return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'scans.track', 'cards'] }));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete('/:id')
|
@Delete('/:id')
|
||||||
@ -132,7 +98,7 @@ export class RunnerController {
|
|||||||
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
||||||
let runner = await this.runnerRepository.findOne({ id: id });
|
let runner = await this.runnerRepository.findOne({ id: id });
|
||||||
if (!runner) { return null; }
|
if (!runner) { return null; }
|
||||||
const responseRunner = await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] });
|
const responseRunner = await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'scans.track', 'cards'] });
|
||||||
|
|
||||||
if (!runner) {
|
if (!runner) {
|
||||||
throw new RunnerNotFoundError();
|
throw new RunnerNotFoundError();
|
||||||
|
127
src/controllers/RunnerOrganisationController.ts
Normal file
127
src/controllers/RunnerOrganisationController.ts
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
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 { RunnerOrganisationHasRunnersError, RunnerOrganisationHasTeamsError, RunnerOrganisationIdsNotMatchingError, RunnerOrganisationNotFoundError } from '../errors/RunnerOrganisationErrors';
|
||||||
|
import { CreateRunnerOrganisation } from '../models/actions/create/CreateRunnerOrganisation';
|
||||||
|
import { UpdateRunnerOrganisation } from '../models/actions/update/UpdateRunnerOrganisation';
|
||||||
|
import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
|
||||||
|
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
||||||
|
import { ResponseRunnerOrganisation } from '../models/responses/ResponseRunnerOrganisation';
|
||||||
|
import { RunnerController } from './RunnerController';
|
||||||
|
import { RunnerTeamController } from './RunnerTeamController';
|
||||||
|
|
||||||
|
|
||||||
|
@JsonController('/organisations')
|
||||||
|
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
|
export class RunnerOrganisationController {
|
||||||
|
private runnerOrganisationRepository: Repository<RunnerOrganisation>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the repository of this controller's model/entity.
|
||||||
|
*/
|
||||||
|
constructor() {
|
||||||
|
this.runnerOrganisationRepository = getConnectionManager().get().getRepository(RunnerOrganisation);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@Authorized("ORGANISATION:GET")
|
||||||
|
@ResponseSchema(ResponseRunnerOrganisation, { isArray: true })
|
||||||
|
@OpenAPI({ description: 'Lists all organisations. <br> This includes their address, contact and teams (if existing/associated).' })
|
||||||
|
async getAll() {
|
||||||
|
let responseTeams: ResponseRunnerOrganisation[] = new Array<ResponseRunnerOrganisation>();
|
||||||
|
const runners = await this.runnerOrganisationRepository.find({ relations: ['address', 'contact', 'teams'] });
|
||||||
|
runners.forEach(runner => {
|
||||||
|
responseTeams.push(new ResponseRunnerOrganisation(runner));
|
||||||
|
});
|
||||||
|
return responseTeams;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('/:id')
|
||||||
|
@Authorized("ORGANISATION:GET")
|
||||||
|
@ResponseSchema(ResponseRunnerOrganisation)
|
||||||
|
@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
|
||||||
|
@OnUndefined(RunnerOrganisationNotFoundError)
|
||||||
|
@OpenAPI({ description: 'Lists all information about the organisation whose id got provided.' })
|
||||||
|
async getOne(@Param('id') id: number) {
|
||||||
|
let runnerOrg = await this.runnerOrganisationRepository.findOne({ id: id }, { relations: ['address', 'contact', 'teams'] });
|
||||||
|
if (!runnerOrg) { throw new RunnerOrganisationNotFoundError(); }
|
||||||
|
return new ResponseRunnerOrganisation(runnerOrg);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@Authorized("ORGANISATION:CREATE")
|
||||||
|
@ResponseSchema(ResponseRunnerOrganisation)
|
||||||
|
@OpenAPI({ description: 'Create a new organsisation.' })
|
||||||
|
async post(@Body({ validate: true }) createRunnerOrganisation: CreateRunnerOrganisation) {
|
||||||
|
let runnerOrganisation;
|
||||||
|
try {
|
||||||
|
runnerOrganisation = await createRunnerOrganisation.toEntity();
|
||||||
|
} catch (error) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
runnerOrganisation = await this.runnerOrganisationRepository.save(runnerOrganisation);
|
||||||
|
|
||||||
|
return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(runnerOrganisation, { relations: ['address', 'contact', 'teams'] }));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put('/:id')
|
||||||
|
@Authorized("ORGANISATION:UPDATE")
|
||||||
|
@ResponseSchema(ResponseRunnerOrganisation)
|
||||||
|
@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
|
||||||
|
@ResponseSchema(RunnerOrganisationIdsNotMatchingError, { statusCode: 406 })
|
||||||
|
@OpenAPI({ description: "Update the organisation whose id you provided. <br> Please remember that ids can't be changed." })
|
||||||
|
async put(@Param('id') id: number, @Body({ validate: true }) updateOrganisation: UpdateRunnerOrganisation) {
|
||||||
|
let oldRunnerOrganisation = await this.runnerOrganisationRepository.findOne({ id: id });
|
||||||
|
|
||||||
|
if (!oldRunnerOrganisation) {
|
||||||
|
throw new RunnerOrganisationNotFoundError();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (oldRunnerOrganisation.id != updateOrganisation.id) {
|
||||||
|
throw new RunnerOrganisationIdsNotMatchingError();
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.runnerOrganisationRepository.save(await updateOrganisation.update(oldRunnerOrganisation));
|
||||||
|
|
||||||
|
return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(id, { relations: ['address', 'contact', 'teams'] }));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete('/:id')
|
||||||
|
@Authorized("ORGANISATION:DELETE")
|
||||||
|
@ResponseSchema(ResponseRunnerOrganisation)
|
||||||
|
@ResponseSchema(ResponseEmpty, { statusCode: 204 })
|
||||||
|
@ResponseSchema(RunnerOrganisationHasTeamsError, { statusCode: 406 })
|
||||||
|
@ResponseSchema(RunnerOrganisationHasRunnersError, { statusCode: 406 })
|
||||||
|
@OnUndefined(204)
|
||||||
|
@OpenAPI({ description: 'Delete the organsisation whose id you provided. <br> If the organisation still has runners and/or teams associated this will fail. <br> To delete the organisation with all associated runners and teams set the force QueryParam to true (cascading deletion might take a while). <br> If no organisation with this id exists it will just return 204(no content).' })
|
||||||
|
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
||||||
|
let organisation = await this.runnerOrganisationRepository.findOne({ id: id });
|
||||||
|
if (!organisation) { return null; }
|
||||||
|
let runnerOrganisation = await this.runnerOrganisationRepository.findOne(organisation, { relations: ['address', 'contact', 'runners', 'teams'] });
|
||||||
|
|
||||||
|
if (!force) {
|
||||||
|
if (runnerOrganisation.teams.length != 0) {
|
||||||
|
throw new RunnerOrganisationHasTeamsError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const teamController = new RunnerTeamController()
|
||||||
|
for (let team of runnerOrganisation.teams) {
|
||||||
|
await teamController.remove(team.id, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!force) {
|
||||||
|
if (runnerOrganisation.runners.length != 0) {
|
||||||
|
throw new RunnerOrganisationHasRunnersError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const runnerController = new RunnerController()
|
||||||
|
for (let runner of runnerOrganisation.runners) {
|
||||||
|
await runnerController.remove(runner.id, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
const responseOrganisation = new ResponseRunnerOrganisation(runnerOrganisation);
|
||||||
|
await this.runnerOrganisationRepository.delete(organisation);
|
||||||
|
return responseOrganisation;
|
||||||
|
}
|
||||||
|
}
|
@ -1,156 +0,0 @@
|
|||||||
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 { RunnerOrganizationHasRunnersError, RunnerOrganizationHasTeamsError, RunnerOrganizationIdsNotMatchingError, RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
|
|
||||||
import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization';
|
|
||||||
import { UpdateRunnerOrganization } from '../models/actions/update/UpdateRunnerOrganization';
|
|
||||||
import { Runner } from '../models/entities/Runner';
|
|
||||||
import { RunnerOrganization } from '../models/entities/RunnerOrganization';
|
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
|
||||||
import { ResponseRunner } from '../models/responses/ResponseRunner';
|
|
||||||
import { ResponseRunnerOrganization } from '../models/responses/ResponseRunnerOrganization';
|
|
||||||
import { RunnerController } from './RunnerController';
|
|
||||||
import { RunnerTeamController } from './RunnerTeamController';
|
|
||||||
|
|
||||||
|
|
||||||
@JsonController('/organizations')
|
|
||||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
|
||||||
export class RunnerOrganizationController {
|
|
||||||
private runnerOrganizationRepository: Repository<RunnerOrganization>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the repository of this controller's model/entity.
|
|
||||||
*/
|
|
||||||
constructor() {
|
|
||||||
this.runnerOrganizationRepository = getConnectionManager().get().getRepository(RunnerOrganization);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get()
|
|
||||||
@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) {
|
|
||||||
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 responseOrgs;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/:id')
|
|
||||||
@Authorized("ORGANIZATION:GET")
|
|
||||||
@ResponseSchema(ResponseRunnerOrganization)
|
|
||||||
@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
|
|
||||||
@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'] });
|
|
||||||
if (!runnerOrg) { throw new RunnerOrganizationNotFoundError(); }
|
|
||||||
return new ResponseRunnerOrganization(runnerOrg);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/:id/runners')
|
|
||||||
@Authorized(["RUNNER:GET", "SCAN:GET"])
|
|
||||||
@ResponseSchema(ResponseRunner, { isArray: true })
|
|
||||||
@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
|
|
||||||
@OpenAPI({ description: 'Lists all runners from this org and it\'s teams (if you don\'t provide the ?onlyDirect=true param). <br> This includes the runner\'s group and distance ran.' })
|
|
||||||
async getRunners(@Param('id') id: number, @QueryParam('onlyDirect') onlyDirect: boolean) {
|
|
||||||
let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
|
|
||||||
let runners: Runner[];
|
|
||||||
if (!onlyDirect) { runners = (await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.group', 'teams.runners.group.parentGroup', 'teams.runners.scans', 'teams.runners.scans.track'] })).allRunners; }
|
|
||||||
else { runners = (await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track'] })).runners; }
|
|
||||||
runners.forEach(runner => {
|
|
||||||
responseRunners.push(new ResponseRunner(runner));
|
|
||||||
});
|
|
||||||
return responseRunners;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post()
|
|
||||||
@Authorized("ORGANIZATION:CREATE")
|
|
||||||
@ResponseSchema(ResponseRunnerOrganization)
|
|
||||||
@OpenAPI({ description: 'Create a new organsisation.' })
|
|
||||||
async post(@Body({ validate: true }) createRunnerOrganization: CreateRunnerOrganization) {
|
|
||||||
let runnerOrganization;
|
|
||||||
try {
|
|
||||||
runnerOrganization = await createRunnerOrganization.toEntity();
|
|
||||||
} catch (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
|
|
||||||
runnerOrganization = await this.runnerOrganizationRepository.save(runnerOrganization);
|
|
||||||
|
|
||||||
return new ResponseRunnerOrganization(await this.runnerOrganizationRepository.findOne(runnerOrganization, { relations: ['contact', 'teams'] }));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Put('/:id')
|
|
||||||
@Authorized("ORGANIZATION:UPDATE")
|
|
||||||
@ResponseSchema(ResponseRunnerOrganization)
|
|
||||||
@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
|
|
||||||
@ResponseSchema(RunnerOrganizationIdsNotMatchingError, { statusCode: 406 })
|
|
||||||
@OpenAPI({ description: "Update the organization whose id you provided. <br> Please remember that ids can't be changed." })
|
|
||||||
async put(@Param('id') id: number, @Body({ validate: true }) updateOrganization: UpdateRunnerOrganization) {
|
|
||||||
let oldRunnerOrganization = await this.runnerOrganizationRepository.findOne({ id: id });
|
|
||||||
|
|
||||||
if (!oldRunnerOrganization) {
|
|
||||||
throw new RunnerOrganizationNotFoundError();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldRunnerOrganization.id != updateOrganization.id) {
|
|
||||||
throw new RunnerOrganizationIdsNotMatchingError();
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.runnerOrganizationRepository.save(await updateOrganization.update(oldRunnerOrganization));
|
|
||||||
|
|
||||||
return new ResponseRunnerOrganization(await this.runnerOrganizationRepository.findOne(id, { relations: ['contact', 'teams'] }));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Delete('/:id')
|
|
||||||
@Authorized("ORGANIZATION:DELETE")
|
|
||||||
@ResponseSchema(ResponseRunnerOrganization)
|
|
||||||
@ResponseSchema(ResponseEmpty, { statusCode: 204 })
|
|
||||||
@ResponseSchema(RunnerOrganizationHasTeamsError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(RunnerOrganizationHasRunnersError, { statusCode: 406 })
|
|
||||||
@OnUndefined(204)
|
|
||||||
@OpenAPI({ description: 'Delete the organsisation whose id you provided. <br> If the organization still has runners and/or teams associated this will fail. <br> To delete the organization with all associated runners and teams set the force QueryParam to true (cascading deletion might take a while). <br> This won\'t delete the associated contact. <br> If no organization with this id exists it will just return 204(no content).' })
|
|
||||||
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
|
||||||
if (id == 1) {
|
|
||||||
throw new BadRequestError("You can't delete the citizen runner org.");
|
|
||||||
}
|
|
||||||
|
|
||||||
let organization = await this.runnerOrganizationRepository.findOne({ id: id });
|
|
||||||
if (!organization) { return null; }
|
|
||||||
let runnerOrganization = await this.runnerOrganizationRepository.findOne(organization, { relations: ['contact', 'runners', 'teams'] });
|
|
||||||
|
|
||||||
if (!force) {
|
|
||||||
if (runnerOrganization.teams.length != 0) {
|
|
||||||
throw new RunnerOrganizationHasTeamsError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const teamController = new RunnerTeamController()
|
|
||||||
for (let team of runnerOrganization.teams) {
|
|
||||||
await teamController.remove(team.id, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!force) {
|
|
||||||
if (runnerOrganization.runners.length != 0) {
|
|
||||||
throw new RunnerOrganizationHasRunnersError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const runnerController = new RunnerController()
|
|
||||||
for (let runner of runnerOrganization.runners) {
|
|
||||||
await runnerController.remove(runner.id, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
const responseOrganization = new ResponseRunnerOrganization(runnerOrganization);
|
|
||||||
await this.runnerOrganizationRepository.delete(organization);
|
|
||||||
return responseOrganization;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,244 +0,0 @@
|
|||||||
import { Request } from "express";
|
|
||||||
import * as jwt from "jsonwebtoken";
|
|
||||||
import { BadRequestError, Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers';
|
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
|
||||||
import { getConnectionManager, Repository } from 'typeorm';
|
|
||||||
import { config } from '../config';
|
|
||||||
import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError';
|
|
||||||
import { MailSendingError } from '../errors/MailErrors';
|
|
||||||
import { RunnerEmailNeededError, RunnerHasDistanceDonationsError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors';
|
|
||||||
import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
|
|
||||||
import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
|
|
||||||
import { JwtCreator } from '../jwtcreator';
|
|
||||||
import { Mailer } from '../mailer';
|
|
||||||
import ScanAuth from '../middlewares/ScanAuth';
|
|
||||||
import { CreateSelfServiceCitizenRunner } from '../models/actions/create/CreateSelfServiceCitizenRunner';
|
|
||||||
import { CreateSelfServiceRunner } from '../models/actions/create/CreateSelfServiceRunner';
|
|
||||||
import { Runner } from '../models/entities/Runner';
|
|
||||||
import { RunnerGroup } from '../models/entities/RunnerGroup';
|
|
||||||
import { RunnerOrganization } from '../models/entities/RunnerOrganization';
|
|
||||||
import { ScanStation } from '../models/entities/ScanStation';
|
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
|
||||||
import { ResponseScanStation } from '../models/responses/ResponseScanStation';
|
|
||||||
import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation';
|
|
||||||
import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner';
|
|
||||||
import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan';
|
|
||||||
import { DonationController } from './DonationController';
|
|
||||||
import { RunnerCardController } from './RunnerCardController';
|
|
||||||
import { ScanController } from './ScanController';
|
|
||||||
|
|
||||||
@JsonController()
|
|
||||||
export class RunnerSelfServiceController {
|
|
||||||
private runnerRepository: Repository<Runner>;
|
|
||||||
private orgRepository: Repository<RunnerOrganization>;
|
|
||||||
private stationRepository: Repository<ScanStation>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the repository of this controller's model/entity.
|
|
||||||
*/
|
|
||||||
constructor() {
|
|
||||||
this.runnerRepository = getConnectionManager().get().getRepository(Runner);
|
|
||||||
this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganization);
|
|
||||||
this.stationRepository = getConnectionManager().get().getRepository(ScanStation);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/runners/me/:jwt')
|
|
||||||
@ResponseSchema(ResponseSelfServiceRunner)
|
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
|
||||||
@OnUndefined(RunnerNotFoundError)
|
|
||||||
@OpenAPI({ description: 'Lists all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
|
|
||||||
async get(@Param('jwt') token: string) {
|
|
||||||
return (new ResponseSelfServiceRunner(await this.getRunner(token)));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Delete('/runners/me/:jwt')
|
|
||||||
@ResponseSchema(ResponseSelfServiceRunner)
|
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
|
||||||
@OnUndefined(RunnerNotFoundError)
|
|
||||||
@OpenAPI({ description: 'Deletes all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
|
|
||||||
async remove(@Param('jwt') token: string, @QueryParam("force") force: boolean) {
|
|
||||||
const responseRunner = await this.getRunner(token);
|
|
||||||
let runner = await this.runnerRepository.findOne({ id: responseRunner.id });
|
|
||||||
|
|
||||||
if (!runner) { return null; }
|
|
||||||
if (!runner) {
|
|
||||||
throw new RunnerNotFoundError();
|
|
||||||
}
|
|
||||||
|
|
||||||
const runnerDonations = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["distanceDonations"] })).distanceDonations;
|
|
||||||
if (runnerDonations.length > 0 && !force) {
|
|
||||||
throw new RunnerHasDistanceDonationsError();
|
|
||||||
}
|
|
||||||
const donationController = new DonationController();
|
|
||||||
for (let donation of runnerDonations) {
|
|
||||||
await donationController.remove(donation.id, force);
|
|
||||||
}
|
|
||||||
|
|
||||||
const runnerCards = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["cards"] })).cards;
|
|
||||||
const cardController = new RunnerCardController;
|
|
||||||
for (let card of runnerCards) {
|
|
||||||
await cardController.remove(card.id, force);
|
|
||||||
}
|
|
||||||
|
|
||||||
const runnerScans = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["scans"] })).scans;
|
|
||||||
const scanController = new ScanController;
|
|
||||||
for (let scan of runnerScans) {
|
|
||||||
await scanController.remove(scan.id, force);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.runnerRepository.delete(runner);
|
|
||||||
return new ResponseSelfServiceRunner(responseRunner);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/runners/me/:jwt/scans')
|
|
||||||
@ResponseSchema(ResponseSelfServiceScan, { isArray: true })
|
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
|
||||||
@OnUndefined(RunnerNotFoundError)
|
|
||||||
@OpenAPI({ description: 'Lists all your (runner) scans. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please contact support.' })
|
|
||||||
async getScans(@Param('jwt') token: string) {
|
|
||||||
const scans = (await this.getRunner(token)).scans;
|
|
||||||
let responseScans = new Array<ResponseSelfServiceScan>()
|
|
||||||
for (let scan of scans) {
|
|
||||||
responseScans.push(new ResponseSelfServiceScan(scan));
|
|
||||||
}
|
|
||||||
return responseScans;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/stations/me')
|
|
||||||
@UseBefore(ScanAuth)
|
|
||||||
@ResponseSchema(ResponseScanStation)
|
|
||||||
@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 })
|
|
||||||
@OnUndefined(ScanStationNotFoundError)
|
|
||||||
@OpenAPI({ description: 'Lists basic information about the station whose token got provided. <br> This includes it\'s associated track.', security: [{ "StationApiToken": [] }] })
|
|
||||||
async getStationMe(@Req() req: Request) {
|
|
||||||
let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] })
|
|
||||||
if (!scan) { throw new ScanStationNotFoundError(); }
|
|
||||||
return scan.toResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('/runners/login')
|
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
|
||||||
@OnUndefined(ResponseEmpty)
|
|
||||||
@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice magic-login-link to be sent to your mail address (rate limited to one mail every 15mins).' })
|
|
||||||
async requestNewToken(@QueryParam('mail') mail: string, @QueryParam("locale") locale: string = "en") {
|
|
||||||
if (!mail) {
|
|
||||||
throw new RunnerNotFoundError();
|
|
||||||
}
|
|
||||||
const runner = await this.runnerRepository.findOne({ email: mail });
|
|
||||||
if (!runner) { throw new RunnerNotFoundError(); }
|
|
||||||
|
|
||||||
if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 15)) { throw new RunnerSelfserviceTimeoutError(); }
|
|
||||||
const token = JwtCreator.createSelfService(runner);
|
|
||||||
|
|
||||||
try {
|
|
||||||
await Mailer.sendSelfserviceForgottenMail(runner.email, token, locale)
|
|
||||||
} catch (error) {
|
|
||||||
throw new MailSendingError();
|
|
||||||
}
|
|
||||||
|
|
||||||
runner.resetRequestedTimestamp = Math.floor(Date.now() / 1000);
|
|
||||||
await this.runnerRepository.save(runner);
|
|
||||||
|
|
||||||
return { token };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('/runners/register')
|
|
||||||
@ResponseSchema(ResponseSelfServiceRunner)
|
|
||||||
@ResponseSchema(RunnerEmailNeededError, { statusCode: 406 })
|
|
||||||
@OpenAPI({ description: 'Create a new selfservice runner in the citizen org. <br> This endpoint shoud be used to allow "everyday citizen" to register themselves. <br> You have to provide a mail address, b/c the future we\'ll implement email verification.' })
|
|
||||||
async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner, @QueryParam("locale") locale: string = "en") {
|
|
||||||
let runner = await createRunner.toEntity();
|
|
||||||
if (await this.getRunnerExistsByMail(runner.email)) {
|
|
||||||
throw new BadRequestError("E-Mail already registered")
|
|
||||||
}
|
|
||||||
runner = await this.runnerRepository.save(runner);
|
|
||||||
|
|
||||||
let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
|
|
||||||
response.token = JwtCreator.createSelfService(runner);
|
|
||||||
|
|
||||||
try {
|
|
||||||
await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
|
|
||||||
} catch (error) {
|
|
||||||
throw new MailSendingError();
|
|
||||||
}
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('/runners/register/:token')
|
|
||||||
@ResponseSchema(ResponseSelfServiceRunner)
|
|
||||||
@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
|
|
||||||
@OpenAPI({ description: 'Create a new selfservice runner in a provided org. <br> The orgs get provided and authorized via api tokens that can be optained via the /organizations endpoint.' })
|
|
||||||
async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner, @QueryParam("locale") locale: string = "en") {
|
|
||||||
const org = await this.getOrgansisation(token);
|
|
||||||
|
|
||||||
let runner = await createRunner.toEntity(org);
|
|
||||||
if (await this.getRunnerExistsByMail(runner.email)) {
|
|
||||||
throw new BadRequestError("E-Mail already registered")
|
|
||||||
}
|
|
||||||
runner = await this.runnerRepository.save(runner);
|
|
||||||
|
|
||||||
let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
|
|
||||||
response.token = JwtCreator.createSelfService(runner);
|
|
||||||
|
|
||||||
try {
|
|
||||||
await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
|
|
||||||
} catch (error) {
|
|
||||||
throw new MailSendingError();
|
|
||||||
}
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/organizations/selfservice/:token')
|
|
||||||
@ResponseSchema(ResponseSelfServiceOrganisation, { isArray: false })
|
|
||||||
@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
|
|
||||||
@OpenAPI({ description: 'Get the basic info and teams for a org.' })
|
|
||||||
async getSelfserviceOrg(@Param('token') token: string) {
|
|
||||||
const orgid = (await this.getOrgansisation(token)).id;
|
|
||||||
const org = await this.orgRepository.findOne({ id: orgid }, { relations: ['teams'] })
|
|
||||||
|
|
||||||
return new ResponseSelfServiceOrganisation(<RunnerOrganization>org);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get's a runner by a provided jwt token.
|
|
||||||
* @param token The runner jwt provided by the runner to identitfy themselves.
|
|
||||||
*/
|
|
||||||
private async getRunner(token: string): Promise<Runner> {
|
|
||||||
if (token == "") { throw new JwtNotProvidedError(); }
|
|
||||||
let jwtPayload = undefined
|
|
||||||
try {
|
|
||||||
jwtPayload = <any>jwt.verify(token, config.jwt_secret);
|
|
||||||
} catch (error) {
|
|
||||||
throw new InvalidCredentialsError();
|
|
||||||
}
|
|
||||||
|
|
||||||
const runner = await this.runnerRepository.findOne({ id: jwtPayload["id"] }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] });
|
|
||||||
if (!runner) { throw new RunnerNotFoundError() }
|
|
||||||
return runner;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get's a runner org by a provided registration api key.
|
|
||||||
* @param token The organization's registration api token.
|
|
||||||
*/
|
|
||||||
private async getOrgansisation(token: string): Promise<RunnerGroup> {
|
|
||||||
token = Buffer.from(token, 'base64').toString('utf8');
|
|
||||||
|
|
||||||
const organization = await this.orgRepository.findOne({ key: token });
|
|
||||||
if (!organization) { throw new RunnerOrganizationNotFoundError; }
|
|
||||||
|
|
||||||
return organization;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if a runner already exists
|
|
||||||
* @param email The runner's email address
|
|
||||||
* @returns Boolean (true if exists, false if not)
|
|
||||||
*/
|
|
||||||
private async getRunnerExistsByMail(email: string): Promise<boolean> {
|
|
||||||
const runner = await this.runnerRepository.findOne({ email });
|
|
||||||
return runner != undefined
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,12 +1,11 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { RunnerTeamHasRunnersError, RunnerTeamIdsNotMatchingError, RunnerTeamNotFoundError } from '../errors/RunnerTeamErrors';
|
||||||
import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam';
|
import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam';
|
||||||
import { UpdateRunnerTeam } from '../models/actions/update/UpdateRunnerTeam';
|
import { UpdateRunnerTeam } from '../models/actions/update/UpdateRunnerTeam';
|
||||||
import { RunnerTeam } from '../models/entities/RunnerTeam';
|
import { RunnerTeam } from '../models/entities/RunnerTeam';
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
||||||
import { ResponseRunner } from '../models/responses/ResponseRunner';
|
|
||||||
import { ResponseRunnerTeam } from '../models/responses/ResponseRunnerTeam';
|
import { ResponseRunnerTeam } from '../models/responses/ResponseRunnerTeam';
|
||||||
import { RunnerController } from './RunnerController';
|
import { RunnerController } from './RunnerController';
|
||||||
|
|
||||||
@ -26,19 +25,12 @@ export class RunnerTeamController {
|
|||||||
@Get()
|
@Get()
|
||||||
@Authorized("TEAM:GET")
|
@Authorized("TEAM:GET")
|
||||||
@ResponseSchema(ResponseRunnerTeam, { isArray: true })
|
@ResponseSchema(ResponseRunnerTeam, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organization and contact (if existing/associated).' })
|
@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organisation 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 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;
|
return responseTeams;
|
||||||
}
|
}
|
||||||
@ -50,25 +42,11 @@ export class RunnerTeamController {
|
|||||||
@OnUndefined(RunnerTeamNotFoundError)
|
@OnUndefined(RunnerTeamNotFoundError)
|
||||||
@OpenAPI({ description: 'Lists all information about the team whose id got provided.' })
|
@OpenAPI({ description: 'Lists all information about the team whose id got provided.' })
|
||||||
async getOne(@Param('id') id: number) {
|
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(); }
|
if (!runnerTeam) { throw new RunnerTeamNotFoundError(); }
|
||||||
return new ResponseRunnerTeam(runnerTeam);
|
return new ResponseRunnerTeam(runnerTeam);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('/:id/runners')
|
|
||||||
@Authorized(["RUNNER:GET", "SCAN:GET"])
|
|
||||||
@ResponseSchema(ResponseRunner, { isArray: true })
|
|
||||||
@ResponseSchema(RunnerTeamNotFoundError, { statusCode: 404 })
|
|
||||||
@OpenAPI({ description: 'Lists all runners from this team. <br> This includes the runner\'s group and distance ran.' })
|
|
||||||
async getRunners(@Param('id') id: number) {
|
|
||||||
let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
|
|
||||||
const runners = (await this.runnerTeamRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track'] })).runners;
|
|
||||||
runners.forEach(runner => {
|
|
||||||
responseRunners.push(new ResponseRunner(runner));
|
|
||||||
});
|
|
||||||
return responseRunners;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@Authorized("TEAM:CREATE")
|
@Authorized("TEAM:CREATE")
|
||||||
@ResponseSchema(ResponseRunnerTeam)
|
@ResponseSchema(ResponseRunnerTeam)
|
||||||
@ -115,7 +93,7 @@ export class RunnerTeamController {
|
|||||||
@ResponseSchema(ResponseEmpty, { statusCode: 204 })
|
@ResponseSchema(ResponseEmpty, { statusCode: 204 })
|
||||||
@ResponseSchema(RunnerTeamHasRunnersError, { statusCode: 406 })
|
@ResponseSchema(RunnerTeamHasRunnersError, { statusCode: 406 })
|
||||||
@OnUndefined(204)
|
@OnUndefined(204)
|
||||||
@OpenAPI({ description: 'Delete the team whose id you provided. <br> If the team still has runners associated this will fail. <br> To delete the team with all associated runners set the force QueryParam to true (cascading deletion might take a while). <br> This won\'t delete the associated contact.<br> If no team with this id exists it will just return 204(no content).' })
|
@OpenAPI({ description: 'Delete the team whose id you provided. <br> If the team still has runners associated this will fail. <br> To delete the team with all associated runners set the force QueryParam to true (cascading deletion might take a while). <br> If no team with this id exists it will just return 204(no content).' })
|
||||||
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
||||||
let team = await this.runnerTeamRepository.findOne({ id: id });
|
let team = await this.runnerTeamRepository.findOne({ id: id });
|
||||||
if (!team) { return null; }
|
if (!team) { return null; }
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import { Request } from "express";
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam, UseBefore } from 'routing-controllers';
|
||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam, Req, UseBefore } from 'routing-controllers';
|
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
||||||
import { Repository, getConnectionManager } from 'typeorm';
|
import { getConnectionManager, Repository } from 'typeorm';
|
||||||
import { RunnerNotFoundError } from '../errors/RunnerErrors';
|
import { RunnerNotFoundError } from '../errors/RunnerErrors';
|
||||||
import { ScanIdsNotMatchingError, ScanNotFoundError } from '../errors/ScanErrors';
|
import { ScanIdsNotMatchingError, ScanNotFoundError } from '../errors/ScanErrors';
|
||||||
import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
|
import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
|
||||||
@ -15,6 +14,7 @@ import { TrackScan } from '../models/entities/TrackScan';
|
|||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
||||||
import { ResponseScan } from '../models/responses/ResponseScan';
|
import { ResponseScan } from '../models/responses/ResponseScan';
|
||||||
import { ResponseTrackScan } from '../models/responses/ResponseTrackScan';
|
import { ResponseTrackScan } from '../models/responses/ResponseTrackScan';
|
||||||
|
|
||||||
@JsonController('/scans')
|
@JsonController('/scans')
|
||||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
export class ScanController {
|
export class ScanController {
|
||||||
@ -34,16 +34,9 @@ export class ScanController {
|
|||||||
@ResponseSchema(ResponseScan, { isArray: true })
|
@ResponseSchema(ResponseScan, { isArray: true })
|
||||||
@ResponseSchema(ResponseTrackScan, { 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.' })
|
@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 responseScans: ResponseScan[] = new Array<ResponseScan>();
|
||||||
let scans: Array<Scan>;
|
const scans = await this.scanRepository.find({ relations: ['runner', 'track', 'runner.scans', '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 => {
|
scans.forEach(scan => {
|
||||||
responseScans.push(scan.toResponse());
|
responseScans.push(scan.toResponse());
|
||||||
});
|
});
|
||||||
@ -58,7 +51,7 @@ export class ScanController {
|
|||||||
@OnUndefined(ScanNotFoundError)
|
@OnUndefined(ScanNotFoundError)
|
||||||
@OpenAPI({ description: 'Lists all information about the scan whose id got provided. This includes the scan\'s runner\'s distance ran.' })
|
@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) {
|
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.scans.track', 'card', 'station'] })
|
||||||
if (!scan) { throw new ScanNotFoundError(); }
|
if (!scan) { throw new ScanNotFoundError(); }
|
||||||
return scan.toResponse();
|
return scan.toResponse();
|
||||||
}
|
}
|
||||||
@ -67,26 +60,22 @@ export class ScanController {
|
|||||||
@UseBefore(ScanAuth)
|
@UseBefore(ScanAuth)
|
||||||
@ResponseSchema(ResponseScan)
|
@ResponseSchema(ResponseScan)
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
||||||
@OpenAPI({ description: 'Create a new scan (not track scan - use /scans/trackscans instead). <br> Please rmemember to provide the scan\'s runner\'s id and distance.', security: [{ "StationApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: 'Create a new scan (not track scan - use /scans/trackscans instead). <br> Please rmemember to provide the scan\'s runner\'s id and distance.', security: [{ "ScanApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async post(@Body({ validate: true }) createScan: CreateScan) {
|
async post(@Body({ validate: true }) createScan: CreateScan) {
|
||||||
let scan = await createScan.toEntity();
|
let scan = await createScan.toEntity();
|
||||||
scan = await this.scanRepository.save(scan);
|
scan = await this.scanRepository.save(scan);
|
||||||
return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/trackscans")
|
@Post("/trackscans")
|
||||||
@UseBefore(ScanAuth)
|
@UseBefore(ScanAuth)
|
||||||
@ResponseSchema(ResponseTrackScan)
|
@ResponseSchema(ResponseTrackScan)
|
||||||
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
|
||||||
@OpenAPI({ description: 'Create a new track scan (for "normal" scans use /scans instead). <br> Please remember that to provide the scan\'s card\'s station\'s id.', security: [{ "StationApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: 'Create a new track scan (for "normal" scans use /scans instead). <br> Please remember that to provide the scan\'s card\'s station\'s id.', security: [{ "ScanApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async postTrackScans(@Body({ validate: true }) createScan: CreateTrackScan, @Req() req: Request) {
|
async postTrackScans(@Body({ validate: true }) createScan: CreateTrackScan) {
|
||||||
const station_id = req.headers["station_id"];
|
|
||||||
if (station_id) {
|
|
||||||
createScan.station = parseInt(station_id.toString());
|
|
||||||
}
|
|
||||||
let scan = await createScan.toEntity();
|
let scan = await createScan.toEntity();
|
||||||
scan = await this.trackScanRepository.save(scan);
|
scan = await this.trackScanRepository.save(scan);
|
||||||
return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('/:id')
|
@Put('/:id')
|
||||||
@ -108,7 +97,7 @@ export class ScanController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.scanRepository.save(await scan.update(oldScan));
|
await this.scanRepository.save(await scan.update(oldScan));
|
||||||
return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('/trackscans/:id')
|
@Put('/trackscans/:id')
|
||||||
@ -131,7 +120,7 @@ export class ScanController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.trackScanRepository.save(await scan.update(oldScan));
|
await this.trackScanRepository.save(await scan.update(oldScan));
|
||||||
return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete('/:id')
|
@Delete('/:id')
|
||||||
@ -143,7 +132,7 @@ export class ScanController {
|
|||||||
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
||||||
let scan = await this.scanRepository.findOne({ id: id });
|
let scan = await this.scanRepository.findOne({ id: id });
|
||||||
if (!scan) { return null; }
|
if (!scan) { return null; }
|
||||||
const responseScan = await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] });
|
const responseScan = await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] });
|
||||||
|
|
||||||
await this.scanRepository.delete(scan);
|
await this.scanRepository.delete(scan);
|
||||||
return responseScan.toResponse();
|
return responseScan.toResponse();
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { ScanStationHasScansError, ScanStationIdsNotMatchingError, ScanStationNotFoundError } from '../errors/ScanStationErrors';
|
||||||
import { TrackNotFoundError } from '../errors/TrackErrors';
|
import { TrackNotFoundError } from '../errors/TrackErrors';
|
||||||
import { CreateScanStation } from '../models/actions/create/CreateScanStation';
|
import { CreateScanStation } from '../models/actions/create/CreateScanStation';
|
||||||
@ -26,16 +26,9 @@ export class ScanStationController {
|
|||||||
@Authorized("STATION:GET")
|
@Authorized("STATION:GET")
|
||||||
@ResponseSchema(ResponseScanStation, { isArray: true })
|
@ResponseSchema(ResponseScanStation, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all stations. <br> This includes their associated tracks.' })
|
@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 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 => {
|
stations.forEach(station => {
|
||||||
responseStations.push(station.toResponse());
|
responseStations.push(station.toResponse());
|
||||||
});
|
});
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
||||||
import { Repository, getConnectionManager } from 'typeorm';
|
import { getConnectionManager, Repository } from 'typeorm';
|
||||||
import { StatsClientNotFoundError } from '../errors/StatsClientErrors';
|
import { StatsClientNotFoundError } from '../errors/StatsClientErrors';
|
||||||
import { TrackNotFoundError } from "../errors/TrackErrors";
|
import { TrackNotFoundError } from "../errors/TrackErrors";
|
||||||
import { CreateStatsClient } from '../models/actions/create/CreateStatsClient';
|
import { CreateStatsClient } from '../models/actions/create/CreateStatsClient';
|
||||||
@ -24,16 +24,9 @@ export class StatsClientController {
|
|||||||
@Authorized("STATSCLIENT:GET")
|
@Authorized("STATSCLIENT:GET")
|
||||||
@ResponseSchema(ResponseStatsClient, { isArray: true })
|
@ResponseSchema(ResponseStatsClient, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all stats clients. Please remember that the key can only be viewed on creation.' })
|
@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 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 => {
|
clients.forEach(clients => {
|
||||||
responseClients.push(new ResponseStatsClient(clients));
|
responseClients.push(new ResponseStatsClient(clients));
|
||||||
});
|
});
|
||||||
|
@ -1,17 +1,15 @@
|
|||||||
import { Get, JsonController, QueryParam, UseBefore } from 'routing-controllers';
|
import { Get, JsonController, UseBefore } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
||||||
import { getConnection } from 'typeorm';
|
import { getConnection } from 'typeorm';
|
||||||
import StatsAuth from '../middlewares/StatsAuth';
|
import StatsAuth from '../middlewares/StatsAuth';
|
||||||
import { Donation } from '../models/entities/Donation';
|
import { Donation } from '../models/entities/Donation';
|
||||||
import { Donor } from '../models/entities/Donor';
|
|
||||||
import { Runner } from '../models/entities/Runner';
|
import { Runner } from '../models/entities/Runner';
|
||||||
import { RunnerOrganization } from '../models/entities/RunnerOrganization';
|
import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
|
||||||
import { RunnerTeam } from '../models/entities/RunnerTeam';
|
import { RunnerTeam } from '../models/entities/RunnerTeam';
|
||||||
import { Scan } from '../models/entities/Scan';
|
import { Scan } from '../models/entities/Scan';
|
||||||
import { TrackScan } from '../models/entities/TrackScan';
|
|
||||||
import { User } from '../models/entities/User';
|
import { User } from '../models/entities/User';
|
||||||
import { ResponseStats } from '../models/responses/ResponseStats';
|
import { ResponseStats } from '../models/responses/ResponseStats';
|
||||||
import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganization';
|
import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganisation';
|
||||||
import { ResponseStatsRunner } from '../models/responses/ResponseStatsRunner';
|
import { ResponseStatsRunner } from '../models/responses/ResponseStatsRunner';
|
||||||
import { ResponseStatsTeam } from '../models/responses/ResponseStatsTeam';
|
import { ResponseStatsTeam } from '../models/responses/ResponseStatsTeam';
|
||||||
|
|
||||||
@ -22,26 +20,14 @@ export class StatsController {
|
|||||||
@ResponseSchema(ResponseStats)
|
@ResponseSchema(ResponseStats)
|
||||||
@OpenAPI({ description: "A very basic stats endpoint providing basic counters for a dashboard or simmilar" })
|
@OpenAPI({ description: "A very basic stats endpoint providing basic counters for a dashboard or simmilar" })
|
||||||
async get() {
|
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(RunnerOrganisation).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'] });
|
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")
|
@Get("/runners/distance")
|
||||||
@ -50,10 +36,7 @@ export class StatsController {
|
|||||||
@OpenAPI({ description: "Returns the top ten runners by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: "Returns the top ten runners by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async getTopRunnersByDistance() {
|
async getTopRunnersByDistance() {
|
||||||
let runners = await getConnection().getRepository(Runner).find({ relations: ['scans', 'group', 'distanceDonations', 'scans.track'] });
|
let runners = await getConnection().getRepository(Runner).find({ relations: ['scans', 'group', 'distanceDonations', 'scans.track'] });
|
||||||
if (!runners || runners.length == 0) {
|
let topRunners = runners.sort((runner1, runner2) => runner1.distance - runner2.distance).slice(0, 9);
|
||||||
return [];
|
|
||||||
}
|
|
||||||
let topRunners = runners.sort((runner1, runner2) => runner2.distance - runner1.distance).slice(0, 10);
|
|
||||||
let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>();
|
let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>();
|
||||||
topRunners.forEach(runner => {
|
topRunners.forEach(runner => {
|
||||||
responseRunners.push(new ResponseStatsRunner(runner));
|
responseRunners.push(new ResponseStatsRunner(runner));
|
||||||
@ -66,11 +49,8 @@ export class StatsController {
|
|||||||
@ResponseSchema(ResponseStatsRunner, { isArray: true })
|
@ResponseSchema(ResponseStatsRunner, { isArray: true })
|
||||||
@OpenAPI({ description: "Returns the top ten runners by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: "Returns the top ten runners by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async getTopRunnersByDonations() {
|
async getTopRunnersByDonations() {
|
||||||
let runners = await getConnection().getRepository(Runner).find({ relations: ['group', 'distanceDonations', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] });
|
let runners = await getConnection().getRepository(Runner).find({ relations: ['scans', 'group', 'distanceDonations', 'scans.track'] });
|
||||||
if (!runners || runners.length == 0) {
|
let topRunners = runners.sort((runner1, runner2) => runner1.distanceDonationAmount - runner2.distanceDonationAmount).slice(0, 9);
|
||||||
return [];
|
|
||||||
}
|
|
||||||
let topRunners = runners.sort((runner1, runner2) => runner2.distanceDonationAmount - runner1.distanceDonationAmount).slice(0, 10);
|
|
||||||
let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>();
|
let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>();
|
||||||
topRunners.forEach(runner => {
|
topRunners.forEach(runner => {
|
||||||
responseRunners.push(new ResponseStatsRunner(runner));
|
responseRunners.push(new ResponseStatsRunner(runner));
|
||||||
@ -78,34 +58,6 @@ export class StatsController {
|
|||||||
return responseRunners;
|
return responseRunners;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("/runners/laptime")
|
|
||||||
@UseBefore(StatsAuth)
|
|
||||||
@ResponseSchema(ResponseStatsRunner, { isArray: true })
|
|
||||||
@OpenAPI({ description: "Returns the top ten runners by fastest laptime on your selected track (track by id).", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
|
||||||
async getTopRunnersByLaptime(@QueryParam("track") track: number) {
|
|
||||||
let scans = await getConnection().getRepository(TrackScan).find({ relations: ['track', 'runner', 'runner.group', 'runner.scans', 'runner.scans.track', 'runner.distanceDonations'] });
|
|
||||||
if (!scans || scans.length == 0) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
scans = scans.filter((s) => { return s.track.id == track && s.valid == true && s.lapTime != 0 }).sort((scan1, scan2) => scan1.lapTime - scan2.lapTime);
|
|
||||||
|
|
||||||
let topScans = new Array<TrackScan>();
|
|
||||||
let knownRunners = new Array<number>();
|
|
||||||
for (let i = 0; i < scans.length && topScans.length < 10; i++) {
|
|
||||||
const element = scans[i];
|
|
||||||
if (!knownRunners.includes(element.runner.id)) {
|
|
||||||
topScans.push(element);
|
|
||||||
knownRunners.push(element.runner.id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>();
|
|
||||||
topScans.forEach(scan => {
|
|
||||||
responseRunners.push(new ResponseStatsRunner(scan.runner, scan.lapTime));
|
|
||||||
});
|
|
||||||
return responseRunners;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get("/scans")
|
@Get("/scans")
|
||||||
@UseBefore(StatsAuth)
|
@UseBefore(StatsAuth)
|
||||||
@ResponseSchema(ResponseStatsRunner, { isArray: true })
|
@ResponseSchema(ResponseStatsRunner, { isArray: true })
|
||||||
@ -119,11 +71,8 @@ export class StatsController {
|
|||||||
@ResponseSchema(ResponseStatsTeam, { isArray: true })
|
@ResponseSchema(ResponseStatsTeam, { isArray: true })
|
||||||
@OpenAPI({ description: "Returns the top ten teams by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: "Returns the top ten teams by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async getTopTeamsByDistance() {
|
async getTopTeamsByDistance() {
|
||||||
let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['parentGroup', 'runners', 'runners.scans', 'runners.scans.track'] });
|
let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] });
|
||||||
if (!teams || teams.length == 0) {
|
let topTeams = teams.sort((team1, team2) => team1.distance - team2.distance).slice(0, 9);
|
||||||
return [];
|
|
||||||
}
|
|
||||||
let topTeams = teams.sort((team1, team2) => team2.distance - team1.distance).slice(0, 10);
|
|
||||||
let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>();
|
let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>();
|
||||||
topTeams.forEach(team => {
|
topTeams.forEach(team => {
|
||||||
responseTeams.push(new ResponseStatsTeam(team));
|
responseTeams.push(new ResponseStatsTeam(team));
|
||||||
@ -136,11 +85,8 @@ export class StatsController {
|
|||||||
@ResponseSchema(ResponseStatsTeam, { isArray: true })
|
@ResponseSchema(ResponseStatsTeam, { isArray: true })
|
||||||
@OpenAPI({ description: "Returns the top ten teams by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: "Returns the top ten teams by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async getTopTeamsByDonations() {
|
async getTopTeamsByDonations() {
|
||||||
let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['parentGroup', 'runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] });
|
let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] });
|
||||||
if (!teams || teams.length == 0) {
|
let topTeams = teams.sort((team1, team2) => team1.distanceDonationAmount - team2.distanceDonationAmount).slice(0, 9);
|
||||||
return [];
|
|
||||||
}
|
|
||||||
let topTeams = teams.sort((team1, team2) => team2.distanceDonationAmount - team1.distanceDonationAmount).slice(0, 10);
|
|
||||||
let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>();
|
let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>();
|
||||||
topTeams.forEach(team => {
|
topTeams.forEach(team => {
|
||||||
responseTeams.push(new ResponseStatsTeam(team));
|
responseTeams.push(new ResponseStatsTeam(team));
|
||||||
@ -148,16 +94,13 @@ export class StatsController {
|
|||||||
return responseTeams;
|
return responseTeams;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("/organizations/distance")
|
@Get("/organisations/distance")
|
||||||
@UseBefore(StatsAuth)
|
@UseBefore(StatsAuth)
|
||||||
@ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
|
@ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
|
||||||
@OpenAPI({ description: "Returns the top ten organizations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: "Returns the top ten organisations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async getTopOrgsByDistance() {
|
async getTopOrgsByDistance() {
|
||||||
let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
|
let orgs = await getConnection().getRepository(RunnerOrganisation).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
|
||||||
if (!orgs || orgs.length == 0) {
|
let topOrgs = orgs.sort((org1, org2) => org1.distance - org2.distance).slice(0, 9);
|
||||||
return [];
|
|
||||||
}
|
|
||||||
let topOrgs = orgs.sort((org1, org2) => org2.distance - org1.distance).slice(0, 10);
|
|
||||||
let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
|
let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
|
||||||
topOrgs.forEach(org => {
|
topOrgs.forEach(org => {
|
||||||
responseOrgs.push(new ResponseStatsOrgnisation(org));
|
responseOrgs.push(new ResponseStatsOrgnisation(org));
|
||||||
@ -165,16 +108,13 @@ export class StatsController {
|
|||||||
return responseOrgs;
|
return responseOrgs;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("/organizations/donations")
|
@Get("/organisations/donations")
|
||||||
@UseBefore(StatsAuth)
|
@UseBefore(StatsAuth)
|
||||||
@ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
|
@ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
|
||||||
@OpenAPI({ description: "Returns the top ten organizations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
@OpenAPI({ description: "Returns the top ten organisations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
|
||||||
async getTopOrgsByDonations() {
|
async getTopOrgsByDonations() {
|
||||||
let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.distanceDonations', 'runners.distanceDonations.runner', 'runners.distanceDonations.runner.scans', 'runners.distanceDonations.runner.scans.track', 'teams', 'teams.runners', 'teams.runners.distanceDonations', 'teams.runners.distanceDonations.runner', 'teams.runners.distanceDonations.runner.scans', 'teams.runners.distanceDonations.runner.scans.track'] });
|
let orgs = await getConnection().getRepository(RunnerOrganisation).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
|
||||||
if (!orgs || orgs.length == 0) {
|
let topOrgs = orgs.sort((org1, org2) => org1.distanceDonationAmount - org2.distanceDonationAmount).slice(0, 9);
|
||||||
return [];
|
|
||||||
}
|
|
||||||
let topOrgs = orgs.sort((org1, org2) => org2.distanceDonationAmount - org1.distanceDonationAmount).slice(0, 10);
|
|
||||||
let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
|
let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
|
||||||
topOrgs.forEach(org => {
|
topOrgs.forEach(org => {
|
||||||
responseOrgs.push(new ResponseStatsOrgnisation(org));
|
responseOrgs.push(new ResponseStatsOrgnisation(org));
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { TrackHasScanStationsError, TrackIdsNotMatchingError, TrackLapTimeCantBeNegativeError, TrackNotFoundError } from "../errors/TrackErrors";
|
||||||
import { CreateTrack } from '../models/actions/create/CreateTrack';
|
import { CreateTrack } from '../models/actions/create/CreateTrack';
|
||||||
import { UpdateTrack } from '../models/actions/update/UpdateTrack';
|
import { UpdateTrack } from '../models/actions/update/UpdateTrack';
|
||||||
@ -25,17 +25,9 @@ export class TrackController {
|
|||||||
@Authorized("TRACK:GET")
|
@Authorized("TRACK:GET")
|
||||||
@ResponseSchema(ResponseTrack, { isArray: true })
|
@ResponseSchema(ResponseTrack, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all tracks.' })
|
@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 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 => {
|
tracks.forEach(track => {
|
||||||
responseTracks.push(new ResponseTrack(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 { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
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 { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
|
||||||
import { UserGroupNotFoundError } from '../errors/UserGroupErrors';
|
import { UserGroupNotFoundError } from '../errors/UserGroupErrors';
|
||||||
import { CreateUser } from '../models/actions/create/CreateUser';
|
import { CreateUser } from '../models/actions/create/CreateUser';
|
||||||
import { UpdateUser } from '../models/actions/update/UpdateUser';
|
import { UpdateUser } from '../models/actions/update/UpdateUser';
|
||||||
@ -28,17 +28,9 @@ export class UserController {
|
|||||||
@Authorized("USER:GET")
|
@Authorized("USER:GET")
|
||||||
@ResponseSchema(ResponseUser, { isArray: true })
|
@ResponseSchema(ResponseUser, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all users. <br> This includes their groups and permissions granted to them.' })
|
@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 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 => {
|
users.forEach(user => {
|
||||||
responseUsers.push(new ResponseUser(user));
|
responseUsers.push(new ResponseUser(user));
|
||||||
});
|
});
|
||||||
@ -74,10 +66,6 @@ export class UserController {
|
|||||||
@ResponseSchema(ResponseUser)
|
@ResponseSchema(ResponseUser)
|
||||||
@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
|
@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
|
||||||
@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
|
@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
|
||||||
@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordTooShortError, { statusCode: 406 })
|
|
||||||
@OpenAPI({ description: 'Create a new user. <br> If you want to grant permissions to the user you have to create them seperately by posting to /api/permissions after creating the user.' })
|
@OpenAPI({ description: 'Create a new user. <br> If you want to grant permissions to the user you have to create them seperately by posting to /api/permissions after creating the user.' })
|
||||||
async post(@Body({ validate: true }) createUser: CreateUser) {
|
async post(@Body({ validate: true }) createUser: CreateUser) {
|
||||||
let user;
|
let user;
|
||||||
@ -97,10 +85,6 @@ export class UserController {
|
|||||||
@ResponseSchema(UserNotFoundError, { statusCode: 404 })
|
@ResponseSchema(UserNotFoundError, { statusCode: 404 })
|
||||||
@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 })
|
@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 })
|
||||||
@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
|
@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
|
||||||
@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 })
|
|
||||||
@ResponseSchema(PasswordTooShortError, { statusCode: 406 })
|
|
||||||
@OpenAPI({ description: "Update the user whose id you provided. <br> To change the permissions directly granted to the user please use /api/permissions instead. <br> Please remember that ids can't be changed." })
|
@OpenAPI({ description: "Update the user whose id you provided. <br> To change the permissions directly granted to the user please use /api/permissions instead. <br> Please remember that ids can't be changed." })
|
||||||
async put(@Param('id') id: number, @Body({ validate: true }) updateUser: UpdateUser) {
|
async put(@Param('id') id: number, @Body({ validate: true }) updateUser: UpdateUser) {
|
||||||
let oldUser = await this.userRepository.findOne({ id: id });
|
let oldUser = await this.userRepository.findOne({ id: id });
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
|
||||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
|
||||||
import { Repository, getConnectionManager } from 'typeorm';
|
import { getConnectionManager, Repository } from 'typeorm';
|
||||||
|
import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
|
||||||
import { UserGroupIdsNotMatchingError, UserGroupNotFoundError } from '../errors/UserGroupErrors';
|
import { UserGroupIdsNotMatchingError, UserGroupNotFoundError } from '../errors/UserGroupErrors';
|
||||||
import { CreateUserGroup } from '../models/actions/create/CreateUserGroup';
|
import { CreateUserGroup } from '../models/actions/create/CreateUserGroup';
|
||||||
import { UpdateUserGroup } from '../models/actions/update/UpdateUserGroup';
|
import { UpdateUserGroup } from '../models/actions/update/UpdateUserGroup';
|
||||||
import { UserGroup } from '../models/entities/UserGroup';
|
import { UserGroup } from '../models/entities/UserGroup';
|
||||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
|
||||||
import { ResponseUserGroup } from '../models/responses/ResponseUserGroup';
|
import { ResponseUserGroup } from '../models/responses/ResponseUserGroup';
|
||||||
import { ResponseUserGroupPermissions } from '../models/responses/ResponseUserGroupPermissions';
|
|
||||||
import { PermissionController } from './PermissionController';
|
import { PermissionController } from './PermissionController';
|
||||||
|
|
||||||
|
|
||||||
@ -25,44 +25,20 @@ export class UserGroupController {
|
|||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
@Authorized("USERGROUP:GET")
|
@Authorized("USERGROUP:GET")
|
||||||
@ResponseSchema(ResponseUserGroup, { isArray: true })
|
@ResponseSchema(UserGroup, { isArray: true })
|
||||||
@OpenAPI({ description: 'Lists all groups. <br> The information provided might change while the project continues to evolve.' })
|
@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) {
|
getAll() {
|
||||||
let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>();
|
return 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());
|
|
||||||
});
|
|
||||||
return responseGroups;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('/:id')
|
@Get('/:id')
|
||||||
@Authorized("USERGROUP:GET")
|
@Authorized("USERGROUP:GET")
|
||||||
@ResponseSchema(ResponseUserGroup)
|
@ResponseSchema(UserGroup)
|
||||||
@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
|
@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
|
||||||
@OnUndefined(UserGroupNotFoundError)
|
@OnUndefined(UserGroupNotFoundError)
|
||||||
@OpenAPI({ description: 'Lists all information about the group whose id got provided. <br> The information provided might change while the project continues to evolve.' })
|
@OpenAPI({ description: 'Lists all information about the group whose id got provided. <br> The information provided might change while the project continues to evolve.' })
|
||||||
async getOne(@Param('id') id: number) {
|
getOne(@Param('id') id: number) {
|
||||||
return await (await (this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] }))).toResponse();
|
return this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] });
|
||||||
}
|
|
||||||
|
|
||||||
@Get('/:id/permissions')
|
|
||||||
@Authorized("USERGROUP:GET")
|
|
||||||
@ResponseSchema(ResponseUserGroupPermissions)
|
|
||||||
@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
|
|
||||||
@OnUndefined(UserGroupNotFoundError)
|
|
||||||
@OpenAPI({ description: 'Lists all permissions granted to the group as permission response objects.' })
|
|
||||||
async getPermissions(@Param('id') id: number) {
|
|
||||||
let group = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions', 'permissions.principal'] })
|
|
||||||
if (!group) { throw new UserGroupNotFoundError(); }
|
|
||||||
return new ResponseUserGroupPermissions(group);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@ -78,8 +54,7 @@ export class UserGroupController {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
userGroup = await this.userGroupsRepository.save(userGroup);
|
return this.userGroupsRepository.save(userGroup);
|
||||||
return (await (this.userGroupsRepository.findOne({ id: userGroup.id }, { relations: ["permissions"] }))).toResponse();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('/:id')
|
@Put('/:id')
|
||||||
@ -88,7 +63,7 @@ export class UserGroupController {
|
|||||||
@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
|
@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
|
||||||
@ResponseSchema(UserGroupIdsNotMatchingError, { statusCode: 406 })
|
@ResponseSchema(UserGroupIdsNotMatchingError, { statusCode: 406 })
|
||||||
@OpenAPI({ description: "Update the group whose id you provided. <br> To change the permissions granted to the group please use /api/permissions instead. <br> Please remember that ids can't be changed." })
|
@OpenAPI({ description: "Update the group whose id you provided. <br> To change the permissions granted to the group please use /api/permissions instead. <br> Please remember that ids can't be changed." })
|
||||||
async put(@Param('id') id: number, @Body({ validate: true }) updateGroup: UpdateUserGroup) {
|
async put(@Param('id') id: number, @EntityFromBody() updateGroup: UpdateUserGroup) {
|
||||||
let oldGroup = await this.userGroupsRepository.findOne({ id: id });
|
let oldGroup = await this.userGroupsRepository.findOne({ id: id });
|
||||||
|
|
||||||
if (!oldGroup) {
|
if (!oldGroup) {
|
||||||
@ -100,7 +75,7 @@ export class UserGroupController {
|
|||||||
}
|
}
|
||||||
await this.userGroupsRepository.save(await updateGroup.update(oldGroup));
|
await this.userGroupsRepository.save(await updateGroup.update(oldGroup));
|
||||||
|
|
||||||
return (await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions'] })).toResponse();
|
return (await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] })).toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete('/:id')
|
@Delete('/:id')
|
||||||
@ -110,7 +85,7 @@ export class UserGroupController {
|
|||||||
@OnUndefined(204)
|
@OnUndefined(204)
|
||||||
@OpenAPI({ description: 'Delete the group whose id you provided. <br> If there are any permissions directly granted to the group they will get deleted as well. <br> Users associated with this group won\'t get deleted - just deassociated. <br> If no group with this id exists it will just return 204(no content).' })
|
@OpenAPI({ description: 'Delete the group whose id you provided. <br> If there are any permissions directly granted to the group they will get deleted as well. <br> Users associated with this group won\'t get deleted - just deassociated. <br> If no group with this id exists it will just return 204(no content).' })
|
||||||
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
|
||||||
let group = await this.userGroupsRepository.findOne({ id: id });
|
let group = await this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] });
|
||||||
if (!group) { return null; }
|
if (!group) { return null; }
|
||||||
const responseGroup = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions'] });
|
const responseGroup = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions'] });
|
||||||
|
|
||||||
|
@ -1,57 +1,24 @@
|
|||||||
import { IsString } from 'class-validator';
|
import { IsString } from 'class-validator';
|
||||||
import { BadRequestError } from 'routing-controllers';
|
import { NotAcceptableError, NotFoundError } from 'routing-controllers';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Error to throw when an address's postal code fails validation.
|
* Error to throw, when to provided address doesn't belong to the accepted types.
|
||||||
*/
|
*/
|
||||||
export class AddressPostalCodeInvalidError extends BadRequestError {
|
export class AddressWrongTypeError extends NotAcceptableError {
|
||||||
@IsString()
|
@IsString()
|
||||||
name = "AddressPostalCodeInvalidError"
|
name = "AddressWrongTypeError"
|
||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
message = "The postal code you provided is invalid. \n Please check if your postal code follows the postal code validation guidelines."
|
message = "The address must be an existing address's id. \n You provided a object of another type."
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Error to throw when an non-empty address's first line isn't set.
|
* Error to throw, when a non-existent address get's loaded.
|
||||||
*/
|
*/
|
||||||
export class AddressFirstLineEmptyError extends BadRequestError {
|
export class AddressNotFoundError extends NotFoundError {
|
||||||
@IsString()
|
@IsString()
|
||||||
name = "AddressFirstLineEmptyError"
|
name = "AddressNotFoundError"
|
||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
message = "You provided a empty first address line. \n If you want an empty address please set all propertys to null. \n For non-empty addresses the following fields have to be set: address1, postalcode, city, country"
|
message = "The address you provided couldn't be located in the system. \n Please check your request."
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when an non-empty address's postal code isn't set.
|
|
||||||
*/
|
|
||||||
export class AddressPostalCodeEmptyError extends BadRequestError {
|
|
||||||
@IsString()
|
|
||||||
name = "AddressPostalCodeEmptyError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "You provided a empty postal code. \n If you want an empty address please set all propertys to null. \n For non-empty addresses the following fields have to be set: address1, postalcode, city, country"
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when an non-empty address's city isn't set.
|
|
||||||
*/
|
|
||||||
export class AddressCityEmptyError extends BadRequestError {
|
|
||||||
@IsString()
|
|
||||||
name = "AddressCityEmptyError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "You provided a empty city. \n If you want an empty address please set all propertys to null. \n For non-empty addresses the following fields have to be set: address1, postalcode, city, country"
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when an non-empty address's country isn't set.
|
|
||||||
*/
|
|
||||||
export class AddressCountryEmptyError extends BadRequestError {
|
|
||||||
@IsString()
|
|
||||||
name = "AddressCountryEmptyError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "You provided a empty country. \n If you want an empty address please set all propertys to null. \n For non-empty addresses the following fields have to be set: address1, postalcode, city, country"
|
|
||||||
}
|
}
|
@ -2,7 +2,18 @@ import { IsString } from 'class-validator';
|
|||||||
import { NotAcceptableError, NotFoundError } from 'routing-controllers';
|
import { NotAcceptableError, NotFoundError } from 'routing-controllers';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Error to throw, when a non-existent contact get's requested.
|
* Error to throw, when a provided groupContact doesn't belong to the accepted types.
|
||||||
|
*/
|
||||||
|
export class GroupContactWrongTypeError extends NotAcceptableError {
|
||||||
|
@IsString()
|
||||||
|
name = "GroupContactWrongTypeError"
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
message = "The groupContact must be an existing groupContact's id. \n You provided a object of another type."
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error to throw, when a non-existent groupContact get's loaded.
|
||||||
*/
|
*/
|
||||||
export class GroupContactNotFoundError extends NotFoundError {
|
export class GroupContactNotFoundError extends NotFoundError {
|
||||||
@IsString()
|
@IsString()
|
||||||
@ -10,16 +21,4 @@ export class GroupContactNotFoundError extends NotFoundError {
|
|||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
message = "The groupContact you provided couldn't be located in the system. \n Please check your request."
|
message = "The groupContact you provided couldn't be located in the system. \n Please check your request."
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when two contacts' ids don't match.
|
|
||||||
* Usually occurs when a user tries to change a contact's id.
|
|
||||||
*/
|
|
||||||
export class GroupContactIdsNotMatchingError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "GroupContactIdsNotMatchingError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "The ids don't match! \n And if you wanted to change a contact's id: This isn't allowed!"
|
|
||||||
}
|
|
@ -1,17 +0,0 @@
|
|||||||
import { IsString } from 'class-validator';
|
|
||||||
import { InternalServerError } from 'routing-controllers';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when a permission couldn't be found.
|
|
||||||
*/
|
|
||||||
export class MailSendingError extends InternalServerError {
|
|
||||||
@IsString()
|
|
||||||
name = "MailSendingError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "We had a problem sending the mail!"
|
|
||||||
|
|
||||||
constructor() {
|
|
||||||
super("We had a problem sending the mail!");
|
|
||||||
}
|
|
||||||
}
|
|
@ -32,29 +32,7 @@ export class RunnerGroupNeededError extends NotAcceptableError {
|
|||||||
name = "RunnerGroupNeededError"
|
name = "RunnerGroupNeededError"
|
||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
message = "Runner's need to be part of one group (team or organization)! \n You provided neither."
|
message = "Runner's need to be part of one group (team or organisation)! \n You provided neither."
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when a citizen runner has no mail-address.
|
|
||||||
*/
|
|
||||||
export class RunnerEmailNeededError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "RunnerEmailNeededError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "Citizenrunners have to provide an email address for verification and contacting."
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when a runner already requested a new selfservice link in the last 24hrs.
|
|
||||||
*/
|
|
||||||
export class RunnerSelfserviceTimeoutError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "RunnerSelfserviceTimeoutError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "You can only reqest a new token every 24hrs."
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
58
src/errors/RunnerOrganisationErrors.ts
Normal file
58
src/errors/RunnerOrganisationErrors.ts
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
import { IsString } from 'class-validator';
|
||||||
|
import { NotAcceptableError, NotFoundError } from 'routing-controllers';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error to throw when a runner organisation couldn't be found.
|
||||||
|
*/
|
||||||
|
export class RunnerOrganisationNotFoundError extends NotFoundError {
|
||||||
|
@IsString()
|
||||||
|
name = "RunnerOrganisationNotFoundError"
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
message = "RunnerOrganisation not found!"
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error to throw when two runner organisation's ids don't match.
|
||||||
|
* Usually occurs when a user tries to change a runner organisation's id.
|
||||||
|
*/
|
||||||
|
export class RunnerOrganisationIdsNotMatchingError extends NotAcceptableError {
|
||||||
|
@IsString()
|
||||||
|
name = "RunnerOrganisationIdsNotMatchingError"
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
message = "The ids don't match! \n And if you wanted to change a runner organisation's id: This isn't allowed!"
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error to throw when a organisation still has runners associated.
|
||||||
|
*/
|
||||||
|
export class RunnerOrganisationHasRunnersError extends NotAcceptableError {
|
||||||
|
@IsString()
|
||||||
|
name = "RunnerOrganisationHasRunnersError"
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
message = "This organisation still has runners associated with it. \n If you want to delete this organisation with all it's runners and teams add `?force` to your query."
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error to throw when a organisation still has teams associated.
|
||||||
|
*/
|
||||||
|
export class RunnerOrganisationHasTeamsError extends NotAcceptableError {
|
||||||
|
@IsString()
|
||||||
|
name = "RunnerOrganisationHasTeamsError"
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
message = "This organisation still has teams associated with it. \n If you want to delete this organisation with all it's runners and teams add `?force` to your query."
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error to throw, when a provided runnerOrganisation doesn't belong to the accepted types.
|
||||||
|
*/
|
||||||
|
export class RunnerOrganisationWrongTypeError extends NotAcceptableError {
|
||||||
|
@IsString()
|
||||||
|
name = "RunnerOrganisationWrongTypeError"
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
message = "The runner organisation must be an existing organisation's id. \n You provided a object of another type."
|
||||||
|
}
|
@ -1,58 +0,0 @@
|
|||||||
import { IsString } from 'class-validator';
|
|
||||||
import { NotAcceptableError, NotFoundError } from 'routing-controllers';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when a runner organization couldn't be found.
|
|
||||||
*/
|
|
||||||
export class RunnerOrganizationNotFoundError extends NotFoundError {
|
|
||||||
@IsString()
|
|
||||||
name = "RunnerOrganizationNotFoundError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "RunnerOrganization not found!"
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when two runner organization's ids don't match.
|
|
||||||
* Usually occurs when a user tries to change a runner organization's id.
|
|
||||||
*/
|
|
||||||
export class RunnerOrganizationIdsNotMatchingError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "RunnerOrganizationIdsNotMatchingError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "The ids don't match! \n And if you wanted to change a runner organization's id: This isn't allowed!"
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when a organization still has runners associated.
|
|
||||||
*/
|
|
||||||
export class RunnerOrganizationHasRunnersError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "RunnerOrganizationHasRunnersError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "This organization still has runners associated with it. \n If you want to delete this organization with all it's runners and teams add `?force` to your query."
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw when a organization still has teams associated.
|
|
||||||
*/
|
|
||||||
export class RunnerOrganizationHasTeamsError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "RunnerOrganizationHasTeamsError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "This organization still has teams associated with it. \n If you want to delete this organization with all it's runners and teams add `?force` to your query."
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error to throw, when a provided runnerOrganization doesn't belong to the accepted types.
|
|
||||||
*/
|
|
||||||
export class RunnerOrganizationWrongTypeError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "RunnerOrganizationWrongTypeError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "The runner organization must be an existing organization's id. \n You provided a object of another type."
|
|
||||||
}
|
|
@ -43,5 +43,5 @@ export class RunnerTeamNeedsParentError extends NotAcceptableError {
|
|||||||
name = "RunnerTeamNeedsParentError"
|
name = "RunnerTeamNeedsParentError"
|
||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
message = "You provided no runner organization as this team's parent group."
|
message = "You provided no runner organisation as this team's parent group."
|
||||||
}
|
}
|
@ -71,33 +71,4 @@ export class UserDeletionNotConfirmedError extends NotAcceptableError {
|
|||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
message = "You are trying to delete a user! \n If you're sure about doing this: provide the ?force=true query param."
|
message = "You are trying to delete a user! \n If you're sure about doing this: provide the ?force=true query param."
|
||||||
}
|
|
||||||
|
|
||||||
export class PasswordMustContainUppercaseLetterError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "PasswordMustContainUppercaseLetterError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "Passwords must contain at least one uppercase letter."
|
|
||||||
}
|
|
||||||
export class PasswordMustContainLowercaseLetterError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "PasswordMustContainLowercaseLetterError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "Passwords must contain at least one lowercase letter."
|
|
||||||
}
|
|
||||||
export class PasswordMustContainNumberError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "PasswordMustContainNumberError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "Passwords must contain at least one number."
|
|
||||||
}
|
|
||||||
export class PasswordTooShortError extends NotAcceptableError {
|
|
||||||
@IsString()
|
|
||||||
name = "PasswordTooShortError"
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
message = "Passwords must be at least ten characters long."
|
|
||||||
}
|
}
|
@ -1,7 +1,6 @@
|
|||||||
import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
|
import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
|
||||||
import * as jsonwebtoken from "jsonwebtoken";
|
import * as jsonwebtoken from "jsonwebtoken";
|
||||||
import { config } from './config';
|
import { config } from './config';
|
||||||
import { Runner } from './models/entities/Runner';
|
|
||||||
import { User } from './models/entities/User';
|
import { User } from './models/entities/User';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -35,19 +34,6 @@ export class JwtCreator {
|
|||||||
}, config.jwt_secret)
|
}, config.jwt_secret)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new selfservice token for a given runner.
|
|
||||||
* @param runner Runner entity that the access token shall be created for.
|
|
||||||
* @param expiry_timestamp Timestamp for the token expiry. Will be set about 9999 years if none provided.
|
|
||||||
*/
|
|
||||||
public static createSelfService(runner: Runner, expiry_timestamp?: number) {
|
|
||||||
if (!expiry_timestamp) { expiry_timestamp = Math.floor(Date.now() / 1000) + 36000 * 60 * 24 * 365 * 9999; }
|
|
||||||
return jsonwebtoken.sign({
|
|
||||||
id: runner.id,
|
|
||||||
exp: expiry_timestamp
|
|
||||||
}, config.jwt_secret)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new password reset token for a given user.
|
* Creates a new password reset token for a given user.
|
||||||
* The token is valid for 15 minutes or 1 use - whatever comes first.
|
* The token is valid for 15 minutes or 1 use - whatever comes first.
|
||||||
|
@ -1,9 +1,6 @@
|
|||||||
import { createConnection } from "typeorm";
|
import { createConnection } from "typeorm";
|
||||||
import { runSeeder } from 'typeorm-seeding';
|
import { runSeeder } from 'typeorm-seeding';
|
||||||
import { config } from '../config';
|
import { User } from '../models/entities/User';
|
||||||
import { ConfigFlag } from '../models/entities/ConfigFlags';
|
|
||||||
import SeedPublicOrg from '../seeds/SeedPublicOrg';
|
|
||||||
import SeedTestRunners from '../seeds/SeedTestRunners';
|
|
||||||
import SeedUsers from '../seeds/SeedUsers';
|
import SeedUsers from '../seeds/SeedUsers';
|
||||||
/**
|
/**
|
||||||
* Loader for the database that creates the database connection and initializes the database tabels.
|
* Loader for the database that creates the database connection and initializes the database tabels.
|
||||||
@ -12,20 +9,8 @@ import SeedUsers from '../seeds/SeedUsers';
|
|||||||
export default async () => {
|
export default async () => {
|
||||||
const connection = await createConnection();
|
const connection = await createConnection();
|
||||||
await connection.synchronize();
|
await connection.synchronize();
|
||||||
|
if (await connection.getRepository(User).count() === 0) {
|
||||||
//The data seeding part
|
|
||||||
if (!(await connection.getRepository(ConfigFlag).findOne({ option: "seeded:user", value: "true" }))) {
|
|
||||||
await runSeeder(SeedUsers);
|
await runSeeder(SeedUsers);
|
||||||
await connection.getRepository(ConfigFlag).save({ option: "seeded:user", value: "true" });
|
|
||||||
}
|
}
|
||||||
if (!(await connection.getRepository(ConfigFlag).findOne({ option: "seeded:citizenorg", value: "true" }))) {
|
|
||||||
await runSeeder(SeedPublicOrg);
|
|
||||||
await connection.getRepository(ConfigFlag).save({ option: "seeded:citizenorg", value: "true" });
|
|
||||||
}
|
|
||||||
if (!(await connection.getRepository(ConfigFlag).findOne({ option: "seeded:testdata", value: "true" })) && config.seedTestData == true) {
|
|
||||||
await runSeeder(SeedTestRunners);
|
|
||||||
await connection.getRepository(ConfigFlag).save({ option: "seeded:testdata", value: "true" });
|
|
||||||
}
|
|
||||||
|
|
||||||
return connection;
|
return connection;
|
||||||
};
|
};
|
@ -1,64 +0,0 @@
|
|||||||
import axios from 'axios';
|
|
||||||
import { config } from './config';
|
|
||||||
import { MailSendingError } from './errors/MailErrors';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class is responsible for all things mail sending.
|
|
||||||
* This uses axios to communicate with the mailer api (https://git.odit.services/lfk/mailer).
|
|
||||||
*/
|
|
||||||
export class Mailer {
|
|
||||||
public static base: string = config.mailer_url;
|
|
||||||
public static key: string = config.mailer_key;
|
|
||||||
public static testing: boolean = config.testing;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function for sending a password reset mail.
|
|
||||||
* @param to_address The address the mail will be sent to. Should always get pulled from a user object.
|
|
||||||
* @param token The requested password reset token - will be combined with the app_url to generate a password reset link.
|
|
||||||
*/
|
|
||||||
public static async sendResetMail(to_address: string, token: string, locale: string = "en") {
|
|
||||||
try {
|
|
||||||
await axios.post(`${Mailer.base}/reset?locale=${locale}&key=${Mailer.key}`, {
|
|
||||||
address: to_address,
|
|
||||||
resetKey: token
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
if (Mailer.testing) { return true; }
|
|
||||||
throw new MailSendingError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function for sending a runner selfservice welcome mail.
|
|
||||||
* @param to_address The address the mail will be sent to. Should always get pulled from a runner object.
|
|
||||||
* @param token The requested selfservice token - will be combined with the app_url to generate a selfservice profile link.
|
|
||||||
*/
|
|
||||||
public static async sendSelfserviceWelcomeMail(to_address: string, token: string, locale: string = "en") {
|
|
||||||
try {
|
|
||||||
await axios.post(`${Mailer.base}/registration?locale=${locale}&key=${Mailer.key}`, {
|
|
||||||
address: to_address,
|
|
||||||
selfserviceToken: token
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
if (Mailer.testing) { return true; }
|
|
||||||
throw new MailSendingError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function for sending a runner selfservice link forgotten mail.
|
|
||||||
* @param to_address The address the mail will be sent to. Should always get pulled from a runner object.
|
|
||||||
* @param token The requested selfservice token - will be combined with the app_url to generate a selfservice profile link.
|
|
||||||
*/
|
|
||||||
public static async sendSelfserviceForgottenMail(to_address: string, token: string, locale: string = "en") {
|
|
||||||
try {
|
|
||||||
await axios.post(`${Mailer.base}/registration_forgot?locale=${locale}&key=${Mailer.key}`, {
|
|
||||||
address: to_address,
|
|
||||||
selfserviceToken: token
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
if (Mailer.testing) { return true; }
|
|
||||||
throw new MailSendingError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -15,14 +15,14 @@ import authchecker from './authchecker';
|
|||||||
const ScanAuth = async (req: Request, res: Response, next: () => void) => {
|
const ScanAuth = async (req: Request, res: Response, next: () => void) => {
|
||||||
let provided_token: string = req.headers["authorization"];
|
let provided_token: string = req.headers["authorization"];
|
||||||
if (provided_token == "" || provided_token === undefined || provided_token === null) {
|
if (provided_token == "" || provided_token === undefined || provided_token === null) {
|
||||||
res.status(401).send({ http_code: 401, short: "no_token", message: "No api token provided." });
|
res.status(401).send("No api token provided.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
provided_token = provided_token.replace("Bearer ", "");
|
provided_token = provided_token.replace("Bearer ", "");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
res.status(401).send({ http_code: 401, short: "no_token", message: "No valid jwt or api token provided." });
|
res.status(401).send("No valid jwt or api token provided.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ const ScanAuth = async (req: Request, res: Response, next: () => void) => {
|
|||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
if (prefix == "" || prefix == undefined || prefix == null) {
|
if (prefix == "" || prefix == undefined || prefix == null) {
|
||||||
res.status(401).send({ http_code: 401, short: "invalid_token", message: "Api token non-existent or invalid syntax." });
|
res.status(401).send("Api token non-existent or invalid syntax.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -46,7 +46,7 @@ const ScanAuth = async (req: Request, res: Response, next: () => void) => {
|
|||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
if (user_authorized == false) {
|
if (user_authorized == false) {
|
||||||
res.status(401).send({ http_code: 401, short: "invalid_token", message: "Api token non-existent or invalid syntax." });
|
res.status(401).send("Api token non-existent or invalid syntax.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -56,13 +56,13 @@ const ScanAuth = async (req: Request, res: Response, next: () => void) => {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (station.enabled == false) {
|
if (station.enabled == false) {
|
||||||
res.status(401).send({ http_code: 401, short: "station_disabled", message: "Station is disabled." });
|
res.status(401).send("Station disabled.");
|
||||||
}
|
}
|
||||||
if (!(await argon2.verify(station.key, provided_token))) {
|
if (!(await argon2.verify(station.key, provided_token))) {
|
||||||
res.status(401).send({ http_code: 401, short: "invalid_token", message: "Api token non-existent or invalid syntax." });
|
res.status(401).send("Api token invalid.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
req.headers["station_id"] = station.id.toString();
|
|
||||||
next();
|
next();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ const StatsAuth = async (req: Request, res: Response, next: () => void) => {
|
|||||||
let user_authorized = false;
|
let user_authorized = false;
|
||||||
try {
|
try {
|
||||||
let action = { request: req, response: res, context: null, next: next }
|
let action = { request: req, response: res, context: null, next: next }
|
||||||
user_authorized = await authchecker(action, ["RUNNER:GET", "TEAM:GET", "ORGANIZATION:GET"]);
|
user_authorized = await authchecker(action, ["RUNNER:GET", "TEAM:GET", "ORGANISATION:GET"]);
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
if (user_authorized == false) {
|
if (user_authorized == false) {
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
|
import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { RunnerGroupNeededError } from '../../errors/RunnerErrors';
|
import { RunnerGroupNeededError } from '../../errors/RunnerErrors';
|
||||||
import { RunnerOrganizationNotFoundError } from '../../errors/RunnerOrganizationErrors';
|
import { RunnerOrganisationNotFoundError } from '../../errors/RunnerOrganisationErrors';
|
||||||
import { RunnerGroup } from '../entities/RunnerGroup';
|
import { RunnerGroup } from '../entities/RunnerGroup';
|
||||||
import { RunnerOrganization } from '../entities/RunnerOrganization';
|
import { RunnerOrganisation } from '../entities/RunnerOrganisation';
|
||||||
import { RunnerTeam } from '../entities/RunnerTeam';
|
import { RunnerTeam } from '../entities/RunnerTeam';
|
||||||
import { CreateRunner } from './create/CreateRunner';
|
import { CreateRunner } from './create/CreateRunner';
|
||||||
|
|
||||||
@ -78,9 +78,9 @@ export class ImportRunner {
|
|||||||
let team = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ id: groupID });
|
let team = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ id: groupID });
|
||||||
if (team) { return team; }
|
if (team) { return team; }
|
||||||
|
|
||||||
let org = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: groupID });
|
let org = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: groupID });
|
||||||
if (!org) {
|
if (!org) {
|
||||||
throw new RunnerOrganizationNotFoundError();
|
throw new RunnerOrganisationNotFoundError();
|
||||||
}
|
}
|
||||||
if (this.team === undefined) { return org; }
|
if (this.team === undefined) { return org; }
|
||||||
|
|
||||||
|
69
src/models/actions/create/CreateAddress.ts
Normal file
69
src/models/actions/create/CreateAddress.ts
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
import { IsNotEmpty, IsOptional, IsPostalCode, IsString } from 'class-validator';
|
||||||
|
import { config } from '../../../config';
|
||||||
|
import { Address } from '../../entities/Address';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This classed is used to create a new Address entity from a json body (post request).
|
||||||
|
*/
|
||||||
|
export class CreateAddress {
|
||||||
|
/**
|
||||||
|
* The newaddress's description.
|
||||||
|
*/
|
||||||
|
@IsString()
|
||||||
|
@IsOptional()
|
||||||
|
description?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The new address's first line.
|
||||||
|
* Containing the street and house number.
|
||||||
|
*/
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
address1: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The new address's second line.
|
||||||
|
* Containing optional information.
|
||||||
|
*/
|
||||||
|
@IsString()
|
||||||
|
@IsOptional()
|
||||||
|
address2?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The new address's postal code.
|
||||||
|
* This will get checked against the postal code syntax for the configured country.
|
||||||
|
*/
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
@IsPostalCode(config.postalcode_validation_countrycode)
|
||||||
|
postalcode: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The new address's city.
|
||||||
|
*/
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
city: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The new address's country.
|
||||||
|
*/
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
country: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new Address entity from this.
|
||||||
|
*/
|
||||||
|
public async toEntity(): Promise<Address> {
|
||||||
|
let newAddress: Address = new Address();
|
||||||
|
|
||||||
|
newAddress.address1 = this.address1;
|
||||||
|
newAddress.address2 = this.address2;
|
||||||
|
newAddress.postalcode = this.postalcode;
|
||||||
|
newAddress.city = this.city;
|
||||||
|
newAddress.country = this.country;
|
||||||
|
|
||||||
|
return newAddress;
|
||||||
|
}
|
||||||
|
}
|
@ -33,7 +33,6 @@ export class CreateDistanceDonation extends CreateDonation {
|
|||||||
let newDonation = new DistanceDonation;
|
let newDonation = new DistanceDonation;
|
||||||
|
|
||||||
newDonation.amountPerDistance = this.amountPerDistance;
|
newDonation.amountPerDistance = this.amountPerDistance;
|
||||||
newDonation.paidAmount = this.paidAmount;
|
|
||||||
newDonation.donor = await this.getDonor();
|
newDonation.donor = await this.getDonor();
|
||||||
newDonation.runner = await this.getRunner();
|
newDonation.runner = await this.getRunner();
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { IsInt, IsOptional, IsPositive } from 'class-validator';
|
import { IsInt, IsPositive } from 'class-validator';
|
||||||
import { getConnection } from 'typeorm';
|
import { getConnection } from 'typeorm';
|
||||||
import { DonorNotFoundError } from '../../../errors/DonorErrors';
|
import { DonorNotFoundError } from '../../../errors/DonorErrors';
|
||||||
import { Donation } from '../../entities/Donation';
|
import { Donation } from '../../entities/Donation';
|
||||||
@ -16,13 +16,6 @@ export abstract class CreateDonation {
|
|||||||
@IsPositive()
|
@IsPositive()
|
||||||
donor: number;
|
donor: number;
|
||||||
|
|
||||||
/**
|
|
||||||
* The donation's paid amount in the smalles unit of your currency (default: euro cent).
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
@IsOptional()
|
|
||||||
paidAmount?: number;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new Donation entity from this.
|
* Creates a new Donation entity from this.
|
||||||
*/
|
*/
|
||||||
|
@ -1,39 +1,38 @@
|
|||||||
import { IsBoolean, IsOptional } from 'class-validator';
|
import { IsBoolean, IsOptional } from 'class-validator';
|
||||||
import { DonorReceiptAddressNeededError } from '../../../errors/DonorErrors';
|
import { DonorReceiptAddressNeededError } from '../../../errors/DonorErrors';
|
||||||
import { Address } from '../../entities/Address';
|
import { Donor } from '../../entities/Donor';
|
||||||
import { Donor } from '../../entities/Donor';
|
import { CreateParticipant } from './CreateParticipant';
|
||||||
import { CreateParticipant } from './CreateParticipant';
|
|
||||||
|
/**
|
||||||
/**
|
* This classed is used to create a new Donor entity from a json body (post request).
|
||||||
* This classed is used to create a new Donor entity from a json body (post request).
|
*/
|
||||||
*/
|
export class CreateDonor extends CreateParticipant {
|
||||||
export class CreateDonor extends CreateParticipant {
|
|
||||||
|
/**
|
||||||
/**
|
* Does this donor need a receipt?
|
||||||
* Does this donor need a receipt?
|
*/
|
||||||
*/
|
@IsBoolean()
|
||||||
@IsBoolean()
|
@IsOptional()
|
||||||
@IsOptional()
|
receiptNeeded?: boolean = false;
|
||||||
receiptNeeded?: boolean = false;
|
|
||||||
|
/**
|
||||||
/**
|
* Creates a new Donor entity from this.
|
||||||
* Creates a new Donor entity from this.
|
*/
|
||||||
*/
|
public async toEntity(): Promise<Donor> {
|
||||||
public async toEntity(): Promise<Donor> {
|
let newDonor: Donor = new Donor();
|
||||||
let newDonor: Donor = new Donor();
|
|
||||||
|
newDonor.firstname = this.firstname;
|
||||||
newDonor.firstname = this.firstname;
|
newDonor.middlename = this.middlename;
|
||||||
newDonor.middlename = this.middlename;
|
newDonor.lastname = this.lastname;
|
||||||
newDonor.lastname = this.lastname;
|
newDonor.phone = this.phone;
|
||||||
newDonor.phone = this.phone;
|
newDonor.email = this.email;
|
||||||
newDonor.email = this.email;
|
newDonor.address = await this.getAddress();
|
||||||
newDonor.receiptNeeded = this.receiptNeeded;
|
newDonor.receiptNeeded = this.receiptNeeded;
|
||||||
newDonor.address = this.address;
|
|
||||||
Address.validate(newDonor.address);
|
if (this.receiptNeeded == true && this.address == null) {
|
||||||
if (this.receiptNeeded == true && Address.isValidAddress(newDonor.address) == false) {
|
throw new DonorReceiptAddressNeededError()
|
||||||
throw new DonorReceiptAddressNeededError()
|
}
|
||||||
}
|
|
||||||
|
return newDonor;
|
||||||
return newDonor;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
@ -21,7 +21,6 @@ export class CreateFixedDonation extends CreateDonation {
|
|||||||
let newDonation = new FixedDonation;
|
let newDonation = new FixedDonation;
|
||||||
|
|
||||||
newDonation.amount = this.amount;
|
newDonation.amount = this.amount;
|
||||||
newDonation.paidAmount = this.paidAmount;
|
|
||||||
newDonation.donor = await this.getDonor();
|
newDonation.donor = await this.getDonor();
|
||||||
|
|
||||||
return newDonation;
|
return newDonation;
|
||||||
|
@ -1,97 +1,78 @@
|
|||||||
import { IsEmail, IsNotEmpty, IsObject, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
|
import { IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { config } from '../../../config';
|
import { config } from '../../../config';
|
||||||
import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
|
import { AddressNotFoundError } from '../../../errors/AddressErrors';
|
||||||
import { Address } from '../../entities/Address';
|
import { Address } from '../../entities/Address';
|
||||||
import { GroupContact } from '../../entities/GroupContact';
|
import { GroupContact } from '../../entities/GroupContact';
|
||||||
import { RunnerGroup } from '../../entities/RunnerGroup';
|
|
||||||
|
/**
|
||||||
/**
|
* This classed is used to create a new Group entity from a json body (post request).
|
||||||
* This classed is used to create a new GroupContact entity from a json body (post request).
|
*/
|
||||||
*/
|
export class CreateGroupContact {
|
||||||
export class CreateGroupContact {
|
/**
|
||||||
/**
|
* The new contact's first name.
|
||||||
* The new contact's first name.
|
*/
|
||||||
*/
|
@IsNotEmpty()
|
||||||
@IsNotEmpty()
|
@IsString()
|
||||||
@IsString()
|
firstname: string;
|
||||||
firstname: string;
|
|
||||||
|
/**
|
||||||
/**
|
* The new contact's middle name.
|
||||||
* The new contact's middle name.
|
*/
|
||||||
*/
|
@IsOptional()
|
||||||
@IsOptional()
|
@IsString()
|
||||||
@IsString()
|
middlename?: string;
|
||||||
middlename?: string;
|
|
||||||
|
/**
|
||||||
/**
|
* The new contact's last name.
|
||||||
* The new contact's last name.
|
*/
|
||||||
*/
|
@IsNotEmpty()
|
||||||
@IsNotEmpty()
|
@IsString()
|
||||||
@IsString()
|
lastname: string;
|
||||||
lastname: string;
|
|
||||||
|
/**
|
||||||
/**
|
* The new contact's address's id.
|
||||||
* The new contact's address.
|
*/
|
||||||
*/
|
@IsInt()
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsObject()
|
address?: number;
|
||||||
address?: Address;
|
|
||||||
|
/**
|
||||||
/**
|
* The contact's phone number.
|
||||||
* The contact's phone number.
|
* This will be validated against the configured country phone numer syntax (default: international).
|
||||||
* This will be validated against the configured country phone numer syntax (default: international).
|
*/
|
||||||
*/
|
@IsOptional()
|
||||||
@IsOptional()
|
@IsPhoneNumber(config.phone_validation_countrycode)
|
||||||
@IsPhoneNumber(config.phone_validation_countrycode)
|
phone?: string;
|
||||||
phone?: string;
|
|
||||||
|
/**
|
||||||
/**
|
* The contact's email address.
|
||||||
* The new contact's email address.
|
*/
|
||||||
*/
|
@IsOptional()
|
||||||
@IsOptional()
|
@IsEmail()
|
||||||
@IsEmail()
|
email?: string;
|
||||||
email?: string;
|
|
||||||
|
/**
|
||||||
/**
|
* Gets the new contact's address by it's id.
|
||||||
* The new contacts's groups' ids.
|
*/
|
||||||
* You can provide either one groupId or an array of groupIDs.
|
public async getAddress(): Promise<Address> {
|
||||||
*/
|
if (!this.address) { return null; }
|
||||||
@IsOptional()
|
let address = await getConnectionManager().get().getRepository(Address).findOne({ id: this.address });
|
||||||
groups?: number[] | number
|
if (!address) { throw new AddressNotFoundError; }
|
||||||
|
return address;
|
||||||
|
}
|
||||||
/**
|
|
||||||
* Get's all groups for this contact by their id's;
|
/**
|
||||||
*/
|
* Creates a new Address entity from this.
|
||||||
public async getGroups(): Promise<RunnerGroup[]> {
|
*/
|
||||||
if (!this.groups) { return null; }
|
public async toEntity(): Promise<GroupContact> {
|
||||||
let groups = new Array<RunnerGroup>();
|
let contact: GroupContact = new GroupContact();
|
||||||
if (!Array.isArray(this.groups)) {
|
contact.firstname = this.firstname;
|
||||||
this.groups = [this.groups]
|
contact.middlename = this.middlename;
|
||||||
}
|
contact.lastname = this.lastname;
|
||||||
for (let group of this.groups) {
|
contact.email = this.email;
|
||||||
let found = await getConnectionManager().get().getRepository(RunnerGroup).findOne({ id: group });
|
contact.phone = this.phone;
|
||||||
if (!found) { throw new RunnerGroupNotFoundError(); }
|
contact.address = await this.getAddress();
|
||||||
groups.push(found);
|
return null;
|
||||||
}
|
}
|
||||||
return groups;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new GroupContact entity from this.
|
|
||||||
*/
|
|
||||||
public async toEntity(): Promise<GroupContact> {
|
|
||||||
let newContact: GroupContact = new GroupContact();
|
|
||||||
newContact.firstname = this.firstname;
|
|
||||||
newContact.middlename = this.middlename;
|
|
||||||
newContact.lastname = this.lastname;
|
|
||||||
newContact.email = this.email;
|
|
||||||
newContact.phone = this.phone;
|
|
||||||
newContact.address = this.address;
|
|
||||||
Address.validate(newContact.address);
|
|
||||||
newContact.groups = await this.getGroups();
|
|
||||||
|
|
||||||
return newContact;
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -1,53 +1,65 @@
|
|||||||
import { IsEmail, IsNotEmpty, IsObject, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
|
import { IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
|
||||||
import { config } from '../../../config';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { Address } from '../../entities/Address';
|
import { config } from '../../../config';
|
||||||
|
import { AddressNotFoundError } from '../../../errors/AddressErrors';
|
||||||
/**
|
import { Address } from '../../entities/Address';
|
||||||
* This classed is used to create a new Participant entity from a json body (post request).
|
|
||||||
*/
|
/**
|
||||||
export abstract class CreateParticipant {
|
* This classed is used to create a new Participant entity from a json body (post request).
|
||||||
/**
|
*/
|
||||||
* The new participant's first name.
|
export abstract class CreateParticipant {
|
||||||
*/
|
/**
|
||||||
@IsString()
|
* The new participant's first name.
|
||||||
@IsNotEmpty()
|
*/
|
||||||
firstname: string;
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
/**
|
firstname: string;
|
||||||
* The new participant's middle name.
|
|
||||||
*/
|
/**
|
||||||
@IsString()
|
* The new participant's middle name.
|
||||||
@IsOptional()
|
*/
|
||||||
middlename?: string;
|
@IsString()
|
||||||
|
@IsOptional()
|
||||||
/**
|
middlename?: string;
|
||||||
* The new participant's last name.
|
|
||||||
*/
|
/**
|
||||||
@IsString()
|
* The new participant's last name.
|
||||||
@IsNotEmpty()
|
*/
|
||||||
lastname: string;
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
/**
|
lastname: string;
|
||||||
* The new participant's phone number.
|
|
||||||
* This will be validated against the configured country phone numer syntax (default: international).
|
/**
|
||||||
*/
|
* The new participant's phone number.
|
||||||
@IsString()
|
* This will be validated against the configured country phone numer syntax (default: international).
|
||||||
@IsOptional()
|
*/
|
||||||
@IsPhoneNumber(config.phone_validation_countrycode)
|
@IsString()
|
||||||
phone?: string;
|
@IsOptional()
|
||||||
|
@IsPhoneNumber(config.phone_validation_countrycode)
|
||||||
/**
|
phone?: string;
|
||||||
* The new participant's e-mail address.
|
|
||||||
*/
|
/**
|
||||||
@IsString()
|
* The new participant's e-mail address.
|
||||||
@IsOptional()
|
*/
|
||||||
@IsEmail()
|
@IsString()
|
||||||
email?: string;
|
@IsOptional()
|
||||||
|
@IsEmail()
|
||||||
/**
|
email?: string;
|
||||||
* The new participant's address.
|
|
||||||
*/
|
/**
|
||||||
@IsOptional()
|
* The new participant's address's id.
|
||||||
@IsObject()
|
*/
|
||||||
address?: Address;
|
@IsInt()
|
||||||
|
@IsOptional()
|
||||||
|
address?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the new participant's address by it's id.
|
||||||
|
*/
|
||||||
|
public async getAddress(): Promise<Address> {
|
||||||
|
if (!this.address) { return null; }
|
||||||
|
let address = await getConnectionManager().get().getRepository(Address).findOne({ id: this.address });
|
||||||
|
if (!address) { throw new AddressNotFoundError; }
|
||||||
|
return address;
|
||||||
|
}
|
||||||
}
|
}
|
@ -1,33 +1,39 @@
|
|||||||
import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
|
import { IsEmail, IsOptional, IsString } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { ResetAlreadyRequestedError, UserDisabledError, UserNotFoundError } from '../../../errors/AuthError';
|
import { ResetAlreadyRequestedError, UserDisabledError, UserNotFoundError } from '../../../errors/AuthError';
|
||||||
import { UserEmailNeededError } from '../../../errors/UserErrors';
|
import { UsernameOrEmailNeededError } from '../../../errors/UserErrors';
|
||||||
import { JwtCreator } from '../../../jwtcreator';
|
import { JwtCreator } from '../../../jwtcreator';
|
||||||
import { User } from '../../entities/User';
|
import { User } from '../../entities/User';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class is used to create password reset tokens for users.
|
* This calss is used to create password reset tokens for users.
|
||||||
* These password reset token can be used to set a new password for the user for the next 15mins.
|
* These password reset token can be used to set a new password for the user for the next 15mins.
|
||||||
*/
|
*/
|
||||||
export class CreateResetToken {
|
export class CreateResetToken {
|
||||||
|
/**
|
||||||
|
* The username of the user that wants to reset their password.
|
||||||
|
*/
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
username?: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The email address of the user that wants to reset their password.
|
* The email address of the user that wants to reset their password.
|
||||||
*/
|
*/
|
||||||
@IsNotEmpty()
|
@IsOptional()
|
||||||
@IsEmail()
|
@IsEmail()
|
||||||
@IsString()
|
@IsString()
|
||||||
email: string;
|
email?: string;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a password reset token based on this.
|
* Create a password reset token based on this.
|
||||||
*/
|
*/
|
||||||
public async toResetToken(): Promise<string> {
|
public async toResetToken(): Promise<any> {
|
||||||
if (!this.email) {
|
if (this.email === undefined && this.username === undefined) {
|
||||||
throw new UserEmailNeededError();
|
throw new UsernameOrEmailNeededError();
|
||||||
}
|
}
|
||||||
let found_user = await getConnectionManager().get().getRepository(User).findOne({ where: [{ email: this.email }] });
|
let found_user = await getConnectionManager().get().getRepository(User).findOne({ where: [{ username: this.username }, { email: this.email }] });
|
||||||
if (!found_user) { throw new UserNotFoundError(); }
|
if (!found_user) { throw new UserNotFoundError(); }
|
||||||
if (found_user.enabled == false) { throw new UserDisabledError(); }
|
if (found_user.enabled == false) { throw new UserDisabledError(); }
|
||||||
if (found_user.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 15 * 60)) { throw new ResetAlreadyRequestedError(); }
|
if (found_user.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 15 * 60)) { throw new ResetAlreadyRequestedError(); }
|
||||||
@ -37,7 +43,7 @@ export class CreateResetToken {
|
|||||||
await getConnectionManager().get().getRepository(User).save(found_user);
|
await getConnectionManager().get().getRepository(User).save(found_user);
|
||||||
|
|
||||||
//Create the reset token
|
//Create the reset token
|
||||||
let reset_token: string = JwtCreator.createReset(found_user);
|
let reset_token = JwtCreator.createReset(found_user);
|
||||||
|
|
||||||
return reset_token;
|
return reset_token;
|
||||||
}
|
}
|
||||||
|
@ -1,55 +1,53 @@
|
|||||||
import { IsInt } from 'class-validator';
|
import { IsInt } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
|
import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
|
||||||
import { RunnerOrganizationWrongTypeError } from '../../../errors/RunnerOrganizationErrors';
|
import { RunnerOrganisationWrongTypeError } from '../../../errors/RunnerOrganisationErrors';
|
||||||
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
||||||
import { Address } from '../../entities/Address';
|
import { Runner } from '../../entities/Runner';
|
||||||
import { Runner } from '../../entities/Runner';
|
import { RunnerGroup } from '../../entities/RunnerGroup';
|
||||||
import { RunnerGroup } from '../../entities/RunnerGroup';
|
import { CreateParticipant } from './CreateParticipant';
|
||||||
import { CreateParticipant } from './CreateParticipant';
|
|
||||||
|
/**
|
||||||
/**
|
* This classed is used to create a new Runner entity from a json body (post request).
|
||||||
* This classed is used to create a new Runner entity from a json body (post request).
|
*/
|
||||||
*/
|
export class CreateRunner extends CreateParticipant {
|
||||||
export class CreateRunner extends CreateParticipant {
|
|
||||||
|
/**
|
||||||
/**
|
* The new runner's group's id.
|
||||||
* The new runner's group's id.
|
*/
|
||||||
*/
|
@IsInt()
|
||||||
@IsInt()
|
group: number;
|
||||||
group: number;
|
|
||||||
|
/**
|
||||||
/**
|
* Creates a new Runner entity from this.
|
||||||
* Creates a new Runner entity from this.
|
*/
|
||||||
*/
|
public async toEntity(): Promise<Runner> {
|
||||||
public async toEntity(): Promise<Runner> {
|
let newRunner: Runner = new Runner();
|
||||||
let newRunner: Runner = new Runner();
|
|
||||||
|
newRunner.firstname = this.firstname;
|
||||||
newRunner.firstname = this.firstname;
|
newRunner.middlename = this.middlename;
|
||||||
newRunner.middlename = this.middlename;
|
newRunner.lastname = this.lastname;
|
||||||
newRunner.lastname = this.lastname;
|
newRunner.phone = this.phone;
|
||||||
newRunner.phone = this.phone;
|
newRunner.email = this.email;
|
||||||
newRunner.email = this.email;
|
newRunner.group = await this.getGroup();
|
||||||
newRunner.group = await this.getGroup();
|
newRunner.address = await this.getAddress();
|
||||||
newRunner.address = this.address;
|
|
||||||
Address.validate(newRunner.address);
|
return newRunner;
|
||||||
|
}
|
||||||
return newRunner;
|
|
||||||
}
|
/**
|
||||||
|
* Gets the new runner's group by it's id.
|
||||||
/**
|
*/
|
||||||
* Gets the new runner's group by it's id.
|
public async getGroup(): Promise<RunnerGroup> {
|
||||||
*/
|
if (this.group === undefined || this.group === null) {
|
||||||
public async getGroup(): Promise<RunnerGroup> {
|
throw new RunnerTeamNeedsParentError();
|
||||||
if (this.group === undefined || this.group === null) {
|
}
|
||||||
throw new RunnerTeamNeedsParentError();
|
if (!isNaN(this.group)) {
|
||||||
}
|
let group = await getConnectionManager().get().getRepository(RunnerGroup).findOne({ id: this.group });
|
||||||
if (!isNaN(this.group)) {
|
if (!group) { throw new RunnerGroupNotFoundError; }
|
||||||
let group = await getConnectionManager().get().getRepository(RunnerGroup).findOne({ id: this.group });
|
return group;
|
||||||
if (!group) { throw new RunnerGroupNotFoundError; }
|
}
|
||||||
return group;
|
|
||||||
}
|
throw new RunnerOrganisationWrongTypeError;
|
||||||
|
}
|
||||||
throw new RunnerOrganizationWrongTypeError;
|
|
||||||
}
|
|
||||||
}
|
}
|
41
src/models/actions/create/CreateRunnerOrganisation.ts
Normal file
41
src/models/actions/create/CreateRunnerOrganisation.ts
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
import { IsInt, IsOptional } from 'class-validator';
|
||||||
|
import { getConnectionManager } from 'typeorm';
|
||||||
|
import { AddressNotFoundError } from '../../../errors/AddressErrors';
|
||||||
|
import { Address } from '../../entities/Address';
|
||||||
|
import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
|
||||||
|
import { CreateRunnerGroup } from './CreateRunnerGroup';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This classed is used to create a new RunnerOrganisation entity from a json body (post request).
|
||||||
|
*/
|
||||||
|
export class CreateRunnerOrganisation extends CreateRunnerGroup {
|
||||||
|
/**
|
||||||
|
* The new organisation's address's id.
|
||||||
|
*/
|
||||||
|
@IsInt()
|
||||||
|
@IsOptional()
|
||||||
|
address?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the org's address by it's id.
|
||||||
|
*/
|
||||||
|
public async getAddress(): Promise<Address> {
|
||||||
|
if (!this.address) { return null; }
|
||||||
|
let address = await getConnectionManager().get().getRepository(Address).findOne({ id: this.address });
|
||||||
|
if (!address) { throw new AddressNotFoundError; }
|
||||||
|
return address;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new RunnerOrganisation entity from this.
|
||||||
|
*/
|
||||||
|
public async toEntity(): Promise<RunnerOrganisation> {
|
||||||
|
let newRunnerOrganisation: RunnerOrganisation = new RunnerOrganisation();
|
||||||
|
|
||||||
|
newRunnerOrganisation.name = this.name;
|
||||||
|
newRunnerOrganisation.contact = await this.getContact();
|
||||||
|
newRunnerOrganisation.address = await this.getAddress();
|
||||||
|
|
||||||
|
return newRunnerOrganisation;
|
||||||
|
}
|
||||||
|
}
|
@ -1,43 +0,0 @@
|
|||||||
import { IsBoolean, IsObject, IsOptional } from 'class-validator';
|
|
||||||
import * as uuid from 'uuid';
|
|
||||||
import { Address } from '../../entities/Address';
|
|
||||||
import { RunnerOrganization } from '../../entities/RunnerOrganization';
|
|
||||||
import { CreateRunnerGroup } from './CreateRunnerGroup';
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This classed is used to create a new RunnerOrganization entity from a json body (post request).
|
|
||||||
*/
|
|
||||||
export class CreateRunnerOrganization extends CreateRunnerGroup {
|
|
||||||
/**
|
|
||||||
* The new organization's address.
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsObject()
|
|
||||||
address?: Address;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Is registration enabled for the new organization?
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsBoolean()
|
|
||||||
registrationEnabled?: boolean = false;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new RunnerOrganization entity from this.
|
|
||||||
*/
|
|
||||||
public async toEntity(): Promise<RunnerOrganization> {
|
|
||||||
let newRunnerOrganization: RunnerOrganization = new RunnerOrganization();
|
|
||||||
|
|
||||||
newRunnerOrganization.name = this.name;
|
|
||||||
newRunnerOrganization.contact = await this.getContact();
|
|
||||||
newRunnerOrganization.address = this.address;
|
|
||||||
Address.validate(newRunnerOrganization.address);
|
|
||||||
|
|
||||||
if (this.registrationEnabled) {
|
|
||||||
newRunnerOrganization.key = uuid.v4().toUpperCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
return newRunnerOrganization;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,8 +1,8 @@
|
|||||||
import { IsInt, IsNotEmpty } from 'class-validator';
|
import { IsInt, IsNotEmpty } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { RunnerOrganizationNotFoundError } from '../../../errors/RunnerOrganizationErrors';
|
import { RunnerOrganisationNotFoundError } from '../../../errors/RunnerOrganisationErrors';
|
||||||
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
||||||
import { RunnerOrganization } from '../../entities/RunnerOrganization';
|
import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
|
||||||
import { RunnerTeam } from '../../entities/RunnerTeam';
|
import { RunnerTeam } from '../../entities/RunnerTeam';
|
||||||
import { CreateRunnerGroup } from './CreateRunnerGroup';
|
import { CreateRunnerGroup } from './CreateRunnerGroup';
|
||||||
|
|
||||||
@ -21,12 +21,12 @@ export class CreateRunnerTeam extends CreateRunnerGroup {
|
|||||||
/**
|
/**
|
||||||
* Gets the new team's parent org based on it's id.
|
* Gets the new team's parent org based on it's id.
|
||||||
*/
|
*/
|
||||||
public async getParent(): Promise<RunnerOrganization> {
|
public async getParent(): Promise<RunnerOrganisation> {
|
||||||
if (this.parentGroup === undefined || this.parentGroup === null) {
|
if (this.parentGroup === undefined || this.parentGroup === null) {
|
||||||
throw new RunnerTeamNeedsParentError();
|
throw new RunnerTeamNeedsParentError();
|
||||||
}
|
}
|
||||||
let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: this.parentGroup });
|
let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.parentGroup });
|
||||||
if (!parentGroup) { throw new RunnerOrganizationNotFoundError();; }
|
if (!parentGroup) { throw new RunnerOrganisationNotFoundError();; }
|
||||||
return parentGroup;
|
return parentGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
|
|
||||||
import { getConnection } from 'typeorm';
|
|
||||||
import { RunnerEmailNeededError } from '../../../errors/RunnerErrors';
|
|
||||||
import { Address } from '../../entities/Address';
|
|
||||||
import { Runner } from '../../entities/Runner';
|
|
||||||
import { RunnerOrganization } from '../../entities/RunnerOrganization';
|
|
||||||
import { CreateParticipant } from './CreateParticipant';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This classed is used to create a new Runner entity from a json body (post request).
|
|
||||||
*/
|
|
||||||
export class CreateSelfServiceCitizenRunner extends CreateParticipant {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The new runners's e-mail address.
|
|
||||||
* Must be provided for email-verification to work.
|
|
||||||
*/
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
@IsEmail()
|
|
||||||
email: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new Runner entity from this.
|
|
||||||
*/
|
|
||||||
public async toEntity(): Promise<Runner> {
|
|
||||||
let newRunner: Runner = new Runner();
|
|
||||||
|
|
||||||
newRunner.firstname = this.firstname;
|
|
||||||
newRunner.middlename = this.middlename;
|
|
||||||
newRunner.lastname = this.lastname;
|
|
||||||
newRunner.phone = this.phone;
|
|
||||||
newRunner.email = this.email;
|
|
||||||
|
|
||||||
if (!newRunner.email) {
|
|
||||||
throw new RunnerEmailNeededError();
|
|
||||||
}
|
|
||||||
|
|
||||||
newRunner.group = await this.getGroup();
|
|
||||||
newRunner.address = this.address;
|
|
||||||
Address.validate(newRunner.address);
|
|
||||||
|
|
||||||
return newRunner;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the new runner's group by it's id.
|
|
||||||
*/
|
|
||||||
public async getGroup(): Promise<RunnerOrganization> {
|
|
||||||
return await getConnection().getRepository(RunnerOrganization).findOne({ id: 1 });
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
import { IsInt, IsOptional } from 'class-validator';
|
|
||||||
import { getConnection } from 'typeorm';
|
|
||||||
import { RunnerTeamNotFoundError } from '../../../errors/RunnerTeamErrors';
|
|
||||||
import { Address } from '../../entities/Address';
|
|
||||||
import { Runner } from '../../entities/Runner';
|
|
||||||
import { RunnerGroup } from '../../entities/RunnerGroup';
|
|
||||||
import { RunnerTeam } from '../../entities/RunnerTeam';
|
|
||||||
import { CreateParticipant } from './CreateParticipant';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This classed is used to create a new Runner entity from a json body (post request).
|
|
||||||
*/
|
|
||||||
export class CreateSelfServiceRunner extends CreateParticipant {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The new runner's team's id.
|
|
||||||
* The team has to be a part of the runner's org.
|
|
||||||
* The team property may get ignored.
|
|
||||||
* If no team get's provided the runner's group will be their org.
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
@IsOptional()
|
|
||||||
team?: number;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new Runner entity from this.
|
|
||||||
*/
|
|
||||||
public async toEntity(group: RunnerGroup): Promise<Runner> {
|
|
||||||
let newRunner: Runner = new Runner();
|
|
||||||
|
|
||||||
newRunner.firstname = this.firstname;
|
|
||||||
newRunner.middlename = this.middlename;
|
|
||||||
newRunner.lastname = this.lastname;
|
|
||||||
newRunner.phone = this.phone;
|
|
||||||
newRunner.email = this.email;
|
|
||||||
newRunner.group = await this.getGroup(group);
|
|
||||||
newRunner.address = this.address;
|
|
||||||
Address.validate(newRunner.address);
|
|
||||||
|
|
||||||
return newRunner;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the new runner's group by it's id.
|
|
||||||
*/
|
|
||||||
public async getGroup(group: RunnerGroup): Promise<RunnerGroup> {
|
|
||||||
if (!this.team) {
|
|
||||||
return group;
|
|
||||||
}
|
|
||||||
const team = await getConnection().getRepository(RunnerTeam).findOne({ id: this.team }, { relations: ["parentGroup"] });
|
|
||||||
if (!team) { throw new RunnerTeamNotFoundError(); }
|
|
||||||
if (team.parentGroup.id != group.id) { throw new RunnerTeamNotFoundError(); }
|
|
||||||
return team;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,5 +1,4 @@
|
|||||||
import { IsInt, IsOptional, IsPositive } from 'class-validator';
|
import { IsInt, IsPositive } from 'class-validator';
|
||||||
import { BadRequestError } from 'routing-controllers';
|
|
||||||
import { getConnection } from 'typeorm';
|
import { getConnection } from 'typeorm';
|
||||||
import { RunnerCardNotFoundError } from '../../../errors/RunnerCardErrors';
|
import { RunnerCardNotFoundError } from '../../../errors/RunnerCardErrors';
|
||||||
import { RunnerNotFoundError } from '../../../errors/RunnerErrors';
|
import { RunnerNotFoundError } from '../../../errors/RunnerErrors';
|
||||||
@ -23,12 +22,10 @@ export class CreateTrackScan {
|
|||||||
/**
|
/**
|
||||||
* The scanning station's id that created the scan.
|
* The scanning station's id that created the scan.
|
||||||
* Mainly used for logging and traceing back scans (or errors).
|
* Mainly used for logging and traceing back scans (or errors).
|
||||||
* You don't have to provide the station if you're authenticateing via a scanstation token (The server takes care of it for you).
|
|
||||||
*/
|
*/
|
||||||
@IsInt()
|
@IsInt()
|
||||||
@IsPositive()
|
@IsPositive()
|
||||||
@IsOptional()
|
station: number;
|
||||||
station?: number;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new Track entity from this.
|
* Creates a new Track entity from this.
|
||||||
@ -47,32 +44,20 @@ export class CreateTrackScan {
|
|||||||
}
|
}
|
||||||
|
|
||||||
newScan.timestamp = Math.round(new Date().getTime() / 1000);
|
newScan.timestamp = Math.round(new Date().getTime() / 1000);
|
||||||
newScan = await this.validateScan(newScan);
|
newScan.valid = await this.validateScan(newScan);
|
||||||
|
|
||||||
return newScan;
|
return newScan;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get's a runnerCard entity via the provided id.
|
|
||||||
* @returns The runnerCard whom's id you provided.
|
|
||||||
*/
|
|
||||||
public async getCard(): Promise<RunnerCard> {
|
public async getCard(): Promise<RunnerCard> {
|
||||||
const id = this.card % 200000000000;
|
const track = await getConnection().getRepository(RunnerCard).findOne({ id: this.card }, { relations: ["runner"] });
|
||||||
const runnerCard = await getConnection().getRepository(RunnerCard).findOne({ id: id }, { relations: ["runner"] });
|
if (!track) {
|
||||||
if (!runnerCard) {
|
|
||||||
throw new RunnerCardNotFoundError();
|
throw new RunnerCardNotFoundError();
|
||||||
}
|
}
|
||||||
return runnerCard;
|
return track;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get's a scanstation entity via the provided id.
|
|
||||||
* @returns The scanstation whom's id you provided.
|
|
||||||
*/
|
|
||||||
public async getStation(): Promise<ScanStation> {
|
public async getStation(): Promise<ScanStation> {
|
||||||
if (!this.station) {
|
|
||||||
throw new BadRequestError("You are missing the station's id!")
|
|
||||||
}
|
|
||||||
const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ["track"] });
|
const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ["track"] });
|
||||||
if (!station) {
|
if (!station) {
|
||||||
throw new ScanStationNotFoundError();
|
throw new ScanStationNotFoundError();
|
||||||
@ -80,21 +65,15 @@ export class CreateTrackScan {
|
|||||||
return station;
|
return station;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public async validateScan(scan: TrackScan): Promise<boolean> {
|
||||||
* Validates the scan and sets it's lap time;
|
const scans = await getConnection().getRepository(TrackScan).find({ where: { runner: scan.runner, valid: true }, relations: ["track"] });
|
||||||
* @param scan The scan you want to validate
|
if (scans.length == 0) { return true; }
|
||||||
* @returns The validated scan with it's laptime set.
|
|
||||||
*/
|
const newestScan = scans[scans.length - 1];
|
||||||
public async validateScan(scan: TrackScan): Promise<TrackScan> {
|
if ((scan.timestamp - newestScan.timestamp) > scan.track.minimumLapTime) {
|
||||||
const latestScan = await getConnection().getRepository(TrackScan).findOne({ where: { runner: scan.runner, valid: true }, relations: ["track"], order: { id: 'DESC' } });
|
return true;
|
||||||
if (!latestScan) {
|
|
||||||
scan.lapTime = 0;
|
|
||||||
scan.valid = true;
|
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
scan.lapTime = scan.timestamp - latestScan.timestamp;
|
return false;
|
||||||
scan.valid = (scan.lapTime > scan.track.minimumLapTime);
|
|
||||||
}
|
|
||||||
return scan;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,10 +1,9 @@
|
|||||||
import * as argon2 from "argon2";
|
import * as argon2 from "argon2";
|
||||||
import { passwordStrength } from "check-password-strength";
|
|
||||||
import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
|
import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import * as uuid from 'uuid';
|
import * as uuid from 'uuid';
|
||||||
import { config } from '../../../config';
|
import { config } from '../../../config';
|
||||||
import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
|
import { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
|
||||||
import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors';
|
import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors';
|
||||||
import { User } from '../../entities/User';
|
import { User } from '../../entities/User';
|
||||||
import { UserGroup } from '../../entities/UserGroup';
|
import { UserGroup } from '../../entities/UserGroup';
|
||||||
@ -95,13 +94,7 @@ export class CreateUser {
|
|||||||
if (!this.email) {
|
if (!this.email) {
|
||||||
throw new UserEmailNeededError();
|
throw new UserEmailNeededError();
|
||||||
}
|
}
|
||||||
if (this.username?.includes("@")) { throw new UsernameContainsIllegalCharacterError(); }
|
if (this.username.includes("@")) { throw new UsernameContainsIllegalCharacterError(); }
|
||||||
|
|
||||||
let password_strength = passwordStrength(this.password);
|
|
||||||
if (!password_strength.contains.includes("uppercase")) { throw new PasswordMustContainUppercaseLetterError(); }
|
|
||||||
if (!password_strength.contains.includes("lowercase")) { throw new PasswordMustContainLowercaseLetterError(); }
|
|
||||||
if (!password_strength.contains.includes("number")) { throw new PasswordMustContainNumberError(); }
|
|
||||||
if (!(password_strength.length > 9)) { throw new PasswordTooShortError(); }
|
|
||||||
|
|
||||||
newUser.email = this.email
|
newUser.email = this.email
|
||||||
newUser.username = this.username
|
newUser.username = this.username
|
||||||
@ -114,7 +107,7 @@ export class CreateUser {
|
|||||||
newUser.groups = await this.getGroups();
|
newUser.groups = await this.getGroups();
|
||||||
newUser.enabled = this.enabled;
|
newUser.enabled = this.enabled;
|
||||||
|
|
||||||
if (!this.profilePic) { newUser.profilePic = `https://lauf-fuer-kaya.de/lfk-logo.png`; }
|
if (!this.profilePic) { newUser.profilePic = `https://dev.lauf-fuer-kaya.de/lfk-logo.png`; }
|
||||||
else { newUser.profilePic = this.profilePic; }
|
else { newUser.profilePic = this.profilePic; }
|
||||||
|
|
||||||
return newUser;
|
return newUser;
|
||||||
|
@ -32,7 +32,6 @@ export class UpdateDistanceDonation extends UpdateDonation {
|
|||||||
*/
|
*/
|
||||||
public async update(donation: DistanceDonation): Promise<DistanceDonation> {
|
public async update(donation: DistanceDonation): Promise<DistanceDonation> {
|
||||||
donation.amountPerDistance = this.amountPerDistance;
|
donation.amountPerDistance = this.amountPerDistance;
|
||||||
donation.paidAmount = this.paidAmount;
|
|
||||||
donation.donor = await this.getDonor();
|
donation.donor = await this.getDonor();
|
||||||
donation.runner = await this.getRunner();
|
donation.runner = await this.getRunner();
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { IsInt, IsOptional, IsPositive } from 'class-validator';
|
import { IsInt, IsPositive } from 'class-validator';
|
||||||
import { getConnection } from 'typeorm';
|
import { getConnection } from 'typeorm';
|
||||||
import { DonorNotFoundError } from '../../../errors/DonorErrors';
|
import { DonorNotFoundError } from '../../../errors/DonorErrors';
|
||||||
import { Donation } from '../../entities/Donation';
|
import { Donation } from '../../entities/Donation';
|
||||||
@ -23,13 +23,6 @@ export abstract class UpdateDonation {
|
|||||||
@IsPositive()
|
@IsPositive()
|
||||||
donor: number;
|
donor: number;
|
||||||
|
|
||||||
/**
|
|
||||||
* The donation's paid amount in the smalles unit of your currency (default: euro cent).
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
@IsOptional()
|
|
||||||
paidAmount?: number;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new Donation entity from this.
|
* Creates a new Donation entity from this.
|
||||||
*/
|
*/
|
||||||
|
@ -1,46 +1,44 @@
|
|||||||
import { IsBoolean, IsInt, IsOptional } from 'class-validator';
|
import { IsBoolean, IsInt, IsOptional } from 'class-validator';
|
||||||
import { DonorReceiptAddressNeededError } from '../../../errors/DonorErrors';
|
import { DonorReceiptAddressNeededError } from '../../../errors/DonorErrors';
|
||||||
import { Address } from '../../entities/Address';
|
import { Donor } from '../../entities/Donor';
|
||||||
import { Donor } from '../../entities/Donor';
|
import { CreateParticipant } from '../create/CreateParticipant';
|
||||||
import { CreateParticipant } from '../create/CreateParticipant';
|
|
||||||
|
/**
|
||||||
/**
|
* This class is used to update a Donor entity (via put request).
|
||||||
* This class is used to update a Donor entity (via put request).
|
*/
|
||||||
*/
|
export class UpdateDonor extends CreateParticipant {
|
||||||
export class UpdateDonor extends CreateParticipant {
|
|
||||||
|
/**
|
||||||
/**
|
* The updated donor's id.
|
||||||
* The updated donor's id.
|
* This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
|
||||||
* This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
|
*/
|
||||||
*/
|
@IsInt()
|
||||||
@IsInt()
|
id: number;
|
||||||
id: number;
|
|
||||||
|
/**
|
||||||
/**
|
* Does the updated donor need a receipt?
|
||||||
* Does the updated donor need a receipt?
|
*/
|
||||||
*/
|
@IsBoolean()
|
||||||
@IsBoolean()
|
@IsOptional()
|
||||||
@IsOptional()
|
receiptNeeded?: boolean;
|
||||||
receiptNeeded?: boolean;
|
|
||||||
|
|
||||||
|
/**
|
||||||
/**
|
* Updates a provided Donor entity based on this.
|
||||||
* Updates a provided Donor entity based on this.
|
*/
|
||||||
*/
|
public async update(donor: Donor): Promise<Donor> {
|
||||||
public async update(donor: Donor): Promise<Donor> {
|
donor.firstname = this.firstname;
|
||||||
donor.firstname = this.firstname;
|
donor.middlename = this.middlename;
|
||||||
donor.middlename = this.middlename;
|
donor.lastname = this.lastname;
|
||||||
donor.lastname = this.lastname;
|
donor.phone = this.phone;
|
||||||
donor.phone = this.phone;
|
donor.email = this.email;
|
||||||
donor.email = this.email;
|
donor.receiptNeeded = this.receiptNeeded;
|
||||||
donor.receiptNeeded = this.receiptNeeded;
|
donor.address = await this.getAddress();
|
||||||
if (!this.address) { donor.address.reset(); }
|
|
||||||
else { donor.address = this.address; }
|
if (this.receiptNeeded == true && this.address == null) {
|
||||||
Address.validate(donor.address);
|
throw new DonorReceiptAddressNeededError()
|
||||||
if (this.receiptNeeded == true && Address.isValidAddress(donor.address) == false) {
|
}
|
||||||
throw new DonorReceiptAddressNeededError()
|
|
||||||
}
|
return donor;
|
||||||
|
}
|
||||||
return donor;
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -20,7 +20,6 @@ export class UpdateFixedDonation extends UpdateDonation {
|
|||||||
*/
|
*/
|
||||||
public async update(donation: FixedDonation): Promise<FixedDonation> {
|
public async update(donation: FixedDonation): Promise<FixedDonation> {
|
||||||
donation.amount = this.amount;
|
donation.amount = this.amount;
|
||||||
donation.paidAmount = this.paidAmount;
|
|
||||||
donation.donor = await this.getDonor();
|
donation.donor = await this.getDonor();
|
||||||
|
|
||||||
return donation;
|
return donation;
|
||||||
|
@ -1,106 +0,0 @@
|
|||||||
import { IsEmail, IsInt, IsNotEmpty, IsObject, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
|
|
||||||
import { getConnectionManager } from 'typeorm';
|
|
||||||
import { config } from '../../../config';
|
|
||||||
import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
|
|
||||||
import { Address } from '../../entities/Address';
|
|
||||||
import { GroupContact } from '../../entities/GroupContact';
|
|
||||||
import { RunnerGroup } from '../../entities/RunnerGroup';
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class is used to update a GroupContact entity (via put request).
|
|
||||||
*/
|
|
||||||
export class UpdateGroupContact {
|
|
||||||
/**
|
|
||||||
* The updated contact's id.
|
|
||||||
* This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
id: number;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated contact's first name.
|
|
||||||
*/
|
|
||||||
@IsNotEmpty()
|
|
||||||
@IsString()
|
|
||||||
firstname: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated contact's middle name.
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
middlename?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated contact's last name.
|
|
||||||
*/
|
|
||||||
@IsNotEmpty()
|
|
||||||
@IsString()
|
|
||||||
lastname: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated contact's address.
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsObject()
|
|
||||||
address?: Address;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated contact's phone number.
|
|
||||||
* This will be validated against the configured country phone numer syntax (default: international).
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsPhoneNumber(config.phone_validation_countrycode)
|
|
||||||
phone?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated contact's email address.
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsEmail()
|
|
||||||
email?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated contacts's groups' ids.
|
|
||||||
* You can provide either one groupId or an array of groupIDs.
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
groups?: number[] | number
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get's all groups for this contact by their id's;
|
|
||||||
*/
|
|
||||||
public async getGroups(): Promise<RunnerGroup[]> {
|
|
||||||
if (!this.groups) { return null; }
|
|
||||||
let groups = new Array<RunnerGroup>();
|
|
||||||
if (!Array.isArray(this.groups)) {
|
|
||||||
this.groups = [this.groups]
|
|
||||||
}
|
|
||||||
for (let group of this.groups) {
|
|
||||||
let found = await getConnectionManager().get().getRepository(RunnerGroup).findOne({ id: group });
|
|
||||||
if (!found) { throw new RunnerGroupNotFoundError(); }
|
|
||||||
groups.push(found);
|
|
||||||
}
|
|
||||||
return groups;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates a provided Donor entity based on this.
|
|
||||||
* @param contact the contact you want to update.
|
|
||||||
*/
|
|
||||||
public async update(contact: GroupContact): Promise<GroupContact> {
|
|
||||||
contact.firstname = this.firstname; GroupContact
|
|
||||||
contact.middlename = this.middlename;
|
|
||||||
contact.lastname = this.lastname;
|
|
||||||
contact.phone = this.phone;
|
|
||||||
contact.email = this.email;
|
|
||||||
if (!this.address) { contact.address.reset(); }
|
|
||||||
else { contact.address = this.address; }
|
|
||||||
Address.validate(contact.address);
|
|
||||||
contact.groups = await this.getGroups();
|
|
||||||
|
|
||||||
return contact;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,57 +1,54 @@
|
|||||||
import { IsInt, IsPositive } from 'class-validator';
|
import { IsInt, IsPositive } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
|
import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
|
||||||
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
||||||
import { Address } from '../../entities/Address';
|
import { Runner } from '../../entities/Runner';
|
||||||
import { Runner } from '../../entities/Runner';
|
import { RunnerGroup } from '../../entities/RunnerGroup';
|
||||||
import { RunnerGroup } from '../../entities/RunnerGroup';
|
import { CreateParticipant } from '../create/CreateParticipant';
|
||||||
import { CreateParticipant } from '../create/CreateParticipant';
|
|
||||||
|
/**
|
||||||
/**
|
* This class is used to update a Runner entity (via put request).
|
||||||
* This class is used to update a Runner entity (via put request).
|
*/
|
||||||
*/
|
export class UpdateRunner extends CreateParticipant {
|
||||||
export class UpdateRunner extends CreateParticipant {
|
|
||||||
|
/**
|
||||||
/**
|
* The updated runner's id.
|
||||||
* The updated runner's id.
|
* This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
|
||||||
* This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
|
*/
|
||||||
*/
|
@IsInt()
|
||||||
@IsInt()
|
id: number;
|
||||||
id: number;
|
|
||||||
|
/**
|
||||||
/**
|
* The updated runner's group's id.
|
||||||
* The updated runner's group's id.
|
*/
|
||||||
*/
|
@IsInt()
|
||||||
@IsInt()
|
@IsPositive()
|
||||||
@IsPositive()
|
group: number;
|
||||||
group: number;
|
|
||||||
|
/**
|
||||||
/**
|
* Updates a provided Runner entity based on this.
|
||||||
* Updates a provided Runner entity based on this.
|
*/
|
||||||
*/
|
public async update(runner: Runner): Promise<Runner> {
|
||||||
public async update(runner: Runner): Promise<Runner> {
|
runner.firstname = this.firstname;
|
||||||
runner.firstname = this.firstname;
|
runner.middlename = this.middlename;
|
||||||
runner.middlename = this.middlename;
|
runner.lastname = this.lastname;
|
||||||
runner.lastname = this.lastname;
|
runner.phone = this.phone;
|
||||||
runner.phone = this.phone;
|
runner.email = this.email;
|
||||||
runner.email = this.email;
|
runner.group = await this.getGroup();
|
||||||
runner.group = await this.getGroup();
|
runner.address = await this.getAddress();
|
||||||
if (!this.address) { runner.address.reset(); }
|
|
||||||
else { runner.address = this.address; }
|
return runner;
|
||||||
Address.validate(runner.address);
|
}
|
||||||
|
|
||||||
return runner;
|
/**
|
||||||
}
|
* Loads the updated runner's group based on it's id.
|
||||||
|
*/
|
||||||
/**
|
public async getGroup(): Promise<RunnerGroup> {
|
||||||
* Loads the updated runner's group based on it's id.
|
if (this.group === undefined || this.group === null) {
|
||||||
*/
|
throw new RunnerTeamNeedsParentError();
|
||||||
public async getGroup(): Promise<RunnerGroup> {
|
}
|
||||||
if (this.group === undefined || this.group === null) {
|
let group = await getConnectionManager().get().getRepository(RunnerGroup).findOne({ id: this.group });
|
||||||
throw new RunnerTeamNeedsParentError();
|
if (!group) { throw new RunnerGroupNotFoundError; }
|
||||||
}
|
return group;
|
||||||
let group = await getConnectionManager().get().getRepository(RunnerGroup).findOne({ id: this.group });
|
}
|
||||||
if (!group) { throw new RunnerGroupNotFoundError; }
|
|
||||||
return group;
|
|
||||||
}
|
|
||||||
}
|
}
|
48
src/models/actions/update/UpdateRunnerOrganisation.ts
Normal file
48
src/models/actions/update/UpdateRunnerOrganisation.ts
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
import { IsInt, IsOptional } from 'class-validator';
|
||||||
|
import { getConnectionManager } from 'typeorm';
|
||||||
|
import { AddressNotFoundError } from '../../../errors/AddressErrors';
|
||||||
|
import { Address } from '../../entities/Address';
|
||||||
|
import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
|
||||||
|
import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class is used to update a RunnerOrganisation entity (via put request).
|
||||||
|
*/
|
||||||
|
export class UpdateRunnerOrganisation extends CreateRunnerGroup {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The updated orgs's id.
|
||||||
|
* This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
|
||||||
|
*/
|
||||||
|
@IsInt()
|
||||||
|
id: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The updated organisation's address's id.
|
||||||
|
*/
|
||||||
|
@IsInt()
|
||||||
|
@IsOptional()
|
||||||
|
address?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads the organisation's address based on it's id.
|
||||||
|
*/
|
||||||
|
public async getAddress(): Promise<Address> {
|
||||||
|
if (!this.address) { return null; }
|
||||||
|
let address = await getConnectionManager().get().getRepository(Address).findOne({ id: this.address });
|
||||||
|
if (!address) { throw new AddressNotFoundError; }
|
||||||
|
return address;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates a provided RunnerOrganisation entity based on this.
|
||||||
|
*/
|
||||||
|
public async update(organisation: RunnerOrganisation): Promise<RunnerOrganisation> {
|
||||||
|
|
||||||
|
organisation.name = this.name;
|
||||||
|
organisation.contact = await this.getContact();
|
||||||
|
organisation.address = await this.getAddress();
|
||||||
|
|
||||||
|
return organisation;
|
||||||
|
}
|
||||||
|
}
|
@ -1,53 +0,0 @@
|
|||||||
import { IsBoolean, IsInt, IsObject, IsOptional } from 'class-validator';
|
|
||||||
import * as uuid from 'uuid';
|
|
||||||
import { Address } from '../../entities/Address';
|
|
||||||
import { RunnerOrganization } from '../../entities/RunnerOrganization';
|
|
||||||
import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class is used to update a RunnerOrganization entity (via put request).
|
|
||||||
*/
|
|
||||||
export class UpdateRunnerOrganization extends CreateRunnerGroup {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated orgs's id.
|
|
||||||
* This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
id: number;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The updated organization's address.
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsObject()
|
|
||||||
address?: Address;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Is registration enabled for the updated organization?
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
|
||||||
@IsBoolean()
|
|
||||||
registrationEnabled?: boolean = false;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates a provided RunnerOrganization entity based on this.
|
|
||||||
*/
|
|
||||||
public async update(organization: RunnerOrganization): Promise<RunnerOrganization> {
|
|
||||||
|
|
||||||
organization.name = this.name;
|
|
||||||
organization.contact = await this.getContact();
|
|
||||||
if (!this.address) { organization.address.reset(); }
|
|
||||||
else { organization.address = this.address; }
|
|
||||||
Address.validate(organization.address);
|
|
||||||
|
|
||||||
if (this.registrationEnabled && !organization.key) {
|
|
||||||
organization.key = uuid.v4().toUpperCase();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
organization.key = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return organization;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,8 +1,8 @@
|
|||||||
import { IsInt, IsPositive } from 'class-validator';
|
import { IsInt, IsPositive } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { RunnerOrganizationNotFoundError } from '../../../errors/RunnerOrganizationErrors';
|
import { RunnerOrganisationNotFoundError } from '../../../errors/RunnerOrganisationErrors';
|
||||||
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
|
||||||
import { RunnerOrganization } from '../../entities/RunnerOrganization';
|
import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
|
||||||
import { RunnerTeam } from '../../entities/RunnerTeam';
|
import { RunnerTeam } from '../../entities/RunnerTeam';
|
||||||
import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
|
import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
|
||||||
|
|
||||||
@ -28,12 +28,12 @@ export class UpdateRunnerTeam extends CreateRunnerGroup {
|
|||||||
/**
|
/**
|
||||||
* Loads the updated teams's parentGroup based on it's id.
|
* Loads the updated teams's parentGroup based on it's id.
|
||||||
*/
|
*/
|
||||||
public async getParent(): Promise<RunnerOrganization> {
|
public async getParent(): Promise<RunnerOrganisation> {
|
||||||
if (this.parentGroup === undefined || this.parentGroup === null) {
|
if (this.parentGroup === undefined || this.parentGroup === null) {
|
||||||
throw new RunnerTeamNeedsParentError();
|
throw new RunnerTeamNeedsParentError();
|
||||||
}
|
}
|
||||||
let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: this.parentGroup });
|
let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.parentGroup });
|
||||||
if (!parentGroup) { throw new RunnerOrganizationNotFoundError();; }
|
if (!parentGroup) { throw new RunnerOrganisationNotFoundError();; }
|
||||||
return parentGroup;
|
return parentGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import { IsBoolean, IsInt, IsOptional, IsPositive } from 'class-validator';
|
import { IsBoolean, IsInt, IsOptional, IsPositive } from 'class-validator';
|
||||||
import { getConnection } from 'typeorm';
|
import { getConnection } from 'typeorm';
|
||||||
import { RunnerNotFoundError } from '../../../errors/RunnerErrors';
|
import { RunnerNotFoundError } from '../../../errors/RunnerErrors';
|
||||||
import { TrackNotFoundError } from '../../../errors/TrackErrors';
|
import { ScanStationNotFoundError } from '../../../errors/ScanStationErrors';
|
||||||
import { Runner } from '../../entities/Runner';
|
import { Runner } from '../../entities/Runner';
|
||||||
import { Track } from '../../entities/Track';
|
import { ScanStation } from '../../entities/ScanStation';
|
||||||
import { TrackScan } from '../../entities/TrackScan';
|
import { TrackScan } from '../../entities/TrackScan';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -38,7 +38,7 @@ export abstract class UpdateTrackScan {
|
|||||||
*/
|
*/
|
||||||
@IsInt()
|
@IsInt()
|
||||||
@IsPositive()
|
@IsPositive()
|
||||||
public track: number;
|
public station: number;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update a TrackScan entity based on this.
|
* Update a TrackScan entity based on this.
|
||||||
@ -47,7 +47,8 @@ export abstract class UpdateTrackScan {
|
|||||||
public async update(scan: TrackScan): Promise<TrackScan> {
|
public async update(scan: TrackScan): Promise<TrackScan> {
|
||||||
scan.valid = this.valid;
|
scan.valid = this.valid;
|
||||||
scan.runner = await this.getRunner();
|
scan.runner = await this.getRunner();
|
||||||
scan.track = await this.getTrack();
|
scan.station = await this.getStation();
|
||||||
|
scan.track = scan.station.track;
|
||||||
|
|
||||||
return scan;
|
return scan;
|
||||||
}
|
}
|
||||||
@ -66,11 +67,11 @@ export abstract class UpdateTrackScan {
|
|||||||
/**
|
/**
|
||||||
* Gets a runner based on the runner id provided via this.runner.
|
* Gets a runner based on the runner id provided via this.runner.
|
||||||
*/
|
*/
|
||||||
public async getTrack(): Promise<Track> {
|
public async getStation(): Promise<ScanStation> {
|
||||||
const track = await getConnection().getRepository(Track).findOne({ id: this.track });
|
const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ['track'] });
|
||||||
if (!track) {
|
if (!station) {
|
||||||
throw new TrackNotFoundError();
|
throw new ScanStationNotFoundError();
|
||||||
}
|
}
|
||||||
return track;
|
return station;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,14 +1,12 @@
|
|||||||
import * as argon2 from "argon2";
|
import * as argon2 from "argon2";
|
||||||
import { passwordStrength } from "check-password-strength";
|
|
||||||
import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
|
import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import { config } from '../../../config';
|
import { config } from '../../../config';
|
||||||
import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
|
import { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
|
||||||
import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors';
|
import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors';
|
||||||
import { User } from '../../entities/User';
|
import { User } from '../../entities/User';
|
||||||
import { UserGroup } from '../../entities/UserGroup';
|
import { UserGroup } from '../../entities/UserGroup';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class is used to update a User entity (via put request).
|
* This class is used to update a User entity (via put request).
|
||||||
*/
|
*/
|
||||||
@ -106,11 +104,6 @@ export class UpdateUser {
|
|||||||
if (this.username.includes("@")) { throw new UsernameContainsIllegalCharacterError(); }
|
if (this.username.includes("@")) { throw new UsernameContainsIllegalCharacterError(); }
|
||||||
|
|
||||||
if (this.password) {
|
if (this.password) {
|
||||||
let password_strength = passwordStrength(this.password);
|
|
||||||
if (!password_strength.contains.includes("uppercase")) { throw new PasswordMustContainUppercaseLetterError(); }
|
|
||||||
if (!password_strength.contains.includes("lowercase")) { throw new PasswordMustContainLowercaseLetterError(); }
|
|
||||||
if (!password_strength.contains.includes("number")) { throw new PasswordMustContainNumberError(); }
|
|
||||||
if (!(password_strength.length > 9)) { throw new PasswordTooShortError(); }
|
|
||||||
user.password = await argon2.hash(this.password + user.uuid);
|
user.password = await argon2.hash(this.password + user.uuid);
|
||||||
user.refreshTokenCount = user.refreshTokenCount + 1;
|
user.refreshTokenCount = user.refreshTokenCount + 1;
|
||||||
}
|
}
|
||||||
@ -124,7 +117,7 @@ export class UpdateUser {
|
|||||||
user.phone = this.phone;
|
user.phone = this.phone;
|
||||||
user.groups = await this.getGroups();
|
user.groups = await this.getGroups();
|
||||||
|
|
||||||
if (!this.profilePic) { user.profilePic = `https://lauf-fuer-kaya.de/lfk-logo.png`; }
|
if (!this.profilePic) { user.profilePic = `https://dev.lauf-fuer-kaya.de/lfk-logo.png`; }
|
||||||
else { user.profilePic = this.profilePic; }
|
else { user.profilePic = this.profilePic; }
|
||||||
|
|
||||||
return user;
|
return user;
|
||||||
|
@ -1,86 +1,90 @@
|
|||||||
import {
|
import {
|
||||||
IsPostalCode,
|
IsInt,
|
||||||
IsString
|
IsNotEmpty,
|
||||||
} from "class-validator";
|
IsOptional,
|
||||||
import { Column } from "typeorm";
|
IsPostalCode,
|
||||||
import ValidatorJS from 'validator';
|
IsString
|
||||||
import { config } from '../../config';
|
} from "class-validator";
|
||||||
import { AddressCityEmptyError, AddressCountryEmptyError, AddressFirstLineEmptyError, AddressPostalCodeEmptyError, AddressPostalCodeInvalidError } from '../../errors/AddressErrors';
|
import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
|
||||||
|
import { config } from '../../config';
|
||||||
/**
|
import { IAddressUser } from './IAddressUser';
|
||||||
* Defines the Address class.
|
|
||||||
* Implemented this way to prevent any formatting differences.
|
/**
|
||||||
*/
|
* Defines the Address entity.
|
||||||
export class Address {
|
* Implemented this way to prevent any formatting differences.
|
||||||
/**
|
*/
|
||||||
* The address's first line.
|
@Entity()
|
||||||
* Containing the street and house number.
|
export class Address {
|
||||||
*/
|
/**
|
||||||
@Column({ nullable: true })
|
* Autogenerated unique id (primary key).
|
||||||
@IsString()
|
*/
|
||||||
address1?: string;
|
@PrimaryGeneratedColumn()
|
||||||
|
@IsInt()
|
||||||
/**
|
id: number;
|
||||||
* The address's second line.
|
|
||||||
* Containing optional information.
|
/**
|
||||||
*/
|
* The address's description.
|
||||||
@Column({ nullable: true })
|
* Optional and mostly for UX.
|
||||||
@IsString()
|
*/
|
||||||
address2?: string;
|
@Column({ nullable: true })
|
||||||
|
@IsString()
|
||||||
/**
|
@IsOptional()
|
||||||
* The address's postal code.
|
description?: string;
|
||||||
* This will get checked against the postal code syntax for the configured country.
|
|
||||||
*/
|
/**
|
||||||
@Column({ nullable: true })
|
* The address's first line.
|
||||||
@IsString()
|
* Containing the street and house number.
|
||||||
@IsPostalCode(config.postalcode_validation_countrycode)
|
*/
|
||||||
postalcode: string;
|
@Column()
|
||||||
|
@IsString()
|
||||||
/**
|
@IsNotEmpty()
|
||||||
* The address's city.
|
address1: string;
|
||||||
*/
|
|
||||||
@Column({ nullable: true })
|
/**
|
||||||
@IsString()
|
* The address's second line.
|
||||||
city: string;
|
* Containing optional information.
|
||||||
|
*/
|
||||||
/**
|
@Column({ nullable: true })
|
||||||
* The address's country.
|
@IsString()
|
||||||
*/
|
@IsOptional()
|
||||||
@Column({ nullable: true })
|
address2?: string;
|
||||||
@IsString()
|
|
||||||
country: string;
|
/**
|
||||||
|
* The address's postal code.
|
||||||
public reset() {
|
* This will get checked against the postal code syntax for the configured country.
|
||||||
this.address1 = null;
|
*/
|
||||||
this.address2 = null;
|
@Column()
|
||||||
this.city = null;
|
@IsString()
|
||||||
this.country = null;
|
@IsNotEmpty()
|
||||||
this.postalcode = null;
|
@IsPostalCode(config.postalcode_validation_countrycode)
|
||||||
}
|
postalcode: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if this is a valid address
|
* The address's city.
|
||||||
*/
|
*/
|
||||||
public static isValidAddress(address: Address): Boolean {
|
@Column()
|
||||||
if (address == null) { return false; }
|
@IsString()
|
||||||
if (address.address1 == null || address.city == null || address.country == null || address.postalcode == null) { return false; }
|
@IsNotEmpty()
|
||||||
if (ValidatorJS.isPostalCode(address.postalcode, config.postalcode_validation_countrycode) == false) { return false; }
|
city: string;
|
||||||
return true;
|
|
||||||
}
|
/**
|
||||||
|
* The address's country.
|
||||||
/**
|
*/
|
||||||
* This function validates addresses.
|
@Column()
|
||||||
* This is a workaround for non-existant class validation for embedded entities.
|
@IsString()
|
||||||
* @param address The address that shall get validated.
|
@IsNotEmpty()
|
||||||
*/
|
country: string;
|
||||||
public static validate(address: Address) {
|
|
||||||
if (address == null) { return; }
|
/**
|
||||||
if (address.address1 == null && address.city == null && address.country == null && address.postalcode == null) { return; }
|
* Used to link the address to participants.
|
||||||
if (address.address1 == null) { throw new AddressFirstLineEmptyError(); }
|
*/
|
||||||
if (address.postalcode == null) { throw new AddressPostalCodeEmptyError(); }
|
@OneToMany(() => IAddressUser, addressUser => addressUser.address, { nullable: true })
|
||||||
if (address.city == null) { throw new AddressCityEmptyError(); }
|
addressUsers: IAddressUser[];
|
||||||
if (address.country == null) { throw new AddressCountryEmptyError(); }
|
|
||||||
if (ValidatorJS.isPostalCode(address.postalcode.toString(), config.postalcode_validation_countrycode) == false) { throw new AddressPostalCodeInvalidError(); }
|
/**
|
||||||
}
|
* Turns this entity into it's response class.
|
||||||
}
|
*/
|
||||||
|
public toResponse() {
|
||||||
|
return new Error("NotImplemented");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
import {
|
|
||||||
IsNotEmpty,
|
|
||||||
IsString
|
|
||||||
} from "class-validator";
|
|
||||||
import { Column, Entity, PrimaryColumn } from "typeorm";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Defines the ConfigFlag entity.
|
|
||||||
* This entity can be used to set some flags on db init.
|
|
||||||
*/
|
|
||||||
@Entity()
|
|
||||||
export class ConfigFlag {
|
|
||||||
/**
|
|
||||||
* The flag's name (primary).
|
|
||||||
*/
|
|
||||||
@PrimaryColumn()
|
|
||||||
@IsString()
|
|
||||||
option: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The flag's value.
|
|
||||||
*/
|
|
||||||
@Column()
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
value: string;
|
|
||||||
}
|
|
@ -2,7 +2,7 @@ import {
|
|||||||
IsInt,
|
IsInt,
|
||||||
IsNotEmpty
|
IsNotEmpty
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
|
import { Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
|
||||||
import { ResponseDonation } from '../responses/ResponseDonation';
|
import { ResponseDonation } from '../responses/ResponseDonation';
|
||||||
import { Donor } from './Donor';
|
import { Donor } from './Donor';
|
||||||
|
|
||||||
@ -34,13 +34,6 @@ export abstract class Donation {
|
|||||||
*/
|
*/
|
||||||
public abstract get amount(): number;
|
public abstract get amount(): number;
|
||||||
|
|
||||||
/**
|
|
||||||
* The donation's paid amount in cents (or whatever your currency's smallest unit is.).
|
|
||||||
* Used to mark donations as paid.
|
|
||||||
*/
|
|
||||||
@Column({ nullable: true })
|
|
||||||
@IsInt()
|
|
||||||
paidAmount: number;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turns this entity into it's response class.
|
* Turns this entity into it's response class.
|
||||||
|
@ -33,15 +33,6 @@ export class Donor extends Participant {
|
|||||||
return this.donations.reduce((sum, current) => sum + current.amount, 0);
|
return this.donations.reduce((sum, current) => sum + current.amount, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the total paid donations of a donor based on his linked donations.
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
public get paidDonationAmount(): number {
|
|
||||||
if (!this.donations) { return 0; }
|
|
||||||
return this.donations.reduce((sum, current) => sum + current.paidAmount, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turns this entity into it's response class.
|
* Turns this entity into it's response class.
|
||||||
*/
|
*/
|
||||||
|
@ -7,10 +7,10 @@ import {
|
|||||||
|
|
||||||
IsString
|
IsString
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
|
import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
|
||||||
import { config } from '../../config';
|
import { config } from '../../config';
|
||||||
import { ResponseGroupContact } from '../responses/ResponseGroupContact';
|
|
||||||
import { Address } from "./Address";
|
import { Address } from "./Address";
|
||||||
|
import { IAddressUser } from './IAddressUser';
|
||||||
import { RunnerGroup } from "./RunnerGroup";
|
import { RunnerGroup } from "./RunnerGroup";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -18,7 +18,7 @@ import { RunnerGroup } from "./RunnerGroup";
|
|||||||
* Mainly it's own class to reduce duplicate code and enable contact's to be associated with multiple groups.
|
* Mainly it's own class to reduce duplicate code and enable contact's to be associated with multiple groups.
|
||||||
*/
|
*/
|
||||||
@Entity()
|
@Entity()
|
||||||
export class GroupContact {
|
export class GroupContact implements IAddressUser {
|
||||||
/**
|
/**
|
||||||
* Autogenerated unique id (primary key).
|
* Autogenerated unique id (primary key).
|
||||||
*/
|
*/
|
||||||
@ -54,7 +54,8 @@ export class GroupContact {
|
|||||||
* The contact's address.
|
* The contact's address.
|
||||||
* This is a address object to prevent any formatting differences.
|
* This is a address object to prevent any formatting differences.
|
||||||
*/
|
*/
|
||||||
@Column(type => Address)
|
@IsOptional()
|
||||||
|
@ManyToOne(() => Address, address => address.addressUsers, { nullable: true })
|
||||||
address?: Address;
|
address?: Address;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -84,7 +85,7 @@ export class GroupContact {
|
|||||||
/**
|
/**
|
||||||
* Turns this entity into it's response class.
|
* Turns this entity into it's response class.
|
||||||
*/
|
*/
|
||||||
public toResponse(): ResponseGroupContact {
|
public toResponse() {
|
||||||
return new ResponseGroupContact(this);
|
return new Error("NotImplemented");
|
||||||
}
|
}
|
||||||
}
|
}
|
20
src/models/entities/IAddressUser.ts
Normal file
20
src/models/entities/IAddressUser.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { Entity, ManyToOne, PrimaryColumn } from 'typeorm';
|
||||||
|
import { Address } from './Address';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface(tm) all entities using addresses have to implement.
|
||||||
|
* This is a abstract class, because apparently typeorm can't really work with interfaces :/
|
||||||
|
*/
|
||||||
|
@Entity()
|
||||||
|
export abstract class IAddressUser {
|
||||||
|
@PrimaryColumn()
|
||||||
|
id: number;
|
||||||
|
|
||||||
|
@ManyToOne(() => Address, address => address.addressUsers, { nullable: true })
|
||||||
|
address?: Address
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Turns this entity into it's response class.
|
||||||
|
*/
|
||||||
|
public abstract toResponse();
|
||||||
|
}
|
@ -7,10 +7,11 @@ import {
|
|||||||
|
|
||||||
IsString
|
IsString
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
import { Column, Entity, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
|
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
|
||||||
import { config } from '../../config';
|
import { config } from '../../config';
|
||||||
import { ResponseParticipant } from '../responses/ResponseParticipant';
|
import { ResponseParticipant } from '../responses/ResponseParticipant';
|
||||||
import { Address } from "./Address";
|
import { Address } from "./Address";
|
||||||
|
import { IAddressUser } from './IAddressUser';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the Participant entity.
|
* Defines the Participant entity.
|
||||||
@ -18,7 +19,7 @@ import { Address } from "./Address";
|
|||||||
*/
|
*/
|
||||||
@Entity()
|
@Entity()
|
||||||
@TableInheritance({ column: { name: "type", type: "varchar" } })
|
@TableInheritance({ column: { name: "type", type: "varchar" } })
|
||||||
export abstract class Participant {
|
export abstract class Participant implements IAddressUser {
|
||||||
/**
|
/**
|
||||||
* Autogenerated unique id (primary key).
|
* Autogenerated unique id (primary key).
|
||||||
*/
|
*/
|
||||||
@ -54,7 +55,7 @@ export abstract class Participant {
|
|||||||
* The participant's address.
|
* The participant's address.
|
||||||
* This is a address object to prevent any formatting differences.
|
* This is a address object to prevent any formatting differences.
|
||||||
*/
|
*/
|
||||||
@Column(type => Address)
|
@ManyToOne(() => Address, address => address.addressUsers, { nullable: true })
|
||||||
address?: Address;
|
address?: Address;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
|
import { IsInt, IsNotEmpty } from "class-validator";
|
||||||
import { ChildEntity, Column, ManyToOne, OneToMany } from "typeorm";
|
import { ChildEntity, ManyToOne, OneToMany } from "typeorm";
|
||||||
import { ResponseRunner } from '../responses/ResponseRunner';
|
import { ResponseRunner } from '../responses/ResponseRunner';
|
||||||
import { DistanceDonation } from "./DistanceDonation";
|
import { DistanceDonation } from "./DistanceDonation";
|
||||||
import { Participant } from "./Participant";
|
import { Participant } from "./Participant";
|
||||||
@ -16,7 +16,7 @@ import { Scan } from "./Scan";
|
|||||||
export class Runner extends Participant {
|
export class Runner extends Participant {
|
||||||
/**
|
/**
|
||||||
* The runner's associated group.
|
* The runner's associated group.
|
||||||
* Can be a runner team or organization.
|
* Can be a runner team or organisation.
|
||||||
*/
|
*/
|
||||||
@IsNotEmpty()
|
@IsNotEmpty()
|
||||||
@ManyToOne(() => RunnerGroup, group => group.runners)
|
@ManyToOne(() => RunnerGroup, group => group.runners)
|
||||||
@ -43,15 +43,6 @@ export class Runner extends Participant {
|
|||||||
@OneToMany(() => Scan, scan => scan.runner, { nullable: true })
|
@OneToMany(() => Scan, scan => scan.runner, { nullable: true })
|
||||||
scans: Scan[];
|
scans: Scan[];
|
||||||
|
|
||||||
/**
|
|
||||||
* The last time the runner requested a selfservice link.
|
|
||||||
* Used to prevent spamming of the selfservice link forgotten route.
|
|
||||||
*/
|
|
||||||
@Column({ nullable: true, unique: false })
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
resetRequestedTimestamp?: number;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns all valid scans associated with this runner.
|
* Returns all valid scans associated with this runner.
|
||||||
* This is implemented here to avoid duplicate code in other files.
|
* This is implemented here to avoid duplicate code in other files.
|
||||||
@ -74,7 +65,7 @@ export class Runner extends Participant {
|
|||||||
*/
|
*/
|
||||||
@IsInt()
|
@IsInt()
|
||||||
public get distanceDonationAmount(): number {
|
public get distanceDonationAmount(): number {
|
||||||
return this.distanceDonations.reduce((sum, current) => sum + current.amount, 0);
|
return this.distanceDonations.reduce((sum, current) => sum + current.amountPerDistance, 0) * this.distance;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -52,7 +52,13 @@ export class RunnerCard {
|
|||||||
* Generates a ean-13 compliant string for barcode generation.
|
* Generates a ean-13 compliant string for barcode generation.
|
||||||
*/
|
*/
|
||||||
public get code(): string {
|
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,11 +67,10 @@ export class RunnerCard {
|
|||||||
private get paddedId(): string {
|
private get paddedId(): string {
|
||||||
let id: string = this.id.toString();
|
let id: string = this.id.toString();
|
||||||
|
|
||||||
if (id.length > 11) {
|
if (id.length > 12) {
|
||||||
throw new RunnerCardIdOutOfRangeError();
|
throw new RunnerCardIdOutOfRangeError();
|
||||||
}
|
}
|
||||||
while (id.length < 11) { id = '0' + id; }
|
while (id.length < 12) { id = '0' + id; }
|
||||||
id = '2' + id;
|
|
||||||
|
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
@ -51,9 +51,6 @@ export abstract class RunnerGroup {
|
|||||||
*/
|
*/
|
||||||
@IsInt()
|
@IsInt()
|
||||||
public get distance(): number {
|
public get distance(): number {
|
||||||
if (!this.runners || this.runners.length == 0) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return this.runners.reduce((sum, current) => sum + current.distance, 0);
|
return this.runners.reduce((sum, current) => sum + current.distance, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,74 +1,65 @@
|
|||||||
import { IsInt, IsOptional, IsString } from "class-validator";
|
import { IsInt, IsOptional } from "class-validator";
|
||||||
import { ChildEntity, Column, OneToMany } from "typeorm";
|
import { ChildEntity, ManyToOne, OneToMany } from "typeorm";
|
||||||
import { ResponseRunnerOrganization } from '../responses/ResponseRunnerOrganization';
|
import { ResponseRunnerOrganisation } from '../responses/ResponseRunnerOrganisation';
|
||||||
import { Address } from './Address';
|
import { Address } from './Address';
|
||||||
import { Runner } from './Runner';
|
import { IAddressUser } from './IAddressUser';
|
||||||
import { RunnerGroup } from "./RunnerGroup";
|
import { Runner } from './Runner';
|
||||||
import { RunnerTeam } from "./RunnerTeam";
|
import { RunnerGroup } from "./RunnerGroup";
|
||||||
|
import { RunnerTeam } from "./RunnerTeam";
|
||||||
/**
|
|
||||||
* Defines the RunnerOrganization entity.
|
/**
|
||||||
* This usually is a school, club or company.
|
* Defines the RunnerOrganisation entity.
|
||||||
*/
|
* This usually is a school, club or company.
|
||||||
@ChildEntity()
|
*/
|
||||||
export class RunnerOrganization extends RunnerGroup {
|
@ChildEntity()
|
||||||
|
export class RunnerOrganisation extends RunnerGroup implements IAddressUser {
|
||||||
/**
|
|
||||||
* The organizations's address.
|
/**
|
||||||
*/
|
* The organisations's address.
|
||||||
@IsOptional()
|
*/
|
||||||
@Column(type => Address)
|
@IsOptional()
|
||||||
address?: Address;
|
@ManyToOne(() => Address, address => address.addressUsers, { nullable: true })
|
||||||
|
address?: Address;
|
||||||
/**
|
|
||||||
* The organization's teams.
|
/**
|
||||||
* Used to link teams to a organization.
|
* The organisation's teams.
|
||||||
*/
|
* Used to link teams to a organisation.
|
||||||
@OneToMany(() => RunnerTeam, team => team.parentGroup, { nullable: true })
|
*/
|
||||||
teams: RunnerTeam[];
|
@OneToMany(() => RunnerTeam, team => team.parentGroup, { nullable: true })
|
||||||
|
teams: RunnerTeam[];
|
||||||
/**
|
|
||||||
* The organization's api key for self-service registration.
|
/**
|
||||||
* The api key can be used for the /runners/register/:token endpoint.
|
* Returns all runners associated with this organisation (directly or indirectly via teams).
|
||||||
* Is has to be base64 encoded if used via the api (to keep url-safety).
|
*/
|
||||||
*/
|
public get allRunners(): Runner[] {
|
||||||
@Column({ nullable: true, unique: true })
|
let returnRunners: Runner[] = new Array<Runner>();
|
||||||
@IsString()
|
returnRunners.push(...this.runners);
|
||||||
@IsOptional()
|
for (let team of this.teams) {
|
||||||
key?: string;
|
returnRunners.push(...team.runners)
|
||||||
|
}
|
||||||
/**
|
return returnRunners;
|
||||||
* Returns all runners associated with this organization (directly or indirectly via teams).
|
}
|
||||||
*/
|
|
||||||
public get allRunners(): Runner[] {
|
/**
|
||||||
let returnRunners: Runner[] = new Array<Runner>();
|
* Returns the total distance ran by this group's runners based on all their valid scans.
|
||||||
returnRunners.push(...this.runners);
|
*/
|
||||||
for (let team of this.teams) {
|
@IsInt()
|
||||||
returnRunners.push(...team.runners)
|
public get distance(): number {
|
||||||
}
|
return this.allRunners.reduce((sum, current) => sum + current.distance, 0);
|
||||||
return returnRunners;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* Returns the total donations a runner has collected based on his linked donations and distance ran.
|
||||||
* Returns the total distance ran by this group's runners based on all their valid scans.
|
*/
|
||||||
*/
|
@IsInt()
|
||||||
@IsInt()
|
public get distanceDonationAmount(): number {
|
||||||
public get distance(): number {
|
return this.allRunners.reduce((sum, current) => sum + current.distanceDonationAmount, 0);
|
||||||
return this.allRunners.reduce((sum, current) => sum + current.distance, 0);
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* Turns this entity into it's response class.
|
||||||
* Returns the total donations a runner has collected based on his linked donations and distance ran.
|
*/
|
||||||
*/
|
public toResponse(): ResponseRunnerOrganisation {
|
||||||
@IsInt()
|
return new ResponseRunnerOrganisation(this);
|
||||||
public get distanceDonationAmount(): number {
|
}
|
||||||
return this.allRunners.reduce((sum, current) => sum + current.distanceDonationAmount, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Turns this entity into it's response class.
|
|
||||||
*/
|
|
||||||
public toResponse(): ResponseRunnerOrganization {
|
|
||||||
return new ResponseRunnerOrganization(this);
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -2,7 +2,7 @@ import { IsNotEmpty } from "class-validator";
|
|||||||
import { ChildEntity, ManyToOne } from "typeorm";
|
import { ChildEntity, ManyToOne } from "typeorm";
|
||||||
import { ResponseRunnerTeam } from '../responses/ResponseRunnerTeam';
|
import { ResponseRunnerTeam } from '../responses/ResponseRunnerTeam';
|
||||||
import { RunnerGroup } from "./RunnerGroup";
|
import { RunnerGroup } from "./RunnerGroup";
|
||||||
import { RunnerOrganization } from "./RunnerOrganization";
|
import { RunnerOrganisation } from "./RunnerOrganisation";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the RunnerTeam entity.
|
* Defines the RunnerTeam entity.
|
||||||
@ -13,11 +13,11 @@ export class RunnerTeam extends RunnerGroup {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The team's parent group.
|
* The team's parent group.
|
||||||
* Every team has to be part of a runnerOrganization - this get's checked on creation and update.
|
* Every team has to be part of a runnerOrganisation - this get's checked on creation and update.
|
||||||
*/
|
*/
|
||||||
@IsNotEmpty()
|
@IsNotEmpty()
|
||||||
@ManyToOne(() => RunnerOrganization, org => org.teams, { nullable: true })
|
@ManyToOne(() => RunnerOrganisation, org => org.teams, { nullable: true })
|
||||||
parentGroup?: RunnerOrganization;
|
parentGroup?: RunnerOrganisation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turns this entity into it's response class.
|
* Turns this entity into it's response class.
|
||||||
|
@ -2,8 +2,6 @@ import {
|
|||||||
IsInt,
|
IsInt,
|
||||||
IsNotEmpty,
|
IsNotEmpty,
|
||||||
|
|
||||||
IsNumber,
|
|
||||||
|
|
||||||
IsPositive
|
IsPositive
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
import { ChildEntity, Column, ManyToOne } from "typeorm";
|
import { ChildEntity, Column, ManyToOne } from "typeorm";
|
||||||
@ -61,14 +59,6 @@ export class TrackScan extends Scan {
|
|||||||
@IsInt()
|
@IsInt()
|
||||||
timestamp: number;
|
timestamp: number;
|
||||||
|
|
||||||
/**
|
|
||||||
* The scan's lap time.
|
|
||||||
* This simply get's calculated from the last lap time;
|
|
||||||
*/
|
|
||||||
@Column()
|
|
||||||
@IsNumber()
|
|
||||||
lapTime: number;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turns this entity into it's response class.
|
* Turns this entity into it's response class.
|
||||||
*/
|
*/
|
||||||
|
@ -4,6 +4,7 @@ import {
|
|||||||
IsString
|
IsString
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
import { ChildEntity, Column } from "typeorm";
|
import { ChildEntity, Column } from "typeorm";
|
||||||
|
import { ResponsePrincipal } from '../responses/ResponsePrincipal';
|
||||||
import { ResponseUserGroup } from '../responses/ResponseUserGroup';
|
import { ResponseUserGroup } from '../responses/ResponseUserGroup';
|
||||||
import { Principal } from './Principal';
|
import { Principal } from './Principal';
|
||||||
|
|
||||||
@ -33,7 +34,7 @@ export class UserGroup extends Principal {
|
|||||||
/**
|
/**
|
||||||
* Turns this entity into it's response class.
|
* Turns this entity into it's response class.
|
||||||
*/
|
*/
|
||||||
public toResponse(): ResponseUserGroup {
|
public toResponse(): ResponsePrincipal {
|
||||||
return new ResponseUserGroup(this);
|
return new ResponseUserGroup(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,7 +0,0 @@
|
|||||||
/**
|
|
||||||
* This enum contains all status a donation can inherit regarding it's payment status.
|
|
||||||
*/
|
|
||||||
export enum DonationStatus {
|
|
||||||
OPEN = 'OPEN',
|
|
||||||
PAID = 'PAID'
|
|
||||||
}
|
|
@ -3,7 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
export enum PermissionTarget {
|
export enum PermissionTarget {
|
||||||
RUNNER = 'RUNNER',
|
RUNNER = 'RUNNER',
|
||||||
ORGANIZATION = 'ORGANIZATION',
|
ORGANISATION = 'ORGANISATION',
|
||||||
TEAM = 'TEAM',
|
TEAM = 'TEAM',
|
||||||
TRACK = 'TRACK',
|
TRACK = 'TRACK',
|
||||||
USER = 'USER',
|
USER = 'USER',
|
||||||
@ -14,7 +14,5 @@ export enum PermissionTarget {
|
|||||||
SCAN = 'SCAN',
|
SCAN = 'SCAN',
|
||||||
STATION = 'STATION',
|
STATION = 'STATION',
|
||||||
CARD = 'CARD',
|
CARD = 'CARD',
|
||||||
DONATION = 'DONATION',
|
DONATION = 'DONATION'
|
||||||
CONTACT = 'CONTACT',
|
|
||||||
MAIL = 'MAIL'
|
|
||||||
}
|
}
|
@ -1,39 +0,0 @@
|
|||||||
/**
|
|
||||||
* This enum contains all object types/entities a response can contain.
|
|
||||||
*/
|
|
||||||
export enum ResponseObjectType {
|
|
||||||
AUTH = 'AUTH',
|
|
||||||
DISTANCEDONATION = 'DISTANCEDONATION',
|
|
||||||
DONATION = 'DONATION',
|
|
||||||
DONOR = 'DONOR',
|
|
||||||
EMPTY = 'EMPTY',
|
|
||||||
GROUPCONTACT = 'GROUPCONTACT',
|
|
||||||
LOGOUT = 'LOGOUT',
|
|
||||||
PARTICIPANT = 'PARTICIPANT',
|
|
||||||
PERMISSION = 'PERMISSION',
|
|
||||||
PRINCIPAL = 'PRINCIPAL',
|
|
||||||
RUNNER = 'RUNNER',
|
|
||||||
RUNNERCARD = 'RUNNERCARD',
|
|
||||||
RUNNERGROUP = 'RUNNERGROUP',
|
|
||||||
RUNNERORGANIZATION = 'RUNNERORGANIZATION',
|
|
||||||
RUNNERTEAM = 'RUNNERTEAM',
|
|
||||||
SCAN = 'SCAN',
|
|
||||||
SCANSTATION = 'SCANSTATION',
|
|
||||||
SELFSERVICEDONATION = 'SELFSERVICEDONATION',
|
|
||||||
SELFSERVICERUNNER = 'SELFSERVICRUNNER',
|
|
||||||
SELFSERVICESCAN = 'SELFSERVICESCAN',
|
|
||||||
SELFSERVICETRACKSCAN = 'SELFSERVICETRACKSCAN',
|
|
||||||
SELFSERVICETEAM = 'SELFSERVICETEAM',
|
|
||||||
SELFSERVICEORGANIZATION = 'SELFSERVICEORGANIZATION',
|
|
||||||
STATS = 'STATS',
|
|
||||||
STATSCLIENT = 'STATSCLIENT',
|
|
||||||
STATSORGANIZATION = 'STATSORGANIZATION',
|
|
||||||
STATSRUNNER = 'STATSRUNNER',
|
|
||||||
STATSTEAM = 'STATSTEAM',
|
|
||||||
TRACK = 'TRACK',
|
|
||||||
TRACKSCAN = 'TRACKSCAN',
|
|
||||||
USER = 'USER',
|
|
||||||
USERGROUP = 'USERGROUP',
|
|
||||||
USERPERMISSIONS = 'USERPERMISSIONS',
|
|
||||||
SELFSERVICEDONOR = 'SELFSERVICEDONOR'
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Defines the repsonse interface.
|
|
||||||
* This forces all response classes to implement the interfaces properties.
|
|
||||||
*/
|
|
||||||
export interface IResponse {
|
|
||||||
/**
|
|
||||||
* The responseType.
|
|
||||||
* This contains the type of class/entity this response contains.
|
|
||||||
*/
|
|
||||||
responseType: ResponseObjectType;
|
|
||||||
}
|
|
@ -1,18 +1,9 @@
|
|||||||
import { IsInt, IsString } from 'class-validator';
|
import { IsInt, IsString } from 'class-validator';
|
||||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
|
|
||||||
import { IResponse } from './IResponse';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the repsonse auth.
|
* Defines the repsonse auth.
|
||||||
*/
|
*/
|
||||||
export class ResponseAuth implements IResponse {
|
export class ResponseAuth {
|
||||||
|
|
||||||
/**
|
|
||||||
* The responseType.
|
|
||||||
* This contains the type of class/entity this response contains.
|
|
||||||
*/
|
|
||||||
responseType: ResponseObjectType = ResponseObjectType.AUTH;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The access_token - JWT shortterm access token.
|
* The access_token - JWT shortterm access token.
|
||||||
*/
|
*/
|
||||||
|
@ -1,19 +1,12 @@
|
|||||||
import { IsInt, IsObject, IsPositive } from 'class-validator';
|
import { IsInt, IsObject, IsPositive } from 'class-validator';
|
||||||
import { DistanceDonation } from '../entities/DistanceDonation';
|
import { DistanceDonation } from '../entities/DistanceDonation';
|
||||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
|
|
||||||
import { IResponse } from './IResponse';
|
|
||||||
import { ResponseDonation } from './ResponseDonation';
|
import { ResponseDonation } from './ResponseDonation';
|
||||||
import { ResponseRunner } from './ResponseRunner';
|
import { ResponseRunner } from './ResponseRunner';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the distance donation response.
|
* Defines the distance donation response.
|
||||||
*/
|
*/
|
||||||
export class ResponseDistanceDonation extends ResponseDonation implements IResponse {
|
export class ResponseDistanceDonation extends ResponseDonation {
|
||||||
/**
|
|
||||||
* The responseType.
|
|
||||||
* This contains the type of class/entity this response contains.
|
|
||||||
*/
|
|
||||||
responseType: ResponseObjectType = ResponseObjectType.DISTANCEDONATION;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The donation's associated runner.
|
* The donation's associated runner.
|
||||||
@ -36,7 +29,7 @@ export class ResponseDistanceDonation extends ResponseDonation implements IRespo
|
|||||||
*/
|
*/
|
||||||
public constructor(donation: DistanceDonation) {
|
public constructor(donation: DistanceDonation) {
|
||||||
super(donation);
|
super(donation);
|
||||||
if (donation.runner) { this.runner = donation.runner.toResponse(); }
|
this.runner = donation.runner.toResponse();
|
||||||
this.amountPerDistance = donation.amountPerDistance;
|
this.amountPerDistance = donation.amountPerDistance;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,27 +1,11 @@
|
|||||||
import { IsInt, IsNotEmpty, IsPositive } from "class-validator";
|
import { IsInt, IsNotEmpty, IsPositive } from "class-validator";
|
||||||
import { Donation } from '../entities/Donation';
|
import { Donation } from '../entities/Donation';
|
||||||
import { DonationStatus } from '../enums/DonationStatus';
|
|
||||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
|
|
||||||
import { IResponse } from './IResponse';
|
|
||||||
import { ResponseDonor } from './ResponseDonor';
|
import { ResponseDonor } from './ResponseDonor';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the donation response.
|
* Defines the donation response.
|
||||||
*/
|
*/
|
||||||
export class ResponseDonation implements IResponse {
|
export class ResponseDonation {
|
||||||
|
|
||||||
/**
|
|
||||||
* The responseType.
|
|
||||||
* This contains the type of class/entity this response contains.
|
|
||||||
*/
|
|
||||||
responseType: ResponseObjectType = ResponseObjectType.DONATION;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The donation's payment status.
|
|
||||||
* Provides you with a quick indicator of it's payment status.
|
|
||||||
*/
|
|
||||||
status: DonationStatus;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The donation's id.
|
* The donation's id.
|
||||||
*/
|
*/
|
||||||
@ -41,28 +25,13 @@ export class ResponseDonation implements IResponse {
|
|||||||
@IsInt()
|
@IsInt()
|
||||||
amount: number;
|
amount: number;
|
||||||
|
|
||||||
/**
|
|
||||||
* The donation's paid amount in the smalles unit of your currency (default: euro cent).
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
paidAmount: number;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a ResponseDonation object from a scan.
|
* Creates a ResponseDonation object from a scan.
|
||||||
* @param donation The donation the response shall be build for.
|
* @param donation The donation the response shall be build for.
|
||||||
*/
|
*/
|
||||||
public constructor(donation: Donation) {
|
public constructor(donation: Donation) {
|
||||||
this.id = donation.id;
|
this.id = donation.id;
|
||||||
if (donation.donor) {
|
this.donor = donation.donor.toResponse();
|
||||||
this.donor = donation.donor.toResponse();
|
|
||||||
}
|
|
||||||
this.amount = donation.amount;
|
this.amount = donation.amount;
|
||||||
this.paidAmount = donation.paidAmount || 0;
|
|
||||||
if (this.paidAmount < this.amount) {
|
|
||||||
this.status = DonationStatus.OPEN;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this.status = DonationStatus.PAID;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,20 +2,12 @@ import {
|
|||||||
IsBoolean, IsInt
|
IsBoolean, IsInt
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
import { Donor } from '../entities/Donor';
|
import { Donor } from '../entities/Donor';
|
||||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
|
|
||||||
import { IResponse } from './IResponse';
|
|
||||||
import { ResponseDonation } from './ResponseDonation';
|
|
||||||
import { ResponseParticipant } from './ResponseParticipant';
|
import { ResponseParticipant } from './ResponseParticipant';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the donor response.
|
* Defines the donor response.
|
||||||
*/
|
*/
|
||||||
export class ResponseDonor extends ResponseParticipant implements IResponse {
|
export class ResponseDonor extends ResponseParticipant {
|
||||||
/**
|
|
||||||
* The responseType.
|
|
||||||
* This contains the type of class/entity this response contains.
|
|
||||||
*/
|
|
||||||
responseType: ResponseObjectType = ResponseObjectType.DONOR;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Does this donor need a receipt?
|
* Does this donor need a receipt?
|
||||||
@ -29,14 +21,6 @@ export class ResponseDonor extends ResponseParticipant implements IResponse {
|
|||||||
@IsInt()
|
@IsInt()
|
||||||
donationAmount: number;
|
donationAmount: number;
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the total paid donations of a donor based on his linked donations.
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
paidDonationAmount: number;
|
|
||||||
|
|
||||||
donations: Array<ResponseDonation>;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a ResponseRunner object from a runner.
|
* Creates a ResponseRunner object from a runner.
|
||||||
* @param runner The user the response shall be build for.
|
* @param runner The user the response shall be build for.
|
||||||
@ -45,12 +29,5 @@ export class ResponseDonor extends ResponseParticipant implements IResponse {
|
|||||||
super(donor);
|
super(donor);
|
||||||
this.receiptNeeded = donor.receiptNeeded;
|
this.receiptNeeded = donor.receiptNeeded;
|
||||||
this.donationAmount = donor.donationAmount;
|
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())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,17 +1,9 @@
|
|||||||
import { IsString } from 'class-validator';
|
import { IsString } from 'class-validator';
|
||||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
|
|
||||||
import { IResponse } from './IResponse';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines a empty response object.
|
* Defines a empty response object.
|
||||||
*/
|
*/
|
||||||
export class ResponseEmpty implements IResponse {
|
export class ResponseEmpty {
|
||||||
/**
|
|
||||||
* The responseType.
|
|
||||||
* This contains the type of class/entity this response contains.
|
|
||||||
*/
|
|
||||||
responseType: ResponseObjectType = ResponseObjectType.EMPTY;
|
|
||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
response: string = "nothing here"
|
response: string = "nothing here"
|
||||||
}
|
}
|
||||||
|
@ -1,86 +0,0 @@
|
|||||||
import { IsInt, IsObject, IsString } from "class-validator";
|
|
||||||
import { Address } from '../entities/Address';
|
|
||||||
import { GroupContact } from '../entities/GroupContact';
|
|
||||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
|
|
||||||
import { IResponse } from './IResponse';
|
|
||||||
import { ResponseRunnerGroup } from './ResponseRunnerGroup';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Defines the group contact response.
|
|
||||||
*/
|
|
||||||
export class ResponseGroupContact implements IResponse {
|
|
||||||
/**
|
|
||||||
* The responseType.
|
|
||||||
* This contains the type of class/entity this response contains.
|
|
||||||
*/
|
|
||||||
responseType: ResponseObjectType = ResponseObjectType.GROUPCONTACT;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's id.
|
|
||||||
*/
|
|
||||||
@IsInt()
|
|
||||||
id: number;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's first name.
|
|
||||||
*/
|
|
||||||
@IsString()
|
|
||||||
firstname: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's middle name.
|
|
||||||
*/
|
|
||||||
@IsString()
|
|
||||||
middlename?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's last name.
|
|
||||||
*/
|
|
||||||
@IsString()
|
|
||||||
lastname: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's phone number.
|
|
||||||
*/
|
|
||||||
@IsString()
|
|
||||||
phone?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's e-mail address.
|
|
||||||
*/
|
|
||||||
@IsString()
|
|
||||||
email?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's associated runner groups.
|
|
||||||
*/
|
|
||||||
@IsObject()
|
|
||||||
groups: ResponseRunnerGroup[];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The contact's address.
|
|
||||||
* This is a address object to prevent any formatting differences.
|
|
||||||
*/
|
|
||||||
@IsObject()
|
|
||||||
address?: Address;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a ResponseGroupContact object from a contact.
|
|
||||||
* @param contact The contact the response shall be build for.
|
|
||||||
*/
|
|
||||||
public constructor(contact: GroupContact) {
|
|
||||||
this.id = contact.id;
|
|
||||||
this.firstname = contact.firstname;
|
|
||||||
this.middlename = contact.middlename;
|
|
||||||
this.lastname = contact.lastname;
|
|
||||||
this.phone = contact.phone;
|
|
||||||
this.email = contact.email;
|
|
||||||
this.address = contact.address;
|
|
||||||
this.groups = new Array<ResponseRunnerGroup>();
|
|
||||||
if (contact.groups) {
|
|
||||||
for (let group of contact.groups) {
|
|
||||||
this.groups.push(group.toResponse());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user