From ef40a91e8d98f4cb6ca5188d50eee30daec43751 Mon Sep 17 00:00:00 2001 From: Tobias Lindberg Date: Wed, 19 May 2021 19:10:05 +0200 Subject: [PATCH] adding sql when end_date is not null to charges --- src/v1_TeslaMateAPICarsCharges.go | 7 +------ src/v1_TeslaMateAPICarsChargesDetails.go | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/v1_TeslaMateAPICarsCharges.go b/src/v1_TeslaMateAPICarsCharges.go index 996bac0..67c4b68 100644 --- a/src/v1_TeslaMateAPICarsCharges.go +++ b/src/v1_TeslaMateAPICarsCharges.go @@ -106,7 +106,7 @@ func TeslaMateAPICarsChargesV1(c *gin.Context) { LEFT JOIN addresses address ON address_id = address.id LEFT JOIN positions position ON position_id = position.id LEFT JOIN geofences geofence ON geofence_id = geofence.id - WHERE charging_processes.car_id=$1 + WHERE charging_processes.car_id=$1 AND charging_processes.end_date IS NOT NULL ORDER BY start_date DESC LIMIT $2 OFFSET $3;` rows, err := db.Query(query, CarID, ResultShow, ResultPage) @@ -121,11 +121,6 @@ func TeslaMateAPICarsChargesV1(c *gin.Context) { // looping through all results for rows.Next() { - - // skip any malformed rows - if end_date == NULL { - continue - } // creating charge object based on struct charge := Charges{} diff --git a/src/v1_TeslaMateAPICarsChargesDetails.go b/src/v1_TeslaMateAPICarsChargesDetails.go index 5b9100b..1c05ecf 100644 --- a/src/v1_TeslaMateAPICarsChargesDetails.go +++ b/src/v1_TeslaMateAPICarsChargesDetails.go @@ -136,7 +136,7 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) { LEFT JOIN positions position ON position_id = position.id LEFT JOIN geofences geofence ON geofence_id = geofence.id LEFT JOIN charges ON charging_processes.id = charges.id - WHERE charging_processes.car_id=$1 AND charging_processes.id=$2 + WHERE charging_processes.car_id=$1 AND charging_processes.id=$2 AND charging_processes.end_date IS NOT NULL ORDER BY start_date DESC;` rows, err := db.Query(query, CarID, ChargeID) @@ -150,11 +150,6 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) { // looping through all results for rows.Next() { - - // skip a malformed charge - if end_date == NULL { - break - } // creating charge object based on struct charge := Charge{}