enhancing readability of IDs in json-response

This commit is contained in:
Tobias Lindberg
2021-02-11 11:11:12 +01:00
parent 28c9175dbe
commit 93f09f0ed7
5 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -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,
+3 -3
View File
@@ -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
}
+5 -5
View File
@@ -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)
+6 -6
View File
@@ -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,
+2 -2
View File
@@ -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,