Merge pull request #998 from hargata/Hargata/api.hot.fix

hargata · web-flow · commit 4dca661c0207 · 2025-07-09T10:26:58.000-06:00
Hargata/api.hot.fix
diff --git a/Controllers/APIController.cs b/Controllers/APIController.cs
@@ -212,15 +212,15 @@ public IActionResult AdjustedOdometer(int vehicleId, int odometer)
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/planrecords")]
-        public IActionResult PlanRecords(MethodParameter parameters)
+        public IActionResult PlanRecords(int vehicleId, MethodParameter parameters)
         {
-            if (parameters.VehicleId == default)
+            if (vehicleId == default)
             {
                 var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
-            var vehicleRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(parameters.VehicleId);
+            var vehicleRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicleId);
             if (parameters.Id != default)
             {
                 vehicleRecords.RemoveAll(x => x.Id != parameters.Id);
@@ -445,15 +445,15 @@ public IActionResult UpdatePlanRecord(PlanRecordExportModel input)
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/servicerecords")]
-        public IActionResult ServiceRecords(MethodParameter parameters)
+        public IActionResult ServiceRecords(int vehicleId, MethodParameter parameters)
         {
-            if (parameters.VehicleId == default)
+            if (vehicleId == default)
             {
                 var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
-            var vehicleRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(parameters.VehicleId);
+            var vehicleRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
             if (parameters.Id != default)
             {
                 vehicleRecords.RemoveAll(x => x.Id != parameters.Id);
@@ -639,15 +639,15 @@ public IActionResult UpdateServiceRecord(GenericRecordExportModel input)
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/repairrecords")]
-        public IActionResult RepairRecords(MethodParameter parameters)
+        public IActionResult RepairRecords(int vehicleId, MethodParameter parameters)
         {
-            if (parameters.VehicleId == default)
+            if (vehicleId == default)
             {
                 var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
-            var vehicleRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(parameters.VehicleId);
+            var vehicleRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
             if (parameters.Id != default)
             {
                 vehicleRecords.RemoveAll(x => x.Id != parameters.Id);
@@ -836,15 +836,15 @@ public IActionResult UpdateRepairRecord(GenericRecordExportModel input)
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/upgraderecords")]
-        public IActionResult UpgradeRecords(MethodParameter parameters)
+        public IActionResult UpgradeRecords(int vehicleId, MethodParameter parameters)
         {
-            if (parameters.VehicleId == default)
+            if (vehicleId == default)
             {
                 var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
-            var vehicleRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(parameters.VehicleId);
+            var vehicleRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
             if (parameters.Id != default)
             {
                 vehicleRecords.RemoveAll(x => x.Id != parameters.Id);
@@ -1032,15 +1032,15 @@ public IActionResult UpdateUpgradeRecord(GenericRecordExportModel input)
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/taxrecords")]
-        public IActionResult TaxRecords(MethodParameter parameters)
+        public IActionResult TaxRecords(int vehicleId, MethodParameter parameters)
         {
-            if (parameters.VehicleId == default)
+            if (vehicleId == default)
             {
                 var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
-            var vehicleRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(parameters.VehicleId);
+            var vehicleRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
             if (parameters.Id != default)
             {
                 vehicleRecords.RemoveAll(x => x.Id != parameters.Id);
@@ -1258,15 +1258,15 @@ public IActionResult LastOdometer(int vehicleId)
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/odometerrecords")]
-        public IActionResult OdometerRecords(MethodParameter parameters)
+        public IActionResult OdometerRecords(int vehicleId, MethodParameter parameters)
         {
-            if (parameters.VehicleId == default)
+            if (vehicleId == default)
             {
                 var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
-            var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(parameters.VehicleId);
+            var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
             //determine if conversion is needed.
             if (vehicleRecords.All(x => x.InitialMileage == default))
             {
@@ -1437,15 +1437,15 @@ public IActionResult UpdateOdometerRecord(OdometerRecordExportModel input)
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/gasrecords")]
-        public IActionResult GasRecords(MethodParameter parameters)
+        public IActionResult GasRecords(int vehicleId, MethodParameter parameters)
         {
-            if (parameters.VehicleId == default)
+            if (vehicleId == default)
             {
                 var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
-            var rawVehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(parameters.VehicleId);
+            var rawVehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
             var vehicleRecords = _gasHelper.GetGasRecordViewModels(rawVehicleRecords, parameters.UseMPG, parameters.UseUKMPG);
             if (parameters.Id != default)
             {
diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs
@@ -12,7 +12,7 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
-        public const string VersionNumber = "1.4.8";
+        public const string VersionNumber = "1.4.9";
         public const string DbName = "data/cartracker.db";
         public const string UserConfigPath = "data/config/userConfig.json";
         public const string ServerConfigPath = "data/config/serverConfig.json";
diff --git a/Models/API/MethodParameter.cs b/Models/API/MethodParameter.cs
@@ -4,7 +4,6 @@ namespace CarCareTracker.Models
 {
     public class MethodParameter
     {
-        public int VehicleId { get; set; }
         public int Id { get; set; }
         [JsonConverter(typeof(FromDateOptional))]
         public string StartDate { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -212,15 +212,15 @@ public IActionResult AdjustedOdometer(int vehicleId, int odometer)`
`212`	`212`	`[TypeFilter(typeof(CollaboratorFilter))]`
`213`	`213`	`[HttpGet]`
`214`	`214`	`[Route("/api/vehicle/planrecords")]`
`215`		`- public IActionResult PlanRecords(MethodParameter parameters)`
	`215`	`+ public IActionResult PlanRecords(int vehicleId, MethodParameter parameters)`
`216`	`216`	`{`
`217`		`- if (parameters.VehicleId == default)`
	`217`	`+ if (vehicleId == default)`
`218`	`218`	`{`
`219`	`219`	`var response = OperationResponse.Failed("Must provide a valid vehicle id");`
`220`	`220`	`Response.StatusCode = 400;`
`221`	`221`	`return Json(response);`
`222`	`222`	`}`
`223`		`- var vehicleRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(parameters.VehicleId);`
	`223`	`+ var vehicleRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicleId);`
`224`	`224`	`if (parameters.Id != default)`
`225`	`225`	`{`
`226`	`226`	`vehicleRecords.RemoveAll(x => x.Id != parameters.Id);`
`@@ -445,15 +445,15 @@ public IActionResult UpdatePlanRecord(PlanRecordExportModel input)`
`445`	`445`	`[TypeFilter(typeof(CollaboratorFilter))]`
`446`	`446`	`[HttpGet]`
`447`	`447`	`[Route("/api/vehicle/servicerecords")]`
`448`		`- public IActionResult ServiceRecords(MethodParameter parameters)`
	`448`	`+ public IActionResult ServiceRecords(int vehicleId, MethodParameter parameters)`
`449`	`449`	`{`
`450`		`- if (parameters.VehicleId == default)`
	`450`	`+ if (vehicleId == default)`
`451`	`451`	`{`
`452`	`452`	`var response = OperationResponse.Failed("Must provide a valid vehicle id");`
`453`	`453`	`Response.StatusCode = 400;`
`454`	`454`	`return Json(response);`
`455`	`455`	`}`
`456`		`- var vehicleRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(parameters.VehicleId);`
	`456`	`+ var vehicleRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);`
`457`	`457`	`if (parameters.Id != default)`
`458`	`458`	`{`
`459`	`459`	`vehicleRecords.RemoveAll(x => x.Id != parameters.Id);`
`@@ -639,15 +639,15 @@ public IActionResult UpdateServiceRecord(GenericRecordExportModel input)`
`639`	`639`	`[TypeFilter(typeof(CollaboratorFilter))]`
`640`	`640`	`[HttpGet]`
`641`	`641`	`[Route("/api/vehicle/repairrecords")]`
`642`		`- public IActionResult RepairRecords(MethodParameter parameters)`
	`642`	`+ public IActionResult RepairRecords(int vehicleId, MethodParameter parameters)`
`643`	`643`	`{`
`644`		`- if (parameters.VehicleId == default)`
	`644`	`+ if (vehicleId == default)`
`645`	`645`	`{`
`646`	`646`	`var response = OperationResponse.Failed("Must provide a valid vehicle id");`
`647`	`647`	`Response.StatusCode = 400;`
`648`	`648`	`return Json(response);`
`649`	`649`	`}`
`650`		`- var vehicleRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(parameters.VehicleId);`
	`650`	`+ var vehicleRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);`
`651`	`651`	`if (parameters.Id != default)`
`652`	`652`	`{`
`653`	`653`	`vehicleRecords.RemoveAll(x => x.Id != parameters.Id);`
`@@ -836,15 +836,15 @@ public IActionResult UpdateRepairRecord(GenericRecordExportModel input)`
`836`	`836`	`[TypeFilter(typeof(CollaboratorFilter))]`
`837`	`837`	`[HttpGet]`
`838`	`838`	`[Route("/api/vehicle/upgraderecords")]`
`839`		`- public IActionResult UpgradeRecords(MethodParameter parameters)`
	`839`	`+ public IActionResult UpgradeRecords(int vehicleId, MethodParameter parameters)`
`840`	`840`	`{`
`841`		`- if (parameters.VehicleId == default)`
	`841`	`+ if (vehicleId == default)`
`842`	`842`	`{`
`843`	`843`	`var response = OperationResponse.Failed("Must provide a valid vehicle id");`
`844`	`844`	`Response.StatusCode = 400;`
`845`	`845`	`return Json(response);`
`846`	`846`	`}`
`847`		`- var vehicleRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(parameters.VehicleId);`
	`847`	`+ var vehicleRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);`
`848`	`848`	`if (parameters.Id != default)`
`849`	`849`	`{`
`850`	`850`	`vehicleRecords.RemoveAll(x => x.Id != parameters.Id);`
`@@ -1032,15 +1032,15 @@ public IActionResult UpdateUpgradeRecord(GenericRecordExportModel input)`
`1032`	`1032`	`[TypeFilter(typeof(CollaboratorFilter))]`
`1033`	`1033`	`[HttpGet]`
`1034`	`1034`	`[Route("/api/vehicle/taxrecords")]`
`1035`		`- public IActionResult TaxRecords(MethodParameter parameters)`
	`1035`	`+ public IActionResult TaxRecords(int vehicleId, MethodParameter parameters)`
`1036`	`1036`	`{`
`1037`		`- if (parameters.VehicleId == default)`
	`1037`	`+ if (vehicleId == default)`
`1038`	`1038`	`{`
`1039`	`1039`	`var response = OperationResponse.Failed("Must provide a valid vehicle id");`
`1040`	`1040`	`Response.StatusCode = 400;`
`1041`	`1041`	`return Json(response);`
`1042`	`1042`	`}`
`1043`		`- var vehicleRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(parameters.VehicleId);`
	`1043`	`+ var vehicleRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);`
`1044`	`1044`	`if (parameters.Id != default)`
`1045`	`1045`	`{`
`1046`	`1046`	`vehicleRecords.RemoveAll(x => x.Id != parameters.Id);`
`@@ -1258,15 +1258,15 @@ public IActionResult LastOdometer(int vehicleId)`
`1258`	`1258`	`[TypeFilter(typeof(CollaboratorFilter))]`
`1259`	`1259`	`[HttpGet]`
`1260`	`1260`	`[Route("/api/vehicle/odometerrecords")]`
`1261`		`- public IActionResult OdometerRecords(MethodParameter parameters)`
	`1261`	`+ public IActionResult OdometerRecords(int vehicleId, MethodParameter parameters)`
`1262`	`1262`	`{`
`1263`		`- if (parameters.VehicleId == default)`
	`1263`	`+ if (vehicleId == default)`
`1264`	`1264`	`{`
`1265`	`1265`	`var response = OperationResponse.Failed("Must provide a valid vehicle id");`
`1266`	`1266`	`Response.StatusCode = 400;`
`1267`	`1267`	`return Json(response);`
`1268`	`1268`	`}`
`1269`		`- var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(parameters.VehicleId);`
	`1269`	`+ var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);`
`1270`	`1270`	`//determine if conversion is needed.`
`1271`	`1271`	`if (vehicleRecords.All(x => x.InitialMileage == default))`
`1272`	`1272`	`{`
`@@ -1437,15 +1437,15 @@ public IActionResult UpdateOdometerRecord(OdometerRecordExportModel input)`
`1437`	`1437`	`[TypeFilter(typeof(CollaboratorFilter))]`
`1438`	`1438`	`[HttpGet]`
`1439`	`1439`	`[Route("/api/vehicle/gasrecords")]`
`1440`		`- public IActionResult GasRecords(MethodParameter parameters)`
	`1440`	`+ public IActionResult GasRecords(int vehicleId, MethodParameter parameters)`
`1441`	`1441`	`{`
`1442`		`- if (parameters.VehicleId == default)`
	`1442`	`+ if (vehicleId == default)`
`1443`	`1443`	`{`
`1444`	`1444`	`var response = OperationResponse.Failed("Must provide a valid vehicle id");`
`1445`	`1445`	`Response.StatusCode = 400;`
`1446`	`1446`	`return Json(response);`
`1447`	`1447`	`}`
`1448`		`- var rawVehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(parameters.VehicleId);`
	`1448`	`+ var rawVehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);`
`1449`	`1449`	`var vehicleRecords = _gasHelper.GetGasRecordViewModels(rawVehicleRecords, parameters.UseMPG, parameters.UseUKMPG);`
`1450`	`1450`	`if (parameters.Id != default)`
`1451`	`1451`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace CarCareTracker.Helper`
`12`	`12`	`/// </summary>`
`13`	`13`	`public static class StaticHelper`
`14`	`14`	`{`
`15`		`- public const string VersionNumber = "1.4.8";`
	`15`	`+ public const string VersionNumber = "1.4.9";`
`16`	`16`	`public const string DbName = "data/cartracker.db";`
`17`	`17`	`public const string UserConfigPath = "data/config/userConfig.json";`
`18`	`18`	`public const string ServerConfigPath = "data/config/serverConfig.json";`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ namespace CarCareTracker.Models`
`4`	`4`	`{`
`5`	`5`	`public class MethodParameter`
`6`	`6`	`{`
`7`		`- public int VehicleId { get; set; }`
`8`	`7`	`public int Id { get; set; }`
`9`	`8`	`[JsonConverter(typeof(FromDateOptional))]`
`10`	`9`	`public string StartDate { get; set; }`