From 1f00e785fa4d34d9a2dcd08dedb9d3fa39e90964 Mon Sep 17 00:00:00 2001 From: Mitchell Currey Date: Tue, 23 Jul 2024 09:36:53 +0100 Subject: [PATCH 1/3] Expand Datum inputs for Rent Free and Reviews --- .../v1/Dto/Model/Datum/Input/DatumSettingsDto.cs | 8 ++++++++ .../v1/Dto/Model/Datum/Input/ModelDatumInputDto.cs | 6 ++++-- .../Dto/Model/Datum/Input/Space/DatumSpaceDto.cs | 1 + .../Model/Datum/Input/Space/Lease/DatumLeaseDto.cs | 5 +++++ .../Datum/Input/Space/Lease/DatumRentFreeDto.cs | 14 ++++++++++++++ .../Datum/Input/Space/Lease/DatumReviewDto.cs | 14 ++++++++++++++ 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/DatumSettingsDto.cs create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumReviewDto.cs diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/DatumSettingsDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/DatumSettingsDto.cs new file mode 100644 index 0000000..8fb8a11 --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/DatumSettingsDto.cs @@ -0,0 +1,8 @@ +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input +{ + public class DatumSettingsDto + { + public string Currency { get; set; } + public string AreaMeasure { get; set; } + } +} \ No newline at end of file diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/ModelDatumInputDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/ModelDatumInputDto.cs index 7be66b3..684552b 100644 --- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/ModelDatumInputDto.cs +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/ModelDatumInputDto.cs @@ -10,8 +10,10 @@ namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input { public class ModelDatumInputDto : IModelInput { - public List Spaces { get; set; } - + public List Spaces { get; set; } = new List(); + public DatumSettingsDto Settings { get; set; } + + public string ExternalId { get; set; } [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? AcquisitionDate { get; set; } public int? HoldPeriodMonths { get; set; } public EntryExitTypes? EntryMethod { get; set; } diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumSpaceDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumSpaceDto.cs index b2f3935..f218e27 100644 --- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumSpaceDto.cs +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumSpaceDto.cs @@ -6,6 +6,7 @@ public class DatumSpaceDto { public DatumLeaseDto Lease { get; set; } + public string ExternalId { get; set; } public string Demise { get; set; } public decimal? MarketRent { get; set; } public decimal? LettableArea { get; set; } diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumLeaseDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumLeaseDto.cs index da66928..87c2eca 100644 --- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumLeaseDto.cs +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumLeaseDto.cs @@ -1,11 +1,16 @@ using Forbury.Integrations.Helpers.Converters; using System; +using System.Collections.Generic; using Newtonsoft.Json; namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease { public class DatumLeaseDto { + public List Reviews { get; set; } = new List(); + public List RentFree { get; set; } = new List(); + + public string ExternalId { get; set; } public string Name { get; set; } [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? StartDate { get; set; } [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? ExpiryDate { get; set; } diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs new file mode 100644 index 0000000..cdcfc40 --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs @@ -0,0 +1,14 @@ +using System; +using Forbury.Integrations.Helpers.Converters; +using Newtonsoft.Json; + +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease +{ + public class DatumRentFreeDto + { + [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? Date { get; set; } + + public decimal Months { get; set; } + public decimal Percent { get; set; } + } +} \ No newline at end of file diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumReviewDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumReviewDto.cs new file mode 100644 index 0000000..d5c3b30 --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumReviewDto.cs @@ -0,0 +1,14 @@ +using System; +using Forbury.Integrations.Helpers.Converters; +using Newtonsoft.Json; + +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease +{ + public class DatumReviewDto + { + public string Type { get; set; } + [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime Date { get; set; } + public string Cap { get; set; } + public string Collar { get; set; } + } +} From a392ee703b618df7d63bfa5935d5e99e9bb37594 Mon Sep 17 00:00:00 2001 From: Mitchell Currey Date: Tue, 23 Jul 2024 09:38:32 +0100 Subject: [PATCH 2/3] Version bump --- src/Forbury.Integrations/Forbury.Integrations.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Forbury.Integrations/Forbury.Integrations.csproj b/src/Forbury.Integrations/Forbury.Integrations.csproj index f25c0d5..fd70b04 100644 --- a/src/Forbury.Integrations/Forbury.Integrations.csproj +++ b/src/Forbury.Integrations/Forbury.Integrations.csproj @@ -1,7 +1,7 @@  - 1.7.1 + 1.7.2 Forbury Development Team Forbury This .NET client library provides a quick and easy option for integrating with Forbury APIs. From 6dd0ebec3cbf0e6f80e8708cd6c3acc64f2d7c68 Mon Sep 17 00:00:00 2001 From: Mitchell Currey Date: Tue, 23 Jul 2024 10:00:28 +0100 Subject: [PATCH 3/3] Update DatumRentFreeDto.cs --- .../API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs index cdcfc40..0adc2fe 100644 --- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumRentFreeDto.cs @@ -7,7 +7,6 @@ namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease public class DatumRentFreeDto { [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? Date { get; set; } - public decimal Months { get; set; } public decimal Percent { get; set; } }