feat(config): log config on boot

Reviewed-on: #49
Reviewed-by: Philipp Dormann <philipp@noreply.git.odit.services>

.air.linux.toml

@@ -0,0 +1,46 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  args_bin = []
+  bin = "tmp\\main"
+  cmd = "go build -o ./tmp/main ."
+  delay = 1000
+  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  exclude_file = []
+  exclude_regex = ["_test.go"]
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_file = []
+  kill_delay = "0s"
+  log = "build-errors.log"
+  poll = false
+  poll_interval = 0
+  post_cmd = []
+  pre_cmd = []
+  rerun = false
+  rerun_delay = 500
+  send_interrupt = false
+  stop_on_error = false
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[screen]
+  clear_on_rebuild = false
+  keep_scroll = true

.dockerignore

@@ -1,3 +1,3 @@
 tmp
 docker-compose.yaml
-.air.toml
+.air*.toml

.env

@@ -4,6 +4,7 @@ APIKEY=lfk
 EVENTNAME=Lauf für Kaya! 2025
 CURRENCYSYMBOL=€
 GOTENBERG_BASEURL=http://localhost:3001
+REDIS_ADDR=localhost:6379
 
 CARD_SUBTITLE=Kaya ist cool
 CARD_BARCODEFORMAT=ean13

.woodpecker/build.yml

@@ -0,0 +1,18 @@
+steps:
+  - name: build latest
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/document-server
+      tags:
+        - latest
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/document-server:latest
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+    when:
+      branch: main
+when:
+  event: push

.woodpecker/release.yml

@@ -0,0 +1,17 @@
+steps:
+  - name: build tag
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/document-server
+      tags:
+        - "${CI_COMMIT_TAG}"
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/document-server:latest
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+when:
+  event:
+    - tag

README.md

@@ -2,7 +2,7 @@
 
 ## Features
 
-- 📝 HTML pdf templates
+- 📝 HTML templates for pdf generation
 - 📚 OpenAPI/Swagger documentation
 - ⚡ High-performance with go and gotenberg
 
@@ -12,9 +12,6 @@
 # Install dependencies
 go mod download
 
