Merge branch 'main' into ABL-174-admin-api-send-announcements-to-spec…

…ify-identities
nmshd · Jan 27, 2025 · 0f7ccd0 · 0f7ccd0
2 parents 297a235 + 0421851
commit 0f7ccd0
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 119 deletions.
diff --git a/.ci/appsettings.override.postgres.docker.json b/.ci/appsettings.override.postgres.docker.json
@@ -79,7 +79,8 @@
         },
         "Messages": {
             "Application": {
-                "DidDomainName": "localhost"
+                "DidDomainName": "localhost",
+                "MaxNumberOfMessageRecipients": 5
             },
             "Infrastructure": {
                 "SqlDatabase": {

diff --git a/.ci/appsettings.override.postgres.local.json b/.ci/appsettings.override.postgres.local.json
@@ -79,7 +79,8 @@
         },
         "Messages": {
             "Application": {
-                "DidDomainName": "localhost"
+                "DidDomainName": "localhost",
+                "MaxNumberOfMessageRecipients": 5
             },
             "Infrastructure": {
                 "SqlDatabase": {

diff --git a/.ci/appsettings.override.sqlserver.docker.json b/.ci/appsettings.override.sqlserver.docker.json
@@ -79,7 +79,8 @@
         },
         "Messages": {
             "Application": {
-                "DidDomainName": "localhost"
+                "DidDomainName": "localhost",
+                "MaxNumberOfMessageRecipients": 5
             },
             "Infrastructure": {
                 "SqlDatabase": {

diff --git a/.ci/appsettings.override.sqlserver.local.json b/.ci/appsettings.override.sqlserver.local.json
@@ -79,7 +79,8 @@
         },
         "Messages": {
             "Application": {
-                "DidDomainName": "localhost"
+                "DidDomainName": "localhost",
+                "MaxNumberOfMessageRecipients": 5
             },
             "Infrastructure": {
                 "SqlDatabase": {

diff --git a/Applications/ConsumerApi/src/appsettings.json b/Applications/ConsumerApi/src/appsettings.json
@@ -85,7 +85,8 @@
                 "Pagination": {
                     "DefaultPageSize": 50,
                     "MaxPageSize": 200
-                }
+                },
+                "MaxNumberOfMessageRecipients": 1
             },
             "Infrastructure": {
                 "SqlDatabase": {

diff --git a/...ations/ConsumerApi/test/ConsumerApi.Tests.Integration/api.appsettings.local.override.json b/...ations/ConsumerApi/test/ConsumerApi.Tests.Integration/api.appsettings.local.override.json
@@ -50,7 +50,8 @@
         },
         "Messages": {
             "Application": {
-                "DidDomainName": "localhost"
+                "DidDomainName": "localhost",
+                "MaxNumberOfMessageRecipients": 5
             },
             "Infrastructure": {
                 "SqlDatabase": {

diff --git a/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/package-lock.json b/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/package-lock.json
diff --git a/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/package.json b/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/package.json
@@ -2,10 +2,10 @@
     "name": "enmshed-backbone-performance-tests",
     "license": "MIT",
     "devDependencies": {
-        "@babel/core": "7.26.0",
+        "@babel/core": "7.26.7",
         "@babel/plugin-proposal-class-properties": "7.18.6",
         "@babel/plugin-proposal-object-rest-spread": "7.20.7",
-        "@babel/preset-env": "7.26.0",
+        "@babel/preset-env": "7.26.7",
         "@babel/preset-typescript": "7.26.0",
         "@js-soft/eslint-config-ts": "1.6.13",
         "@js-soft/license-check": "1.0.9",

diff --git a/Modules/Messages/src/Messages.Application/ApplicationOptions.cs b/Modules/Messages/src/Messages.Application/ApplicationOptions.cs
@@ -14,6 +14,9 @@ public class ApplicationOptions
     [MinLength(3)]
     [MaxLength(45)]
     public string DidDomainName { get; set; } = null!;
+
+    [Required]
+    public int MaxNumberOfMessageRecipients { get; set; }
 }
 
 public class PaginationOptions

diff --git a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/Validator.cs b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/Validator.cs
@@ -5,12 +5,13 @@
 using Backbone.Modules.Messages.Domain.Ids;
 using Backbone.Tooling.Extensions;
 using FluentValidation;
+using Microsoft.Extensions.Options;
 
 namespace Backbone.Modules.Messages.Application.Messages.Commands.SendMessage;
 
 public class Validator : AbstractValidator<SendMessageCommand>
 {
-    public Validator()
+    public Validator(IOptions<ApplicationOptions> options)
     {
         RuleFor(m => m.Recipients)
             .DetailedNotNull()
@@ -21,7 +22,8 @@ public Validator()
                 .SetValidator(new SendMessageCommandRecipientInformationValidator()));
 
         RuleFor(m => m.Recipients.Count)
-            .InclusiveBetween(1, 50).WithErrorCode(GenericApplicationErrors.Validation.InvalidPropertyValue().Code);
+            .LessThanOrEqualTo(options.Value.MaxNumberOfMessageRecipients)
+            .WithErrorCode(GenericApplicationErrors.Validation.InvalidPropertyValue().Code);
 
         RuleFor(m => m.Body).DetailedNotNull().NumberOfBytes(1, 10.Mebibytes());