From 93f09f0ed7adb6ff691fa80d4d0fa10d037ad410 Mon Sep 17 00:00:00 2001
From: Tobias Lindberg <tobias.ehlert@gmail.com>
Date: Thu, 11 Feb 2021 11:11:12 +0100
Subject: [PATCH] enhancing readability of IDs in json-response

---
 src/TeslaMateAPICars.go           |  4 ++--
 src/TeslaMateAPICarsID.go         |  6 +++---
 src/TeslaMateAPICarsStatus.go     | 10 +++++-----
 src/TeslaMateAPICarsUpdates.go    | 12 ++++++------
 src/TeslaMateAPIGlobalSettings.go |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/TeslaMateAPICars.go b/src/TeslaMateAPICars.go
index d2527bb..a583662 100644
--- a/src/TeslaMateAPICars.go
+++ b/src/TeslaMateAPICars.go
@@ -48,7 +48,7 @@ func TeslaMateAPICars() (string, bool) {
 	}
 	// Cars struct - child of Data
 	type Cars struct {
-		ID               int              `json:"id"`                // smallint
+		CarID            int              `json:"car_id"`            // smallint
 		Name             string           `json:"name"`              // text
 		CarDetails       CarDetails       `json:"car_details"`       // struct
 		CarExterior      CarExterior      `json:"car_exterior"`      // struct
@@ -114,7 +114,7 @@ func TeslaMateAPICars() (string, bool) {
 
 		// scanning row and putting values into the car
 		err = rows.Scan(
-			&car.ID,
+			&car.CarID,
 			&car.CarDetails.EID,
 			&car.CarDetails.VID,
 			&car.CarDetails.Model,
diff --git a/src/TeslaMateAPICarsID.go b/src/TeslaMateAPICarsID.go
index cfc4a27..a242475 100644
--- a/src/TeslaMateAPICarsID.go
+++ b/src/TeslaMateAPICarsID.go
@@ -11,7 +11,7 @@ func TeslaMateAPICarsID(CarID int) bool {
 
 	// creating structs for storing data
 	type Car struct {
-		ID int `json:"id"` // smallint
+		CarID int `json:"car_id"` // smallint
 	}
 
 	// creating required vars
@@ -42,7 +42,7 @@ func TeslaMateAPICarsID(CarID int) bool {
 
 		// scanning row and putting values into the car
 		err = rows.Scan(
-			&car.ID,
+			&car.CarID,
 		)
 
 		// checking for errors after scanning
@@ -50,7 +50,7 @@ func TeslaMateAPICarsID(CarID int) bool {
 			log.Fatal(err)
 		}
 
-		if CarID != 0 && CarID == car.ID {
+		if CarID != 0 && CarID == car.CarID {
 			// return true that CarID exists.. to do correct redirect to status page of particular car
 			ValidCarID = true
 		}
diff --git a/src/TeslaMateAPICarsStatus.go b/src/TeslaMateAPICarsStatus.go
index ccfb364..3ed4574 100644
--- a/src/TeslaMateAPICarsStatus.go
+++ b/src/TeslaMateAPICarsStatus.go
@@ -316,8 +316,8 @@ func TeslaMateAPICarsStatus(CarID int) (string, bool) {
 	}
 	// Cars struct - child of Data
 	type Car struct {
-		ID   int    `json:"id"`   // smallint
-		Name string `json:"name"` // text
+		CarID   int    `json:"car_id"`   // smallint
+		CarName string `json:"car_name"` // text
 	}
 	// TeslaMateUnits struct - child of Data
 	type TeslaMateUnits struct {
@@ -366,8 +366,8 @@ func TeslaMateAPICarsStatus(CarID int) (string, bool) {
 
 		// scanning row and putting values into the car
 		err = rows.Scan(
-			&CarData.ID,
-			&CarData.Name,
+			&CarData.CarID,
+			&CarData.CarName,
 			&UnitsLength,
 			&UnitsTemperature,
 		)
@@ -377,7 +377,7 @@ func TeslaMateAPICarsStatus(CarID int) (string, bool) {
 			log.Fatal(err)
 		}
 
-		if CarID != 0 && CarID == CarData.ID || CarID == 0 {
+		if CarID != 0 && CarID == CarData.CarID || CarID == 0 {
 
 			// creating lots of subscribe to get values from every topic..
 			c.Subscribe(fmt.Sprintf("teslamate%s/cars/%d/display_name", MQTTNameSpace, CarID), 0, nil)
diff --git a/src/TeslaMateAPICarsUpdates.go b/src/TeslaMateAPICarsUpdates.go
index 4df2c1c..51e3744 100644
--- a/src/TeslaMateAPICarsUpdates.go
+++ b/src/TeslaMateAPICarsUpdates.go
@@ -14,12 +14,12 @@ func TeslaMateAPICarsUpdates(CarID int, ResultPage int, ResultShow int) (string,
 	// creating structs for /cars/<CarID>/updates
 	// Car struct - child of Data
 	type Car struct {
-		CarID int    `json:"id"`   // smallint
-		Name  string `json:"name"` // text
+		CarID   int    `json:"car_id"`   // smallint
+		CarName string `json:"car_name"` // text
 	}
 	// Updates struct - child of Data
 	type Updates struct {
-		ID        int    `json:"updates_id"` // smallint
+		UpdateID  int    `json:"update_id"`  // smallint
 		StartDate string `json:"start_date"` // string
 		EndDate   string `json:"end_date"`   // string
 		Version   string `json:"version"`    // string
@@ -51,7 +51,7 @@ func TeslaMateAPICarsUpdates(CarID int, ResultPage int, ResultShow int) (string,
 	query := `
 		SELECT
 			updates.id,
-			name,
+			car.name,
 			start_date,
 			end_date,
 			version
@@ -78,8 +78,8 @@ func TeslaMateAPICarsUpdates(CarID int, ResultPage int, ResultShow int) (string,
 
 		// scanning row and putting values into the update
 		err = rows.Scan(
-			&update.ID,
-			&CarData.Name,
+			&update.UpdateID,
+			&CarData.CarName,
 			&update.StartDate,
 			&update.EndDate,
 			&update.Version,
diff --git a/src/TeslaMateAPIGlobalSettings.go b/src/TeslaMateAPIGlobalSettings.go
index 144cfc5..79908d0 100644
--- a/src/TeslaMateAPIGlobalSettings.go
+++ b/src/TeslaMateAPIGlobalSettings.go
@@ -34,7 +34,7 @@ func TeslaMateAPIGlobalSettings() (string, bool) {
 	}
 	// GlobalSettings struct - child of Data
 	type GlobalSettings struct {
-		ID             int            `json:"id"`               // smallint
+		SettingID      int            `json:"setting_id"`       // smallint
 		AccountInfo    AccountInfo    `json:"account_info"`     // struct
 		TeslaMateUnits TeslaMateUnits `json:"teslamate_units"`  // struct
 		TeslaMateGUI   TeslaMateGUI   `json:"teslamate_webgui"` // struct
@@ -85,7 +85,7 @@ func TeslaMateAPIGlobalSettings() (string, bool) {
 
 		// scanning row and putting values into the GlobalSetting
 		err = rows.Scan(
-			&GlobalSetting.ID,
+			&GlobalSetting.SettingID,
 			&GlobalSetting.AccountInfo.InsertedAt,
 			&GlobalSetting.AccountInfo.UpdatedAt,
 			&GlobalSetting.TeslaMateUnits.UnitsLength,