-# Generate the swagger docs
-swag init
-
 # Run the server
 air
 ```
@@ -29,3 +26,71 @@ The project uses:
 
 - 🏃‍♂️ go as the language and build tool
 - 🌐 gofiber for the web framework
+- 📦 air for live reload
+- 📝 swaggo for API documentation
+- 📄 gotenberg for HTML to PDF conversion
+
+### 📦 Use docker compose for external dependencies
+
+```shell
+docker compose -f docker-compose.dev.yaml up
+```
+
+### 🏃 Run via air
+
+> Install air via `go install github.com/air-verse/air@latest`
+
+```shell
+# With the default air config
+air
+
+# With the config for linux/macOS
+air -c .air.linux.toml
+
+# With the config for windows
+air -c .air.windows.toml
+```
+
+### ✒️ Update the swagger docs
+
+> Install swag via `go install github.com/swaggo/swag/cmd/swag@latest`
+
+```shell
+swag init
+```
+
+### 🐋 Build container
+
+```shell
+# single arch
+docker build -t registry.odit.services/lfk/document-server:latest .
+
+# multiarch
+docker buildx build --platform=linux/amd64,linux/arm64 -t registry.odit.services/lfk/document-server:latest --push .
+```
+
+## ⏱️ Benchmarks
+
+### Barcode Generation
+
+- Requests: 10000
+- Concurrency: Unlimited
+- Data: `123456789123`
+- Width: 1000
+- Height: 500
+
+#### No cache (cold start)
+
+| Format  | Data           | Requests/sec | Slowest | Fastest | Average |
+| ------- | -------------- | ------------ | ------- | ------- | ------- |
+| Code128 | `123456789123` | 763.3996     | 0.7995  | 0.0172  | 0.0654  |
+| EAN13   | `123456789123` | 767.1170     | 0.7607  | 0.0171  | 0.0651  |
+| QR      | `123456789123` | 683.8472     | 0.6528  | 0.0178  | 0.0730  |
+
+#### Redis cache (warm start)
+
+| Format  | Data           | Requests/sec | Slowest | Fastest | Average |
+| ------- | -------------- | ------------ | ------- | ------- | ------- |
+| Code128 | `123456789123` | 15611.5521   | 0.0965  | 0.0006  | 0.0032  |
+| EAN13   | `123456789123` | 14985.4401   | 0.0925  | 0.0006  | 0.0033  |
+| QR      | `123456789123` | 14306.2540   | 0.1143  | 0.0005  | 0.0035  |

docker-compose.dev.yaml

@@ -3,3 +3,7 @@ services:
     image: gotenberg/gotenberg:8
     ports:
       - "3001:3000"
+  redis:
+    image: docker.dragonflydb.io/dragonflydb/dragonfly
+    ports:
+      - "6379:6379"

docker-compose.yaml

@@ -9,3 +9,7 @@ services:
     image: gotenberg/gotenberg:8
     ports:
       - "3001:3000"
+  redis:
+    image: docker.dragonflydb.io/dragonflydb/dragonfly
+    ports:
+      - "6379:6379"

docker.env

@@ -4,6 +4,7 @@ APIKEY=lfk
 EVENTNAME=Lauf für Kaya! 2025
 CURRENCYSYMBOL=€
 GOTENBERG_BASEURL=http://gotenberg:3000
+REDIS_ADDR=redis:6379
 
 CARD_SUBTITLE=Kaya ist cool
 CARD_BARCODEFORMAT=ean13

docs/docs.go

@@ -9,14 +9,88 @@ const docTemplate = `{
     "info": {
         "description": "{{escape .Description}}",
         "title": "{{.Title}}",
-        "contact": {},
+        "termsOfService": "https://lauf-fuer-kaya.de/datenschutz",
+        "contact": {
+            "name": "ODIT.Services UG (haftungsbeschränkt)",
+            "url": "https://odit.services",
+            "email": "info@odit.services"
+        },
+        "license": {
+            "name": "CC BY-NC-SA 4.0"
+        },
         "version": "{{.Version}}"
     },
     "host": "{{.Host}}",
     "basePath": "{{.BasePath}}",
     "paths": {
-        "/cards": {
+        "/v1/barcodes/{type}/{content}": {
+            "get": {
+                "description": "Generate barcodes based on the provided data",
+                "produces": [
+                    "image/png"
+                ],
+                "tags": [
+                    "barcodes"
+                ],
+                "summary": "Generate barcodes",
+                "parameters": [
+                    {
+                        "enum": [
+                            "ean13",
+                            "code128"
+                        ],
+                        "type": "string",
+                        "description": "Barcode type",
+                        "name": "type",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "minLength": 1,
+                        "type": "string",
+                        "description": "Barcode content",
+                        "name": "content",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "maximum": 10000,
+                        "minimum": 1,
+                        "type": "integer",
+                        "default": 1000,
+                        "description": "Barcode width",
+                        "name": "width",
+                        "in": "query"
+                    },
+                    {
+                        "maximum": 10000,
+                        "minimum": 1,
+                        "type": "integer",
+                        "default": 1000,
+                        "description": "Barcode height",
+                        "name": "height",
+                        "in": "query"
+                    },
+                    {
+                        "maximum": 100,
+                        "minimum": 0,
+                        "type": "integer",
+                        "default": 10,
+                        "description": "Padding around the barcode (included in image size)",
+                        "name": "padding",
+                        "in": "query"
+                    }
+                ],
+                "responses": {}
+            }
+        },
+        "/v1/pdfs/cards": {
             "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "Generate cards based on the provided data",
                 "consumes": [
                     "application/json"
@@ -25,7 +99,7 @@ const docTemplate = `{
                     "application/pdf"
                 ],
                 "tags": [
-                    "cards"
+                    "pdfs"
                 ],
                 "summary": "Generate runner cards",
                 "parameters": [
@@ -42,8 +116,13 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/certificates": {
+        "/v1/pdfs/certificates": {
             "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "Generate certificates based on the provided data",
                 "consumes": [
                     "application/json"
@@ -52,7 +131,7 @@ const docTemplate = `{
                     "application/pdf"
                 ],
                 "tags": [
-                    "certificates"
+                    "pdfs"
                 ],
                 "summary": "Generate runner certificates",
                 "parameters": [
@@ -69,8 +148,13 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/contracts": {
+        "/v1/pdfs/contracts": {
             "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "Generate a contract based on the provided data",
                 "consumes": [
                     "application/json"
@@ -79,7 +163,7 @@ const docTemplate = `{
                     "application/pdf"
                 ],
                 "tags": [
-                    "contracts"
+                    "pdfs"
                 ],
                 "summary": "Generate a contract",
                 "parameters": [
@@ -237,18 +321,11 @@ const docTemplate = `{
         "models.Group": {
             "type": "object",
             "required": [
-                "id",
                 "name"
             ],
             "properties": {
-                "id": {
-                    "type": "integer"
-                },
                 "name": {
                     "type": "string"
-                },
-                "parent_group": {
-                    "$ref": "#/definitions/models.Group"
                 }
             }
         },
@@ -320,6 +397,13 @@ const docTemplate = `{
                 }
             }
         }
+    },
+    "securityDefinitions": {
+        "ApiKeyAuth": {
+            "type": "apiKey",
+            "name": "key",
+            "in": "query"
+        }
     }
 }`
 

docs/swagger.json

@@ -3,11 +3,85 @@
     "info": {
         "description": "This is the API documentation for the LfK Document Server - a tool for pdf generation.",
         "title": "LfK Document Server API",
-        "contact": {}
+        "termsOfService": "https://lauf-fuer-kaya.de/datenschutz",
+        "contact": {
+            "name": "ODIT.Services UG (haftungsbeschränkt)",
+            "url": "https://odit.services",
+            "email": "info@odit.services"
+        },
+        "license": {
+            "name": "CC BY-NC-SA 4.0"
+        }
     },
     "paths": {
-        "/cards": {
+        "/v1/barcodes/{type}/{content}": {
+            "get": {
+                "description": "Generate barcodes based on the provided data",
+                "produces": [
+                    "image/png"
+                ],
+                "tags": [
+                    "barcodes"
+                ],
+                "summary": "Generate barcodes",
+                "parameters": [
+                    {
+                        "enum": [
+                            "ean13",
+                            "code128"
+                        ],
+                        "type": "string",
+                        "description": "Barcode type",
+                        "name": "type",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "minLength": 1,
+                        "type": "string",
+                        "description": "Barcode content",
+                        "name": "content",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "maximum": 10000,
+                        "minimum": 1,
+                        "type": "integer",
+                        "default": 1000,
+                        "description": "Barcode width",
+                        "name": "width",
+                        "in": "query"
+                    },
+                    {
+                        "maximum": 10000,
+                        "minimum": 1,
+                        "type": "integer",
+                        "default": 1000,
+                        "description": "Barcode height",
+                        "name": "height",
+                        "in": "query"
+                    },
+                    {
+                        "maximum": 100,
+                        "minimum": 0,
+                        "type": "integer",
+                        "default": 10,
+                        "description": "Padding around the barcode (included in image size)",
+                        "name": "padding",
+                        "in": "query"
+                    }
+                ],
+                "responses": {}
+            }
+        },
+        "/v1/pdfs/cards": {
             "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "Generate cards based on the provided data",
                 "consumes": [
                     "application/json"
@@ -16,7 +90,7 @@
                     "application/pdf"
                 ],
                 "tags": [
-                    "cards"
+                    "pdfs"
                 ],
                 "summary": "Generate runner cards",
                 "parameters": [
@@ -33,8 +107,13 @@
                 "responses": {}
             }
         },
-        "/certificates": {
+        "/v1/pdfs/certificates": {
             "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "Generate certificates based on the provided data",
                 "consumes": [
                     "application/json"
@@ -43,7 +122,7 @@
                     "application/pdf"
                 ],
                 "tags": [
-                    "certificates"
+                    "pdfs"
                 ],
                 "summary": "Generate runner certificates",
                 "parameters": [
@@ -60,8 +139,13 @@
                 "responses": {}
             }
         },
-        "/contracts": {
+        "/v1/pdfs/contracts": {
             "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "Generate a contract based on the provided data",
                 "consumes": [
                     "application/json"
@@ -70,7 +154,7 @@
                     "application/pdf"
                 ],
                 "tags": [
-                    "contracts"
+                    "pdfs"
                 ],
                 "summary": "Generate a contract",
                 "parameters": [
@@ -228,18 +312,11 @@
         "models.Group": {
             "type": "object",
             "required": [
-                "id",
                 "name"
             ],
             "properties": {
-                "id": {
-                    "type": "integer"
-                },
                 "name": {
                     "type": "string"
-                },
-                "parent_group": {
-                    "$ref": "#/definitions/models.Group"
                 }
             }
         },
@@ -311,5 +388,12 @@
                 }
             }
         }
+    },
+    "securityDefinitions": {
+        "ApiKeyAuth": {
+            "type": "apiKey",
+            "name": "key",
+            "in": "query"
+        }
     }
 }

docs/swagger.yaml

@@ -94,14 +94,9 @@ definitions:
     type: object
   models.Group:
     properties:
-      id:
-        type: integer
       name:
         type: string
-      parent_group:
-        $ref: '#/definitions/models.Group'
     required:
-    - id
     - name
     type: object
   models.Runner:
@@ -152,12 +147,63 @@ definitions:
     - last_name
     type: object
 info:
-  contact: {}
+  contact:
+    email: info@odit.services
+    name: ODIT.Services UG (haftungsbeschränkt)
+    url: https://odit.services
   description: This is the API documentation for the LfK Document Server - a tool
     for pdf generation.
+  license:
+    name: CC BY-NC-SA 4.0
+  termsOfService: https://lauf-fuer-kaya.de/datenschutz
   title: LfK Document Server API
 paths:
-  /cards:
+  /v1/barcodes/{type}/{content}:
+    get:
+      description: Generate barcodes based on the provided data
+      parameters:
+      - description: Barcode type
+        enum:
+        - ean13
+        - code128
+        in: path
+        name: type
+        required: true
+        type: string
+      - description: Barcode content
+        in: path
+        minLength: 1
+        name: content
+        required: true
+        type: string
+      - default: 1000
+        description: Barcode width
+        in: query
+        maximum: 10000
+        minimum: 1
+        name: width
+        type: integer
+      - default: 1000
+        description: Barcode height
+        in: query
+        maximum: 10000
+        minimum: 1
+        name: height
+        type: integer
+      - default: 10
+        description: Padding around the barcode (included in image size)
+        in: query
+        maximum: 100
+        minimum: 0
+        name: padding
+        type: integer
+      produces:
+      - image/png
+      responses: {}
+      summary: Generate barcodes
+      tags:
+      - barcodes
+  /v1/pdfs/cards:
     post:
       consumes:
       - application/json
@@ -172,10 +218,12 @@ paths:
       produces:
       - application/pdf
       responses: {}
+      security:
+      - ApiKeyAuth: []
       summary: Generate runner cards
       tags:
-      - cards
+      - pdfs
-  /certificates:
+  /v1/pdfs/certificates:
     post:
       consumes:
       - application/json
@@ -190,10 +238,12 @@ paths:
       produces:
       - application/pdf
       responses: {}
+      security:
+      - ApiKeyAuth: []
       summary: Generate runner certificates
       tags:
-      - certificates
+      - pdfs
-  /contracts:
+  /v1/pdfs/contracts:
     post:
       consumes:
       - application/json
@@ -208,7 +258,14 @@ paths:
       produces:
       - application/pdf
       responses: {}
+      security:
+      - ApiKeyAuth: []
       summary: Generate a contract
       tags:
-      - contracts
+      - pdfs
+securityDefinitions:
+  ApiKeyAuth:
+    in: query
+    name: key
+    type: apiKey
 swagger: "2.0"

go.mod

@@ -14,6 +14,8 @@ require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/boombuler/barcode v1.0.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -32,6 +34,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/oxplot/papersizes v0.0.0-20181201065918-90a3a5ae1915 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/redis/go-redis/v9 v9.7.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect

go.sum

@@ -4,9 +4,13 @@ github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7X
 github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
 github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4=
 github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
@@ -54,6 +58,8 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
+github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=

handlers/barcode.go

@@ -0,0 +1,64 @@
+package handlers
+
+import (
+	"strconv"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+// GenerateBarcode godoc
+//
+//	@Summary		Generate barcodes
+//	@Description	Generate barcodes based on the provided data
+//	@Tags			barcodes
+//	@Param			type	path	string	true	"Barcode type"											Enums(ean13, code128)
+//	@Param			content	path	string	true	"Barcode content"										MinLength(1)
+//	@Param			width	query	int		false	"Barcode width"											Minimum(1)	Maximum(10000)	default(1000)
+//	@Param			height	query	int		false	"Barcode height"										Minimum(1)	Maximum(10000)	default(1000)
+//	@Param			padding	query	int		false	"Padding around the barcode (included in image size)"	Minimum(0)	Maximum(100)	default(10)
+//	@Produce		image/png
+//	@Router			/v1/barcodes/{type}/{content} [get]
+func (h *DefaultHandler) GenerateBarcode(c *fiber.Ctx) error {
+
+	// Get the type and content from the URL
+	barcodeType := c.Params("type")
+	barcodeContent := c.Params("content")
+
+	// Get the width and height from the query parameters
+	widthStr := c.Query("width", "1000")
+	heightStr := c.Query("height", "1000")
+	paddingStr := c.Query("padding", "10")
+
+	// Convert width and height to integers
+	width, err := strconv.Atoi(widthStr)
+	if err != nil {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"error": "Invalid width parameter",
+		})
+	}
+
+	height, err := strconv.Atoi(heightStr)
+	if err != nil {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"error": "Invalid height parameter",
+		})
+	}
+
+	padding, err := strconv.Atoi(paddingStr)
+	if err != nil {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"error": "Invalid padding parameter",
+		})
+	}
+
+	// Generate the barcode
+	barcode, err := h.BarcodeService.GenerateBarcode(barcodeType, barcodeContent, width, height, padding)
+	if err != nil {
+		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
+			"error": err.Error(),
+		})
+	}
+
+	c.Set(fiber.HeaderContentType, "image/png")
+	return c.Send(barcode.Bytes())
+}

handlers/card.go

@@ -5,18 +5,19 @@ import (
 	"slices"
 
 	"git.odit.services/lfk/document-server/models"
-	"git.odit.services/lfk/document-server/services"
 	"github.com/gofiber/fiber/v2"
 )
 
 // GenerateCard godoc
+//
 //	@Summary		Generate runner cards
 //	@Description	Generate cards based on the provided data
-// @Tags cards
+//	@Tags			pdfs
 //	@Accept			json
 //	@Param			data	body	models.CardRequest	true	"Card data"
 //	@Produce		application/pdf
-// @Router /cards [post]
+//	@Security		ApiKeyAuth
+//	@Router			/v1/pdfs/cards [post]
 func (h *DefaultHandler) GenerateCard(c *fiber.Ctx) error {
 	cardRequest := new(models.CardRequest)
 	if err := c.BodyParser(cardRequest); err != nil {
@@ -30,15 +31,14 @@ func (h *DefaultHandler) GenerateCard(c *fiber.Ctx) error {
 		})
 	}
 
-	generator := services.DefaultTemplater{}
+	templateString, err := h.StaticService.GetTemplate(cardRequest.Locale, "card")
-	templateString, err := services.GetTemplate(cardRequest.Locale, "card")
 	if err != nil {
 		log.Println(err)
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
 			"error": "Template not found",
 		})
 	}
-	template, err := generator.StringToTemplate(templateString)
+	template, err := h.Templater.StringToTemplate(templateString)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
@@ -53,15 +53,15 @@ func (h *DefaultHandler) GenerateCard(c *fiber.Ctx) error {
 		BarcodePrefix: h.Config.CardBarcodePrefix,
 	}
 
-	result, err := generator.Execute(template, genConfig)
+	result, err := h.Templater.Execute(template, genConfig)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
 		})
 	}
 	c.Set(fiber.HeaderContentType, "text/html")
