Simplified project structure yet better defined our different functio…

…ns of the program.
Delubear · Dec 3, 2024 · 7a3713e · 7a3713e
1 parent 53f128c
commit 7a3713e
Show file tree

Hide file tree

Showing 59 changed files with 272 additions and 256 deletions.
diff --git a/GlucoseTray.Domain/DependencyExtensions.cs b/GlucoseTray.Domain/DependencyExtensions.cs
diff --git a/GlucoseTray.Domain/GlucoseTray.Domain.csproj b/GlucoseTray.Domain/GlucoseTray.Domain.csproj
@@ -10,4 +10,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="DisplayResults\" />
+    <Folder Include="GlucoseSettings\" />
+  </ItemGroup>
+
 </Project>
diff --git a/GlucoseTray.Infrastructure/ExternalCommunicationAdapter.cs b/GlucoseTray.Infrastructure/ExternalCommunicationAdapter.cs
diff --git a/GlucoseTray.Infrastructure/GlucoseTray.Infrastructure.csproj b/GlucoseTray.Infrastructure/GlucoseTray.Infrastructure.csproj
@@ -11,8 +11,4 @@
 	<PackageReference Include="TaskScheduler" Version="2.11.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\GlucoseTray.Domain\GlucoseTray.Domain.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/GlucoseTray.Tests/AlertServiceTests.cs b/GlucoseTray.Tests/AlertServiceTests.cs
@@ -1,9 +1,9 @@
 
 using NSubstitute;
-using GlucoseTray.Domain.Enums;
-using GlucoseTray.Domain;
-using GlucoseTray.Domain.DisplayResults;
-using GlucoseTray.Domain.GlucoseSettings;
+using GlucoseTray.Enums;
+using GlucoseTray.DisplayResults;
+using GlucoseTray.DisplayResults.Contracts;
+using GlucoseTray.GlucoseSettings.Contracts;
 
 namespace GlucoseTray.Tests;
 

diff --git a/GlucoseTray.Tests/DebugServiceTests.cs b/GlucoseTray.Tests/DebugServiceTests.cs
@@ -1,5 +1,5 @@
-using GlucoseTray.Domain.DisplayResults;
-using GlucoseTray.Domain.FetchResults;
+using GlucoseTray.DisplayResults.Contracts;
+using GlucoseTray.FetchResults;
 using NSubstitute;
 
 namespace GlucoseTray.Tests;

diff --git a/GlucoseTray.Tests/GlucoseFetchResultExtensionTests.cs b/GlucoseTray.Tests/GlucoseFetchResultExtensionTests.cs
@@ -1,8 +1,7 @@
-using GlucoseTray.Domain;
-using GlucoseTray.Domain.Enums;
-using GlucoseTray.Domain.DisplayResults;
 using NSubstitute;
-using GlucoseTray.Domain.GlucoseSettings;
+using GlucoseTray.Enums;
+using GlucoseTray.DisplayResults.Extensions;
+using GlucoseTray.GlucoseSettings.Contracts;
 
 namespace GlucoseTray.Tests;
 

diff --git a/GlucoseTray.Tests/GlucoseTray.Tests.csproj b/GlucoseTray.Tests/GlucoseTray.Tests.csproj
@@ -14,7 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\GlucoseTray.Domain\GlucoseTray.Domain.csproj" />
     <ProjectReference Include="..\GlucoseTray\GlucoseTray.csproj" />
   </ItemGroup>
 

diff --git a/GlucoseTray.Tests/SettingsProxyTests.cs b/GlucoseTray.Tests/SettingsProxyTests.cs
@@ -1,5 +1,4 @@
-using GlucoseTray.Domain.Enums;
-using GlucoseTray.Domain.GlucoseSettings;
+using GlucoseTray.Enums;
 using GlucoseTray.GlucoseSettings;
 using Microsoft.Extensions.Options;
 using NSubstitute;

