Merge pull request #646 from ITfoxtec/test

Test
ITfoxtec · Nov 3, 2023 · 6dcd43b · 6dcd43b
2 parents 4faf554 + e0246f4
commit 6dcd43b
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/src/FoxIDs.Control/Controllers/Tracks/TTrackLogController.cs b/src/FoxIDs.Control/Controllers/Tracks/TTrackLogController.cs
@@ -326,7 +326,7 @@ private string GetGeneralQueryExtend() =>
 @$"| extend {Constants.Logs.DownPartyId} = Properties.{Constants.Logs.DownPartyId} 
 | extend {Constants.Logs.UpPartyId} = Properties.{Constants.Logs.UpPartyId} 
 | extend {Constants.Logs.SessionId} = Properties.{Constants.Logs.SessionId} 
-| extend {Constants.Logs.ExternalSequenceId} = Properties.{Constants.Logs.ExternalSequenceId} 
+| extend {Constants.Logs.ExternalSessionId} = Properties.{Constants.Logs.ExternalSessionId}
 | extend {Constants.Logs.UserId} = Properties.{Constants.Logs.UserId} 
 | extend {Constants.Logs.Email} = Properties.{Constants.Logs.Email} 
 | extend {Constants.Logs.UserAgent} = Properties.{Constants.Logs.UserAgent}";
@@ -337,7 +337,7 @@ private string GetGeneralQueryWhere(string filter) =>
 {Constants.Logs.UpPartyId} contains '{filter}' or 
 {Constants.Logs.SequenceId} contains '{filter}' or 
 {Constants.Logs.SessionId} contains '{filter}' or 
-{Constants.Logs.ExternalSequenceId} contains '{filter}' or 
+{Constants.Logs.ExternalSessionId} contains '{filter}' or 
 {Constants.Logs.UserId} contains '{filter}' or 
 {Constants.Logs.Email} contains '{filter}' or 
 {Constants.Logs.UserAgent} contains '{filter}'";

diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
-		<Version>1.1.2.0</Version>
+		<Version>1.1.3.0</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Control/Logic/UsageLogLogic.cs b/src/FoxIDs.Control/Logic/UsageLogLogic.cs
@@ -292,7 +292,7 @@ private double GetCount(LogsTableRow row, Api.UsageLogTypes logType)
             {
                 count += row.GetDouble("UsageAddRating");
             }
-            return count.HasValue ? count.Value : 0;
+            return Math.Round(count.HasValue ? count.Value : 0, 1);
         }
 
         private DateTime GetDate(LogsTableRow row)

diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
-		<Version>1.1.2.0</Version>
+		<Version>1.1.3.0</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
-		<Version>1.1.2.0</Version>
+		<Version>1.1.3.0</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/src/FoxIDs.Shared/FoxIDs.Shared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
-		<Version>1.1.2.0</Version>
+		<Version>1.1.3.0</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.SharedBase/Constants.cs b/src/FoxIDs.SharedBase/Constants.cs
@@ -65,22 +65,22 @@ public static class Logs
             public const string TrackName = "f_TrackName";
             public const string GrantType = "f_GrantType";
             public const string Domain = "f_Domain";
-            public const string UserAgent = "{Constants.Logs.UserAgent}";
-            public const string UpPartyId = "{Constants.Logs.UpPartyId}";
+            public const string UserAgent = "f_UserAgent";
+            public const string UpPartyId = "f_UpPartyId";
             public const string UpPartyClientId = "f_UpPartyClientId";
             public const string UpPartyStatus = "f_UpPartyStatus";
-            public const string DownPartyId = "{Constants.Logs.DownPartyId}";
+            public const string DownPartyId = "f_DownPartyId";
             public const string DownPartyClientId = "f_DownPartyClientId";
-            public const string SequenceId = "{Constants.Logs.SequenceId}";
-            public const string ExternalSequenceId = "f_ExternalSequenceId";            
-            public const string AccountAction = "f_AccountAction";            
+            public const string SequenceId = "f_SequenceId";
+            public const string ExternalSequenceId = "f_ExternalSequenceId";
+            public const string AccountAction = "f_AccountAction";
             public const string SequenceCulture = "f_SequenceCulture";
             public const string Issuer = "f_Issuer";
             public const string Status = "f_Status";
-            public const string SessionId = "{Constants.Logs.SessionId}";
-            public const string ExternalSessionId = "{Constants.Logs.ExternalSequenceId}";
-            public const string UserId = "{Constants.Logs.UserId}";
-            public const string Email = "{Constants.Logs.Email}";
+            public const string SessionId = "f_SessionId";
+            public const string ExternalSessionId = "f_ExternalSessionId";
+            public const string UserId = "f_UserId";
+            public const string Email = "f_Email";
             public const string Type = "f_Type";
             public const string FailingLoginCount = "f_FailingLoginCount";
             public const string UsageType = "f_UsageType";
@@ -115,7 +115,7 @@ public static class Models
 
             public const int MasterPartitionIdLength = 30;
             public const string MasterPartitionIdExPattern = @"^[\w:@]*$";
-            public const int DocumentPartitionIdLength = 70;
+            public const int DocumentPartitionIdLength = 110;
             public const string DocumentPartitionIdExPattern = @"^[\w:\-]*$";
 
             public static class Master
@@ -188,7 +188,7 @@ public static class Resource
 
             public static class Tenant
             {
-                public const int IdLength = 50;
+                public const int IdLength = 70;
                 public const string IdRegExPattern = @"^[a-z0-9_:-]*$";
                 public const int NameLength = 50;
                 public const string NameRegExPattern = @"^\w[\w\-]*$";
@@ -199,7 +199,7 @@ public static class Tenant
 
             public static class Track
             {
-                public const int IdLength = 80;
+                public const int IdLength = 120;
                 public const string IdRegExPattern = @"^[a-z0-9_:-]*$";
                 public const int NameLength = 50;
                 public const string NameRegExPattern = @"^[\w\-]*$";
@@ -258,7 +258,7 @@ public static class Logging
 
             public static class User
             {
-                public const int IdLength = 140;
+                public const int IdLength = 180;
                 public const string IdRegExPattern = @"^[\w:\-.+@]*$";
                 public const int UserIdLength = 40;
                 public const int ClaimsMin = 0;
@@ -312,7 +312,7 @@ public static class Party
             {
                 public const int NameLength = 50;
                 public const string NameRegExPattern = @"^[\w\-]*$";
-                public const int IdLength = 110;
+                public const int IdLength = 170;
                 public const string IdRegExPattern = @"^[\w:\-]*$";
                 public const int NoteLength = 200;
 
@@ -352,7 +352,7 @@ public static class Client
                     public const int RedirectUrisMin = 0;
                     public const int RedirectUrisMax = 200;
                     public const int RedirectUriLength = 500;
-                    public const int RedirectUriSumLength = 20000;
+                    public const int RedirectUriSumLength = 25000;
                     public const int SecretsMin = 0;
                     public const int SecretsMax = 10;
                     public const int ClientKeysMin = 0;

diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
-		<Version>1.1.2.0</Version>
+		<Version>1.1.3.0</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/FoxIDs.csproj b/src/FoxIDs/FoxIDs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
-		<Version>1.1.2.0</Version>
+		<Version>1.1.3.0</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>