diff --git a/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs b/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs index 6dd4aba..8956228 100644 --- a/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs +++ b/Hackney.Shared.HousingSearch/Domain/Asset/Contract.cs @@ -1,5 +1,4 @@ using Hackney.Shared.HousingSearch.Domain.Contract; -using Hackney.Shared.HousingSearch.Domain.Enums; using System; using System.Collections.Generic; @@ -15,7 +14,7 @@ public class Contract public DateTime? EndDate { get; set; } public string EndReason { get; set; } public bool? IsApproved { get; set; } - public ApprovalStatus ApprovalStatus { get; set; } + public string ApprovalStatus { get; set; } public string ApprovalStatusReason { get; set; } public bool? IsActive { get; set; } public IEnumerable Charges { get; set; } diff --git a/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs b/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs index f01b4a6..158dcf5 100644 --- a/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs +++ b/Hackney.Shared.HousingSearch/Domain/Contract/Contract.cs @@ -1,5 +1,4 @@ using Hackney.Shared.HousingSearch.Gateways.Models.Contract; -using Hackney.Shared.HousingSearch.Domain.Enums; using System; using System.Collections.Generic; @@ -15,7 +14,7 @@ public class Contract public DateTime? EndDate { get; set; } public string EndReason { get; set; } public bool? IsApproved { get; set; } - public ApprovalStatus ApprovalStatus { get; set; } + public string ApprovalStatus { get; set; } public string ApprovalStatusReason { get; set; } public bool? IsActive { get; set; } public IEnumerable Charges { get; set; } diff --git a/Hackney.Shared.HousingSearch/Domain/Enums/ApprovalStatus.cs b/Hackney.Shared.HousingSearch/Domain/Enums/ApprovalStatus.cs deleted file mode 100644 index 0bac0c1..0000000 --- a/Hackney.Shared.HousingSearch/Domain/Enums/ApprovalStatus.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Hackney.Shared.HousingSearch.Domain.Enums -{ - [JsonConverter(typeof(JsonStringEnumConverter))] - public enum ApprovalStatus - { - PendingApproval, - Approved, - PendingReapproval - } -} \ No newline at end of file diff --git a/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs b/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs index 5038960..fab35f9 100644 --- a/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs +++ b/Hackney.Shared.HousingSearch/Gateways/Models/Assets/QueryableAssetContract.cs @@ -1,6 +1,5 @@ using System; using Hackney.Shared.HousingSearch.Gateways.Models.Contract; -using Hackney.Shared.HousingSearch.Domain.Enums; using Nest; using System.Collections.Generic; @@ -17,7 +16,7 @@ public class QueryableAssetContract public DateTime? EndDate { get; set; } public string EndReason { get; set; } public bool? IsApproved { get; set; } - public ApprovalStatus ApprovalStatus { get; set; } + public string ApprovalStatus { get; set; } public string ApprovalStatusReason { get; set; } public bool? IsActive { get; set; } public IEnumerable Charges { get; set; }