From 98777328d76f554c44197424d1b84e617d69f111 Mon Sep 17 00:00:00 2001
From: Piotr Kus <trent.blaugrana@gmail.com>
Date: Sat, 1 Feb 2025 07:14:29 +0100
Subject: [PATCH] * Changed string parameters to GUID

---
 FA_WEB.sln                                    |  6 ----
 .../Controllers/CustomerOrdersController.cs   |  2 +-
 .../EdiCustomerOrdersController.cs            |  2 +-
 FaKrosnoApi/Controllers/ErrorLogController.cs |  2 +-
 FaKrosnoEfDataModelTests/Service.cs           |  2 +-
 .../Components/Pages/CustomerOrder.razor      |  5 ++--
 .../Components/Pages/CustomerOrders.razor     |  2 +-
 .../Components/Pages/EdiCustomerOrder.razor   |  4 +--
 .../Components/Pages/EdiCustomerOrders.razor  |  4 +--
 .../Services/CustomerOrderService.cs          |  4 +--
 .../Services/EdiCustomerOrderService.cs       | 14 +++++-----
 .../Services/CustomerOrderService.cs          |  8 +++---
 .../Services/EdiCustomerOrderService.cs       | 28 +++++++++----------
 .../Services/ErrorLogService.cs               |  2 +-
 .../Services/ICustomerOrderService.cs         |  2 +-
 .../Services/IEdiCustomerOrderService.cs      |  2 +-
 .../Services/IErrorLogService.cs              |  2 +-
 17 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/FA_WEB.sln b/FA_WEB.sln
index 60646e3..8d46ffe 100644
--- a/FA_WEB.sln
+++ b/FA_WEB.sln
@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaKrosnoEfDataModel", "FaKr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SytelineSaAppEfDataModel", "SytelineSaAppEfDataModel\SytelineSaAppEfDataModel.csproj", "{02B7F642-62C1-4BA2-87B0-0B9214319095}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaKrosnoEfDataModelTests", "FaKrosnoEfDataModelTests\FaKrosnoEfDataModelTests.csproj", "{4D8AA0FD-6025-4D03-86B9-51CE07081D80}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,10 +35,6 @@ Global
 		{02B7F642-62C1-4BA2-87B0-0B9214319095}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{02B7F642-62C1-4BA2-87B0-0B9214319095}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{02B7F642-62C1-4BA2-87B0-0B9214319095}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D8AA0FD-6025-4D03-86B9-51CE07081D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D8AA0FD-6025-4D03-86B9-51CE07081D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D8AA0FD-6025-4D03-86B9-51CE07081D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D8AA0FD-6025-4D03-86B9-51CE07081D80}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/FaKrosnoApi/Controllers/CustomerOrdersController.cs b/FaKrosnoApi/Controllers/CustomerOrdersController.cs
index ce0470d..4d0f632 100644
--- a/FaKrosnoApi/Controllers/CustomerOrdersController.cs
+++ b/FaKrosnoApi/Controllers/CustomerOrdersController.cs
@@ -16,7 +16,7 @@ namespace FaKrosnoApi.Controllers
         }
 
         [HttpGet("by-order-number")]
-        public async Task<ActionResult<CustomerOrderDto?>> GetByCustomerOrderNumber([FromQuery] string customerOrderNumber)
+        public async Task<ActionResult<CustomerOrderDto?>> GetByCustomerOrderNumber([FromQuery] Guid customerOrderNumber)
         {
             CustomerOrderDto? scheduleOrder = await service.GetByOrderNumber(customerOrderNumber);
             return scheduleOrder != null ? Ok(scheduleOrder) : NotFound();
diff --git a/FaKrosnoApi/Controllers/EdiCustomerOrdersController.cs b/FaKrosnoApi/Controllers/EdiCustomerOrdersController.cs
index 4478550..c599fba 100644
--- a/FaKrosnoApi/Controllers/EdiCustomerOrdersController.cs
+++ b/FaKrosnoApi/Controllers/EdiCustomerOrdersController.cs
@@ -23,7 +23,7 @@ namespace FaKrosnoApi.Controllers
         }
 
         [HttpGet("by-order-number")]
