Replace local HTTP helpers with shared package

Use github.com/iqhater/pkg for middleware and headers. Drop unused local
cache, limiter, logger, and middleware packages, and update the module
to
Go 1.26.

Author: iqhater

cmd/api-docs/main.go

@@ -6,8 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gooddog-rent/hotels_api/pkg/logger"
-	mid "github.com/gooddog-rent/hotels_api/pkg/middleware"
+	mid "github.com/iqhater/pkg/middleware"
 )
 
 // OpenAPI docs
@@ -19,7 +18,7 @@ func main() {
 	mux.Handle("/api/", http.StripPrefix("/api/", http.FileServer(http.Dir("./api"))))
 
 	// redirect to from / to /api/app/redoc.html
-	mux.HandleFunc("/", mid.Bind(logger.Log, func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/", mid.Bind(mid.Log, func(w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, "/api/app/redoc.html", http.StatusMovedPermanently)
 	}))
 

go.mod

@@ -1,21 +1,21 @@
 module github.com/gooddog-rent/hotels_api
 
-go 1.24
+go 1.26
 
 require (
 	github.com/Masterminds/squirrel v1.5.4
+	github.com/iqhater/pkg v0.0.0-20260619181521-8b4449dab11c
 	github.com/joho/godotenv v1.5.1
 	github.com/mattn/go-sqlite3 v1.14.24
 	github.com/pressly/goose/v3 v3.24.1
-	github.com/sh7dm/brotlihandler v0.0.1
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/goleak v1.3.0
-	golang.org/x/time v0.7.0
 )
 
 require (
-	github.com/andybalholm/brotli v1.1.1 // indirect
+	github.com/andybalholm/brotli v1.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -25,5 +25,6 @@ require (
 	github.com/stretchr/objx v0.5.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/time v0.15.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,8 +1,7 @@
 github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
 github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
-github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
-github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
+github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
+github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 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=
@@ -12,6 +11,8 @@ 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/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+github.com/iqhater/pkg v0.0.0-20260619181521-8b4449dab11c h1:qI5ESjxlJ6M3DwMdE6m0JpxNPY0rr9mzh1X0GaeVHYg=
+github.com/iqhater/pkg v0.0.0-20260619181521-8b4449dab11c/go.mod h1:DOkyDJn+R4Eqo27TiDDAJeHiwOjvpJFwPLxk5STvvIw=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -38,8 +39,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE=
 github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
-github.com/sh7dm/brotlihandler v0.0.1 h1:Z03e/T3zvAE5xdYrcnGKqtcH8Qv+NWKcPZqmyGQyZBg=
-github.com/sh7dm/brotlihandler v0.0.1/go.mod h1:SlI4IqBvHLUChGcMTRS89G2SBGXifdXuL80EsZvPdnA=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -55,8 +54,8 @@ golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
-golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
+golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/controller/http/v1/hotel.go

@@ -44,11 +44,6 @@ func (h *hotelRoutes) GetHotels(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	// db read timeout
-	/* contextDBTimeout := 20 * time.Second
-	ctxTimeout, cancel := context.WithTimeoutCause(req.Context(), contextDBTimeout, errors.New("Read from DB timeout!"))
-	defer cancel() */
-
 	filtered, err := h.hotelService.SearchHotels(req.Context(), text, limit)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusNotFound)

internal/run.go

@@ -12,32 +12,21 @@ import (
 	"time"
 
 	"github.com/gooddog-rent/hotels_api/internal/service"
-	"github.com/gooddog-rent/hotels_api/pkg/cache"
-	"github.com/gooddog-rent/hotels_api/pkg/headers/content"
-	"github.com/gooddog-rent/hotels_api/pkg/headers/cors"
-	"github.com/gooddog-rent/hotels_api/pkg/headers/secure"
-	"github.com/gooddog-rent/hotels_api/pkg/limiter"
-	"github.com/gooddog-rent/hotels_api/pkg/logger"
 
 	"log"
 	"net/http"
 	"os/signal"
 	"syscall"
 
-	mid "github.com/gooddog-rent/hotels_api/pkg/middleware"
-
-	"github.com/sh7dm/brotlihandler"
+	"github.com/iqhater/pkg/headers"
+	mid "github.com/iqhater/pkg/middleware"
 )
 
 func Run() {
 
 	// init config environments
 	cfg := NewConfig()
 
-	// init cache storage
-	c := cache.NewCache("2m")
-	cache.CacheStore = c
-
 	// init repositories
 	repositories, err := infra.NewRepositories(cfg.HOTELS_PATH)
 	if err != nil {
@@ -61,19 +50,25 @@ func Run() {
 
 	// init middlewares per one route
 	midMain := mid.Middlewares(
-		c.CacheHeaders,
-		content.ContentTypeHeaders,
-		cors.CORSHeaders,
-		secure.SecureHeaders,
 		ctrl.ValidateRequest,
-		// c.CacheResponse,
+		mid.Compress,
+		mid.NewCache("2m").CacheResponse,
+		headers.CORSHeaders(headers.CORSConfig{
+			AllowOrigins: []string{"*"},
+			AllowMethods: []string{http.MethodGet, http.MethodOptions},
+			AllowHeaders: []string{"Accept, Content-Type, Content-Length, Accept-Encoding"},
+		}),
+		headers.SecureHeaders,
+		headers.ContentTypeHeaders("application/json"),
 	)
 
 	// init global middlewares
 	middlewaresGlobal := mid.Middlewares(
-		logger.Log,
-		limiter.Limit,
-		brotlihandler.CompressHandler,
+		mid.Recover,
+		mid.RequestID,
+		mid.Log,
+		mid.Limit(3, 7),
+		mid.ContextTimeout(15*time.Second),
 	)
 
 	mux.HandleFunc("GET /api/v1/hotels", mid.Bind(midMain, controller.GetHotels))