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

Add option for not importing location

Browse Source
This commit is contained in:
Alf Sebastian Houge
2022-04-06 12:06:45 +02:00
parent 15cf09f326
commit dc33aaad49
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/controllers/import.go
View File

@@ -2,6 +2,7 @@ package controllers
import (
"net/http"
"strconv"
"github.com/akhilrex/hammond/service"
"github.com/gin-gonic/gin"
@@ -37,7 +38,13 @@ func drivvoImport(c *gin.Context) {
c.JSON(http.StatusUnprocessableEntity, "Missing Vehicle ID")
return
}
errors := service.DrivvoImport(bytes, c.MustGet("userId").(string), vehicleId)
importLocation, err := strconv.ParseBool(c.PostForm("importLocation"))
if err != nil {
c.JSON(http.StatusUnprocessableEntity, "Please include importLocation option.")
return
}
errors := service.DrivvoImport(bytes, c.MustGet("userId").(string), vehicleId, importLocation)
if len(errors) > 0 {
c.JSON(http.StatusUnprocessableEntity, gin.H{"errors": errors})
return

12
server/service/importService.go
View File

@@ -65,7 +65,7 @@ func DrivvoParseExpenses(content []byte, user *db.User, vehicle *db.Vehicle) ([]
return expenses, errors
}
func DrivvoParseRefuelings(content []byte, user *db.User, vehicle *db.Vehicle) ([]db.Fillup, []string) {
func DrivvoParseRefuelings(content []byte, user *db.User, vehicle *db.Vehicle, importLocation bool) ([]db.Fillup, []string) {
refuelingReader := csv.NewReader(bytes.NewReader(content))
refuelingReader.Comment = '#'
refuelingRecords, err := refuelingReader.ReadAll()
@@ -99,8 +99,10 @@ func DrivvoParseRefuelings(content []byte, user *db.User, vehicle *db.Vehicle) (
errors = append(errors, "Found an invalid odometer reading at refuel row "+strconv.Itoa(index+1))
}
// TODO: Make optional
location := record[17]
location := ""
if importLocation {
location = record[17]
}
pricePerUnit, err := strconv.ParseFloat(record[3], 32)
if err != nil {
@@ -142,7 +144,7 @@ func DrivvoParseRefuelings(content []byte, user *db.User, vehicle *db.Vehicle) (
return fillups, errors
}
func DrivvoImport(content []byte, userId string, vehicleId string) []string {
func DrivvoImport(content []byte, userId string, vehicleId string, importLocation bool) []string {
var errors []string
user, err := GetUserById(userId)
if err != nil {
@@ -172,7 +174,7 @@ func DrivvoImport(content []byte, userId string, vehicleId string) []string {
expenseSectionIndex = endParseIndex
}
fillups, errors := DrivvoParseRefuelings(content[:serviceSectionIndex], user, vehicle)
fillups, errors := DrivvoParseRefuelings(content[:serviceSectionIndex], user, vehicle, importLocation)
_ = fillups
var allExpenses []db.Expense