gilles/hammond
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed dateLayout, fixed variable order in call to ParseInLocation, code formatting

Browse Source
This commit is contained in:
Alex H
2023-04-17 21:10:31 -04:00
parent 785ff9a089
commit e9812e7e27
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/service/genericImportService.go
View File

@@ -1,6 +1,7 @@
package service package service
import ( import (
"fmt"
"hammond/db" "hammond/db"
"hammond/models" "hammond/models"
"time" "time"
@@ -9,11 +10,12 @@ import (
func GenericParseRefuelings(content []models.ImportFillup, user *db.User, vehicle *db.Vehicle, timezone string) ([]db.Fillup, []string) { func GenericParseRefuelings(content []models.ImportFillup, user *db.User, vehicle *db.Vehicle, timezone string) ([]db.Fillup, []string) {
var errors []string var errors []string
var fillups []db.Fillup var fillups []db.Fillup
dateLayout := "2023-04-16T04:41:25.682Z" dateLayout := "2006-01-02T15:04:05.000Z"
loc, _ := time.LoadLocation(timezone) loc, _ := time.LoadLocation(timezone)
for _, record := range content { for _, record := range content {
date, err := time.ParseInLocation(record.Date, dateLayout, loc) date, err := time.ParseInLocation(dateLayout, record.Date, loc)
if err != nil { if err != nil {
fmt.Println(err)
date = time.Date(2000, time.December, 0, 0, 0, 0, 0, loc) date = time.Date(2000, time.December, 0, 0, 0, 0, 0, loc)
} }
@@ -24,23 +26,23 @@ func GenericParseRefuelings(content []models.ImportFillup, user *db.User, vehicl
missedFillup = *record.HasMissedFillup missedFillup = *record.HasMissedFillup
} }
fillups = append(fillups, db.Fillup{ fillups = append(fillups, db.Fillup{
VehicleID: vehicle.ID, VehicleID: vehicle.ID,
UserID: user.ID, UserID: user.ID,
Date: date, Date: date,
IsTankFull: record.IsTankFull, IsTankFull: record.IsTankFull,
HasMissedFillup: &missedFillup, HasMissedFillup: &missedFillup,
FuelQuantity: float32(record.FuelQuantity), FuelQuantity: float32(record.FuelQuantity),
PerUnitPrice: float32(record.PerUnitPrice), PerUnitPrice: float32(record.PerUnitPrice),
FillingStation: record.FillingStation, FillingStation: record.FillingStation,
OdoReading: record.OdoReading, OdoReading: record.OdoReading,
TotalAmount: float32(record.TotalAmount), TotalAmount: float32(record.TotalAmount),
FuelUnit: vehicle.FuelUnit, FuelUnit: vehicle.FuelUnit,
Currency: user.Currency, Currency: user.Currency,
DistanceUnit: user.DistanceUnit, DistanceUnit: user.DistanceUnit,
Comments: record.Comments, Comments: record.Comments,
Source: "Generic Import", Source: "Generic Import",
}) })
} }
return fillups, errors return fillups, errors