Compare commits
	
		
			229 Commits
		
	
	
		
			v0.6.1
			...
			0c763a2dfd
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0c763a2dfd | |||
| a7297ff933 | |||
| 4cdba8bc77 | |||
| 77c6303014 | |||
| 2b641faa29 | |||
| 9fa8b93c08 | |||
| 4b676bc853 | |||
| 4433ddb1e1 | |||
| 39aa7598b7 | |||
| 19a290c3a9 | |||
| 9bc80aac8a | |||
| e184673963 | |||
| 68cd746a9f | |||
| 69651d9f6c | |||
| 6fd246f43c | |||
| ae14d6c74f | |||
| 2fa56b82d1 | |||
| 9cc66eebdf | |||
| 4c10e20b91 | |||
| 9217421221 | |||
| 4570845b3e | |||
| 0e78951300 | |||
| 6ad56b3126 | |||
| d95c6d3365 | |||
| 1f2c8abb22 | |||
| a6d5693ccd | |||
| 31b258b4ce | |||
| f19f2808d8 | |||
| 3b9cd2e1bb | |||
| 95320ca1bc | |||
| f2d127fc98 | |||
| eb526fb57f | |||
| 348fe52c42 | |||
| eef0fa6952 | |||
| 8a82e059b7 | |||
| 2229cdf20d | |||
| 3220b194d4 | |||
| 278c4a6a41 | |||
| ec50ac31c4 | |||
| a2f0d814fc | |||
| 6468b35708 | |||
| 3558e99090 | |||
| 520608aef0 | |||
| 6df5f634f3 | |||
| da266a8dd6 | |||
| 8ae4b85827 | |||
| 8fe3243693 | |||
| 49b174f29f | |||
| 30c6d3d8db | |||
| 6c14ed9c89 | |||
| 01ed51489e | |||
| 0636616dad | |||
| 34dbaaafe0 | |||
| b4c31ee9b5 | |||
| 99307423c5 | |||
| 71542bc388 | |||
| d64f470b60 | |||
| b8fbb72fa0 | |||
| 0c61ff457d | |||
| 1d82f65b0d | |||
| 610988ec16 | |||
| 6e236ede14 | |||
| b7ad5d3a31 | |||
| a694ad225c | |||
| 5633e85f41 | |||
| 95e1eec313 | |||
| 377d5dadb2 | |||
| 4a294b1e17 | |||
| 720774fcf4 | |||
| dcdbdd15ac | |||
| 132b48cf2a | |||
| 23bd432c5f | |||
| 71b33ab05b | |||
| 87f444c30d | |||
| 4a73eab134 | |||
| f8baca5ab2 | |||
| 10221b9f2e | |||
| 1d8c8c8e9c | |||
| 4603a84f16 | |||
| 2cd8f3f7f3 | |||
| 107eeeae7f | |||
| b8767b8bd4 | |||
| bf686e89e0 | |||
| 6163f0a90b | |||
| 8f0f795a70 | |||
| 22cae39bd3 | |||
| 0b07a53ed2 | |||
| d4a02e7db2 | |||
| b9a7dc84f0 | |||
| 7111068361 | |||
| 63964fbf2c | |||
| cbcb829fbd | |||
| 057ae0d797 | |||
| 257f320ee3 | |||
| 7b15c2d88b | |||
| 988f17a795 | |||
| 4471e57438 | |||
| 51daf969cf | |||
| cb71fcd13b | |||
| a6a526dc5d | |||
| dd6d799c84 | |||
| e89e07d0fc | |||
| c28843c405 | |||
| 4834a6698b | |||
| 69afd4d587 | |||
| 24d152fdc8 | |||
| 4279e43743 | |||
| d837654617 | |||
| 0767943721 | |||
| ca87774767 | |||
| f693f2cde9 | |||
| d70c5b1bbc | |||
| 71e3d0efe2 | |||
| b517dff8a8 | |||
| 114c246ace | |||
| d7703c9e07 | |||
| dc3071f7d2 | |||
| 5fb355f450 | |||
| 33c13de32c | |||
| 1be073a4fa | |||
| b0d8249452 | |||
| 7af883f271 | |||
| f5433076b0 | |||
| 6aafe4a6ae | |||
| bdeeb03645 | |||
| 675c8762e8 | |||
| 89e392473c | |||
| 6c9b91d75a | |||
| 8c00aefd6c | |||
| 3afd785a54 | |||
| 8099999e2c | |||
| a139554e05 | |||
| 0290b0e5f5 | |||
| 0f7fa990d4 | |||
| 2f568c9cb8 | |||
| 1cb2dc9d53 | |||
| 6005b0661f | |||
| 5a36c8dcae | |||
| 58f4d2151f | |||
| 95135ddc89 | |||
| a7fe1e1759 | |||
| 56a5f41686 | |||
| c23b4d907f | |||
| bd7b81efe7 | |||
| 274a146b9b | |||
| 5a3fc5b2bd | |||
| 070560e863 | |||
| 536900091a | |||
| 8154e715bb | |||
| 4c6665062f | |||
| cb3ea9b1eb | |||
| 7a64f23937 | |||
| 96ba25ec6c | |||
| e6a8ebcb5b | |||
| 888cab5898 | |||
| 383a8095b8 | |||
| 63f6526e4f | |||
| b24e24ff7d | |||
| 9ce35d8eb7 | |||
| 48a87e8936 | |||
| b8c28ebb08 | |||
| 5daaa3a73c | |||
| 24c38cce26 | |||
| bd00f4f8d5 | |||
| 03d76e6d0b | |||
| 3f8e8ce3a6 | |||
| c9bd6de476 | |||
| e702118d4d | |||
| 97159dd9f8 | |||
| 942d9dbc76 | |||
| 88844e1a44 | |||
| e76a9cef95 | |||
| 20aeed8778 | |||
| ccb7ae29a3 | |||
| dcb12b0ac2 | |||
| dd1258333e | |||
| 3ef3a94b20 | |||
| 135852eb9a | |||
| 963253cbc8 | |||
| 539a6509b1 | |||
| f3d73d5346 | |||
| f159252651 | |||
| 6ab60998d4 | |||
| 30d220bc36 | |||
| 24aff3bac4 | |||
| ce63043887 | |||
| e40017a6b8 | |||
| e843a464e7 | |||
| d0ae50d557 | |||
| 7a49e7c5c9 | |||
| 1dd64204cc | |||
| 438ff0fc3f | |||
| c1bbda51f0 | |||
| 4705a39aab | |||
| 4d721f62d9 | |||
| b0328ffdaf | |||
| 031cede542 | |||
| 3c69f8c4a8 | |||
| cc6568c381 | |||
| a3a1395a46 | |||
| b08acc6660 | |||
| 7a303c2b2c | |||
| 3f9a7049e3 | |||
| 6249419fae | |||
| f347b7ad49 | |||
| 74faec85c8 | |||
| fbdadbef1f | |||
| c87c97c90f | |||
| a6bca59ffe | |||
| 732a1b88d9 | |||
| 4c960feeb2 | |||
| 72fee96a08 | |||
| fcb43f92b0 | |||
| 5ba8f1dd44 | |||
| 3d3790c2eb | |||
| 1fa3fa75ee | |||
| c8882ae6a1 | |||
| 673e896aa3 | |||
| 0ed7f78b2c | |||
| 1d38d308ad | |||
| d709ee7479 | |||
| aae042c041 | |||
| ca7a84eb3e | |||
| 1f32ed0727 | |||
| 289f9e2196 | |||
| 937a9fad4d | |||
| 7c3a1b8fff | |||
| a8ea4fa659 | |||
| c1dd4518d1 | 
							
								
								
									
										89
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										89
									
								
								.drone.yml
									
									
									
									
									
								
							| @@ -19,10 +19,17 @@ get: | |||||||
