From b93b7f321e2b5dab36bf7e33256772843fb029ad Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Fri, 9 Feb 2024 14:55:29 -0700
Subject: [PATCH] fixed export file path.

---
 Controllers/MigrationController.cs | 11 +++++++++--
 Views/Migration/Index.cshtml       |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Controllers/MigrationController.cs b/Controllers/MigrationController.cs
index e4eb87a..225b07a 100644
--- a/Controllers/MigrationController.cs
+++ b/Controllers/MigrationController.cs
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Npgsql;
 using System.Data.Common;
+using System.IO.Compression;
 using System.Xml.Linq;
 
 namespace CarCareTracker.Controllers
@@ -67,7 +68,10 @@ namespace CarCareTracker.Controllers
             {
                 return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
             }
-            var tempPath = $"temp/{Guid.NewGuid}.db";
+            var tempFolder = $"temp/{Guid.NewGuid()}";
+            var tempPath = $"{tempFolder}/cartracker.db";
+            var fullFolderPath = _fileHelper.GetFullFilePath(tempFolder, false);
+            Directory.CreateDirectory(fullFolderPath);
             var fullFileName = _fileHelper.GetFullFilePath(tempPath, false);
             try
             {
@@ -393,10 +397,13 @@ namespace CarCareTracker.Controllers
                     };
                 }
                 #endregion
-                return Json(new OperationResponse { Success = true, Message = $"/{tempPath}" });
+                var destFilePath = $"{fullFolderPath}.zip";
+                ZipFile.CreateFromDirectory(fullFolderPath, destFilePath);
+                return Json(new OperationResponse { Success = true, Message = $"/{tempFolder}.zip" });
             }
             catch (Exception ex)
             {
+                _logger.LogError(ex.Message);
                 return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
         }
diff --git a/Views/Migration/Index.cshtml b/Views/Migration/Index.cshtml
index 8149fa0..9b6ffee 100644
--- a/Views/Migration/Index.cshtml
+++ b/Views/Migration/Index.cshtml
@@ -42,7 +42,9 @@
 </div>
 <script>
     function exportFromPostgres(){
+        sloader.show();
         $.get('/Migration/Export', function (data) {
+            sloader.hide();
             if (data.success) {
                 window.location.href = data.message;
             } else {