Fixes to data models

panoramicdata · Mar 8, 2024 · b72bfa6 · b72bfa6
1 parent 9bda683
commit b72bfa6
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 5 deletions.
diff --git a/LogicMonitor.Api.Test/LogicMonitor.Api.Test.csproj b/LogicMonitor.Api.Test/LogicMonitor.Api.Test.csproj
@@ -13,7 +13,7 @@
 	<ItemGroup>
 		<PackageReference Include="Divergic.Logging.Xunit" Version="4.3.0" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="FluentAssertions.Analyzers" Version="0.30.0">
+		<PackageReference Include="FluentAssertions.Analyzers" Version="0.31.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -25,10 +25,10 @@
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
-		<PackageReference Include="xunit" Version="2.6.6" />
-		<PackageReference Include="xunit.analyzers" Version="1.10.0" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
+		<PackageReference Include="xunit" Version="2.7.0" />
+		<PackageReference Include="xunit.analyzers" Version="1.11.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>

diff --git a/LogicMonitor.Api/Settings/AccountSettings.cs b/LogicMonitor.Api/Settings/AccountSettings.cs
@@ -18,6 +18,24 @@ public class AccountSettings : IHasSingletonEndpoint
 	[DataMember(Name = "numberOfOpenAlerts")]
 	public int ActiveAlertCount { get; set; }
 
+	/// <summary>
+	///     The number of PaaS resources
+	/// </summary>
+	[DataMember(Name = "numOfPaaSResources")]
+	public int PaasResourceCount { get; set; }
+
+	/// <summary>
+	///     The number of IaaS resources
+	/// </summary>
+	[DataMember(Name = "numOfIaaSResources")]
+	public int IaasResourceCount { get; set; }
+
+	/// <summary>
+	///     The number of IaaS resources
+	/// </summary>
+	[DataMember(Name = "numOfNonComputeResources")]
+	public int NonComputeResourceCount { get; set; }
+
 	/// <summary>
 	///     The number of serverless resources
 	/// </summary>
@@ -473,6 +491,12 @@ public class AccountSettings : IHasSingletonEndpoint
 	[DataMember(Name = "whiteList")]
 	public string WhiteList { get; set; } = string.Empty;
 
+	/// <summary>
+	///     AccountDomain Whitelist
+	/// </summary>
+	[DataMember(Name = "accountDomainWhiteList")]
+	public string AccountDomainWhiteList { get; set; } = string.Empty;
+
 	/// <summary>
 	///     User Suspend Days
 	/// </summary>
@@ -491,6 +515,18 @@ public class AccountSettings : IHasSingletonEndpoint
 	[DataMember(Name = "numberOfWidgets")]
 	public int WidgetCount { get; set; }
 
+	/// <summary>
+	/// Whether collector debug is enabled
+	/// </summary>
+	[DataMember(Name = "enableCollectorDebug")]
+	public bool EnableCollectorDebug { get; set; }
+
+	/// <summary>
+	/// Whether test scripts are enabled
+	/// </summary>
+	[DataMember(Name = "enableTestScript")]
+	public bool EnableTestScript { get; set; }
+
 	/// <summary>
 	/// enableScriptsInTextWidget
 	/// </summary>
@@ -515,6 +551,12 @@ public class AccountSettings : IHasSingletonEndpoint
 	[DataMember(Name = "maximumTimeToKeepTenantIdentifierPropertyTextBoxDisabledInMins")]
 	public int MaximumTimeToKeepTenantIdentifierPropertyTextBoxDisabledInMins { get; set; }
 
+	/// <summary>
+	/// TokenDisabledDays
+	/// </summary>
+	[DataMember(Name = "tokenDisabledDays")]
+	public int TokenDisabledDays { get; set; }
+
 	/// <summary>
 	///     The endpoint
 	/// </summary>

diff --git a/LogicMonitor.Api/Websites/Website.cs b/LogicMonitor.Api/Websites/Website.cs
@@ -183,6 +183,12 @@ public class Website : NamedItem, IHasCustomProperties, IPatchable
 	[DataMember(Name = "alertStatusPriority")]
 	public int AlertStatusPriority { get; set; }
 
+	/// <summary>
+	///     The Alerting disabled on
+	/// </summary>
+	[DataMember(Name = "alertingDisabledOn")]
+	public object AlertingDisabledOn { get; set; } = new();
+
 	/// <summary>
 	/// The count
 	/// </summary>

diff --git a/LogicMonitor.Api/Websites/WebsiteGroup.cs b/LogicMonitor.Api/Websites/WebsiteGroup.cs
@@ -43,6 +43,12 @@ public class WebsiteGroup : NamedItem, IHasEndpoint, IHasCustomProperties
 	[DataMember(Name = "disableAlerting")]
 	public bool DisableAlerting { get; set; }
 
+	/// <summary>
+	///     The Alerting disabled on
+	/// </summary>
+	[DataMember(Name = "alertingDisabledOn")]
+	public object AlertingDisabledOn { get; set; } = new();
+
 	/// <summary>
 	/// The privilege operations of the user\u0027s role that made the API request.  The array can contain the values ack, sdt and/or threshold
 	/// </summary>