-        public async Task<ActionResult<EdiCustomerOrderDto>> GetByCustomerOrderNumber([FromQuery] string customerOrderNumber)
+        public async Task<ActionResult<EdiCustomerOrderDto>> GetByCustomerOrderNumber([FromQuery] Guid customerOrderNumber)
         {
             EdiCustomerOrderDto? scheduleOrder = await service.GetByOrderNumber(customerOrderNumber);
             return scheduleOrder != null ? Ok(scheduleOrder) : NotFound();
diff --git a/FaKrosnoApi/Controllers/ErrorLogController.cs b/FaKrosnoApi/Controllers/ErrorLogController.cs
index 052c893..2ead3d5 100644
--- a/FaKrosnoApi/Controllers/ErrorLogController.cs
+++ b/FaKrosnoApi/Controllers/ErrorLogController.cs
@@ -16,7 +16,7 @@ namespace FaKrosnoApi.Controllers
         }
 
         [HttpGet("by-order-number")]
-        public async Task<ActionResult<IEnumerable<ErrorLogDto>>> GetByCustomerOrderNumber([FromQuery] string customerOrderNumber)
+        public async Task<ActionResult<IEnumerable<ErrorLogDto>>> GetByCustomerOrderNumber([FromQuery] Guid customerOrderNumber)
         {
             var errorLogs = await service.GetByOrderNumber(customerOrderNumber);
             return errorLogs.Any() ? Ok(errorLogs) : NotFound();
diff --git a/FaKrosnoEfDataModelTests/Service.cs b/FaKrosnoEfDataModelTests/Service.cs
index ab404f8..bee79d6 100644
--- a/FaKrosnoEfDataModelTests/Service.cs
+++ b/FaKrosnoEfDataModelTests/Service.cs
@@ -51,7 +51,7 @@ namespace FaKrosnoEfDataModelTests
 
             //var sendOrderToSyteline = serviceBase1.SendOrderToSyteline("EDI0004475");
 
-            var byOrderNumber = serviceBase2.GetByOrderNumber("EDI0004490");
+            //var byOrderNumber = serviceBase2.GetByOrderNumber("EDI0004490");
         }       
     }
 }
diff --git a/OrdersManagement/Components/Pages/CustomerOrder.razor b/OrdersManagement/Components/Pages/CustomerOrder.razor
index 537081b..ba8a68b 100644
--- a/OrdersManagement/Components/Pages/CustomerOrder.razor
+++ b/OrdersManagement/Components/Pages/CustomerOrder.razor
@@ -1,4 +1,4 @@
-@page "/CustomerOrder/{CustomerOrderId}"
+@page "/CustomerOrder/{CustomerOrderId:guid}"
 
 @inject EdiCustomerOrderService CustomerOrderService
 @using SytelineSaAppEfDataModel.Dtos
@@ -7,5 +7,6 @@
 <h3>CustomerOrder</h3>
 
 @code {
-    
+    [Parameter]
+    public Guid CustomerOrderId { get; set; }
 }
\ No newline at end of file
diff --git a/OrdersManagement/Components/Pages/CustomerOrders.razor b/OrdersManagement/Components/Pages/CustomerOrders.razor
index 1709520..32ecf03 100644
--- a/OrdersManagement/Components/Pages/CustomerOrders.razor
+++ b/OrdersManagement/Components/Pages/CustomerOrders.razor
@@ -72,7 +72,7 @@
 
     private void OnRowDoubleClick(GridRowEventArgs<CustomerOrderDto> obj)
     {
-        string customerOrderId = obj.Item.CoNum;
+        Guid customerOrderId = obj.Item.RowPointer;
 
         NavigationManager.NavigateTo($"/CustomerOrder/{customerOrderId}");
     }
diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor
index aba5f5c..6f737dc 100644
--- a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor
+++ b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor
@@ -1,4 +1,4 @@
-@page "/EdiCustomerOrder/{CustomerOrderId}"
+@page "/EdiCustomerOrder/{CustomerOrderId:guid}"
 
 @inject EdiCustomerOrderService EdiCustomerOrderService
 @using SytelineSaAppEfDataModel.Dtos
