Admin CLI for sending announcements to all identities

Applications/AdminCli/src/AdminCli/AdminCli.csproj

@@ -10,11 +10,22 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\..\..\Infrastructure\Infrastructure.csproj" />
+        <ProjectReference Include="..\..\..\..\Modules\Announcements\src\Announcements.Application\Announcements.Application.csproj" />
+        <ProjectReference Include="..\..\..\..\Modules\Announcements\src\Announcements.Infrastructure\Announcements.Infrastructure.csproj" />
         <ProjectReference Include="..\..\..\..\Modules\Devices\src\Devices.Infrastructure\Devices.Infrastructure.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <None Remove="appsettings.json" />
+        <Content Include="appsettings.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+
 </Project>

Applications/AdminCli/src/AdminCli/Commands/Announcements/AnnouncementCommand.cs

@@ -0,0 +1,134 @@
+using System.CommandLine;
+using System.Text.Json;
+using Backbone.AdminCli.Commands.BaseClasses;
+using Backbone.Modules.Announcements.Application.Announcements.Commands.CreateAnnouncement;
+using Backbone.Modules.Announcements.Domain.Entities;
+using MediatR;
+
+namespace Backbone.AdminCli.Commands.Announcements;
+
+public class AnnouncementCommand : AdminCliCommand
+{
+    public AnnouncementCommand(ServiceLocator serviceLocator) : base("announcement", serviceLocator)
+    {
+        AddCommand(new SendAnnouncementCommand(serviceLocator));
+    }
+}
+
+public class SendAnnouncementCommand : AdminCliDbCommand
+{
+    public SendAnnouncementCommand(ServiceLocator serviceLocator) : base("send", serviceLocator)
+    {
+        var expiresAt = new Option<string?>("--expiration")
+        {
+            IsRequired = false,
+            Description = "The expiration date of the announcement."
+        };
+
+        var severity = new Option<string?>("--severity")
+        {
+            IsRequired = true,
+            Description = "The severity of the announcement."
+        };
+
+        AddOption(expiresAt);
+        AddOption(severity);
+
+        this.SetHandler(SendAnnouncement, DB_PROVIDER_OPTION, DB_CONNECTION_STRING_OPTION, severity, expiresAt);
+    }
+
+    private async Task SendAnnouncement(string dbProvider, string dbConnectionString, string? severityInput, string? expiresAtInput)
+    {
+        try
+        {
+            var severity = severityInput switch
+            {
+                _ when string.IsNullOrWhiteSpace(severityInput) => AnnouncementSeverity.Low,
+                _ when Enum.TryParse<AnnouncementSeverity>(severityInput, ignoreCase: true, out var parsedSeverity) => parsedSeverity,
+                _ => throw new ArgumentException($@"Specified severity '{severityInput}' is not a valid severity.")
+            };
+
+            DateTime? expiresAt = expiresAtInput switch
+            {
+                _ when string.IsNullOrWhiteSpace(expiresAtInput) => null,
+                _ when DateTime.TryParse(expiresAtInput, out var parsedDateTime) => parsedDateTime,
+                _ => throw new ArgumentException($@"Specified expiration datetime '{expiresAtInput}' is not a valid DateTime.")
+            };
+
+            var texts = ReadTextsFromCommandLineInput();
+
+            if (texts.Count == 0)
+            {
+                Console.WriteLine(@"No texts provided. Exiting...");
+                return;
+            }
+
+            Console.WriteLine(@"Sending announcement...");
+
+            var mediator = _serviceLocator.GetService<IMediator>(dbProvider, dbConnectionString);
+
+            var response = await mediator.Send(new CreateAnnouncementCommand
+            {
+                Texts = texts,
+                Severity = severity,
+                ExpiresAt = expiresAt
+            }, CancellationToken.None);
+
+            Console.WriteLine(@"Announcement sent successfully");
+            Console.WriteLine(JsonSerializer.Serialize(response, JSON_SERIALIZER_OPTIONS));
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine($@"An error occurred: {e.Message}");
+        }
+    }
+
+    private static List<CreateAnnouncementCommandText> ReadTextsFromCommandLineInput()
+    {
+        var texts = new List<CreateAnnouncementCommandText>();
+        bool addAnotherLanguage;
+        do
+        {
+            var language = PromptForInput(@"Enter language (e.g. en, de, it, nl). At least 1 must be in english: ");
+            var title = PromptForInput(@"Enter title: ");
+            var body = PromptForInput(@"Enter body: ");
+
+            if (language == null || title == null || body == null)
+            {
+                break;
+            }
+
+            texts.Add(new CreateAnnouncementCommandText
+            {
+                Language = language,
+                Title = title,
+                Body = body
+            });
+
+            var input = PromptForInput(@"Do you want to add another language? ([y]es/[n]o): ");
+            addAnotherLanguage = input?.Trim().ToLower() is "yes" or "y";
+        } while (addAnotherLanguage);
+
+        return texts;
+    }
+
+    private static string? PromptForInput(string prompt)
+    {
+        Console.Write(prompt);
+        var input = Console.ReadLine();
+
+        while (string.IsNullOrWhiteSpace(input))
+        {
+            Console.WriteLine($@"Input cannot be empty. Press x to exit.");
+            Console.Write(prompt);
+            input = Console.ReadLine();
+
+            if (input == null || !input.Trim().Equals("x", StringComparison.CurrentCultureIgnoreCase)) continue;
+
+            input = null;
+            break;
+        }
+
+        return input;
+    }
+}