diff --git a/GlucoseTray.Tests/StringExtensionsTests.cs b/GlucoseTray.Tests/StringExtensionsTests.cs
@@ -1,5 +1,5 @@
-using GlucoseTray.Domain.DisplayResults;
-using GlucoseTray.Domain.Enums;
+using GlucoseTray.DisplayResults.Extensions;
+using GlucoseTray.Enums;
 
 namespace GlucoseTray.Tests
 {

diff --git a/GlucoseTray.sln b/GlucoseTray.sln
@@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GlucoseTray", "GlucoseTray\
 EndProject
 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
 		Debug|Any CPU = Debug|Any CPU
@@ -25,14 +21,6 @@ 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

diff --git a/GlucoseTray/AppContext.cs b/GlucoseTray/AppContext.cs
@@ -1,5 +1,4 @@
-using GlucoseTray.Domain;
-using GlucoseTray.Domain.GlucoseSettings;
+using GlucoseTray.GlucoseSettings.Contracts;
 using Microsoft.Extensions.Logging;
 using System.Windows.Forms;
 

diff --git a/...ray.Domain/DisplayResults/AlertService.cs → GlucoseTray/DisplayResults/AlertService.cs b/...ray.Domain/DisplayResults/AlertService.cs → GlucoseTray/DisplayResults/AlertService.cs
@@ -1,7 +1,9 @@
-using GlucoseTray.Domain.Enums;
-using GlucoseTray.Domain.GlucoseSettings;
+using GlucoseTray.DisplayResults.Contracts;
+using GlucoseTray.DisplayResults.Extensions;
+using GlucoseTray.Enums;
+using GlucoseTray.GlucoseSettings.Contracts;
 
-namespace GlucoseTray.Domain.DisplayResults;
+namespace GlucoseTray.DisplayResults;
 
 public class AlertService(ISettingsProxy options, IIconService iconService, IDialogService dialogService, GlucoseResult glucoseResult)
 {

diff --git a/...y.Domain/DisplayResults/IDialogService.cs → ...isplayResults/Contracts/IDialogService.cs b/...y.Domain/DisplayResults/IDialogService.cs → ...isplayResults/Contracts/IDialogService.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.DisplayResults;
+namespace GlucoseTray.DisplayResults.Contracts;
 
 public interface IDialogService
 {

diff --git a/...ray.Domain/DisplayResults/IIconService.cs → .../DisplayResults/Contracts/IIconService.cs b/...ray.Domain/DisplayResults/IIconService.cs → .../DisplayResults/Contracts/IIconService.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.DisplayResults
+namespace GlucoseTray.DisplayResults.Contracts
 {
     public interface IIconService
     {

diff --git a/GlucoseTray.Domain/ISchedulingAdapter.cs → ...ayResults/Contracts/ISchedulingAdapter.cs b/GlucoseTray.Domain/ISchedulingAdapter.cs → ...ayResults/Contracts/ISchedulingAdapter.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain
+namespace GlucoseTray.DisplayResults.Contracts
 {
     public interface ISchedulingAdapter
     {

diff --git a/GlucoseTray/DisplayResults/DependencyExtensions.cs b/GlucoseTray/DisplayResults/DependencyExtensions.cs
@@ -0,0 +1,18 @@
+using GlucoseTray.DisplayResults.Contracts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GlucoseTray.DisplayResults;
+
+public static class DependencyExtensions
+{
+    public static IServiceCollection RegisterDisplayResultServices(this IServiceCollection services)
+    {
+        services
+                .AddScoped<AlertService, AlertService>()
+                .AddScoped<ISchedulingAdapter, TaskSchedulerService>()
+                .AddScoped<IIconService, IconService>()
+                .AddScoped<IDialogService, DialogService>();
+
+        return services;
+    }
+}
diff --git a/GlucoseTray/DisplayResults/DialogService.cs b/GlucoseTray/DisplayResults/DialogService.cs
@@ -1,4 +1,4 @@
-using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.DisplayResults.Contracts;
 using System.Windows.Forms;
 
 namespace GlucoseTray.DisplayResults;

diff --git a/...ayResults/GlucoseFetchResultExtensions.cs → ...xtensions/GlucoseFetchResultExtensions.cs b/...ayResults/GlucoseFetchResultExtensions.cs → ...xtensions/GlucoseFetchResultExtensions.cs
@@ -1,6 +1,6 @@
-using GlucoseTray.Domain.Enums;
+using GlucoseTray.Enums;
 
-namespace GlucoseTray.Domain.DisplayResults;
+namespace GlucoseTray.DisplayResults.Extensions;
 
 public static class GlucoseFetchResultExtensions
 {

diff --git a/...Domain/DisplayResults/StringExtensions.cs → ...layResults/Extensions/StringExtensions.cs b/...Domain/DisplayResults/StringExtensions.cs → ...layResults/Extensions/StringExtensions.cs
@@ -1,6 +1,6 @@
-using GlucoseTray.Domain.Enums;
+using GlucoseTray.Enums;
 
-namespace GlucoseTray.Domain.DisplayResults;
+namespace GlucoseTray.DisplayResults.Extensions;
 
 public static class StringExtensions
 {

diff --git a/GlucoseTray/DisplayResults/IconService.cs b/GlucoseTray/DisplayResults/IconService.cs
@@ -1,8 +1,7 @@
-using GlucoseTray.Domain;
-using GlucoseTray.Domain.DisplayResults;
-using GlucoseTray.Domain.Enums;
-using GlucoseTray.Domain.GlucoseSettings;
-using GlucoseTray.GlucoseSettings;
+using GlucoseTray.DisplayResults.Contracts;
+using GlucoseTray.DisplayResults.Extensions;
+using GlucoseTray.Enums;
+using GlucoseTray.GlucoseSettings.Contracts;
 using GlucoseTray.Views.Settings;
 using Microsoft.Extensions.Logging;
 using System.ComponentModel;

diff --git a/...ay.Infrastructure/TaskSchedulerService.cs → ...ay/DisplayResults/TaskSchedulerService.cs b/...ay.Infrastructure/TaskSchedulerService.cs → ...ay/DisplayResults/TaskSchedulerService.cs
@@ -1,7 +1,8 @@
-using GlucoseTray.Domain;
+using GlucoseTray.DisplayResults.Contracts;
 using Microsoft.Win32.TaskScheduler;
+using System.IO;
 
-namespace GlucoseTray.Infrastructure;
+namespace GlucoseTray.DisplayResults;
 
 public class TaskSchedulerService : ISchedulingAdapter
 {

diff --git a/GlucoseTray.Domain/Enums/AlertLevel.cs → GlucoseTray/Enums/AlertLevel.cs b/GlucoseTray.Domain/Enums/AlertLevel.cs → GlucoseTray/Enums/AlertLevel.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.Enums;
+namespace GlucoseTray.Enums;
 
 public enum AlertLevel
 {

diff --git a/GlucoseTray.Domain/Enums/DataSource.cs → GlucoseTray/Enums/DataSource.cs b/GlucoseTray.Domain/Enums/DataSource.cs → GlucoseTray/Enums/DataSource.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.Enums;
+namespace GlucoseTray.Enums;
 
 public enum DataSource
 {

diff --git a/GlucoseTray.Domain/Enums/DexcomServer.cs → GlucoseTray/Enums/DexcomServer.cs b/GlucoseTray.Domain/Enums/DexcomServer.cs → GlucoseTray/Enums/DexcomServer.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace GlucoseTray.Domain.Enums;
+namespace GlucoseTray.Enums;
 
 public enum DexcomServerLocation
 {

diff --git a/GlucoseTray.Domain/Enums/GlucoseUnitType.cs → GlucoseTray/Enums/GlucoseUnitType.cs b/GlucoseTray.Domain/Enums/GlucoseUnitType.cs → GlucoseTray/Enums/GlucoseUnitType.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.Enums;
+namespace GlucoseTray.Enums;
 
 public enum GlucoseUnitType
 {

diff --git a/GlucoseTray.Domain/Enums/TrendResult.cs → GlucoseTray/Enums/TrendResult.cs b/GlucoseTray.Domain/Enums/TrendResult.cs → GlucoseTray/Enums/TrendResult.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.Enums;
+namespace GlucoseTray.Enums;
 
 public enum TrendResult
 {

diff --git a/GlucoseTray.Domain/Enums/UpDown.cs → GlucoseTray/Enums/UpDown.cs b/GlucoseTray.Domain/Enums/UpDown.cs → GlucoseTray/Enums/UpDown.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.Enums;
+namespace GlucoseTray.Enums;
 
 public enum UpDown
 {

diff --git a/GlucoseTray/FetchResults/Contracts/IDexcomService.cs b/GlucoseTray/FetchResults/Contracts/IDexcomService.cs
@@ -0,0 +1,6 @@
+namespace GlucoseTray.FetchResults.Contracts;
+
+public interface IDexcomService
+{
+    Task GetLatestReadingAsync();
+}
diff --git a/...hResults/IExternalCommunicationAdapter.cs → ...ontracts/IExternalCommunicationAdapter.cs b/...hResults/IExternalCommunicationAdapter.cs → ...ontracts/IExternalCommunicationAdapter.cs
@@ -1,4 +1,4 @@
-namespace GlucoseTray.Domain.FetchResults
+namespace GlucoseTray.FetchResults.Contracts
 {
     public interface IExternalCommunicationAdapter
     {

diff --git a/GlucoseTray/FetchResults/Contracts/IGlucoseFetchService.cs b/GlucoseTray/FetchResults/Contracts/IGlucoseFetchService.cs
@@ -0,0 +1,6 @@
+namespace GlucoseTray.FetchResults.Contracts;
+
+public interface IGlucoseFetchService
+{
+    Task GetLatestReadingsAsync();
+}
diff --git a/GlucoseTray/FetchResults/Contracts/INightscoutService.cs b/GlucoseTray/FetchResults/Contracts/INightscoutService.cs
@@ -0,0 +1,6 @@
+namespace GlucoseTray.FetchResults.Contracts;
+
+public interface INightscoutService
+{
+    Task GetLatestReadingAsync();
+}
diff --git a/...eTray.Domain/FetchResults/DebugService.cs → GlucoseTray/FetchResults/DebugService.cs b/...eTray.Domain/FetchResults/DebugService.cs → GlucoseTray/FetchResults/DebugService.cs
@@ -1,6 +1,6 @@
-using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.DisplayResults.Contracts;
 
-namespace GlucoseTray.Domain.FetchResults;
+namespace GlucoseTray.FetchResults;
 
 public class DebugService(IDialogService uiService)
 {