Admin API for sending announcements to specific identities

Applications/AdminApi/http/Announcements/Announcements.bru

@@ -0,0 +1,29 @@
+meta {
+  name: /Announcements
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{baseUrl}}/Announcements
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    "severity": 1,
+    "texts": [
+      {
+        "language": "en",
+        "title": "System Maintenance V2",
+        "body": "The system will be undergoing maintenance on Saturday."
+      }
+    ],
+    "expiresAt": "2023-12-31T23:59:59Z",
+    "recipients": [
+      "did:e:localhost:dids:8234cca0160ff05c785636", 
+      "did:e:localhost:dids:5b8640b14cc9796fbf8d0d"
+    ]
+  }
+}

Applications/AdminApi/http/Announcements/List Announcements.bru

@@ -0,0 +1,11 @@
+meta {
+  name: /Announcements
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{baseUrl}}/Announcements
+  body: none
+  auth: none
+}

Applications/AdminApi/src/AdminApi/Controllers/AnnouncementsController.cs

@@ -16,7 +16,7 @@ public AnnouncementsController(IMediator mediator) : base(mediator)
     }
 
     [HttpPost]
-    public async Task<IActionResult> CreateAnnouncement(CreateAnnouncementCommand request, CancellationToken cancellationToken)
+    public async Task<IActionResult> CreateAnnouncement([FromBody] CreateAnnouncementCommand request, CancellationToken cancellationToken)
     {
         var response = await _mediator.Send(request, cancellationToken);
         return Created(response);

Applications/AdminApi/test/AdminApi.Tests.Integration/api.appsettings.local.override.json

@@ -10,6 +10,15 @@
         }
     },
     "Modules": {
+        "Announcements": {
+            "Infrastructure": {
+                "SqlDatabase": {
+                    "Provider": "Postgres",
+                    "ConnectionString": "User ID=postgres;Password=admin;Server=localhost;Port=5432;Database=enmeshed;" // postgres
+                    // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=sa;Password=Passw0rd;TrustServerCertificate=True" // sqlserver
+                }
+            }
+        },
         "Quotas": {
             "Infrastructure": {
                 "SqlDatabase": {

Applications/ConsumerApi/src/appsettings.json

@@ -52,7 +52,6 @@
         },
         "Devices": {
             "Application": {
-                "DidDomainName": "localhost",
                 "Pagination": {
                     "DefaultPageSize": 50,
                     "MaxPageSize": 200
@@ -79,7 +78,6 @@
         },
         "Messages": {
             "Application": {
-                "DidDomainName": "localhost",
                 "MaxNumberOfUnreceivedMessagesFromOneSender": 20,
                 "Pagination": {
                     "DefaultPageSize": 50,

Applications/ConsumerApi/src/http/Announcements/List Announcements.bru

@@ -0,0 +1,15 @@
+meta {
+  name: /Announcements
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{baseUrl}}/Announcements
+  body: none
+  auth: inherit
+}
+
+params:query {
+  language: en
+}

Applications/ConsumerApi/src/http/Tokens/List Tokens.bru

@@ -11,7 +11,7 @@ get {
 }
 
 params:query {
-  ~ids: TOKsjPynl0FHYJzHnkIo
-  ~PageNumber: 1
-  ~PageSize: 1
+  ids: TOKsjPynl0FHYJzHnkIo
+  PageNumber: 1
+  PageSize: 1
 }

Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/api.appsettings.local.override.json

@@ -6,6 +6,15 @@
         }
     },
     "Modules": {
+        "Announcements": {
+            "Infrastructure": {
+                "SqlDatabase": {
+                    "Provider": "Postgres",
+                    "ConnectionString": "User ID=postgres;Password=admin;Server=localhost;Port=5432;Database=enmeshed;" // postgres
+                    // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=sa;Password=Passw0rd;TrustServerCertificate=True" // sqlserver
+                }
+            }
+        },
         "Challenges": {
             "Infrastructure": {
                 "SqlDatabase": {
@@ -80,6 +89,9 @@
             }
         },
         "Tokens": {
+            "Application": {
+                "DidDomainName": "localhost"
+            },
             "Infrastructure": {
                 "SqlDatabase": {
                     "Provider": "Postgres",

Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Dockerfile

@@ -7,24 +7,33 @@ WORKDIR /src
 COPY ["Directory.Build.props", "."]
 COPY ["Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Job.IdentityDeletion.csproj", "Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/"]
 COPY ["BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj", "BuildingBlocks/src/BuildingBlocks.API/"]
-COPY ["Modules/Devices/src/Devices.Domain/Devices.Domain.csproj", "Modules/Devices/src/Devices.Domain/"]
 COPY ["BuildingBlocks/src/BuildingBlocks.Domain/BuildingBlocks.Domain.csproj", "BuildingBlocks/src/BuildingBlocks.Domain/"]
 COPY ["BuildingBlocks/src/Tooling/Tooling.csproj", "BuildingBlocks/src/Tooling/"]
 COPY ["BuildingBlocks/src/DevelopmentKit.Identity/DevelopmentKit.Identity.csproj", "BuildingBlocks/src/DevelopmentKit.Identity/"]
-COPY ["Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj", "Modules/Devices/src/Devices.Infrastructure/"]
 COPY ["BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj", "BuildingBlocks/src/BuildingBlocks.Infrastructure/"]
 COPY ["BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj", "BuildingBlocks/src/BuildingBlocks.Application.Abstractions/"]
-COPY ["Modules/Devices/src/Devices.Application/Devices.Application.csproj", "Modules/Devices/src/Devices.Application/"]
 COPY ["BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj", "BuildingBlocks/src/BuildingBlocks.Application/"]
 COPY ["Common/src/Common.Infrastructure/Common.Infrastructure.csproj", "Common/src/Common.Infrastructure/"]
 COPY ["BuildingBlocks/src/Crypto/Crypto.csproj", "BuildingBlocks/src/Crypto/"]
 COPY ["Infrastructure/Infrastructure.csproj", "Infrastructure/"]
+COPY ["Modules/Announcements/src/Announcements.Domain/Announcements.Domain.csproj", "Modules/Announcements/src/Announcements.Domain/"]
+COPY ["Modules/Announcements/src/Announcements.Application/Announcements.Application.csproj", "Modules/Announcements/src/Announcements.Application/"]	
+COPY ["Modules/Announcements/src/Announcements.ConsumerApi/Announcements.ConsumerApi.csproj", "Modules/Announcements/src/Announcements.ConsumerApi/"]
+COPY ["Modules/Announcements/src/Announcements.Infrastructure.Database.Postgres/Announcements.Infrastructure.Database.Postgres.csproj", "Modules/Announcements/src/Announcements.Infrastructure.Database.Postgres/"]
+COPY ["Modules/Announcements/src/Announcements.Infrastructure/Announcements.Infrastructure.csproj", "Modules/Announcements/src/Announcements.Infrastructure/"]
+COPY ["Modules/Announcements/src/Announcements.Infrastructure.Database.SqlServer/Announcements.Infrastructure.Database.SqlServer.csproj", "Modules/Announcements/src/Announcements.Infrastructure.Database.SqlServer/"]
 COPY ["Modules/Challenges/src/Challenges.Application/Challenges.Application.csproj", "Modules/Challenges/src/Challenges.Application/"]
 COPY ["Modules/Challenges/src/Challenges.Domain/Challenges.Domain.csproj", "Modules/Challenges/src/Challenges.Domain/"]
 COPY ["Modules/Challenges/src/Challenges.ConsumerApi/Challenges.ConsumerApi.csproj", "Modules/Challenges/src/Challenges.ConsumerApi/"]
 COPY ["Modules/Challenges/src/Challenges.Infrastructure.Database.Postgres/Challenges.Infrastructure.Database.Postgres.csproj", "Modules/Challenges/src/Challenges.Infrastructure.Database.Postgres/"]
 COPY ["Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj", "Modules/Challenges/src/Challenges.Infrastructure/"]
 COPY ["Modules/Challenges/src/Challenges.Infrastructure.Database.SqlServer/Challenges.Infrastructure.Database.SqlServer.csproj", "Modules/Challenges/src/Challenges.Infrastructure.Database.SqlServer/"]
+COPY ["Modules/Devices/src/Devices.Domain/Devices.Domain.csproj", "Modules/Devices/src/Devices.Domain/"]
+COPY ["Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj", "Modules/Devices/src/Devices.Infrastructure/"]
+COPY ["Modules/Devices/src/Devices.Application/Devices.Application.csproj", "Modules/Devices/src/Devices.Application/"]
+COPY ["Modules/Devices/src/Devices.ConsumerApi/Devices.ConsumerApi.csproj", "Modules/Devices/src/Devices.ConsumerApi/"]
+COPY ["Modules/Devices/src/Devices.Infrastructure.Database.Postgres/Devices.Infrastructure.Database.Postgres.csproj", "Modules/Devices/src/Devices.Infrastructure.Database.Postgres/"]
+COPY ["Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/Devices.Infrastructure.Database.SqlServer.csproj", "Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/"]
 COPY ["Modules/Files/src/Files.Application/Files.Application.csproj", "Modules/Files/src/Files.Application/"]
 COPY ["Modules/Files/src/Files.Domain/Files.Domain.csproj", "Modules/Files/src/Files.Domain/"]
 COPY ["Modules/Files/src/Files.ConsumerApi/Files.ConsumerApi.csproj", "Modules/Files/src/Files.ConsumerApi/"]
@@ -62,9 +71,6 @@ COPY ["Modules/Tokens/src/Tokens.ConsumerApi/Tokens.ConsumerApi.csproj", "Module
 COPY ["Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj", "Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/"]
 COPY ["Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj", "Modules/Tokens/src/Tokens.Infrastructure/"]
 COPY ["Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj", "Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/"]
-COPY ["Modules/Devices/src/Devices.ConsumerApi/Devices.ConsumerApi.csproj", "Modules/Devices/src/Devices.ConsumerApi/"]
-COPY ["Modules/Devices/src/Devices.Infrastructure.Database.Postgres/Devices.Infrastructure.Database.Postgres.csproj", "Modules/Devices/src/Devices.Infrastructure.Database.Postgres/"]
-COPY ["Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/Devices.Infrastructure.Database.SqlServer.csproj", "Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/"]
 
 RUN dotnet restore /p:ContinuousIntegrationBuild=true "Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Job.IdentityDeletion.csproj"
 

Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Job.IdentityDeletion.csproj

@@ -20,6 +20,8 @@
         <ProjectReference Include="..\..\..\..\BuildingBlocks\src\BuildingBlocks.Infrastructure\BuildingBlocks.Infrastructure.csproj" />
         <ProjectReference Include="..\..\..\..\BuildingBlocks\src\Tooling\Tooling.csproj" />
         <ProjectReference Include="..\..\..\..\Infrastructure\Infrastructure.csproj" />
+        <ProjectReference Include="..\..\..\..\Modules\Announcements\src\Announcements.Application\Announcements.Application.csproj" />
+        <ProjectReference Include="..\..\..\..\Modules\Announcements\src\Announcements.ConsumerApi\Announcements.ConsumerApi.csproj" />
         <ProjectReference Include="..\..\..\..\Modules\Challenges\src\Challenges.Application\Challenges.Application.csproj" />
         <ProjectReference Include="..\..\..\..\Modules\Challenges\src\Challenges.ConsumerApi\Challenges.ConsumerApi.csproj" />
         <ProjectReference Include="..\..\..\..\Modules\Files\src\Files.Application\Files.Application.csproj" />

Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Program.cs

@@ -4,6 +4,7 @@
 using Backbone.BuildingBlocks.Application.Identities;
 using Backbone.BuildingBlocks.Application.QuotaCheck;
 using Backbone.Infrastructure.EventBus;
+using Backbone.Modules.Announcements.ConsumerApi;
 using Backbone.Modules.Challenges.ConsumerApi;
 using Backbone.Modules.Devices.ConsumerApi;
 using Backbone.Modules.Devices.Infrastructure.PushNotifications;
@@ -93,6 +94,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                 services.AddTransient(typeof(IHostedService), worker);
 
                 services
+                    .AddModule<AnnouncementsModule>(configuration)
                     .AddModule<DevicesModule>(configuration)
                     .AddModule<RelationshipsModule>(configuration)
                     .AddModule<ChallengesModule>(configuration)

Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/ServicesExtensions.cs

@@ -1,10 +1,12 @@
 using Backbone.BuildingBlocks.Application.Identities;
 
 namespace Backbone.Job.IdentityDeletion;
+
 public static class ServicesExtensions
 {
     public static IServiceCollection RegisterIdentityDeleters(this IServiceCollection services)
     {
+        services.AddTransient<IIdentityDeleter, Modules.Announcements.Application.Announcements.IdentityDeleter>();
         services.AddTransient<IIdentityDeleter, Modules.Challenges.Application.Identities.IdentityDeleter>();
         services.AddTransient<IIdentityDeleter, Modules.Devices.Application.Identities.IdentityDeleter>();
         services.AddTransient<IIdentityDeleter, Modules.Files.Application.Identities.IdentityDeleter>();

Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/ActualDeletionWorkerTests.cs

@@ -43,7 +43,7 @@
 
         var auditLogEntriesForDeletedData = auditLogEntries.Where(e => e.MessageKey == MessageKey.DataDeleted).ToList();
 
-        auditLogEntriesForDeletedData.Should().HaveCount(13);
+        auditLogEntriesForDeletedData.Should().HaveCount(14);
 
         auditLogEntriesForDeletedData.Should().AllSatisfy(e =>
         {
@@ -65,6 +65,7 @@
         deletedAggregates.Should().Contain("SyncRuns");
         deletedAggregates.Should().Contain("Datawallets");
         deletedAggregates.Should().Contain("Tokens");
+        deletedAggregates.Should().Contain("AnnouncementRecipients");
     }
 
     [Fact]
@@ -126,7 +127,7 @@
         var assertionContext = GetService<RelationshipsDbContext>();
 
         var relationshipsAfterAct = await assertionContext.Relationships.Where(Relationship.HasParticipant(identityToBeDeleted.Address)).ToListAsync();
         relationshipsAfterAct.Should().BeEmpty();
     }
 
     [Fact]
@@ -147,6 +148,11 @@
         templatesAfterAct.Should().BeEmpty();
     }
 
+    private T GetService<T>() where T : notnull
+    {
+        return _host.Services.CreateScope().ServiceProvider.GetRequiredService<T>();
+    }
+
     #region Seeders
 
     private async Task<Message> SeedDatabaseWithMessage(Relationship relationship, Identity from, Identity to)
@@ -216,9 +222,4 @@
     }
 
     #endregion
-
-    private T GetService<T>() where T : notnull
-    {
-        return _host.Services.CreateScope().ServiceProvider.GetRequiredService<T>();
-    }
 }

BuildingBlocks/src/BuildingBlocks.Application/Extensions/ValidatorExtensions.cs

@@ -31,6 +31,6 @@ public static IRuleBuilderOptions<T, TProperty> In<T, TProperty>(this IRuleBuild
         return ruleBuilder
             .Must(x => (bool)method.Invoke(null, [x])!)
             .WithErrorCode(GenericApplicationErrors.Validation.InvalidPropertyValue().Code)
-            .WithMessage("The ID is not valid. Check length, prefix and the used characters.");
+            .WithMessage("'{PropertyName}': The ID or Address is not valid. Check length, prefix and the used characters.");
     }
 }

BuildingBlocks/src/Tooling/Extensions/IEnumerableExtensions.cs

@@ -0,0 +1,9 @@
+namespace Backbone.Tooling.Extensions;
+
+public static class IEnumerableExtensions
+{
+    public static bool IsEmpty<T>(this IEnumerable<T> items)
+    {
+        return !items.Any();
+    }
+}

BuildingBlocks/src/Tooling/Extensions/StringExtensions.cs

@@ -26,9 +26,4 @@ public static byte[] GetBytes(this string text)
     {
         return Encoding.UTF8.GetBytes(text);
     }
-
-    public static bool IsEmpty<T>(this IEnumerable<T> items)
-    {
-        return !items.Any();
-    }
 }

BuildingBlocks/src/UnitTestTools/FluentValidation/Extensions.cs

@@ -22,13 +22,13 @@ public static void ShouldHaveValidationErrorForId<T>(this TestValidationResult<T
     {
         var errorsForProperty = testValidationResult.ShouldHaveValidationErrorFor(propertyWithInvalidId);
         errorsForProperty.Should().Contain(r =>
-            r.ErrorCode == "error.platform.validation.invalidPropertyValue" && r.ErrorMessage == "The ID is not valid. Check length, prefix and the used characters.");
+            r.ErrorCode == "error.platform.validation.invalidPropertyValue" && r.ErrorMessage.Contains("The ID or Address is not valid. Check length, prefix and the used characters."));
     }
 
     public static void ShouldHaveValidationErrorForIdInCollection<T>(this TestValidationResult<T> testValidationResult, string collectionWithInvalidId, int indexWithInvalidId)
     {
         var errorsForProperty = testValidationResult.ShouldHaveValidationErrorFor($"{collectionWithInvalidId}[{indexWithInvalidId}]");
         errorsForProperty.Should().Contain(r =>
-            r.ErrorCode == "error.platform.validation.invalidPropertyValue" && r.ErrorMessage == "The ID is not valid. Check length, prefix and the used characters.");
+            r.ErrorCode == "error.platform.validation.invalidPropertyValue" && r.ErrorMessage.Contains("The ID or Address is not valid. Check length, prefix and the used characters."));
     }
 }

Modules/Announcements/src/Announcements.Application/Announcements/Commands/CreateAnnouncement/CreateAnnouncementCommand.cs

@@ -9,6 +9,8 @@ public class CreateAnnouncementCommand : IRequest<AnnouncementDTO>
     public required AnnouncementSeverity Severity { get; set; }
     public required List<CreateAnnouncementCommandText> Texts { get; set; }
     public DateTime? ExpiresAt { get; set; }
+
+    public List<string> Recipients { get; set; } = [];
 }
 
 public class CreateAnnouncementCommandText

Modules/Announcements/src/Announcements.Application/Announcements/Commands/CreateAnnouncement/Handler.cs

@@ -1,4 +1,5 @@
-using Backbone.Modules.Announcements.Application.Announcements.DTOs;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Announcements.Application.Announcements.DTOs;
 using Backbone.Modules.Announcements.Application.Infrastructure.Persistence.Repository;
 using Backbone.Modules.Announcements.Domain.Entities;
 using MediatR;
@@ -16,9 +17,11 @@ public Handler(IAnnouncementsRepository announcementsRepository)
 
     public async Task<AnnouncementDTO> Handle(CreateAnnouncementCommand request, CancellationToken cancellationToken)
     {
+        var announcementRecipients = request.Recipients.Select(r => new AnnouncementRecipient(IdentityAddress.Parse(r)));
+
         var texts = request.Texts.Select(t => new AnnouncementText(AnnouncementLanguage.Parse(t.Language), t.Title, t.Body)).ToList();
 
-        var announcement = new Announcement(request.Severity, texts, request.ExpiresAt);
+        var announcement = new Announcement(request.Severity, texts, request.ExpiresAt, announcementRecipients);
 
         await _announcementsRepository.Add(announcement, cancellationToken);
 

Modules/Announcements/src/Announcements.Application/Announcements/Commands/CreateAnnouncement/Validator.cs

@@ -1,5 +1,7 @@
 using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Extensions;
 using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
 using Backbone.Modules.Announcements.Domain.Entities;
 using FluentValidation;
 
@@ -14,7 +16,12 @@ public Validator()
             .WithErrorCode(GenericApplicationErrors.Validation.InvalidPropertyValue().Code)
             .WithMessage("There must be a text for English.");
 
+        RuleFor(x => x.Recipients.Count)
+            .LessThanOrEqualTo(100)
+            .WithErrorCode(GenericApplicationErrors.Validation.InvalidPropertyValue().Code);
+
         RuleForEach(x => x.Texts).SetValidator(new CreateAnnouncementCommandTextValidator());
+        RuleForEach(x => x.Recipients).ValidId<CreateAnnouncementCommand, IdentityAddress>();
     }
 }
 

Modules/Announcements/src/Announcements.Application/Announcements/Commands/DeleteAnnouncementRecipients/DeleteAnnouncementRecipientsCommand.cs

@@ -0,0 +1,13 @@
+using MediatR;
+
+namespace Backbone.Modules.Announcements.Application.Announcements.Commands.DeleteAnnouncementRecipients;
+
+public record DeleteAnnouncementRecipientsCommand : IRequest
+{
+    public DeleteAnnouncementRecipientsCommand(string identityAddress)
+    {
+        IdentityAddress = identityAddress;
+    }
+
+    public string IdentityAddress { get; }
+}

Modules/Announcements/src/Announcements.Application/Announcements/Commands/DeleteAnnouncementRecipients/Handler.cs

@@ -0,0 +1,22 @@
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Announcements.Application.Infrastructure.Persistence.Repository;
+using MediatR;
+
+namespace Backbone.Modules.Announcements.Application.Announcements.Commands.DeleteAnnouncementRecipients;
+
+public class Handler : IRequestHandler<DeleteAnnouncementRecipientsCommand>
+{
+    private readonly IAnnouncementsRepository _announcementsRepository;
+
+    public Handler(IAnnouncementsRepository announcementsRepository)
+    {
+        _announcementsRepository = announcementsRepository;
+    }
+
+    public async Task Handle(DeleteAnnouncementRecipientsCommand request, CancellationToken cancellationToken)
+    {
+        var parsedIdentityAddress = IdentityAddress.Parse(request.IdentityAddress);
+
+        await _announcementsRepository.DeleteRecipients(r => r.Address == parsedIdentityAddress, cancellationToken);
+    }
+}