First pass at bringing more structure to the code with the end goal o…

…f being able to better facilitate testing.

GlucoseTray/Services/AlertService.cs → GlucoseTray.Domain/DisplayResults/AlertService.cs

@@ -1,6 +1,6 @@
-using GlucoseTray.Settings;
+using GlucoseTray.Domain.Enums;
 
-namespace GlucoseTray.Services;
+namespace GlucoseTray.Domain.DisplayResults;
 
 public class AlertService(ISettingsProxy options, IUiService uiService)
 {

GlucoseTray/Extensions/GlucoseFetchResultExtensions.cs → GlucoseTray.Domain/DisplayResults/GlucoseFetchResultExtensions.cs

@@ -1,4 +1,6 @@
-namespace GlucoseTray.Extensions;
+using GlucoseTray.Domain.Enums;
+
+namespace GlucoseTray.Domain.DisplayResults;
 
 public static class GlucoseFetchResultExtensions
 {

GlucoseTray.Domain/DisplayResults/IUiService.cs

@@ -0,0 +1,11 @@
+namespace GlucoseTray.Domain.DisplayResults;
+
+public interface IUiService
+{
+    void ShowErrorAlert(string messageBoxText, string caption);
+    void InitializeTrayIcon(EventHandler exitEvent);
+    void DisposeTrayIcon();
+    void CreateIcon(GlucoseResult glucoseResult);
+    void ShowAlert(string alertName);
+    void ShowCriticalAlert(string alertText, string alertName);
+}

GlucoseTray/Extensions/StringExtensions.cs → GlucoseTray.Domain/DisplayResults/StringExtensions.cs

@@ -1,4 +1,6 @@
-namespace GlucoseTray.Extensions;
+using GlucoseTray.Domain.Enums;
+
+namespace GlucoseTray.Domain.DisplayResults;
 
 public static class StringExtensions
 {

GlucoseTray/Enums/AlertLevel.cs → GlucoseTray.Domain/Enums/AlertLevel.cs

@@ -1,4 +1,4 @@
-namespace GlucoseTray.Enums;
+namespace GlucoseTray.Domain.Enums;
 
 public enum AlertLevel
 {

GlucoseTray/Enums/DexcomServer.cs → GlucoseTray.Domain/Enums/DexcomServer.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace GlucoseTray.Enums;
+namespace GlucoseTray.Domain.Enums;
 
 public enum DexcomServerLocation
 {

GlucoseTray/Enums/FetchMethod.cs → GlucoseTray.Domain/Enums/FetchMethod.cs

@@ -1,4 +1,4 @@
-namespace GlucoseTray.Enums;
+namespace GlucoseTray.Domain.Enums;
 
 public enum FetchMethod
 {

GlucoseTray/Enums/GlucoseUnitType.cs → GlucoseTray.Domain/Enums/GlucoseUnitType.cs

@@ -1,4 +1,4 @@
-namespace GlucoseTray.Enums;
+namespace GlucoseTray.Domain.Enums;
 
 public enum GlucoseUnitType
 {

GlucoseTray/Enums/TrendResult.cs → GlucoseTray.Domain/Enums/TrendResult.cs

@@ -1,4 +1,4 @@
-namespace GlucoseTray.Enums;
+namespace GlucoseTray.Domain.Enums;
 
 public enum TrendResult
 {

GlucoseTray/Enums/UpDown.cs → GlucoseTray.Domain/Enums/UpDown.cs

@@ -1,4 +1,4 @@
-namespace GlucoseTray.Enums;
+namespace GlucoseTray.Domain.Enums;
 
 public enum UpDown
 {

GlucoseTray/Services/DebugService.cs → GlucoseTray.Domain/FetchResults/DebugService.cs

@@ -1,4 +1,6 @@
-namespace GlucoseTray.Services;
+using GlucoseTray.Domain.DisplayResults;
+
+namespace GlucoseTray.Domain.FetchResults;
 
 public class DebugService(IUiService uiService)
 {

GlucoseTray/Models/DexcomResult.cs → GlucoseTray.Domain/FetchResults/DexcomResult.cs

@@ -1,4 +1,4 @@
-namespace GlucoseTray.Models;
+namespace GlucoseTray.Domain.FetchResults;
 
 /// <summary>
 /// Class that maps to the JSON received from DexCom queries.

GlucoseTray/Services/DexcomService.cs → GlucoseTray.Domain/FetchResults/DexcomService.cs

@@ -1,9 +1,10 @@
-using GlucoseTray.Settings;
+using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.Domain.Enums;
 using Microsoft.Extensions.Logging;
 using System.Linq;
 using System.Text.Json;
 
-namespace GlucoseTray.Services;
+namespace GlucoseTray.Domain.FetchResults;
 
 public interface IDexcomService
 {
@@ -84,7 +85,7 @@ private async Task<string> GetSessionId(string accountId)
     {
         var sessionIdRequestJson = JsonSerializer.Serialize(new
         {
-            accountId = accountId,
+            accountId,
             applicationId = "d8665ade-9673-4e27-9ff6-92db4ce13d13",
             password = _options.DexcomPassword
         });

GlucoseTray/Services/GlucoseFetchService.cs → GlucoseTray.Domain/FetchResults/GlucoseFetchService.cs

@@ -1,7 +1,7 @@
-using GlucoseTray.Settings;
+using GlucoseTray.Domain.Enums;
 using Microsoft.Extensions.Logging;
 
-namespace GlucoseTray.Services;
+namespace GlucoseTray.Domain.FetchResults;
 
 public interface IGlucoseFetchService
 {

GlucoseTray/Services/GlucoseMath.cs → GlucoseTray.Domain/FetchResults/GlucoseMath.cs

@@ -1,18 +1,18 @@
-using GlucoseTray.Settings;
+using GlucoseTray.Domain.Enums;
 
-namespace GlucoseTray.Services;
+namespace GlucoseTray.Domain.FetchResults;
 
-internal static class GlucoseMath
+public static class GlucoseMath
 {
     private static bool IsCriticalLow(GlucoseResult result, ISettingsProxy currentSettings)
     {
         if (result.MmolValue == 0) // Don't treat a zero / null / default result as critical low.
             return false;
-        return (currentSettings.GlucoseUnit == GlucoseUnitType.MMOL && result.MmolValue <= currentSettings.CriticalLowBg)
-            || (currentSettings.GlucoseUnit == GlucoseUnitType.MG && result.MgValue <= currentSettings.CriticalLowBg);
+        return currentSettings.GlucoseUnit == GlucoseUnitType.MMOL && result.MmolValue <= currentSettings.CriticalLowBg
+            || currentSettings.GlucoseUnit == GlucoseUnitType.MG && result.MgValue <= currentSettings.CriticalLowBg;
     }
 
-    internal static void CalculateValues(GlucoseResult result, double value, ISettingsProxy currentSettings)
+    public static void CalculateValues(GlucoseResult result, double value, ISettingsProxy currentSettings)
     {
         if (value == 0)
         {

GlucoseTray.Domain/FetchResults/IExternalCommunicationAdapter.cs

@@ -0,0 +1,8 @@
+namespace GlucoseTray.Domain.FetchResults
+{
+    public interface IExternalCommunicationAdapter
+    {
+        Task<string> PostApiResponseAsync(string url, string? content = null);
+        Task<string> GetApiResponseAsync(string url, string? content = null);
+    }
+}

GlucoseTray/Models/NightScoutResult.cs → GlucoseTray.Domain/FetchResults/NightScoutResult.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace GlucoseTray.Models;
+namespace GlucoseTray.Domain.FetchResults;
 
 /// <summary>
 /// Class that maps to the JSON from NightScout queries.

GlucoseTray/Services/NightscoutService.cs → GlucoseTray.Domain/FetchResults/NightscoutService.cs

@@ -1,31 +1,23 @@
-using GlucoseTray.Settings;
+using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.Domain.Enums;
 using Microsoft.Extensions.Logging;
 using System.Linq;
 using System.Text.Json;
 
-namespace GlucoseTray.Services;
+namespace GlucoseTray.Domain.FetchResults;
 
 public interface INightscoutService
 {
     Task<GlucoseResult> GetLatestReadingAsync();
 }
 
-public class NightscoutService : INightscoutService
+public class NightscoutService(ISettingsProxy options, ILogger<NightscoutService> logger, UrlAssembler urlBuilder, IExternalCommunicationAdapter externalAdapter, DebugService debug) : INightscoutService
 {
-    private readonly ISettingsProxy _options;
-    private readonly ILogger _logger;
-    private readonly UrlAssembler _urlBuilder;
-    private readonly IExternalCommunicationAdapter _externalAdapter;
-    private readonly DebugService _debug;
-
-    public NightscoutService(ISettingsProxy options, ILogger<NightscoutService> logger, UrlAssembler urlBuilder, IExternalCommunicationAdapter externalAdapter, DebugService debug)
-    {
-        _options = options;
-        _logger = logger;
-        _urlBuilder = urlBuilder;
-        _externalAdapter = externalAdapter;
-        _debug = debug;
-    }
+    private readonly ISettingsProxy _options = options;
+    private readonly ILogger _logger = logger;
+    private readonly UrlAssembler _urlBuilder = urlBuilder;
+    private readonly IExternalCommunicationAdapter _externalAdapter = externalAdapter;
+    private readonly DebugService _debug = debug;
 
     public async Task<GlucoseResult> GetLatestReadingAsync()
     {

GlucoseTray/Services/UrlAssembler.cs → GlucoseTray.Domain/FetchResults/UrlAssembler.cs

@@ -1,15 +1,10 @@
-using GlucoseTray.Settings;
+using GlucoseTray.Domain.Enums;
 
-namespace GlucoseTray.Services;
+namespace GlucoseTray.Domain.FetchResults;
 
-public class UrlAssembler
+public class UrlAssembler(ISettingsProxy options)
 {
-    private readonly ISettingsProxy _options;
-
-    public UrlAssembler(ISettingsProxy options)
-    {
-        _options = options;
-    }
+    private readonly ISettingsProxy _options = options;
 
     public string BuildNightscoutUrl()
     {

GlucoseTray/Models/GlucoseResult.cs → GlucoseTray.Domain/GlucoseResult.cs

@@ -1,4 +1,6 @@
-namespace GlucoseTray.Models;
+using GlucoseTray.Domain.Enums;
+
+namespace GlucoseTray.Domain;
 
 public class GlucoseResult
 {

GlucoseTray.Domain/GlucoseTray.Domain.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+  </ItemGroup>
+
+</Project>

GlucoseTray/Settings/ISettingsProxy.cs → GlucoseTray.Domain/ISettingsProxy.cs

@@ -1,5 +1,6 @@
-
-namespace GlucoseTray.Settings
+using GlucoseTray.Domain.Enums;
+
+namespace GlucoseTray.Domain
 {
     public interface ISettingsProxy
     {

GlucoseTray.Domain/ITaskSchedulerService.cs

@@ -0,0 +1,8 @@
+namespace GlucoseTray.Domain
+{
+    public interface ITaskSchedulerService
+    {
+        bool HasTaskEnabled();
+        void ToggleTask(bool enable);
+    }
+}

GlucoseTray/Services/ExternalCommunicationAdapter.cs → GlucoseTray.Infrastructure/ExternalCommunicationAdapter.cs

@@ -1,17 +1,11 @@
-using GlucoseTray.Settings;
+using GlucoseTray.Domain;
+using GlucoseTray.Domain.FetchResults;
 using Microsoft.Extensions.Logging;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 
-namespace GlucoseTray.Services
+namespace GlucoseTray.Infrastructure
 {
-    public interface IExternalCommunicationAdapter
-    {
-        Task<string> PostApiResponseAsync(string url, string? content = null);
-        Task<string> GetApiResponseAsync(string url, string? content = null);
-    }
-
     public class ExternalCommunicationAdapter : IExternalCommunicationAdapter
     {
         private readonly IHttpClientFactory _httpClientFactory;

GlucoseTray.Infrastructure/GlucoseTray.Infrastructure.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+	<PackageReference Include="TaskScheduler" Version="2.11.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GlucoseTray.Domain\GlucoseTray.Domain.csproj" />
+  </ItemGroup>
+
+</Project>

GlucoseTray/Services/TaskSchedulerService.cs → GlucoseTray.Infrastructure/TaskSchedulerService.cs

@@ -1,9 +1,9 @@
-using Microsoft.Win32.TaskScheduler;
-using System.IO;
+using GlucoseTray.Domain;
+using Microsoft.Win32.TaskScheduler;
 
-namespace GlucoseTray.Services;
+namespace GlucoseTray.Infrastructure;
 
-public class TaskSchedulerService
+public class TaskSchedulerService : ITaskSchedulerService
 {
     private readonly string ExecutablePath = "\"" + Environment.ProcessPath + "\"";
     private readonly string TaskName = "GlucoseTray-" + Environment.UserName;

GlucoseTray.Tests/AlertServiceTests.cs

@@ -1,9 +1,11 @@
 
 using GlucoseTray.Models;
-using GlucoseTray.Enums;
 using GlucoseTray.Services;
 using NSubstitute;
 using GlucoseTray.Settings;
+using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain;
+using GlucoseTray.Domain.DisplayResults;
 
 namespace GlucoseTray.Tests;
 

GlucoseTray.Tests/DebugServiceTests.cs

@@ -1,4 +1,5 @@
-using GlucoseTray.Services;
+using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.Domain.FetchResults;
 using NSubstitute;
 
 namespace GlucoseTray.Tests;

GlucoseTray.Tests/GlucoseFetchResultExtensionTests.cs

@@ -1,6 +1,7 @@
-using GlucoseTray.Enums;
-using GlucoseTray.Extensions;
-using GlucoseTray.Models;
+using GlucoseTray.Domain;
+using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.FetchResults;
+using GlucoseTray.Domain.DisplayResults;
 
 namespace GlucoseTray.Tests;
 

GlucoseTray.Tests/GlucoseTray.Tests.csproj

@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\GlucoseTray.Domain\GlucoseTray.Domain.csproj" />
     <ProjectReference Include="..\GlucoseTray\GlucoseTray.csproj" />
   </ItemGroup>
 

GlucoseTray.Tests/StringExtensionsTests.cs

@@ -1,5 +1,5 @@
-using GlucoseTray.Enums;
-using GlucoseTray.Extensions;
+using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.Domain.Enums;
 
 namespace GlucoseTray.Tests
 {

GlucoseTray.sln

@@ -5,7 +5,11 @@ VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GlucoseTray", "GlucoseTray\GlucoseTray.csproj", "{0A0B15BE-CA2F-4B32-A338-C8B2DF04060E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlucoseTray.Tests", "GlucoseTray.Tests\GlucoseTray.Tests.csproj", "{2D51E5C0-484E-4152-8F1B-1C1CAD05B1D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GlucoseTray.Tests", "GlucoseTray.Tests\GlucoseTray.Tests.csproj", "{2D51E5C0-484E-4152-8F1B-1C1CAD05B1D9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlucoseTray.Infrastructure", "GlucoseTray.Infrastructure\GlucoseTray.Infrastructure.csproj", "{85E701C4-C9D5-4BA7-B5A0-BDA687F6A07A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlucoseTray.Domain", "GlucoseTray.Domain\GlucoseTray.Domain.csproj", "{8341109F-EF71-4EA1-9277-FF612A577929}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +25,14 @@ Global
 		{2D51E5C0-484E-4152-8F1B-1C1CAD05B1D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D51E5C0-484E-4152-8F1B-1C1CAD05B1D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D51E5C0-484E-4152-8F1B-1C1CAD05B1D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85E701C4-C9D5-4BA7-B5A0-BDA687F6A07A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85E701C4-C9D5-4BA7-B5A0-BDA687F6A07A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85E701C4-C9D5-4BA7-B5A0-BDA687F6A07A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85E701C4-C9D5-4BA7-B5A0-BDA687F6A07A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8341109F-EF71-4EA1-9277-FF612A577929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8341109F-EF71-4EA1-9277-FF612A577929}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8341109F-EF71-4EA1-9277-FF612A577929}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8341109F-EF71-4EA1-9277-FF612A577929}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE