Add ApprovalStatus to Contract and AssetContract

LBHackney-IT · Sep 6, 2024 · 20b0523 · 20b0523
1 parent 7a2e381
commit 20b0523
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 0 deletions.
diff --git a/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs b/Hackney.Shared.HousingSearch.Tests/Factories/DomainFactoryTests.cs
@@ -60,6 +60,7 @@ public void CanConvertQueryableAssetContractEntityToDomain()
             domainContract.StartDate.Should().Be(queryableAssetContract.StartDate);
             domainContract.ApprovalDate.Should().Be(queryableAssetContract.ApprovalDate);
             domainContract.IsApproved.Should().Be(queryableAssetContract.IsApproved);
+            domainContract.ApprovalStatus.Should().Be(queryableAssetContract.ApprovalStatus);
             domainContract.IsActive.Should().Be(queryableAssetContract.IsActive);
             domainContract.Charges.Should().BeEquivalentTo(queryableAssetContract.Charges);
             domainContract.RelatedPeople.Should().BeEquivalentTo(queryableAssetContract.RelatedPeople);

diff --git a/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs b/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs
@@ -1,4 +1,5 @@
 using Hackney.Shared.HousingSearch.Domain.Contract;
+using Hackney.Shared.HousingSearch.Domain.Enums;
 using System;
 using System.Collections.Generic;
 
@@ -12,6 +13,7 @@ public class Contract
         public DateTime? StartDate { get; set; }
         public DateTime? ApprovalDate { get; set; }
         public bool? IsApproved { get; set; }
+        public ApprovalStatus ApprovalStatus { get; set; }
         public bool? IsActive { get; set; }
         public IEnumerable<Charges> Charges { get; set; }
         public IEnumerable<RelatedPeople> RelatedPeople { get; set; }

diff --git a/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs b/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs
@@ -1,4 +1,5 @@
 using Hackney.Shared.HousingSearch.Gateways.Models.Contract;
+using Hackney.Shared.HousingSearch.Domain.Enums;
 using System;
 using System.Collections.Generic;
 
@@ -12,6 +13,7 @@ public class Contract
         public DateTime? StartDate { get; set; }
         public DateTime? ApprovalDate { get; set; }
         public bool? IsApproved { get; set; }
+        public ApprovalStatus ApprovalStatus { get; set; }
         public bool? IsActive { get; set; }
         public IEnumerable<QueryableCharges> Charges { get; set; }
         public IEnumerable<QueryableRelatedPeople> RelatedPeople { get; set; }

diff --git a/Hackney.Shared.HousingSearch/Domain/Enums/ApprovalStatus.cs b/Hackney.Shared.HousingSearch/Domain/Enums/ApprovalStatus.cs
@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Hackney.Shared.HousingSearch.Domain.Enums
+{
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public enum ApprovalStatus
+    {
+        PendingApproval,
+        Approved,
+        PendingReapproval
+    }
+}
diff --git a/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs b/Hackney.Shared.HousingSearch/Factories/DomainFactory.cs
@@ -92,6 +92,7 @@ public static Domain.Asset.Contract ToDomain(this QueryableAssetContract entity)
                 StartDate = entity.StartDate,
                 ApprovalDate = entity.ApprovalDate,
                 IsApproved = entity.IsApproved,
+                ApprovalStatus = entity.ApprovalStatus,
                 IsActive = entity.IsActive,
                 Charges = entity.Charges?.ToDomain(),
                 RelatedPeople = entity.RelatedPeople?.ToDomain(),

diff --git a/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs b/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs
@@ -1,5 +1,6 @@
 using System;
 using Hackney.Shared.HousingSearch.Gateways.Models.Contract;
+using Hackney.Shared.HousingSearch.Domain.Enums;
 using Nest;
 using System.Collections.Generic;
 
@@ -14,6 +15,7 @@ public class QueryableAssetContract
         public DateTime? StartDate { get; set; }
         public DateTime? ApprovalDate { get; set; }
         public bool? IsApproved { get; set; }
+        public ApprovalStatus ApprovalStatus { get; set; }
         public bool? IsActive { get; set; }
         public IEnumerable<QueryableCharges> Charges { get; set; }
         public IEnumerable<QueryableRelatedPeople> RelatedPeople { get; set; }