From 90755d68b3e79fefe5fe9b2001e38dfc295ecabb Mon Sep 17 00:00:00 2001
From: "DESKTOP-T0O5CDB\\DESK-555BD" <ivancheahkf@gmail.com>
Date: Fri, 8 Mar 2024 11:49:30 -0700
Subject: [PATCH] Improved Attachment Export

---
 Controllers/VehicleController.cs | 6 ++++++
 Helper/FileHelper.cs             | 2 +-
 Helper/StaticHelper.cs           | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
index 2bef090..46f1005 100644
--- a/Controllers/VehicleController.cs
+++ b/Controllers/VehicleController.cs
@@ -1132,6 +1132,7 @@ namespace CarCareTracker.Controllers
                 var records = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
                 attachmentData.AddRange(records.Select(x => new GenericReportModel
                 {
+                    DataType = ImportMode.ServiceRecord,
                     Date = x.Date,
                     Odometer = x.Mileage,
                     Files = x.Files
@@ -1142,6 +1143,7 @@ namespace CarCareTracker.Controllers
                 var records = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
                 attachmentData.AddRange(records.Select(x => new GenericReportModel
                 {
+                    DataType = ImportMode.RepairRecord,
                     Date = x.Date,
                     Odometer = x.Mileage,
                     Files = x.Files
@@ -1152,6 +1154,7 @@ namespace CarCareTracker.Controllers
                 var records = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
                 attachmentData.AddRange(records.Select(x => new GenericReportModel
                 {
+                    DataType = ImportMode.UpgradeRecord,
                     Date = x.Date,
                     Odometer = x.Mileage,
                     Files = x.Files
@@ -1162,6 +1165,7 @@ namespace CarCareTracker.Controllers
                 var records = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
                 attachmentData.AddRange(records.Select(x => new GenericReportModel
                 {
+                    DataType = ImportMode.GasRecord,
                     Date = x.Date,
                     Odometer = x.Mileage,
                     Files = x.Files
@@ -1172,6 +1176,7 @@ namespace CarCareTracker.Controllers
                 var records = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
                 attachmentData.AddRange(records.Select(x => new GenericReportModel
                 {
+                    DataType = ImportMode.TaxRecord,
                     Date = x.Date,
                     Odometer = 0,
                     Files = x.Files
@@ -1182,6 +1187,7 @@ namespace CarCareTracker.Controllers
                 var records = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
                 attachmentData.AddRange(records.Select(x => new GenericReportModel
                 {
+                    DataType = ImportMode.OdometerRecord,
                     Date = x.Date,
                     Odometer = x.Mileage,
                     Files = x.Files
diff --git a/Helper/FileHelper.cs b/Helper/FileHelper.cs
index b22d331..da7395c 100644
--- a/Helper/FileHelper.cs
+++ b/Helper/FileHelper.cs
@@ -173,7 +173,7 @@ namespace CarCareTracker.Helper
                 foreach (UploadedFiles file in reportModel.Files)
                 {
                     var fileToCopy = GetFullFilePath(file.Location);
-                    var destFileName = $"{tempPath}/{fileIndex}{Path.GetExtension(file.Location)}";
+                    var destFileName = $"{tempPath}/{fileIndex}_{reportModel.DataType}_{reportModel.Date.ToString("yyyy-MM-dd")}_{file.Name}{Path.GetExtension(file.Location)}";
                     File.Copy(fileToCopy, destFileName);
                     fileIndex++;
                 }
diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs
index e99720d..56155be 100644
--- a/Helper/StaticHelper.cs
+++ b/Helper/StaticHelper.cs
@@ -8,7 +8,7 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
-        public static string VersionNumber = "1.2.5";
+        public static string VersionNumber = "1.2.6";
         public static string DbName = "data/cartracker.db";
         public static string UserConfigPath = "config/userConfig.json";
         public static string GenericErrorMessage = "An error occurred, please try again later";