Applications/AdminCli/src/AdminCli/Commands/RootCommand.cs

@@ -1,3 +1,4 @@
+using Backbone.AdminCli.Commands.Announcements;
 using Backbone.AdminCli.Commands.Clients;
 using Backbone.AdminCli.Commands.Tiers;
 
@@ -9,5 +10,6 @@ public RootCommand(ServiceLocator serviceLocator)
     {
         AddCommand(new ClientCommand(serviceLocator));
         AddCommand(new TierCommand(serviceLocator));
+        AddCommand(new AnnouncementCommand(serviceLocator));
     }
 }

Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs

@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+using Backbone.Infrastructure.EventBus;
+
+namespace Backbone.AdminCli.Configuration;
+
+public class AdminCliConfiguration
+{
+    [Required]
+    public AdminInfrastructureConfiguration Infrastructure { get; set; } = new();
+
+    [Required]
+    public ModulesConfiguration Modules { get; set; } = new();
+
+    public class AdminInfrastructureConfiguration
+    {
+        [Required]
+        public EventBusConfiguration EventBus { get; set; } = new();
+    }
+
+    public class ModulesConfiguration
+    {
+        [Required]
+        public DevicesCliConfiguration Devices { get; set; } = new();
+    }
+}

Applications/AdminCli/src/AdminCli/Configuration/DevicesCliConfiguration.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using Backbone.Modules.Devices.Infrastructure.PushNotifications;
+
+namespace Backbone.AdminCli.Configuration;
+
+public class DevicesCliConfiguration
+{
+    [Required]
+    public InfrastructureConfiguration Infrastructure { get; set; } = new();
+
+    public class InfrastructureConfiguration
+    {
+        [Required]
+        public PushNotificationOptions PushNotifications { get; set; } = new();
+    }
+}

Applications/AdminCli/src/AdminCli/Dockerfile

@@ -18,6 +18,11 @@ COPY ["Modules/Devices/src/Devices.Application/Devices.Application.csproj", "Mod
 COPY ["BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj", "BuildingBlocks/src/BuildingBlocks.Application/"]
 COPY ["BuildingBlocks/src/Crypto/Crypto.csproj", "BuildingBlocks/src/Crypto/"]
 COPY ["Modules/Devices/src/Devices.Domain/Devices.Domain.csproj", "Modules/Devices/src/Devices.Domain/"]
+COPY ["Modules/Announcements/src/Announcements.Application/Announcements.Application.csproj", "Modules/Announcements/src/Announcements.Application/"]
+COPY ["Modules/Announcements/src/Announcements.Infrastructure/Announcements.Infrastructure.csproj", "Modules/Announcements/src/Announcements.Infrastructure/"]
+COPY ["Modules/Announcements/src/Announcements.Domain/Announcements.Domain.csproj", "Modules/Announcements/src/Announcements.Domain/"]
+COPY ["Infrastructure/Infrastructure.csproj", "Infrastructure/"]
+
 
 RUN dotnet restore /p:ContinuousIntegrationBuild=true "Applications/AdminCli/src/AdminCli/AdminCli.csproj"
 
@@ -32,6 +37,9 @@ FROM base AS final
 WORKDIR /app
 COPY --from=build /app/publish/Backbone.AdminCli ./backbone
 
+# Ensure the appsettings.json file is copied to the correct location
+COPY appsettings.json /app/appsettings.json
+
 ENV PATH="$PATH:/app"
 
 LABEL org.opencontainers.image.source="https://github.com/nmshd/backbone"

Applications/AdminCli/src/AdminCli/Properties/launchSettings.json

@@ -10,9 +10,20 @@
       "environmentVariables": {
         "Database__Provider": "Postgres",
         //"Database__ConnectionString": "Server=localhost;Database=enmeshed;User Id=devices;Password=Passw0rd;TrustServerCertificate=True;" //SqlServer
-        "Database__ConnectionString": "User ID=devices;Password=Passw0rd;Server=host.docker.internal;Port=5432;Database=enmeshed;"
+          "Database__ConnectionString": "User ID=postgres;Password=admin;Server=host.docker.internal;Port=5432;Database=enmeshed;"
         //Postgres
       }
-    }
+    },
+      "announcement send": {
+          "commandName": "Project",
+          "commandLineArgs": "announcement send --expiration 2025-12-31 --severity medium",
+          "environmentVariables": {
+              "Database__Provider": "Postgres",
+              "Database__ConnectionString": "User ID=postgres;Password=admin;Server=host.docker.internal;Port=5432;Database=enmeshed;"
+          }
+      }
+
+
+
   }
 }

Applications/AdminCli/src/AdminCli/ServiceLocator.cs

@@ -1,11 +1,20 @@
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Backbone.AdminCli.Configuration;
 using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.Infrastructure.EventBus;
