fix CarName to be NullString instead of string

Co-Authored-By: Vincent Barrier <[email protected]>
tobiasehlert · Sep 22, 2023 · e4ff878 · e4ff878
1 parent ca0c58b
commit e4ff878
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/src/v1_TeslaMateAPICarsCharges.go b/src/v1_TeslaMateAPICarsCharges.go
@@ -20,8 +20,8 @@ func TeslaMateAPICarsChargesV1(c *gin.Context) {
 	// creating structs for /cars/<CarID>/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
@@ -23,8 +23,8 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) {
 	// creating structs for /cars/<CarID>/charges/<ChargeID>
 	// 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
@@ -20,8 +20,8 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
 	// creating structs for /cars/<CarID>/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
@@ -23,8 +23,8 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
 	// creating structs for /cars/<CarID>/drives/<DriveID>
 	// 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
@@ -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
@@ -20,8 +20,8 @@ func TeslaMateAPICarsUpdatesV1(c *gin.Context) {
 	// creating structs for /cars/<CarID>/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 {