Merge pull request #3 from AlfHou/add-vin

Add VIN field to vehicle data
AlfHou · Jan 19, 2023 · 47810a8 · 47810a8
2 parents 5aabeda + f9d24bc
commit 47810a8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/server/db/dbModels.go b/server/db/dbModels.go
@@ -60,6 +60,7 @@ type Vehicle struct {
 	Base
 	Nickname          string       `json:"nickname"`
 	Registration      string       `json:"registration"`
+	VIN               string       `json:"vin"`
 	Make              string       `json:"make"`
 	Model             string       `json:"model"`
 	YearOfManufacture int          `json:"yearOfManufacture"`

diff --git a/server/db/migrations.go b/server/db/migrations.go
@@ -21,6 +21,11 @@ var migrations = []localMigration{
 	{
 		Name:  "2021_02_07_00_09_LowerCaseEmails",
 		Query: "update users set email=lower(email)",
+
+	},
+	{
+		Name:  "2022_03_08_13_16_AddVIN",
+		Query: "ALTER TABLE vehicles ADD COLUMN vin text",
 	},
 }
 

diff --git a/server/models/vehicle.go b/server/models/vehicle.go
@@ -17,6 +17,7 @@ type SubItemQuery struct {
 type CreateVehicleRequest struct {
 	Nickname          string       `form:"nickname" json:"nickname" binding:"required"`
 	Registration      string       `form:"registration" json:"registration" binding:"required"`
+	VIN               string       `form:"vin" json:"vin"`
 	Make              string       `form:"make" json:"make" binding:"required"`
 	Model             string       `form:"model" json:"model" binding:"required"`
 	YearOfManufacture int          `form:"yearOfManufacture" json:"yearOfManufacture"`

diff --git a/server/service/vehicleService.go b/server/service/vehicleService.go
@@ -14,6 +14,7 @@ func CreateVehicle(model models.CreateVehicleRequest, userId string) (*db.Vehicl
 		Nickname:          model.Nickname,
 		Registration:      model.Registration,
 		Model:             model.Model,
+		VIN:               model.VIN,
 		Make:              model.Make,
 		YearOfManufacture: model.YearOfManufacture,
 		EngineSize:        model.EngineSize,
@@ -100,6 +101,7 @@ func UpdateVehicle(vehicleID string, model models.UpdateVehicleRequest) error {
 	//return db.DB.Model(&toUpdate).Updates(db.Vehicle{
 	toUpdate.Nickname = model.Nickname
 	toUpdate.Registration = model.Registration
+	toUpdate.VIN = model.VIN
 	toUpdate.Model = model.Model
 	toUpdate.Make = model.Make
 	toUpdate.YearOfManufacture = model.YearOfManufacture

diff --git a/ui/src/router/views/createVehicle.vue b/ui/src/router/views/createVehicle.vue
@@ -47,6 +47,7 @@ export default {
           fuelUnit: null,
           fuelType: null,
           registration: '',
+          vin: '',
           nickname: '',
           engineSize: null,
           make: '',
@@ -58,6 +59,7 @@ export default {
           fuelUnit: veh.fuelUnit,
           fuelType: veh.fuelType,
           registration: veh.registration,
+          vin: veh.vin,
           nickname: veh.nickname,
           engineSize: veh.engineSize,
           make: veh.make,
@@ -138,6 +140,9 @@ export default {
       <b-field label="Registration*">
         <b-input v-model="vehicleModel.registration" type="text" expanded required></b-input>
       </b-field>
+      <b-field label="VIN">
+        <b-input v-model="vehicleModel.vin" type="text" expanded></b-input>
+      </b-field>
       <b-field label="Fuel Type*">
         <b-select v-model.number="vehicleModel.fuelType" placeholder="Fuel Type" required expanded>
           <option v-for="(option, key) in fuelTypeMasters" :key="key" :value="key">