* Extended of Dtos
* Added new Services and Controllers
This commit is contained in:
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper.Configuration.Annotations;
|
||||
|
||||
namespace SytelineSaAppEfDataModel.Dtos
|
||||
{
|
||||
@@ -105,6 +106,8 @@ namespace SytelineSaAppEfDataModel.Dtos
|
||||
public string TranslatedStatus => TranslateStatus(Status ?? string.Empty);
|
||||
public string? SlOrderNumber => EdiCustomerOrderTranslates.MaxBy(x => x.CreatedDate)?.CoCoNum;
|
||||
public string SentToSl => Posted == 1 ? "TAK" : "NIE";
|
||||
[Ignore] public int ScheduleOrderId { get; set; }
|
||||
[Ignore] public DateTime LastUpdateDate { get; set; }
|
||||
|
||||
public IEnumerable<EdiCustomerOrderLineDto> EdiCustomerOrderLines { get; set; } = new List<EdiCustomerOrderLineDto>();
|
||||
public IEnumerable<EdiCustomerOrderTranslateDto> EdiCustomerOrderTranslates { get; set; } = new List<EdiCustomerOrderTranslateDto>();
|
||||
|
||||
11
SytelineSaAppEfDataModel/Dtos/EdiLogDto.cs
Normal file
11
SytelineSaAppEfDataModel/Dtos/EdiLogDto.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
namespace SytelineSaAppEfDataModel.Dtos;
|
||||
|
||||
public class EdiLogDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string ProcessName { get; set; }
|
||||
public string ConfigurationName { get; set; }
|
||||
public int Status { get; set; }
|
||||
public string LogText { get; set; }
|
||||
public DateTime Date { get; set; }
|
||||
}
|
||||
11
SytelineSaAppEfDataModel/Entities/EdiLog.cs
Normal file
11
SytelineSaAppEfDataModel/Entities/EdiLog.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
namespace SytelineSaAppEfDataModel.Entities;
|
||||
|
||||
public class EdiLog
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string ProcessName { get; set; }
|
||||
public string ConfigurationName { get; set; }
|
||||
public int Status { get; set; }
|
||||
public string LogText { get; set; }
|
||||
public DateTime Date { get; set; }
|
||||
}
|
||||
@@ -31,6 +31,7 @@ namespace SytelineSaAppEfDataModel
|
||||
CreateMap<Item, ItemDto>().ReverseMap();
|
||||
CreateMap<VatCodeAssociation, VatCodeAssociationDto>().ReverseMap();
|
||||
CreateMap<ItemCustPriceAll, ItemCustPriceAllDto>().ReverseMap();
|
||||
CreateMap<EdiLog, EdiLogDto>().ReverseMap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
using AutoMapper;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SytelineSaAppEfDataModel.Dtos;
|
||||
using SytelineSaAppEfDataModel.Entities;
|
||||
|
||||
namespace SytelineSaAppEfDataModel.Services;
|
||||
|
||||
@@ -10,4 +12,18 @@ public class EdiCustomerOrderImportService(SytelineSaAppDbContext context, IMapp
|
||||
return (await context.EdiCustomerOrderImports.OrderByDescending(x => x.LastUpdateDate)
|
||||
.FirstOrDefaultAsync())?.LastUpdateDate ?? DateTime.Now.Date;
|
||||
}
|
||||
|
||||
public async Task<bool> AddEdiCustomerOrderImport(EdiCustomerOrderImportDto ediCustomerOrderImport)
|
||||
{
|
||||
var entity = mapper.Map<EdiCustomerOrderImport>(ediCustomerOrderImport);
|
||||
await context.EdiCustomerOrderImports.AddAsync(entity);
|
||||
return await context.SaveChangesAsync() > 0;
|
||||
}
|
||||
|
||||
public async Task<bool> AddEdiCustomerOrderImports(IList<EdiCustomerOrderImportDto> ediCustomerOrderImports)
|
||||
{
|
||||
var entities = mapper.Map<List<EdiCustomerOrderImport>>(ediCustomerOrderImports);
|
||||
context.EdiCustomerOrderImports.AddRange(entities);
|
||||
return await context.SaveChangesAsync() > 0;
|
||||
}
|
||||
}
|
||||
@@ -149,13 +149,16 @@ namespace SytelineSaAppEfDataModel.Services
|
||||
|
||||
try
|
||||
{
|
||||
await context.EdiCustomerOrders.AddRangeAsync(ediCustomerOrders.Select(mapper.Map<EdiCustomerOrder>));
|
||||
await context.EdiCustomerOrderLines.AddRangeAsync(ediCustomerOrders
|
||||
.SelectMany(x => x.EdiCustomerOrderLines)
|
||||
.Select(mapper.Map<EdiCustomerOrderLine>));
|
||||
await context.EdiCustomerOrderLineItems.AddRangeAsync(ediCustomerOrders
|
||||
.SelectMany(x => x.EdiCustomerOrderLines)
|
||||
.SelectMany(y => y.EdiCustomerOrderLineItems).Select(mapper.Map<EdiCustomerOrderLineItem>));
|
||||
IList<EdiCustomerOrder> customerOrders = ediCustomerOrders.Select(mapper.Map<EdiCustomerOrder>).ToList();
|
||||
IList<EdiCustomerOrderLine> ediCustomerOrderLines = ediCustomerOrders
|
||||
.SelectMany(x => x.EdiCustomerOrderLines).Select(mapper.Map<EdiCustomerOrderLine>).ToList();
|
||||
IList<EdiCustomerOrderLineItem> ediCustomerOrderLineItems = ediCustomerOrders
|
||||
.SelectMany(x => x.EdiCustomerOrderLines).SelectMany(y => y.EdiCustomerOrderLineItems)
|
||||
.Select(mapper.Map<EdiCustomerOrderLineItem>).ToList();
|
||||
|
||||
await context.EdiCustomerOrders.AddRangeAsync(customerOrders);
|
||||
await context.EdiCustomerOrderLines.AddRangeAsync(ediCustomerOrderLines);
|
||||
await context.EdiCustomerOrderLineItems.AddRangeAsync(ediCustomerOrderLineItems);
|
||||
await context.EdiCustomerOrderTranslates.AddRangeAsync(ediCustomerOrders
|
||||
.SelectMany(x => x.EdiCustomerOrderTranslates)
|
||||
.Select(mapper.Map<EdiCustomerOrderTranslate>));
|
||||
|
||||
15
SytelineSaAppEfDataModel/Services/EdiLogService.cs
Normal file
15
SytelineSaAppEfDataModel/Services/EdiLogService.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
using AutoMapper;
|
||||
using SytelineSaAppEfDataModel.Dtos;
|
||||
using SytelineSaAppEfDataModel.Entities;
|
||||
|
||||
namespace SytelineSaAppEfDataModel.Services;
|
||||
|
||||
public class EdiLogService(SytelineSaAppDbContext context, IMapper mapper) : IEdiLogService
|
||||
{
|
||||
public async Task<bool> AddEdiLog(EdiLogDto ediLog)
|
||||
{
|
||||
var entity = mapper.Map<EdiLog>(ediLog);
|
||||
await context.EdiLogs.AddAsync(entity);
|
||||
return await context.SaveChangesAsync() > 0;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,10 @@
|
||||
using SytelineSaAppEfDataModel.Dtos;
|
||||
|
||||
namespace SytelineSaAppEfDataModel.Services;
|
||||
|
||||
public interface IEdiCustomerOrderImportService
|
||||
{
|
||||
Task<DateTime> GetLastUpdateDate();
|
||||
Task<bool> AddEdiCustomerOrderImport(EdiCustomerOrderImportDto ediCustomerOrderImport);
|
||||
Task<bool> AddEdiCustomerOrderImports(IList<EdiCustomerOrderImportDto> ediCustomerOrderImports);
|
||||
}
|
||||
8
SytelineSaAppEfDataModel/Services/IEdiLogService.cs
Normal file
8
SytelineSaAppEfDataModel/Services/IEdiLogService.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
using SytelineSaAppEfDataModel.Dtos;
|
||||
|
||||
namespace SytelineSaAppEfDataModel.Services;
|
||||
|
||||
public interface IEdiLogService
|
||||
{
|
||||
Task<bool> AddEdiLog(EdiLogDto ediLog);
|
||||
}
|
||||
@@ -30,6 +30,7 @@ namespace SytelineSaAppEfDataModel
|
||||
public DbSet<Item> Items { get; set; }
|
||||
public DbSet<VatCodeAssociation> VatCodeAssociations { get; set; }
|
||||
public DbSet<ItemCustPriceAll> ItemCustPriceAlls { get; set; }
|
||||
public DbSet<EdiLog> EdiLogs { get; set; }
|
||||
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
|
||||
{
|
||||
@@ -2468,6 +2469,43 @@ namespace SytelineSaAppEfDataModel
|
||||
.HasDatabaseName("IX_itemcustprice_all_RowPointer")
|
||||
.IsUnique();
|
||||
});
|
||||
|
||||
modelBuilder.Entity<EdiLog>(entity =>
|
||||
{
|
||||
entity.ToTable("edi_logs");
|
||||
|
||||
entity.HasKey(e => e.Id);
|
||||
|
||||
entity.Property(e => e.Id)
|
||||
.HasColumnName("Id")
|
||||
.HasColumnType("int")
|
||||
.IsRequired();
|
||||
|
||||
entity.Property(e => e.ProcessName)
|
||||
.HasColumnName("ProcessName")
|
||||
.HasMaxLength(200)
|
||||
.IsRequired();
|
||||
|
||||
entity.Property(e => e.ConfigurationName)
|
||||
.HasColumnName("ConfigurationName")
|
||||
.HasMaxLength(200)
|
||||
.IsRequired();
|
||||
|
||||
entity.Property(e => e.Status)
|
||||
.HasColumnName("Status")
|
||||
.HasColumnType("int")
|
||||
.IsRequired();
|
||||
|
||||
entity.Property(e => e.LogText)
|
||||
.HasColumnName("LogText")
|
||||
.HasColumnType("varchar(max)")
|
||||
.IsRequired();
|
||||
|
||||
entity.Property(e => e.Date)
|
||||
.HasColumnName("Date")
|
||||
.HasColumnType("datetime")
|
||||
.IsRequired();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user