+using Backbone.Modules.Announcements.Infrastructure.Persistence.Database;
 using Backbone.Modules.Devices.Application.Extensions;
 using Backbone.Modules.Devices.Domain.Entities.Identities;
 using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Backbone.Modules.Devices.Infrastructure.Persistence;
 using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
+using Backbone.Modules.Devices.Infrastructure.PushNotifications;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using IServiceCollectionExtensions = Backbone.Modules.Devices.Infrastructure.Persistence.IServiceCollectionExtensions;
+
 
 namespace Backbone.AdminCli;
 
@@ -14,14 +23,15 @@ public class ServiceLocator
     public T GetService<T>(string dbProvider, string dbConnectionString) where T : notnull
     {
         var services = ConfigureServices(dbProvider, dbConnectionString);
-
-        var serviceProvider = services.BuildServiceProvider();
-        return serviceProvider.GetRequiredService<T>();
+        return services.GetRequiredService<T>();
     }
 
-    private static IServiceCollection ConfigureServices(string dbProvider, string dbConnectionString)
+    private static IServiceProvider ConfigureServices(string dbProvider, string dbConnectionString)
     {
         var services = new ServiceCollection();
+
+        services.AddAutofac();
+
         services
             .AddIdentity<ApplicationUser, IdentityRole>()
             .AddEntityFrameworkStores<DevicesDbContext>();
@@ -41,14 +51,38 @@ private static IServiceCollection ConfigureServices(string dbProvider, string db
         services.AddApplicationWithoutIdentityDeletion();
 
         services.AddSingleton<IQuotaChecker, AlwaysSuccessQuotaChecker>();
-
         services.AddLogging();
+        IServiceCollectionExtensions.AddDatabase(services, options =>
+        {
+            options.Provider = dbProvider;
+            options.ConnectionString = dbConnectionString;
+        });
+
+        var configuration = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+            .Build();
+        services.AddSingleton<IConfiguration>(configuration);
+        services.ConfigureAndValidate<AdminCliConfiguration>(configuration.Bind);
+
+        var serviceProvider = services.BuildServiceProvider();
+#pragma warning disable ASP0000 // We retrieve the Configuration via IOptions here so that it is validated
+        var parsedConfiguration = serviceProvider.GetRequiredService<IOptions<AdminCliConfiguration>>().Value;
+#pragma warning restore ASP0000
+
+        services.AddEventBus(parsedConfiguration.Infrastructure.EventBus);
+        services.AddPushNotifications(parsedConfiguration.Modules.Devices.Infrastructure.PushNotifications);
+
+        Modules.Announcements.Application.Extensions.IServiceCollectionExtensions.AddApplication(services);
         services.AddDatabase(options =>
         {
             options.Provider = dbProvider;
             options.ConnectionString = dbConnectionString;
         });
 
-        return services;
+        var containerBuilder = new ContainerBuilder();
+        containerBuilder.Populate(services);
+        var container = containerBuilder.Build();
+        return new AutofacServiceProvider(container);
     }
 }

Applications/AdminCli/src/AdminCli/appsettings.json

@@ -0,0 +1,39 @@
+{
+    "Infrastructure": {
+        "EventBus": {
+            "SubscriptionClientName": "admincli",
+            "Vendor": "RabbitMQ",
+            // possible values: InMemory, RabbitMQ, GoogleCloud, Azure
+            "ConnectionInfo": "localhost",
+            "RabbitMQEnableSsl": false,
+            "RabbitMQUsername": "guest",
+            // only available for RabbitMQ
+            "RabbitMQPassword": "guest",
+            // only available for RabbitMQ
+            "ConnectionRetryCount": 5,
+            // only available for RabbitMQ
+
+            "GcpPubSubProjectId": "",
+            // only available for Google Cloud Pub/Sub
+            "GcpPubSubTopicName": ""
+            // only available for Google Cloud Pub/Sub
+        }
+    },
+    "Modules": {
+        "Devices": {
+            "Infrastructure": {
+                "PushNotifications": {
+                    "Providers": {
+                        "dummy": {
+                            "enabled": true
+                        },
+                        "sse": {
+                            "enabled": true,
+                            "SseServerBaseAddress": "http://localhost:8083"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationTexts/PushNotificationTextProvider.cs

@@ -2,7 +2,6 @@
 using System.Resources;
 using Backbone.BuildingBlocks.Application.PushNotifications;
 using Backbone.Modules.Devices.Domain.Entities.Identities;
-using Backbone.Tooling.Extensions;
 
 namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.NotificationTexts;
 

Modules/Devices/test/Devices.Infrastructure.Tests/Tests/PushNotifications/Connectors/Sse/ServerSentEventsConnectorTests.cs

@@ -3,7 +3,6 @@
 using Backbone.Modules.Devices.Infrastructure.PushNotifications.Responses;
 using FakeItEasy;
 using Microsoft.Extensions.Logging;
-using static Backbone.Modules.Devices.Infrastructure.Tests.TestDataGenerator;
 
 namespace Backbone.Modules.Devices.Infrastructure.Tests.Tests.PushNotifications.Connectors.Sse;