diff --git a/.env b/.env new file mode 100644 index 0000000..0abca1d --- /dev/null +++ b/.env @@ -0,0 +1,16 @@ +PORT=3000 +PRODUCION=false +APIKEY=lfk +EVENTNAME=Lauf für Kaya! 2025 +CURRENCYSYMBOL=€ + +CARD_SUBTITLE=Kaya ist cool +CARD_BARCODEFORMAT=ean13 +# CARD_BARCODEPREFIX= + +SPONSOING_RECEIPTMINIMUM=10 +SPONSORING_DISCLAIMER=Kaya ist cool, aber pass auf, dass du nicht zu viel Geld sammelst! +SPONSORING_BARCODEFORMAT=code128 +# SPONSORING_BARCODEPREFIX= + +CERTIFICATE_FOOTER=Kaya ist cool, danke für deine Unterstützung! \ No newline at end of file diff --git a/go.mod b/go.mod index ef24c89..b99bb16 100644 --- a/go.mod +++ b/go.mod @@ -14,26 +14,44 @@ 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/fsnotify/fsnotify v1.7.0 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/spec v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/klauspost/compress v1.17.11 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/makiuchi-d/gozxing v0.1.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect + 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/rivo/uniseg v0.4.7 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.19.0 // indirect + github.com/subosito/gotenv v1.6.0 // indirect github.com/swaggo/files/v2 v2.0.1 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.57.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.9.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/tools v0.27.0 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 3505c93..d730419 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,11 @@ 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/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/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= github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= @@ -20,6 +23,8 @@ github.com/gofiber/swagger v1.1.0 h1:ff3rg1fB+Rp5JN/N8jfxTiZtMKe/9tB9QDc79fPiJKQ github.com/gofiber/swagger v1.1.0/go.mod h1:pRZL0Np35sd+lTODTE5The0G+TMHfNY+oC4hM2/i5m8= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= @@ -28,6 +33,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/makiuchi-d/gozxing v0.1.1 h1:xxqijhoedi+/lZlhINteGbywIrewVdVv2wl9r5O9S1I= @@ -39,8 +46,12 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/oxplot/papersizes v0.0.0-20181201065918-90a3a5ae1915 h1:4WzMzgExTgBfuUQ/HegMf+jcHtH+c3fl7eySUQUbfzg= github.com/oxplot/papersizes v0.0.0-20181201065918-90a3a5ae1915/go.mod h1:LJRTnhoARxQgMyT7T9L+ZzwR4OrmyHTy5LPxZEzE1CM= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +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/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -48,8 +59,32 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/swaggo/files/v2 v2.0.1 h1:XCVJO/i/VosCDsJu1YLpdejGsGnBE9deRMpjN4pJLHk= github.com/swaggo/files/v2 v2.0.1/go.mod h1:24kk2Y9NYEJ5lHuCra6iVwkMjIekMCaFq/0JQj66kyM= github.com/swaggo/swag v1.16.4 h1:clWJtd9LStiG3VeijiCfOVODP6VpHtKdQy9ELFG3s1A= @@ -62,6 +97,12 @@ github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVS github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= @@ -70,12 +111,18 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/handlers/card.go b/handlers/card.go index c055154..fb81c92 100644 --- a/handlers/card.go +++ b/handlers/card.go @@ -17,7 +17,7 @@ import ( // @Param data body models.CardRequest true "Card data" // @Produce application/pdf // @Router /cards [post] -func GenerateCard(c *fiber.Ctx) error { +func (h *DefaultHandler) GenerateCard(c *fiber.Ctx) error { cardRequest := new(models.CardRequest) if err := c.BodyParser(cardRequest); err != nil { return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ @@ -47,10 +47,10 @@ func GenerateCard(c *fiber.Ctx) error { genConfig := &models.CardTemplateOptions{ CardSegments: splitCardSegments(cardRequest.Cards), - EventName: "Event name", - CardSubtitle: "Card subtitle", - BarcodeFormat: "ean13", - BarcodePrefix: "", + EventName: h.Config.EventName, + CardSubtitle: h.Config.CardSubtitle, + BarcodeFormat: h.Config.CardBarcodeFormat, + BarcodePrefix: h.Config.CardBarcodePrefix, } result, err := generator.Execute(template, genConfig) diff --git a/handlers/certificate.go b/handlers/certificate.go index 1a74d52..b64daa4 100644 --- a/handlers/certificate.go +++ b/handlers/certificate.go @@ -17,7 +17,7 @@ import ( // @Param data body models.CertificateRequest true "Certificate data" // @Produce application/pdf // @Router /certificates [post] -func GenerateCertificate(c *fiber.Ctx) error { +func (h *DefaultHandler) GenerateCertificate(c *fiber.Ctx) error { certificateRequest := new(models.CertificateRequest) if err := c.BodyParser(certificateRequest); err != nil { return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ @@ -47,9 +47,9 @@ func GenerateCertificate(c *fiber.Ctx) error { genConfig := &models.CertificateTemplateOptions{ Runners: addUpRunnerDonations(certificateRequest.Runners), - EventName: "Event name", - Footer: "Footer", - CurrencySymbol: "€", + EventName: h.Config.EventName, + Footer: h.Config.CertificateFooter, + CurrencySymbol: h.Config.CurrencySymbol, Locale: certificateRequest.Locale, } diff --git a/handlers/contract.go b/handlers/contract.go index 4a87da6..1a28c28 100644 --- a/handlers/contract.go +++ b/handlers/contract.go @@ -17,7 +17,7 @@ import ( // @Param data body models.ContractRequest true "Contract data" // @Produce application/pdf // @Router /contracts [post] -func GenerateContract(c *fiber.Ctx) error { +func (h *DefaultHandler) GenerateContract(c *fiber.Ctx) error { contract := new(models.ContractRequest) if err := c.BodyParser(contract); err != nil { return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ @@ -49,12 +49,12 @@ func GenerateContract(c *fiber.Ctx) error { genConfig := &models.ContractTemplateOptions{ Runners: contract.Runners, - CurrencySymbol: "€", - Disclaimer: "This is a disclaimer", - ReceiptMinimumAmount: 10, - EventName: "Event name", - BarcodeFormat: "ean13", - BarcodePrefix: "1", + CurrencySymbol: h.Config.CurrencySymbol, + Disclaimer: h.Config.SponosringDisclaimer, + ReceiptMinimumAmount: h.Config.SponsoringReceiptMinimum, + EventName: h.Config.EventName, + BarcodeFormat: h.Config.SponsoringBarcodeFormat, + BarcodePrefix: h.Config.SponsoringBarcodePrefix, } result, err := generator.Execute(template, genConfig) diff --git a/handlers/handlers.go b/handlers/handlers.go new file mode 100644 index 0000000..00a73d3 --- /dev/null +++ b/handlers/handlers.go @@ -0,0 +1,16 @@ +package handlers + +import ( + "git.odit.services/lfk/document-server/models" + "github.com/gofiber/fiber/v2" +) + +type Handler interface { + GenerateCard(*fiber.Ctx) error + GenerateContract(*fiber.Ctx) error + GenerateCertificate(*fiber.Ctx) error +} + +type DefaultHandler struct { + Config *models.Config +} diff --git a/handlers/util.go b/handlers/util.go index cb483e4..da69ff9 100644 --- a/handlers/util.go +++ b/handlers/util.go @@ -2,6 +2,6 @@ package handlers import "github.com/gofiber/fiber/v2" -func NotFoundHandler(c *fiber.Ctx) error { +func (h *DefaultHandler) NotFoundHandler(c *fiber.Ctx) error { return c.Status(404).SendString("Not Found") } diff --git a/main.go b/main.go index af2ab6c..0fbfed5 100644 --- a/main.go +++ b/main.go @@ -3,24 +3,23 @@ package main import ( "crypto/sha256" "crypto/subtle" - "flag" "log" "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" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/keyauth" "github.com/gofiber/swagger" + "github.com/spf13/viper" ) var ( - port = flag.String("port", ":3000", "Port to listen on") - prod = flag.Bool("prod", false, "Enable prefork in Production") - apiKey = flag.String("apikey", "lfk", "API key for incoming authentication") + config *models.Config ) func validateAPIKey(c *fiber.Ctx, key string) (bool, error) { - hashedAPIKey := sha256.Sum256([]byte(*apiKey)) + hashedAPIKey := sha256.Sum256([]byte(config.APIKey)) hashedKey := sha256.Sum256([]byte(key)) if subtle.ConstantTimeCompare(hashedAPIKey[:], hashedKey[:]) == 1 { @@ -29,15 +28,49 @@ func validateAPIKey(c *fiber.Ctx, key string) (bool, error) { return false, keyauth.ErrMissingOrMalformedAPIKey } +func loadEnv() error { + + viper.SetDefault("PORT", "3000") + viper.SetDefault("CARD_BARCODEFORMAT", "ean13") + viper.SetDefault("CARD_BARCODEPREFIX", "") + viper.SetDefault("SPONSORING_BARCODEFORMAT", "code128") + viper.SetDefault("SPONSORING_BARCODEPREFIX", "") + + // Load .env file + viper.SetConfigFile(".env") + + // Load environment variables + viper.AutomaticEnv() + err := viper.ReadInConfig() + if err != nil { + return err + } + + // Unmarshal the config from file and env into the config struct + err = viper.Unmarshal(&config) + if err != nil { + return err + } + + return nil +} + // @title LfK Document Server API // @description This is the API documentation for the LfK Document Server - a tool for pdf generation. func main() { - // Parse command-line flags - flag.Parse() + + err := loadEnv() + if err != nil { + log.Fatal(err) + } + + handler := handlers.DefaultHandler{ + Config: config, + } // Create a new Fiber instance app := fiber.New(fiber.Config{ - Prefork: *prod, + Prefork: config.Prod, }) // Swagger documentation route @@ -52,12 +85,12 @@ func main() { v1.Get("/", func(c *fiber.Ctx) error { return c.SendString("Hello, World!") }) - v1.Post("/contracts", handlers.GenerateContract) - v1.Post("/cards", handlers.GenerateCard) - v1.Post("/certificates", handlers.GenerateCertificate) + v1.Post("/contracts", handler.GenerateContract) + v1.Post("/cards", handler.GenerateCard) + v1.Post("/certificates", handler.GenerateCertificate) - app.Use(handlers.NotFoundHandler) + app.Use(handler.NotFoundHandler) docs.SwaggerInfo.BasePath = "/" - log.Fatal(app.Listen(*port)) + log.Fatal(app.Listen("0.0.0.0:" + config.Port)) } diff --git a/models/config.go b/models/config.go new file mode 100644 index 0000000..1529f3e --- /dev/null +++ b/models/config.go @@ -0,0 +1,17 @@ +package models + +type Config struct { + Prod bool `mapstructure:"PRODUCION"` + Port string `mapstructure:"PORT"` + APIKey string `mapstructure:"APIKEY"` + EventName string `mapstructure:"EVENTNAME"` + CurrencySymbol string `mapstructure:"CURRENCYSYMBOL"` + CardSubtitle string `mapstructure:"CARD_SUBTITLE"` + CardBarcodeFormat string `mapstructure:"CARD_BARCODEFORMAT"` + CardBarcodePrefix string `mapstructure:"CARD_BARCODEPREFIX"` + SponsoringReceiptMinimum int `mapstructure:"SPONSOING_RECEIPTMINIMUM"` + SponosringDisclaimer string `mapstructure:"SPONSORING_DISCLAIMER"` + SponsoringBarcodeFormat string `mapstructure:"SPONSORING_BARCODEFORMAT"` + SponsoringBarcodePrefix string `mapstructure:"SPONSORING_BARCODEPREFIX"` + CertificateFooter string `mapstructure:"CERTIFICATE_FOOTER"` +}