Code-complete v2 vehicle API

PartSource.Data/Models/BaseVehicle.cs

@@ -5,14 +5,18 @@ using System.Text;
 
 namespace PartSource.Data.Models
 {
-    public class BaseVehicle
-    {
-        public int BaseVehicleId { get; set; }
+	public class BaseVehicle
+	{
+		public int BaseVehicleId { get; set; }
 
-        public int Year { get; set; }
+		public string Make { get; set; }
 
-        public int MakeId { get; set; }
+		public int MakeId { get; set; }
 
-        public int ModelId { get; set; }
-    }
+		public string Model { get; set; }
+
+		public int ModelId { get; set; }
+
+		public int Year { get; set; }
+	}
 }

PartSource.Data/Models/Engine.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Security.Cryptography;
 using System.Text;
 
 namespace PartSource.Data.Models
@@ -14,5 +15,13 @@ namespace PartSource.Data.Models
         public int BaseVehicleId { get; set; }
 
         public int SubmodelId { get; set; }
+
+        public string Make { get; set; }
+
+        public int MakeId { get; set; }
+
+        public string Model { get; set; }
+
+        public int ModelId { get; set; }
     }
 }

PartSource.Data/Models/Fitment.cs

@@ -10,9 +10,9 @@ namespace PartSource.Data.Models
 
         public string LineCode { get; set; }
 
-        public int? BaseVehicleId { get; set; }
+        public int BaseVehicleId { get; set; }
 
-        public int? EngineConfigId { get; set; }
+        public int EngineConfigId { get; set; }
 
         public string Position { get; set; }
     }

PartSource.Data/Models/Submodel.cs

@@ -7,20 +7,20 @@ using System.Text;
 
 namespace PartSource.Data.Models
 {
-    [Table("Submodel", Schema = "Vehicle")]
     public class Submodel
     {
         public int SubmodelId { get; set; }
 
         public string Name { get; set; }
 
-        [JsonIgnore]
         public int Year { get; set; }
 
-        [JsonIgnore]
+        public string Make { get; set; }
+
         public int MakeId { get; set; }
 
-        [JsonIgnore]
+        public string Model { get; set; }
+
         public int ModelId { get; set; }
     }
 }

PartSource.Data/Models/VehicleData.cs

@@ -6,32 +6,29 @@ using System.Text;
 
 namespace PartSource.Data.Models
 {
-    public class VehicleData
+    public class Vehicle
     {
-        public int? MakeId { get; set; }
+        public int MakeId { get; set; }
 
         public string MakeName { get; set; }
 
-        public int? ModelId { get; set; }
+        public int ModelId { get; set; }
 
         public string ModelName { get; set; }
 
-        public int? EngineConfigId { get; set; }
+        public int EngineConfigId { get; set; }
 
         public string EngineDescription { get; set; }
 
-        public int? BaseVehicleId { get; set; }
+        public int BaseVehicleId { get; set; }
 
-        public int? Year { get; set; }
+        public int Year { get; set; }
 
-        public int? SubmodelId { get; set; }
+        public int SubmodelId { get; set; }
 
         public string SubmodelName { get; set; }
 
         [Key]
         public int VehicleToEngineConfigId { get; set; }
-
-        [NotMapped]
-        public string Position { get; set; }
     }
 }

PartSource.Data/Models/VehicleMake.cs

@@ -8,7 +8,7 @@ namespace PartSource.Data.Models
     public class VehicleMake
     {
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        public int Id { get; set; }
+        public int MakeId { get; set; }
 
         public string Name { get; set; }
     }

PartSource.Data/Models/VehicleModel.cs

@@ -9,11 +9,14 @@ namespace PartSource.Data.Models
     public class VehicleModel
     {
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        public int Id { get; set; }
+        public int ModelId { get; set; }
+
+        public int Year { get; set; }
 
         public string Name { get; set; }
 
-        public int VehicleMakeId { get; set; }
+        public string Make { get; set; }
 
+        public int MakeId { get; set; }
     }
 }