Skip to content

Refactor namespaces & fix issue with multiple MLAs #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MitchellNZ merged 1 commit into from
Nov 13, 2024
Merged

Refactor namespaces & fix issue with multiple MLAs #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...Lease/DatumMarketLeasingAssumptionsDto.cs → ...arket/DatumMarketLeasingAssumptionsDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion .../Lease/Options/DatumLeaseFeeOptionsDto.cs → ...Market/Options/DatumLeaseFeeOptionsDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...ace/Lease/Options/DatumLeaseOptionsDto.cs → ...ut/Market/Options/DatumLeaseOptionsDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...se/Options/DatumLeaseVacancyOptionsDto.cs → ...et/Options/DatumLeaseVacancyOptionsDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/ModelDatumInputDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
6 changes: 3 additions & 3 deletions ...Space/Lease/FirstRenewalAssumptionsDto.cs → .../Space/DatumFirstRenewalAssumptionsDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; }
Expand Down
2 changes: 1 addition & 1 deletion src/Forbury.Integrations/API/v1/Dto/Model/Datum/Input/Space/DatumSpaceDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
2 changes: 1 addition & 1 deletion src/Forbury.Integrations/Forbury.Integrations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down