-	converter := services.GotenbergConverter{BaseUrl: h.Config.GotenbergBaseUrl}
+
-	pdf, err := converter.ToPdf(result, "a4", false)
+	pdf, err := h.Converter.ToPdf(result, "a4", false)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
@@ -69,6 +69,7 @@ func (h *DefaultHandler) GenerateCard(c *fiber.Ctx) error {
 	}
 
 	c.Set(fiber.HeaderContentType, "application/pdf")
+	c.Set(fiber.HeaderContentDisposition, "attachment; filename=runner-cards.pdf")
 	return c.Send(pdf)
 }
 

handlers/certificate.go

@@ -5,18 +5,19 @@ import (
 	"slices"
 
 	"git.odit.services/lfk/document-server/models"
-	"git.odit.services/lfk/document-server/services"
 	"github.com/gofiber/fiber/v2"
 )
 
 // GenerateCertificate godoc
+//
 //	@Summary		Generate runner certificates
 //	@Description	Generate certificates based on the provided data
-// @Tags certificates
+//	@Tags			pdfs
 //	@Accept			json
 //	@Param			data	body	models.CertificateRequest	true	"Certificate data"
 //	@Produce		application/pdf
-// @Router /certificates [post]
+//	@Security		ApiKeyAuth
+//	@Router			/v1/pdfs/certificates [post]
 func (h *DefaultHandler) GenerateCertificate(c *fiber.Ctx) error {
 	certificateRequest := new(models.CertificateRequest)
 	if err := c.BodyParser(certificateRequest); err != nil {
@@ -30,15 +31,14 @@ func (h *DefaultHandler) GenerateCertificate(c *fiber.Ctx) error {
 		})
 	}
 
