From 9c2ff979fb72bacd231691cc38041fc28a42f192 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 9 Jan 2024 22:01:12 +1100
Subject: [PATCH] one more test

---
 models/secret.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/models/secret.go b/models/secret.go
index 85c2c9f..b930478 100644
--- a/models/secret.go
+++ b/models/secret.go
@@ -31,7 +31,7 @@ type Secret struct {
 // Since there are some ambiguous column names (eg UserName is present in both users and secrets table), the order of fields in this struct matters
 type UserSecret struct {
 	Secret
-	UserId int `db:"UserUserId"`
+	UserUserId int `db:"UserUserId"`
 	User
 	//Group
 	Permission
@@ -133,6 +133,9 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 				return secretResults, err
 			}
 			//log.Printf("r: %v\n", r)
+
+			// work around to get the UserId populated in the User field of the struct
+			r.User.UserId = r.UserUserId
 			debugPrint := utils.PrintStructContents(&r, 0)
 			log.Println(debugPrint)