Merge pull request 'Release 0.4.3' (#40) from dev into main

Reviewed-on: #40
Reviewed-by: Philipp Dormann <philipp@philippdormann.de>

.drone.yml

@@ -1,6 +1,27 @@
+---
+kind: secret
+name: docker_username
+get:
+  path: odit-registry-builder
+  name: username
+
+---
+kind: secret
+name: docker_password
+get:
+  path: odit-registry-builder
+  name: password
+
+---
+kind: secret
+name: git_ssh
+get:
+  path: odit-git-bot
+  name: sshkey
+
 ---
 kind: pipeline
-type: docker
+type: kubernetes
 name: build:dev
 clone:
   disable: true
@@ -16,13 +37,14 @@ steps:
     depends_on: [clone]
     settings:
       username:
-        from_secret: DOCKER_REGISTRY_USER
+        from_secret: docker_username
       password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
+        from_secret: docker_password
       repo: registry.odit.services/lfk/document-server
       tags:
         - dev
       registry: registry.odit.services
+      mtu: 1000
   - name: run changelog export
     depends_on: ["clone"]
     image: node:latest
@@ -38,7 +60,7 @@ steps:
       author_email: bot@odit.services
       remote: git@git.odit.services:lfk/document-server.git
       ssh_key:
-        from_secret: GITLAB_SSHKEY
+        from_secret: git_ssh
   - name: run full license export
     depends_on: ["clone"]
     image: node:14.15.1-alpine3.12
@@ -56,7 +78,7 @@ steps:
       remote: git@git.odit.services:lfk/document-server.git
       skip_verify: true
       ssh_key:
-        from_secret: GITLAB_SSHKEY
+        from_secret: git_ssh
 
 trigger:
   branch:
@@ -66,7 +88,7 @@ trigger:
 
 ---
 kind: pipeline
-type: docker
+type: kubernetes
 name: build:latest
 clone:
   disable: true
@@ -84,13 +106,14 @@ steps:
     image: plugins/docker
     settings:
       username:
-        from_secret: DOCKER_REGISTRY_USER
+        from_secret: docker_username
       password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
+        from_secret: docker_password
       repo: registry.odit.services/lfk/document-server
       tags:
         - latest
       registry: registry.odit.services
+      mtu: 1000
   - name: push merge to repo
     depends_on: ["clone"]
     image: appleboy/drone-git-push
@@ -99,7 +122,7 @@ steps:
       commit: false
       remote: git@git.odit.services:lfk/document-server.git
       ssh_key:
-        from_secret: GITLAB_SSHKEY
+        from_secret: git_ssh
 
 trigger:
   branch:
@@ -109,7 +132,7 @@ trigger:
 
 ---
 kind: pipeline
-type: docker
+type: kubernetes
 name: build:tags
 
 steps:
@@ -118,13 +141,14 @@ steps:
     depends_on: [clone]
     settings:
       username:
-        from_secret: DOCKER_REGISTRY_USER
+        from_secret: docker_username
       password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
+        from_secret: docker_password
       repo: registry.odit.services/lfk/document-server
       tags:
         - '${DRONE_TAG}'
       registry: registry.odit.services
+      mtu: 1000
 trigger:
   event:
   - tag

CHANGELOG.md

@@ -2,12 +2,63 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [v0.4.3](https://git.odit.services/lfk/document-server/compare/v0.4.2...v0.4.3)
+
+- 🧾New changelog file version [CI SKIP] [skip ci] [`289a0d8`](https://git.odit.services/lfk/document-server/commit/289a0d8671575dda911c64f79d24726d3bbee071)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`457ea26`](https://git.odit.services/lfk/document-server/commit/457ea26cf8124009084415d12c7a0e31912a3eb1)
+- 🚀Bumped version to v0.4.3 [`c3beb3e`](https://git.odit.services/lfk/document-server/commit/c3beb3e1032492f9a8304c4b099a700ad0d1d2cf)
+- Pipeline mtu fix [`c2d2b66`](https://git.odit.services/lfk/document-server/commit/c2d2b66f2f6fbd30c2027fd3dab393db5219eb44)
+
+#### [v0.4.2](https://git.odit.services/lfk/document-server/compare/v0.4.0...v0.4.2)
+
+> 29 March 2021
+
+- Merge pull request 'Release 0.4.2' (#39) from dev into main [`ce3053c`](https://git.odit.services/lfk/document-server/commit/ce3053c0ba5404ebd8d4cbd5386c454d8cd8c4d2)
+- 🚀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] [`6608456`](https://git.odit.services/lfk/document-server/commit/6608456c686e51d3aa16e630ba72c7c29e428b2a)
+- 🧾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)
+
 #### [v0.3.3](https://git.odit.services/lfk/document-server/compare/v0.3.2...v0.3.3)
 
+> 19 February 2021
+
+- Merge pull request 'Alpha Release 0.3.3 - Download options' (#32) from dev into main [`21b5e04`](https://git.odit.services/lfk/document-server/commit/21b5e048ed5ed72f88304e5c737639c54cc71483)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`d1a29c1`](https://git.odit.services/lfk/document-server/commit/d1a29c1cbb8845a1adf8a414d158ebcabd48dc04)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`fd8b7e5`](https://git.odit.services/lfk/document-server/commit/fd8b7e56da4a1601141f63627e3990660c521ea6)
 - Added download option to cards [`1ca5d3e`](https://git.odit.services/lfk/document-server/commit/1ca5d3ea078ef51818657e2b3c9f114c67bff86d)
 - Added download header [`55877de`](https://git.odit.services/lfk/document-server/commit/55877de2aa46583f30d033467037e0454d1236be)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`c012b49`](https://git.odit.services/lfk/document-server/commit/c012b4943d96ee3a9442c65389c4dcea08642109)
 - 🚀Bumped version to v0.3.3 [`ba566bc`](https://git.odit.services/lfk/document-server/commit/ba566bcc33ed920324cd9977b3f293a2c629f92c)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`a386c5b`](https://git.odit.services/lfk/document-server/commit/a386c5bef88da29e4447399d4edca0234b674ed5)
 

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 \

README.md

@@ -36,6 +36,8 @@ The basic generation mechanism makes the templates and routes interchangeable (i
 | SPONSORING_RECEIPT_MINIMUM_AMOUNT | String | "10" | The mimimum total donation amount a sponsor has to donate to be able to receive a donation receipt - used to generate pdf text.
 | SPONOR_LOGOS | Array<String> | Empty png | The sponsor images you want to loop through. You can provide them via http url, local file or base64-encoded image.
 | API_KEY | String(min length: 64) | Random generated string | The api key you want to use for auth (query-param `key`), has to be at least 64 chars long.
+| DISCLAIMER_TEXT | String | N/A | A disclaimer that will get displayed on the bottom of each sponsoring contract. R/N You can only provide the disclaimer for one language.
+| CONTRACTS_PER_RUNNER | Number | 1 | The amount of contracts that get created per runner (per request).
 
 ## Templates
 > The document server uses html templates to generate various pdf documents.

docker-compose.yml

@@ -1,9 +1,15 @@
-version: "3"
+version: "3"
-services:
+services:
-  document_server:
+  document_server:
-    build: .
+    build: .
-    ports:
+    ports:
-      - 4010:4010
+      - 4010:4010
-    environment:
+    environment:
-      APP_PORT: 4010
+      APP_PORT: 4010
-      NODE_ENV: production
+      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"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-document-server",
-  "version": "0.3.3",
+  "version": "0.4.3",
   "description": "The document generation server for the LfK! runner system. This generates certificates, sponsoring aggreements and more",
   "main": "src/app.ts",
   "scripts": {

src/PdfCreator.ts

@@ -22,6 +22,7 @@ export class PdfCreator {
     private templateDir = path.join(__dirname, '/templates');
     private browser;
     private static interpolations = { eventname: config.eventname, sponsoring_receipt_minimum_amount: config.sponsoring_receipt_minimum_amount, currency_symbol: config.currency_symbol }
+    private static contractsPerRunner = config.contracts_per_runner;
 
     /**
      * Main constructor.
@@ -108,6 +109,11 @@ export class PdfCreator {
         if (runners.length == 1 && Object.keys(runners[0]).length == 0) {
             runners[0] = this.generateEmptyRunner();
         }
+        for (var i = 1; i < PdfCreator.contractsPerRunner; i++) {
+            runners = runners.reduce(function (res, current, index, array) {
+                return res.concat([current, current]);
+            }, []);
+        }
         if (runners.length > 50) {
             let pdf_promises = new Array<Promise<Buffer>>();
             let i, j;
@@ -121,7 +127,7 @@ export class PdfCreator {
         await i18next.changeLanguage(locale);
         const template_source = fs.readFileSync(`${this.templateDir}/sponsoring_contract.html`, 'utf8');
         const template = Handlebars.compile(template_source);
-        let result = template({ runners, codeformat });
+        let result = template({ runners, codeformat, disclaimer: config.disclaimer_text });
         result = await awaitAsyncHandlebarHelpers(result);
         const pdf = await this.renderPdf(result, { format: "A5", landscape: true });
         return pdf

src/config.ts

@@ -12,11 +12,16 @@ export const config = {
     codeformat: process.env.CODEFORMAT || "qrcode",
     sponor_logos: getSponsorLogos(),
     api_key: getApiKey(),
+    disclaimer_text: process.env.DISCLAIMER_TEXT || "",
+    contracts_per_runner: parseInt(process.env.CONTRACTS_PER_RUNNER) || 1,
 }
 let errors = 0
 if (typeof config.internal_port !== "number") {
     errors++
 }
+if (typeof config.contracts_per_runner !== "number") {
+    errors++
+}
 if (typeof config.development !== "boolean") {
     errors++
 }

src/controllers/PdfController.ts

@@ -71,7 +71,20 @@ export class PdfController {
     private mapCardGroupNames(cards: RunnerCard[]): RunnerCard[] {
         let response = new Array<RunnerCard>();
         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 {

src/templates/sponsoring_contract.html

@@ -68,8 +68,8 @@
           <p style="font-size: x-small; display: block;">{{__ "group"}}</p>
         </div>
       </div>
-      <p>{{__ "sponsoring_amount_per_distance"}}</p>
+      <p style="margin-top: -0.5rem">{{__ "sponsoring_amount_per_distance"}}</p>
-      <div class="columns">
+      <div class="columns" style="margin-top: -1rem;">
         <div class="column is-6">
           <span style="border-bottom: 1px solid; width: 100%; display: block;"> </span>
           <p style="font-size: x-small; display: block;">{{__ "lastname"}}</p>
@@ -79,9 +79,9 @@
           <p style="font-size: x-small; display: block;">{{__ "firstname"}}</p>
         </div>
       </div>
-      <p style="font-size: medium;">{{__ "address"}} ({{__ "sponsor"}})</p>
+      <p style="font-size: medium; margin-top: -0.5rem;">{{__ "address"}} ({{__ "sponsor"}})</p>
       <p style="font-size: x-small;">({{__ "sponsoring_address_condition"}})</p>
-      <div class="columns">
+      <div class="columns" style="margin-top: -1rem;">
         <div class="column is-8">
           <span style="border-bottom: 1px solid; width: 100%; display: block;"> </span>
           <p style="font-size: x-small; display: block;">{{__ "street"}}</p>
@@ -91,7 +91,7 @@
           <p style="font-size: x-small; display: block;">{{__ "house_number"}}</p>
         </div>
       </div>
-      <div class="columns">
+      <div class="columns" style="margin-top: -1rem;">
         <div class="column is-4">
           <span style="border-bottom: 1px solid; width: 100%; display: block;"> </span>
           <p style="font-size: x-small; display: block;">{{__ "postalcode"}}</p>
@@ -101,8 +101,7 @@
           <p style="font-size: x-small; display: block;">{{__ "city"}}</p>
         </div>
       </div>
-      <br>
+      <div class="columns" style="margin-top: -1rem;">
-      <div class="columns">
         <div class="column is-7">
           <span style="border-bottom: 1px solid; width: 100%; display: block;"> </span>
           <p style="font-size: x-small; display: block;">{{__ "location"}}, {{__ "date"}}</p>
@@ -112,6 +111,7 @@
           <p style="font-size: x-small; display: block;">{{__ "signature"}}</p>
         </div>
       </div>
+      <p style="font-size: xx-small; overflow: hidden; height: 4rem; text-align: center;">{{../disclaimer}}</p>
     </div>
   </div>
   {{/each}}