From 2fb7b31992de3b4315b1ca46f24dc616929a03e5 Mon Sep 17 00:00:00 2001 From: jins-maryjob Date: Thu, 11 Sep 2025 11:22:35 +1200 Subject: [PATCH 1/4] YOLO-5547 [Commercial] API Post + Get - Future Sheet --- .../API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs index bcb4698..582118e 100644 --- a/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs @@ -11,10 +11,8 @@ public class FuturesDto public CalendarBasis MarketYearBasis { get; set; } [JsonConverter(typeof(StringEnumConverter))] public CalendarBasis OutgoingsYearBasis { get; set; } - [JsonConverter(typeof(StringEnumConverter))] - public CalendarBasis EscalationYearBasis { get; set; } - [JsonConverter(typeof(StringEnumConverter))] - public GrowthBasisType MarketRentGrowthBasis { get; set; } + public string EscalationYearBasis { get; set; } + public string MarketRentGrowthBasis { get; set; } public decimal? PriorYearCpi { get; set; } public bool? DeferOutgoings { get; set; } public List EscalationAssumptions { get; set; } From 97c9daa505b27256469985bb5fc0b2f4eee81419 Mon Sep 17 00:00:00 2001 From: jins-maryjob Date: Thu, 11 Sep 2025 11:48:32 +1200 Subject: [PATCH 2/4] YOLO-5547 [Commercial] API Post + Get - Future Sheet --- .../Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs deleted file mode 100644 index f8bb34b..0000000 --- a/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Forbury.Integrations.API.v1.Dto.Model.Commercial.Input.Enums -{ - public enum GrowthBasisType - { - Net, - Gross - } -} \ No newline at end of file From a1c3b6b0d9eb888dacb712defdb2516d0860cee5 Mon Sep 17 00:00:00 2001 From: jins-maryjob Date: Thu, 11 Sep 2025 14:57:24 +1200 Subject: [PATCH 3/4] Revert "YOLO-5547 [Commercial] API Post + Get - Future Sheet" This reverts commit 97c9daa505b27256469985bb5fc0b2f4eee81419. --- .../Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs new file mode 100644 index 0000000..f8bb34b --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Enums/GrowthBasisType.cs @@ -0,0 +1,8 @@ +namespace Forbury.Integrations.API.v1.Dto.Model.Commercial.Input.Enums +{ + public enum GrowthBasisType + { + Net, + Gross + } +} \ No newline at end of file From ec58ea27da660bc4f740703d7ff4fe0444fa760d Mon Sep 17 00:00:00 2001 From: jins-maryjob Date: Thu, 11 Sep 2025 15:02:51 +1200 Subject: [PATCH 4/4] Revert "YOLO-5547 [Commercial] API Post + Get - Future Sheet" This reverts commit 2fb7b31992de3b4315b1ca46f24dc616929a03e5. --- .../API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs index 582118e..bcb4698 100644 --- a/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Commercial/Input/Future/FuturesDto.cs @@ -11,8 +11,10 @@ public class FuturesDto public CalendarBasis MarketYearBasis { get; set; } [JsonConverter(typeof(StringEnumConverter))] public CalendarBasis OutgoingsYearBasis { get; set; } - public string EscalationYearBasis { get; set; } - public string MarketRentGrowthBasis { get; set; } + [JsonConverter(typeof(StringEnumConverter))] + public CalendarBasis EscalationYearBasis { get; set; } + [JsonConverter(typeof(StringEnumConverter))] + public GrowthBasisType MarketRentGrowthBasis { get; set; } public decimal? PriorYearCpi { get; set; } public bool? DeferOutgoings { get; set; } public List EscalationAssumptions { get; set; }