diff options
Diffstat (limited to 'code/api/src/Models/Misc')
| -rw-r--r-- | code/api/src/Models/Misc/ApiSpecDocument.cs | 2 | ||||
| -rw-r--r-- | code/api/src/Models/Misc/AppConfiguration.cs | 8 | ||||
| -rw-r--r-- | code/api/src/Models/Misc/AppPath.cs | 14 | ||||
| -rw-r--r-- | code/api/src/Models/Misc/KnownProblemModel.cs | 19 | ||||
| -rw-r--r-- | code/api/src/Models/Misc/LoggedInUserModel.cs | 2 | ||||
| -rw-r--r-- | code/api/src/Models/Misc/RequestTimeZoneInfo.cs | 2 |
6 files changed, 29 insertions, 18 deletions
diff --git a/code/api/src/Models/Misc/ApiSpecDocument.cs b/code/api/src/Models/Misc/ApiSpecDocument.cs index 1c7d936..a515baf 100644 --- a/code/api/src/Models/Misc/ApiSpecDocument.cs +++ b/code/api/src/Models/Misc/ApiSpecDocument.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Data.Models; +namespace IOL.GreatOffice.Api.Models.Models; public class ApiSpecDocument { diff --git a/code/api/src/Models/Misc/AppConfiguration.cs b/code/api/src/Models/Misc/AppConfiguration.cs index 31e5726..9ed6fe4 100644 --- a/code/api/src/Models/Misc/AppConfiguration.cs +++ b/code/api/src/Models/Misc/AppConfiguration.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography.X509Certificates; -namespace IOL.GreatOffice.Api.Data.Models; +namespace IOL.GreatOffice.Api.Models.Models; public class AppConfiguration { @@ -96,8 +96,10 @@ public class AppConfiguration public X509Certificate2 CERT1() => new(Convert.FromBase64String(APP_CERT)); - public object GetPublicVersion() { - return new { + public object GetPublicObject() + { + return new + { DB_HOST, DB_PORT, DB_USER, diff --git a/code/api/src/Models/Misc/AppPath.cs b/code/api/src/Models/Misc/AppPath.cs index e47e48c..5a8c206 100644 --- a/code/api/src/Models/Misc/AppPath.cs +++ b/code/api/src/Models/Misc/AppPath.cs @@ -1,20 +1,24 @@ -namespace IOL.GreatOffice.Api.Data.Models; +namespace IOL.GreatOffice.Api.Models.Models; public sealed record AppPath { public string HostPath { get; init; } public string WebPath { get; init; } - public string GetHostPathForFilename(string filename, string fallback = "") { - if (filename.IsNullOrWhiteSpace()) { + public string GetHostPathForFilename(string filename, string fallback = "") + { + if (filename.IsNullOrWhiteSpace()) + { return fallback; } return Path.Combine(HostPath, filename); } - public string GetWebPathForFilename(string filename, string fallback = "") { - if (filename.IsNullOrWhiteSpace()) { + public string GetWebPathForFilename(string filename, string fallback = "") + { + if (filename.IsNullOrWhiteSpace()) + { return fallback; } diff --git a/code/api/src/Models/Misc/KnownProblemModel.cs b/code/api/src/Models/Misc/KnownProblemModel.cs index 9acc85c..5a9927f 100644 --- a/code/api/src/Models/Misc/KnownProblemModel.cs +++ b/code/api/src/Models/Misc/KnownProblemModel.cs @@ -1,8 +1,9 @@ -namespace IOL.GreatOffice.Api.Data.Models; +namespace IOL.GreatOffice.Api.Models.Models; public class KnownProblemModel { - public KnownProblemModel(string title = default, string subtitle = default, Dictionary<string, string[]> errors = default) { + public KnownProblemModel(string title = default, string subtitle = default, Dictionary<string, string[]> errors = default) + { Title = title; Subtitle = subtitle; Errors = errors ?? new(); @@ -13,12 +14,16 @@ public class KnownProblemModel public Dictionary<string, string[]> Errors { get; set; } public string TraceId { get; set; } - public void AddError(string field, string errorText) { - if (!Errors.ContainsKey(field)) { - Errors.Add(field, new[] {errorText}); - } else { + public void AddError(string field, string errorText) + { + if (!Errors.ContainsKey(field)) + { + Errors.Add(field, [errorText]); + } + else + { var currentErrors = Errors[field]; - var newErrors = currentErrors.Concat(new[] {errorText}); + var newErrors = currentErrors.Concat(new[] { errorText }); Errors.Remove(field); Errors.Add(field, newErrors.ToArray()); } diff --git a/code/api/src/Models/Misc/LoggedInUserModel.cs b/code/api/src/Models/Misc/LoggedInUserModel.cs index 541d4a5..ce2b163 100644 --- a/code/api/src/Models/Misc/LoggedInUserModel.cs +++ b/code/api/src/Models/Misc/LoggedInUserModel.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Data.Models; +namespace IOL.GreatOffice.Api.Models.Models; public class LoggedInUserModel { diff --git a/code/api/src/Models/Misc/RequestTimeZoneInfo.cs b/code/api/src/Models/Misc/RequestTimeZoneInfo.cs index 4c5aa13..4d9d8c1 100644 --- a/code/api/src/Models/Misc/RequestTimeZoneInfo.cs +++ b/code/api/src/Models/Misc/RequestTimeZoneInfo.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Data.Models; +namespace IOL.GreatOffice.Api.Models.Models; public class RequestTimeZoneInfo { |