Merge pull request #29 from grupadotnet/add-unit-tests

Add unit tests configuration and actual unit tests for MessageService and AttachmentService
grupadotnet · Jan 25, 2025 · 2d89637 · 2d89637
2 parents fcf65e7 + aa27447
commit 2d89637
Show file tree

Hide file tree

Showing 26 changed files with 470 additions and 68 deletions.
diff --git a/appsettings_example.Tests.json b/appsettings_example.Tests.json
@@ -2,9 +2,13 @@
   "ConnectionStrings": {
     "pimi-connect-postgresql-test": "Host=localhost; Port=5432; Database=pimi-connect-test; Username=postgres; Password=password123"
   },
-  "TestSettings": {
-    "EntitiesCount": 6,
+  "IntegrationTestsSettings": {
+    "EntitiesCount": 5,
     "ConnectionStringName": "pimi-connect-postgresql-test",
     "MigrationsAssemblyName": "pimi-connect-api.API"
-  } 
+  },
+  "UnitTestsSettings": {
+    "DummyCount": 10,
+    "DummyStringMaxLength": 20
+  }
 }
diff --git a/pimi-connect-api/pimi-connect-api.API/Attachment/AttachmentRepository.cs b/pimi-connect-api/pimi-connect-api.API/Attachment/AttachmentRepository.cs
@@ -5,7 +5,7 @@
 
 namespace pimi_connect_api.Attachment;
 
