From 26d007182d422f818eab67f7577dde6c4ff2238b Mon Sep 17 00:00:00 2001 From: Zeeshaun Date: Mon, 13 Apr 2026 16:52:52 +0000 Subject: [PATCH] Updating --- .../LCU.API.Internal.CoreSoapApiWrapper/Web.config | 1 + LCU.API.Internal.MaidBotApi/.codex | 0 .../LCU.Api.Internal.MaidBot.sln | 8 +++++++- .../LCU.Api.Internal.MaidBotLib.csproj | 10 +++++++--- .../LCU.Library.Internal.MaidBotModels.csproj | 14 ++++++++++++++ .../Models/DebugEventLog.cs | 6 +++--- .../Models/EventLog.cs | 13 ++++++++++--- .../Models/GroupEnum.cs | 4 ---- .../Models/LoggingMatrix.cs | 9 +++++++-- .../Models/PropertyEnum.cs | 2 +- LCU.API.Internal.MemberPreferencesApi/Dockerfile | 4 ++-- 11 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 LCU.API.Internal.MaidBotApi/.codex create mode 100644 LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/LCU.Library.Internal.MaidBotModels.csproj rename LCU.API.Internal.MaidBotApi/{LCU.Api.Internal.MaidBotLib => LCU.Library.Internal.MaidBotModels}/Models/DebugEventLog.cs (90%) rename LCU.API.Internal.MaidBotApi/{LCU.Api.Internal.MaidBotLib => LCU.Library.Internal.MaidBotModels}/Models/EventLog.cs (86%) rename LCU.API.Internal.MaidBotApi/{LCU.Api.Internal.MaidBotLib => LCU.Library.Internal.MaidBotModels}/Models/GroupEnum.cs (71%) rename LCU.API.Internal.MaidBotApi/{LCU.Api.Internal.MaidBotLib => LCU.Library.Internal.MaidBotModels}/Models/LoggingMatrix.cs (94%) rename LCU.API.Internal.MaidBotApi/{LCU.Api.Internal.MaidBotLib => LCU.Library.Internal.MaidBotModels}/Models/PropertyEnum.cs (55%) diff --git a/LCU.API.Internal.CoreSoapApiWrapper/LCU.API.Internal.CoreSoapApiWrapper/Web.config b/LCU.API.Internal.CoreSoapApiWrapper/LCU.API.Internal.CoreSoapApiWrapper/Web.config index 9314daf..98cda86 100644 --- a/LCU.API.Internal.CoreSoapApiWrapper/LCU.API.Internal.CoreSoapApiWrapper/Web.config +++ b/LCU.API.Internal.CoreSoapApiWrapper/LCU.API.Internal.CoreSoapApiWrapper/Web.config @@ -89,6 +89,7 @@ + diff --git a/LCU.API.Internal.MaidBotApi/.codex b/LCU.API.Internal.MaidBotApi/.codex new file mode 100644 index 0000000..e69de29 diff --git a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBot.sln b/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBot.sln index 5eaf0b0..916f52d 100644 --- a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBot.sln +++ b/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBot.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29905.134 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotApi", "LCU.API.Internal.MaidBotApi\LCU.Api.Internal.MaidBotApi.csproj", "{1C92A326-91A3-4904-B3EF-B766E10E7191}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotApi", "LCU.Api.Internal.MaidBotApi\LCU.Api.Internal.MaidBotApi.csproj", "{1C92A326-91A3-4904-B3EF-B766E10E7191}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotTests", "LCU.Api.Internal.MaidBotTests\LCU.Api.Internal.MaidBotTests.csproj", "{98503299-44F3-410A-B61F-36BC1706F132}" ProjectSection(ProjectDependencies) = postProject @@ -16,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotLib EndProject Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "LCU.Api.Internal.MaidBotSql", "LCU.Api.Internal.MaidBotSql\LCU.Api.Internal.MaidBotSql.sqlproj", "{ECCE6677-A2F2-4694-964F-F91EBE7AAC00}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LCU.Library.Internal.MaidBotModels", "LCU.Library.Internal.MaidBotModels\LCU.Library.Internal.MaidBotModels.csproj", "{819AD89D-FF34-479C-A894-1C0F9704410A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,6 +46,10 @@ Global {ECCE6677-A2F2-4694-964F-F91EBE7AAC00}.Release|Any CPU.ActiveCfg = Release|Any CPU {ECCE6677-A2F2-4694-964F-F91EBE7AAC00}.Release|Any CPU.Build.0 = Release|Any CPU {ECCE6677-A2F2-4694-964F-F91EBE7AAC00}.Release|Any CPU.Deploy.0 = Release|Any CPU + {819AD89D-FF34-479C-A894-1C0F9704410A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {819AD89D-FF34-479C-A894-1C0F9704410A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {819AD89D-FF34-479C-A894-1C0F9704410A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {819AD89D-FF34-479C-A894-1C0F9704410A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/LCU.Api.Internal.MaidBotLib.csproj b/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/LCU.Api.Internal.MaidBotLib.csproj index 0c94c02..edeec44 100644 --- a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/LCU.Api.Internal.MaidBotLib.csproj +++ b/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/LCU.Api.Internal.MaidBotLib.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net8.0 true 1.0.2 @@ -17,9 +17,13 @@ - - + + + + + + diff --git a/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/LCU.Library.Internal.MaidBotModels.csproj b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/LCU.Library.Internal.MaidBotModels.csproj new file mode 100644 index 0000000..688cda6 --- /dev/null +++ b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/LCU.Library.Internal.MaidBotModels.csproj @@ -0,0 +1,14 @@ + + + + netstandard2.0 + true + 1.0.0 + LCU Internal MaidBot model definitions. + + + + + + + diff --git a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/DebugEventLog.cs b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/DebugEventLog.cs similarity index 90% rename from LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/DebugEventLog.cs rename to LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/DebugEventLog.cs index ed66bb0..2d85dc5 100644 --- a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/DebugEventLog.cs +++ b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/DebugEventLog.cs @@ -1,4 +1,4 @@ -namespace LCU.Api.Internal.MaidBotLib.Models +namespace LCU.Api.Internal.MaidBotLib.Models { public class DebugEventLog { @@ -6,7 +6,6 @@ public DebugEventLog() { - } public DebugEventLog(EventLog eventLog) @@ -15,6 +14,7 @@ } public int DebugEventLogId { get; set; } + public string RawLog { get; set; } } -} \ No newline at end of file +} diff --git a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/EventLog.cs b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/EventLog.cs similarity index 86% rename from LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/EventLog.cs rename to LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/EventLog.cs index d4c2fd4..9cb37d1 100644 --- a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/EventLog.cs +++ b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/EventLog.cs @@ -1,16 +1,23 @@ -using System; +using System; namespace LCU.Api.Internal.MaidBotLib.Models { public class EventLog { public int EventLogId { get; set; } + public string Application { get; set; } - public string Level { get; set; } + + public string Level { get; set; } + public string Group { get; set; } + public DateTime LogTimeStamp { get; set; } + public string Message { get; set; } + public string Environment { get; set; } + public string DebugData { get; set; } } -} \ No newline at end of file +} diff --git a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/GroupEnum.cs b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/GroupEnum.cs similarity index 71% rename from LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/GroupEnum.cs rename to LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/GroupEnum.cs index c0790da..a8bc0ba 100644 --- a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/GroupEnum.cs +++ b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/GroupEnum.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace LCU.Api.Internal.MaidBotLib.Models { public enum GroupEnum diff --git a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/LoggingMatrix.cs b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/LoggingMatrix.cs similarity index 94% rename from LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/LoggingMatrix.cs rename to LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/LoggingMatrix.cs index 1b29cae..7034b76 100644 --- a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/LoggingMatrix.cs +++ b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/LoggingMatrix.cs @@ -1,18 +1,23 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace LCU.Api.Internal.MaidBotLib.Models { public class LoggingMatrix { public int LoggingMatrixId { get; set; } + [StringLength(200, MinimumLength = 1, ErrorMessage = "Application field must have a length between 1 and 200 characters")] public string Application { get; set; } + [StringLength(50, MinimumLength = 1, ErrorMessage = "Level field must have a length between 1 and 50 characters")] public string Level { get; set; } + [StringLength(100, MinimumLength = 1, ErrorMessage = "Groups field must have a length between 1 and 100 characters")] public string Group { get; set; } + [StringLength(100, MinimumLength = 1, ErrorMessage = "Emails field must have a length between 1 and 100 characters")] public string Email { get; set; } + public bool Disabled { get; set; } } -} \ No newline at end of file +} diff --git a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/PropertyEnum.cs b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/PropertyEnum.cs similarity index 55% rename from LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/PropertyEnum.cs rename to LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/PropertyEnum.cs index e8d816c..b9f8b50 100644 --- a/LCU.API.Internal.MaidBotApi/LCU.Api.Internal.MaidBotLib/Models/PropertyEnum.cs +++ b/LCU.API.Internal.MaidBotApi/LCU.Library.Internal.MaidBotModels/Models/PropertyEnum.cs @@ -1,4 +1,4 @@ -namespace LCU.Api.Internal.MaidBotLib.Models +namespace LCU.Api.Internal.MaidBotLib.Models { public enum PropertyEnum { diff --git a/LCU.API.Internal.MemberPreferencesApi/Dockerfile b/LCU.API.Internal.MemberPreferencesApi/Dockerfile index 326dd00..2e4bb50 100644 --- a/LCU.API.Internal.MemberPreferencesApi/Dockerfile +++ b/LCU.API.Internal.MemberPreferencesApi/Dockerfile @@ -5,6 +5,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS aspnetcore-build COPY LCU.API.Internal.MemberPreferencesApi/LCU.API.Internal.MemberPreferencesApi.csproj ./source/LCU.API.Internal.MemberPreferencesApi/ COPY LCU.API.Internal.MemberPreferencesApiLib/LCU.API.Internal.MemberPreferencesApiLib.csproj ./source/LCU.API.Internal.MemberPreferencesApiLib/ COPY LCU.Library.Internal.MemberPreferencesApiModels/LCU.Library.Internal.MemberPreferencesApiModels.csproj ./source/LCU.Library.Internal.MemberPreferencesApiModels/ +COPY LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/ # Install Credential Provider and set env variables to enable Nuget restore with auth ARG PAT=bh2lq3jibktw67b2wdbqyfln7cd3je6lk52kijntpj43v6kimpgq @@ -19,8 +20,7 @@ RUN dotnet restore -s "https://landmarkcu.pkgs.visualstudio.com/_packaging/LCU-I COPY . ./source/ LABEL test=true -COPY LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/ -RUN dotnet restore ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj +RUN dotnet restore -s "https://landmarkcu.pkgs.visualstudio.com/_packaging/LCU-Internal/nuget/v3/index.json" -s "https://api.nuget.org/v3/index.json" ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj RUN dotnet test -c Release --results-directory /testresults --logger "trx;LogFileName=test_results.trx" ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj # .NET Core Publish