@@ -202,7 +202,7 @@
 @code {
 
     [Parameter]
-    public string CustomerOrderId { get; set; } = string.Empty;
+    public Guid CustomerOrderId { get; set; }
 
     List<EdiCustomerOrderDto?>? _ediCustomerOrder;
     List<EdiCustomerOrderLineDto> _ediCustomerOrderLines = [];
diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
index d7c3154..3c1a7d7 100644
--- a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
+++ b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
@@ -122,7 +122,7 @@
 
     private void OnRowDoubleClick(GridRowEventArgs<EdiCustomerOrderDto> obj)
     {
-        string customerOrderId = obj.Item.CustomerOrderNumber;
+        Guid customerOrderId = obj.Item.RowPointer;
 
         NavigationManager.NavigateTo($"/EdiCustomerOrder/{customerOrderId}");
     }
@@ -135,7 +135,7 @@
 
         foreach (EdiCustomerOrderDto selectedEdiCustomerOrder in _selectedEdiCustomerOrders)
         {
-            ResponseDto response = await EdiCustomerOrderService.SendOrderToSyteline(selectedEdiCustomerOrder.CustomerOrderNumber);
+            ResponseDto response = await EdiCustomerOrderService.SendOrderToSyteline(selectedEdiCustomerOrder.RowPointer, selectedEdiCustomerOrder.CustomerOrderNumber);
 
             if (response.Status == 1)
             {
diff --git a/OrdersManagement/Services/CustomerOrderService.cs b/OrdersManagement/Services/CustomerOrderService.cs
index 4dfe79e..aa44b82 100644
--- a/OrdersManagement/Services/CustomerOrderService.cs
+++ b/OrdersManagement/Services/CustomerOrderService.cs
@@ -9,9 +9,9 @@ public class CustomerOrderService(HttpClient httpClient)
         return await httpClient.GetFromJsonAsync<IEnumerable<CustomerOrderDto>>("api/CustomerOrders");
     }
 
-    public async Task<CustomerOrderDto?> GetCustomerOrderAsync(string customerOrderNumber)
+    public async Task<CustomerOrderDto?> GetCustomerOrderAsync(Guid customerOrderNumber)
     {
         return await httpClient.GetFromJsonAsync<CustomerOrderDto>(
-            $"api/CustomerOrders/by-order-number/?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}");
+            $"api/CustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
     }
 }
\ No newline at end of file
diff --git a/OrdersManagement/Services/EdiCustomerOrderService.cs b/OrdersManagement/Services/EdiCustomerOrderService.cs
index 7b2255d..a0f5e21 100644
--- a/OrdersManagement/Services/EdiCustomerOrderService.cs
+++ b/OrdersManagement/Services/EdiCustomerOrderService.cs
@@ -10,32 +10,32 @@ namespace OrdersManagement.Services
             return await httpClient.GetFromJsonAsync<IEnumerable<EdiCustomerOrderDto>>("api/EdiCustomerOrders");
         }
 
-        public async Task<EdiCustomerOrderDto?> GetEdiCustomerOrderAsync(string customerOrderNumber)
+        public async Task<EdiCustomerOrderDto?> GetEdiCustomerOrderAsync(Guid customerOrderNumber)
         {
             return await httpClient.GetFromJsonAsync<EdiCustomerOrderDto>(
-                $"api/EdiCustomerOrders/by-order-number/?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}");
+                $"api/EdiCustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
         }
 
-        public async Task<ResponseDto> SendOrderToSyteline(string customerOrderNumber)
+        public async Task<ResponseDto> SendOrderToSyteline(Guid customerOrderNumber, string orderNumber)
         {
             HttpResponseMessage responseMessage = await httpClient.PostAsync(
-                $"api/EdiCustomerOrders/send-to-syteline?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}", null);
+                $"api/EdiCustomerOrders/send-to-syteline?customerOrderNumber={customerOrderNumber}", null);
             
             if (responseMessage.IsSuccessStatusCode)
             {
-                return new ResponseDto(1, customerOrderNumber, null, null);
+                return new ResponseDto(1, orderNumber, null, null);
             }
 
             string? errorMessage = null;
             IEnumerable<ErrorLogDto>? logs = await httpClient.GetFromJsonAsync<IEnumerable<ErrorLogDto>>(
-                $"api/ErrorLog/by-order-number/?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}");
+                $"api/ErrorLog/by-order-number/?customerOrderNumber={customerOrderNumber}");
 
             if (logs != null)
             {
                 errorMessage = string.Join("\r\n", logs.Select(x => x.ErrMsg));
             }
 
-            return new ResponseDto(0, customerOrderNumber, errorMessage, null);
+            return new ResponseDto(0, orderNumber, errorMessage, null);
         }
     }
 }
