Replaced chi v5 with gin
This commit is contained in:
Borna Rajković
parent
3df4c2dfaa
commit
484d60da70
32
go.mod
32
go.mod
|
|
@ -3,9 +3,37 @@ module holiday-api
|
|||
go 1.19
|
||||
|
||||
require (
|
||||
github.com/go-chi/chi v1.5.4
|
||||
github.com/gin-gonic/gin v1.9.1
|
||||
github.com/google/uuid v1.3.0
|
||||
github.com/jmoiron/sqlx v1.3.5
|
||||
github.com/joho/godotenv v1.5.1
|
||||
github.com/lib/pq v1.10.9
|
||||
github.com/google/uuid v1.3.0 // indirect
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bytedance/sonic v1.9.1 // indirect
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
|
||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||
github.com/gin-gonic/gin v1.9.1 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
||||
github.com/goccy/go-json v0.10.2 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
|
||||
github.com/leodido/go-urn v1.2.4 // indirect
|
||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.2.11 // indirect
|
||||
golang.org/x/arch v0.3.0 // indirect
|
||||
golang.org/x/crypto v0.9.0 // indirect
|
||||
golang.org/x/net v0.10.0 // indirect
|
||||
golang.org/x/sys v0.8.0 // indirect
|
||||
golang.org/x/text v0.9.0 // indirect
|
||||
google.golang.org/protobuf v1.30.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
|
|
|||
78
go.sum
78
go.sum
|
|
@ -1,15 +1,93 @@
|
|||
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
|
||||
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
|
||||
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
|
||||
github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
|
||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
|
||||
github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
|
||||
github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs=
|
||||
github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg=
|
||||
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
|
||||
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
||||
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
||||
github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
|
||||
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
||||
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
|
||||
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
||||
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
||||
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
|
||||
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||
github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
|
||||
github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
|
||||
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
||||
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
||||
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
|
||||
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
|
||||
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
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/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
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.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
||||
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
|
||||
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
|
||||
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
|
||||
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
|
||||
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
|
||||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
|
||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
|
||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
||||
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
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=
|
||||
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
|
||||
|
|
|
|||
87
handlers.go
87
handlers.go
|
|
@ -3,37 +3,32 @@ package main
|
|||
import (
|
||||
"encoding/xml"
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/google/uuid"
|
||||
"holiday-api/holiday"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
func getHolidays(service holiday.Service) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseForm(); err != nil {
|
||||
log.Printf("Failed parsing params: %v", err)
|
||||
func getHolidays(service holiday.Service) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
paging := holiday.Paging{PageSize: 50}
|
||||
if err := c.ShouldBindQuery(&paging); err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
paging := holiday.Paging{
|
||||
PageSize: readInt(r, "pageSize", 1000),
|
||||
Page: readInt(r, "page", 0),
|
||||
}
|
||||
search := holiday.Search{
|
||||
Country: r.Form.Get("country"),
|
||||
Year: readIntNullable(r, "year"),
|
||||
Date: readDateNullable(r, "date"),
|
||||
RangeStart: readDateNullable(r, "rangeStart"),
|
||||
RangeEnd: readDateNullable(r, "rangeEnd"),
|
||||
StateHoliday: readBoolNullable(r, "stateHoliday"),
|
||||
ReligiousHoliday: readBoolNullable(r, "religiousHoliday"),
|
||||
|
||||
search := holiday.Search{}
|
||||
if err := c.ShouldBindQuery(&search); err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
|
||||
holidays, err := service.Find(search, paging)
|
||||
if err != nil {
|
||||
render(w, r, 404, ErrorResponse{Created: time.Now(), Message: "failed fetching holidays"})
|
||||
render(c, http.StatusNotFound, ErrorResponse{Created: time.Now(), Message: "failed fetching holidays"})
|
||||
} else {
|
||||
render(w, r, 200, mapHolidays(holidays))
|
||||
render(c, http.StatusOK, mapHolidays(holidays))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -105,55 +100,3 @@ func mapHolidays(holidays []holiday.Holiday) HolidayResponse {
|
|||
Holidays: response,
|
||||
}
|
||||
}
|
||||
|
||||
func readDateNullable(r *http.Request, param string) *time.Time {
|
||||
if r.Form.Has(param) {
|
||||
var year, month, date int
|
||||
count, err := fmt.Sscanf(r.Form.Get(param), "%d-%d-%d", &year, &month, &date)
|
||||
if count < 3 {
|
||||
log.Printf("failed reading %s: %v", param, err)
|
||||
return nil
|
||||
} else {
|
||||
readDate := time.Date(year, time.Month(month), date, 0, 0, 0, 0, time.UTC)
|
||||
return &readDate
|
||||
}
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func readIntNullable(r *http.Request, param string) *int {
|
||||
if r.Form.Has(param) {
|
||||
if value, err := strconv.Atoi(r.Form.Get(param)); err == nil {
|
||||
return &value
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func readBoolNullable(r *http.Request, param string) *bool {
|
||||
if r.Form.Has(param) {
|
||||
if value, err := strconv.ParseBool(r.Form.Get(param)); err == nil {
|
||||
return &value
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func readInt(r *http.Request, param string, defaultValue int) int {
|
||||
if r.Form.Has(param) {
|
||||
if value, err := strconv.Atoi(r.Form.Get(param)); err == nil {
|
||||
return value
|
||||
} else {
|
||||
return defaultValue
|
||||
}
|
||||
} else {
|
||||
return defaultValue
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@ type Holiday struct {
|
|||
}
|
||||
|
||||
type Paging struct {
|
||||
PageSize int
|
||||
Page int
|
||||
PageSize int `form:"page_size" binging:"min=0"`
|
||||
Page int `form:"page" binging:"min=0"`
|
||||
}
|
||||
|
||||
type Search struct {
|
||||
Country string
|
||||
Year *int
|
||||
Date *time.Time
|
||||
RangeStart *time.Time
|
||||
RangeEnd *time.Time
|
||||
StateHoliday *bool
|
||||
ReligiousHoliday *bool
|
||||
Country string `form:"country" binding:"len=2"`
|
||||
Year *int `form:"year" binding:"omitempty,min=0"`
|
||||
Date *time.Time `form:"date" time_format:"2006-01-02"`
|
||||
RangeStart *time.Time `form:"range_start" time_format:"2006-01-02"`
|
||||
RangeEnd *time.Time `form:"range_end" time_format:"2006-01-02"`
|
||||
StateHoliday *bool `form:"state_holiday,omitempty"`
|
||||
ReligiousHoliday *bool `form:"religious_holiday,omitempty"`
|
||||
}
|
||||
|
|
|
|||
237
main.go
237
main.go
|
|
@ -2,9 +2,7 @@ package main
|
|||
|
||||
import (
|
||||
"embed"
|
||||
"fmt"
|
||||
"github.com/go-chi/chi"
|
||||
"github.com/go-chi/chi/middleware"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/google/uuid"
|
||||
"github.com/joho/godotenv"
|
||||
_ "github.com/lib/pq"
|
||||
|
|
@ -14,7 +12,6 @@ import (
|
|||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
|
@ -49,77 +46,49 @@ func main() {
|
|||
log.Fatalf("couldn't execute migrations: %v", err)
|
||||
}
|
||||
|
||||
r := chi.NewRouter()
|
||||
r.Use(middleware.RequestID)
|
||||
r.Use(middleware.RealIP)
|
||||
r.Use(middleware.Logger)
|
||||
r.Use(middleware.Recoverer)
|
||||
g := gin.Default()
|
||||
|
||||
holidayService := holiday.Service{client}
|
||||
loadTemplates(g)
|
||||
|
||||
r.Get("/api/v1/holidays", getHolidays(holidayService))
|
||||
holidayService := holiday.Service{DB: client}
|
||||
|
||||
templates, err := template.New("").ParseFiles("templates/index.gohtml", "templates/search.gohtml", "templates/search_date.gohtml", "templates/docs.gohtml")
|
||||
if err != nil {
|
||||
log.Fatalf("couldn't load templates: %v", err)
|
||||
}
|
||||
g.GET("/api/v1/holidays", getHolidays(holidayService))
|
||||
|
||||
r.Get("/docs", func(w http.ResponseWriter, r *http.Request) {
|
||||
templates, err := template.New("").ParseFiles("templates/docs.gohtml")
|
||||
if err != nil {
|
||||
log.Fatalf("couldn't load templates: %v", err)
|
||||
}
|
||||
renderTemplate(w, r, 200, templates, "docs.gohtml", 0)
|
||||
setupAdminDashboard(g.Group("/admin"), holidayService)
|
||||
|
||||
g.GET("/docs", func(c *gin.Context) {
|
||||
c.HTML(http.StatusOK, "docs.gohtml", nil)
|
||||
})
|
||||
|
||||
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
renderTemplate(w, r, 200, templates, "index.gohtml", 0)
|
||||
g.GET("/", func(c *gin.Context) {
|
||||
c.HTML(http.StatusOK, "index.gohtml", nil)
|
||||
})
|
||||
|
||||
r.Get("/search", func(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseForm()
|
||||
country := r.FormValue("country")
|
||||
year := time.Now().Year()
|
||||
if y := r.FormValue("year"); y != "" {
|
||||
if yr, err := strconv.ParseInt(y, 10, 64); err == nil {
|
||||
year = int(yr)
|
||||
g.GET("/search", func(c *gin.Context) {
|
||||
request := holiday.Search{}
|
||||
if err := c.ShouldBindQuery(&request); err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
search := holiday.Search{Year: &year, Country: country}
|
||||
|
||||
search := holiday.Search{Country: request.Country, Year: request.Year}
|
||||
holidays, _ := holidayService.Find(search, holiday.Paging{PageSize: 100})
|
||||
holidayResponse := mapHolidays(holidays)
|
||||
|
||||
renderTemplate(w, r, 200, templates, "search.gohtml", holidayResponse)
|
||||
c.HTML(http.StatusOK, "search.gohtml", mapHolidays(holidays))
|
||||
})
|
||||
|
||||
r.Get("/search/date", func(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseForm()
|
||||
country := r.FormValue("country")
|
||||
date := time.Now()
|
||||
if y := r.FormValue("date"); y != "" {
|
||||
date = parseDate(y)
|
||||
g.GET("/search/date", func(c *gin.Context) {
|
||||
request := holiday.Search{}
|
||||
if err := c.ShouldBindQuery(&request); err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
|
||||
search := holiday.Search{Date: &date, Country: country}
|
||||
|
||||
search := holiday.Search{Country: request.Country, Date: request.Date}
|
||||
holidays, _ := holidayService.Find(search, holiday.Paging{PageSize: 100})
|
||||
holidayResponse := mapHolidays(holidays)
|
||||
|
||||
renderTemplate(w, r, 200, templates, "search_date.gohtml", holidayResponse)
|
||||
c.HTML(http.StatusOK, "search_date.gohtml", mapHolidays(holidays))
|
||||
})
|
||||
|
||||
r.Mount("/admin", adminDashboard(holidayService))
|
||||
|
||||
log.Fatal(http.ListenAndServe(":5281", r))
|
||||
log.Fatal(http.ListenAndServe(":5281", g))
|
||||
}
|
||||
|
||||
func adminDashboard(service holiday.Service) http.Handler {
|
||||
r := chi.NewRouter()
|
||||
|
||||
credentials := loadCredentials()
|
||||
templates, err := template.New("").Funcs(template.FuncMap{
|
||||
func loadTemplates(g *gin.Engine) {
|
||||
g.SetFuncMap(template.FuncMap{
|
||||
"boolcmp": func(value *bool, expected string) bool {
|
||||
if value == nil {
|
||||
return expected == "nil"
|
||||
|
|
@ -128,16 +97,15 @@ func adminDashboard(service holiday.Service) http.Handler {
|
|||
}
|
||||
},
|
||||
"deferint": func(value *int) int { return *value },
|
||||
}).ParseFiles("templates/admin_dashboard.gohtml", "templates/holiday.gohtml", "templates/error.gohtml")
|
||||
if err != nil {
|
||||
log.Fatalf("couldn't load templates: %v", err)
|
||||
})
|
||||
g.LoadHTMLFiles("templates/admin_dashboard.gohtml", "templates/holiday.gohtml", "templates/error.gohtml", "templates/index.gohtml", "templates/search.gohtml", "templates/search_date.gohtml", "templates/docs.gohtml")
|
||||
}
|
||||
|
||||
r.Use(middleware.BasicAuth("/admin", credentials))
|
||||
func setupAdminDashboard(adminDashboard *gin.RouterGroup, service holiday.Service) {
|
||||
adminDashboard.Use(gin.BasicAuth(loadAuth()))
|
||||
|
||||
r.Get("/holiday", func(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseForm()
|
||||
id := r.FormValue("id")
|
||||
adminDashboard.GET("/holiday", func(c *gin.Context) {
|
||||
id := c.Query("id")
|
||||
|
||||
response := HolidaySingleResponse{
|
||||
Id: nil,
|
||||
|
|
@ -148,7 +116,6 @@ func adminDashboard(service holiday.Service) http.Handler {
|
|||
IsStateHoliday: true,
|
||||
IsReligiousHoliday: false,
|
||||
}
|
||||
|
||||
if id != "" {
|
||||
if h, err := service.FindById(uuid.Must(uuid.Parse(id))); err == nil {
|
||||
response = HolidaySingleResponse{
|
||||
|
|
@ -162,99 +129,70 @@ func adminDashboard(service holiday.Service) http.Handler {
|
|||
}
|
||||
}
|
||||
}
|
||||
renderTemplate(w, r, 200, templates, "holiday.gohtml", response)
|
||||
c.HTML(http.StatusOK, "holiday.gohtml", response)
|
||||
})
|
||||
|
||||
r.Post("/holiday/delete", func(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseForm()
|
||||
var id uuid.UUID
|
||||
if i := r.FormValue("id"); i != "" {
|
||||
id = uuid.MustParse(i)
|
||||
} else {
|
||||
log.Printf("Failed deleting holiday: missing id", err)
|
||||
w.WriteHeader(500)
|
||||
w.Write([]byte("There was an error"))
|
||||
adminDashboard.POST("/holiday", func(c *gin.Context) {
|
||||
request := struct {
|
||||
Id *string `form:"id"`
|
||||
Name string `form:"name" binding:"required,min=1"`
|
||||
Description string `form:"description"`
|
||||
IsStateHoliday bool `form:"stateHoliday"`
|
||||
IsReligiousHoliday bool `form:"religiousHoliday"`
|
||||
Country string `form:"country" binding:"len=2"`
|
||||
Date time.Time `form:"date" time_format:"2006-01-02"`
|
||||
}{}
|
||||
if err := c.ShouldBind(&request); err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
}
|
||||
err := service.Delete(id)
|
||||
if err != nil {
|
||||
log.Printf("Failed deleting holiday: %v", err)
|
||||
w.WriteHeader(500)
|
||||
w.Write([]byte("There was an error"))
|
||||
} else {
|
||||
w.Header().Add("Location", "/admin")
|
||||
w.WriteHeader(http.StatusSeeOther)
|
||||
w.Write([]byte{})
|
||||
}
|
||||
})
|
||||
|
||||
r.Post("/holiday", func(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseForm()
|
||||
var id *uuid.UUID = nil
|
||||
if i := r.FormValue("id"); i != "" {
|
||||
temp := uuid.MustParse(i)
|
||||
id = &temp
|
||||
}
|
||||
name := strings.TrimSpace(r.FormValue("name"))
|
||||
description := strings.TrimSpace(r.FormValue("description"))
|
||||
isStateHoliday := parseCheckbox(r.FormValue("stateHoliday"))
|
||||
isReligiousHoliday := parseCheckbox(r.FormValue("religiousHoliday"))
|
||||
date := parseDate(r.FormValue("date"))
|
||||
country := r.FormValue("country")
|
||||
|
||||
hol := holiday.Holiday{
|
||||
Country: country,
|
||||
Date: date,
|
||||
Name: name,
|
||||
Description: description,
|
||||
IsStateHoliday: isStateHoliday,
|
||||
IsReligiousHoliday: isReligiousHoliday,
|
||||
Country: request.Country,
|
||||
Date: request.Date,
|
||||
Name: request.Name,
|
||||
Description: request.Description,
|
||||
IsStateHoliday: request.IsStateHoliday,
|
||||
IsReligiousHoliday: request.IsReligiousHoliday,
|
||||
}
|
||||
|
||||
var err error
|
||||
if id != nil {
|
||||
hol.Id = *id
|
||||
if request.Id != nil {
|
||||
hol.Id = uuid.MustParse(*request.Id)
|
||||
hol, err = service.Update(hol)
|
||||
} else {
|
||||
hol, err = service.Create(hol)
|
||||
}
|
||||
if err != nil {
|
||||
log.Printf("Failed updating or creating holiday: %v", err)
|
||||
w.WriteHeader(500)
|
||||
w.Write([]byte("There was an error"))
|
||||
c.AbortWithError(http.StatusInternalServerError, err)
|
||||
} else {
|
||||
w.Header().Add("Location", "/admin/holiday?id="+hol.Id.String())
|
||||
w.WriteHeader(http.StatusSeeOther)
|
||||
w.Write([]byte{})
|
||||
c.Redirect(http.StatusSeeOther, "/admin/holiday?id="+hol.Id.String())
|
||||
}
|
||||
})
|
||||
|
||||
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseForm()
|
||||
country := r.FormValue("country")
|
||||
if country == "" {
|
||||
country = "HR"
|
||||
}
|
||||
var stateHoliday *bool = nil
|
||||
if h := r.FormValue("stateHoliday"); h != "" {
|
||||
if hol, err := strconv.ParseBool(h); err == nil {
|
||||
stateHoliday = &hol
|
||||
}
|
||||
}
|
||||
var religiousHoliday *bool = nil
|
||||
if h := r.FormValue("religiousHoliday"); h != "" {
|
||||
if hol, err := strconv.ParseBool(h); err == nil {
|
||||
religiousHoliday = &hol
|
||||
}
|
||||
}
|
||||
year := time.Now().Year()
|
||||
if y := r.FormValue("year"); y != "" {
|
||||
if yr, err := strconv.ParseInt(y, 10, 64); err == nil {
|
||||
year = int(yr)
|
||||
adminDashboard.POST("/holiday/delete", func(c *gin.Context) {
|
||||
request := struct {
|
||||
Id *string `form:"id" binding:"required"`
|
||||
}{}
|
||||
if err := c.ShouldBind(&request); err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
err := service.Delete(uuid.MustParse(*request.Id))
|
||||
if err != nil {
|
||||
log.Printf("Failed deleting holiday: %v", err)
|
||||
c.AbortWithStatus(http.StatusInternalServerError)
|
||||
} else {
|
||||
c.Redirect(http.StatusSeeOther, "/admin")
|
||||
}
|
||||
})
|
||||
|
||||
search := holiday.Search{Year: &year, Country: country, StateHoliday: stateHoliday, ReligiousHoliday: religiousHoliday}
|
||||
|
||||
adminDashboard.GET("/", func(c *gin.Context) {
|
||||
search := holiday.Search{Country: "HR", Year: new(int)}
|
||||
*search.Year = time.Now().Year()
|
||||
if err := c.ShouldBindQuery(&search); err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
holidays, _ := service.Find(search, holiday.Paging{PageSize: 100})
|
||||
holidayResponse := mapHolidays(holidays)
|
||||
|
||||
|
|
@ -262,26 +200,11 @@ func adminDashboard(service holiday.Service) http.Handler {
|
|||
response["holidays"] = holidayResponse
|
||||
response["search"] = search
|
||||
|
||||
renderTemplate(w, r, 200, templates, "admin_dashboard.gohtml", response)
|
||||
c.HTML(http.StatusOK, "admin_dashboard.gohtml", response)
|
||||
})
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
func parseDate(date string) time.Time {
|
||||
var year, month, day int
|
||||
fmt.Sscanf(date, "%d-%d-%d", &year, &month, &day)
|
||||
return time.Date(year, time.Month(month), day, 0, 0, 0, 0, time.UTC)
|
||||
}
|
||||
|
||||
func parseCheckbox(value string) bool {
|
||||
if value != "" {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func loadCredentials() map[string]string {
|
||||
func loadAuth() map[string]string {
|
||||
credentials := envMustExist("AUTH_KEY")
|
||||
values := strings.Split(credentials, ":")
|
||||
return map[string]string{values[0]: values[1]}
|
||||
|
|
|
|||
52
render.go
52
render.go
|
|
@ -1,58 +1,20 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"encoding/xml"
|
||||
"html/template"
|
||||
"log"
|
||||
"net/http"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func renderTemplate[T any](w http.ResponseWriter, r *http.Request, status int, templates *template.Template, template string, response T) error {
|
||||
buffer := bytes.Buffer{}
|
||||
if err := templates.Lookup(template).Execute(&buffer, response); err == nil {
|
||||
w.Header().Add("content-type", "text/html; charset=utf-8")
|
||||
w.WriteHeader(status)
|
||||
_, err = w.Write(buffer.Bytes())
|
||||
return err
|
||||
} else {
|
||||
return onError(w, err)
|
||||
}
|
||||
}
|
||||
|
||||
func onError(w http.ResponseWriter, err error) error {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
log.Printf("failed writing response: %v", err)
|
||||
_, _ = w.Write([]byte{})
|
||||
return err
|
||||
}
|
||||
|
||||
func render[T any](w http.ResponseWriter, r *http.Request, status int, response T) error {
|
||||
switch r.Header.Get("accept") {
|
||||
func render[T any](c *gin.Context, status int, response T) {
|
||||
switch c.GetHeader("accept") {
|
||||
case "application/xml":
|
||||
fallthrough
|
||||
case "text/xml":
|
||||
if body, err := xml.MarshalIndent(response, "", " "); err == nil {
|
||||
// we return the same type as requested
|
||||
w.Header().Add("content-type", r.Header.Get("accept")+"; charset=utf-8")
|
||||
w.WriteHeader(status)
|
||||
_, err = w.Write([]byte(xml.Header))
|
||||
_, err = w.Write(body)
|
||||
return err
|
||||
} else {
|
||||
return onError(w, err)
|
||||
}
|
||||
c.Header("content-type", c.GetHeader("accept")+"; charset=utf-8")
|
||||
c.XML(status, response)
|
||||
case "application/json":
|
||||
fallthrough
|
||||
default:
|
||||
if body, err := json.MarshalIndent(response, "", " "); err == nil {
|
||||
w.Header().Add("content-type", "application/json; charset=utf-8")
|
||||
w.WriteHeader(status)
|
||||
_, err = w.Write(body)
|
||||
return err
|
||||
} else {
|
||||
return onError(w, err)
|
||||
}
|
||||
c.Header("content-type", "application/json; charset=utf-8")
|
||||
c.JSON(status, response)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@
|
|||
<title>Holiday-api</title>
|
||||
</head>
|
||||
<body>
|
||||
<style>
|
||||
* {font-family: system-ui}
|
||||
</style>
|
||||
<h1><a href="/admin">Holiday-api</a></h1>
|
||||
<p>Welcome to admin interface for holiday api</p>
|
||||
|
||||
|
|
@ -40,26 +43,26 @@
|
|||
<label>State holiday</label>
|
||||
|
||||
<label for="state-holiday-true">True</label>
|
||||
<input type="radio" value="true" {{if boolcmp .search.StateHoliday "true"}}checked{{end}} id="state-holiday-true" name="stateHoliday">
|
||||
<input type="radio" value="true" {{if boolcmp .search.StateHoliday "true"}}checked{{end}} id="state-holiday-true" name="state_holiday">
|
||||
|
||||
<label for="state-holiday-false">False</label>
|
||||
<input type="radio" value="false" {{if boolcmp .search.StateHoliday "false"}}checked{{end}} id="state-holiday-false" name="stateHoliday">
|
||||
<input type="radio" value="false" {{if boolcmp .search.StateHoliday "false"}}checked{{end}} id="state-holiday-false" name="state_holiday">
|
||||
|
||||
<label for="state-holiday-any">Any</label>
|
||||
<input type="radio" value="" {{if boolcmp .search.StateHoliday "nil"}}checked{{end}} id="state-holiday-any" name="stateHoliday">
|
||||
<input type="radio" value="" {{if boolcmp .search.StateHoliday "nil"}}checked{{end}} id="state-holiday-any" name="state_holiday">
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>Religious holiday</label>
|
||||
|
||||
<label for="religious-holiday-true">True</label>
|
||||
<input type="radio" value="true" {{if boolcmp .search.ReligiousHoliday "true"}}checked{{end}} id="religious-holiday-true" name="religiousHoliday">
|
||||
<input type="radio" value="true" {{if boolcmp .search.ReligiousHoliday "true"}}checked{{end}} id="religious-holiday-true" name="religious_holiday">
|
||||
|
||||
<label for="religious-holiday-false">False</label>
|
||||
<input type="radio" value="false" {{if boolcmp .search.ReligiousHoliday "false"}}checked{{end}} id="religious-holiday-false" name="religiousHoliday">
|
||||
<input type="radio" value="false" {{if boolcmp .search.ReligiousHoliday "false"}}checked{{end}} id="religious-holiday-false" name="religious_holiday">
|
||||
|
||||
<label for="religious-holiday-any">Any</label>
|
||||
<input type="radio" value="" {{if boolcmp .search.ReligiousHoliday "nil"}}checked{{end}} id="religious-holiday-any" name="religiousHoliday">
|
||||
<input type="radio" value="" {{if boolcmp .search.ReligiousHoliday "nil"}}checked{{end}} id="religious-holiday-any" name="religious_holiday">
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@
|
|||
<input type="date" id="date" name="date" value="{{.Date.String}}">
|
||||
|
||||
<label for="state-holiday">State holiday</label>
|
||||
<input type="checkbox" id="state-holiday" name="stateHoliday" {{if .IsStateHoliday}}checked{{end}}>
|
||||
<input type="checkbox" id="state-holiday" value="true" name="stateHoliday" {{if .IsStateHoliday}}checked{{end}}>
|
||||
|
||||
<label for="religious-holiday">Religious holiday</label>
|
||||
<input type="checkbox" id="religious-holiday" name="religiousHoliday" {{if .IsReligiousHoliday}}checked{{end}}>
|
||||
<input type="checkbox" id="religious-holiday" value="true" name="religiousHoliday" {{if .IsReligiousHoliday}}checked{{end}}>
|
||||
|
||||
<button type="submit">{{if .Id}}Update{{else}}Create{{end}}</button>
|
||||
</form>
|
||||
|
|
|
|||
Loading…
Reference in New Issue