diff --git a/FruitBank.Common/Entities/Partner.cs b/FruitBank.Common/Entities/Partner.cs index 5941e1a..ccc6f6e 100644 --- a/FruitBank.Common/Entities/Partner.cs +++ b/FruitBank.Common/Entities/Partner.cs @@ -9,6 +9,9 @@ namespace FruitBank.Common.Entities; public class Partner : MgEntityBase, IPartner { public string Name { get; set; } + public string TaxId { get; set; } + public string CertificationNumber { get; set; } + public string PostalCode { get; set; } public string Country { get; set; } public string State { get; set; } diff --git a/FruitBank.Common/Entities/Shipping.cs b/FruitBank.Common/Entities/Shipping.cs index 4458883..c15aa77 100644 --- a/FruitBank.Common/Entities/Shipping.cs +++ b/FruitBank.Common/Entities/Shipping.cs @@ -8,7 +8,6 @@ namespace FruitBank.Common.Entities; [System.ComponentModel.DataAnnotations.Schema.Table(FruitBankConstClient.ShippingDbTableName)] public class Shipping : MgEntityBase, IShipping { - public int PartnerId { get; set; } public DateTime ShippingDate { get; set; } public string LicencePlate { get; set; } public bool IsAllMeasured { get; set; } diff --git a/FruitBank.Common/Entities/ShippingDocument.cs b/FruitBank.Common/Entities/ShippingDocument.cs index 2e2d244..bf98e52 100644 --- a/FruitBank.Common/Entities/ShippingDocument.cs +++ b/FruitBank.Common/Entities/ShippingDocument.cs @@ -9,9 +9,13 @@ namespace FruitBank.Common.Entities; public class ShippingDocument : MgEntityBase, IShippingDocument { public int PartnerId { get; set; } - public int ShippingId { get; set; } + public int? ShippingId { get; set; } + + public string DocumentIdNumber { get; set; } public DateTime ShippingDate { get; set; } public string Country { get; set; } + public int TotalPallets { get; set; } + public bool IsAllMeasured { get; set; } [Association(ThisKey = nameof(ShippingId), OtherKey = nameof(Shipping.Id), CanBeNull = true)] diff --git a/FruitBank.Common/Entities/ShippingItem.cs b/FruitBank.Common/Entities/ShippingItem.cs index d35894d..f62073c 100644 --- a/FruitBank.Common/Entities/ShippingItem.cs +++ b/FruitBank.Common/Entities/ShippingItem.cs @@ -22,6 +22,9 @@ public class ShippingItem : MgEntityBase, IShippingItem public int ShippingDocumentId { get; set; } public string Name { get; set; } + public string PalletSize { get; set; } + public int PalletsOnDocument { get; set; } + public int QuantityOnDocument { get; set; } [Column(DataType = DataType.DecFloat)] public double NetWeightOnDocument { get; set; } diff --git a/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs b/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs index 2b70232..1792cda 100644 --- a/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs +++ b/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs @@ -10,7 +10,6 @@ namespace FruitBank.Common.Interfaces; public interface IFruitBankDataControllerCommon { public Task?> GetMeasuringModels(); - public Task GetMeasuringModelByShippingId(int shippingId); #region Partner public Task?> GetPartners(); diff --git a/FruitBank.Common/Interfaces/IPartner.cs b/FruitBank.Common/Interfaces/IPartner.cs index e8d899f..2c81851 100644 --- a/FruitBank.Common/Interfaces/IPartner.cs +++ b/FruitBank.Common/Interfaces/IPartner.cs @@ -6,6 +6,8 @@ namespace FruitBank.Common.Interfaces; public interface IPartner : IEntityInt, ITimeStampInfo { string Name { get; set; } + string TaxId { get; set; } + string CertificationNumber { get; set; } string PostalCode { get; set; } string Country { get; set; } string State { get; set; } diff --git a/FruitBank.Common/Interfaces/IShipping.cs b/FruitBank.Common/Interfaces/IShipping.cs index 0e9ed03..1448be9 100644 --- a/FruitBank.Common/Interfaces/IShipping.cs +++ b/FruitBank.Common/Interfaces/IShipping.cs @@ -6,7 +6,6 @@ namespace FruitBank.Common.Interfaces; public interface IShipping : IEntityInt, ITimeStampInfo { - int PartnerId { get; set; } DateTime ShippingDate { get; set; } string LicencePlate { get; set; } bool IsAllMeasured { get; set; } diff --git a/FruitBank.Common/Interfaces/IShippingDocument.cs b/FruitBank.Common/Interfaces/IShippingDocument.cs index 9d39cb5..01cefa3 100644 --- a/FruitBank.Common/Interfaces/IShippingDocument.cs +++ b/FruitBank.Common/Interfaces/IShippingDocument.cs @@ -7,12 +7,37 @@ namespace FruitBank.Common.Interfaces; public interface IShippingDocument: IEntityInt, ITimeStampInfo { public int PartnerId { get; set; } - public int ShippingId { get; set; } + public int? ShippingId { get; set; } + + public string DocumentIdNumber { get; set; } + public DateTime ShippingDate { get; set; } public string Country { get; set; } + + int TotalPallets { get; set; } + public bool IsAllMeasured { get; set; } public Partner? Partner { get; set; } public Shipping? Shipping{ get; set; } public List? ShippingItems { get; set; } -} \ No newline at end of file +} + + +//Shipping: +//PartnerId kivesz a db-ből +//string adószám taxId +//string CertificationNumber + +//ShippingDocument: +//nullable ShippingId +//string DocumentIdNumber +//string PalletSize + +//ShippingItem: +//int PalletNumberOnDocument +//string CertificationNumber + +//Files: +//string ForeignTable +//string ForeignKey \ No newline at end of file diff --git a/FruitBank.Common/Interfaces/IShippingItem.cs b/FruitBank.Common/Interfaces/IShippingItem.cs index 5b44761..f7f1e35 100644 --- a/FruitBank.Common/Interfaces/IShippingItem.cs +++ b/FruitBank.Common/Interfaces/IShippingItem.cs @@ -11,6 +11,10 @@ public interface IShippingItem : IEntityInt, ITimeStampInfo int? ProductId { get; set; } string Name { get; set; } + + string PalletSize { get; set; } + int PalletsOnDocument { get; set; } + int QuantityOnDocument { get; set; } double NetWeightOnDocument { get; set; } double GrossWeightOnDocument { get; set; } diff --git a/FruitBank.Common/SignalRs/SignalRTags.cs b/FruitBank.Common/SignalRs/SignalRTags.cs index 64827de..8d9bc69 100644 --- a/FruitBank.Common/SignalRs/SignalRTags.cs +++ b/FruitBank.Common/SignalRs/SignalRTags.cs @@ -7,7 +7,6 @@ public class SignalRTags : AcSignalRTags public const int GetSiteViewModelByUserId = int.MaxValue; public const int GetMeasuringModels = 10; - public const int GetMeasuringModelByShippingId = 11; public const int GetPartners = 20; public const int GetPartnerById = 21; diff --git a/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs b/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs index 73c63c9..0b0f286 100644 --- a/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs +++ b/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs @@ -66,18 +66,20 @@ namespace FruitBankHybrid.Shared.Tests var newName = GetFixtureName(partner.Name); partner.Name = newName; - await _signalRClient.UpdatePartner(partner); + partner = await _signalRClient.UpdatePartner(partner); - partner = await GetPartnerByIdTest(partnerId); + Assert.IsNotNull(partner); Assert.IsTrue(partner.Name == newName); partner.Name = GetOriginalName(partner.Name); - await _signalRClient.UpdatePartner(partner); + partner = await _signalRClient.UpdatePartner(partner); + + Assert.IsNotNull(partner); + Assert.IsTrue(partner.Id == partnerId); } #endregion Partner #region Shipping - [TestMethod] public async Task GetShippingsTest() { @@ -124,10 +126,14 @@ namespace FruitBankHybrid.Shared.Tests await _signalRClient.UpdateShipping(shipping); shipping = await GetShippingByIdTest(shippingId); + + Assert.IsTrue(shipping.Id == shippingId); Assert.IsTrue(shipping.LicencePlate == newLicencePlate); shipping.LicencePlate = GetOriginalName(shipping.LicencePlate); await _signalRClient.UpdateShipping(shipping); + + Assert.IsTrue(shipping.Id == shippingId); } #endregion Shipping diff --git a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs index 58eef2c..ac86254 100644 --- a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs +++ b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs @@ -22,16 +22,6 @@ namespace FruitBankHybrid.Shared.Services.SignalRs ConstHelper.NameByValue(0); } - public Task GetMeasuringModelByShippingId(int shippingId) - => GetByIdAsync(SignalRTags.GetMeasuringModelByShippingId, shippingId); - - //public Task GetWelcomeMessageAsync(string message, Action? callback = null) - //{ - // Logger.Detail($"GetWelcomeMessageAsync client called; message: {message}"); - - // return GetAllAsync(SignalRTags.GetAllTransferDestinations, callback); - //} - public Task?> GetMeasuringModels() => GetAllAsync>(SignalRTags.GetMeasuringModels);