-	generator := services.DefaultTemplater{}
+	templateString, err := h.StaticService.GetTemplate(certificateRequest.Locale, "certificate")
-	templateString, err := services.GetTemplate(certificateRequest.Locale, "certificate")
 	if err != nil {
 		log.Println(err)
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
 			"error": "Template not found",
 		})
 	}
-	template, err := generator.StringToTemplate(templateString)
+	template, err := h.Templater.StringToTemplate(templateString)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
@@ -53,15 +53,15 @@ func (h *DefaultHandler) GenerateCertificate(c *fiber.Ctx) error {
 		Locale:         certificateRequest.Locale,
 	}
 
-	result, err := generator.Execute(template, genConfig)
+	result, err := h.Templater.Execute(template, genConfig)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
 		})
 	}
 	c.Set(fiber.HeaderContentType, "text/html")
-	converter := services.GotenbergConverter{BaseUrl: h.Config.GotenbergBaseUrl}
+
-	pdf, err := converter.ToPdf(result, "a4", false)
+	pdf, err := h.Converter.ToPdf(result, "a4", false)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
@@ -69,6 +69,7 @@ func (h *DefaultHandler) GenerateCertificate(c *fiber.Ctx) error {
 	}
 
 	c.Set(fiber.HeaderContentType, "application/pdf")
