gci pkg deps

IgorPolyakov · IgorPolyakov · commit e04f48090529 · 2024-09-04T20:38:15.000+03:00
diff --git a/cmd/main.go b/cmd/main.go
@@ -5,15 +5,14 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/cors"
-	_ "github.com/lib/pq"
-	_ "go.uber.org/automaxprocs"
-
 	"ctf01d/internal/config"
 	"ctf01d/internal/handler"
 	migration "ctf01d/internal/migrations/psql"
 	"ctf01d/internal/server"
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/cors"
+	_ "github.com/lib/pq"
+	_ "go.uber.org/automaxprocs"
 )
 
 func main() {
diff --git a/internal/handler/games.go b/internal/handler/games.go
@@ -5,12 +5,11 @@ import (
 	"log/slog"
 	"net/http"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/model"
 	"ctf01d/internal/repository"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 func (h *Handler) CreateGame(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/handler/interface.go b/internal/handler/interface.go
@@ -3,9 +3,8 @@ package handler
 import (
 	"net/http"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 // ServerInterfaceWrapper wraps Handler to conform to the generated interface
diff --git a/internal/handler/results.go b/internal/handler/results.go
@@ -5,12 +5,11 @@ import (
 	"log/slog"
 	"net/http"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/model"
 	"ctf01d/internal/repository"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 func (h *Handler) CreateResult(w http.ResponseWriter, r *http.Request, gameId openapi_types.UUID) {
diff --git a/internal/handler/services.go b/internal/handler/services.go
@@ -5,12 +5,11 @@ import (
 	"log/slog"
 	"net/http"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/model"
 	"ctf01d/internal/repository"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 func (h *Handler) CreateService(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/handler/sessions.go b/internal/handler/sessions.go
@@ -5,12 +5,11 @@ import (
 	"log/slog"
 	"net/http"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/repository"
 	"ctf01d/internal/server"
 	"ctf01d/internal/view"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 func (h *Handler) SignInUser(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/handler/teams.go b/internal/handler/teams.go
@@ -5,12 +5,11 @@ import (
 	"log/slog"
 	"net/http"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/model"
 	"ctf01d/internal/repository"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 func (h *Handler) CreateTeam(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/handler/users.go b/internal/handler/users.go
@@ -5,12 +5,11 @@ import (
 	"log/slog"
 	"net/http"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/model"
 	"ctf01d/internal/repository"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 func (h *Handler) CreateUser(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/helper/helper.go b/internal/helper/helper.go
@@ -8,7 +8,6 @@ import (
 	"net/url"
 
 	"ctf01d/internal/server"
-
 	"golang.org/x/crypto/bcrypt"
 )
 
diff --git a/internal/model/game.go b/internal/model/game.go
@@ -3,9 +3,8 @@ package model
 import (
 	"time"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type Game struct {
diff --git a/internal/model/profile.go b/internal/model/profile.go
@@ -3,9 +3,8 @@ package model
 import (
 	"time"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type Profile struct {
diff --git a/internal/model/result.go b/internal/model/result.go
@@ -1,9 +1,8 @@
 package model
 
 import (
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type Result struct {
diff --git a/internal/model/service.go b/internal/model/service.go
@@ -3,10 +3,9 @@ package model
 import (
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type Service struct {
diff --git a/internal/model/team.go b/internal/model/team.go
@@ -3,10 +3,9 @@ package model
 import (
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type Team struct {
diff --git a/internal/model/university.go b/internal/model/university.go
@@ -1,9 +1,8 @@
 package model
 
 import (
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type University struct {
diff --git a/internal/model/user.go b/internal/model/user.go
@@ -3,10 +3,9 @@ package model
 import (
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/helper"
 	"ctf01d/internal/server"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type User struct {
diff --git a/internal/repository/game.go b/internal/repository/game.go
@@ -5,10 +5,9 @@ import (
 	"database/sql"
 	"time"
 
+	"ctf01d/internal/model"
 	"github.com/google/uuid"
 	openapi_types "github.com/oapi-codegen/runtime/types"
-
-	"ctf01d/internal/model"
 )
 
 type GameRepository interface {
diff --git a/internal/repository/result.go b/internal/repository/result.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/model"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type ResultRepository interface {
diff --git a/internal/repository/service.go b/internal/repository/service.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/model"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type ServiceRepository interface {
diff --git a/internal/repository/team.go b/internal/repository/team.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/model"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type TeamRepository interface {
diff --git a/internal/repository/team_member_requests.go b/internal/repository/team_member_requests.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/model"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type TeamMemberRequestRepository interface {
diff --git a/internal/repository/user.go b/internal/repository/user.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"database/sql"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	"ctf01d/internal/model"
+	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
 type UserRepository interface {
diff --git a/test/server_integration_test.go b/test/server_integration_test.go
@@ -10,14 +10,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-chi/chi/v5"
-	"github.com/jaswdr/faker"
-	_ "github.com/lib/pq"
-
 	"ctf01d/internal/config"
 	"ctf01d/internal/handler"
 	migration "ctf01d/internal/migrations/psql"
 	"ctf01d/internal/server"
+	"github.com/go-chi/chi/v5"
+	"github.com/jaswdr/faker"
+	_ "github.com/lib/pq"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,8 @@ package handler`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`		`- openapi_types "github.com/oapi-codegen/runtime/types"`
`7`		`-`
`8`	`6`	`"ctf01d/internal/server"`
	`7`	`+ openapi_types "github.com/oapi-codegen/runtime/types"`
`9`	`8`	`)`
`10`	`9`
`11`	`10`	`// ServerInterfaceWrapper wraps Handler to conform to the generated interface`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"net/url"`
`9`	`9`
`10`	`10`	`"ctf01d/internal/server"`
`11`		`-`
`12`	`11`	`"golang.org/x/crypto/bcrypt"`
`13`	`12`	`)`
`14`	`13`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,8 @@ package model`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`	`5`
`6`		`- openapi_types "github.com/oapi-codegen/runtime/types"`
`7`		`-`
`8`	`6`	`"ctf01d/internal/server"`
	`7`	`+ openapi_types "github.com/oapi-codegen/runtime/types"`
`9`	`8`	`)`
`10`	`9`
`11`	`10`	`type Game struct {`