Compare commits
	
		
			89 Commits
		
	
	
		
			6163f0a90b
			...
			v0.13.2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e8b2e6f261 | |||
| 39f3b0e01f | |||
| edaf255e8f | |||
| 41c4ed4d0f | |||
| f2bd88aadf | |||
| 67a3661448 | |||
| 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 | 
							
								
								
									
										89
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										89
									
								
								.drone.yml
									
									
									
									
									
								
							| @@ -19,10 +19,17 @@ get: | ||||
|   path: odit-git-bot | ||||
|   name: sshkey | ||||
|  | ||||
| --- | ||||
| kind: secret | ||||
| name: ci_token | ||||
| get: | ||||
|   path: odit-ci-bot | ||||
|   name: apikey | ||||
|  | ||||
| --- | ||||
| kind: pipeline | ||||
| type: kubernetes | ||||
| name: tests:node_latest | ||||
| name: tests:node | ||||
| clone: | ||||
|   disable: true | ||||
| steps: | ||||
| @@ -32,7 +39,7 @@ steps: | ||||
|       - git clone $DRONE_REMOTE_URL . | ||||
|       - git checkout $DRONE_SOURCE_BRANCH | ||||
|   - name: run tests | ||||
|     image: node:latest | ||||
|     image: registry.odit.services/hub/library/node:19.5.0-alpine3.16 | ||||
|     commands: | ||||
|       - yarn | ||||
|       - yarn test:ci | ||||
| @@ -54,53 +61,23 @@ steps: | ||||
|       - git clone $DRONE_REMOTE_URL . | ||||
|       - git checkout dev | ||||
|   - name: build dev | ||||
|     image: plugins/docker | ||||
|     depends_on: [clone] | ||||
|     depends_on: ["clone"] | ||||
|     image: registry.odit.services/library/drone-kaniko | ||||
|     settings: | ||||
|       username: | ||||
|         from_secret: docker_username | ||||
|       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: | ||||
|         - dev | ||||
|       cache: true | ||||
|       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: | ||||
|   branch: | ||||
| @@ -125,17 +102,22 @@ steps: | ||||
|       - git checkout main | ||||
|   - name: build latest | ||||
|     depends_on: ["clone"] | ||||
|     image: plugins/docker | ||||
|     image: registry.odit.services/library/drone-kaniko | ||||
|     settings: | ||||
|       username: | ||||
|         from_secret: docker_username | ||||
|       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: | ||||
|         - latest | ||||
|       cache: true | ||||
|       registry: registry.odit.services | ||||
|       mtu: 1000 | ||||
|   - name: push merge to repo | ||||
|     depends_on: ["clone"] | ||||
|     image: appleboy/drone-git-push | ||||
| @@ -159,30 +141,35 @@ name: build:tags | ||||
|  | ||||
| steps: | ||||
|   - name: build $DRONE_TAG | ||||
|     image: plugins/docker | ||||
|     depends_on: [clone] | ||||
|     depends_on: ["clone"] | ||||
|     image: registry.odit.services/library/drone-kaniko | ||||
|     settings: | ||||
|       username: | ||||
|         from_secret: docker_username | ||||
|       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: | ||||
|         - '${DRONE_TAG}' | ||||
|         - "${DRONE_TAG}" | ||||
|       cache: true | ||||
|       registry: registry.odit.services | ||||
|       mtu: 1000 | ||||
|   - name: trigger node lib build | ||||
|     image: idcooldi/drone-webhook | ||||
|     settings: | ||||
|       urls: https://ci.odit.services/api/repos/lfk/lfk-client-node/builds?SOURCE_TAG=${DRONE_TAG} | ||||
|       bearer: | ||||
|         from_secret: BOT_DRONE_KEY | ||||
|         from_secret: ci_token | ||||
|   - name: trigger js lib build | ||||
|     image: idcooldi/drone-webhook | ||||
|     settings: | ||||
|       urls: https://ci.odit.services/api/repos/lfk/lfk-client-js/builds?SOURCE_TAG=${DRONE_TAG} | ||||
|       bearer: | ||||
|         from_secret: BOT_DRONE_KEY | ||||
|         from_secret: ci_token | ||||
| trigger: | ||||
|   event: | ||||
|     - tag | ||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -136,3 +136,4 @@ build | ||||
| lib | ||||
| /oss-attribution | ||||
| *.tmp | ||||
| pnpm-lock.yaml | ||||
|   | ||||
							
								
								
									
										135
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										135
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,8 +2,143 @@ | ||||
|  | ||||
| All notable changes to this project will be documented in this file. Dates are displayed in UTC. | ||||
|  | ||||
| #### [v0.13.2](https://git.odit.services/lfk/backend/compare/v0.13.1...v0.13.2) | ||||
|  | ||||
| - Merge pull request 'move selfservice magic link endpoint to 15min rate limit' (#200) from feature/runner-selfservice-login-link-rate-limit into dev [`39f3b0e`](https://git.odit.services/lfk/backend/commit/39f3b0e01f03bfbcfcb0ea08d697268ce068e63d) | ||||
| - move to 15min limit [`edaf255`](https://git.odit.services/lfk/backend/commit/edaf255e8f609185dcd6c2c0cd2e8b007b785e0c) | ||||
| - Merge pull request 'Releases 0.12.0 and 0.13.0' (#199) from dev into main [`41c4ed4`](https://git.odit.services/lfk/backend/commit/41c4ed4d0faaed382801bbe480f31dafa6f3912d) | ||||
|  | ||||
| #### [v0.13.1](https://git.odit.services/lfk/backend/compare/v0.13.0...v0.13.1) | ||||
|  | ||||
| > 2 February 2023 | ||||
|  | ||||
| - 🚀Bumped version to v0.13.1 [`f2bd88a`](https://git.odit.services/lfk/backend/commit/f2bd88aadfcb6ffa0485ea6afac8c7664a37f5f4) | ||||
| - Updated description [`67a3661`](https://git.odit.services/lfk/backend/commit/67a36614485b2ea83c2de41e0684708b95a05b32) | ||||
|  | ||||
| #### [v0.13.0](https://git.odit.services/lfk/backend/compare/v0.12.0...v0.13.0) | ||||
|  | ||||
| > 2 February 2023 | ||||
|  | ||||
| - Added faker for testing [`e184673`](https://git.odit.services/lfk/backend/commit/e1846739638905aab6ba7e059fd2cbf8ff467bf3) | ||||
| - 📖New license file version [CI SKIP] [skip ci] [`2b641fa`](https://git.odit.services/lfk/backend/commit/2b641faa29c47d95f69983770dc4ab37e674604f) | ||||
| - 🚀Bumped version to v0.13.0 [`0c763a2`](https://git.odit.services/lfk/backend/commit/0c763a2dfd39607b480d9aff7d3c883791f41700) | ||||
| - Updated selfservice tests to prevent email duplication [`9bc80aa`](https://git.odit.services/lfk/backend/commit/9bc80aac8aab9b4dedc26c9bc3ce705d7fe9c0bf) | ||||
| - Moved license and changelog export to releaseit hooks [`77c6303`](https://git.odit.services/lfk/backend/commit/77c6303014578edbbadeeaa790f7974bde2a9764) | ||||
| - Updated readme [`4cdba8b`](https://git.odit.services/lfk/backend/commit/4cdba8bc77ce543f6fb636711b8728bce794eac7) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`ae14d6c`](https://git.odit.services/lfk/backend/commit/ae14d6c74f9205440b41ca5fdbd052ca449148fc) | ||||
| - Added selfservice runner create check to prevent duplicate email [`68cd746`](https://git.odit.services/lfk/backend/commit/68cd746a9f3360b3630a9ba570213d2aa62497b4) | ||||
| - Updated tests for new login in selfservice [`39aa759`](https://git.odit.services/lfk/backend/commit/39aa7598b7cd0ecb0f077f50ebdd31c6e205f06d) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`9fa8b93`](https://git.odit.services/lfk/backend/commit/9fa8b93c08ee52335b18e743f9d205b19e6095c6) | ||||
| - Moved changelog generation to package script [`a7297ff`](https://git.odit.services/lfk/backend/commit/a7297ff933ae1372a9d508cdae1a54d2ebbcc647) | ||||
| - Merge pull request 'feature/197-duplicate_runner_mail' (#198) from feature/197-duplicate_runner_mail into dev [`4b676bc`](https://git.odit.services/lfk/backend/commit/4b676bc85336c2d494e9e74823d38deec5cc0400) | ||||
| - Updated logo url [`4433ddb`](https://git.odit.services/lfk/backend/commit/4433ddb1e15a35481728670e22049200644bf337) | ||||
| - depends_on: ["clone"] [`9cc66ee`](https://git.odit.services/lfk/backend/commit/9cc66eebdfe8e7a2888bbc97197d1756ff44de30) | ||||
| - Fixed typo [`19a290c`](https://git.odit.services/lfk/backend/commit/19a290c3a931ead0d9ae9ebb0985bfbaac54df59) | ||||
| - Rename selfservice forgot to login [`69651d9`](https://git.odit.services/lfk/backend/commit/69651d9f6cd826b6d4720f164897a2a72a57c851) | ||||
| - 📖New license file version [CI SKIP] [skip ci] [`6fd246f`](https://git.odit.services/lfk/backend/commit/6fd246f43cb3f4d0ccb6e017ee699889ba17daac) | ||||
| - Add git for changelog fun [`2fa56b8`](https://git.odit.services/lfk/backend/commit/2fa56b82d1e082a1deae943e5fca5101f24e3ef5) | ||||
|  | ||||
| #### [v0.12.0](https://git.odit.services/lfk/backend/compare/v0.11.1...v0.12.0) | ||||
|  | ||||
| > 2 February 2023 | ||||
|  | ||||
| - Pinned versions [`a6d5693`](https://git.odit.services/lfk/backend/commit/a6d5693ccdeb25b15a09af8f7438142114268807) | ||||
| - Drone -> Kaniko based builds [`0e78951`](https://git.odit.services/lfk/backend/commit/0e789513008085d0db94fc3b2dd9e74a5e583049) | ||||
| - Drone images to odit registry [`6ad56b3`](https://git.odit.services/lfk/backend/commit/6ad56b31269bf19a740c1b6b1a303a8a9d7d59d0) | ||||
| - Bumped container base images [`d95c6d3`](https://git.odit.services/lfk/backend/commit/d95c6d33657f6aa977a8ebfefad7e199bb1cc9c3) | ||||
| - Enabled tag via release script [`9217421`](https://git.odit.services/lfk/backend/commit/92174212213f874e41c9472a927bcf87b963ac94) | ||||
| - Pinned pnpm for builds [`4570845`](https://git.odit.services/lfk/backend/commit/4570845b3e1bd00c228fe1b09b658c24e20aba7f) | ||||
| - 🚀Bumped version to v0.12.0 [`4c10e20`](https://git.odit.services/lfk/backend/commit/4c10e20b91a8101ee37b230373ceb3e024582b41) | ||||
| - Ignore pnpm lock [`1f2c8ab`](https://git.odit.services/lfk/backend/commit/1f2c8abb22f3ff1e61b7350b517bd699c3e315f6) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`31b258b`](https://git.odit.services/lfk/backend/commit/31b258b4ce82213144160a4233b7fd127e456776) | ||||
|  | ||||
| #### [v0.11.1](https://git.odit.services/lfk/backend/compare/v0.11.0...v0.11.1) | ||||
|  | ||||
| > 22 April 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.11.1' (#196) from dev into main [`f19f280`](https://git.odit.services/lfk/backend/commit/f19f2808d88414f1877c01f10996dac68b6f9617) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`2229cdf`](https://git.odit.services/lfk/backend/commit/2229cdf20db1a98f9f76a99fa9d3f463cdf6d804) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`348fe52`](https://git.odit.services/lfk/backend/commit/348fe52c42cfa32239b703041820f725e147154e) | ||||
| - Now prefixing runnercards with 2 [`8a82e05`](https://git.odit.services/lfk/backend/commit/8a82e059b74ceabf43c9cbfe9c9b89ef6ce15a28) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`3b9cd2e`](https://git.odit.services/lfk/backend/commit/3b9cd2e1bbbe8e69c3883233a98f286d768c2b79) | ||||
| - Added fix for the appended 2 [`eb526fb`](https://git.odit.services/lfk/backend/commit/eb526fb57faf631fd6e84af99af738ab1b3481c7) | ||||
| - 🚀Bumped version to v0.11.1 [`95320ca`](https://git.odit.services/lfk/backend/commit/95320ca1bccc2886553accea6a428aadffda0a27) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`f2d127f`](https://git.odit.services/lfk/backend/commit/f2d127fc98d75ce658424624abd382c087737ca0) | ||||
|  | ||||
| #### [v0.11.0](https://git.odit.services/lfk/backend/compare/v0.10.2...v0.11.0) | ||||
|  | ||||
| > 14 April 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.11.0' (#195) from dev into main [`3220b19`](https://git.odit.services/lfk/backend/commit/3220b194d4c704835d6d106ec4d9d54a17a38b62) | ||||
| - Fixed spelling [`da266a8`](https://git.odit.services/lfk/backend/commit/da266a8dd68dbb575997ae343624982b690486ec) | ||||
| - Updated tests [`01ed514`](https://git.odit.services/lfk/backend/commit/01ed51489eb92fff907d46a930ecf0b0eb5cad2b) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`520608a`](https://git.odit.services/lfk/backend/commit/520608aef05b21f4daadf55cfc8caddba06b8f01) | ||||
| - Added payedDonationAmount to donor and responsedonor [`8ae4b85`](https://git.odit.services/lfk/backend/commit/8ae4b8582749332f4fb081eee0c520293347001f) | ||||
| - Responses now contain the donation status [`34dbaaa`](https://git.odit.services/lfk/backend/commit/34dbaaafe0422234848eabe3f52b26879c9e5a49) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`278c4a6`](https://git.odit.services/lfk/backend/commit/278c4a6a415434487a92ff66f8114bb2547aac48) | ||||
| - Marked payedAmount as optional during creation and/or update [`0636616`](https://git.odit.services/lfk/backend/commit/0636616dad5afb41ffe47a857d91ac75b4f2f20a) | ||||
| - Added payed amount fileld to donation class [`b8fbb72`](https://git.odit.services/lfk/backend/commit/b8fbb72fa0b659c9acc406c72a8a59c2174351b4) | ||||
| - Added status to tests [`30c6d3d`](https://git.odit.services/lfk/backend/commit/30c6d3d8db9fe37a51e596a73add8b87e8616e54) | ||||
| - Added payed amount to response class [`d64f470`](https://git.odit.services/lfk/backend/commit/d64f470b608b3f179ec77da0210de51c328ef3f2) | ||||
| - 📖New license file version [CI SKIP] [skip ci] [`a2f0d81`](https://git.odit.services/lfk/backend/commit/a2f0d814fc782ad440500e7d6ec779b6ab7f0ac6) | ||||
| - 🚀Bumped version to v0.11.0 [`3558e99`](https://git.odit.services/lfk/backend/commit/3558e9909088647bd4f1f4334f50c07a5ef00214) | ||||
| - Merge pull request 'Donation payment management feature/193-donation_payments' (#194) from feature/193-donation_payments into dev [`6df5f63`](https://git.odit.services/lfk/backend/commit/6df5f634f3123e04c015889573ccc5674a8bab27) | ||||
| - Added payed amount to crealte classes [`71542bc`](https://git.odit.services/lfk/backend/commit/71542bc3887b97c15436d03280e49f7b3f0fcb06) | ||||
| - Added donation status enum [`b4c31ee`](https://git.odit.services/lfk/backend/commit/b4c31ee9b5b35d6e11b07f50f3d30ca12e0f7728) | ||||
| - Added payed amount to update classes [`9930742`](https://git.odit.services/lfk/backend/commit/99307423c533f8cde847b59a80bffc2ff42c9769) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`0c61ff4`](https://git.odit.services/lfk/backend/commit/0c61ff457d02f750efa457dd75464187683b037a) | ||||
| - Added mssing check to tests [`6c14ed9`](https://git.odit.services/lfk/backend/commit/6c14ed9c89eadc1a10db8c912d8ea2711a518766) | ||||
| - No longer answering with null, but 0 [`49b174f`](https://git.odit.services/lfk/backend/commit/49b174f29f63e963e600d74b6923a20211d832eb) | ||||
| - Saved missing file [`8fe3243`](https://git.odit.services/lfk/backend/commit/8fe32436935d7cd6c17eae1e138383d3b714e1ba) | ||||
|  | ||||
| #### [v0.10.2](https://git.odit.services/lfk/backend/compare/v0.10.1...v0.10.2) | ||||
|  | ||||
| > 7 April 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.10.2' (#192) from dev into main [`1d82f65`](https://git.odit.services/lfk/backend/commit/1d82f65b0d3a32d10c1a10c991353c18696d58bf) | ||||
| - Added first selfservice test [`057ae0d`](https://git.odit.services/lfk/backend/commit/057ae0d79758cd627d6d128406a0d201b6b7ad9b) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`b7ad5d3`](https://git.odit.services/lfk/backend/commit/b7ad5d3a31b8b4f5960852d3ac38af133719ebcd) | ||||
| - First try of the laptime sort [`4471e57`](https://git.odit.services/lfk/backend/commit/4471e57438582d55ff846fd69c2cfcc26b40df2a) | ||||
| - Potential fix for all remaining errors [`377d5da`](https://git.odit.services/lfk/backend/commit/377d5dadb2a14cb2d70e0b2dc77026f51b3fb51c) | ||||
| - At least one fewer test should fail now [`87f444c`](https://git.odit.services/lfk/backend/commit/87f444c30d69d65a9f918c63631a859a389eeee3) | ||||
| - Tried workaround for no availdable stats [`8f0f795`](https://git.odit.services/lfk/backend/commit/8f0f795a709db216396998b68b8bbd64ff4d44ff) | ||||
| - Reverted temp bugfix [`4603a84`](https://git.odit.services/lfk/backend/commit/4603a84f16fb53a14d1792447100f5b470969dd0) | ||||
| - Fixed sorting algo [`988f17a`](https://git.odit.services/lfk/backend/commit/988f17a795bb2d867e9d1d8e78051dff1a14ec30) | ||||
| - Added runners stats tests [`7111068`](https://git.odit.services/lfk/backend/commit/7111068361e00cc1308664a3ae650a56e28c015c) | ||||
| - Added basic laptime endpoint [`cb71fcd`](https://git.odit.services/lfk/backend/commit/cb71fcd13bc61e6214e2fd7b70e72094749463d3) | ||||
| - Added orgs by donations stats tests [`d4a02e7`](https://git.odit.services/lfk/backend/commit/d4a02e7db2ff4976be21605e31aac2f3c82a49c0) | ||||
| - Added teams stats endpoint tests [`b9a7dc8`](https://git.odit.services/lfk/backend/commit/b9a7dc84f05441445453193974b2a793b5197fa5) | ||||
| - Now resolving all missing relations [`257f320`](https://git.odit.services/lfk/backend/commit/257f320ee3bf6429c4314c64023520366f9f730b) | ||||
| - Added min laptime to StatsRunner [`51daf96`](https://git.odit.services/lfk/backend/commit/51daf969cf74792b2c2f2f16ce4359d9fca47bc8) | ||||
| - Fixed sorting [`7b15c2d`](https://git.odit.services/lfk/backend/commit/7b15c2d88b14e7279aad97b0c950202ddb5acaaa) | ||||
| - Fixed top-ten bein top 9 [`a6a526d`](https://git.odit.services/lfk/backend/commit/a6a526dc5d8b1613ea34e82e477081349e764aec) | ||||
| - added new ci secret [`5633e85`](https://git.odit.services/lfk/backend/commit/5633e85f41cb69b10fd8a86f57f1bd2f50848f7b) | ||||
| - Added temp console log for test [`22cae39`](https://git.odit.services/lfk/backend/commit/22cae39bd351ca285880e50187ea0d46a7a26437) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`610988e`](https://git.odit.services/lfk/backend/commit/610988ec16b8df61cca61cf2252a469d30318d81) | ||||
| - Added temp console log for ci debugging [`4a73eab`](https://git.odit.services/lfk/backend/commit/4a73eab134c3a9f58771be996bc8811b62cf378e) | ||||
| - Temp disabled runners by donations test [`0b07a53`](https://git.odit.services/lfk/backend/commit/0b07a53ed209c6193ead3c4d199545e22333ab32) | ||||
| - Updated default docker-compose [`f8baca5`](https://git.odit.services/lfk/backend/commit/f8baca5ab2c56b906751bc7edd71477456ad91f3) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`dd6d799`](https://git.odit.services/lfk/backend/commit/dd6d799c847fc96aec1be8f2667ad371890076fb) | ||||
| - Resolved missing parentgroup relation [`23bd432`](https://git.odit.services/lfk/backend/commit/23bd432c5f33a0863217120d97e2e4ea52a08baf) | ||||
| - Removed console logs for now working tests [`71b33ab`](https://git.odit.services/lfk/backend/commit/71b33ab05b53b62c8b271bd2995c94b2fc212dfd) | ||||
| - Fixed typo in test [`cbcb829`](https://git.odit.services/lfk/backend/commit/cbcb829fbde3a4a5e7f94de5dcf24d854c5fc257) | ||||
| - Ptotential fix for stats failing [`dcdbdd1`](https://git.odit.services/lfk/backend/commit/dcdbdd15acfe6eef4220b7ed66db60d78107d1f9) | ||||
| - 🚀Bumped version to v0.10.2 [`6e236ed`](https://git.odit.services/lfk/backend/commit/6e236ede145e164ee84543fb62404b4776550973) | ||||
| - Merge pull request 'stats/runners/laptime feature/190-runners_laptime' (#191) from feature/190-runners_laptime into dev [`a694ad2`](https://git.odit.services/lfk/backend/commit/a694ad225c68fa23152402acba871c857433cc70) | ||||
| - Removed all useless console.logs [`95e1eec`](https://git.odit.services/lfk/backend/commit/95e1eec313a79458dd75307a9d0f8319af0d0904) | ||||
| - Pinned testing container tag to prod container tag [`10221b9`](https://git.odit.services/lfk/backend/commit/10221b9f2e4493080f3ff095d9772bcfd0ac50eb) | ||||
| - Now resolving all relations for orgs by distance [`4a294b1`](https://git.odit.services/lfk/backend/commit/4a294b1e17c44294274b06748ec8141812c2d217) | ||||
| - Added temp console log [`720774f`](https://git.odit.services/lfk/backend/commit/720774fcf47c38601ab88d5d74cfcd0e47b21acf) | ||||
| - Removed console log for passing tests [`132b48c`](https://git.odit.services/lfk/backend/commit/132b48cf2a9e990a5e830c744ed8244bd25e8b3a) | ||||
| - Removed console log [`1d8c8c8`](https://git.odit.services/lfk/backend/commit/1d8c8c8e9cefa58449f7abb2481d9396fe37ba20) | ||||
| - Temp test logging workaround [`bf686e8`](https://git.odit.services/lfk/backend/commit/bf686e89e02998ccc80c838ef890c736c252634c) | ||||
| - Temp test logging workaround [`6163f0a`](https://git.odit.services/lfk/backend/commit/6163f0a90b3721d3a1488f89cbb39ddff7152241) | ||||
| - Removed test for content type [`63964fb`](https://git.odit.services/lfk/backend/commit/63964fbf2c41d9b90f995f056e9db65ab07d54a8) | ||||
|  | ||||
| #### [v0.10.1](https://git.odit.services/lfk/backend/compare/v0.10.0...v0.10.1) | ||||
|  | ||||
| > 3 April 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.10.1' (#189) from dev into main [`e89e07d`](https://git.odit.services/lfk/backend/commit/e89e07d0fc99f14148b01204fb8ed39e2da77e38) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`69afd4d`](https://git.odit.services/lfk/backend/commit/69afd4d5877401eb46df430f43a7feb273abda1e) | ||||
| - 🚀Bumped version to v0.10.1 [`24d152f`](https://git.odit.services/lfk/backend/commit/24d152fdc8fe17fffa2f2a718d7145ba8a91d79c) | ||||
|   | ||||
							
								
								
									
										13
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								Dockerfile
									
									
									
									
									
								
							| @@ -1,16 +1,15 @@ | ||||
| # Typescript Build | ||||
| FROM node:14.15.1-alpine3.12 | ||||
| FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 | ||||
| WORKDIR /app | ||||
| COPY package.json ./ | ||||
| RUN npm i -g pnpm | ||||
| RUN pnpm i | ||||
| RUN npx pnpm@7.26.3 i | ||||
| COPY tsconfig.json ormconfig.js ./ | ||||
| COPY src ./src | ||||
| RUN pnpm run build | ||||
| RUN npm run build | ||||
|  | ||||
| # 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 ./ | ||||
| RUN npm i -g pnpm | ||||
| RUN pnpm i --prod | ||||
| RUN npx pnpm@7.26.3 i --prod | ||||
| COPY --from=0 /app/dist dist | ||||
| 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 use the `test:ci:generate_env` package script to generate a example env (uses bs data as test server and ignores the errors). | ||||
|  | ||||
| | Name | Type | Default | Description | ||||
| | - | - | - | - | ||||
| | APP_PORT | Number | 4010 | The port the backend server listens on. Is optional. | ||||
| | DB_TYPE | String | N/A | The type of the db u want to use. It has to be supported by typeorm. Possible: `sqlite`, `mysql`, `postgresql` | ||||
| | DB_HOST | String | N/A | The db's host's ip-address/fqdn or file path for sqlite | ||||
| | DB_PORT | String | N/A | The db's port | ||||
| | DB_USER | String | N/A | The user for accessing the db | ||||
| | DB_PASSWORD | String | N/A | The user's password for accessing the db | ||||
| | DB_NAME | String | N/A | The db's name | ||||
| | NODE_ENV | String | dev | The apps env - influences debug info. Also when the env is set to "test", mailing errors get ignored. | ||||
| | POSTALCODE_COUNTRYCODE | String/CountryCode | N/A | The countrycode used to validate address's postal codes | ||||
| | PHONE_COUNTRYCODE | String/CountryCode | null (international) | The countrycode used to validate phone numers | ||||
| | SEED_TEST_DATA | Boolean | False | If you want the app to seed some example data set this to true | ||||
| | MAILER_URL | String(Url) | N/A | The mailer's base url (no trailing slash) | ||||
| | MAILER_KEY | String | N/A | The mailer's api key. | ||||
| | IMPRINT_URL | String(Url) | /imprint | The link to a imprint page for the system (Defaults to the frontend's imprint) | ||||
| | PRIVACY_URL | String(Url) | /privacy | The link to a privacy page for the system (Defaults to the frontend's privacy page) | ||||
| | Name                   | Type               | Default              | Description                                                                                                    | | ||||
| | ---------------------- | ------------------ | -------------------- | -------------------------------------------------------------------------------------------------------------- | | ||||
| | APP_PORT               | Number             | 4010                 | The port the backend server listens on. Is optional.                                                           | | ||||
| | DB_TYPE                | String             | N/A                  | The type of the db u want to use. It has to be supported by typeorm. Possible: `sqlite`, `mysql`, `postgresql` | | ||||
| | DB_HOST                | String             | N/A                  | The db's host's ip-address/fqdn or file path for sqlite                                                        | | ||||
| | DB_PORT                | String             | N/A                  | The db's port                                                                                                  | | ||||
| | DB_USER                | String             | N/A                  | The user for accessing the db                                                                                  | | ||||
| | DB_PASSWORD            | String             | N/A                  | The user's password for accessing the db                                                                       | | ||||
| | DB_NAME                | String             | N/A                  | The db's name                                                                                                  | | ||||
| | NODE_ENV               | String             | dev                  | The apps env - influences debug info. Also when the env is set to "test", mailing errors get ignored.          | | ||||
| | POSTALCODE_COUNTRYCODE | String/CountryCode | N/A                  | The countrycode used to validate address's postal codes                                                        | | ||||
| | PHONE_COUNTRYCODE      | String/CountryCode | null (international) | The countrycode used to validate phone numers                                                                  | | ||||
| | SEED_TEST_DATA         | Boolean            | False                | If you want the app to seed some example data set this to true                                                 | | ||||
| | MAILER_URL             | String(Url)        | N/A                  | The mailer's base url (no trailing slash)                                                                      | | ||||
| | MAILER_KEY             | String             | N/A                  | The mailer's api key.                                                                                          | | ||||
| | IMPRINT_URL            | String(Url)        | /imprint             | The link to a imprint page for the system (Defaults to the frontend's imprint)                                 | | ||||
| | PRIVACY_URL            | String(Url)        | /privacy             | The link to a privacy page for the system (Defaults to the frontend's privacy page)                            | | ||||
|  | ||||
|  | ||||
| ## Recommended Editor | ||||
| @@ -85,8 +85,8 @@ yarn docs | ||||
|    * A new release tag automaticly triggers the release ci pipeline | ||||
| * main: Protected "release" branch | ||||
|    * 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 | ||||
|    * New releases get created as tags from this    | ||||
|    * The dev tag of the docker image get's build from this | ||||
|    * Only push minor changes to this branch! | ||||
|    * To merge a feature branch into this please create a pull request | ||||
|   | ||||
| @@ -11,8 +11,12 @@ services: | ||||
|       DB_PORT: bla | ||||
|       DB_USER: bla | ||||
|       DB_PASSWORD: bla | ||||
|       DB_NAME: dev.sqlite | ||||
|       DB_NAME: ./db.sqlite | ||||
|       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 | ||||
|       # DB_TYPE: postgres | ||||
|       # DB_HOST: backend_db | ||||
|   | ||||
							
								
								
									
										117
									
								
								licenses.md
									
									
									
									
									
								
							
							
						
						
									
										117
									
								
								licenses.md
									
									
									
									
									
								
							| @@ -444,6 +444,25 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||
| **License**: MIT | ||||
| **Description**: A node.js driver for mysql. It is written in JavaScript, does not require compiling, and is 100% MIT licensed. | ||||
| ## 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 | ||||
| @@ -696,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. | ||||
|   | ||||
|  | ||||
| # @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 | ||||
| **Author**: ODIT.Services | ||||
| **Repo**: [object Object] | ||||
| @@ -926,6 +1014,35 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 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 | ||||
| **Author**: undefined | ||||
| **Repo**: [object Object] | ||||
|   | ||||
							
								
								
									
										96
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										96
									
								
								package.json
									
									
									
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@odit/lfk-backend", | ||||
|   "version": "0.10.1", | ||||
|   "version": "0.13.2", | ||||
|   "main": "src/app.ts", | ||||
|   "repository": "https://git.odit.services/lfk/backend", | ||||
|   "author": { | ||||
| @@ -23,52 +23,54 @@ | ||||
|   "license": "CC-BY-NC-SA-4.0", | ||||
|   "dependencies": { | ||||
|     "@odit/class-validator-jsonschema": "2.1.1", | ||||
|     "argon2": "^0.27.1", | ||||
|     "axios": "^0.21.1", | ||||
|     "body-parser": "^1.19.0", | ||||
|     "check-password-strength": "^2.0.2", | ||||
|     "argon2": "0.27.1", | ||||
|     "axios": "0.21.1", | ||||
|     "body-parser": "1.19.0", | ||||
|     "check-password-strength": "2.0.2", | ||||
|     "class-transformer": "0.3.1", | ||||
|     "class-validator": "^0.13.1", | ||||
|     "consola": "^2.15.0", | ||||
|     "cookie": "^0.4.1", | ||||
|     "cookie-parser": "^1.4.5", | ||||
|     "cors": "^2.8.5", | ||||
|     "csvtojson": "^2.0.10", | ||||
|     "dotenv": "^8.2.0", | ||||
|     "express": "^4.17.1", | ||||
|     "jsonwebtoken": "^8.5.1", | ||||
|     "libphonenumber-js": "^1.9.9", | ||||
|     "mysql": "^2.18.1", | ||||
|     "pg": "^8.5.1", | ||||
|     "reflect-metadata": "^0.1.13", | ||||
|     "class-validator": "0.13.1", | ||||
|     "consola": "2.15.0", | ||||
|     "cookie": "0.4.1", | ||||
|     "cookie-parser": "1.4.5", | ||||
|     "cors": "2.8.5", | ||||
|     "csvtojson": "2.0.10", | ||||
|     "dotenv": "8.2.0", | ||||
|     "express": "4.17.1", | ||||
|     "jsonwebtoken": "8.5.1", | ||||
|     "libphonenumber-js": "1.9.9", | ||||
|     "mysql": "2.18.1", | ||||
|     "pg": "8.5.1", | ||||
|     "reflect-metadata": "0.1.13", | ||||
|     "routing-controllers": "0.9.0-alpha.6", | ||||
|     "routing-controllers-openapi": "^2.2.0", | ||||
|     "routing-controllers-openapi": "2.2.0", | ||||
|     "sqlite3": "5.0.0", | ||||
|     "typeorm": "^0.2.30", | ||||
|     "typeorm-routing-controllers-extensions": "^0.2.0", | ||||
|     "typeorm-seeding": "^1.6.1", | ||||
|     "uuid": "^8.3.2", | ||||
|     "validator": "^13.5.2" | ||||
|     "typeorm": "0.2.30", | ||||
|     "typeorm-routing-controllers-extensions": "0.2.0", | ||||
|     "typeorm-seeding": "1.6.1", | ||||
|     "uuid": "8.3.2", | ||||
|     "validator": "13.5.2" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "@odit/license-exporter": "^0.0.9", | ||||
|     "@types/cors": "^2.8.9", | ||||
|     "@types/csvtojson": "^1.1.5", | ||||
|     "@types/express": "^4.17.11", | ||||
|     "@types/jest": "^26.0.20", | ||||
|     "@types/jsonwebtoken": "^8.5.0", | ||||
|     "@types/node": "^14.14.22", | ||||
|     "@types/uuid": "^8.3.0", | ||||
|     "cp-cli": "^2.0.0", | ||||
|     "jest": "^26.6.3", | ||||
|     "nodemon": "^2.0.7", | ||||
|     "release-it": "^14.2.2", | ||||
|     "rimraf": "^3.0.2", | ||||
|     "start-server-and-test": "^1.11.7", | ||||
|     "ts-jest": "^26.5.0", | ||||
|     "ts-node": "^9.1.1", | ||||
|     "typedoc": "^0.20.19", | ||||
|     "typescript": "^4.1.3" | ||||
|     "@faker-js/faker": "^7.6.0", | ||||
|     "@odit/license-exporter": "0.0.9", | ||||
|     "@types/cors": "2.8.9", | ||||
|     "@types/csvtojson": "1.1.5", | ||||
|     "@types/express": "4.17.11", | ||||
|     "@types/jest": "26.0.20", | ||||
|     "@types/jsonwebtoken": "8.5.0", | ||||
|     "@types/node": "14.14.22", | ||||
|     "@types/uuid": "8.3.0", | ||||
|     "auto-changelog": "^2.4.0", | ||||
|     "cp-cli": "2.0.0", | ||||
|     "jest": "26.6.3", | ||||
|     "nodemon": "2.0.7", | ||||
|     "release-it": "14.2.2", | ||||
|     "rimraf": "3.0.2", | ||||
|     "start-server-and-test": "1.11.7", | ||||
|     "ts-jest": "26.5.0", | ||||
|     "ts-node": "9.1.1", | ||||
|     "typedoc": "0.20.19", | ||||
|     "typescript": "4.1.3" | ||||
|   }, | ||||
|   "scripts": { | ||||
|     "dev": "nodemon src/app.ts", | ||||
| @@ -82,6 +84,7 @@ | ||||
|     "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", | ||||
|     "licenses:export": "license-exporter --markdown", | ||||
|     "changelog:export": "auto-changelog --commit-limit false -p -u --hide-credit", | ||||
|     "release": "release-it --only-version" | ||||
|   }, | ||||
|   "release-it": { | ||||
| @@ -90,11 +93,16 @@ | ||||
|       "requireCleanWorkingDir": false, | ||||
|       "commitMessage": "🚀Bumped version to v${version}", | ||||
|       "requireBranch": "dev", | ||||
|       "push": false, | ||||
|       "tag": false | ||||
|       "push": true, | ||||
|       "tag": true, | ||||
|       "tagName": "v${version}", | ||||
|       "tagAnnotation": "v${version}" | ||||
|     }, | ||||
|     "npm": { | ||||
|       "publish": false | ||||
|     }, | ||||
|     "hooks": { | ||||
|       "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md" | ||||
|     } | ||||
|   }, | ||||
|   "nodemonConfig": { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Request } from "express"; | ||||
| import * as jwt from "jsonwebtoken"; | ||||
| import { Body, Delete, 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 { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { config } from '../config'; | ||||
| @@ -116,10 +116,10 @@ export class RunnerSelfServiceController { | ||||
| 		return scan.toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Post('/runners/forgot') | ||||
| 	@Post('/runners/login') | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@OnUndefined(ResponseEmpty) | ||||
| 	@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).' }) | ||||
| 	@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice magic-login-link to be sent to your mail address (rate limited to one mail every 15mins).' }) | ||||
| 	async requestNewToken(@QueryParam('mail') mail: string, @QueryParam("locale") locale: string = "en") { | ||||
| 		if (!mail) { | ||||
| 			throw new RunnerNotFoundError(); | ||||
| @@ -127,7 +127,7 @@ export class RunnerSelfServiceController { | ||||
| 		const runner = await this.runnerRepository.findOne({ email: mail }); | ||||
| 		if (!runner) { throw new RunnerNotFoundError(); } | ||||
|  | ||||
| 		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 60 * 24)) { throw new RunnerSelfserviceTimeoutError(); } | ||||
| 		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 15)) { throw new RunnerSelfserviceTimeoutError(); } | ||||
| 		const token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| 		try { | ||||
| @@ -148,8 +148,11 @@ export class RunnerSelfServiceController { | ||||
| 	@OpenAPI({ description: 'Create a new selfservice runner in the citizen org. <br> This endpoint shoud be used to allow "everyday citizen" to register themselves. <br> You have to provide a mail address, b/c the future we\'ll implement email verification.' }) | ||||
| 	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner, @QueryParam("locale") locale: string = "en") { | ||||
| 		let runner = await createRunner.toEntity(); | ||||
|  | ||||
| 		if (await this.getRunnerExistsByMail(runner.email)) { | ||||
| 			throw new BadRequestError("E-Mail already registered") | ||||
| 		} | ||||
| 		runner = await this.runnerRepository.save(runner); | ||||
|  | ||||
| 		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] })); | ||||
| 		response.token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| @@ -170,6 +173,9 @@ export class RunnerSelfServiceController { | ||||
| 		const org = await this.getOrgansisation(token); | ||||
|  | ||||
| 		let runner = await createRunner.toEntity(org); | ||||
| 		if (await this.getRunnerExistsByMail(runner.email)) { | ||||
| 			throw new BadRequestError("E-Mail already registered") | ||||
| 		} | ||||
| 		runner = await this.runnerRepository.save(runner); | ||||
|  | ||||
| 		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] })); | ||||
| @@ -225,4 +231,14 @@ export class RunnerSelfServiceController { | ||||
|  | ||||
| 		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 | ||||
| 	} | ||||
| } | ||||
| @@ -41,7 +41,6 @@ export class StatsController { | ||||
|             return []; | ||||
|         } | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner2.distance - runner1.distance).slice(0, 10); | ||||
|         return runners; | ||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||
|         topRunners.forEach(runner => { | ||||
|             responseRunners.push(new ResponseStatsRunner(runner)); | ||||
| @@ -54,7 +53,7 @@ export class StatsController { | ||||
|     @ResponseSchema(ResponseStatsRunner, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten runners by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     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'] }); | ||||
|         if (!runners || runners.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
| @@ -107,7 +106,7 @@ export class StatsController { | ||||
|     @ResponseSchema(ResponseStatsTeam, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten teams by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     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'] }); | ||||
|         if (!teams || teams.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
| @@ -124,7 +123,7 @@ export class StatsController { | ||||
|     @ResponseSchema(ResponseStatsTeam, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten teams by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     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'] }); | ||||
|         if (!teams || teams.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
| @@ -158,7 +157,7 @@ export class StatsController { | ||||
|     @ResponseSchema(ResponseStatsOrgnisation, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten organizations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     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'] }); | ||||
|         if (!orgs || orgs.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|   | ||||
| @@ -33,6 +33,7 @@ export class CreateDistanceDonation extends CreateDonation { | ||||
|         let newDonation = new DistanceDonation; | ||||
|  | ||||
|         newDonation.amountPerDistance = this.amountPerDistance; | ||||
|         newDonation.paidAmount = this.paidAmount; | ||||
|         newDonation.donor = await this.getDonor(); | ||||
|         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 { DonorNotFoundError } from '../../../errors/DonorErrors'; | ||||
| import { Donation } from '../../entities/Donation'; | ||||
| @@ -16,6 +16,13 @@ export abstract class CreateDonation { | ||||
|     @IsPositive() | ||||
|     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. | ||||
|      */ | ||||
|   | ||||
| @@ -21,6 +21,7 @@ export class CreateFixedDonation extends CreateDonation { | ||||
|         let newDonation = new FixedDonation; | ||||
|  | ||||
|         newDonation.amount = this.amount; | ||||
|         newDonation.paidAmount = this.paidAmount; | ||||
|         newDonation.donor = await this.getDonor(); | ||||
|  | ||||
|         return newDonation; | ||||
|   | ||||
| @@ -57,7 +57,8 @@ export class CreateTrackScan { | ||||
|      * @returns The runnerCard whom's id you provided. | ||||
|      */ | ||||
|     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) { | ||||
|             throw new RunnerCardNotFoundError(); | ||||
|         } | ||||
|   | ||||
| @@ -114,7 +114,7 @@ export class CreateUser { | ||||
|         newUser.groups = await this.getGroups(); | ||||
|         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; } | ||||
|  | ||||
|         return newUser; | ||||
|   | ||||
| @@ -32,6 +32,7 @@ export class UpdateDistanceDonation extends UpdateDonation { | ||||
|      */ | ||||
|     public async update(donation: DistanceDonation): Promise<DistanceDonation> { | ||||
|         donation.amountPerDistance = this.amountPerDistance; | ||||
|         donation.paidAmount = this.paidAmount; | ||||
|         donation.donor = await this.getDonor(); | ||||
|         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 { DonorNotFoundError } from '../../../errors/DonorErrors'; | ||||
| import { Donation } from '../../entities/Donation'; | ||||
| @@ -23,6 +23,13 @@ export abstract class UpdateDonation { | ||||
|     @IsPositive() | ||||
|     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. | ||||
|      */ | ||||
|   | ||||
| @@ -20,6 +20,7 @@ export class UpdateFixedDonation extends UpdateDonation { | ||||
|      */ | ||||
|     public async update(donation: FixedDonation): Promise<FixedDonation> { | ||||
|         donation.amount = this.amount; | ||||
|         donation.paidAmount = this.paidAmount; | ||||
|         donation.donor = await this.getDonor(); | ||||
|  | ||||
|         return donation; | ||||
|   | ||||
| @@ -124,7 +124,7 @@ export class UpdateUser { | ||||
|         user.phone = this.phone; | ||||
|         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; } | ||||
|  | ||||
|         return user; | ||||
|   | ||||
| @@ -2,7 +2,7 @@ import { | ||||
|   IsInt, | ||||
|   IsNotEmpty | ||||
| } from "class-validator"; | ||||
| import { Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm"; | ||||
| import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm"; | ||||
| import { ResponseDonation } from '../responses/ResponseDonation'; | ||||
| import { Donor } from './Donor'; | ||||
|  | ||||
| @@ -34,6 +34,13 @@ export abstract class Donation { | ||||
|    */ | ||||
|   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. | ||||
|   | ||||
| @@ -33,6 +33,15 @@ export class Donor extends Participant { | ||||
|     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. | ||||
|    */ | ||||
|   | ||||
| @@ -67,10 +67,11 @@ export class RunnerCard { | ||||
|   private get paddedId(): string { | ||||
|     let id: string = this.id.toString(); | ||||
|  | ||||
|     if (id.length > 12) { | ||||
|     if (id.length > 11) { | ||||
|       throw new RunnerCardIdOutOfRangeError(); | ||||
|     } | ||||
|     while (id.length < 12) { id = '0' + id; } | ||||
|     while (id.length < 11) { id = '0' + id; } | ||||
|     id = '2' + id; | ||||
|  | ||||
|     return id; | ||||
|   } | ||||
|   | ||||
| @@ -51,6 +51,9 @@ export abstract class RunnerGroup { | ||||
|   */ | ||||
|   @IsInt() | ||||
|   public get distance(): number { | ||||
|     if (!this.runners || this.runners.length == 0) { | ||||
|       return 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' | ||||
| } | ||||
| @@ -1,5 +1,6 @@ | ||||
| import { IsInt, IsNotEmpty, IsPositive } from "class-validator"; | ||||
| import { Donation } from '../entities/Donation'; | ||||
| import { DonationStatus } from '../enums/DonationStatus'; | ||||
| import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||
| import { IResponse } from './IResponse'; | ||||
| import { ResponseDonor } from './ResponseDonor'; | ||||
| @@ -15,6 +16,12 @@ export class ResponseDonation implements IResponse { | ||||
|     */ | ||||
|     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. | ||||
|      */ | ||||
| @@ -34,6 +41,12 @@ export class ResponseDonation implements IResponse { | ||||
|     @IsInt() | ||||
|     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. | ||||
|      * @param donation The donation the response shall be build for. | ||||
| @@ -42,5 +55,12 @@ export class ResponseDonation implements IResponse { | ||||
|         this.id = donation.id; | ||||
|         this.donor = donation.donor.toResponse(); | ||||
|         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() | ||||
|     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. | ||||
|      * @param runner The user the response shall be build for. | ||||
| @@ -36,5 +42,6 @@ export class ResponseDonor extends ResponseParticipant implements IResponse { | ||||
|         super(donor); | ||||
|         this.receiptNeeded = donor.receiptNeeded; | ||||
|         this.donationAmount = donor.donationAmount; | ||||
|         this.paidDonationAmount = donor.paidDonationAmount; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -49,7 +49,15 @@ export class ResponseStatsOrgnisation implements IResponse { | ||||
|     public constructor(org: RunnerOrganization) { | ||||
|         this.name = org.name; | ||||
|         this.id = org.id; | ||||
|         try { | ||||
|             this.distance = org.distance; | ||||
|         } catch { | ||||
|             this.distance = -1; | ||||
|         } | ||||
|         try { | ||||
|             this.donationAmount = org.distanceDonationAmount; | ||||
|         } catch { | ||||
|             this.donationAmount = -1; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -76,10 +76,22 @@ export class ResponseStatsRunner implements IResponse { | ||||
|     public constructor(runner: Runner, laptime?: number) { | ||||
|         this.id = runner.id; | ||||
|         this.firstname = runner.firstname; | ||||
|         if (runner.firstname) { | ||||
|             this.middlename = runner.middlename; | ||||
|         } | ||||
|         this.lastname = runner.lastname; | ||||
|         try { | ||||
|             this.distance = runner.distance; | ||||
|         } | ||||
|         catch { | ||||
|             this.distance = -1; | ||||
|         } | ||||
|         try { | ||||
|             this.donationAmount = runner.distanceDonationAmount; | ||||
|         } | ||||
|         catch { | ||||
|             this.donationAmount = -1; | ||||
|         } | ||||
|         if (laptime) { | ||||
|             this.minLaptime = laptime; | ||||
|         } | ||||
|   | ||||
| @@ -57,7 +57,15 @@ export class ResponseStatsTeam implements IResponse { | ||||
|         this.name = team.name; | ||||
|         this.id = team.id; | ||||
|         this.parent = team.parentGroup.toResponse(); | ||||
|         try { | ||||
|             this.distance = team.distance; | ||||
|         } catch { | ||||
|             this.distance = -1; | ||||
|         } | ||||
|         try { | ||||
|             this.donationAmount = team.distanceDonationAmount; | ||||
|         } catch { | ||||
|             this.donationAmount = -1; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -170,7 +170,7 @@ describe('POST /api/donations/fixed successfully', () => { | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		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', { | ||||
| 			"donor": added_donor.id, | ||||
| 			"amount": 1000 | ||||
| @@ -181,6 +181,25 @@ describe('POST /api/donations/fixed successfully', () => { | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"donor": added_donor, | ||||
| 			"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" | ||||
| 		}); | ||||
| 	}); | ||||
| @@ -219,7 +238,7 @@ describe('POST /api/donations/distance successfully', () => { | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		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', { | ||||
| 			"runner": added_runner.id, | ||||
| 			"amountPerDistance": 100, | ||||
| @@ -233,6 +252,28 @@ describe('POST /api/donations/distance successfully', () => { | ||||
| 			"amountPerDistance": 100, | ||||
| 			"runner": added_runner, | ||||
| 			"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" | ||||
| 		}) | ||||
| 	}); | ||||
|   | ||||
| @@ -213,6 +213,17 @@ describe('adding + updating fixed donation valid', () => { | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		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 () => { | ||||
| 		const res = await axios.put(base + '/api/donations/fixed/' + added_donation.id, { | ||||
| 			"id": added_donation.id, | ||||
| @@ -317,6 +328,19 @@ describe('adding + updating distance donation valid', () => { | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		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 () => { | ||||
| 		const res = await axios.put(base + '/api/donations/distance/' + added_donation.id, { | ||||
| 			"id": added_donation.id, | ||||
|   | ||||
| @@ -1,5 +1,7 @@ | ||||
| import { faker } from '@faker-js/faker'; | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
|  | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let access_token; | ||||
| @@ -21,7 +23,7 @@ describe('delete selfservice runner invalid', () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
|             "firstname": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com" | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|         }, axios_config); | ||||
|         added_runner = res.data; | ||||
|         expect(res.status).toEqual(200); | ||||
| @@ -50,7 +52,7 @@ describe('delete selfservice runner valid', () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
|             "firstname": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com" | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|         }, axios_config); | ||||
|         added_runner = res.data; | ||||
|         expect(res.status).toEqual(200); | ||||
|   | ||||
| @@ -15,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 () => { | ||||
|         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.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     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.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; | ||||
|     it('registering as citizen should return 200', async () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
| @@ -42,19 +42,19 @@ describe('POST /api/runners/me/forgot 2 times within timeout should fail', () => | ||||
|         added_runner = res.data; | ||||
|     }); | ||||
|     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.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     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.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 new_token; | ||||
|     it('registering as citizen should return 200', async () => { | ||||
| @@ -69,7 +69,7 @@ describe('POST /api/runners/me/forgot valid should return 200', () => { | ||||
|         added_runner = res.data; | ||||
|     }); | ||||
|     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.headers['content-type']).toContain("application/json"); | ||||
|         new_token = res.data.token; | ||||
|   | ||||
| @@ -1,3 +1,4 @@ | ||||
| import { faker } from '@faker-js/faker'; | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
| @@ -30,7 +31,7 @@ describe('register + get should return 200', () => { | ||||
|             "firstname": "string", | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com" | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|   | ||||
| @@ -1,3 +1,4 @@ | ||||
| import { faker } from '@faker-js/faker'; | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
| @@ -39,7 +40,7 @@ describe('register invalid citizen', () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com" | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(400); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
| @@ -48,7 +49,7 @@ describe('register invalid citizen', () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
|             "firstname": "string", | ||||
|             "middlename": "string", | ||||
|             "email": "user@example.com" | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(400); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
| @@ -59,7 +60,26 @@ describe('register invalid citizen', () => { | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "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); | ||||
|         expect(res.status).toEqual(400); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
| @@ -71,7 +91,7 @@ describe('register citizen valid', () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
|             "firstname": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com" | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
| @@ -81,7 +101,7 @@ describe('register citizen valid', () => { | ||||
|             "firstname": "string", | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com", | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|             "phone": "+4909132123456", | ||||
|             "address": { | ||||
|                 address1: "Teststreet 1", | ||||
| @@ -187,7 +207,7 @@ describe('register valid company', () => { | ||||
|             "firstname": "string", | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com", | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|             "phone": "+4909132123456", | ||||
|             "address": { | ||||
|                 address1: "Teststreet 1", | ||||
| @@ -214,7 +234,7 @@ describe('register valid company', () => { | ||||
|             "firstname": "string", | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com", | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|             "phone": "+4909132123456", | ||||
|             "address": { | ||||
|                 address1: "Teststreet 1", | ||||
| @@ -232,7 +252,7 @@ describe('register valid company', () => { | ||||
|             "firstname": "string", | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com", | ||||
|             "email": faker.internet.exampleEmail(), | ||||
|             "phone": "+4909132123456", | ||||
|             "address": { | ||||
|                 address1: "Teststreet 1", | ||||
|   | ||||
| @@ -52,7 +52,6 @@ describe('GET /api/stats/runners/* should return 200', () => { | ||||
|     }); | ||||
|     it('get by donations w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/donations', axios_config_stats); | ||||
|         console.log(res.data) | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user