Commit 61a65077: fix folder path, remove obsolete extensions

AvailabilityExtensionsTest.cs

-68

/UnitTest/AvailabilityExtensionsTest.cs

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

ColorExtensionsTest.cs

-68

/UnitTest/ColorExtensionsTest.cs

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

DateTimeExtensionsTest.cs

-68

/UnitTest/DateTimeExtensionsTest.cs

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

ListExtensionsTest.cs

-68

/UnitTest/ListExtensionsTest.cs

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

StringExtensionsTest.cs

-68

/UnitTest/StringExtensionsTest.cs

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

TemperatureExtensionsTest.cs

-68

/UnitTest/TemperatureExtensionsTest.cs

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

UnitTest.csproj

-68

/UnitTest/UnitTest.csproj

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

DateTimeExtensions.cs

-68

/WPE.App.Extensions/DateTimeExtensions.cs

Renamed from

/WPE.App.Utils/DateTimeExtensions.cs

View

using Microsoft.AspNetCore.Components;

using Microsoft.Extensions.Logging;

namespace Infsoft.WPE.App.Services.Analytics.Logging

{

/// <summary>

/// Implements <see cref="IAnalyticsService"/> as logging only

/// </summary>

internal class LoggingAnalyticsService(ILogger<LoggingAnalyticsService> Logger, IPageTitleCache PageTitleCache, NavigationManager NavigationManager) : IAnalyticsService

{

/// <inheritdoc/>

public Task OnClick(string name, string text, InteractionType interactionType, string location) => Log($"Clicked {interactionType} with name '{name}' and text '{text}' at location {location}");

/// <inheritdoc/>

public Task OnSearch(int numberOfResults, string searchLocation, string? term = null, Dictionary<string, List<string>>? filters = null, DateTime? startDate = null, DateTime? endDate = null)

{

var msg = "Performed search";

var restrictions = new List<string>();

if (term is not null)

restrictions.Add($"term {term}");

if (filters is not null)

restrictions.Add($"filters: {string.Join(';', filters.Select(kv => $"{kv.Key}={string.Join(',', kv.Value)}"))}");

if (startDate is not null)

restrictions.Add($"startDate: {startDate.Value:o}");

if (endDate is not null)

restrictions.Add($"endDate: {endDate.Value:o}");

if (restrictions.Count != 0)

msg += $" with {string.Join(" and ", restrictions)}";

msg += $" at location {searchLocation} returning {numberOfResults} results";

if (startDate is null && endDate is not null)

Logger.LogWarning("End date was logged without start date, this is not supported");

return Log(msg);

}

/// <inheritdoc/>

public async Task Init() {

await Log("Initialized service");

await OnPageView(NavigationManager.ToBaseRelativePath(NavigationManager.Uri).Split('?')[0]);

}

/// <inheritdoc/>

public Task OnConsentUpdate(Dictionary<string, bool> givenConsents) => Log($"Updated consent: {string.Join(',', givenConsents.Select(consent => $"{consent.Key}: {consent.Value}"))}");

/// <inheritdoc/>

public Task OnLogin() => Log("Perfomed login");

/// <inheritdoc/>

public Task OnPageView(string relativeUrl) {

relativeUrl = $"/{relativeUrl}";

return Log($"Opened page with name '{relativeUrl}' and title '{(PageTitleCache.TryGetPageTitle(relativeUrl, out var title) ? title : "Unknown")}'");

}

/// <inheritdoc/>

public Task OnSilentLogin() => Log("Perfomed silent login");

private Task Log(string message)

{

using var scope = Logger.BeginScope("Analytics");

Logger.LogInformation("{Message}", message);

return Task.CompletedTask;

}

NavigationManagerExtensions.cs

/WPE.App.Extensions/NavigationManagerExtensions.cs

Renamed from

/WPE.App.Utils/NavigationManagerExtensions.cs

View

The file content is identical.

StringExtensions.cs

/WPE.App.Extensions/StringExtensions.cs

View

WPE.App.Extensions.csproj

/WPE.App.Extensions/WPE.App.Extensions.csproj

Renamed from

/WPE.App.Utils/WPE.App.Extensions.csproj

View

Availability.cs

/WPE.App.Utils/Models/Availability.cs

View

StateColor.cs

/WPE.App.Utils/Models/StateColor.cs

View

TemperatureUnit.cs

/WPE.App.Utils/Models/TemperatureUnit.cs

View

AvailabilityExtensions.cs

/WPE.App.Utils/AvailabilityExtensions.cs

View

ColorExtensions.cs

/WPE.App.Utils/ColorExtensions.cs

View

ListExtensions.cs

/WPE.App.Utils/ListExtensions.cs

View

StringExtensions.cs

/WPE.App.Utils/StringExtensions.cs

View

TemperatureExtensions.cs

/WPE.App.Utils/TemperatureExtensions.cs

View

WPE.App.Extensions.sln

/WPE.App.Extensions.sln

View



	UnitTest
	AvailabilityExtensionsTest.cs
	ColorExtensionsTest.cs
	DateTimeExtensionsTest.cs
	ListExtensionsTest.cs
	StringExtensionsTest.cs
	TemperatureExtensionsTest.cs
	UnitTest.csproj
	WPE.App.Extensions
	DateTimeExtensions.cs rename, edit
	NavigationManagerExtensions.cs rename
	StringExtensions.cs +
	WPE.App.Extensions.csproj rename, edit
	WPE.App.Utils
	Models
	Availability.cs
	StateColor.cs
	TemperatureUnit.cs
	AvailabilityExtensions.cs
	ColorExtensions.cs
	ListExtensions.cs
	StringExtensions.cs
	TemperatureExtensions.cs
	WPE.App.Extensions.sln