From 43ffa2803fa2f8feef6212f49f91fd8b10a0bbf0 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Tue, 20 Aug 2024 18:50:38 +0100
Subject: [PATCH] Rename struct field to match database column

---
 sevenkeys/cli/mainui.go           |  2 +-
 sevenkeys/cli/storage.go          |  2 +-
 sevenkeys/database/storagearea.go | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sevenkeys/cli/mainui.go b/sevenkeys/cli/mainui.go
index a1fe49d..e030570 100644
--- a/sevenkeys/cli/mainui.go
+++ b/sevenkeys/cli/mainui.go
@@ -39,7 +39,7 @@ func MainCliLoop(db *sql.DB) {
 		case "n", "newstorage":
 			var storageArea database.StorageArea
 			storageArea.Name = GetStringResponse("Storage area name:")
-			storageArea.Type = GetStringResponse("Storage area type (Binder/Box):")
+			storageArea.StorageType = GetStringResponse("Storage area type (Binder/Box):")
 			err = logic.CreateStorageArea(db, storageArea)
 			logic.Check(err)
 			break
diff --git a/sevenkeys/cli/storage.go b/sevenkeys/cli/storage.go
index 4b17ea7..0a12a5d 100644
--- a/sevenkeys/cli/storage.go
+++ b/sevenkeys/cli/storage.go
@@ -30,7 +30,7 @@ func showStorageInfo(w io.Writer, area database.StorageArea) {
 		return
 	}
 
-	fmt.Fprintf(w, "%s (%s)\n", area.Name, area.Type)
+	fmt.Fprintf(w, "%s (%s)\n", area.Name, area.StorageType)
 	return
 }
 
diff --git a/sevenkeys/database/storagearea.go b/sevenkeys/database/storagearea.go
index aa670ad..0148a75 100644
--- a/sevenkeys/database/storagearea.go
+++ b/sevenkeys/database/storagearea.go
@@ -3,9 +3,9 @@ package database
 import "database/sql"
 
 type StorageArea struct {
-	Id   int
-	Name string
-	Type string
+	Id          int
+	Name        string
+	StorageType string
 }
 
 func GetAllStorageAreas(db *sql.DB) ([]StorageArea, error) {
@@ -20,7 +20,7 @@ func GetAllStorageAreas(db *sql.DB) ([]StorageArea, error) {
 
 	var area StorageArea
 	for rows.Next() {
-		err := rows.Scan(&area.Id, &area.Name, &area.Type)
+		err := rows.Scan(&area.Id, &area.Name, &area.StorageType)
 		if err != nil {
 			return storageAreas, err
 		}
@@ -39,7 +39,7 @@ func InsertStorageArea(db *sql.DB, storageArea StorageArea) error {
 		return err
 	}
 
-	_, err = insert.Exec(storageArea.Name, storageArea.Type)
+	_, err = insert.Exec(storageArea.Name, storageArea.StorageType)
 	if err != nil {
 		return err
 	}