Skip to content

Update reporting ID properties and mappings for contracts #816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Mar 13, 2026
Merged

Update reporting ID properties and mappings for contracts #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0c59d
Update reporting ID properties and mappings for contracts
StuartFerguson Mar 13, 2026
0ec5371
Merge branch 'main' into copilot/fix-transaction-detail-report
StuartFerguson Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions EstateManagementUI.BlazorServer/Factories/ModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ public static List<ContractProductModel> ConvertFrom(List<BusinessLogic.Models.C
public static ContractProductModel ConvertFrom(BusinessLogic.Models.ContractModels.ContractProductModel model) {
var result = new ContractProductModel() {
ContractProductId = model.ContractProductId,
ContractProductReportingId = model.ContractProductReportingId,
ProductName = model.ProductName,
DisplayText = model.DisplayText,
Value = model.Value,
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/UIServices/ContractUIService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public ContractUIService(IMediator mediator) {

public async Task<Result<List<ContractModels.ContractModel>>> GetContracts(CorrelationId correlationId,
Guid estateId) {
var result = await this.Mediator.Send(new ContractQueries.GetContractsQuery(correlationId, estateId));
Result<List<BusinessLogic.Models.ContractModels.ContractModel>> result = await this.Mediator.Send(new ContractQueries.GetContractsQuery(correlationId, estateId));
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
var contracts = ModelFactory.ConvertFrom(result.Data);
Expand Down
4 changes: 2 additions & 2 deletions EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProduct.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 2 additions & 0 deletions ...ManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/ContractProductTransactionFee.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
2 changes: 1 addition & 1 deletion EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ContractModels.ContractProductTransactionFeeModel>()
};
Expand Down
Loading