Added a configurable limit to the number of groups a user can create …

Src/DeUrgenta.Api/Startup.cs

@@ -48,7 +48,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddUserApiServices();
             services.AddBackpackApiServices();
-            services.AddGroupApiServices();
+            services.AddGroupApiServices(Configuration);
             services.AddCertificationsApiServices();         
             services.AddEventsApiServices();
             services.AddAdminApiServices();

Src/DeUrgenta.Api/appsettings.json

@@ -44,5 +44,9 @@
     "Region": "",
     "AWS_ACCESS_KEY_ID": "",
     "AWS_SECRET_ACCESS_KEY": ""
+  },
+  "Group": {
+    "MaxJoinedGroupsPerUser": 5,
+    "MaxCreatedGroupsPerUser": 5
   }
 }

Src/DeUrgenta.Group.Api/BootstrappingExtensions.cs

@@ -1,17 +1,19 @@
 using DeUrgenta.Common.Validation;
 using DeUrgenta.Group.Api.Commands;
 using DeUrgenta.Group.Api.Models;
+using DeUrgenta.Group.Api.Options;
 using DeUrgenta.Group.Api.Queries;
 using DeUrgenta.Group.Api.Validators;
 using DeUrgenta.Group.Api.Validators.RequestValidators;
 using FluentValidation;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DeUrgenta.Group.Api
 {
     public static class BootstrappingExtensions
     {
-        public static IServiceCollection AddGroupApiServices(this IServiceCollection services)
+        public static IServiceCollection AddGroupApiServices(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddTransient<IValidateRequest<AddGroup>, AddGroupValidator>();
             services.AddTransient<IValidateRequest<AddSafeLocation>, AddSafeLocationValidator>();
@@ -29,6 +31,8 @@ public static IServiceCollection AddGroupApiServices(this IServiceCollection ser
             services.AddTransient<IValidator<GroupRequest>, GroupRequestValidator>();
             services.AddTransient<IValidator<SafeLocationRequest>, SafeLocationRequestValidator>();
 
+            services.Configure<GroupsConfig>(configuration.GetSection(GroupsConfig.SectionName));
+
             return services;
         }
     }

Src/DeUrgenta.Group.Api/CommandHandlers/AddGroupHandler.cs

@@ -31,7 +31,7 @@ public async Task<Result<GroupModel>> Handle(AddGroup request, CancellationToken
             }
 
             var user = await _context.Users.FirstAsync(u => u.Sub == request.UserSub, cancellationToken);
-            
+
             var newBackpack = new Backpack
             {
                 Name = $"Backpack for {request.Group.Name}"

Src/DeUrgenta.Group.Api/CommandHandlers/InviteToGroupHandler.cs

@@ -1,11 +1,13 @@
-using System.Threading;
+using System.Configuration;
+using System.Threading;
 using System.Threading.Tasks;
 using CSharpFunctionalExtensions;
 using DeUrgenta.Common.Validation;
 using DeUrgenta.Domain;
 using DeUrgenta.Domain.Entities;
 using DeUrgenta.Group.Api.Commands;
 using MediatR;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
 namespace DeUrgenta.Group.Api.CommandHandlers

Src/DeUrgenta.Group.Api/Options/GroupsConfig.cs

@@ -0,0 +1,10 @@
+namespace DeUrgenta.Group.Api.Options
+{
+    public class GroupsConfig
+    {
+        public const string SectionName = "Groups";
+
+        public int MaxJoinedGroupsPerUser { get; set; }
+        public int MaxCreatedGroupsPerUser { get; set; }
+    }
+}

Src/DeUrgenta.Group.Api/Validators/AddGroupValidator.cs

@@ -2,17 +2,27 @@
 using DeUrgenta.Common.Validation;
 using DeUrgenta.Domain;
 using DeUrgenta.Group.Api.Commands;
+using DeUrgenta.Group.Api.Options;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 namespace DeUrgenta.Group.Api.Validators
 {
     public class AddGroupValidator : IValidateRequest<AddGroup>
     {
         private readonly DeUrgentaContext _context;
+        private readonly GroupsConfig _groupsConfig;
 
-        public AddGroupValidator(DeUrgentaContext context)
+        public AddGroupValidator(DeUrgentaContext context, GroupsConfig groupsConfig)
         {
             _context = context;
+            _groupsConfig = groupsConfig;
+        }
+
+        public AddGroupValidator(DeUrgentaContext context, IOptions<GroupsConfig> groupsConfig)
+        {
+            _context = context;
+            _groupsConfig = groupsConfig.Value;
         }
 
         public async Task<bool> IsValidAsync(AddGroup request)
@@ -22,6 +32,11 @@ public async Task<bool> IsValidAsync(AddGroup request)
             {
                 return false;
             }
+
+            if (user.GroupsAdministered.Count >= _groupsConfig.MaxCreatedGroupsPerUser)
+            {
+                return false;
+            }
 
             return true;
         }

Src/DeUrgenta.Group.Api/Validators/InviteToGroupValidator.cs

@@ -2,17 +2,27 @@
 using DeUrgenta.Common.Validation;
 using DeUrgenta.Domain;
 using DeUrgenta.Group.Api.Commands;
+using DeUrgenta.Group.Api.Options;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 namespace DeUrgenta.Group.Api.Validators
 {
     public class InviteToGroupValidator : IValidateRequest<InviteToGroup>
     {
         private readonly DeUrgentaContext _context;
+        private readonly GroupsConfig _groupsConfig;
 
-        public InviteToGroupValidator(DeUrgentaContext context)
+        public InviteToGroupValidator(DeUrgentaContext context, GroupsConfig groupsConfig)
         {
             _context = context;
+            _groupsConfig = groupsConfig;
+        }
+
+        public InviteToGroupValidator(DeUrgentaContext context, IOptions<GroupsConfig> groupsConfig)
+        {
+            _context = context;
+            _groupsConfig = groupsConfig.Value;
         }
 
         public async Task<bool> IsValidAsync(InviteToGroup request)
@@ -53,6 +63,11 @@ public async Task<bool> IsValidAsync(InviteToGroup request)
             {
                 return false;
             }
+
+            if (invitedUser.GroupsMember.Count >= _groupsConfig.MaxJoinedGroupsPerUser)
+            {
+                return false;
+            }
 
             return true;
         }

Src/DeUrgenta.User.Api/Controller/UserController.cs

@@ -247,14 +247,14 @@ public async Task<ActionResult> DeleteLocationAsync([FromRoute] Guid locationId)
         /// </summary>
         /// <returns></returns>
         [HttpGet("group-invites")]
-        [SwaggerResponse(StatusCodes.Status200OK, "Get group invites for current user", typeof(IImmutableList<GropInviteModel>))]
+        [SwaggerResponse(StatusCodes.Status200OK, "Get group invites for current user", typeof(IImmutableList<GroupInviteModel>))]
         [SwaggerResponse(StatusCodes.Status400BadRequest, "A business rule was violated", typeof(ProblemDetails))]
         [SwaggerResponse(StatusCodes.Status500InternalServerError, "Something bad happened", typeof(ProblemDetails))]
 
         [SwaggerResponseExample(StatusCodes.Status200OK, typeof(GetGroupInvitesResponseExample))]
         [SwaggerResponseExample(StatusCodes.Status400BadRequest, typeof(BusinessRuleViolationResponseExample))]
         [SwaggerResponseExample(StatusCodes.Status500InternalServerError, typeof(ApplicationErrorResponseExample))]
-        public async Task<ActionResult<GropInviteModel>> GetGroupInvitesAsync()
+        public async Task<ActionResult<GroupInviteModel>> GetGroupInvitesAsync()
         {
             var sub = User.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;
             var query = new GetGroupInvites(sub);

Src/DeUrgenta.User.Api/Models/GropInviteModel.cs → Src/DeUrgenta.User.Api/Models/GroupInviteModel.cs

@@ -2,7 +2,7 @@
 
 namespace DeUrgenta.User.Api.Models
 {
-    public sealed record GropInviteModel
+    public sealed record GroupInviteModel
     {
         public Guid InviteId { get; init; }
         public Guid GroupId { get; init; }

Src/DeUrgenta.User.Api/Queries/GetGroupInvites.cs

@@ -5,7 +5,7 @@
 
 namespace DeUrgenta.User.Api.Queries
 {
-    public class GetGroupInvites : IRequest<Result<IImmutableList<GropInviteModel>>>
+    public class GetGroupInvites : IRequest<Result<IImmutableList<GroupInviteModel>>>
     {
         public string UserSub { get; }
 

Src/DeUrgenta.User.Api/QueryHandlers/GetGroupInvitesHandler.cs

@@ -12,7 +12,7 @@
 
 namespace DeUrgenta.User.Api.QueryHandlers
 {
-    public class GetGroupInvitesHandler : IRequestHandler<GetGroupInvites, Result<IImmutableList<GropInviteModel>>>
+    public class GetGroupInvitesHandler : IRequestHandler<GetGroupInvites, Result<IImmutableList<GroupInviteModel>>>
     {
         private readonly IValidateRequest<GetGroupInvites> _validator;
         private readonly DeUrgentaContext _context;
@@ -23,18 +23,18 @@ public GetGroupInvitesHandler(IValidateRequest<GetGroupInvites> validator, DeUrg
             _context = context;
         }
 
-        public async Task<Result<IImmutableList<GropInviteModel>>> Handle(GetGroupInvites request, CancellationToken cancellationToken)
+        public async Task<Result<IImmutableList<GroupInviteModel>>> Handle(GetGroupInvites request, CancellationToken cancellationToken)
         {
             var isValid = await _validator.IsValidAsync(request);
             if (!isValid)
             {
-                return Result.Failure<IImmutableList<GropInviteModel>>("Validation failed");
+                return Result.Failure<IImmutableList<GroupInviteModel>>("Validation failed");
             }
 
             var groupInvites = await _context
                 .GroupInvites
                 .Where(gi => gi.InvitationReceiver.Sub == request.UserSub)
-                .Select(x => new GropInviteModel
+                .Select(x => new GroupInviteModel
                 {
                     SenderId = x.InvitationSenderId,
                     GroupId = x.GroupId,

Src/DeUrgenta.User.Api/Swagger/GetGroupInvitesResponseExample.cs

@@ -6,11 +6,11 @@
 
 namespace DeUrgenta.User.Api.Swagger
 {
-    public class GetGroupInvitesResponseExample : IExamplesProvider<IImmutableList<GropInviteModel>>
+    public class GetGroupInvitesResponseExample : IExamplesProvider<IImmutableList<GroupInviteModel>>
     {
-        public IImmutableList<GropInviteModel> GetExamples()
+        public IImmutableList<GroupInviteModel> GetExamples()
         {
-            return new List<GropInviteModel>
+            return new List<GroupInviteModel>
             {
                 new()
                 {

Src/Tests/DeUrgenta.Group.Api.Tests/CommandsHandlers/AddGroupHandlerShould.cs

@@ -16,7 +16,7 @@ namespace DeUrgenta.Group.Api.Tests.CommandsHandlers
     public class AddGroupHandlerShould
     {
         private readonly DeUrgentaContext _dbContext;
-        
+
         public AddGroupHandlerShould(DatabaseFixture fixture)
         {
             _dbContext = fixture.Context;

Src/Tests/DeUrgenta.Group.Api.Tests/CommandsHandlers/InviteToGroupHandlerShould.cs

@@ -35,7 +35,8 @@ public async Task Return_failed_result_when_validation_fails()
             var sut = new InviteToGroupHandler(validator, _dbContext);
 
             // Act
-            var result = await sut.Handle(new InviteToGroup("a-sub", Guid.NewGuid(), Guid.NewGuid()), CancellationToken.None);
+            var result = await sut.Handle(new InviteToGroup("a-sub", Guid.NewGuid(), Guid.NewGuid()),
+                CancellationToken.None);
 
             // Assert
             result.IsFailure.ShouldBeTrue();

Src/Tests/DeUrgenta.Group.Api.Tests/Validators/AddGroupValidatorShould.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using DeUrgenta.Domain;
+using DeUrgenta.Domain.Entities;
 using DeUrgenta.Group.Api.Commands;
 using DeUrgenta.Group.Api.Models;
+using DeUrgenta.Group.Api.Options;
 using DeUrgenta.Group.Api.Validators;
 using DeUrgenta.Tests.Helpers;
 using DeUrgenta.Tests.Helpers.Builders;
@@ -15,10 +17,12 @@ namespace DeUrgenta.Group.Api.Tests.Validators
     public class AddGroupValidatorShould
     {
         private readonly DeUrgentaContext _dbContext;
+        private readonly GroupsConfig _groupsConfig;
 
         public AddGroupValidatorShould(DatabaseFixture fixture)
         {
             _dbContext = fixture.Context;
+            _groupsConfig = new GroupsConfig {MaxCreatedGroupsPerUser = 5};
         }
 
         [Theory]
@@ -28,7 +32,7 @@ public AddGroupValidatorShould(DatabaseFixture fixture)
         public async Task Invalidate_request_when_no_user_found_by_sub(string sub)
         {
             // Arrange
-            var sut = new AddGroupValidator(_dbContext);
+            var sut = new AddGroupValidator(_dbContext, _groupsConfig);
 
             // Act
             var isValid = await sut.IsValidAsync(new AddGroup(sub, new GroupRequest()));
@@ -40,7 +44,7 @@ public async Task Invalidate_request_when_no_user_found_by_sub(string sub)
         [Fact]
         public async Task Validate_when_user_was_found_by_sub()
         {
-            var sut = new AddGroupValidator(_dbContext);
+            var sut = new AddGroupValidator(_dbContext, _groupsConfig);
 
             // Arrange
             var userSub = Guid.NewGuid().ToString();
@@ -55,5 +59,33 @@ public async Task Validate_when_user_was_found_by_sub()
             // Assert
             isValid.ShouldBeTrue();
         }
+
+        [Fact]
+        public async Task Invalidate_when_user_exceeds_group_creation_limit()
+        {
+            // Arrange
+            var sut = new AddGroupValidator(_dbContext, _groupsConfig);
+
+            // Seed user
+            var userSub = Guid.NewGuid().ToString();
+            var user = new UserBuilder().WithSub(userSub).Build();
+            await _dbContext.SaveChangesAsync();
+
+            // Seed groups
+            for (int i = 0; i < 5; i++)
+            {
+                await _dbContext.Groups.AddAsync(new Domain.Entities.Group
+                {
+                    Name = i.ToString(), Admin = user
+                });
+            }
+            await _dbContext.SaveChangesAsync();
+
+            // Act
+            var result = await sut.IsValidAsync(new AddGroup(user.Sub, new GroupRequest {Name = "TestGroup"}));
+
+            // Assert
+            result.ShouldBeFalse();
+        }
     }
 }