FA/FA_WEB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Changed string parameters to GUID

Browse Source
This commit is contained in:
Piotr Kus
2025-02-01 07:14:29 +01:00
parent f996b668c2
commit 98777328d7
17 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FA_WEB.sln
View File

@@ -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

2
FaKrosnoApi/Controllers/CustomerOrdersController.cs
View File

@@ -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();

2
FaKrosnoApi/Controllers/EdiCustomerOrdersController.cs
View File

@@ -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();

2
FaKrosnoApi/Controllers/ErrorLogController.cs
View File

@@ -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();

2
FaKrosnoEfDataModelTests/Service.cs
View File

@@ -51,7 +51,7 @@ namespace FaKrosnoEfDataModelTests
//var sendOrderToSyteline = serviceBase1.SendOrderToSyteline("EDI0004475");
var byOrderNumber = serviceBase2.GetByOrderNumber("EDI0004490");
//var byOrderNumber = serviceBase2.GetByOrderNumber("EDI0004490");
}
}
}

5
OrdersManagement/Components/Pages/CustomerOrder.razor
View File

@@ -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; }
}

2
OrdersManagement/Components/Pages/CustomerOrders.razor
View File

@@ -72,7 +72,7 @@
private void OnRowDoubleClick(GridRowEventArgs<CustomerOrderDto> obj)
{
string customerOrderId = obj.Item.CoNum;
Guid customerOrderId = obj.Item.RowPointer;
NavigationManager.NavigateTo($"/CustomerOrder/{customerOrderId}");
}

4
OrdersManagement/Components/Pages/EdiCustomerOrder.razor
View File

@@ -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 = [];

4
OrdersManagement/Components/Pages/EdiCustomerOrders.razor
View File

@@ -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)
{

4
OrdersManagement/Services/CustomerOrderService.cs
View File

@@ -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}");
}
}

14
OrdersManagement/Services/EdiCustomerOrderService.cs
View File

@@ -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);
}
}
}

8
SytelineSaAppEfDataModel/Services/CustomerOrderService.cs
View File

@@ -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();
}

28
SytelineSaAppEfDataModel/Services/EdiCustomerOrderService.cs
View File

@@ -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();

2
SytelineSaAppEfDataModel/Services/ErrorLogService.cs
View File

@@ -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();

2
SytelineSaAppEfDataModel/Services/ICustomerOrderService.cs
View File

@@ -10,6 +10,6 @@ namespace SytelineSaAppEfDataModel.Services
public interface ICustomerOrderService
{
Task<IEnumerable<CustomerOrderDto>> GetAll();
Task<CustomerOrderDto?> GetByOrderNumber(string orderNumber);
Task<CustomerOrderDto?> GetByOrderNumber(Guid orderNumber);
}
}

2
SytelineSaAppEfDataModel/Services/IEdiCustomerOrderService.cs
View File

@@ -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);
}
}

2
SytelineSaAppEfDataModel/Services/IErrorLogService.cs
View File

@@ -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);
}
}