From ffb126276f933464a650156a3e97b2fb38e41d00 Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Thu, 27 Mar 2025 05:59:01 -0600 Subject: [PATCH] Add ID to reminderexportmodel. --- Controllers/APIController.cs | 2 +- Logic/VehicleLogic.cs | 4 ++-- Models/Shared/ImportModel.cs | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Controllers/APIController.cs b/Controllers/APIController.cs index a5fd82d..2c319a6 100644 --- a/Controllers/APIController.cs +++ b/Controllers/APIController.cs @@ -1403,7 +1403,7 @@ namespace CarCareTracker.Controllers } var currentMileage = _vehicleLogic.GetMaxMileage(vehicleId); var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId); - var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).Select(x=> new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString()}); + var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).Select(x=> new ReminderExportModel { Id = x.Id.ToString(), Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString()}); if (_config.GetInvariantApi() || Request.Headers.ContainsKey("culture-invariant")) { return Json(results, StaticHelper.GetInvariantOption()); diff --git a/Logic/VehicleLogic.cs b/Logic/VehicleLogic.cs index 04dc5b6..30dc2c1 100644 --- a/Logic/VehicleLogic.cs +++ b/Logic/VehicleLogic.cs @@ -303,11 +303,11 @@ namespace CarCareTracker.Logic //set next reminder if (results.Any(x => (x.Metric == ReminderMetric.Date || x.Metric == ReminderMetric.Both) && x.Date >= DateTime.Now.Date)) { - resultToAdd.NextReminder = results.Where(x => x.Date >= DateTime.Now.Date).OrderBy(x => x.Date).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First(); + resultToAdd.NextReminder = results.Where(x => x.Date >= DateTime.Now.Date).OrderBy(x => x.Date).Select(x => new ReminderExportModel { Id = x.Id.ToString(), Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First(); } else if (results.Any(x => (x.Metric == ReminderMetric.Odometer || x.Metric == ReminderMetric.Both) && x.Mileage >= currentMileage)) { - resultToAdd.NextReminder = results.Where(x => x.Mileage >= currentMileage).OrderBy(x => x.Mileage).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First(); + resultToAdd.NextReminder = results.Where(x => x.Mileage >= currentMileage).OrderBy(x => x.Mileage).Select(x => new ReminderExportModel { Id = x.Id.ToString(), Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First(); } apiResult.Add(resultToAdd); } diff --git a/Models/Shared/ImportModel.cs b/Models/Shared/ImportModel.cs index cbb424a..9533344 100644 --- a/Models/Shared/ImportModel.cs +++ b/Models/Shared/ImportModel.cs @@ -115,6 +115,8 @@ namespace CarCareTracker.Models } public class ReminderExportModel { + [JsonConverter(typeof(FromIntOptional))] + public string Id { get; set; } public string Description { get; set; } public string Urgency { get; set; } public string Metric { get; set; }