+	c.Set(fiber.HeaderContentDisposition, "attachment; filename=certificate.pdf")
 	return c.Send(pdf)
 }
 

handlers/contract.go

@@ -5,18 +5,19 @@ import (
 	"slices"
 
 	"git.odit.services/lfk/document-server/models"
-	"git.odit.services/lfk/document-server/services"
 	"github.com/gofiber/fiber/v2"
 )
 
 // GenerateContract godoc
+//
 //	@Summary		Generate a contract
 //	@Description	Generate a contract based on the provided data
-// @Tags contracts
+//	@Tags			pdfs
 //	@Accept			json
 //	@Param			data	body	models.ContractRequest	true	"Contract data"
 //	@Produce		application/pdf
-// @Router /contracts [post]
+//	@Security		ApiKeyAuth
+//	@Router			/v1/pdfs/contracts [post]
 func (h *DefaultHandler) GenerateContract(c *fiber.Ctx) error {
 	contract := new(models.ContractRequest)
 	if err := c.BodyParser(contract); err != nil {
@@ -32,15 +33,14 @@ func (h *DefaultHandler) GenerateContract(c *fiber.Ctx) error {
 
 	contract.Runners = repeatRunnerArrayItems(contract.Runners, 2)
 
-	generator := services.DefaultTemplater{}
+	templateString, err := h.StaticService.GetTemplate(contract.Locale, "contract")
-	templateString, err := services.GetTemplate(contract.Locale, "contract")
 	if err != nil {
 		log.Println(err)
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
 			"error": "Template not found",
 		})
 	}
-	template, err := generator.StringToTemplate(templateString)
+	template, err := h.Templater.StringToTemplate(templateString)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
@@ -57,15 +57,14 @@ func (h *DefaultHandler) GenerateContract(c *fiber.Ctx) error {
 		BarcodePrefix:        h.Config.SponsoringBarcodePrefix,
 	}
 
-	result, err := generator.Execute(template, genConfig)
+	result, err := h.Templater.Execute(template, genConfig)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
 		})
 	}
 
