Select vehicle when importing drivvo csv.

Select what vehicle to import for on frontend. Actually import the data to the db

server/controllers/import.go

@@ -32,7 +32,12 @@ func drivvoImport(c *gin.Context) {
 		c.JSON(http.StatusUnprocessableEntity, err)
 		return
 	}
-	errors := service.DrivvoImport(bytes, c.MustGet("userId").(string))
+	vehicleId := c.PostForm("vehicleID")
+	if vehicleId == "" {
+		c.JSON(http.StatusUnprocessableEntity, "Missing Vehicle ID")
+		return
+	}
+	errors := service.DrivvoImport(bytes, c.MustGet("userId").(string), vehicleId)
 	if len(errors) > 0 {
 		c.JSON(http.StatusUnprocessableEntity, gin.H{"errors": errors})
 		return

server/service/importService.go

@@ -13,7 +13,7 @@ import (
 
 // TODO: Move drivvo stuff to separate file
 
-func DrivvoParseExpenses(content []byte, user *db.User) ([]db.Expense, []string) {
+func DrivvoParseExpenses(content []byte, user *db.User, vehicle *db.Vehicle) ([]db.Expense, []string) {
 	expenseReader := csv.NewReader(bytes.NewReader(content))
 	expenseReader.Comment = '#'
 	// Read headers (there is a trailing comma at the end, that's why we have to read the first line)
@@ -53,6 +53,7 @@ func DrivvoParseExpenses(content []byte, user *db.User) ([]db.Expense, []string)
 		notes := fmt.Sprintf("Location: %s\nNotes: %s\n", record[4], record[5])
 		expense.Comments = notes
 
+		expense.VehicleID = vehicle.ID
 		expense.ExpenseType = record[3]
 		expense.UserID = user.ID
 		expense.Currency = user.Currency
@@ -65,7 +66,7 @@ func DrivvoParseExpenses(content []byte, user *db.User) ([]db.Expense, []string)
 	return expenses, errors
 }
 
-func DrivvoParseRefuelings(content []byte, user *db.User) ([]db.Fillup, []string) {
+func DrivvoParseRefuelings(content []byte, user *db.User, vehicle *db.Vehicle) ([]db.Fillup, []string) {
 	refuelingReader := csv.NewReader(bytes.NewReader(content))
 	refuelingReader.Comment = '#'
 	refuelingRecords, err := refuelingReader.ReadAll()
@@ -131,6 +132,8 @@ func DrivvoParseRefuelings(content []byte, user *db.User) ([]db.Fillup, []string
 		notes := fmt.Sprintf("Reason: %s\nNotes: %s\nFuel: %s\n", record[18], record[19], record[2])
 		fillup.Comments = notes
 
+		fillup.VehicleID = vehicle.ID
+		fillup.FuelUnit = vehicle.FuelUnit
 		fillup.UserID = user.ID
 		fillup.Currency = user.Currency
 		fillup.DistanceUnit = user.DistanceUnit
@@ -141,7 +144,7 @@ func DrivvoParseRefuelings(content []byte, user *db.User) ([]db.Fillup, []string
 	return fillups, errors
 }
 
-func DrivvoImport(content []byte, userId string) []string {
+func DrivvoImport(content []byte, userId string, vehicleId string) []string {
 	var errors []string
 	user, err := GetUserById(userId)
 	if err != nil {
@@ -149,6 +152,12 @@ func DrivvoImport(content []byte, userId string) []string {
 		return errors
 	}
 
+	vehicle, err := GetVehicleById(vehicleId)
+	if err != nil {
+		errors = append(errors, err.Error())
+		return errors
+	}
+
 	serviceSectionIndex := bytes.Index(content, []byte("#Service"))
 
 	endParseIndex := bytes.Index(content, []byte("#Income"))
@@ -165,12 +174,12 @@ func DrivvoImport(content []byte, userId string) []string {
 		expenseSectionIndex = endParseIndex
 	}
 
-	fillups, errors := DrivvoParseRefuelings(content[:serviceSectionIndex], user)
+	fillups, errors := DrivvoParseRefuelings(content[:serviceSectionIndex], user, vehicle)
 	_ = fillups
 
 	var allExpenses []db.Expense
 	if serviceSectionIndex != -1 {
-		services, parseErrors := DrivvoParseExpenses(content[serviceSectionIndex:expenseSectionIndex], user)
+		services, parseErrors := DrivvoParseExpenses(content[serviceSectionIndex:expenseSectionIndex], user, vehicle)
 		if parseErrors != nil {
 			errors = append(errors, parseErrors...)
 		}
@@ -178,7 +187,7 @@ func DrivvoImport(content []byte, userId string) []string {
 	}
 
 	if expenseSectionIndex != endParseIndex {
-		expenses, parseErrors := DrivvoParseExpenses(content[expenseSectionIndex:endParseIndex], user)
+		expenses, parseErrors := DrivvoParseExpenses(content[expenseSectionIndex:endParseIndex], user, vehicle)
 		if parseErrors != nil {
 			errors = append(errors, parseErrors...)
 		}
@@ -189,7 +198,29 @@ func DrivvoImport(content []byte, userId string) []string {
 		return errors
 	}
 
-	errors = append(errors, "Not implemented")
+	tx := db.DB.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	if err := tx.Error; err != nil {
+		errors = append(errors, err.Error())
+		return errors
+	}
+	if err := tx.Create(&fillups).Error; err != nil {
+		tx.Rollback()
+		errors = append(errors, err.Error())
+		return errors
+	}
+	if err := tx.Create(&allExpenses).Error; err != nil {
+		tx.Rollback()
+		errors = append(errors, err.Error())
+		return errors
+	}
+	if err := tx.Commit().Error; err != nil {
+		errors = append(errors, err.Error())
+	}
 	return errors
 }
 

ui/src/router/views/import-drivvo.vue

@@ -9,8 +9,24 @@ export default {
     meta: [{ name: 'description', content: 'The Import Drivvo page.' }],
   },
   components: { Layout },
+  props: {
+    user: {
+      type: Object,
+      required: true,
+    },
+  },
+  data: function() {
+    return {
+      myVehicles: [],
+      file: null,
+      selectedVehicle: null,
+      tryingToCreate: false,
+      errors: [],
+    }
+  },
   computed: {
     ...mapState('utils', ['isMobile']),
+    ...mapState('vehicles', ['vehicles']),
     uploadButtonLabel() {
       if (this.isMobile) {
         if (this.file == null) {
@@ -27,18 +43,8 @@ export default {
       }
     },
   },
-  props: {
+  mounted() {
-    user: {
+    this.myVehicles = this.vehicles
-      type: Object,
-      required: true,
-    },
-  },
-  data: function() {
-    return {
-      file: null,
-      tryingToCreate: false,
-      errors: [],
-    }
   },
   methods: {
     importDrivvo() {
@@ -49,6 +55,7 @@ export default {
       this.tryingToCreate = true
       this.errorMessage = ''
       const formData = new FormData()
+      formData.append('vehicleID', this.selectedVehicle)
       formData.append('file', this.file, this.file.name)
       axios
         .post(`/api/import/drivvo`, formData)
@@ -92,31 +99,35 @@ export default {
         <!-- TODO: Write about that income and trips are not imported. Also Second and Third fuel are ignored -->
         <p class="subtitle"> Steps to import data from Drivvo</p>
         <ol>
+          <li>Export your data from Drivvo in the CSV format.</li>
+          <li>Select the vehicle the exported data is for. You may need to create the vehicle in Hammond first if you haven't already done so</li>
           <li
-            >Export your data from Fuelly in the CSV format. Steps to do that can be found
+            >Make sure that the <u>Currency</u> and <u>Distance Unit</u> are set correctly in Hammond. Drivvo does not include this information in
-            <a href="http://docs.fuelly.com/acar-import-export-center" target="_nofollow">here</a>.</li
+            their export, instead Hammond will use the values set for the user.</li
-          >
-          <li>Make sure that you have already created the vehicles in Hammond platform.</li>
-          <li>Make sure that the Vehicle nickname in Hammond is exactly the same as the name on Fuelly CSV or the import will not work.</li>
-          <li
-            >Make sure that the <u>Currency</u> and <u>Distance Unit</u> are set correctly in Hammond. Import will not autodetect Currency from the
-            CSV but use the one set for the user.</li
           >
           <li>Similiarly, make sure that the <u>Fuel Unit</u> and <u>Fuel Type</u> are correctly set in the Vehicle.</li>
-          <li>Once you have checked all these points,just import the CSV below.</li>
+          <li>Once you have checked all these points, select the vehicle and import the CSV below.</li>
-          <li><b>Make sure that you do not import the file again and that will create repeat entries.</b></li>
+          <li><b>Make sure that you do not import the file again as that will create repeat entries.</b></li>
         </ol>
       </div>
     </div>
     <div class="section box">
-      <div class="columns">
+      <div class="columns is-multiline">
-        <div class="column is-two-thirds"> <p class="subtitle">Choose the Drivvo CSV and press the import button.</p></div>
+        <div class="column is-full"> <p class="subtitle">Choose the vehicle, then select the Drivvo CSV and press the import button.</p></div>
-        <div class="column is-one-third is-flex is-align-content-center">
+        <div class="column is-full is-flex is-align-content-center">
           <form @submit.prevent="importDrivvo">
-            <div class="columns"
+            <div class="columns">
-              ><div class="column">
+              <div class="column">
+                <b-field label="Vehicle" label-position="on-border">
+                  <b-select v-model="selectedVehicle" placeholder="Select Vehicle" required>
+                    <option v-for="vehicle in myVehicles" :key="vehicle.id" :value="vehicle.id">{{ vehicle.nickname }}</option>
+                  </b-select>
+                </b-field>
+              </div>
+
+              <div class="column">
                 <b-field class="file is-primary" :class="{ 'has-name': !!file }">
-                  <b-upload v-model="file" class="file-label" accept=".csv">
+                  <b-upload v-model="file" class="file-label" accept=".csv" required>
                     <span class="file-cta">
                       <b-icon class="file-icon" icon="upload"></b-icon>
                       <span class="file-label">{{ uploadButtonLabel }}</span>

ui/src/router/views/import-fuelly.vue

@@ -114,7 +114,7 @@ export default {
             <div class="columns"
               ><div class="column">
                 <b-field class="file is-primary" :class="{ 'has-name': !!file }">
-                  <b-upload v-model="file" class="file-label" accept=".csv">
+                  <b-upload v-model="file" class="file-label" accept=".csv" required>
                     <span class="file-cta">
                       <b-icon class="file-icon" icon="upload"></b-icon>
                       <span class="file-label">{{ uploadButtonLabel }}</span>