Merge pull request #75 from eugeneniemand/NoMoqUnitTest

No moq unit test

Globals.cs

@@ -10,6 +10,6 @@
 global using NetDaemon.Extensions.Scheduler;
 global using NetDaemon.HassModel.Entities;
 global using NetDaemon.HassModel;
-global using Niemand.Helpers;
+global using NetDaemon.Helpers;
 global using System.Threading;
 global using System.Threading.Tasks;

Helpers/Extentions.cs

@@ -1,18 +1,23 @@
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
+using Niemand;
+using Niemand.Helpers;
 
-namespace Niemand.Helpers;
+namespace NetDaemon.Helpers;
 
 public static class Extentions
 {
     private const int MustBeLessThan = 100000000; // 8 decimal digits
 
-    public static IServiceCollection AddGeneratedCode(this IServiceCollection serviceCollection)
+    public static IServiceCollection SetupDependencies(this IServiceCollection serviceCollection)
         => serviceCollection
            .AddTransient<IEntities, Entities>()
            .AddTransient<IServices, Services>()
            .AddTransient<IAlexa, Alexa>()
-           .AddSingleton<IVoiceProvider, VoiceProvider>();
+           .AddSingleton<IVoiceProvider, VoiceProvider>()
+           .AddScoped<People>()
+           .AddSingleton<IServiceProvider>(sp => sp);
+
 
     public static string GetFixedHash(this string s)
     {

Helpers/Notifications/Alexa.cs

@@ -4,14 +4,23 @@ namespace Niemand.Helpers;
 
 public class Alexa : IAlexa
 {
+    public enum NotificationType
+    {
+        Prompt,
+        Announcement,
+        Tts
+    }
+
     private readonly IDictionary<string, AlexaDeviceConfig> _devices;
     private readonly IEntities                              _entities;
     private readonly IHaContext                             _ha;
     private readonly ILogger<Alexa>                         _logger;
     private readonly Subject<Config>                        _messages = new();
-    private readonly IScheduler                             _scheduler;
-    private readonly IServices                              _services;
-    private readonly IVoiceProvider                         _voice;
+
+    private readonly Subject<PromptResponse> _promptResponses = new();
+    private readonly IScheduler              _scheduler;
+    private readonly IServices               _services;
+    private readonly IVoiceProvider          _voice;
 
 
     public Alexa(IHaContext ha, IEntities entities, IServices services, IScheduler scheduler, IVoiceProvider voice, IAppConfig<AlexaConfig> config, ILogger<Alexa> logger)
@@ -47,7 +56,7 @@ public void Announce(string mediaPlayer, string message) =>
     public void Prompt(string mediaPlayer, string message, string eventId) =>
         QueueNotification(new Config { Entity = mediaPlayer, Message = message, EventId = eventId }, "prompt");
 
-    public Subject<PromptResponse> PromptResponses { get; } = new();
+    public IObservable<PromptResponse> PromptResponses => _promptResponses;
 
     public void TextToSpeech(Config config) =>
         QueueNotification(config, "tts");
@@ -103,7 +112,7 @@ private async Task ProcessNotifications(IEnumerable<Config> cfgs)
 
         foreach (var cfg in cfgs)
         {
-            message          += ( message != "" ? ",,,," : "" ) + cfg.Message;
+            message          += ( message != "" ? ",,,and," : "" ) + cfg.Message;
             entities         =  cfg.Entities;
             notificationType =  cfg.NotifyType;
             eventId          =  cfg.EventId;
@@ -158,7 +167,7 @@ private void SetupResponseHandler(IHaContext haContext)
             if (responseEvent?.Data == null) return;
             if (responseEvent?.Data?.ResponsePersonId != null)
                 responseEvent.Data.ResponsePersonName = People[responseEvent.Data.ResponsePersonId].Name;
-            PromptResponses.OnNext(responseEvent.Data);
+            _promptResponses.OnNext(responseEvent.Data);
         });
     }
 

Helpers/Notifications/AlexaConfig.cs

@@ -2,6 +2,6 @@
 
 public class AlexaConfig
 {
-    public IDictionary<string, AlexaPeopleConfig> People { get; set; }
     public IDictionary<string, AlexaDeviceConfig> Devices { get; set; }
+    public IDictionary<string, AlexaPeopleConfig> People { get; set; }
 }

Helpers/Notifications/AlexaDeviceConfig.cs

@@ -1,4 +1,4 @@
-namespace Niemand.Helpers;
+namespace NetDaemon.Helpers;
 
 public class AlexaDeviceConfig
 {

Helpers/Notifications/IAlexa.cs

@@ -1,14 +1,12 @@
-using System.Reactive.Subjects;
-
-namespace Niemand.Helpers;
+namespace Niemand.Helpers;
 
 public interface IAlexa
 {
+    public Dictionary<string, AlexaPeopleConfig> People { get; }
+    public IObservable<PromptResponse> PromptResponses { get; }
     void Announce(Alexa.Config config);
     void Announce(string mediaPlayer, string message);
     void Prompt(string mediaPlayer, string message, string eventId);
     void TextToSpeech(Alexa.Config config);
     void TextToSpeech(string mediaPlayer, string message);
-    public Subject<PromptResponse> PromptResponses { get; }
-    public Dictionary<string, AlexaPeopleConfig> People { get;  } 
 }

Helpers/Notifications/IVoiceProvider.cs

@@ -1,4 +1,4 @@
-namespace Niemand.Helpers;
+namespace NetDaemon.Helpers;
 
 public interface IVoiceProvider
 {

Helpers/Notifications/PromptResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Niemand.Helpers;
+namespace NetDaemon.Helpers;
 
 public record PromptResponse
 {

Helpers/Notifications/PromptResponseType.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Niemand.Helpers;
+namespace NetDaemon.Helpers;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum PromptResponseType

Helpers/Notifications/VoiceProvider.cs

@@ -1,4 +1,4 @@
-namespace Niemand.Helpers;
+namespace NetDaemon.Helpers;
 
 public class VoiceProvider : IVoiceProvider
 {

Helpers/Shared.cs

@@ -1,4 +1,4 @@
-namespace Niemand.Helpers;
+namespace NetDaemon.Helpers;
 
 public static class Shared
 {