diff --git a/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs b/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs index 4040346..632b760 100644 --- a/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs +++ b/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs @@ -59,6 +59,8 @@ public void CanConvertQueryableAssetContractEntityToDomain() domainContract.TargetType.Should().Be(queryableAssetContract.TargetType); domainContract.StartDate.Should().Be(queryableAssetContract.StartDate); domainContract.ApprovalDate.Should().Be(queryableAssetContract.ApprovalDate); + domainContract.EndDate.Should().Be(queryableAssetContract.EndDate); + domainContract.EndReason.Should().Be(queryableAssetContract.EndReason); domainContract.IsApproved.Should().Be(queryableAssetContract.IsApproved); domainContract.ApprovalStatus.Should().Be(queryableAssetContract.ApprovalStatus); domainContract.ApprovalStatusReason.Should().Be(queryableAssetContract.ApprovalStatusReason); diff --git a/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs b/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs index 9030096..6dd4aba 100644 --- a/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs +++ b/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs @@ -12,6 +12,8 @@ public class Contract public string TargetType { get; set; } public DateTime? StartDate { get; set; } public DateTime? ApprovalDate { get; set; } + public DateTime? EndDate { get; set; } + public string EndReason { get; set; } public bool? IsApproved { get; set; } public ApprovalStatus ApprovalStatus { get; set; } public string ApprovalStatusReason { get; set; } diff --git a/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs b/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs index ecdfd16..f01b4a6 100644 --- a/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs +++ b/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs @@ -12,6 +12,8 @@ public class Contract public string TargetType { get; set; } public DateTime? StartDate { get; set; } public DateTime? ApprovalDate { get; set; } + public DateTime? EndDate { get; set; } + public string EndReason { get; set; } public bool? IsApproved { get; set; } public ApprovalStatus ApprovalStatus { get; set; } public string ApprovalStatusReason { get; set; } diff --git a/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs b/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs index 25f2ad0..fb69950 100644 --- a/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs +++ b/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs @@ -90,6 +90,8 @@ public static Domain.Asset.Contract ToDomain(this QueryableAssetContract entity) TargetId = entity.TargetId, TargetType = entity.TargetType, StartDate = entity.StartDate, + EndDate = entity.EndDate, + EndReason = entity.EndReason, ApprovalDate = entity.ApprovalDate, IsApproved = entity.IsApproved, ApprovalStatus = entity.ApprovalStatus, diff --git a/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs b/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs index 61a27e3..5038960 100644 --- a/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs +++ b/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs @@ -14,6 +14,8 @@ public class QueryableAssetContract public string TargetType { get; set; } public DateTime? StartDate { get; set; } public DateTime? ApprovalDate { get; set; } + public DateTime? EndDate { get; set; } + public string EndReason { get; set; } public bool? IsApproved { get; set; } public ApprovalStatus ApprovalStatus { get; set; } public string ApprovalStatusReason { get; set; }