From 741a67224285b75451d420552ae37b72072b7e5a Mon Sep 17 00:00:00 2001 From: Marta Pederiva <86296201+martapederiva@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:46:26 +0100 Subject: [PATCH 1/2] Add end contract data --- .../Factories/DomainFactoryTests.cs | 2 ++ Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs | 2 ++ Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs | 2 ++ Hackney.Shared.HousingSearch/Factories/DomainFactory.cs | 2 ++ .../Gateways/Models/Assets/QueryableAssetContract.cs | 2 ++ 5 files changed, 10 insertions(+) diff --git a/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs b/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs index 4040346..8887e61 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..3a5c060 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..8514c0a 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..df18147 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; } From c147c21dbadd861b5f2e13f97627000d1044906f Mon Sep 17 00:00:00 2001 From: Marta Pederiva <86296201+martapederiva@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:05:49 +0100 Subject: [PATCH 2/2] Add end contract data --- .../Factories/DomainFactoryTests.cs | 4 ++-- Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs | 2 +- Hackney.Shared.HousingSearch/Factories/DomainFactory.cs | 2 +- .../Gateways/Models/Assets/QueryableAssetContract.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs b/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs index 8887e61..632b760 100644 --- a/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs +++ b/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs @@ -59,8 +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.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/Contract/Contract.cs b/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs index 3a5c060..f01b4a6 100644 --- a/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs +++ b/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs @@ -13,7 +13,7 @@ public class Contract public DateTime? StartDate { get; set; } public DateTime? ApprovalDate { get; set; } public DateTime? EndDate { get; set; } - public string EndReason { 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 8514c0a..fb69950 100644 --- a/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs +++ b/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs @@ -91,7 +91,7 @@ public static Domain.Asset.Contract ToDomain(this QueryableAssetContract entity) TargetType = entity.TargetType, StartDate = entity.StartDate, EndDate = entity.EndDate, - EndReason= entity.EndReason, + 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 df18147..5038960 100644 --- a/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs +++ b/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs @@ -15,7 +15,7 @@ public class QueryableAssetContract public DateTime? StartDate { get; set; } public DateTime? ApprovalDate { get; set; } public DateTime? EndDate { get; set; } - public string EndReason { get; set; } + public string EndReason { get; set; } public bool? IsApproved { get; set; } public ApprovalStatus ApprovalStatus { get; set; } public string ApprovalStatusReason { get; set; }