From 7487687ee6dc40093f307c2c1f38d629e2362002 Mon Sep 17 00:00:00 2001
From: Mitchell Currey <Mitchell.Currey@forbury.com>
Date: Tue, 12 Nov 2024 10:36:08 +0000
Subject: [PATCH] Refactor namespaces & fix issue with multiple MLAs

---
 .../Lease => Market}/DatumMarketLeasingAssumptionsDto.cs    | 4 ++--
 .../Lease => Market}/Options/DatumLeaseFeeOptionsDto.cs     | 2 +-
 .../{Space/Lease => Market}/Options/DatumLeaseOptionsDto.cs | 2 +-
 .../Lease => Market}/Options/DatumLeaseVacancyOptionsDto.cs | 2 +-
 .../API/v1/Dto/Model/Datum/Input/ModelDatumInputDto.cs      | 6 +++---
 ...AssumptionsDto.cs => DatumFirstRenewalAssumptionsDto.cs} | 6 +++---
 .../API/v1/Dto/Model/Datum/Input/Space/DatumSpaceDto.cs     | 2 +-
 src/Forbury.Integrations/Forbury.Integrations.csproj        | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/{Space/Lease => Market}/DatumMarketLeasingAssumptionsDto.cs (67%)
 rename src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/{Space/Lease => Market}/Options/DatumLeaseFeeOptionsDto.cs (66%)
 rename src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/{Space/Lease => Market}/Options/DatumLeaseOptionsDto.cs (75%)
 rename src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/{Space/Lease => Market}/Options/DatumLeaseVacancyOptionsDto.cs (75%)
 rename src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/{Lease/FirstRenewalAssumptionsDto.cs => DatumFirstRenewalAssumptionsDto.cs} (81%)

diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumMarketLeasingAssumptionsDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/DatumMarketLeasingAssumptionsDto.cs
similarity index 67%
rename from src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumMarketLeasingAssumptionsDto.cs
rename to src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/DatumMarketLeasingAssumptionsDto.cs
index 73d79b7..1c86df7 100644
--- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumMarketLeasingAssumptionsDto.cs
+++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/DatumMarketLeasingAssumptionsDto.cs
@@ -1,6 +1,6 @@
-using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options;
+using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Market.Options;
 
-namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease
+namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Market
 {
     public class DatumMarketLeasingAssumptionsDto
     {
diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseFeeOptionsDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseFeeOptionsDto.cs
similarity index 66%
rename from src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseFeeOptionsDto.cs
rename to src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseFeeOptionsDto.cs
index 372204c..aa90a2e 100644
--- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseFeeOptionsDto.cs
+++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseFeeOptionsDto.cs
@@ -1,4 +1,4 @@
-namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options
+namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Market.Options
 {
     public class DatumLeaseFeeOptionsDto
     {
diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseOptionsDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseOptionsDto.cs
similarity index 75%
rename from src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseOptionsDto.cs
rename to src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseOptionsDto.cs
index b6eeaf4..b510cfe 100644
--- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseOptionsDto.cs
+++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseOptionsDto.cs
@@ -1,4 +1,4 @@
-namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options
+namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Market.Options
 {
     public class DatumLeaseOptionsDto
     {
diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseVacancyOptionsDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseVacancyOptionsDto.cs
similarity index 75%
rename from src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseVacancyOptionsDto.cs
rename to src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseVacancyOptionsDto.cs
index 16e4bae..1951fdc 100644
--- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseVacancyOptionsDto.cs
+++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Market/Options/DatumLeaseVacancyOptionsDto.cs
@@ -1,4 +1,4 @@
-namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options
+namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Market.Options
 {
     public class DatumLeaseVacancyOptionsDto
     {
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 183b8f7..0704bc4 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
@@ -4,16 +4,16 @@
 using Forbury.Integrations.Helpers.Converters;
 using System;
 using System.Collections.Generic;
-using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease;
+using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Market;
 using Newtonsoft.Json;
 
 namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input
 {
     public class ModelDatumInputDto : IModelInput
     {
-        public List<DatumSpaceDto> Spaces { get; set; } = new List<DatumSpaceDto>();
         public DatumSettingsDto Settings { get; set; }
-        public DatumMarketLeasingAssumptionsDto MarketLeasingAssumptions { get; set; }
+        public List<DatumSpaceDto> Spaces { get; set; } = new List<DatumSpaceDto>();
+        public List<DatumMarketLeasingAssumptionsDto> MarketLeasingAssumptions { get; set; }
 
         public string ExternalId { get; set; }
         [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? AcquisitionDate { get; set; }
diff --git a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/FirstRenewalAssumptionsDto.cs b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumFirstRenewalAssumptionsDto.cs
similarity index 81%
rename from src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/FirstRenewalAssumptionsDto.cs
rename to src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumFirstRenewalAssumptionsDto.cs
index 21770bc..977c764 100644
--- a/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/FirstRenewalAssumptionsDto.cs
+++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumFirstRenewalAssumptionsDto.cs
@@ -1,11 +1,11 @@
 using System;
-using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options;
+using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Market.Options;
 using Forbury.Integrations.Helpers.Converters;
 using Newtonsoft.Json;
 
-namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease
+namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space
 {
-    public class FirstRenewalAssumptionsDto
+    public class DatumFirstRenewalAssumptionsDto
     {
         [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)]  public DateTime? StartDate { get; set; }
         public decimal BaseRent { 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 68334f5..d0ad132 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
@@ -12,6 +12,6 @@ public class DatumSpaceDto
         public decimal? LettableArea { get; set; }
 
         public string MarketLeasingAssumptionProfile { get; set; }
-        public FirstRenewalAssumptionsDto FirstRenewalOverrides { get; set; }
+        public DatumFirstRenewalAssumptionsDto DatumFirstRenewalOverrides { get; set; }
     }
 }
diff --git a/src/Forbury.Integrations/Forbury.Integrations.csproj b/src/Forbury.Integrations/Forbury.Integrations.csproj
index 947cde2..f9093d5 100644
--- a/src/Forbury.Integrations/Forbury.Integrations.csproj
+++ b/src/Forbury.Integrations/Forbury.Integrations.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.7.3</Version>
+    <Version>1.7.4</Version>
     <Authors>Forbury Development Team</Authors>
     <Company>Forbury</Company>
     <PackageDescription>This .NET client library provides a quick and easy option for integrating with Forbury APIs.</PackageDescription>