From e4ff87854a41a96acb6973c4199ec894f8d25be3 Mon Sep 17 00:00:00 2001 From: Tobias Lindberg Date: Fri, 22 Sep 2023 16:53:22 +0200 Subject: [PATCH] fix CarName to be NullString instead of string Co-Authored-By: Vincent Barrier --- src/v1_TeslaMateAPICarsCharges.go | 9 +++++---- src/v1_TeslaMateAPICarsChargesDetails.go | 11 ++++++----- src/v1_TeslaMateAPICarsDrives.go | 9 +++++---- src/v1_TeslaMateAPICarsDrivesDetails.go | 11 ++++++----- src/v1_TeslaMateAPICarsStatus.go | 4 ++-- src/v1_TeslaMateAPICarsUpdates.go | 4 ++-- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/v1_TeslaMateAPICarsCharges.go b/src/v1_TeslaMateAPICarsCharges.go index 247e7e9..e8def67 100644 --- a/src/v1_TeslaMateAPICarsCharges.go +++ b/src/v1_TeslaMateAPICarsCharges.go @@ -20,8 +20,8 @@ func TeslaMateAPICarsChargesV1(c *gin.Context) { // creating structs for /cars//charges // Car struct - child of Data type Car struct { - CarID int `json:"car_id"` // smallint - CarName string `json:"car_name"` // text + CarID int `json:"car_id"` // smallint + CarName NullString `json:"car_name"` // text (nullable) } // BatteryDetails struct - child of Charges type BatteryDetails struct { @@ -67,8 +67,9 @@ func TeslaMateAPICarsChargesV1(c *gin.Context) { // creating required vars var ( - ChargesData []Charges - UnitsLength, UnitsTemperature, CarName string + CarName NullString + ChargesData []Charges + UnitsLength, UnitsTemperature string ) // calculate offset based on page (page 0 is not possible, since first page is minimum 1) diff --git a/src/v1_TeslaMateAPICarsChargesDetails.go b/src/v1_TeslaMateAPICarsChargesDetails.go index 504d5a4..c325642 100644 --- a/src/v1_TeslaMateAPICarsChargesDetails.go +++ b/src/v1_TeslaMateAPICarsChargesDetails.go @@ -23,8 +23,8 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) { // creating structs for /cars//charges/ // Car struct - child of Data type Car struct { - CarID int `json:"car_id"` // smallint - CarName string `json:"car_name"` // text + CarID int `json:"car_id"` // smallint + CarName NullString `json:"car_name"` // text (nullable) } // BatteryDetails struct - child of Charges type BatteryDetails struct { @@ -108,9 +108,10 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) { // creating required vars var ( - charge Charge - ChargeDetailsData []ChargeDetails - UnitsLength, UnitsTemperature, CarName string + CarName NullString + charge Charge + ChargeDetailsData []ChargeDetails + UnitsLength, UnitsTemperature string ) // getting data from database diff --git a/src/v1_TeslaMateAPICarsDrives.go b/src/v1_TeslaMateAPICarsDrives.go index f1c0099..70958d0 100644 --- a/src/v1_TeslaMateAPICarsDrives.go +++ b/src/v1_TeslaMateAPICarsDrives.go @@ -20,8 +20,8 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) { // creating structs for /cars//drives // Car struct - child of Data type Car struct { - CarID int `json:"car_id"` // smallint - CarName string `json:"car_name"` // text + CarID int `json:"car_id"` // smallint + CarName NullString `json:"car_name"` // text (nullable) } // OdometerDetails struct - child of Drives type OdometerDetails struct { @@ -82,8 +82,9 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) { // creating required vars var ( - DrivesData []Drives - UnitsLength, UnitsTemperature, CarName string + CarName NullString + DrivesData []Drives + UnitsLength, UnitsTemperature string ) // calculate offset based on page (page 0 is not possible, since first page is minimum 1) diff --git a/src/v1_TeslaMateAPICarsDrivesDetails.go b/src/v1_TeslaMateAPICarsDrivesDetails.go index 6c39a64..bb5e5c1 100644 --- a/src/v1_TeslaMateAPICarsDrivesDetails.go +++ b/src/v1_TeslaMateAPICarsDrivesDetails.go @@ -23,8 +23,8 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) { // creating structs for /cars//drives/ // Car struct - child of Data type Car struct { - CarID int `json:"car_id"` // smallint - CarName string `json:"car_name"` // text + CarID int `json:"car_id"` // smallint + CarName NullString `json:"car_name"` // text (nullable) } // OdometerDetails struct - child of Drives type OdometerDetails struct { @@ -121,9 +121,10 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) { // creating required vars var ( - drive Drive - DriveDetailsData []DriveDetails - UnitsLength, UnitsTemperature, CarName string + CarName NullString + drive Drive + DriveDetailsData []DriveDetails + UnitsLength, UnitsTemperature string ) // getting data from database diff --git a/src/v1_TeslaMateAPICarsStatus.go b/src/v1_TeslaMateAPICarsStatus.go index 03cd62b..e5afcf8 100644 --- a/src/v1_TeslaMateAPICarsStatus.go +++ b/src/v1_TeslaMateAPICarsStatus.go @@ -462,8 +462,8 @@ func (s *statusCache) TeslaMateAPICarsStatusV1(c *gin.Context) { } // Cars struct - child of Data type Car struct { - CarID int `json:"car_id"` // smallint - CarName string `json:"car_name"` // text + CarID int `json:"car_id"` // smallint + CarName NullString `json:"car_name"` // text (nullable) } // TeslaMateUnits struct - child of Data type TeslaMateUnits struct { diff --git a/src/v1_TeslaMateAPICarsUpdates.go b/src/v1_TeslaMateAPICarsUpdates.go index 39b4b1f..ba8de28 100644 --- a/src/v1_TeslaMateAPICarsUpdates.go +++ b/src/v1_TeslaMateAPICarsUpdates.go @@ -20,8 +20,8 @@ func TeslaMateAPICarsUpdatesV1(c *gin.Context) { // creating structs for /cars//updates // Car struct - child of Data type Car struct { - CarID int `json:"car_id"` // smallint - CarName string `json:"car_name"` // text + CarID int `json:"car_id"` // smallint + CarName NullString `json:"car_name"` // text (nullable) } // Updates struct - child of Data type Updates struct {