From 923714b0779c88247c7743318cb7a9ad27f566ec Mon Sep 17 00:00:00 2001 From: Dmitrii Rubtsov Date: Tue, 3 Sep 2024 19:35:07 +0300 Subject: [PATCH] Format imports --- cmd/articles-server/main.go | 11 ++++++----- internal/api/middleware/logger.go | 5 +++-- internal/api/router.go | 2 +- internal/api/v1/articles.go | 5 +++-- internal/config/config.go | 3 ++- internal/repository/articles.go | 1 + internal/storage/storage.go | 1 + 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cmd/articles-server/main.go b/cmd/articles-server/main.go index 0aa61f5..c7b2b23 100644 --- a/cmd/articles-server/main.go +++ b/cmd/articles-server/main.go @@ -4,6 +4,12 @@ import ( "context" "errors" "fmt" + "net/http" + "os" + "os/signal" + "syscall" + "time" + "github.com/go-playground/validator/v10" "github.com/massivemadness/articles-server/internal/api" "github.com/massivemadness/articles-server/internal/api/server" @@ -13,11 +19,6 @@ import ( "github.com/massivemadness/articles-server/internal/repository" "github.com/massivemadness/articles-server/internal/storage" "go.uber.org/zap" - "net/http" - "os" - "os/signal" - "syscall" - "time" ) func main() { diff --git a/internal/api/middleware/logger.go b/internal/api/middleware/logger.go index 1f1c07e..963f676 100644 --- a/internal/api/middleware/logger.go +++ b/internal/api/middleware/logger.go @@ -1,10 +1,11 @@ package middleware import ( - "github.com/go-chi/chi/v5/middleware" - "go.uber.org/zap" "net/http" "time" + + "github.com/go-chi/chi/v5/middleware" + "go.uber.org/zap" ) func Logger(logger *zap.Logger) func(next http.Handler) http.Handler { diff --git a/internal/api/router.go b/internal/api/router.go index a79d9ff..b55c0a5 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,7 +5,7 @@ import ( "github.com/go-chi/chi/v5/middleware" mw "github.com/massivemadness/articles-server/internal/api/middleware" "github.com/massivemadness/articles-server/internal/api/server" - "github.com/massivemadness/articles-server/internal/api/v1" + v1 "github.com/massivemadness/articles-server/internal/api/v1" ) func NewRouter(wrapper *server.Wrapper) chi.Router { diff --git a/internal/api/v1/articles.go b/internal/api/v1/articles.go index a4c5963..e27e872 100644 --- a/internal/api/v1/articles.go +++ b/internal/api/v1/articles.go @@ -2,11 +2,12 @@ package v1 import ( "encoding/json" + "net/http" + "strconv" + "github.com/go-chi/chi/v5" "github.com/massivemadness/articles-server/internal/api/server" "github.com/massivemadness/articles-server/internal/entity" - "net/http" - "strconv" ) func GetArticlesHandler(wrapper *server.Wrapper) http.HandlerFunc { diff --git a/internal/config/config.go b/internal/config/config.go index e221321..5d1832c 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,10 +1,11 @@ package config import ( - "github.com/ilyakaznacheev/cleanenv" "log" "os" "time" + + "github.com/ilyakaznacheev/cleanenv" ) var ( diff --git a/internal/repository/articles.go b/internal/repository/articles.go index a20dafd..7f3c848 100644 --- a/internal/repository/articles.go +++ b/internal/repository/articles.go @@ -2,6 +2,7 @@ package repository import ( "context" + "github.com/massivemadness/articles-server/internal/entity" "github.com/massivemadness/articles-server/internal/storage" ) diff --git a/internal/storage/storage.go b/internal/storage/storage.go index 7536d0e..a60ecc6 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -3,6 +3,7 @@ package storage import ( "context" "fmt" + "github.com/jackc/pgx/v5/pgxpool" "github.com/massivemadness/articles-server/internal/config" )