Merge branch 'development' of https://github.com/Avanade/approval-system

 into 114-refactor-myrequests-page

Signed-off-by: Ismael Ibuan <[email protected]>

src/goapp/infrastructure/database/database.go

@@ -31,44 +31,44 @@ 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
 	}
 	return rows, nil
 }
 
 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")
 	}
 	return row, nil
 }
 
 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
 	}

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
 }