-	converter := services.GotenbergConverter{BaseUrl: h.Config.GotenbergBaseUrl}
+	pdf, err := h.Converter.ToPdf(result, "a5", true)
-	pdf, err := converter.ToPdf(result, "a5", true)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
@@ -73,6 +72,7 @@ func (h *DefaultHandler) GenerateContract(c *fiber.Ctx) error {
 	}
 
 	c.Set(fiber.HeaderContentType, "application/pdf")
+	c.Set(fiber.HeaderContentDisposition, "attachment; filename=runner-contracts.pdf")
 	return c.Send(pdf)
 }
 

handlers/handlers.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"git.odit.services/lfk/document-server/models"
+	"git.odit.services/lfk/document-server/services"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -9,8 +10,13 @@ type Handler interface {
 	GenerateCard(*fiber.Ctx) error
 	GenerateContract(*fiber.Ctx) error
 	GenerateCertificate(*fiber.Ctx) error
+	GenerateBarcode(*fiber.Ctx) error
 }
 
 type DefaultHandler struct {
 	Config         *models.Config
+	BarcodeService services.BarcodeService
+	Templater      services.Templater
+	Converter      services.Converter
+	StaticService  services.StaticService
 }

main.go

@@ -8,9 +8,11 @@ import (
 	"git.odit.services/lfk/document-server/docs" // Correct import path for docs
 	"git.odit.services/lfk/document-server/handlers"
 	"git.odit.services/lfk/document-server/models"
+	"git.odit.services/lfk/document-server/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/keyauth"
 	"github.com/gofiber/swagger"
+	"github.com/redis/go-redis/v9"
 	"github.com/spf13/viper"
 )
 
