yan/archived-teslamateapi
1
0
Fork 0
mirror of https://github.com/tobiasehlert/teslamateapi.git synced 2026-02-27 09:54:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: reordering sql query slightly (#364)

Browse Source
This commit is contained in:
Tobias Lindberg
2025-09-22 10:19:23 +02:00
committed by GitHub
parent 0d55424758
commit 3ec135d108
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/v1_TeslaMateAPICarsDrives.go
View File

@@ -143,9 +143,6 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
COALESCE( NULLIF ( GREATEST ( start_rated_range_km - end_rated_range_km, 0 ), 0 ),0 ) as range_diff_rated_km,
outside_temp_avg,
inside_temp_avg,
(SELECT unit_of_length FROM settings LIMIT 1) as unit_of_length,
(SELECT unit_of_temperature FROM settings LIMIT 1) as unit_of_temperature,
cars.name,
CASE
WHEN (start_rated_range_km - end_rated_range_km) > 0
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency
@@ -155,7 +152,10 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
WHEN (duration_min > 1 AND distance > 1 AND ( start_position.usable_battery_level IS NULL OR end_position.usable_battery_level IS NULL OR ( end_position.battery_level - end_position.usable_battery_level ) = 0 )) AND NULLIF(distance, 0) IS NOT NULL
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency / NULLIF(distance, 0) * 1000
ELSE NULL
END as consumption_net
END as consumption_net,
(SELECT unit_of_length FROM settings LIMIT 1) as unit_of_length,
(SELECT unit_of_temperature FROM settings LIMIT 1) as unit_of_temperature,
cars.name
FROM drives
LEFT JOIN cars ON car_id = cars.id
LEFT JOIN addresses start_address ON start_address_id = start_address.id
@@ -236,11 +236,11 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
&drive.RangeRated.RangeDiff,
&drive.OutsideTempAvg,
&drive.InsideTempAvg,
&drive.EnergyConsumedNet,
&drive.ConsumptionNet,
&UnitsLength,
&UnitsTemperature,
&CarName,
&drive.EnergyConsumedNet,
&drive.ConsumptionNet,
)
// converting values based of settings UnitsLength

12
src/v1_TeslaMateAPICarsDrivesDetails.go
View File

@@ -160,9 +160,6 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
COALESCE( NULLIF ( GREATEST ( start_rated_range_km - end_rated_range_km, 0 ), 0 ),0 ) as range_diff_rated_km,
outside_temp_avg,
inside_temp_avg,
(SELECT unit_of_length FROM settings LIMIT 1) as unit_of_length,
(SELECT unit_of_temperature FROM settings LIMIT 1) as unit_of_temperature,
cars.name,
CASE
WHEN (start_rated_range_km - end_rated_range_km) > 0
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency
@@ -172,7 +169,10 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
WHEN (duration_min > 1 AND distance > 1 AND ( start_position.usable_battery_level IS NULL OR end_position.usable_battery_level IS NULL OR ( end_position.battery_level - end_position.usable_battery_level ) = 0 )) AND NULLIF(distance, 0) IS NOT NULL
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency / NULLIF(distance, 0) * 1000
ELSE NULL
END as consumption_net
END as consumption_net,
(SELECT unit_of_length FROM settings LIMIT 1) as unit_of_length,
(SELECT unit_of_temperature FROM settings LIMIT 1) as unit_of_temperature,
cars.name
FROM drives
LEFT JOIN cars ON car_id = cars.id
LEFT JOIN addresses start_address ON start_address_id = start_address.id
@@ -214,11 +214,11 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
&drive.RangeRated.RangeDiff,
&drive.OutsideTempAvg,
&drive.InsideTempAvg,
&drive.EnergyConsumedNet,
&drive.ConsumptionNet,
&UnitsLength,
&UnitsTemperature,
&CarName,
&drive.EnergyConsumedNet,
&drive.ConsumptionNet,
)
switch err {