From fc736df4e311d990d9871cd31290f6e0f99f880e Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 9 Jan 2024 22:22:27 +1100
Subject: [PATCH] another test

---
 models/user.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/models/user.go b/models/user.go
index ee25157..ec7b011 100644
--- a/models/user.go
+++ b/models/user.go
@@ -41,7 +41,7 @@ type UserSafe struct {
 	User
 	SafeId   int    `db:"SafeId"`
 	SafeName string `db:"SafeName"`
-	GroupId  int    `db:"GroupId"`
+	//GroupId  int    `db:"GroupId"`
 }
 
 func (u *User) SaveUser() (*User, error) {
@@ -365,12 +365,12 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
 	INNER JOIN permissions ON groups.GroupId = permissions.GroupId
 	INNER JOIN safes on permissions.SafeId = safes.SafeId
 	WHERE users.UserId=?`, userId)
-	defer rows.Close()
 
 	if err != nil {
 		log.Printf("UserGetSafesAllowed error executing sql record : '%s'\n", err)
 		return results, err
 	} else {
+		defer rows.Close()
 
 		// Get columns from rows for debugging
 		columns, err := rows.Columns()
@@ -378,6 +378,7 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
 			log.Printf("UserGetSafesAllowed error getting column listing : '%s'\n", err)
 			return results, err
 		}
+		log.Printf("columns: %v\n", columns)
 
 		// parse all the results into a slice
 		for rows.Next() {
@@ -404,6 +405,7 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
 			}
 
 			// Print the raw row record
+			log.Println("-----------")
 			for _, column := range columns {
 				log.Printf("%s: %v\n", column, rowValues[column])
 			}