@@ -35,6 +37,7 @@ func loadEnv() error {
 	viper.SetDefault("CARD_BARCODEPREFIX", "")
 	viper.SetDefault("SPONSORING_BARCODEFORMAT", "code128")
 	viper.SetDefault("SPONSORING_BARCODEPREFIX", "")
+	viper.SetDefault("APIKEY", "lfk")
 
 	// Load .env file
 	viper.SetConfigFile(".env")
@@ -43,7 +46,7 @@ func loadEnv() error {
 	viper.AutomaticEnv()
 	err := viper.ReadInConfig()
 	if err != nil {
-		return err
+		log.Println("No .env file found")
 	}
 
 	// Unmarshal the config from file and env into the config struct
@@ -52,11 +55,21 @@ func loadEnv() error {
 		return err
 	}
 
+	log.Printf("Loaded config: %+v\n", config)
+
 	return nil
 }
 
 // @title						LfK Document Server API
 // @description				This is the API documentation for the LfK Document Server - a tool for pdf generation.
+// @license.name				CC BY-NC-SA 4.0
+// @termsOfService				https://lauf-fuer-kaya.de/datenschutz
+// @contact.name				ODIT.Services UG (haftungsbeschränkt)
+// @contact.url				https://odit.services
+// @contact.email				info@odit.services
+// @securityDefinitions.apiKey	ApiKeyAuth
+// @in							query
+// @name						key
 func main() {
 
 	err := loadEnv()
@@ -64,8 +77,31 @@ func main() {
 		log.Fatal(err)
 	}
 
+	var redisClient *redis.Client
+	if config.RedisAddr != "" {
+		log.Println("Using redis at", config.RedisAddr)
+		redisClient = redis.NewClient(&redis.Options{
+			Addr: config.RedisAddr,
+		})
+	}
+
+	barcodeGenerator := &services.DefaultBarcodeService{
+		RedisClient: redisClient,
+	}
+	staticService := &services.DefaultStaticService{
+		Cache: make(map[string]string),
+	}
 	handler := handlers.DefaultHandler{
 		Config:         config,
+		BarcodeService: barcodeGenerator,
+		StaticService:  staticService,
+		Templater: &services.DefaultTemplater{
+			BarcodeService: barcodeGenerator,
+			StaticService:  staticService,
+		},
+		Converter: &services.GotenbergConverter{
+			BaseUrl: config.GotenbergBaseUrl,
+		},
 	}
 
 	// Create a new Fiber instance
@@ -77,17 +113,18 @@ func main() {
 	app.Get("/swagger/*", swagger.HandlerDefault)
 
 	v1 := app.Group("/v1")
-	v1.Use(keyauth.New(keyauth.Config{
+
+	pdfv1 := v1.Group("/pdfs")
+	pdfv1.Use(keyauth.New(keyauth.Config{
 		KeyLookup: "query:key",
 		Validator: validateAPIKey,
 	}))
 
-	v1.Get("/", func(c *fiber.Ctx) error {
+	pdfv1.Post("/contracts", handler.GenerateContract)
-		return c.SendString("Hello, World!")
+	pdfv1.Post("/cards", handler.GenerateCard)
-	})
+	pdfv1.Post("/certificates", handler.GenerateCertificate)
-	v1.Post("/contracts", handler.GenerateContract)
+
-	v1.Post("/cards", handler.GenerateCard)
+	v1.Get("/barcodes/:type/:content", handler.GenerateBarcode)
-	v1.Post("/certificates", handler.GenerateCertificate)
 
 	app.Use(handler.NotFoundHandler)
 	docs.SwaggerInfo.BasePath = "/"

models/config.go

@@ -15,4 +15,5 @@ type Config struct {
 	SponsoringBarcodePrefix  string `mapstructure:"SPONSORING_BARCODEPREFIX"`
 	CertificateFooter        string `mapstructure:"CERTIFICATE_FOOTER"`
 	GotenbergBaseUrl         string `mapstructure:"GOTENBERG_BASEURL"`
+	RedisAddr                string `mapstructure:"REDIS_ADDR"`
 }

models/contract.go

@@ -14,9 +14,7 @@ type Runner struct {
 }
 
 type Group struct {
-	ID          int    `json:"id" validate:"required"`
 	Name string `json:"name" validate:"required"`
-	ParentGroup *Group `json:"parent_group" validate:"optional"`
 }
 
 type ContractTemplateOptions struct {

services/barcode.go

@@ -0,0 +1,109 @@
+package services
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"image"
+	"image/color"
+	"image/draw"
+	"image/png"
+	"log"
+	"slices"
+	"time"
+
+	"github.com/boombuler/barcode"
+	"github.com/boombuler/barcode/code128"
+	"github.com/boombuler/barcode/ean"
+	"github.com/boombuler/barcode/qr"
+	"github.com/redis/go-redis/v9"
+)
+
+type BarcodeService interface {
+	GenerateBarcode(format string, content string, width int, height int, padding int) (bytes.Buffer, error)
+	IsTypeSupported(format string) bool
+}
+
+type DefaultBarcodeService struct {
+	RedisClient *redis.Client
+}
+
+func (b *DefaultBarcodeService) GenerateBarcode(format string, content string, width int, height int, padding int) (bytes.Buffer, error) {
+	ctx := context.Background()
+
+	if !b.IsTypeSupported(format) {
+		return bytes.Buffer{}, fmt.Errorf("unsupported barcode type: %s", format)
+	}
+
+	if b.RedisClient != nil {
+		cachedBarcode, err := b.RedisClient.Get(ctx, fmt.Sprintf("barcode:%s:%s:%d:%d:%d", format, content, width, height, padding)).Result()
+		if err == nil {
+			log.Printf("Cache hit for barcode:%s:%s:%d:%d", format, content, width, height)
+			buf := bytes.Buffer{}
+			buf.Write([]byte(cachedBarcode))
+			return buf, nil
+		}
+	}
+
+	var generatedCode barcode.Barcode
+	var err error
+
+	switch format {
+	case "ean13":
+		generatedCode, err = ean.Encode(content)
+		if err != nil {
+			return bytes.Buffer{}, err
+		}
+		break
+	case "code128":
+		generatedCode, err = code128.Encode(content)
+		if err != nil {
+			return bytes.Buffer{}, err
+		}
+		break
+	case "qr":
+		generatedCode, err = qr.Encode(content, qr.M, qr.AlphaNumeric)
+		if err != nil {
+			return bytes.Buffer{}, err
+		}
+		break
+	}
+
+	// Create a white background image
+	bg := image.NewRGBA(image.Rect(0, 0, width, height))
+	white := color.RGBA{255, 255, 255, 255}
+	draw.Draw(bg, bg.Bounds(), &image.Uniform{white}, image.Point{}, draw.Src)
+
+	// Calculate the new size for the barcode to fit within the padding
+	newWidth := width - 2*padding
+	newHeight := height - 2*padding
+
+	// Scale the barcode to the new size
+	scaledCode, err := barcode.Scale(generatedCode, newWidth, newHeight)
+	if err != nil {
+		return bytes.Buffer{}, err
+	}
+
+	// Draw the barcode on top of the white background with padding
+	draw.Draw(bg, scaledCode.Bounds().Add(image.Point{padding, padding}), scaledCode, image.Point{}, draw.Over)
+
+	var buf bytes.Buffer
+	err = png.Encode(&buf, bg)
+	if err != nil {
+		return bytes.Buffer{}, err
+	}
+
+	if b.RedisClient != nil {
+		err = b.RedisClient.Set(ctx, fmt.Sprintf("barcode:%s:%s:%d:%d", format, content, width, height), buf.String(), 10*time.Minute).Err()
+		if err != nil {
+			return bytes.Buffer{}, err
+		}
+	}
+
+	return buf, nil
+}
+
+func (b *DefaultBarcodeService) IsTypeSupported(format string) bool {
+	supportedTypes := []string{"ean13", "code128", "qr"}
+	return slices.Contains(supportedTypes, format)
+}

services/templater.go

@@ -6,13 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"html/template"
-	"image/png"
 	"strings"
-
-	"github.com/boombuler/barcode"
-	"github.com/boombuler/barcode/code128"
-	"github.com/boombuler/barcode/ean"
-	"github.com/boombuler/barcode/qr"
 )
 
 type Templater interface {
@@ -21,6 +15,8 @@ type Templater interface {
 }
 
 type DefaultTemplater struct {
+	BarcodeService BarcodeService
+	StaticService  StaticService
 }
 
 func idToEan13(id string, prefix string) (string, error) {
@@ -37,60 +33,30 @@ func idToEan13(id string, prefix string) (string, error) {
 }
 
 func (t *DefaultTemplater) GenerateBarcode(code string, format string, prefix string) (string, error) {
-	var generatedCode barcode.Barcode
 	var err error
 
-	switch format {
+	if format == "ean13" {
-	case "ean13":
+		code, err = idToEan13(code, prefix)
-		encodedEan, err := idToEan13(code, prefix)
 		if err != nil {
 			return "", err
 		}
-		generatedCode, err = ean.Encode(encodedEan)
-		if err != nil {
-			return "", err
-		}
-		break
-	case "code128":
-		generatedCode, err = code128.Encode(prefix + code)
-		if err != nil {
-			return "", err
-		}
-		break
-	case "qr":
-		generatedCode, err = qr.Encode(prefix+code, qr.M, qr.AlphaNumeric)
-		if err != nil {
-			return "", err
-		}
-		break
-	default:
-		return "", errors.New("unknown barcode format")
 	}
 
-	scaledCode, err := barcode.Scale(generatedCode, 1000, 500)
+	buf, err := t.BarcodeService.GenerateBarcode(format, code, 1000, 500, 0)
-	if err != nil {
-		return "", err
-	}
 
-	var buf bytes.Buffer
+	return base64.StdEncoding.EncodeToString(buf.Bytes()), err
-	err = png.Encode(&buf, scaledCode)
-	if err != nil {
-		return "", err
-	}
-
-	return base64.StdEncoding.EncodeToString(buf.Bytes()), nil
 }
 
 func (t *DefaultTemplater) SelectSponsorImage(id int) (string, error) {
-	sponsors, err := ListFilesInStaticSubFolder("images/sponsors")
+	sponsors, err := t.StaticService.ListFilesInStaticSubFolder("images/sponsors")
 	if err != nil {
 		return "", err
 	}
-	return GetImage("sponsors/" + strings.TrimSuffix(sponsors[id%len(sponsors)], ".base64")), nil
+	return t.StaticService.GetImage("sponsors/" + strings.TrimSuffix(sponsors[id%len(sponsors)], ".base64")), nil
 }
 
 func (t *DefaultTemplater) LoadImage(name string) (string, error) {
-	return GetImage(name), nil
+	return t.StaticService.GetImage(name), nil
 }
 
 func (t *DefaultTemplater) FormatUnit(unit string, locale string, amount int) (string, error) {

services/templates.go

@@ -7,16 +7,35 @@ import (
 	"os"
 )
 
-func GetTemplate(locale, templateName string) (string, error) {
+type StaticService interface {
+	GetTemplate(locale, templateName string) (string, error)
+	ListFilesInStaticSubFolder(folderName string) ([]string, error)
+	GetImage(imageName string) string
+}
+
+type DefaultStaticService struct {
+	Cache map[string]string
+}
+
+func (s *DefaultStaticService) GetTemplate(locale, templateName string) (string, error) {
+
+	if s.Cache[locale+templateName] != "" {
+		log.Printf("returning cached template %s with locale %s", templateName, locale)
+		return s.Cache[locale+templateName], nil
+	}
+
 	content, err := os.ReadFile(fmt.Sprintf("static/templates/%s/%s.html", templateName, locale))
 	if content == nil || err != nil {
 		log.Printf("error reading template %s with locale %s: %v", templateName, locale, err)
 		return "", err
 	}
+
+	s.Cache[locale+templateName] = string(content)
+
 	return string(content), nil
 }
 
-func ListFilesInStaticSubFolder(folderName string) ([]string, error) {
+func (s *DefaultStaticService) ListFilesInStaticSubFolder(folderName string) ([]string, error) {
 	files, err := os.ReadDir(fmt.Sprintf("static/%s", folderName))
 	if err != nil {
 		log.Printf("error reading files from folder %s: %v", folderName, err)
@@ -32,7 +51,7 @@ func ListFilesInStaticSubFolder(folderName string) ([]string, error) {
 	return images, nil
 }
 
-func GetImage(imageName string) string {
+func (s *DefaultStaticService) GetImage(imageName string) string {
 	content, err := os.ReadFile("static/images/" + imageName + ".base64")
 	if content == nil || err != nil {
 		log.Printf("error reading image %s: %v", imageName, err)