From ce52bdf6959b9b775b68db964a94172b680536a3 Mon Sep 17 00:00:00 2001 From: Seyoun Lim Date: Thu, 31 Oct 2024 16:05:28 +1300 Subject: [PATCH 1/2] Datum MLA extension --- .../Dto/Model/Datum/Input/ModelDatumInputDto.cs | 4 +++- .../Model/Datum/Input/Space/DatumSpaceDto.cs | 3 +++ .../Lease/DatumMarketLeasingAssumptionsDto.cs | 12 ++++++++++++ .../Space/Lease/FirstRenewalAssumptionsDto.cs | 17 +++++++++++++++++ .../Lease/Options/DatumLeaseFeeOptionsDto.cs | 8 ++++++++ .../Space/Lease/Options/DatumLeaseOptionsDto.cs | 10 ++++++++++ .../Options/DatumLeaseVacancyOptionsDto.cs | 10 ++++++++++ .../Forbury.Integrations.csproj | 2 +- 8 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumMarketLeasingAssumptionsDto.cs create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/FirstRenewalAssumptionsDto.cs create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseFeeOptionsDto.cs create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseOptionsDto.cs create mode 100644 src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseVacancyOptionsDto.cs 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 684552b..183b8f7 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,6 +4,7 @@ using Forbury.Integrations.Helpers.Converters; using System; using System.Collections.Generic; +using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease; using Newtonsoft.Json; namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input @@ -12,7 +13,8 @@ public class ModelDatumInputDto : IModelInput { public List Spaces { get; set; } = new List(); public DatumSettingsDto Settings { get; set; } - + public DatumMarketLeasingAssumptionsDto MarketLeasingAssumptions { get; set; } + public string ExternalId { get; set; } [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? AcquisitionDate { get; set; } public int? HoldPeriodMonths { 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 f218e27..68334f5 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 @@ -10,5 +10,8 @@ public class DatumSpaceDto public string Demise { get; set; } public decimal? MarketRent { get; set; } public decimal? LettableArea { get; set; } + + public string MarketLeasingAssumptionProfile { get; set; } + public FirstRenewalAssumptionsDto FirstRenewalOverrides { get; set; } } } 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/Space/Lease/DatumMarketLeasingAssumptionsDto.cs new file mode 100644 index 0000000..73d79b7 --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/DatumMarketLeasingAssumptionsDto.cs @@ -0,0 +1,12 @@ +using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options; + +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease +{ + public class DatumMarketLeasingAssumptionsDto + { + public string Description { get; set; } + public DatumLeaseOptionsDto LeaseOptions { get; set; } + public DatumLeaseVacancyOptionsDto VacancyOptions { get; set; } + public DatumLeaseFeeOptionsDto FeeOptions { 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/Lease/FirstRenewalAssumptionsDto.cs new file mode 100644 index 0000000..21770bc --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/FirstRenewalAssumptionsDto.cs @@ -0,0 +1,17 @@ +using System; +using Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options; +using Forbury.Integrations.Helpers.Converters; +using Newtonsoft.Json; + +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease +{ + public class FirstRenewalAssumptionsDto + { + [JsonConverter(typeof(DateFormatConverter), JsonFormats.DateFormat)] public DateTime? StartDate { get; set; } + public decimal BaseRent { get; set; } + public decimal MarketRent { get; set; } + public DatumLeaseOptionsDto LeaseOptions { get; set; } + public DatumLeaseVacancyOptionsDto VacancyOptions { get; set; } + public DatumLeaseFeeOptionsDto FeeOptions { get; set; } + } +} 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/Space/Lease/Options/DatumLeaseFeeOptionsDto.cs new file mode 100644 index 0000000..372204c --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseFeeOptionsDto.cs @@ -0,0 +1,8 @@ +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options +{ + public class DatumLeaseFeeOptionsDto + { + public decimal? AgentsLeasingFee { get; set; } + public decimal? LegalLeasingFee { get; set; } + } +} 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/Space/Lease/Options/DatumLeaseOptionsDto.cs new file mode 100644 index 0000000..b6eeaf4 --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseOptionsDto.cs @@ -0,0 +1,10 @@ +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options +{ + public class DatumLeaseOptionsDto + { + public int? TermYears { get; set; } + public string ReviewType { get; set; } + public int? ReviewFrequencyYears { get; set; } + public int? RentFreeMonths { get; set; } + } +} 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/Space/Lease/Options/DatumLeaseVacancyOptionsDto.cs new file mode 100644 index 0000000..16e4bae --- /dev/null +++ b/src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/Lease/Options/DatumLeaseVacancyOptionsDto.cs @@ -0,0 +1,10 @@ +namespace Forbury.Integrations.API.v1.Dto.Model.Datum.Input.Space.Lease.Options +{ + public class DatumLeaseVacancyOptionsDto + { + public int? DowntimeMonths { get; set; } + public int? PreRefurbMonths { get; set; } + public int? RefurbMonths { get; set; } + public decimal? RefurbAmount { get; set; } + } +} diff --git a/src/Forbury.Integrations/Forbury.Integrations.csproj b/src/Forbury.Integrations/Forbury.Integrations.csproj index fd70b04..947cde2 100644 --- a/src/Forbury.Integrations/Forbury.Integrations.csproj +++ b/src/Forbury.Integrations/Forbury.Integrations.csproj @@ -1,7 +1,7 @@  - 1.7.2 + 1.7.3 Forbury Development Team Forbury This .NET client library provides a quick and easy option for integrating with Forbury APIs. From 852f04da87a9bf24a077b1e9a6f8c46dcc02c82b Mon Sep 17 00:00:00 2001 From: Mitchell Currey Date: Tue, 5 Nov 2024 10:43:49 +0000 Subject: [PATCH 2/2] Enable manual triggers --- .github/workflows/codeql.yml | 1 + .github/workflows/dotnet.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d232681..2c592ea 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,6 +14,7 @@ name: "CodeQL" on: push: branches: [ "master" ] + workflow_dispatch: pull_request: # The branches below must be a subset of the branches above branches: [ "master" ] diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 211ff23..bfcc389 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -3,6 +3,7 @@ name: .NET on: push: branches: [ "master" ] + workflow_dispatch: pull_request: branches: [ "master" ]