|   path: odit-git-bot |   path: odit-git-bot | ||||||
|   name: sshkey |   name: sshkey | ||||||
|  |  | ||||||
|  | --- | ||||||
|  | kind: secret | ||||||
|  | name: ci_token | ||||||
|  | get: | ||||||
|  |   path: odit-ci-bot | ||||||
|  |   name: apikey | ||||||
|  |  | ||||||
| --- | --- | ||||||
| kind: pipeline | kind: pipeline | ||||||
| type: kubernetes | type: kubernetes | ||||||
| name: tests:node_latest | name: tests:node | ||||||
| clone: | clone: | ||||||
|   disable: true |   disable: true | ||||||
| steps: | steps: | ||||||
| @@ -32,7 +39,7 @@ steps: | |||||||
|       - git clone $DRONE_REMOTE_URL . |       - git clone $DRONE_REMOTE_URL . | ||||||
|       - git checkout $DRONE_SOURCE_BRANCH |       - git checkout $DRONE_SOURCE_BRANCH | ||||||
|   - name: run tests |   - name: run tests | ||||||
|     image: node:latest |     image: registry.odit.services/hub/library/node:19.5.0-alpine3.16 | ||||||
|     commands: |     commands: | ||||||
|       - yarn |       - yarn | ||||||
|       - yarn test:ci |       - yarn test:ci | ||||||
| @@ -54,53 +61,23 @@ steps: | |||||||
|       - git clone $DRONE_REMOTE_URL . |       - git clone $DRONE_REMOTE_URL . | ||||||
|       - git checkout dev |       - git checkout dev | ||||||
|   - name: build dev |   - name: build dev | ||||||
|     image: plugins/docker |     depends_on: ["clone"] | ||||||
|     depends_on: [clone] |     image: registry.odit.services/library/drone-kaniko | ||||||
|     settings: |     settings: | ||||||
|       username: |       username: | ||||||
|         from_secret: docker_username |         from_secret: docker_username | ||||||
|       password: |       password: | ||||||
|         from_secret: docker_password |         from_secret: docker_password | ||||||
|       repo: registry.odit.services/lfk/backend |       build_args: | ||||||
|  |         - NPM_REGISTRY_DOMAIN: | ||||||
|  |           from_secret: npmjs_domain | ||||||
|  |         - NPM_REGISTRY_TOKEN: | ||||||
|  |           from_secret: npmjs_token | ||||||
|  |       repo: lfk/backend | ||||||
|       tags: |       tags: | ||||||
|         - dev |         - dev | ||||||
|  |       cache: true | ||||||
|       registry: registry.odit.services |       registry: registry.odit.services | ||||||
|       mtu: 1000 |  | ||||||
|   - 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: git_ssh |  | ||||||
|   - 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: git_ssh |  | ||||||
|  |  | ||||||
|  |  | ||||||
| trigger: | trigger: | ||||||
|   branch: |   branch: | ||||||
| @@ -125,17 +102,22 @@ steps: | |||||||
|       - git checkout main |       - git checkout main | ||||||
|   - name: build latest |   - name: build latest | ||||||
|     depends_on: ["clone"] |     depends_on: ["clone"] | ||||||
|     image: plugins/docker |     image: registry.odit.services/library/drone-kaniko | ||||||
|     settings: |     settings: | ||||||
|       username: |       username: | ||||||
|         from_secret: docker_username |         from_secret: docker_username | ||||||
|       password: |       password: | ||||||
|         from_secret: docker_password |         from_secret: docker_password | ||||||
|       repo: registry.odit.services/lfk/backend |       build_args: | ||||||
|  |         - NPM_REGISTRY_DOMAIN: | ||||||
|  |           from_secret: npmjs_domain | ||||||
|  |         - NPM_REGISTRY_TOKEN: | ||||||
|  |           from_secret: npmjs_token | ||||||
|  |       repo: lfk/backend | ||||||
|       tags: |       tags: | ||||||
|         - latest |         - latest | ||||||
|  |       cache: true | ||||||
|       registry: registry.odit.services |       registry: registry.odit.services | ||||||
|       mtu: 1000 |  | ||||||
|   - name: push merge to repo |   - name: push merge to repo | ||||||
|     depends_on: ["clone"] |     depends_on: ["clone"] | ||||||
|     image: appleboy/drone-git-push |     image: appleboy/drone-git-push | ||||||
| @@ -159,30 +141,35 @@ name: build:tags | |||||||
|  |  | ||||||
| steps: | steps: | ||||||
|   - name: build $DRONE_TAG |   - name: build $DRONE_TAG | ||||||
|     image: plugins/docker |     depends_on: ["clone"] | ||||||
|     depends_on: [clone] |     image: registry.odit.services/library/drone-kaniko | ||||||
|     settings: |     settings: | ||||||
|       username: |       username: | ||||||
|         from_secret: docker_username |         from_secret: docker_username | ||||||
|       password: |       password: | ||||||
|         from_secret: docker_password |         from_secret: docker_password | ||||||
|       repo: registry.odit.services/lfk/backend |       build_args: | ||||||
|  |         - NPM_REGISTRY_DOMAIN: | ||||||
|  |           from_secret: npmjs_domain | ||||||
|  |         - NPM_REGISTRY_TOKEN: | ||||||
|  |           from_secret: npmjs_token | ||||||
|  |       repo: lfk/backend | ||||||
|       tags: |       tags: | ||||||
|         - '${DRONE_TAG}' |         - "${DRONE_TAG}" | ||||||
|  |       cache: true | ||||||
|       registry: registry.odit.services |       registry: registry.odit.services | ||||||
|       mtu: 1000 |  | ||||||
|   - name: trigger node lib build |   - name: trigger node lib build | ||||||
|     image: idcooldi/drone-webhook |     image: idcooldi/drone-webhook | ||||||
|     settings: |     settings: | ||||||
|       urls: https://ci.odit.services/api/repos/lfk/lfk-client-node/builds?SOURCE_TAG=${DRONE_TAG} |       urls: https://ci.odit.services/api/repos/lfk/lfk-client-node/builds?SOURCE_TAG=${DRONE_TAG} | ||||||
|       bearer: |       bearer: | ||||||
|         from_secret: BOT_DRONE_KEY |         from_secret: ci_token | ||||||
|   - 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: BOT_DRONE_KEY |         from_secret: ci_token | ||||||
| trigger: | trigger: | ||||||
|   event: |   event: | ||||||
|     - tag |     - tag | ||||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -136,3 +136,4 @@ build | |||||||
| lib | lib | ||||||
| /oss-attribution | /oss-attribution | ||||||
| *.tmp | *.tmp | ||||||
|  | pnpm-lock.yaml | ||||||
|   | |||||||
							
								
								
									
										307
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										307
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,8 +2,308 @@ | |||||||
|  |  | ||||||
| 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. | ||||||
|  |  | ||||||
| #### [v0.6.1](https://git.odit.services/lfk/backend/compare/v0.5.0...v0.6.1) | #### [v0.13.0](https://git.odit.services/lfk/backend/compare/v0.12.0...v0.13.0) | ||||||
|  |  | ||||||
|  | - 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) | ||||||
|  | - 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) | - 📖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) | - 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) | - Updated ci with new kubernetes secrets 🚀🚀🚀 [`5541ae6`](https://git.odit.services/lfk/backend/commit/5541ae6ebd7f36f4482ae752f358102a18b95de0) | ||||||
| @@ -17,12 +317,12 @@ All notable changes to this project will be documented in this file. Dates are d | |||||||
| - Implemented the "real" errors [`e26b7d4`](https://git.odit.services/lfk/backend/commit/e26b7d4923777a3013368e29c122709de7e1d9da) | - 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) | - 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) | - 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) | - 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) | - 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) | - 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) | - 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] [`a7958ee`](https://git.odit.services/lfk/backend/commit/a7958eecd65116ab937f640cbebcae1962cb86c8) | ||||||
| - 🧾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] [`076aa87`](https://git.odit.services/lfk/backend/commit/076aa87dba1d6fc544e76c16f99c64d37fc82ea0) | - 🧾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) | - 🧾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) | - Updated request timeout [`ffcd45e`](https://git.odit.services/lfk/backend/commit/ffcd45e5724fccdec9b1dbc48f1320525dcd7288) | ||||||
| @@ -30,16 +330,17 @@ All notable changes to this project will be documented in this file. Dates are d | |||||||
| - 🚀Bumped version to v0.6.1 [`ce3ca9f`](https://git.odit.services/lfk/backend/commit/ce3ca9f1c86a6fe72e4dd77e3a0d60bf1e1bf542) | - 🚀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) | - 🚀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) | - 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) | - 🧾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) | - 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) | - 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) | - 🧾New changelog file version [CI SKIP] [skip ci] [`bf71e35`](https://git.odit.services/lfk/backend/commit/bf71e35ecd333d888d63213d69b04fc681a9d0bd) | ||||||
| - Changed endpoint url to avoid conflicts [`e5dab34`](https://git.odit.services/lfk/backend/commit/e5dab3469c3cef6298fc8deb1192a38f7d18406b) |  | ||||||
| - Adjusted tests for the new testing env [`9292027`](https://git.odit.services/lfk/backend/commit/92920273bec409563d1e38ea27f4d30f893598e8) | - 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) | - Applied Docker MTU fix 🛠 [`f7af777`](https://git.odit.services/lfk/backend/commit/f7af77710421d7aae5efb048e0622cd067fc20eb) | ||||||
| - Updated description [`94001a4`](https://git.odit.services/lfk/backend/commit/94001a48f1b314e91ea5ec982e5585124f9541b6) | - 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) | - 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) | - 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 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) | - 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) | - Updated to new responsetype [`08957d4`](https://git.odit.services/lfk/backend/commit/08957d4dc2951cfeec56a54680c2ae4ef1525ab2) | ||||||
|   | |||||||
							
								
								
									
										13
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								Dockerfile
									
									
									
									
									
								
							| @@ -1,16 +1,15 @@ | |||||||
| # Typescript Build | # Typescript Build | ||||||
| FROM node:14.15.1-alpine3.12 | FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 | ||||||
| WORKDIR /app | WORKDIR /app | ||||||
| COPY package.json ./ | COPY package.json ./ | ||||||
| RUN npm i -g pnpm | RUN npx pnpm@7.26.3 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 npm run build | ||||||
|  |  | ||||||
| # final image | # final image | ||||||
| FROM node:14.15.1-alpine3.12 | FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 | ||||||
| COPY package.json ormconfig.js ./ | COPY package.json ormconfig.js ./ | ||||||
| RUN npm i -g pnpm | RUN npx pnpm@7.26.3 i --prod | ||||||
| RUN pnpm i --prod |  | ||||||
| COPY --from=0 /app/dist dist | COPY --from=0 /app/dist dist | ||||||
| ENTRYPOINT ["node", "dist/app.js"] | ENTRYPOINT ["node", "dist/app.js"] | ||||||
							
								
								
									
										36
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								README.md
									
									
									
									
									
								
							| @@ -51,23 +51,23 @@ yarn docs | |||||||
| > You can provide them via .env file or docker env vars. | > 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). | > 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 | | Name                   | Type               | Default              | Description                                                                                                    | | ||||||
| | - | - | - | - | | ---------------------- | ------------------ | -------------------- | -------------------------------------------------------------------------------------------------------------- | | ||||||
| | APP_PORT | Number | 4010 | The port the backend server listens on. Is optional. | | 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_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_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_PORT                | String             | N/A                  | The db's port                                                                                                  | | ||||||
| | DB_USER | String | N/A | The user for accessing the db | | 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_PASSWORD            | String             | N/A                  | The user's password for accessing the db                                                                       | | ||||||
| | DB_NAME | String | N/A | The db's name | | 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. | | 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 | | 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 | | 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 | | 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_URL             | String(Url)        | N/A                  | The mailer's base url (no trailing slash)                                                                      | | ||||||
| | MAILER_KEY | String | N/A | The mailer's api key. | | 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) | | 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) | | PRIVACY_URL            | String(Url)        | /privacy             | The link to a privacy page for the system (Defaults to the frontend's privacy page)                            | | ||||||
|  |  | ||||||
|  |  | ||||||
| ## Recommended Editor | ## Recommended Editor | ||||||
| @@ -85,8 +85,8 @@ yarn docs | |||||||
|    * A new release tag automaticly triggers the release ci pipeline |    * A new release tag automaticly triggers the release ci pipeline | ||||||
| * main: Protected "release" branch | * main: Protected "release" branch | ||||||
|    * The latest tag of the docker image get's build from this |    * The latest tag of the docker image get's build from this | ||||||
|    * New releases get created as tags from this    |  | ||||||
| * dev: Current dev branch for merging the different feature branches and bugfixes | * dev: Current dev branch for merging the different feature branches and bugfixes | ||||||
|  |    * New releases get created as tags from this    | ||||||
|    * The dev tag of the docker image get's build from this |    * The dev tag of the docker image get's build from this | ||||||
|    * Only push minor changes to this branch! |    * Only push minor changes to this branch! | ||||||
|    * To merge a feature branch into this please create a pull request |    * To merge a feature branch into this please create a pull request | ||||||
|   | |||||||
| @@ -11,8 +11,12 @@ services: | |||||||
|       DB_PORT: bla |       DB_PORT: bla | ||||||
|       DB_USER: bla |       DB_USER: bla | ||||||
|       DB_PASSWORD: bla |       DB_PASSWORD: bla | ||||||
|       DB_NAME: dev.sqlite |       DB_NAME: ./db.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 | ||||||
|   | |||||||
							
								
								
									
										146
									
								
								licenses.md
									
									
									
									
									
								
							
							
						
						
									
										146
									
								
								licenses.md
									
									
									
									
									
								
							| @@ -115,6 +115,35 @@ 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] | ||||||
| @@ -415,6 +444,25 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |||||||
| **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 | ||||||
| @@ -667,6 +715,75 @@ 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] | ||||||
| @@ -897,6 +1014,35 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |||||||
|     SOFTWARE |     SOFTWARE | ||||||
|   |   | ||||||
|  |  | ||||||
|  | # auto-changelog | ||||||
|  | **Author**: Pete Cook <pete@cookpete.com> (https://github.com/cookpete) | ||||||
|  | **Repo**: [object Object] | ||||||
|  | **License**: MIT | ||||||
|  | **Description**: Command line tool for generating a changelog from git tags and commit history | ||||||
|  | ## License Text | ||||||
|  | The MIT License | ||||||
|  |  | ||||||
|  | Copyright (c) 2017 Pete Cook https://cookpete.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. | ||||||
|  |   | ||||||
|  |  | ||||||
| # cp-cli | # cp-cli | ||||||
| **Author**: undefined | **Author**: undefined | ||||||
| **Repo**: [object Object] | **Repo**: [object Object] | ||||||
|   | |||||||
							
								
								
									
										95
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										95
									
								
								package.json
									
									
									
									
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "@odit/lfk-backend", |   "name": "@odit/lfk-backend", | ||||||
|   "version": "0.6.1", |   "version": "0.13.0", | ||||||
|   "main": "src/app.ts", |   "main": "src/app.ts", | ||||||
|   "repository": "https://git.odit.services/lfk/backend", |   "repository": "https://git.odit.services/lfk/backend", | ||||||
|   "author": { |   "author": { | ||||||
| @@ -23,51 +23,54 @@ | |||||||
|   "license": "CC-BY-NC-SA-4.0", |   "license": "CC-BY-NC-SA-4.0", | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@odit/class-validator-jsonschema": "2.1.1", |     "@odit/class-validator-jsonschema": "2.1.1", | ||||||
|     "argon2": "^0.27.1", |     "argon2": "0.27.1", | ||||||
|     "axios": "^0.21.1", |     "axios": "0.21.1", | ||||||
|     "body-parser": "^1.19.0", |     "body-parser": "1.19.0", | ||||||
|  |     "check-password-strength": "2.0.2", | ||||||
|     "class-transformer": "0.3.1", |     "class-transformer": "0.3.1", | ||||||
|     "class-validator": "^0.13.1", |     "class-validator": "0.13.1", | ||||||
|     "consola": "^2.15.0", |     "consola": "2.15.0", | ||||||
|     "cookie": "^0.4.1", |     "cookie": "0.4.1", | ||||||
|     "cookie-parser": "^1.4.5", |     "cookie-parser": "1.4.5", | ||||||
|     "cors": "^2.8.5", |     "cors": "2.8.5", | ||||||
|     "csvtojson": "^2.0.10", |     "csvtojson": "2.0.10", | ||||||
|     "dotenv": "^8.2.0", |     "dotenv": "8.2.0", | ||||||
|     "express": "^4.17.1", |     "express": "4.17.1", | ||||||
|     "jsonwebtoken": "^8.5.1", |     "jsonwebtoken": "8.5.1", | ||||||
|     "libphonenumber-js": "^1.9.9", |     "libphonenumber-js": "1.9.9", | ||||||
|     "mysql": "^2.18.1", |     "mysql": "2.18.1", | ||||||
|     "pg": "^8.5.1", |     "pg": "8.5.1", | ||||||
|     "reflect-metadata": "^0.1.13", |     "reflect-metadata": "0.1.13", | ||||||
|     "routing-controllers": "0.9.0-alpha.6", |     "routing-controllers": "0.9.0-alpha.6", | ||||||
|     "routing-controllers-openapi": "^2.2.0", |     "routing-controllers-openapi": "2.2.0", | ||||||
|     "sqlite3": "5.0.0", |     "sqlite3": "5.0.0", | ||||||
|     "typeorm": "^0.2.30", |     "typeorm": "0.2.30", | ||||||
|     "typeorm-routing-controllers-extensions": "^0.2.0", |     "typeorm-routing-controllers-extensions": "0.2.0", | ||||||
|     "typeorm-seeding": "^1.6.1", |     "typeorm-seeding": "1.6.1", | ||||||
|     "uuid": "^8.3.2", |     "uuid": "8.3.2", | ||||||
|     "validator": "^13.5.2" |     "validator": "13.5.2" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@odit/license-exporter": "^0.0.9", |     "@faker-js/faker": "^7.6.0", | ||||||
|     "@types/cors": "^2.8.9", |     "@odit/license-exporter": "0.0.9", | ||||||
|     "@types/csvtojson": "^1.1.5", |     "@types/cors": "2.8.9", | ||||||
|     "@types/express": "^4.17.11", |     "@types/csvtojson": "1.1.5", | ||||||
|     "@types/jest": "^26.0.20", |     "@types/express": "4.17.11", | ||||||
|     "@types/jsonwebtoken": "^8.5.0", |     "@types/jest": "26.0.20", | ||||||
|     "@types/node": "^14.14.22", |     "@types/jsonwebtoken": "8.5.0", | ||||||
|     "@types/uuid": "^8.3.0", |     "@types/node": "14.14.22", | ||||||
|     "cp-cli": "^2.0.0", |     "@types/uuid": "8.3.0", | ||||||
|     "jest": "^26.6.3", |     "auto-changelog": "^2.4.0", | ||||||
|     "nodemon": "^2.0.7", |     "cp-cli": "2.0.0", | ||||||
|     "release-it": "^14.2.2", |     "jest": "26.6.3", | ||||||
|     "rimraf": "^3.0.2", |     "nodemon": "2.0.7", | ||||||
|     "start-server-and-test": "^1.11.7", |     "release-it": "14.2.2", | ||||||
|     "ts-jest": "^26.5.0", |     "rimraf": "3.0.2", | ||||||
|     "ts-node": "^9.1.1", |     "start-server-and-test": "1.11.7", | ||||||
|     "typedoc": "^0.20.19", |     "ts-jest": "26.5.0", | ||||||
|     "typescript": "^4.1.3" |     "ts-node": "9.1.1", | ||||||
|  |     "typedoc": "0.20.19", | ||||||
|  |     "typescript": "4.1.3" | ||||||
|   }, |   }, | ||||||
|   "scripts": { |   "scripts": { | ||||||
|     "dev": "nodemon src/app.ts", |     "dev": "nodemon src/app.ts", | ||||||
| @@ -81,6 +84,7 @@ | |||||||
|     "seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed", |     "seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed", | ||||||
|     "openapi:export": "ts-node scripts/openapi_export.ts", |     "openapi:export": "ts-node scripts/openapi_export.ts", | ||||||
|     "licenses:export": "license-exporter --markdown", |     "licenses:export": "license-exporter --markdown", | ||||||
|  |     "changelog:export": "auto-changelog --commit-limit false -p -u --hide-credit", | ||||||
|     "release": "release-it --only-version" |     "release": "release-it --only-version" | ||||||
|   }, |   }, | ||||||
|   "release-it": { |   "release-it": { | ||||||
| @@ -89,11 +93,16 @@ | |||||||
|       "requireCleanWorkingDir": false, |       "requireCleanWorkingDir": false, | ||||||
|       "commitMessage": "🚀Bumped version to v${version}", |       "commitMessage": "🚀Bumped version to v${version}", | ||||||
|       "requireBranch": "dev", |       "requireBranch": "dev", | ||||||
|       "push": false, |       "push": true, | ||||||
|       "tag": false |       "tag": true, | ||||||
|  |       "tagName": "v${version}", | ||||||
|  |       "tagAnnotation": "v${version}" | ||||||
|     }, |     }, | ||||||
|     "npm": { |     "npm": { | ||||||
|       "publish": false |       "publish": false | ||||||
|  |     }, | ||||||
|  |     "hooks": { | ||||||
|  |       "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md" | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "nodemonConfig": { |   "nodemonConfig": { | ||||||
|   | |||||||
| @@ -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 { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors'; | import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, 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('/') | 	@Get('/permissions') | ||||||
| 	@ResponseSchema(ResponseUserPermissions) | 	@ResponseSchema(ResponseUserPermissions) | ||||||
| 	@ResponseSchema(UserNotFoundError, { statusCode: 404 }) | 	@ResponseSchema(UserNotFoundError, { statusCode: 404 }) | ||||||
| 	@OnUndefined(UserNotFoundError) | 	@OnUndefined(UserNotFoundError) | ||||||
| @@ -48,6 +48,10 @@ 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'] }); | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ export class RunnerCardController { | |||||||
| 	@OpenAPI({ description: 'Lists all card.' }) | 	@OpenAPI({ description: 'Lists all card.' }) | ||||||
| 	async getAll() { | 	async getAll() { | ||||||
| 		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); | 		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); | ||||||
| 		const cards = await this.cardRepository.find({ relations: ['runner'] }); | 		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||||
| 		cards.forEach(card => { | 		cards.forEach(card => { | ||||||
| 			responseCards.push(new ResponseRunnerCard(card)); | 			responseCards.push(new ResponseRunnerCard(card)); | ||||||
| 		}); | 		}); | ||||||
| @@ -42,11 +42,36 @@ export class RunnerCardController { | |||||||
| 	@OnUndefined(RunnerCardNotFoundError) | 	@OnUndefined(RunnerCardNotFoundError) | ||||||
| 	@OpenAPI({ description: "Lists all information about the card whose id got provided." }) | 	@OpenAPI({ description: "Lists all information about the card whose id got provided." }) | ||||||
| 	async getOne(@Param('id') id: number) { | 	async getOne(@Param('id') id: number) { | ||||||
| 		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner'] }); | 		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||||
| 		if (!card) { throw new RunnerCardNotFoundError(); } | 		if (!card) { throw new RunnerCardNotFoundError(); } | ||||||
| 		return card.toResponse(); | 		return card.toResponse(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	@Post('/bulk') | ||||||
|  | 	@Authorized("CARD:CREATE") | ||||||
|  | 	@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) { | ||||||
|  | 		let createPromises = new Array<any>(); | ||||||
|  | 		for (let index = 0; index < count; index++) { | ||||||
|  | 			createPromises.push(this.cardRepository.save({ runner: null, enabled: true })) | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		const cards = await Promise.all(createPromises); | ||||||
|  |  | ||||||
|  | 		if (returnCards) { | ||||||
|  | 			let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); | ||||||
|  | 			for await (let card of cards) { | ||||||
|  | 				let dbCard = await this.cardRepository.findOne({ id: card.id }); | ||||||
|  | 				responseCards.push(new ResponseRunnerCard(dbCard)); | ||||||
|  | 			} | ||||||
|  | 			return responseCards; | ||||||
|  | 		} | ||||||
|  | 		let response = new ResponseEmpty(); | ||||||
|  | 		response.response = `Created ${count} new blanco cards.` | ||||||
|  | 		return response; | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	@Post() | 	@Post() | ||||||
| 	@Authorized("CARD:CREATE") | 	@Authorized("CARD:CREATE") | ||||||
| 	@ResponseSchema(ResponseRunnerCard) | 	@ResponseSchema(ResponseRunnerCard) | ||||||
| @@ -55,7 +80,7 @@ export class RunnerCardController { | |||||||
| 	async post(@Body({ validate: true }) createCard: CreateRunnerCard) { | 	async post(@Body({ validate: true }) createCard: CreateRunnerCard) { | ||||||
| 		let card = await createCard.toEntity(); | 		let card = await createCard.toEntity(); | ||||||
| 		card = await this.cardRepository.save(card); | 		card = await this.cardRepository.save(card); | ||||||
| 		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner'] })).toResponse(); | 		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	@Put('/:id') | 	@Put('/:id') | ||||||
| @@ -77,7 +102,7 @@ export class RunnerCardController { | |||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		await this.cardRepository.save(await card.update(oldCard)); | 		await this.cardRepository.save(await card.update(oldCard)); | ||||||
| 		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner'] })).toResponse(); | 		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	@Delete('/:id') | 	@Delete('/:id') | ||||||
|   | |||||||
| @@ -1,12 +1,12 @@ | |||||||
| import { Request } from "express"; | import { Request } from "express"; | ||||||
| import * as jwt from "jsonwebtoken"; | import * as jwt from "jsonwebtoken"; | ||||||
| import { Body, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers'; | import { BadRequestError, Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } 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 { config } from '../config'; | import { config } from '../config'; | ||||||
| import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError'; | import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError'; | ||||||
| import { MailSendingError } from '../errors/MailErrors'; | import { MailSendingError } from '../errors/MailErrors'; | ||||||
| import { RunnerEmailNeededError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors'; | import { RunnerEmailNeededError, RunnerHasDistanceDonationsError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors'; | ||||||
| import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors'; | import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors'; | ||||||
| import { ScanStationNotFoundError } from '../errors/ScanStationErrors'; | import { ScanStationNotFoundError } from '../errors/ScanStationErrors'; | ||||||
| import { JwtCreator } from '../jwtcreator'; | import { JwtCreator } from '../jwtcreator'; | ||||||
| @@ -23,6 +23,9 @@ import { ResponseScanStation } from '../models/responses/ResponseScanStation'; | |||||||
| import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation'; | import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation'; | ||||||
| import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner'; | import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner'; | ||||||
| import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan'; | import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan'; | ||||||
|  | import { DonationController } from './DonationController'; | ||||||
|  | import { RunnerCardController } from './RunnerCardController'; | ||||||
|  | import { ScanController } from './ScanController'; | ||||||
|  |  | ||||||
| @JsonController() | @JsonController() | ||||||
| export class RunnerSelfServiceController { | export class RunnerSelfServiceController { | ||||||
| @@ -43,11 +46,50 @@ export class RunnerSelfServiceController { | |||||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | 	@ResponseSchema(ResponseSelfServiceRunner) | ||||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||||
| 	@OnUndefined(RunnerNotFoundError) | 	@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 contact support.' }) | 	@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) { | 	async get(@Param('jwt') token: string) { | ||||||
| 		return (new ResponseSelfServiceRunner(await this.getRunner(token))); | 		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') | 	@Get('/runners/me/:jwt/scans') | ||||||
| 	@ResponseSchema(ResponseSelfServiceScan, { isArray: true }) | 	@ResponseSchema(ResponseSelfServiceScan, { isArray: true }) | ||||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||||
| @@ -67,18 +109,18 @@ export class RunnerSelfServiceController { | |||||||
| 	@ResponseSchema(ResponseScanStation) | 	@ResponseSchema(ResponseScanStation) | ||||||
| 	@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 }) | 	@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 }) | ||||||
| 	@OnUndefined(ScanStationNotFoundError) | 	@OnUndefined(ScanStationNotFoundError) | ||||||
| 	@OpenAPI({ description: 'Lists basic information about the station whose token got provided. <br> This includes it\'s associated track.', security: [{ "ScanApiToken": [] }] }) | 	@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) { | 	async getStationMe(@Req() req: Request) { | ||||||
| 		let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] }) | 		let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] }) | ||||||
| 		if (!scan) { throw new ScanStationNotFoundError(); } | 		if (!scan) { throw new ScanStationNotFoundError(); } | ||||||
| 		return scan.toResponse(); | 		return scan.toResponse(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	@Post('/runners/forgot') | 	@Post('/runners/login') | ||||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||||
| 	@OnUndefined(ResponseEmpty) | 	@OnUndefined(ResponseEmpty) | ||||||
| 	@OpenAPI({ description: 'TODO' }) | 	@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice token/link to be sent to your mail address (rate limited to one mail every 24hrs).' }) | ||||||
| 	async requestNewToken(@QueryParam('mail') mail: string) { | 	async requestNewToken(@QueryParam('mail') mail: string, @QueryParam("locale") locale: string = "en") { | ||||||
| 		if (!mail) { | 		if (!mail) { | ||||||
| 			throw new RunnerNotFoundError(); | 			throw new RunnerNotFoundError(); | ||||||
| 		} | 		} | ||||||
| @@ -89,7 +131,7 @@ export class RunnerSelfServiceController { | |||||||
| 		const token = JwtCreator.createSelfService(runner); | 		const token = JwtCreator.createSelfService(runner); | ||||||
|  |  | ||||||
| 		try { | 		try { | ||||||
| 			await Mailer.sendSelfserviceForgottenMail(runner.email, token, "en") | 			await Mailer.sendSelfserviceForgottenMail(runner.email, token, locale) | ||||||
| 		} catch (error) { | 		} catch (error) { | ||||||
| 			throw new MailSendingError(); | 			throw new MailSendingError(); | ||||||
| 		} | 		} | ||||||
| @@ -104,15 +146,18 @@ export class RunnerSelfServiceController { | |||||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | 	@ResponseSchema(ResponseSelfServiceRunner) | ||||||
| 	@ResponseSchema(RunnerEmailNeededError, { statusCode: 406 }) | 	@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.' }) | 	@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) { | 	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner, @QueryParam("locale") locale: string = "en") { | ||||||
| 		let runner = await createRunner.toEntity(); | 		let runner = await createRunner.toEntity(); | ||||||
|  | 		if (await this.getRunnerExistsByMail(runner.email)) { | ||||||
|  | 			throw new BadRequestError("E-Mail already registered") | ||||||
|  | 		} | ||||||
| 		runner = await this.runnerRepository.save(runner); | 		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'] })); | 		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); | 		response.token = JwtCreator.createSelfService(runner); | ||||||
|  |  | ||||||
| 		try { | 		try { | ||||||
| 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, "en") | 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale) | ||||||
| 		} catch (error) { | 		} catch (error) { | ||||||
| 			throw new MailSendingError(); | 			throw new MailSendingError(); | ||||||
| 		} | 		} | ||||||
| @@ -124,17 +169,20 @@ export class RunnerSelfServiceController { | |||||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | 	@ResponseSchema(ResponseSelfServiceRunner) | ||||||
| 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 }) | 	@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.' }) | 	@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) { | 	async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner, @QueryParam("locale") locale: string = "en") { | ||||||
| 		const org = await this.getOrgansisation(token); | 		const org = await this.getOrgansisation(token); | ||||||
|  |  | ||||||
| 		let runner = await createRunner.toEntity(org); | 		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); | 		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'] })); | 		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); | 		response.token = JwtCreator.createSelfService(runner); | ||||||
|  |  | ||||||
| 		try { | 		try { | ||||||
| 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, "en") | 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale) | ||||||
| 		} catch (error) { | 		} catch (error) { | ||||||
| 			throw new MailSendingError(); | 			throw new MailSendingError(); | ||||||
| 		} | 		} | ||||||
| @@ -183,4 +231,14 @@ export class RunnerSelfServiceController { | |||||||
|  |  | ||||||
| 		return organization; | 		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,4 +1,5 @@ | |||||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam, UseBefore } from 'routing-controllers'; | import { Request } from "express"; | ||||||
|  | import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam, Req, UseBefore } from 'routing-controllers'; | ||||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||||
| import { getConnectionManager, Repository } from 'typeorm'; | import { getConnectionManager, Repository } from 'typeorm'; | ||||||
| import { RunnerNotFoundError } from '../errors/RunnerErrors'; | import { RunnerNotFoundError } from '../errors/RunnerErrors'; | ||||||
| @@ -14,7 +15,6 @@ 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 { | ||||||
| @@ -60,7 +60,7 @@ 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: [{ "ScanApiToken": [] }, { "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: [{ "StationApiToken": [] }, { "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); | ||||||
| @@ -71,8 +71,12 @@ export class ScanController { | |||||||
| 	@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: [{ "ScanApiToken": [] }, { "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: [{ "StationApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||||
| 	async postTrackScans(@Body({ validate: true }) createScan: CreateTrackScan) { | 	async postTrackScans(@Body({ validate: true }) createScan: CreateTrackScan, @Req() req: Request) { | ||||||
|  | 		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.group', 'runner.scans.track', 'card', 'station'] })).toResponse(); | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| import { Get, JsonController, UseBefore } from 'routing-controllers'; | import { Get, JsonController, QueryParam, UseBefore } from 'routing-controllers'; | ||||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||||
| import { getConnection } from 'typeorm'; | import { getConnection } from 'typeorm'; | ||||||
| import StatsAuth from '../middlewares/StatsAuth'; | import StatsAuth from '../middlewares/StatsAuth'; | ||||||
| @@ -7,6 +7,7 @@ import { Runner } from '../models/entities/Runner'; | |||||||
| import { RunnerOrganization } from '../models/entities/RunnerOrganization'; | import { RunnerOrganization } from '../models/entities/RunnerOrganization'; | ||||||
| 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/ResponseStatsOrganization'; | ||||||
| @@ -36,7 +37,10 @@ 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'] }); | ||||||
|         let topRunners = runners.sort((runner1, runner2) => runner1.distance - runner2.distance).slice(0, 9); |         if (!runners || runners.length == 0) { | ||||||
|  |             return []; | ||||||
|  |         } | ||||||
|  |         let topRunners = runners.sort((runner1, runner2) => runner2.distance - runner1.distance).slice(0, 10); | ||||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); |         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||||
|         topRunners.forEach(runner => { |         topRunners.forEach(runner => { | ||||||
|             responseRunners.push(new ResponseStatsRunner(runner)); |             responseRunners.push(new ResponseStatsRunner(runner)); | ||||||
| @@ -49,8 +53,11 @@ 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: ['scans', 'group', 'distanceDonations', 'scans.track'] }); |         let runners = await getConnection().getRepository(Runner).find({ relations: ['group', 'distanceDonations', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }); | ||||||
|         let topRunners = runners.sort((runner1, runner2) => runner1.distanceDonationAmount - runner2.distanceDonationAmount).slice(0, 9); |         if (!runners || runners.length == 0) { | ||||||
|  |             return []; | ||||||
|  |         } | ||||||
|  |         let topRunners = runners.sort((runner1, runner2) => runner2.distanceDonationAmount - runner1.distanceDonationAmount).slice(0, 10); | ||||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); |         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||||
|         topRunners.forEach(runner => { |         topRunners.forEach(runner => { | ||||||
|             responseRunners.push(new ResponseStatsRunner(runner)); |             responseRunners.push(new ResponseStatsRunner(runner)); | ||||||
| @@ -58,6 +65,34 @@ 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 }) | ||||||
| @@ -71,8 +106,11 @@ 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: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] }); |         let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['parentGroup', 'runners', 'runners.scans', 'runners.scans.track'] }); | ||||||
|         let topTeams = teams.sort((team1, team2) => team1.distance - team2.distance).slice(0, 9); |         if (!teams || teams.length == 0) { | ||||||
|  |             return []; | ||||||
|  |         } | ||||||
|  |         let topTeams = teams.sort((team1, team2) => team2.distance - team1.distance).slice(0, 10); | ||||||
|         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); |         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); | ||||||
|         topTeams.forEach(team => { |         topTeams.forEach(team => { | ||||||
|             responseTeams.push(new ResponseStatsTeam(team)); |             responseTeams.push(new ResponseStatsTeam(team)); | ||||||
| @@ -85,8 +123,11 @@ 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: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] }); |         let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['parentGroup', 'runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] }); | ||||||
|         let topTeams = teams.sort((team1, team2) => team1.distanceDonationAmount - team2.distanceDonationAmount).slice(0, 9); |         if (!teams || teams.length == 0) { | ||||||
|  |             return []; | ||||||
|  |         } | ||||||
|  |         let topTeams = teams.sort((team1, team2) => team2.distanceDonationAmount - team1.distanceDonationAmount).slice(0, 10); | ||||||
|         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); |         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); | ||||||
|         topTeams.forEach(team => { |         topTeams.forEach(team => { | ||||||
|             responseTeams.push(new ResponseStatsTeam(team)); |             responseTeams.push(new ResponseStatsTeam(team)); | ||||||
| @@ -100,7 +141,10 @@ export class StatsController { | |||||||
|     @OpenAPI({ description: "Returns the top ten organizations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) |     @OpenAPI({ description: "Returns the top ten organizations 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(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] }); | ||||||
|         let topOrgs = orgs.sort((org1, org2) => org1.distance - org2.distance).slice(0, 9); |         if (!orgs || orgs.length == 0) { | ||||||
|  |             return []; | ||||||
|  |         } | ||||||
|  |         let topOrgs = orgs.sort((org1, org2) => org2.distance - org1.distance).slice(0, 10); | ||||||
|         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); |         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); | ||||||
|         topOrgs.forEach(org => { |         topOrgs.forEach(org => { | ||||||
|             responseOrgs.push(new ResponseStatsOrgnisation(org)); |             responseOrgs.push(new ResponseStatsOrgnisation(org)); | ||||||
| @@ -113,8 +157,11 @@ export class StatsController { | |||||||
|     @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 organizations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||||
|     async getTopOrgsByDonations() { |     async getTopOrgsByDonations() { | ||||||
|         let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] }); |         let 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 topOrgs = orgs.sort((org1, org2) => org1.distanceDonationAmount - org2.distanceDonationAmount).slice(0, 9); |         if (!orgs || orgs.length == 0) { | ||||||
|  |             return []; | ||||||
|  |         } | ||||||
|  |         let topOrgs = orgs.sort((org1, org2) => org2.distanceDonationAmount - org1.distanceDonationAmount).slice(0, 10); | ||||||
|         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); |         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); | ||||||
|         topOrgs.forEach(org => { |         topOrgs.forEach(org => { | ||||||
|             responseOrgs.push(new ResponseStatsOrgnisation(org)); |             responseOrgs.push(new ResponseStatsOrgnisation(org)); | ||||||
|   | |||||||
| @@ -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 { getConnectionManager, Repository } from 'typeorm'; | import { getConnectionManager, Repository } from 'typeorm'; | ||||||
| import { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors'; | import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, 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'; | ||||||
| @@ -66,6 +66,10 @@ 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; | ||||||
| @@ -85,6 +89,10 @@ 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 }); | ||||||
|   | |||||||
| @@ -72,3 +72,32 @@ 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." | ||||||
|  | } | ||||||
| @@ -33,6 +33,7 @@ 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, IsPositive } from 'class-validator'; | import { IsInt, IsOptional, 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,6 +16,13 @@ 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. | ||||||
|      */ |      */ | ||||||
|   | |||||||
| @@ -21,6 +21,7 @@ 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,4 +1,5 @@ | |||||||
| import { IsInt, IsPositive } from 'class-validator'; | import { IsInt, IsOptional, 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'; | ||||||
| @@ -22,10 +23,12 @@ 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() | ||||||
|     station: number; |     @IsOptional() | ||||||
|  |     station?: number; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Creates a new Track entity from this. |      * Creates a new Track entity from this. | ||||||
| @@ -44,21 +47,32 @@ export class CreateTrackScan { | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         newScan.timestamp = Math.round(new Date().getTime() / 1000); |         newScan.timestamp = Math.round(new Date().getTime() / 1000); | ||||||
|         newScan.lapTime = await this.getLaptime(newScan) |         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 track = await getConnection().getRepository(RunnerCard).findOne({ id: this.card }, { relations: ["runner"] }); |         const id = this.card % 200000000000; | ||||||
|  |         const track = await getConnection().getRepository(RunnerCard).findOne({ id: id }, { relations: ["runner"] }); | ||||||
|         if (!track) { |         if (!track) { | ||||||
|             throw new RunnerCardNotFoundError(); |             throw new RunnerCardNotFoundError(); | ||||||
|         } |         } | ||||||
|         return track; |         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(); | ||||||
| @@ -66,15 +80,22 @@ export class CreateTrackScan { | |||||||
|         return station; |         return station; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public validateScan(scan: TrackScan): boolean { |     /** | ||||||
|         return (scan.lapTime > scan.track.minimumLapTime); |      * Validates the scan and sets it's lap time; | ||||||
|     } |      * @param scan The scan you want to validate | ||||||
|  |      * @returns The validated scan with it's laptime set. | ||||||
|     public async getLaptime(scan: TrackScan): Promise<number> { |      */ | ||||||
|  |     public async validateScan(scan: TrackScan): Promise<TrackScan> { | ||||||
|         const scans = await getConnection().getRepository(TrackScan).find({ where: { runner: scan.runner, valid: true }, relations: ["track"] }); |         const scans = await getConnection().getRepository(TrackScan).find({ where: { runner: scan.runner, valid: true }, relations: ["track"] }); | ||||||
|         if (scans.length == 0) { return 0; } |         if (scans.length == 0) { | ||||||
|  |             scan.lapTime = 0; | ||||||
|  |             scan.valid = true; | ||||||
|  |         } | ||||||
|  |         else { | ||||||
|             const newestScan = scans[scans.length - 1]; |             const newestScan = scans[scans.length - 1]; | ||||||
|         return (scan.timestamp - newestScan.timestamp); |             scan.lapTime = scan.timestamp - newestScan.timestamp; | ||||||
|  |             scan.valid = (scan.lapTime > scan.track.minimumLapTime); | ||||||
|  |         } | ||||||
|  |         return scan; | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -1,9 +1,10 @@ | |||||||
| 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 { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors'; | import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, 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'; | ||||||
| @@ -94,7 +95,13 @@ 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 | ||||||
| @@ -107,7 +114,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://dev.lauf-fuer-kaya.de/lfk-logo.png`; } |         if (!this.profilePic) { newUser.profilePic = `https://lauf-fuer-kaya.de/lfk-logo.png`; } | ||||||
|         else { newUser.profilePic = this.profilePic; } |         else { newUser.profilePic = this.profilePic; } | ||||||
|  |  | ||||||
|         return newUser; |         return newUser; | ||||||
|   | |||||||
| @@ -32,6 +32,7 @@ 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, IsPositive } from 'class-validator'; | import { IsInt, IsOptional, 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,6 +23,13 @@ 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. | ||||||
|      */ |      */ | ||||||
|   | |||||||
| @@ -20,6 +20,7 @@ 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,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 { ScanStationNotFoundError } from '../../../errors/ScanStationErrors'; | import { TrackNotFoundError } from '../../../errors/TrackErrors'; | ||||||
| import { Runner } from '../../entities/Runner'; | import { Runner } from '../../entities/Runner'; | ||||||
| import { ScanStation } from '../../entities/ScanStation'; | import { Track } from '../../entities/Track'; | ||||||
| import { TrackScan } from '../../entities/TrackScan'; | import { TrackScan } from '../../entities/TrackScan'; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -38,7 +38,7 @@ export abstract class UpdateTrackScan { | |||||||
|      */ |      */ | ||||||
|     @IsInt() |     @IsInt() | ||||||
|     @IsPositive() |     @IsPositive() | ||||||
|     public station: number; |     public track: number; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Update a TrackScan entity based on this. |      * Update a TrackScan entity based on this. | ||||||
| @@ -47,8 +47,7 @@ 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.station = await this.getStation(); |         scan.track = await this.getTrack(); | ||||||
|         scan.track = scan.station.track; |  | ||||||
|  |  | ||||||
|         return scan; |         return scan; | ||||||
|     } |     } | ||||||
| @@ -67,11 +66,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 getStation(): Promise<ScanStation> { |     public async getTrack(): Promise<Track> { | ||||||
|         const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ['track'] }); |         const track = await getConnection().getRepository(Track).findOne({ id: this.track }); | ||||||
|         if (!station) { |         if (!track) { | ||||||
|             throw new ScanStationNotFoundError(); |             throw new TrackNotFoundError(); | ||||||
|         } |         } | ||||||
|         return station; |         return track; | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -1,12 +1,14 @@ | |||||||
| 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 { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors'; | import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, 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). | ||||||
|  */ |  */ | ||||||
| @@ -104,6 +106,11 @@ 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; | ||||||
|         } |         } | ||||||
| @@ -117,7 +124,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://dev.lauf-fuer-kaya.de/lfk-logo.png`; } |         if (!this.profilePic) { user.profilePic = `https://lauf-fuer-kaya.de/lfk-logo.png`; } | ||||||
|         else { user.profilePic = this.profilePic; } |         else { user.profilePic = this.profilePic; } | ||||||
|  |  | ||||||
|         return user; |         return user; | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ import { | |||||||
|   IsInt, |   IsInt, | ||||||
|   IsNotEmpty |   IsNotEmpty | ||||||
| } from "class-validator"; | } from "class-validator"; | ||||||
| import { Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm"; | import { Column, 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,6 +34,13 @@ 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,6 +33,15 @@ 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. | ||||||
|    */ |    */ | ||||||
|   | |||||||
| @@ -67,10 +67,11 @@ 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 > 12) { |     if (id.length > 11) { | ||||||
|       throw new RunnerCardIdOutOfRangeError(); |       throw new RunnerCardIdOutOfRangeError(); | ||||||
|     } |     } | ||||||
|     while (id.length < 12) { id = '0' + id; } |     while (id.length < 11) { id = '0' + id; } | ||||||
|  |     id = '2' + id; | ||||||
|  |  | ||||||
|     return id; |     return id; | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -51,6 +51,9 @@ 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); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								src/models/enums/DonationStatus.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								src/models/enums/DonationStatus.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | /** | ||||||
|  |  * This enum contains all status a donation can inherit regarding it's payment status. | ||||||
|  |  */ | ||||||
|  | export enum DonationStatus { | ||||||
|  |     OPEN = 'OPEN', | ||||||
|  |     PAID = 'PAID' | ||||||
|  | } | ||||||
| @@ -35,4 +35,5 @@ export enum ResponseObjectType { | |||||||
|     USER = 'USER', |     USER = 'USER', | ||||||
|     USERGROUP = 'USERGROUP', |     USERGROUP = 'USERGROUP', | ||||||
|     USERPERMISSIONS = 'USERPERMISSIONS', |     USERPERMISSIONS = 'USERPERMISSIONS', | ||||||
|  |     SELFSERVICEDONOR = 'SELFSERVICEDONOR' | ||||||
| } | } | ||||||
| @@ -1,5 +1,6 @@ | |||||||
| 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 { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||||
| import { IResponse } from './IResponse'; | import { IResponse } from './IResponse'; | ||||||
| import { ResponseDonor } from './ResponseDonor'; | import { ResponseDonor } from './ResponseDonor'; | ||||||
| @@ -15,6 +16,12 @@ export class ResponseDonation implements IResponse { | |||||||
|     */ |     */ | ||||||
|     responseType: ResponseObjectType = ResponseObjectType.DONATION; |     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. | ||||||
|      */ |      */ | ||||||
| @@ -34,6 +41,12 @@ 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. | ||||||
| @@ -42,5 +55,12 @@ export class ResponseDonation implements IResponse { | |||||||
|         this.id = donation.id; |         this.id = donation.id; | ||||||
|         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; | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -28,6 +28,12 @@ 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; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 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. | ||||||
| @@ -36,5 +42,6 @@ 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; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -2,6 +2,7 @@ import { IsInt, IsNotEmpty, IsPositive } from 'class-validator'; | |||||||
| import { DistanceDonation } from '../entities/DistanceDonation'; | import { DistanceDonation } from '../entities/DistanceDonation'; | ||||||
| import { ResponseObjectType } from '../enums/ResponseObjectType'; | import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||||
| import { IResponse } from './IResponse'; | import { IResponse } from './IResponse'; | ||||||
|  | import { ResponseSelfServiceDonor } from './ResponseSelfServiceDonor'; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Defines the runner selfservice donation response. |  * Defines the runner selfservice donation response. | ||||||
| @@ -18,7 +19,7 @@ export class ResponseSelfServiceDonation implements IResponse { | |||||||
|      * The donation's donor. |      * The donation's donor. | ||||||
|      */ |      */ | ||||||
|     @IsNotEmpty() |     @IsNotEmpty() | ||||||
|     donor: string; |     donor: ResponseSelfServiceDonor; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * The donation's amount in the smalles unit of your currency (default: euro cent). |      * The donation's amount in the smalles unit of your currency (default: euro cent). | ||||||
| @@ -35,9 +36,7 @@ export class ResponseSelfServiceDonation implements IResponse { | |||||||
|     amountPerDistance: number; |     amountPerDistance: number; | ||||||
|  |  | ||||||
|     public constructor(donation: DistanceDonation) { |     public constructor(donation: DistanceDonation) { | ||||||
|         if (!donation.donor.middlename) { this.donor = donation.donor.firstname + " " + donation.donor.lastname; } |         this.donor = new ResponseSelfServiceDonor(donation.donor); | ||||||
|         else { this.donor = donation.donor.firstname + " " + donation.donor.middlename + " " + donation.donor.lastname; } |  | ||||||
|  |  | ||||||
|         this.amountPerDistance = donation.amountPerDistance; |         this.amountPerDistance = donation.amountPerDistance; | ||||||
|         this.amount = donation.amount; |         this.amount = donation.amount; | ||||||
|     } |     } | ||||||
|   | |||||||
							
								
								
									
										51
									
								
								src/models/responses/ResponseSelfServiceDonor.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								src/models/responses/ResponseSelfServiceDonor.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,51 @@ | |||||||
|  | import { IsInt, IsString } from "class-validator"; | ||||||
|  | import { Donor } from '../entities/Donor'; | ||||||
|  | import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||||
|  | import { IResponse } from './IResponse'; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Defines the donor selfservice response. | ||||||
|  |  * Why? B/C runner's are not allowed to view all information available to admin users. | ||||||
|  | */ | ||||||
|  | export class ResponseSelfServiceDonor implements IResponse { | ||||||
|  |     /** | ||||||
|  |     * The responseType. | ||||||
|  |     * This contains the type of class/entity this response contains. | ||||||
|  |     */ | ||||||
|  |     responseType: ResponseObjectType = ResponseObjectType.SELFSERVICEDONOR; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * The participant's id. | ||||||
|  |      */ | ||||||
|  |     @IsInt() | ||||||
|  |     id: number; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * The participant's first name. | ||||||
|  |      */ | ||||||
|  |     @IsString() | ||||||
|  |     firstname: string; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * The participant's middle name. | ||||||
|  |      */ | ||||||
|  |     @IsString() | ||||||
|  |     middlename?: string; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * The participant's last name. | ||||||
|  |      */ | ||||||
|  |     @IsString() | ||||||
|  |     lastname: string; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Creates a ResponseSelfServiceDonor object from a runner. | ||||||
|  |      * @param donor The donor the response shall be build for. | ||||||
|  |      */ | ||||||
|  |     public constructor(donor: Donor) { | ||||||
|  |         this.id = donor.id; | ||||||
|  |         this.firstname = donor.firstname; | ||||||
|  |         this.middlename = donor.middlename; | ||||||
|  |         this.lastname = donor.lastname; | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -38,10 +38,10 @@ export class ResponseSelfServiceRunner extends ResponseParticipant implements IR | |||||||
|     group: string; |     group: string; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * The runner's associated donations. |      * The runner's associated distance donations. | ||||||
|      */ |      */ | ||||||
|     @IsString() |     @IsString() | ||||||
|     donations: ResponseSelfServiceDonation[] |     distanceDonations: ResponseSelfServiceDonation[] | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * The runner's self-service jwt for auth. |      * The runner's self-service jwt for auth. | ||||||
| @@ -60,7 +60,7 @@ export class ResponseSelfServiceRunner extends ResponseParticipant implements IR | |||||||
|         this.distance = runner.distance; |         this.distance = runner.distance; | ||||||
|         this.donationAmount = runner.distanceDonationAmount; |         this.donationAmount = runner.distanceDonationAmount; | ||||||
|         this.group = this.getTeamString(runner.group); |         this.group = this.getTeamString(runner.group); | ||||||
|         this.donations = this.getDonations(runner.distanceDonations); |         this.distanceDonations = this.getDonations(runner.distanceDonations); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -49,7 +49,15 @@ export class ResponseStatsOrgnisation implements IResponse { | |||||||
|     public constructor(org: RunnerOrganization) { |     public constructor(org: RunnerOrganization) { | ||||||
|         this.name = org.name; |         this.name = org.name; | ||||||
|         this.id = org.id; |         this.id = org.id; | ||||||
|  |         try { | ||||||
|             this.distance = org.distance; |             this.distance = org.distance; | ||||||
|  |         } catch { | ||||||
|  |             this.distance = -1; | ||||||
|  |         } | ||||||
|  |         try { | ||||||
|             this.donationAmount = org.distanceDonationAmount; |             this.donationAmount = org.distanceDonationAmount; | ||||||
|  |         } catch { | ||||||
|  |             this.donationAmount = -1; | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| import { | import { | ||||||
|     IsInt, |     IsInt, | ||||||
|     IsObject, |     IsObject, | ||||||
|  |     IsOptional, | ||||||
|     IsString |     IsString | ||||||
| } from "class-validator"; | } from "class-validator"; | ||||||
| import { Runner } from '../entities/Runner'; | import { Runner } from '../entities/Runner'; | ||||||
| @@ -55,6 +56,13 @@ export class ResponseStatsRunner implements IResponse { | |||||||
|     @IsInt() |     @IsInt() | ||||||
|     donationAmount: number; |     donationAmount: number; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * The runner's fastest laptime in seconds. | ||||||
|  |      */ | ||||||
|  |     @IsInt() | ||||||
|  |     @IsOptional() | ||||||
|  |     minLaptime?: number; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * The runner's group. |      * The runner's group. | ||||||
|      */ |      */ | ||||||
| @@ -65,13 +73,28 @@ export class ResponseStatsRunner implements IResponse { | |||||||
|      * Creates a new runner stats response from a runner |      * Creates a new runner stats response from a runner | ||||||
|      * @param runner The runner whoes response shall be generated - the following relations have to be resolved: scans, group, distanceDonations, scans.track |      * @param runner The runner whoes response shall be generated - the following relations have to be resolved: scans, group, distanceDonations, scans.track | ||||||
|      */ |      */ | ||||||
|     public constructor(runner: Runner) { |     public constructor(runner: Runner, laptime?: number) { | ||||||
|         this.id = runner.id; |         this.id = runner.id; | ||||||
|         this.firstname = runner.firstname; |         this.firstname = runner.firstname; | ||||||
|  |         if (runner.firstname) { | ||||||
|             this.middlename = runner.middlename; |             this.middlename = runner.middlename; | ||||||
|  |         } | ||||||
|         this.lastname = runner.lastname; |         this.lastname = runner.lastname; | ||||||
|  |         try { | ||||||
|             this.distance = runner.distance; |             this.distance = runner.distance; | ||||||
|  |         } | ||||||
|  |         catch { | ||||||
|  |             this.distance = -1; | ||||||
|  |         } | ||||||
|  |         try { | ||||||
|             this.donationAmount = runner.distanceDonationAmount; |             this.donationAmount = runner.distanceDonationAmount; | ||||||
|  |         } | ||||||
|  |         catch { | ||||||
|  |             this.donationAmount = -1; | ||||||
|  |         } | ||||||
|  |         if (laptime) { | ||||||
|  |             this.minLaptime = laptime; | ||||||
|  |         } | ||||||
|         this.group = runner.group.toResponse(); |         this.group = runner.group.toResponse(); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -57,7 +57,15 @@ export class ResponseStatsTeam implements IResponse { | |||||||
|         this.name = team.name; |         this.name = team.name; | ||||||
|         this.id = team.id; |         this.id = team.id; | ||||||
|         this.parent = team.parentGroup.toResponse(); |         this.parent = team.parentGroup.toResponse(); | ||||||
|  |         try { | ||||||
|             this.distance = team.distance; |             this.distance = team.distance; | ||||||
|  |         } catch { | ||||||
|  |             this.distance = -1; | ||||||
|  |         } | ||||||
|  |         try { | ||||||
|             this.donationAmount = team.distanceDonationAmount; |             this.donationAmount = team.distanceDonationAmount; | ||||||
|  |         } catch { | ||||||
|  |             this.donationAmount = -1; | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,14 +1,14 @@ | |||||||
|  | import * as argon2 from "argon2"; | ||||||
| import { Connection } from 'typeorm'; | import { Connection } from 'typeorm'; | ||||||
| import { Factory, Seeder } from 'typeorm-seeding'; | import { Factory, Seeder } from 'typeorm-seeding'; | ||||||
|  | import * as uuid from 'uuid'; | ||||||
| import { CreatePermission } from '../models/actions/create/CreatePermission'; | import { CreatePermission } from '../models/actions/create/CreatePermission'; | ||||||
| import { CreateUser } from '../models/actions/create/CreateUser'; |  | ||||||
| import { CreateUserGroup } from '../models/actions/create/CreateUserGroup'; | import { CreateUserGroup } from '../models/actions/create/CreateUserGroup'; | ||||||
| import { Permission } from '../models/entities/Permission'; | import { Permission } from '../models/entities/Permission'; | ||||||
| import { User } from '../models/entities/User'; | import { User } from '../models/entities/User'; | ||||||
| import { UserGroup } from '../models/entities/UserGroup'; | import { UserGroup } from '../models/entities/UserGroup'; | ||||||
| import { PermissionAction } from '../models/enums/PermissionAction'; | import { PermissionAction } from '../models/enums/PermissionAction'; | ||||||
| import { PermissionTarget } from '../models/enums/PermissionTargets'; | import { PermissionTarget } from '../models/enums/PermissionTargets'; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Seeds a admin group with a demo user into the database for initial setup and auto recovery. |  * Seeds a admin group with a demo user into the database for initial setup and auto recovery. | ||||||
|  * We know that the nameing isn't perfectly fitting. Feel free to change it. |  * We know that the nameing isn't perfectly fitting. Feel free to change it. | ||||||
| @@ -16,7 +16,7 @@ import { PermissionTarget } from '../models/enums/PermissionTargets'; | |||||||
| export default class SeedUsers implements Seeder { | export default class SeedUsers implements Seeder { | ||||||
|     public async run(factory: Factory, connection: Connection): Promise<any> { |     public async run(factory: Factory, connection: Connection): Promise<any> { | ||||||
|         let adminGroup: UserGroup = await this.createAdminGroup(connection); |         let adminGroup: UserGroup = await this.createAdminGroup(connection); | ||||||
|         await this.createUser(connection, adminGroup.id); |         await this.createUser(connection, adminGroup); | ||||||
|         await this.createPermissions(connection, adminGroup.id); |         await this.createPermissions(connection, adminGroup.id); | ||||||
|     } |     } | ||||||
|  |  | ||||||
| @@ -27,15 +27,16 @@ export default class SeedUsers implements Seeder { | |||||||
|         return await connection.getRepository(UserGroup).save(await adminGroup.toEntity()); |         return await connection.getRepository(UserGroup).save(await adminGroup.toEntity()); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public async createUser(connection: Connection, group: number) { |     public async createUser(connection: Connection, group: UserGroup) { | ||||||
|         let initialUser = new CreateUser(); |         let initialUser = new User(); | ||||||
|         initialUser.firstname = "demo"; |         initialUser.firstname = "demo"; | ||||||
|         initialUser.lastname = "demo"; |         initialUser.lastname = "demo"; | ||||||
|         initialUser.username = "demo"; |         initialUser.username = "demo"; | ||||||
|         initialUser.password = "demo"; |         initialUser.uuid = uuid.v4(); | ||||||
|  |         initialUser.password = await argon2.hash("demo" + initialUser.uuid); | ||||||
|         initialUser.email = "demo@dev.lauf-fuer-kaya.de" |         initialUser.email = "demo@dev.lauf-fuer-kaya.de" | ||||||
|         initialUser.groups = group; |         initialUser.groups = [group]; | ||||||
|         return await connection.getRepository(User).save(await initialUser.toEntity()); |         return await connection.getRepository(User).save(initialUser); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public async createPermissions(connection: Connection, principal: number) { |     public async createPermissions(connection: Connection, principal: number) { | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ const base = "http://localhost:" + config.internal_port | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     axios_config = { |     axios_config = { | ||||||
|         validateStatus: undefined |         validateStatus: undefined | ||||||
|     }; |     }; | ||||||
|   | |||||||
| @@ -8,14 +8,15 @@ const axios_config = { | |||||||
| };; | };; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     await axios.post(base + '/api/users', { |     await axios.post(base + '/api/users', { | ||||||
|         "firstname": "demo_logout", |         "firstname": "demo_logoutASD123", | ||||||
|         "middlename": "demo_logout", |         "middlename": "demo_logoutASD123", | ||||||
|         "lastname": "demo_logout", |         "lastname": "demo_logoutASD123", | ||||||
|         "username": "demo_logout", |         "username": "demo_logoutASD123", | ||||||
|         "password": "demo_logout", |         "password": "demo_logoutASD123", | ||||||
|         "email": "demo_logout@dev.lauf-fuer-kaya.de" |         "email": "demo_logoutASD123@dev.lauf-fuer-kaya.de" | ||||||
|     }, { |     }, { | ||||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, |         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||||
|         validateStatus: undefined |         validateStatus: undefined | ||||||
| @@ -25,7 +26,7 @@ beforeAll(async () => { | |||||||
| describe('POST /api/auth/logout valid', () => { | describe('POST /api/auth/logout valid', () => { | ||||||
|     let refresh_coookie; |     let refresh_coookie; | ||||||
|     it('valid logout with token in cookie should return 200', async () => { |     it('valid logout with token in cookie should return 200', async () => { | ||||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logout", password: "demo_logout" }); |         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logoutASD123", password: "demo_logoutASD123" }); | ||||||
|         refresh_coookie = res_login.headers["set-cookie"]; |         refresh_coookie = res_login.headers["set-cookie"]; | ||||||
|         const res = await axios.post(base + '/api/auth/logout', null, { |         const res = await axios.post(base + '/api/auth/logout', null, { | ||||||
|             headers: { "Cookie": refresh_coookie }, |             headers: { "Cookie": refresh_coookie }, | ||||||
| @@ -34,7 +35,7 @@ describe('POST /api/auth/logout valid', () => { | |||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|     }); |     }); | ||||||
|     it('valid logout with token in body should return 200', async () => { |     it('valid logout with token in body should return 200', async () => { | ||||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logout", password: "demo_logout" }); |         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logoutASD123", password: "demo_logoutASD123" }); | ||||||
|         const res = await axios.post(base + '/api/auth/logout', { token: res_login.data["refresh_token"] }, axios_config); |         const res = await axios.post(base + '/api/auth/logout', { token: res_login.data["refresh_token"] }, axios_config); | ||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|     }); |     }); | ||||||
|   | |||||||
| @@ -8,14 +8,15 @@ const axios_config = { | |||||||
| };; | };; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     await axios.post(base + '/api/users', { |     await axios.post(base + '/api/users', { | ||||||
|         "firstname": "demo_refresh", |         "firstname": "demo_refreshASD312", | ||||||
|         "middlename": "demo_refresh", |         "middlename": "demo_refreshASD312", | ||||||
|         "lastname": "demo_refresh", |         "lastname": "demo_refreshASD312", | ||||||
|         "username": "demo_refresh", |         "username": "demo_refreshASD312", | ||||||
|         "password": "demo_refresh", |         "password": "demo_refreshASD312", | ||||||
|         "email": "demo_refresh@dev.lauf-fuer-kaya.de" |         "email": "demo_refreshASD312@dev.lauf-fuer-kaya.de" | ||||||
|     }, { |     }, { | ||||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, |         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||||
|         validateStatus: undefined |         validateStatus: undefined | ||||||
| @@ -24,7 +25,7 @@ beforeAll(async () => { | |||||||
|  |  | ||||||
| describe('POST /api/auth/refresh valid', () => { | describe('POST /api/auth/refresh valid', () => { | ||||||
|     it('valid refresh with token in cookie should return 200', async () => { |     it('valid refresh with token in cookie should return 200', async () => { | ||||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refresh", password: "demo_refresh" }); |         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refreshASD312", password: "demo_refreshASD312" }); | ||||||
|         const res = await axios.post(base + '/api/auth/refresh', null, { |         const res = await axios.post(base + '/api/auth/refresh', null, { | ||||||
|             headers: { "Cookie": res_login.headers["set-cookie"] }, |             headers: { "Cookie": res_login.headers["set-cookie"] }, | ||||||
|             validateStatus: undefined |             validateStatus: undefined | ||||||
| @@ -32,7 +33,7 @@ describe('POST /api/auth/refresh valid', () => { | |||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|     }); |     }); | ||||||
|     it('valid refresh with token in body should return 200', async () => { |     it('valid refresh with token in body should return 200', async () => { | ||||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refresh", password: "demo_refresh" }); |         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refreshASD312", password: "demo_refreshASD312" }); | ||||||
|         const res = await axios.post(base + '/api/auth/refresh', { token: res_login.data["refresh_token"] }, axios_config); |         const res = await axios.post(base + '/api/auth/refresh', { token: res_login.data["refresh_token"] }, axios_config); | ||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|     }); |     }); | ||||||
|   | |||||||
| @@ -8,25 +8,26 @@ const axios_config = { | |||||||
| };; | };; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     await axios.post(base + '/api/users', { |     await axios.post(base + '/api/users', { | ||||||
|         "firstname": "demo_reset", |         "firstname": "demo_resetASD312", | ||||||
|         "middlename": "demo_reset", |         "middlename": "demo_resetASD312", | ||||||
|         "lastname": "demo_reset", |         "lastname": "demo_resetASD312", | ||||||
|         "username": "demo_reset", |         "username": "demo_resetASD312", | ||||||
|         "password": "demo_reset", |         "password": "demo_resetASD312", | ||||||
|         "email": "demo_reset1@dev.lauf-fuer-kaya.de" |         "email": "demo_resetASD3121@dev.lauf-fuer-kaya.de" | ||||||
|     }, { |     }, { | ||||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, |         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||||
|         validateStatus: undefined |         validateStatus: undefined | ||||||
|     }); |     }); | ||||||
|     await axios.post(base + '/api/users', { |     await axios.post(base + '/api/users', { | ||||||
|         "firstname": "demo_reset2", |         "firstname": "demo_resetASD3122", | ||||||
|         "middlename": "demo_reset2", |         "middlename": "demo_resetASD3122", | ||||||
|         "lastname": "demo_reset2", |         "lastname": "demo_resetASD3122", | ||||||
|         "username": "demo_reset2", |         "username": "demo_resetASD3122", | ||||||
|         "password": "demo_reset2", |         "password": "demo_resetASD3122", | ||||||
|         "email": "demo_reset2@dev.lauf-fuer-kaya.de" |         "email": "demo_resetASD3122@dev.lauf-fuer-kaya.de" | ||||||
|     }, { |     }, { | ||||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, |         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||||
|         validateStatus: undefined |         validateStatus: undefined | ||||||
| @@ -36,7 +37,7 @@ beforeAll(async () => { | |||||||
| describe('POST /api/auth/reset valid', () => { | describe('POST /api/auth/reset valid', () => { | ||||||
|     let reset_token; |     let reset_token; | ||||||
|     it('valid reset token request should return 200 (500 w/o correct auth)', async () => { |     it('valid reset token request should return 200 (500 w/o correct auth)', async () => { | ||||||
|         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_reset1@dev.lauf-fuer-kaya.de" }, axios_config); |         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_resetASD3121@dev.lauf-fuer-kaya.de" }, axios_config); | ||||||
|         reset_token = res1.data.resetToken; |         reset_token = res1.data.resetToken; | ||||||
|         expect(res1.status).toEqual(200); |         expect(res1.status).toEqual(200); | ||||||
|     }); |     }); | ||||||
| @@ -44,8 +45,8 @@ describe('POST /api/auth/reset valid', () => { | |||||||
| // --------------- | // --------------- | ||||||
| describe('POST /api/auth/reset invalid requests', () => { | describe('POST /api/auth/reset invalid requests', () => { | ||||||
|     it('request another password reset before the timeout should return 406', async () => { |     it('request another password reset before the timeout should return 406', async () => { | ||||||
|         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_reset2@dev.lauf-fuer-kaya.de" }, axios_config); |         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_resetASD3122@dev.lauf-fuer-kaya.de" }, axios_config); | ||||||
|         const res2 = await axios.post(base + '/api/auth/reset', { email: "demo_reset2@dev.lauf-fuer-kaya.de" }, axios_config); |         const res2 = await axios.post(base + '/api/auth/reset', { email: "demo_resetASD3122@dev.lauf-fuer-kaya.de" }, axios_config); | ||||||
|         expect(res2.status).toEqual(406); |         expect(res2.status).toEqual(406); | ||||||
|     }); |     }); | ||||||
| }); | }); | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
| @@ -85,7 +86,6 @@ describe('POST /api/cards successfully (with runner)', () => { | |||||||
| 			"lastname": "last", | 			"lastname": "last", | ||||||
| 			"group": added_org.id | 			"group": added_org.id | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		delete res2.data.group; |  | ||||||
| 		added_runner = res2.data; | 		added_runner = res2.data; | ||||||
| 		expect(res2.status).toEqual(200); | 		expect(res2.status).toEqual(200); | ||||||
| 		expect(res2.headers['content-type']).toContain("application/json") | 		expect(res2.headers['content-type']).toContain("application/json") | ||||||
| @@ -149,3 +149,38 @@ describe('POST /api/cards successfully (with runner)', () => { | |||||||
| 		}); | 		}); | ||||||
| 	}); | 	}); | ||||||
| }); | }); | ||||||
|  | // --------------- | ||||||
|  | describe('POST /api/cards/bulk successfully', () => { | ||||||
|  | 	it('creating a single new bulk card should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config); | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 	}); | ||||||
|  | 	it('creating a single new bulk card and letting the system return it should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/cards/bulk?count=1&returnCards=true', {}, axios_config); | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 		expect(res.data[0].id).toBeDefined(); | ||||||
|  | 	}); | ||||||
|  | 	it('creating 50 new bulk card should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config); | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 	}); | ||||||
|  | 	it('creating 50 new bulk cards and letting the system return it should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/cards/bulk?count=50&returnCards=true', {}, axios_config); | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 		expect(res.data.length).toEqual(50); | ||||||
|  | 	}); | ||||||
|  | 	it('creating 250 new bulk card should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/cards/bulk?count=250', {}, axios_config); | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 	}); | ||||||
|  | 	it('creating 2000 new bulk card should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/cards/bulk?count=2000', {}, axios_config); | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 	}); | ||||||
|  | }); | ||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
| @@ -63,7 +64,6 @@ describe('adding + updating card.runner successfully', () => { | |||||||
| 			"lastname": "last", | 			"lastname": "last", | ||||||
| 			"group": added_org.id | 			"group": added_org.id | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		delete res2.data.group; |  | ||||||
| 		added_runner = res2.data; | 		added_runner = res2.data; | ||||||
| 		expect(res2.status).toEqual(200); | 		expect(res2.status).toEqual(200); | ||||||
| 		expect(res2.headers['content-type']).toContain("application/json") | 		expect(res2.headers['content-type']).toContain("application/json") | ||||||
| @@ -74,7 +74,6 @@ describe('adding + updating card.runner successfully', () => { | |||||||
| 			"lastname": "last", | 			"lastname": "last", | ||||||
| 			"group": added_org.id | 			"group": added_org.id | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		delete res2.data.group; |  | ||||||
| 		added_runner2 = res2.data; | 		added_runner2 = res2.data; | ||||||
| 		expect(res2.status).toEqual(200); | 		expect(res2.status).toEqual(200); | ||||||
| 		expect(res2.headers['content-type']).toContain("application/json") | 		expect(res2.headers['content-type']).toContain("application/json") | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
| @@ -169,7 +170,7 @@ describe('POST /api/donations/fixed successfully', () => { | |||||||
| 		expect(res.status).toEqual(200); | 		expect(res.status).toEqual(200); | ||||||
| 		expect(res.headers['content-type']).toContain("application/json") | 		expect(res.headers['content-type']).toContain("application/json") | ||||||
| 	}); | 	}); | ||||||
| 	it('creating a new fixed donation should return 200', async () => { | 	it('creating a new fixed donation with more params should return 200', async () => { | ||||||
| 		const res = await axios.post(base + '/api/donations/fixed', { | 		const res = await axios.post(base + '/api/donations/fixed', { | ||||||
| 			"donor": added_donor.id, | 			"donor": added_donor.id, | ||||||
| 			"amount": 1000 | 			"amount": 1000 | ||||||
| @@ -180,6 +181,25 @@ describe('POST /api/donations/fixed successfully', () => { | |||||||
| 		expect(res.data).toEqual({ | 		expect(res.data).toEqual({ | ||||||
| 			"donor": added_donor, | 			"donor": added_donor, | ||||||
| 			"amount": 1000, | 			"amount": 1000, | ||||||
|  | 			"paidAmount": 0, | ||||||
|  | 			"status": "OPEN", | ||||||
|  | 			"responseType": "DONATION" | ||||||
|  | 		}); | ||||||
|  | 	}); | ||||||
|  | 	it('creating a new fixed donation with all params should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/donations/fixed', { | ||||||
|  | 			"donor": added_donor.id, | ||||||
|  | 			"amount": 1000, | ||||||
|  | 			"paidAmount": 1000 | ||||||
|  | 		}, axios_config); | ||||||
|  | 		delete res.data.id; | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 		expect(res.data).toEqual({ | ||||||
|  | 			"donor": added_donor, | ||||||
|  | 			"amount": 1000, | ||||||
|  | 			"paidAmount": 1000, | ||||||
|  | 			"status": "PAID", | ||||||
| 			"responseType": "DONATION" | 			"responseType": "DONATION" | ||||||
| 		}); | 		}); | ||||||
| 	}); | 	}); | ||||||
| @@ -218,7 +238,7 @@ describe('POST /api/donations/distance successfully', () => { | |||||||
| 		expect(res.status).toEqual(200); | 		expect(res.status).toEqual(200); | ||||||
| 		expect(res.headers['content-type']).toContain("application/json") | 		expect(res.headers['content-type']).toContain("application/json") | ||||||
| 	}); | 	}); | ||||||
| 	it('creating a new fixed donation should return 200', async () => { | 	it('creating a new distance donation with most params should return 200', async () => { | ||||||
| 		const res = await axios.post(base + '/api/donations/distance', { | 		const res = await axios.post(base + '/api/donations/distance', { | ||||||
| 			"runner": added_runner.id, | 			"runner": added_runner.id, | ||||||
| 			"amountPerDistance": 100, | 			"amountPerDistance": 100, | ||||||
| @@ -232,6 +252,28 @@ describe('POST /api/donations/distance successfully', () => { | |||||||
| 			"amountPerDistance": 100, | 			"amountPerDistance": 100, | ||||||
| 			"runner": added_runner, | 			"runner": added_runner, | ||||||
| 			"amount": 0, | 			"amount": 0, | ||||||
|  | 			"paidAmount": 0, | ||||||
|  | 			"status": "PAID", | ||||||
|  | 			"responseType": "DISTANCEDONATION" | ||||||
|  | 		}) | ||||||
|  | 	}); | ||||||
|  | 	it('creating a new distance donation with all params should return 200', async () => { | ||||||
|  | 		const res = await axios.post(base + '/api/donations/distance', { | ||||||
|  | 			"runner": added_runner.id, | ||||||
|  | 			"amountPerDistance": 100, | ||||||
|  | 			"donor": added_donor.id, | ||||||
|  | 			"paidAmount": 1000 | ||||||
|  | 		}, axios_config); | ||||||
|  | 		delete res.data.id; | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 		expect(res.data).toEqual({ | ||||||
|  | 			"donor": added_donor, | ||||||
|  | 			"amountPerDistance": 100, | ||||||
|  | 			"runner": added_runner, | ||||||
|  | 			"amount": 0, | ||||||
|  | 			"paidAmount": 1000, | ||||||
|  | 			"status": "PAID", | ||||||
| 			"responseType": "DISTANCEDONATION" | 			"responseType": "DISTANCEDONATION" | ||||||
| 		}) | 		}) | ||||||
| 	}); | 	}); | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
| @@ -212,6 +213,17 @@ describe('adding + updating fixed donation valid', () => { | |||||||
| 		expect(res.headers['content-type']).toContain("application/json"); | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
| 		expect(res.data.amount).toEqual(42); | 		expect(res.data.amount).toEqual(42); | ||||||
| 	}); | 	}); | ||||||
|  | 	it('updating paidAmount should return 200', async () => { | ||||||
|  | 		const res = await axios.put(base + '/api/donations/fixed/' + added_donation.id, { | ||||||
|  | 			"id": added_donation.id, | ||||||
|  | 			"donor": added_donor.id, | ||||||
|  | 			"amount": 42, | ||||||
|  | 			"paidAmount": 10 | ||||||
|  | 		}, axios_config); | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 		expect(res.data.paidAmount).toEqual(10); | ||||||
|  | 	}); | ||||||
| 	it('updating donor should return 200', async () => { | 	it('updating donor should return 200', async () => { | ||||||
| 		const res = await axios.put(base + '/api/donations/fixed/' + added_donation.id, { | 		const res = await axios.put(base + '/api/donations/fixed/' + added_donation.id, { | ||||||
| 			"id": added_donation.id, | 			"id": added_donation.id, | ||||||
| @@ -316,6 +328,19 @@ describe('adding + updating distance donation valid', () => { | |||||||
| 		expect(res.headers['content-type']).toContain("application/json"); | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
| 		expect(res.data.amountPerDistance).toEqual(69); | 		expect(res.data.amountPerDistance).toEqual(69); | ||||||
| 	}); | 	}); | ||||||
|  | 	it('updating paidAmount should return 200', async () => { | ||||||
|  | 		const res = await axios.put(base + '/api/donations/distance/' + added_donation.id, { | ||||||
|  | 			"id": added_donation.id, | ||||||
|  | 			"runner": added_runner.id, | ||||||
|  | 			"amountPerDistance": 69, | ||||||
|  | 			"donor": added_donor.id, | ||||||
|  | 			"paidAmount": 10 | ||||||
|  | 		}, axios_config); | ||||||
|  | 		delete res.data.donor.donationAmount; | ||||||
|  | 		expect(res.status).toEqual(200); | ||||||
|  | 		expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  | 		expect(res.data.paidAmount).toEqual(10); | ||||||
|  | 	}); | ||||||
| 	it('updating runner should return 200', async () => { | 	it('updating runner should return 200', async () => { | ||||||
| 		const res = await axios.put(base + '/api/donations/distance/' + added_donation.id, { | 		const res = await axios.put(base + '/api/donations/distance/' + added_donation.id, { | ||||||
| 			"id": added_donation.id, | 			"id": added_donation.id, | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
| @@ -15,7 +16,7 @@ beforeAll(async () => { | |||||||
| }); | }); | ||||||
|  |  | ||||||
| // --------------- | // --------------- | ||||||
| describe('adding + deletion (non-existant)', () => { | describe('deletion (non-existant)', () => { | ||||||
|     it('delete', async () => { |     it('delete', async () => { | ||||||
|         const res2 = await axios.delete(base + '/api/organizations/0', axios_config); |         const res2 = await axios.delete(base + '/api/organizations/0', axios_config); | ||||||
|         expect(res2.status).toEqual(204); |         expect(res2.status).toEqual(204); | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
							
								
								
									
										68
									
								
								src/tests/selfservice/selfservice_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										68
									
								
								src/tests/selfservice/selfservice_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,68 @@ | |||||||
|  | import { faker } from '@faker-js/faker'; | ||||||
|  | import axios from 'axios'; | ||||||
|  | import { config } from '../../config'; | ||||||
|  |  | ||||||
|  | const base = "http://localhost:" + config.internal_port | ||||||
|  |  | ||||||
|  | let access_token; | ||||||
|  | let axios_config; | ||||||
|  |  | ||||||
|  | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|  |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|  |     access_token = res.data["access_token"]; | ||||||
|  |     axios_config = { | ||||||
|  |         headers: { "authorization": "Bearer " + access_token }, | ||||||
|  |         validateStatus: undefined | ||||||
|  |     }; | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('delete selfservice runner invalid', () => { | ||||||
|  |     let added_runner; | ||||||
|  |     it('registering as citizen with minimal params should return 200', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/runners/register', { | ||||||
|  |             "firstname": "string", | ||||||
|  |             "lastname": "string", | ||||||
|  |             "email": faker.internet.exampleEmail(), | ||||||
|  |         }, axios_config); | ||||||
|  |         added_runner = res.data; | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('delete with valid jwt should return 200', async () => { | ||||||
|  |         const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('delete with valid jwt but non-existant runner should return 200', async () => { | ||||||
|  |         const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config); | ||||||
|  |         expect(res.status).toEqual(404); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('delete with invalid jwt should return 401', async () => { | ||||||
|  |         const res = await axios.delete(base + '/api/runners/me/123.123', axios_config); | ||||||
|  |         expect(res.status).toEqual(401); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('delete selfservice runner valid', () => { | ||||||
|  |     let added_runner; | ||||||
|  |     it('registering as citizen with minimal params should return 200', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/runners/register', { | ||||||
|  |             "firstname": "string", | ||||||
|  |             "lastname": "string", | ||||||
|  |             "email": faker.internet.exampleEmail(), | ||||||
|  |         }, axios_config); | ||||||
|  |         added_runner = res.data; | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('delete with valid jwt should return 200', async () => { | ||||||
|  |         const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |         delete added_runner.token; | ||||||
|  |         expect(res.data).toEqual(added_runner); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
| @@ -14,20 +15,20 @@ beforeAll(async () => { | |||||||
|     }; |     }; | ||||||
| }); | }); | ||||||
|  |  | ||||||
| describe('POST /api/runners/me/forgot invalid syntax/mail should fail', () => { | describe('POST /api/runners/me/login invalid syntax/mail should fail', () => { | ||||||
|     it('get without mail return 404', async () => { |     it('get without mail return 404', async () => { | ||||||
|         const res = await axios.post(base + '/api/runners/forgot', null, axios_config); |         const res = await axios.post(base + '/api/runners/login', null, axios_config); | ||||||
|         expect(res.status).toEqual(404); |         expect(res.status).toEqual(404); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|     }); |     }); | ||||||
|     it('get without bs mail return 404', async () => { |     it('get without bs mail return 404', async () => { | ||||||
|         const res = await axios.post(base + '/api/runners/forgot?mail=asdasdasdasdasd@tester.test.dev.lauf-fuer-kaya.de', null, axios_config); |         const res = await axios.post(base + '/api/runners/login?mail=asdasdasdasdasd@tester.test.dev.lauf-fuer-kaya.de', null, axios_config); | ||||||
|         expect(res.status).toEqual(404); |         expect(res.status).toEqual(404); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|     }); |     }); | ||||||
| }); | }); | ||||||
| // --------------- | // --------------- | ||||||
| describe('POST /api/runners/me/forgot 2 times within timeout should fail', () => { | describe('POST /api/runners/me/login 2 times within timeout should fail', () => { | ||||||
|     let added_runner; |     let added_runner; | ||||||
|     it('registering as citizen should return 200', async () => { |     it('registering as citizen should return 200', async () => { | ||||||
|         const res = await axios.post(base + '/api/runners/register', { |         const res = await axios.post(base + '/api/runners/register', { | ||||||
| @@ -41,19 +42,19 @@ describe('POST /api/runners/me/forgot 2 times within timeout should fail', () => | |||||||
|         added_runner = res.data; |         added_runner = res.data; | ||||||
|     }); |     }); | ||||||
|     it('post with valid mail should return 200', async () => { |     it('post with valid mail should return 200', async () => { | ||||||
|         const res = await axios.post(base + '/api/runners/forgot?mail=' + added_runner.email, null, axios_config); |         const res = await axios.post(base + '/api/runners/login?mail=' + added_runner.email, null, axios_config); | ||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|     }); |     }); | ||||||
|     it('2nd post with valid mail should return 406', async () => { |     it('2nd post with valid mail should return 406', async () => { | ||||||
|         const res = await axios.post(base + '/api/runners/forgot?mail=' + added_runner.email, null, axios_config); |         const res = await axios.post(base + '/api/runners/login?mail=' + added_runner.email, null, axios_config); | ||||||
|         expect(res.status).toEqual(406); |         expect(res.status).toEqual(406); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|     }); |     }); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| // --------------- | // --------------- | ||||||
| describe('POST /api/runners/me/forgot valid should return 200', () => { | describe('POST /api/runners/me/login valid should return 200', () => { | ||||||
|     let added_runner; |     let added_runner; | ||||||
|     let new_token; |     let new_token; | ||||||
|     it('registering as citizen should return 200', async () => { |     it('registering as citizen should return 200', async () => { | ||||||
| @@ -68,7 +69,7 @@ describe('POST /api/runners/me/forgot valid should return 200', () => { | |||||||
|         added_runner = res.data; |         added_runner = res.data; | ||||||
|     }); |     }); | ||||||
|     it('post with valid mail should return 200', async () => { |     it('post with valid mail should return 200', async () => { | ||||||
|         const res = await axios.post(base + '/api/runners/forgot?mail=' + added_runner.email, null, axios_config); |         const res = await axios.post(base + '/api/runners/login?mail=' + added_runner.email, null, axios_config); | ||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|         new_token = res.data.token; |         new_token = res.data.token; | ||||||
|   | |||||||
| @@ -1,3 +1,4 @@ | |||||||
|  | import { faker } from '@faker-js/faker'; | ||||||
| import axios from 'axios'; | import axios from 'axios'; | ||||||
| import { config } from '../../config'; | import { config } from '../../config'; | ||||||
| const base = "http://localhost:" + config.internal_port | const base = "http://localhost:" + config.internal_port | ||||||
| @@ -6,6 +7,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
| @@ -29,7 +31,7 @@ describe('register + get should return 200', () => { | |||||||
|             "firstname": "string", |             "firstname": "string", | ||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "email": "user@example.com" |             "email": faker.internet.exampleEmail(), | ||||||
|         }, axios_config); |         }, axios_config); | ||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
|   | |||||||
| @@ -1,3 +1,4 @@ | |||||||
|  | import { faker } from '@faker-js/faker'; | ||||||
| import axios from 'axios'; | import axios from 'axios'; | ||||||
| import { config } from '../../config'; | import { config } from '../../config'; | ||||||
| const base = "http://localhost:" + config.internal_port | const base = "http://localhost:" + config.internal_port | ||||||
| @@ -6,6 +7,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|     access_token = res.data["access_token"]; |     access_token = res.data["access_token"]; | ||||||
|     axios_config = { |     axios_config = { | ||||||
| @@ -38,7 +40,7 @@ describe('register invalid citizen', () => { | |||||||
|         const res = await axios.post(base + '/api/runners/register', { |         const res = await axios.post(base + '/api/runners/register', { | ||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "email": "user@example.com" |             "email": faker.internet.exampleEmail(), | ||||||
|         }, axios_config); |         }, axios_config); | ||||||
|         expect(res.status).toEqual(400); |         expect(res.status).toEqual(400); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
| @@ -47,7 +49,7 @@ describe('register invalid citizen', () => { | |||||||
|         const res = await axios.post(base + '/api/runners/register', { |         const res = await axios.post(base + '/api/runners/register', { | ||||||
|             "firstname": "string", |             "firstname": "string", | ||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "email": "user@example.com" |             "email": faker.internet.exampleEmail(), | ||||||
|         }, axios_config); |         }, axios_config); | ||||||
|         expect(res.status).toEqual(400); |         expect(res.status).toEqual(400); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
| @@ -58,7 +60,26 @@ describe('register invalid citizen', () => { | |||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "phone": "peter", |             "phone": "peter", | ||||||
|             "email": "user@example.com" |             "email": faker.internet.exampleEmail(), | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(400); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('registering as citizen with duplicate mail should return 400', async () => { | ||||||
|  |         const mail = faker.internet.exampleEmail(); | ||||||
|  |         await axios.post(base + '/api/runners/register', { | ||||||
|  |             "firstname": "string", | ||||||
|  |             "middlename": "string", | ||||||
|  |             "lastname": "string", | ||||||
|  |             "phone": "peter", | ||||||
|  |             "email": mail, | ||||||
|  |         }, axios_config); | ||||||
|  |         const res = await axios.post(base + '/api/runners/register', { | ||||||
|  |             "firstname": "string", | ||||||
|  |             "middlename": "string", | ||||||
|  |             "lastname": "string", | ||||||
|  |             "phone": "peter", | ||||||
|  |             "email": mail, | ||||||
|         }, axios_config); |         }, axios_config); | ||||||
|         expect(res.status).toEqual(400); |         expect(res.status).toEqual(400); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
| @@ -70,7 +91,7 @@ describe('register citizen valid', () => { | |||||||
|         const res = await axios.post(base + '/api/runners/register', { |         const res = await axios.post(base + '/api/runners/register', { | ||||||
|             "firstname": "string", |             "firstname": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "email": "user@example.com" |             "email": faker.internet.exampleEmail(), | ||||||
|         }, axios_config); |         }, axios_config); | ||||||
|         expect(res.status).toEqual(200); |         expect(res.status).toEqual(200); | ||||||
|         expect(res.headers['content-type']).toContain("application/json"); |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
| @@ -80,7 +101,7 @@ describe('register citizen valid', () => { | |||||||
|             "firstname": "string", |             "firstname": "string", | ||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "email": "user@example.com", |             "email": faker.internet.exampleEmail(), | ||||||
|             "phone": "+4909132123456", |             "phone": "+4909132123456", | ||||||
|             "address": { |             "address": { | ||||||
|                 address1: "Teststreet 1", |                 address1: "Teststreet 1", | ||||||
| @@ -186,7 +207,7 @@ describe('register valid company', () => { | |||||||
|             "firstname": "string", |             "firstname": "string", | ||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "email": "user@example.com", |             "email": faker.internet.exampleEmail(), | ||||||
|             "phone": "+4909132123456", |             "phone": "+4909132123456", | ||||||
|             "address": { |             "address": { | ||||||
|                 address1: "Teststreet 1", |                 address1: "Teststreet 1", | ||||||
| @@ -213,7 +234,7 @@ describe('register valid company', () => { | |||||||
|             "firstname": "string", |             "firstname": "string", | ||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "email": "user@example.com", |             "email": faker.internet.exampleEmail(), | ||||||
|             "phone": "+4909132123456", |             "phone": "+4909132123456", | ||||||
|             "address": { |             "address": { | ||||||
|                 address1: "Teststreet 1", |                 address1: "Teststreet 1", | ||||||
| @@ -231,7 +252,7 @@ describe('register valid company', () => { | |||||||
|             "firstname": "string", |             "firstname": "string", | ||||||
|             "middlename": "string", |             "middlename": "string", | ||||||
|             "lastname": "string", |             "lastname": "string", | ||||||
|             "email": "user@example.com", |             "email": faker.internet.exampleEmail(), | ||||||
|             "phone": "+4909132123456", |             "phone": "+4909132123456", | ||||||
|             "address": { |             "address": { | ||||||
|                 address1: "Teststreet 1", |                 address1: "Teststreet 1", | ||||||
|   | |||||||
							
								
								
									
										89
									
								
								src/tests/stats/stats_get.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										89
									
								
								src/tests/stats/stats_get.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,89 @@ | |||||||
|  | import axios from 'axios'; | ||||||
|  | import { config } from '../../config'; | ||||||
|  | const base = "http://localhost:" + config.internal_port | ||||||
|  |  | ||||||
|  | let axios_config_full; | ||||||
|  | let axios_config_stats; | ||||||
|  |  | ||||||
|  | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|  |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|  |     let access_token = res.data["access_token"]; | ||||||
|  |     axios_config_full = { | ||||||
|  |         headers: { "authorization": "Bearer " + access_token }, | ||||||
|  |         validateStatus: undefined | ||||||
|  |     }; | ||||||
|  |     const res2 = await axios.post(base + '/api/statsclients', { username: "demo", password: "demo" }, axios_config_full); | ||||||
|  |     access_token = res2.data["key"]; | ||||||
|  |     axios_config_stats = { | ||||||
|  |         headers: { "authorization": "Bearer " + access_token }, | ||||||
|  |         validateStatus: undefined | ||||||
|  |     }; | ||||||
|  | }); | ||||||
|  |  | ||||||
|  | describe('GET /api/stats/runners/distance w/o auth should return 200', () => { | ||||||
|  |     it('get with invalid token should return 401', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/runners/distance', { | ||||||
|  |             headers: { "authorization": "Bearer 123123123123123123" }, | ||||||
|  |             validateStatus: undefined | ||||||
|  |         }); | ||||||
|  |         expect(res.status).toEqual(401); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('GET /api/stats should return 200', () => { | ||||||
|  |     it('get w/o auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats', { validateStatus: undefined }); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('get w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('GET /api/stats/runners/* should return 200', () => { | ||||||
|  |     it('get by distance w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/runners/distance', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('get by donations w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/runners/donations', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('get by laptime w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/runners/laptime', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('GET /api/stats/teams/* should return 200', () => { | ||||||
|  |     it('get by distance w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/teams/distance', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('get by donations w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/teams/donations', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('GET /api/stats/organizations/* should return 200', () => { | ||||||
|  |     it('get by distance w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/organizations/distance', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  |     it('get by donations w/ auth should return 200', async () => { | ||||||
|  |         const res = await axios.get(base + '/api/stats/organizations/donations', axios_config_stats); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |         expect(res.headers['content-type']).toContain("application/json"); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ let access_token; | |||||||
| let axios_config; | let axios_config; | ||||||
|  |  | ||||||
| beforeAll(async () => { | beforeAll(async () => { | ||||||
|  | 	jest.setTimeout(20000); | ||||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
| 	access_token = res.data["access_token"]; | 	access_token = res.data["access_token"]; | ||||||
| 	axios_config = { | 	axios_config = { | ||||||
| @@ -86,7 +87,7 @@ describe('adding + updating illegally', () => { | |||||||
| 	it('updating with wrong id should return 406', async () => { | 	it('updating with wrong id should return 406', async () => { | ||||||
| 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | ||||||
| 			"id": added_scan.id + 1, | 			"id": added_scan.id + 1, | ||||||
| 			"station": added_station.id, | 			"track": added_track.id, | ||||||
| 			"runner": added_runner.id | 			"runner": added_runner.id | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		expect(res2.status).toEqual(406); | 		expect(res2.status).toEqual(406); | ||||||
| @@ -95,7 +96,7 @@ describe('adding + updating illegally', () => { | |||||||
| 	it('updating with invalid station should return 404', async () => { | 	it('updating with invalid station should return 404', async () => { | ||||||
| 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | ||||||
| 			"id": added_scan.id, | 			"id": added_scan.id, | ||||||
| 			"station": 9999999999999999, | 			"track": 9999999999999999, | ||||||
| 			"runner": added_runner.id | 			"runner": added_runner.id | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		expect(res2.status).toEqual(404); | 		expect(res2.status).toEqual(404); | ||||||
| @@ -104,7 +105,7 @@ describe('adding + updating illegally', () => { | |||||||
| 	it('updating with invalid runner should return 404', async () => { | 	it('updating with invalid runner should return 404', async () => { | ||||||
| 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | ||||||
| 			"id": added_scan.id, | 			"id": added_scan.id, | ||||||
| 			"station": added_station.id, | 			"track": added_station.id, | ||||||
| 			"runner": 9999999999999999999 | 			"runner": 9999999999999999999 | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		expect(res2.status).toEqual(404); | 		expect(res2.status).toEqual(404); | ||||||
| @@ -211,7 +212,7 @@ describe('adding + updating successfilly', () => { | |||||||
| 	it('updating with new runner should return 200', async () => { | 	it('updating with new runner should return 200', async () => { | ||||||
| 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | ||||||
| 			"id": added_scan.id, | 			"id": added_scan.id, | ||||||
| 			"station": added_station.id, | 			"track": added_track.id, | ||||||
| 			"runner": added_runner2.id | 			"runner": added_runner2.id | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		expect(res2.status).toEqual(200); | 		expect(res2.status).toEqual(200); | ||||||
| @@ -220,7 +221,7 @@ describe('adding + updating successfilly', () => { | |||||||
| 	it('updating with new station should return 200', async () => { | 	it('updating with new station should return 200', async () => { | ||||||
| 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | ||||||
| 			"id": added_scan.id, | 			"id": added_scan.id, | ||||||
| 			"station": added_station2.id, | 			"track": added_track2.id, | ||||||
| 			"runner": added_runner.id | 			"runner": added_runner.id | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
| 		expect(res2.status).toEqual(200); | 		expect(res2.status).toEqual(200); | ||||||
| @@ -229,7 +230,7 @@ describe('adding + updating successfilly', () => { | |||||||
| 	it('updating with valid=false should return 200', async () => { | 	it('updating with valid=false should return 200', async () => { | ||||||
| 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, { | ||||||
| 			"id": added_scan.id, | 			"id": added_scan.id, | ||||||
| 			"station": added_station2.id, | 			"track": added_track2.id, | ||||||
| 			"runner": added_runner.id, | 			"runner": added_runner.id, | ||||||
| 			"valid": false | 			"valid": false | ||||||
| 		}, axios_config); | 		}, axios_config); | ||||||
|   | |||||||
							
								
								
									
										51
									
								
								src/tests/users/user_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								src/tests/users/user_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,51 @@ | |||||||
|  | import axios from 'axios'; | ||||||
|  | import { config } from '../../config'; | ||||||
|  | const base = "http://localhost:" + config.internal_port | ||||||
|  |  | ||||||
|  | let access_token; | ||||||
|  | let axios_config; | ||||||
|  |  | ||||||
|  | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|  |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|  |     access_token = res.data["access_token"]; | ||||||
|  |     axios_config = { | ||||||
|  |         headers: { "authorization": "Bearer " + access_token }, | ||||||
|  |         validateStatus: undefined | ||||||
|  |     }; | ||||||
|  | }); | ||||||
|  |  | ||||||
|  | // --------------- | ||||||
|  | describe('adding + deletion (non-existant)', () => { | ||||||
|  |     it('delete', async () => { | ||||||
|  |         const res2 = await axios.delete(base + '/api/users/0?force=true', axios_config); | ||||||
|  |         expect(res2.status).toEqual(204); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('adding + deletion (successfull)', () => { | ||||||
|  |     let added_user | ||||||
|  |     it('valid user creation with minimal parameters should return 200', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "string", | ||||||
|  |             "middlename": "string", | ||||||
|  |             "lastname": "string", | ||||||
|  |             "email": "demo_123_123_123asdASD@example.com", | ||||||
|  |             "password": "demo_123_123_123asdASD", | ||||||
|  |             "enabled": true | ||||||
|  |         } | ||||||
|  |             , axios_config); | ||||||
|  |         added_user = res.data; | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |     }); | ||||||
|  |     it('delete', async () => { | ||||||
|  |         const res2 = await axios.delete(base + '/api/users/' + added_user.id + "?force=true", axios_config); | ||||||
|  |         expect(res2.status).toEqual(200); | ||||||
|  |         expect(res2.headers['content-type']).toContain("application/json") | ||||||
|  |     }); | ||||||
|  |     it('check if user really was deleted', async () => { | ||||||
|  |         const res3 = await axios.get(base + '/api/users/' + added_user.id, axios_config); | ||||||
|  |         expect(res3.status).toEqual(404); | ||||||
|  |         expect(res3.headers['content-type']).toContain("application/json") | ||||||
|  |     }); | ||||||
|  | }); | ||||||
							
								
								
									
										113
									
								
								src/tests/users/user_post.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										113
									
								
								src/tests/users/user_post.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,113 @@ | |||||||
|  | import axios from 'axios'; | ||||||
|  | import { config } from '../../config'; | ||||||
|  |  | ||||||
|  | const base = "http://localhost:" + config.internal_port | ||||||
|  |  | ||||||
|  | let axios_config = {}; | ||||||
|  |  | ||||||
|  | beforeAll(async () => { | ||||||
|  |     jest.setTimeout(20000); | ||||||
|  |     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||||
|  |     let access_token = res.data["access_token"]; | ||||||
|  |     axios_config = { | ||||||
|  |         headers: { "authorization": "Bearer " + access_token }, | ||||||
|  |         validateStatus: undefined | ||||||
|  |     }; | ||||||
|  | }); | ||||||
|  |  | ||||||
|  | describe('POST /api/users valid', () => { | ||||||
|  |     it('valid user creation with minimal parameters should return 200', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123", | ||||||
|  |             "lastname": "demo_createASD123", | ||||||
|  |             "password": "demo_createASD123", | ||||||
|  |             "email": "demo_createASD123@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |     }); | ||||||
|  |     it('valid user creation with all parameters should return 200', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_2", | ||||||
|  |             "middlename": "demo_createASD123_2", | ||||||
|  |             "lastname": "demo_createASD123_2", | ||||||
|  |             "username": "demo_createASD123_2", | ||||||
|  |             "password": "demo_createASD123_2", | ||||||
|  |             "email": "demo_createASD123_2@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(200); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('POST /api/users invalid -> 400', () => { | ||||||
|  |     it('user creation w/o firstname should return 400', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "lastname": "demo_createASD123_3", | ||||||
|  |             "password": "demo_createASD123_3", | ||||||
|  |             "email": "demo_createASD123_3@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(400); | ||||||
|  |     }); | ||||||
|  |     it('user creation w/o lastname should return 400', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_3", | ||||||
|  |             "password": "demo_createASD123_3", | ||||||
|  |             "email": "demo_createASD123_3@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(400); | ||||||
|  |     }); | ||||||
|  |     it('user creation w/o password should return 400', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_3", | ||||||
|  |             "lastname": "demo_createASD123_3", | ||||||
|  |             "email": "demo_createASD123_3@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(400); | ||||||
|  |     }); | ||||||
|  |     it('user creation w/o email should return 400', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_3", | ||||||
|  |             "lastname": "demo_createASD123_3", | ||||||
|  |             "password": "demo_createASD123_3" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(400); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  | // --------------- | ||||||
|  | describe('POST /api/users invalid -> Password errors', () => { | ||||||
|  |     it('user creation w/ invalid password -> No numbers should return 406', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_4", | ||||||
|  |             "lastname": "demo_createASD123_4", | ||||||
|  |             "password": "demo_createASD", | ||||||
|  |             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(406); | ||||||
|  |     }); | ||||||
|  |     it('user creation w/ invalid password -> No uppercase should return 406', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_4", | ||||||
|  |             "lastname": "demo_createASD123_4", | ||||||
|  |             "password": "demo_create_4", | ||||||
|  |             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(406); | ||||||
|  |     }); | ||||||
|  |     it('user creation w/ invalid password -> No lowercase should return 406', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_4", | ||||||
|  |             "lastname": "demo_createASD123_4", | ||||||
|  |             "password": "DEMO123123ASD", | ||||||
|  |             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(406); | ||||||
|  |     }); | ||||||
|  |     it('user creation w/ invalid password -> Too short should return 406', async () => { | ||||||
|  |         const res = await axios.post(base + '/api/users', { | ||||||
|  |             "firstname": "demo_createASD123_4", | ||||||
|  |             "lastname": "demo_createASD123_4", | ||||||
|  |             "password": "1Aa_", | ||||||
|  |             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||||
|  |         }, axios_config); | ||||||
|  |         expect(res.status).toEqual(406); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
		Reference in New Issue
	
	Block a user