diff --git a/src/goapp/infrastructure/database/database.go b/src/goapp/infrastructure/database/database.go index 070dd2f..ed3f706 100644 --- a/src/goapp/infrastructure/database/database.go +++ b/src/goapp/infrastructure/database/database.go @@ -31,14 +31,14 @@ func (d *Database) Connect() (*sql.DB, error) { } func (d *Database) Query(query string, args ...any) (*sql.Rows, error) { - con, err := d.Connect() + conn, err := d.Connect() if err != nil { return nil, err } - defer con.Close() + defer conn.Close() ctx := context.Background() - rows, err := con.QueryContext(ctx, query, args...) + rows, err := conn.QueryContext(ctx, query, args...) if err != nil { return nil, err } @@ -46,14 +46,14 @@ func (d *Database) Query(query string, args ...any) (*sql.Rows, error) { } func (d *Database) QueryRow(query string, args ...any) (*sql.Row, error) { - con, err := d.Connect() + conn, err := d.Connect() if err != nil { return nil, err } - defer con.Close() + defer conn.Close() ctx := context.Background() - row := con.QueryRowContext(ctx, query, args...) + row := conn.QueryRowContext(ctx, query, args...) if row == nil { err = fmt.Errorf("QueryRowContext returned nil") } @@ -61,14 +61,14 @@ func (d *Database) QueryRow(query string, args ...any) (*sql.Row, error) { } func (d *Database) Execute(query string, args ...any) error { - con, err := d.Connect() + conn, err := d.Connect() if err != nil { return err } - defer con.Close() + defer conn.Close() ctx := context.Background() - _, err = con.ExecContext(ctx, query, args...) + _, err = conn.ExecContext(ctx, query, args...) if err != nil { return err } diff --git a/src/goapp/middleware/middleware.go b/src/goapp/middleware/middleware.go index c6f8724..b253d83 100644 --- a/src/goapp/middleware/middleware.go +++ b/src/goapp/middleware/middleware.go @@ -29,8 +29,8 @@ func ManagedIdentityAuth() Middleware { // Chain applies middlewares to a http.HandlerFunc func Chain(f http.HandlerFunc, middlewares ...Middleware) http.HandlerFunc { - for _, m := range middlewares { - f = m(f) + for i := len(middlewares) - 1; i >= 0; i-- { + f = middlewares[i](f) } return f }