-public class AttachmentRepository : IRepository<AttachmentEntity>
+public class AttachmentRepository : IAttachmentRepository
 {
     private readonly AppDbContext _dbContext;
 

diff --git a/pimi-connect-api/pimi-connect-api.API/Attachment/AttachmentService.cs b/pimi-connect-api/pimi-connect-api.API/Attachment/AttachmentService.cs
@@ -10,12 +10,12 @@ namespace pimi_connect_api.Attachment;
 public class AttachmentService : IAttachmentService
 {
     private readonly IMapper _mapper;
-    private readonly AttachmentRepository _repository;
+    private readonly IAttachmentRepository _repository;
 
-    public AttachmentService(AppDbContext dbContext, IMapper mapper)
+    public AttachmentService(IMapper mapper, IAttachmentRepository repository)
     {
         _mapper = mapper;
-        _repository = new AttachmentRepository(dbContext);
+        _repository = repository;
     }
 
     public async Task<AttachmentDto> GetAttachmentAsync(Guid id)

diff --git a/pimi-connect-api/pimi-connect-api.API/Attachment/IAttachmentRepository.cs b/pimi-connect-api/pimi-connect-api.API/Attachment/IAttachmentRepository.cs
@@ -0,0 +1,9 @@
+using pimi_connect_app.Data.Entities;
+using pimi_connect_app.Data.Repository;
+
+namespace pimi_connect_api.Attachment;
+
+public interface IAttachmentRepository : IRepository<AttachmentEntity>
+{
+
+}
diff --git a/pimi-connect-api/pimi-connect-api.API/Message/IMessageRepository.cs b/pimi-connect-api/pimi-connect-api.API/Message/IMessageRepository.cs
@@ -1,6 +1,9 @@
+using pimi_connect_app.Data.Entities;
+using pimi_connect_app.Data.Repository;
+
 namespace pimi_connect_api.Message;
 
-public interface IMessageRepository
+public interface IMessageRepository : IRepository<MessageEntity>
 {
     Task<bool> MessageExists(Guid id);
 }
diff --git a/pimi-connect-api/pimi-connect-api.API/Message/MessageRepository.cs b/pimi-connect-api/pimi-connect-api.API/Message/MessageRepository.cs
@@ -5,7 +5,7 @@
 
 namespace pimi_connect_api.Message;
 
-public class MessageRepository : IRepository<MessageEntity>, IMessageRepository
+public class MessageRepository : IMessageRepository
 {
     private readonly AppDbContext _dbContext;
 

diff --git a/pimi-connect-api/pimi-connect-api.API/Message/MessageService.cs b/pimi-connect-api/pimi-connect-api.API/Message/MessageService.cs
@@ -1,25 +1,22 @@
 using AutoMapper;
-using Microsoft.EntityFrameworkCore;
 using pimi_connect_api.Exceptions;
-using pimi_connect_api.Message;
 using pimi_connect_api.Services.Interfaces;
-using pimi_connect_app.Data.AppDbContext;
 using pimi_connect_app.Data.Entities;
 using pimi_connect_app.Data.Models;
-using pimi_connect_app.Data.Repository;
 
-namespace pimi_connect_api.Services
+namespace pimi_connect_api.Message
 {
     public class MessageService : IMessageService
     {
         private readonly IMapper _mapper;
-        private readonly MessageRepository _repository;
+        private readonly IMessageRepository _repository;
 
-        public MessageService(AppDbContext dbContext, IMapper mapper)
+        public MessageService(IMapper mapper, IMessageRepository repository)
         {
             _mapper = mapper;
-            _repository = new MessageRepository(dbContext);
+            _repository = repository;
         }
+
         public Task<MessageDto> AddMessageAsync(MessageDto messageDto)
         {
             throw new NotImplementedException();

diff --git a/pimi-connect-api/pimi-connect-api.API/Program.cs b/pimi-connect-api/pimi-connect-api.API/Program.cs
@@ -3,14 +3,17 @@
 using Microsoft.EntityFrameworkCore;
 using pimi_connect_api.Attachment;
 using pimi_connect_api.Hubs;
+using pimi_connect_api.Message;
 using pimi_connect_api.Middleware;
 using pimi_connect_api.Services;
 using pimi_connect_api.Services.Interfaces;
 using pimi_connect_api.User;
 using pimi_connect_api.UserChat;
 using pimi_connect_app.Data.AppDbContext;
+using pimi_connect_app.Data.Entities;
 using pimi_connect_app.Data.Models;
 using pimi_connect_app.Data.Models.Validators;
+using pimi_connect_app.Data.Repository;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -29,6 +32,12 @@
 builder.Services.AddScoped<IMessageService, MessageService>();
 builder.Services.AddScoped<IUserChatService, UserChatService>();
 
+// Repositories
+builder.Services.AddScoped<IUserRepository, UserRepository>();
+builder.Services.AddScoped<IAttachmentRepository, AttachmentRepository>();
+builder.Services.AddScoped<IMessageRepository, MessageRepository>();
+builder.Services.AddScoped<IUserChatRepository, UserChatRepository>();
+
 // Validators
 builder.Services.AddScoped<IValidator<UserDto>, UserDtoValidator>();
 

diff --git a/pimi-connect-api/pimi-connect-api.API/User/IUserRepository.cs b/pimi-connect-api/pimi-connect-api.API/User/IUserRepository.cs
@@ -1,8 +1,9 @@
 using pimi_connect_app.Data.Entities;
+using pimi_connect_app.Data.Repository;
 
 namespace pimi_connect_api.User;
 
-public interface IUserRepository
+public interface IUserRepository : IRepository<UserEntity>
 {
     Task<UserEntity?> GetByEmail(string email);
 }
diff --git a/pimi-connect-api/pimi-connect-api.API/User/UserRepository.cs b/pimi-connect-api/pimi-connect-api.API/User/UserRepository.cs
@@ -5,7 +5,7 @@
 
 namespace pimi_connect_api.User;
 
-public class UserRepository : IRepository<UserEntity>, IUserRepository
+public class UserRepository : IUserRepository
 {
     private readonly AppDbContext _dbContext;
 

diff --git a/pimi-connect-api/pimi-connect-api.API/User/UserService.cs b/pimi-connect-api/pimi-connect-api.API/User/UserService.cs
@@ -11,12 +11,12 @@ namespace pimi_connect_api.User;
 public class UserService : IUserService
 {
     private readonly IMapper _mapper;
-    private readonly UserRepository _repository;
+    private readonly IUserRepository _repository;
 
-    public UserService(AppDbContext dbContext, IMapper mapper)
+    public UserService(IMapper mapper, IUserRepository repository)
     {
         _mapper = mapper;
-        _repository = new UserRepository(dbContext);
+        _repository = repository;
     }
 
     public async Task<UserDto> GetUserAsync(Guid id)

diff --git a/pimi-connect-api/pimi-connect-api.API/UserChat/IUserChatRepository.cs b/pimi-connect-api/pimi-connect-api.API/UserChat/IUserChatRepository.cs
@@ -0,0 +1,9 @@
+using pimi_connect_app.Data.Entities;
+using pimi_connect_app.Data.Repository;
+
+namespace pimi_connect_api.UserChat;
+
+public interface IUserChatRepository : IRepository<UserChatEntity>
+{
+
+}
diff --git a/pimi-connect-api/pimi-connect-api.API/UserChat/UserChatRepository.cs b/pimi-connect-api/pimi-connect-api.API/UserChat/UserChatRepository.cs
@@ -5,7 +5,7 @@
 
 namespace pimi_connect_api.UserChat;
 
-public class UserChatRepository : IRepository<UserChatEntity>
+public class UserChatRepository : IUserChatRepository
 {
     private readonly AppDbContext _dbContext;
 

diff --git a/pimi-connect-api/pimi-connect-api.API/UserChat/UserChatService.cs b/pimi-connect-api/pimi-connect-api.API/UserChat/UserChatService.cs
@@ -11,12 +11,12 @@ namespace pimi_connect_api.UserChat;
 public class UserChatService : IUserChatService
 {
     private readonly IMapper _mapper;
-    private readonly UserChatRepository _repository;
+    private readonly IUserChatRepository _repository;
 
-    public UserChatService(AppDbContext dbContext, IMapper mapper)
+    public UserChatService(IMapper mapper, IUserChatRepository repository)
     {
         _mapper = mapper;
-        _repository = new UserChatRepository(dbContext);
+        _repository = repository;
     }
 
     public async Task<UserChatDto> GetUserChatAsync(Guid id)

diff --git a/pimi-connect-api/pimi-connect-api.Tests/GlobalUsings.cs b/pimi-connect-api/pimi-connect-api.Tests/GlobalUsings.cs
@@ -2,6 +2,8 @@
 global using Microsoft.EntityFrameworkCore;
 global using Microsoft.AspNetCore.Mvc;
 
+global using Moq;
+
 global using pimi_connect_api.Controllers;
 global using pimi_connect_api.Services;
 

diff --git a/...rollersTests/AttachmentControllerTests.cs → ...grationTests/AttachmentControllerTests.cs b/...rollersTests/AttachmentControllerTests.cs → ...grationTests/AttachmentControllerTests.cs
@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Http;
 using pimi_connect_api.Attachment;
 using pimi_connect_api.Exceptions;
-using pimi_connect_api.UnitTests.Base;
+using pimi_connect_api.Tests.IntegrationTests.Base;
 
-namespace pimi_connect_api.UnitTests.ControllersTests;
+namespace pimi_connect_api.Tests.IntegrationTests;
 
 [Collection("TestsWhichUseDatabase_pimi-connect-test")]
-public class AttachmentControllerTests : ControllerTestsBase<AttachmentDto>
+public class AttachmentIntegrationTests : IntegrationTestsBase<AttachmentDto>
 {
     private AttachmentController _attachmentController;
 
@@ -20,7 +20,8 @@ public class AttachmentControllerTests : ControllerTestsBase<AttachmentDto>
         }
 
         // initialize Controller
-        var attachmentService = new AttachmentService(TestDbContext, Mapper);
+        var attachmentRepository = new AttachmentRepository(TestDbContext);
+        var attachmentService = new AttachmentService(Mapper, attachmentRepository);
         _attachmentController = new AttachmentController(attachmentService);
     }
 

diff --git a/...trollersTests/Base/ControllerTestsBase.cs → ...grationTests/Base/IntegrationTestsBase.cs b/...trollersTests/Base/ControllerTestsBase.cs → ...grationTests/Base/IntegrationTestsBase.cs
@@ -1,25 +1,25 @@
 using AutoMapper;
 using Microsoft.Extensions.Configuration;
+using pimi_connect_api.Tests.Shared;
 using pimi_connect_api.UnitTests.Shared;
 using pimi_connect_app.Data.AppDbContext;
-using pimi_connect_app.Data.MappingProfiles;
 
-namespace pimi_connect_api.UnitTests.Base;
+namespace pimi_connect_api.Tests.IntegrationTests.Base;
 
-public abstract class ControllerTestsBase<TDtoType>  where TDtoType : class
+public abstract class IntegrationTestsBase<TDtoType>  where TDtoType : class
 {
     #region Properties
     protected AppDbContext TestDbContext { get; private set; }
     protected IConfiguration Configuration { get; private set; }
-    protected TestSettings Settings { get; private set; }
+    protected IntegrationTestsSettings Settings { get; private set; }
     protected IMapper Mapper { get; private set; }
     protected TestHelper Helper { get; }
     protected List<Guid> ExistingIds { get; private set; }
     protected Guid ExistingId { get; private set; }
     protected Guid NotExistingId { get; private set; }
     #endregion
 
-    protected ControllerTestsBase()
+    protected IntegrationTestsBase()
     {
         SetupConfiguration();
         SetupSettings();
@@ -85,30 +85,23 @@ private void SetupConfiguration()
             .Build();
 
         Configuration = configuration;
-
-
     }
 
     private void SetupSettings()
     {
-        Settings = new TestSettings();
-        Configuration.GetSection("TestSettings")
+        Settings = new IntegrationTestsSettings();
+        Configuration.GetSection("IntegrationTestsSettings")
             .Bind(Settings, c => c.BindNonPublicProperties = true);
 
         if (Settings == null)
         {
-            throw new InvalidOperationException("Could not get TestSettings correctly.");
+            throw new InvalidOperationException("Could not get IntegrationTestsSettings correctly.");
         }
     }
 
     private void SetupMapper()
     {
-        var mapperConfig = new MapperConfiguration(cfg => 
-        {
-            cfg.AddProfile(new MappingProfile());
-        });
-
-        Mapper = new Mapper(mapperConfig);
+        Mapper = Utils.CreateMapper();
     }
 
     private void SetupTestDbContext()
@@ -133,12 +126,7 @@ private void SetIds()
 
     private void SetExistingIds()
     {
-        ExistingIds = new List<Guid>();
-
-        for (var i = 0; i < Settings.EntitiesCount; i++)
-        {
-            ExistingIds.Add(Guid.NewGuid());
-        }
+        ExistingIds = Utils.CreateGuids(Settings.EntitiesCount);
     }
 
     private void SetExistingId()

diff --git a/...-connect-api.Tests/Shared/TestSettings.cs → ...ionTests/Base/IntegrationTestsSettings.cs b/...-connect-api.Tests/Shared/TestSettings.cs → ...ionTests/Base/IntegrationTestsSettings.cs
@@ -1,6 +1,6 @@
-namespace pimi_connect_api.UnitTests.Shared;
+namespace pimi_connect_api.Tests.IntegrationTests.Base;
 
-public class TestSettings
+public class IntegrationTestsSettings
 {
     public int EntitiesCount { get; set; }
     public string ConnectionStringName { get; set; }

diff --git a/...mi-connect-api.Tests/Shared/TestHelper.cs → ...Tests/IntegrationTests/Base/TestHelper.cs b/...mi-connect-api.Tests/Shared/TestHelper.cs → ...Tests/IntegrationTests/Base/TestHelper.cs
@@ -1,9 +1,7 @@
 using AutoMapper;
 using pimi_connect_app.Data.AppDbContext;
-using pimi_connect_app.Data.Entities;
-using pimi_connect_app.Data.Enums;
 
-namespace pimi_connect_api.UnitTests.Shared;
+namespace pimi_connect_api.Tests.IntegrationTests.Base;
 
 public class TestHelper
 {
@@ -21,7 +19,7 @@ public async Task ResetDbContext()
         await _testDbContext.Database.EnsureDeletedAsync();
         await _testDbContext.Database.EnsureCreatedAsync();
     }
-
+    
     #region Fill tables
     public async Task FillUsersTable(List<Guid> idsToAdd)
     {
@@ -51,5 +49,4 @@ await _testDbContext
         _testDbContext.ChangeTracker.Clear();
     }
     #endregion
-
 }
diff --git a/...s/ControllersTests/UserControllerTests.cs → ...s/IntegrationTests/UserControllerTests.cs b/...s/ControllersTests/UserControllerTests.cs → ...s/IntegrationTests/UserControllerTests.cs
@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Http;
 using pimi_connect_api.Exceptions;
-using pimi_connect_api.UnitTests.Base;
+using pimi_connect_api.Tests.IntegrationTests.Base;
 using pimi_connect_api.User;
 
-namespace pimi_connect_api.UnitTests.ControllersTests;
+namespace pimi_connect_api.Tests.IntegrationTests;
 
 [Collection("TestsWhichUseDatabase_pimi-connect-test")]
-public class UserControllerTests : ControllerTestsBase<UserDto>
+public class UserControllerTests : IntegrationTestsBase<UserDto>
 {
     private UserController _userController;
 
@@ -21,7 +21,8 @@ public class UserControllerTests : ControllerTestsBase<UserDto>
         }
 
         // initialize Controller
-        var userService = new UserService(TestDbContext, Mapper);
+        var userRepository = new UserRepository(TestDbContext);
+        var userService = new UserService(Mapper, userRepository);
         _userController = new UserController(userService);
     }