diff --git a/.drone.yml b/.drone.yml index 168e6b2..54b7b6d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,6 +44,7 @@ steps: tags: - dev registry: registry.odit.services + mtu: 1000 - name: run changelog export depends_on: ["clone"] image: node:latest diff --git a/CHANGELOG.md b/CHANGELOG.md index dd50bf1..b7b1d46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,39 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. -#### [v0.3.3](https://git.odit.services/lfk/document-server/compare/v0.3.3...v0.3.3) +#### [v0.4.2](https://git.odit.services/lfk/document-server/compare/v0.4.0...v0.4.2) -- Merge pull request 'Configurable sponsoring disclaimer feature/33-disclaimer' (#34) from feature/33-disclaimer into dev [`e9d3574`](https://git.odit.services/lfk/document-server/commit/e9d35745997a9e948509ea67b59f5a7658f9d652) +- 🚀Bumped version to v0.4.1 [`d17108f`](https://git.odit.services/lfk/document-server/commit/d17108f4b9f041727afcee5c171d5d8f9a3c677c) +- 🧾New changelog file version [CI SKIP] [skip ci] [`0ade575`](https://git.odit.services/lfk/document-server/commit/0ade57536e372a62356fe2f329f6cfe04bcfc397) +- Fixed faulty object mapping [`9584bfe`](https://git.odit.services/lfk/document-server/commit/9584bfed8ba5b8c856b55aa90969874d4d6751ff) +- 🧾New changelog file version [CI SKIP] [skip ci] [`8bac1fa`](https://git.odit.services/lfk/document-server/commit/8bac1fadd6b4257e5062a1b1673e122c5b535046) +- 🧾New changelog file version [CI SKIP] [skip ci] [`b8f0d1f`](https://git.odit.services/lfk/document-server/commit/b8f0d1fa60da4e3262623cecf4a78c8a9a322f8c) +- 🧾New changelog file version [CI SKIP] [skip ci] [`073433f`](https://git.odit.services/lfk/document-server/commit/073433f308f2f8e7ada97dd0b3896fb541e85711) +- 🧾New changelog file version [CI SKIP] [skip ci] [`a478081`](https://git.odit.services/lfk/document-server/commit/a47808172797e12800c46d17ccf4b458f4a506de) +- 🧾New changelog file version [CI SKIP] [skip ci] [`0839ff6`](https://git.odit.services/lfk/document-server/commit/0839ff63593cfb9e8339b2b2a86dbe7e2afb5dcb) +- Now using our own images to build stuff 🚀 [`96886c7`](https://git.odit.services/lfk/document-server/commit/96886c74bc397e1ee793e83e0d01a6bbaa953da3) +- 🚀Bumped version to v0.4.2 [`1cbe5a1`](https://git.odit.services/lfk/document-server/commit/1cbe5a1614c40fbf23f032be60039ddb1472ca94) +- Emergency bugfixes 🐞 [`3c42ca3`](https://git.odit.services/lfk/document-server/commit/3c42ca30427174c21e0db6426d8f0d91a1ebc501) +- Let's try the mtu fix [`c51ec74`](https://git.odit.services/lfk/document-server/commit/c51ec74d30334b156668de4719c77f2e9c6d023f) + +#### [v0.4.0](https://git.odit.services/lfk/document-server/compare/v0.3.3...v0.4.0) + +> 14 March 2021 + +- Merge pull request 'Alpha Release 0.4.0' (#38) from dev into main [`8d3cc34`](https://git.odit.services/lfk/document-server/commit/8d3cc34395922a271da1032310da6ec6f7a164f7) +- Updated ci with new kubernetes secrets 🚀🚀🚀 [`b180e04`](https://git.odit.services/lfk/document-server/commit/b180e0404537404d0564453fde5976f4de672a8b) - Updated styleing [`03ed6d5`](https://git.odit.services/lfk/document-server/commit/03ed6d5bc18c5b26edd7b1d698c9de936e008f32) +- 🧾New changelog file version [CI SKIP] [skip ci] [`b612562`](https://git.odit.services/lfk/document-server/commit/b612562d347f5fafcf4ce94a4508b7c0bb9370c6) +- 🚀Bumped version to v0.4.0 [`85519bc`](https://git.odit.services/lfk/document-server/commit/85519bc2e4e8906732dc5f99e417014a14bad7d0) +- Merge pull request 'Configureable contracts amount feature/35-contracts_per_runner' (#37) from feature/35-contracts_per_runner into dev [`ed02306`](https://git.odit.services/lfk/document-server/commit/ed023067386551dc92d60ba63dff8bc4cc44ce00) - Added disclaimer to template [`4e1e124`](https://git.odit.services/lfk/document-server/commit/4e1e124d0dc08f96aeb05dd1c975064fe785b80f) +- Changed ci pipeline type to kubernetes [`677bd86`](https://git.odit.services/lfk/document-server/commit/677bd861335302269baec96a59916475bbdd405f) +- Added config for amount of contracts per runner [`d01b4a0`](https://git.odit.services/lfk/document-server/commit/d01b4a0b99f3c1aa088b02d766d21bfb6b9e3a29) +- Added logic for generateing multiple contracts per runner [`d991940`](https://git.odit.services/lfk/document-server/commit/d9919404b5b90151318d20258a273ca6c7640393) - MAde disclaimer configurable via env [`5e4d6f4`](https://git.odit.services/lfk/document-server/commit/5e4d6f44dab581483135594432bd8c8d65ba74ef) - MAde disclaimer configurable via env [`885765a`](https://git.odit.services/lfk/document-server/commit/885765ac71b6a65c869ee841c383667f4947dcde) +- Documented the new config var [`31a5950`](https://git.odit.services/lfk/document-server/commit/31a59500fa77f1ad7c54fa297d00c8707ae6db9c) +- Merge pull request 'Configurable sponsoring disclaimer feature/33-disclaimer' (#34) from feature/33-disclaimer into dev [`e9d3574`](https://git.odit.services/lfk/document-server/commit/e9d35745997a9e948509ea67b59f5a7658f9d652) - 🧾New changelog file version [CI SKIP] [skip ci] [`19fbf50`](https://git.odit.services/lfk/document-server/commit/19fbf50f6f6057c5321a999b6551d05db32b5fd8) - Added reamde entry for the new env var [`9dd62ce`](https://git.odit.services/lfk/document-server/commit/9dd62cefa94bf3f0bf8e77fd25e7ca1ec4b30e2b) diff --git a/Dockerfile b/Dockerfile index 26c1bd3..b0c54e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Typescript Build -FROM registry.odit.services/mirror/node:14.15.1-alpine3.12 +FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12 WORKDIR /app COPY package.json ./ RUN npm i -g pnpm @@ -8,7 +8,7 @@ COPY tsconfig.json ./ COPY src ./src RUN pnpm run build # final image -FROM registry.odit.services/mirror/alpine:3.13.1 +FROM registry.odit.services/hub/library/alpine:3.13.1 WORKDIR /app RUN apk add --no-cache \ chromium \ diff --git a/docker-compose.yml b/docker-compose.yml index cb5d403..ff15c07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,15 @@ -version: "3" -services: - document_server: - build: . - ports: - - 4010:4010 - environment: - APP_PORT: 4010 - NODE_ENV: production \ No newline at end of file +version: "3" +services: + document_server: + build: . + ports: + - 4010:4010 + environment: + APP_PORT: 4010 + NODE_ENV: production + EVENT_NAME: "Lauf für Kaya! 2021" + CURRENCY_SYMBOL: "€" + API_KEY: RYRccAJ4SKZnZaEci6Nyk9Z6mw3sD94fyKJ74WNzi6hLkxGNyJDrKPkxBmPwvR4f + CONTRACTS_PER_RUNNER: 2 + SPONSORING_RECEIPT_MINIMUM_AMOUNT: 50 + DISCLAIMER_TEXT: "Rechtsgrundlage unserer Datenverarbeitung aufgrund freiwilliger Einwilligung ist Art. 6 Abs. 1 e), Abs. 3 DSGVO i.V.m. Art. 85 BayEUG. Mit Ihrer Unterschrift willigen Sie in unsere Datennutzung zum Zwecke des Lauf für Kaya! ein. Die Daten für Spendenquittungen" \ No newline at end of file diff --git a/package.json b/package.json index af57d63..2483833 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-document-server", - "version": "0.4.0", + "version": "0.4.2", "description": "The document generation server for the LfK! runner system. This generates certificates, sponsoring aggreements and more", "main": "src/app.ts", "scripts": { diff --git a/src/config.ts b/src/config.ts index 7dbc3c0..ed07fd0 100644 --- a/src/config.ts +++ b/src/config.ts @@ -13,7 +13,7 @@ export const config = { sponor_logos: getSponsorLogos(), api_key: getApiKey(), disclaimer_text: process.env.DISCLAIMER_TEXT || "", - contracts_per_runner: process.env.CONTRACTS_PER_RUNNER || 1, + contracts_per_runner: parseInt(process.env.CONTRACTS_PER_RUNNER) || 1, } let errors = 0 if (typeof config.internal_port !== "number") { diff --git a/src/controllers/PdfController.ts b/src/controllers/PdfController.ts index 0aad6c7..619dc81 100644 --- a/src/controllers/PdfController.ts +++ b/src/controllers/PdfController.ts @@ -71,7 +71,20 @@ export class PdfController { private mapCardGroupNames(cards: RunnerCard[]): RunnerCard[] { let response = new Array(); for (let card of cards) { - if (!card.runner.group.parentGroup) { + if (!card.runner) { + card.runner = { + id: 0, + firstname: "Blank", + lastname: "Blank", + distance: 0, + group: { + id: 0, + name: "Blank", + fullName: "Blank" + } + } + } + else if (!card.runner.group.parentGroup) { card.runner.group.fullName = card.runner.group.name; } else {