diff --git a/SytelineSaAppEfDataModel/Services/CustomerOrderService.cs b/SytelineSaAppEfDataModel/Services/CustomerOrderService.cs
index 0eeb3e3..6e8e786 100644
--- a/SytelineSaAppEfDataModel/Services/CustomerOrderService.cs
+++ b/SytelineSaAppEfDataModel/Services/CustomerOrderService.cs
@@ -16,21 +16,21 @@ namespace SytelineSaAppEfDataModel.Services
             return await context.CustomerOrders.Select(x => mapper.Map<CustomerOrderDto>(x)).ToListAsync();
         }
 
-        public async Task<CustomerOrderDto?> GetByOrderNumber(string orderNumber)
+        public async Task<CustomerOrderDto?> GetByOrderNumber(Guid orderNumber)
         {
             CustomerOrderDto? customerOrder = await context.CustomerOrders
-                .Where(x => x.CoNum == orderNumber)
+                .Where(x => x.RowPointer == orderNumber)
                 .Select(x => mapper.Map<CustomerOrderDto>(x)).FirstOrDefaultAsync();
             if (customerOrder == null) return null;
             
             customerOrder.CustomerOrderLines = await context.CustomerOrderLines
-                .Where(x => x.CoNum == orderNumber)
+                .Where(x => x.CoNum == customerOrder.CoNum)
                 .Select(x => mapper.Map<CustomerOrderLineDto>(x)).ToListAsync();
 
             foreach (CustomerOrderLineDto customerOrderLine in customerOrder.CustomerOrderLines)
             {
                 customerOrderLine.CustomerOrderLineItems = await context.CustomerOrderLineItems
-                    .Where(x => x.CoNum == orderNumber && x.CoLine == customerOrderLine.CoLine)
+                    .Where(x => x.CoNum == customerOrder.CoNum && x.CoLine == customerOrderLine.CoLine)
                     .Select(x => mapper.Map<CustomerOrderLineItemDto>(x)).ToListAsync();
             }
 
diff --git a/SytelineSaAppEfDataModel/Services/EdiCustomerOrderService.cs b/SytelineSaAppEfDataModel/Services/EdiCustomerOrderService.cs
index 307e8fa..251174b 100644
--- a/SytelineSaAppEfDataModel/Services/EdiCustomerOrderService.cs
+++ b/SytelineSaAppEfDataModel/Services/EdiCustomerOrderService.cs
@@ -36,10 +36,10 @@ namespace SytelineSaAppEfDataModel.Services
         {
             IList<EdiCustomerOrderDto?> customerOrders = new List<EdiCustomerOrderDto?>();
 
-            IList<string> orderNumbers = await context.EdiCustomerOrders.Where(x => x.CreateDate > date)
-                .Select(x => x.CustomerOrderNumber).ToListAsync();
+            IList<Guid> orderNumbers = await context.EdiCustomerOrders.Where(x => x.CreateDate > date)
+                .Select(x => x.RowPointer).ToListAsync();
 
-            foreach (string orderNumber in orderNumbers)
+            foreach (Guid orderNumber in orderNumbers)
             {
                 customerOrders.Add(await GetByOrderNumber(orderNumber));
             }
@@ -47,28 +47,28 @@ namespace SytelineSaAppEfDataModel.Services
             return customerOrders;
         }
 
-        public async Task<EdiCustomerOrderDto?> GetByOrderNumber(string customerOrderNumber)
+        public async Task<EdiCustomerOrderDto?> GetByOrderNumber(Guid customerOrderNumber)
         {
+            EdiCustomerOrderDto ediCustomerOrder = mapper.Map<EdiCustomerOrderDto>(
+                await context.EdiCustomerOrders.FirstOrDefaultAsync(x => x.RowPointer == customerOrderNumber));
+
+            if (ediCustomerOrder == null)
+            {
+                return null;
+            }
+            
             IList<EdiCustomerOrderLineDto> ediCustomerOrderLines = await context.EdiCustomerOrderLines
-                .Where(x => x.CustomerOrderNumber == customerOrderNumber)
+                .Where(x => x.CustomerOrderNumber == ediCustomerOrder.CustomerOrderNumber)
                 .Select(x => mapper.Map<EdiCustomerOrderLineDto>(x)).ToListAsync();
 
             foreach (EdiCustomerOrderLineDto ediCustomerOrderLine in ediCustomerOrderLines)
             {
                 ediCustomerOrderLine.EdiCustomerOrderLineItems = await context.EdiCustomerOrderLineItems
-                    .Where(x => x.CustomerOrderNumber == customerOrderNumber &&
+                    .Where(x => x.CustomerOrderNumber == ediCustomerOrder.CustomerOrderNumber &&
                                 x.CustomerOrderLine == ediCustomerOrderLine.CustomerOrderLine)
                     .Select(x => mapper.Map<EdiCustomerOrderLineItemDto>(x)).ToListAsync();
             }
 
-            EdiCustomerOrderDto ediCustomerOrder = mapper.Map<EdiCustomerOrderDto>(
-                await context.EdiCustomerOrders.FirstOrDefaultAsync(x => x.CustomerOrderNumber == customerOrderNumber));
-
-            if (ediCustomerOrder == null)
-            {
-                return null;
-            }
-
             IList<EdiCustomerOrderTranslateDto> ediCustomerOrderTranslates = await context.EdiCustomerOrderTranslates
                 .Where(x => x.EdiCoCoNum == ediCustomerOrder.CustomerOrderNumber)
                 .Select(x => mapper.Map<EdiCustomerOrderTranslateDto>(x)).ToListAsync();
diff --git a/SytelineSaAppEfDataModel/Services/ErrorLogService.cs b/SytelineSaAppEfDataModel/Services/ErrorLogService.cs
index fc218c4..3e53095 100644
--- a/SytelineSaAppEfDataModel/Services/ErrorLogService.cs
+++ b/SytelineSaAppEfDataModel/Services/ErrorLogService.cs
@@ -16,7 +16,7 @@ namespace SytelineSaAppEfDataModel.Services
             return await context.ErrorLogs.Select(x => mapper.Map<ErrorLogDto>(x)).ToListAsync();
         }
 
-        public async Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(string customerOrderNumber)
+        public async Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(Guid customerOrderNumber)
         {
             return await context.ErrorLogs.Where(x => x.TrxNum == customerOrderNumber)
                 .Select(x => mapper.Map<ErrorLogDto>(x)).ToListAsync();
diff --git a/SytelineSaAppEfDataModel/Services/ICustomerOrderService.cs b/SytelineSaAppEfDataModel/Services/ICustomerOrderService.cs
index 9c3b338..5db216a 100644
--- a/SytelineSaAppEfDataModel/Services/ICustomerOrderService.cs
+++ b/SytelineSaAppEfDataModel/Services/ICustomerOrderService.cs
@@ -10,6 +10,6 @@ namespace SytelineSaAppEfDataModel.Services
     public interface ICustomerOrderService
     {
         Task<IEnumerable<CustomerOrderDto>> GetAll();
-        Task<CustomerOrderDto?> GetByOrderNumber(string orderNumber);
+        Task<CustomerOrderDto?> GetByOrderNumber(Guid orderNumber);
     }
 }
diff --git a/SytelineSaAppEfDataModel/Services/IEdiCustomerOrderService.cs b/SytelineSaAppEfDataModel/Services/IEdiCustomerOrderService.cs
index 03f7574..0f5d2e9 100644
--- a/SytelineSaAppEfDataModel/Services/IEdiCustomerOrderService.cs
+++ b/SytelineSaAppEfDataModel/Services/IEdiCustomerOrderService.cs
@@ -11,7 +11,7 @@ namespace SytelineSaAppEfDataModel.Services
     {
         Task<IEnumerable<EdiCustomerOrderDto>> GetAll();
         Task<IEnumerable<EdiCustomerOrderDto?>> GetByDate(DateTime date);
-        Task<EdiCustomerOrderDto?> GetByOrderNumber(string orderNumber);
+        Task<EdiCustomerOrderDto?> GetByOrderNumber(Guid orderNumber);
         Task<int> SendOrderToSyteline(string customerOrderNumber);
     }
 }
diff --git a/SytelineSaAppEfDataModel/Services/IErrorLogService.cs b/SytelineSaAppEfDataModel/Services/IErrorLogService.cs
index c890052..2db2e1a 100644
--- a/SytelineSaAppEfDataModel/Services/IErrorLogService.cs
+++ b/SytelineSaAppEfDataModel/Services/IErrorLogService.cs
@@ -10,6 +10,6 @@ namespace SytelineSaAppEfDataModel.Services
     public interface IErrorLogService
     {
         Task<IEnumerable<ErrorLogDto>> GetAll();
-        Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(string customerOrderNumber);
+        Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(Guid customerOrderNumber);
     }
 }