improve error handling and improve holiday tests (#63)

* improve error handling and improve holiday tests

* fix client, add go.work file and update deps

* add go.work file for v2/pkg

api/api.go

@@ -11,8 +11,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/your-overtime/api/pkg"
 
+	swaggerfiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
-	"github.com/swaggo/gin-swagger/swaggerFiles"
 )
 
 // API struct
@@ -82,7 +82,7 @@ func (a *API) CreateEndpoints() {
 
 	v1 := api.Group("/v1")
 
-	v1.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
+	v1.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
 
 	// Overview
 	v1.GET("/overview", a.GetOverview)

go.mod

@@ -3,16 +3,27 @@ module github.com/your-overtime/api
 go 1.15
 
 require (
-	github.com/emersion/go-ical v0.0.0-20220406103352-1c2d2bd7962b
+	github.com/bytedance/sonic v1.9.2 // indirect
+	github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f
 	github.com/gin-gonic/gin v1.9.1
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/spec v0.20.9 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-playground/validator/v10 v10.14.1 // indirect
 	github.com/go-sql-driver/mysql v1.6.0
-	github.com/jinzhu/now v1.1.4 // indirect
-	github.com/joho/godotenv v1.3.0
-	github.com/sirupsen/logrus v1.8.1
-	github.com/swaggo/gin-swagger v1.3.3
-	github.com/swaggo/swag v1.7.8
-	golang.org/x/crypto v0.9.0
-	gorm.io/driver/mysql v1.1.2
-	gorm.io/driver/sqlite v1.1.4
-	gorm.io/gorm v1.22.4
+	github.com/joho/godotenv v1.4.0
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/mattn/go-sqlite3 v1.14.15 // indirect
+	github.com/sirupsen/logrus v1.9.0
+	github.com/swaggo/files v1.0.1
+	github.com/swaggo/gin-swagger v1.6.0
+	github.com/swaggo/swag v1.16.1
+	github.com/teambition/rrule-go v1.8.0 // indirect
+	golang.org/x/crypto v0.10.0
+	golang.org/x/tools v0.10.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gorm.io/driver/mysql v1.3.6
+	gorm.io/driver/sqlite v1.3.6
+	gorm.io/gorm v1.23.9
 )

go.work

@@ -0,0 +1,7 @@
+go 1.20
+
+use (
+	.
+	./v2
+	./v2/pkg
+)

go.work.sum

@@ -0,0 +1,2 @@
+github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
+golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=

v2/api/holiday.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"errors"
 	"net/http"
 	"strconv"
 	"time"
@@ -119,7 +120,10 @@ func (a *API) GetHoliday(c *gin.Context) {
 	}
 	id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
 	h, err := os.GetHoliday(uint(id))
-	if err != nil {
+
+	if errors.Is(err, pkg.ErrNotFound) {
+		c.JSON(http.StatusNotFound, err)
+	} else if err != nil {
 		log.Debug(err)
 		c.JSON(http.StatusInternalServerError, err)
 	} else {

v2/go.mod

@@ -1,56 +1,62 @@
 module github.com/your-overtime/api/v2
 
-go 1.18
+go 1.20
 
 require (
 	github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/joho/godotenv v1.4.0
 	github.com/sirupsen/logrus v1.9.0
-	github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a
-	github.com/swaggo/gin-swagger v1.5.3
-	github.com/swaggo/swag v1.8.5
-	golang.org/x/crypto v0.9.0
+	github.com/swaggo/files v1.0.1
+	github.com/swaggo/gin-swagger v1.6.0
+	github.com/swaggo/swag v1.16.1
+	github.com/your-overtime/api/v2/pkg v0.0.0-00010101000000-000000000000
+	golang.org/x/crypto v0.10.0
 	gorm.io/driver/mysql v1.3.6
 	gorm.io/driver/sqlite v1.3.6
 	gorm.io/gorm v1.23.9
 )
 
+replace github.com/your-overtime/api/v2/pkg => ./pkg
+
 require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.9.2 // 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/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/spec v0.20.7 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/spec v0.20.9 // indirect
+	github.com/go-openapi/swag v0.22.4 // 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/go-playground/validator/v10 v10.14.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-sqlite3 v1.14.15 // 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/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/teambition/rrule-go v1.8.0 // 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/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/net v0.11.0 // indirect
+	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/text v0.10.0 // indirect
+	golang.org/x/tools v0.10.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )