diff --git a/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs b/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs index d88e36b9..42f6ca0a 100644 --- a/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs +++ b/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs @@ -128,6 +128,7 @@ public static List ConvertFrom(List>> GetContracts(CorrelationId correlationId, Guid estateId) { - var result = await this.Mediator.Send(new ContractQueries.GetContractsQuery(correlationId, estateId)); + Result> result = await this.Mediator.Send(new ContractQueries.GetContractsQuery(correlationId, estateId)); if (result.IsFailed) return ResultHelpers.CreateFailure(result); var contracts = ModelFactory.ConvertFrom(result.Data); diff --git a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProduct.cs b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProduct.cs index 00ac847b..67bcede7 100644 --- a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProduct.cs +++ b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProduct.cs @@ -8,8 +8,8 @@ public class ContractProduct public Guid ContractId { get; set; } [JsonProperty("product_id")] public Guid ProductId { get; set; } - [JsonProperty("product_reporting_id")] - public Int32 ProductReportingId { get; set; } + [JsonProperty("contract_product_reporting_id")] + public Int32 ContractProductReportingId { get; set; } [JsonProperty("product_name")] public String ProductName { get; set; } [JsonProperty("display_text")] diff --git a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProductTransactionFee.cs b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProductTransactionFee.cs index c171f029..48654aea 100644 --- a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProductTransactionFee.cs +++ b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProductTransactionFee.cs @@ -14,4 +14,6 @@ public class ContractProductTransactionFee public Int32 FeeType { get; set; } [JsonProperty("value")] public Decimal Value { get; set; } + [JsonProperty("contract_product_transaction_fee_reporting_id")] + public Int32 ContractProductTransactionFeeReportingId { get; set; } } \ No newline at end of file diff --git a/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs b/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs index 9a6b3b2d..5e879acd 100644 --- a/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs +++ b/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs @@ -500,7 +500,7 @@ public static ContractModels.ContractModel ToContract(this Contract apiResultDat DisplayText = contractProduct.DisplayText, ProductName = contractProduct.ProductName, ContractProductId = contractProduct.ProductId, - ContractProductReportingId = contractProduct.ProductReportingId, + ContractProductReportingId = contractProduct.ContractProductReportingId, NumberOfFees = contractProduct.TransactionFees.Count, TransactionFees = new List() };