From de8d97e5bffa70ff6c4ecca68fbc7ce385ea064e Mon Sep 17 00:00:00 2001 From: Artemy <109195690+stalcker2288969@users.noreply.github.com> Date: Tue, 17 Jun 2025 21:27:16 +0700 Subject: [PATCH] Adding postfix Async --- .../EF/Repositories/UsersRepositoryTests.cs | 40 +++++++++---------- Govor.Core/Repositories/IUsersExist.cs | 6 +-- Govor.Core/Repositories/IUsersReader.cs | 12 +++--- Govor.Core/Repositories/IUsersWriter.cs | 8 ++-- Govor.Data/Repositories/UsersRepository.cs | 30 +++++++------- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/UsersRepositoryTests.cs b/Govor.API.Tests/IntegrationTests/EF/Repositories/UsersRepositoryTests.cs index fe3f284..fba9a8f 100644 --- a/Govor.API.Tests/IntegrationTests/EF/Repositories/UsersRepositoryTests.cs +++ b/Govor.API.Tests/IntegrationTests/EF/Repositories/UsersRepositoryTests.cs @@ -47,7 +47,7 @@ public class UsersRepositoryTests // Act - var result = await userRepository.GetAll(); + var result = await userRepository.GetAllAsync(); // Assert Assert.That(result, Is.Not.Null); @@ -68,7 +68,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var result = await userRepository.FindById(user.Id); + var result = await userRepository.FindByIdAsync(user.Id); // Assert Assert.That(result, Is.Not.Null); @@ -86,7 +86,7 @@ public class UsersRepositoryTests var userRepository = new UsersRepository(context, _userValidator); // Act & Assert - Assert.ThrowsAsync>(async () => await userRepository.FindById(id)); + Assert.ThrowsAsync>(async () => await userRepository.FindByIdAsync(id)); } [Test] @@ -103,7 +103,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var result = await userRepository.FindByRangeId(users.Select(u => u.Id)); + var result = await userRepository.FindByRangeIdAsync(users.Select(u => u.Id)); // Assert Assert.That(result, Is.Not.Null); @@ -124,7 +124,7 @@ public class UsersRepositoryTests // Act & Assert Assert.ThrowsAsync>>(async () => - await userRepository.FindByRangeId(ids)); + await userRepository.FindByRangeIdAsync(ids)); } [Test] @@ -140,7 +140,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var result = await userRepository.FindByUsername(user.Name); + var result = await userRepository.FindByUsernameAsync(user.Name); // Assert Assert.That(result, Is.Not.Null); Assert.That(result.Name, Is.EqualTo(user.Name)); @@ -157,7 +157,7 @@ public class UsersRepositoryTests var userRepository = new UsersRepository(context, _userValidator); // Act & Assert - Assert.ThrowsAsync>(async () => await userRepository.FindByUsername(username)); + Assert.ThrowsAsync>(async () => await userRepository.FindByUsernameAsync(username)); } [Test] @@ -174,7 +174,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var result = await userRepository.FindByRangeUsernames(users.Select(u => u.Name)); + var result = await userRepository.FindByRangeUsernamesAsync(users.Select(u => u.Name)); // Assert Assert.That(result, Is.Not.Null); @@ -194,7 +194,7 @@ public class UsersRepositoryTests // Act & Assert Assert.ThrowsAsync>>(async () => - await userRepository.FindByRangeUsernames(usernames)); + await userRepository.FindByRangeUsernamesAsync(usernames)); } [Test] @@ -213,7 +213,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var result = await userRepository.FindUsersByCreatedDate(selectedDate); + var result = await userRepository.FindUsersByCreatedDateAsync(selectedDate); // Assert var expectedUsers = users @@ -236,7 +236,7 @@ public class UsersRepositoryTests // Act & Assert Assert.ThrowsAsync>(async () => - await userRepository.FindUsersByCreatedDate(date)); + await userRepository.FindUsersByCreatedDateAsync(date)); } [Test] @@ -248,7 +248,7 @@ public class UsersRepositoryTests var userRepository = new UsersRepository(context, _userValidator); // Act - userRepository.Add(user); + userRepository.AddAsync(user); var res = context.Users.Find(user.Id); // Assert @@ -268,7 +268,7 @@ public class UsersRepositoryTests var userRepository = new UsersRepository(context, _userValidator); // Act & Assert - Assert.ThrowsAsync(async () => await userRepository.Add(user)); + Assert.ThrowsAsync(async () => await userRepository.AddAsync(user)); } [Test] @@ -283,7 +283,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var res = await userRepository.Exists(user); + var res = await userRepository.ExistsAsync(user); // Assert Assert.That(res, Is.True); @@ -299,7 +299,7 @@ public class UsersRepositoryTests // Act - var res = await userRepository.Exists(user); + var res = await userRepository.ExistsAsync(user); // Assert Assert.That(res, Is.False); @@ -312,7 +312,7 @@ public class UsersRepositoryTests await using var context = new GovorDbContext(_options); var userRepository = new UsersRepository(context, _userValidator); // Act & Assert - Assert.ThrowsAsync>(async () => await userRepository.Exists(default)); + Assert.ThrowsAsync>(async () => await userRepository.ExistsAsync(default)); } [Test] @@ -327,7 +327,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var res = await userRepository.ExistsById(user.Id); + var res = await userRepository.ExistsByIdAsync(user.Id); // Assert Assert.That(res, Is.True); @@ -343,7 +343,7 @@ public class UsersRepositoryTests // Act - var res = await userRepository.ExistsById(user.Id); + var res = await userRepository.ExistsByIdAsync(user.Id); // Assert Assert.That(res, Is.False); @@ -361,7 +361,7 @@ public class UsersRepositoryTests await context.SaveChangesAsync(); // Act - var res = await userRepository.ExistsUsername(user.Name); + var res = await userRepository.ExistsUsernameAsync(user.Name); // Assert Assert.That(res, Is.True); @@ -378,7 +378,7 @@ public class UsersRepositoryTests // Act - var res = await userRepository.ExistsUsername(user.Name); + var res = await userRepository.ExistsUsernameAsync(user.Name); // Assert Assert.That(res, Is.False); diff --git a/Govor.Core/Repositories/IUsersExist.cs b/Govor.Core/Repositories/IUsersExist.cs index ad8ee12..bf004aa 100644 --- a/Govor.Core/Repositories/IUsersExist.cs +++ b/Govor.Core/Repositories/IUsersExist.cs @@ -4,7 +4,7 @@ namespace Govor.Core.Repositories; public interface IUsersExist { - public Task Exists(User user); - public Task ExistsById(Guid id); - public Task ExistsUsername(string username); + public Task ExistsAsync(User user); + public Task ExistsByIdAsync(Guid id); + public Task ExistsUsernameAsync(string username); } \ No newline at end of file diff --git a/Govor.Core/Repositories/IUsersReader.cs b/Govor.Core/Repositories/IUsersReader.cs index 3ff9d0d..74ec0ff 100644 --- a/Govor.Core/Repositories/IUsersReader.cs +++ b/Govor.Core/Repositories/IUsersReader.cs @@ -4,10 +4,10 @@ namespace Govor.Core.Repositories; public interface IUsersReader { - public Task> GetAll(); - public Task FindById(Guid id); - public Task> FindByRangeId(IEnumerable ids); - public Task FindByUsername(string username); - public Task> FindByRangeUsernames(IEnumerable usernames); - public Task> FindUsersByCreatedDate(DateOnly createdDate); + public Task> GetAllAsync(); + public Task FindByIdAsync(Guid id); + public Task> FindByRangeIdAsync(IEnumerable ids); + public Task FindByUsernameAsync(string username); + public Task> FindByRangeUsernamesAsync(IEnumerable usernames); + public Task> FindUsersByCreatedDateAsync(DateOnly createdDate); } \ No newline at end of file diff --git a/Govor.Core/Repositories/IUsersWriter.cs b/Govor.Core/Repositories/IUsersWriter.cs index a9fb07f..9637d39 100644 --- a/Govor.Core/Repositories/IUsersWriter.cs +++ b/Govor.Core/Repositories/IUsersWriter.cs @@ -4,8 +4,8 @@ namespace Govor.Core.Repositories; public interface IUsersWriter { - public Task Add(User user); - public Task Update(User user); - public Task Remove(User user); - public Task Remove(Guid userId); + public Task AddAsync(User user); + public Task UpdateAsync(User user); + public Task RemoveAsync(User user); + public Task RemoveAsync(Guid userId); } \ No newline at end of file diff --git a/Govor.Data/Repositories/UsersRepository.cs b/Govor.Data/Repositories/UsersRepository.cs index 83db39f..18556f7 100644 --- a/Govor.Data/Repositories/UsersRepository.cs +++ b/Govor.Data/Repositories/UsersRepository.cs @@ -17,7 +17,7 @@ public class UsersRepository : IUsersRepository _validator = validator; } - public async Task> GetAll() + public async Task> GetAllAsync() { return await _context.Users .AsNoTracking() @@ -25,7 +25,7 @@ public class UsersRepository : IUsersRepository .ToListOrThrowIfEmpty(new NotFoundException("Users in Database not exists")); } - public async Task FindById(Guid id) + public async Task FindByIdAsync(Guid id) { if(id == Guid.Empty) throw new ArgumentException("Id must not be empty", nameof(id)); @@ -36,7 +36,7 @@ public class UsersRepository : IUsersRepository ?? throw new NotFoundByKeyException(id, "User with given id does not exist"); } - public async Task> FindByRangeId(IEnumerable ids) + public async Task> FindByRangeIdAsync(IEnumerable ids) { if (ids is null || !ids.Any()) throw new ArgumentException("Ids must not be empty", nameof(ids)); @@ -47,7 +47,7 @@ public class UsersRepository : IUsersRepository .ToListOrThrowIfEmpty(new NotFoundByKeyException>(ids,"Users with given ids not found")); } - public async Task FindByUsername(string username) + public async Task FindByUsernameAsync(string username) { if(username is null || username == string.Empty) throw new ArgumentNullException(username, "Username cannot be empty"); @@ -58,7 +58,7 @@ public class UsersRepository : IUsersRepository ?? throw new NotFoundByKeyException(username, "User with given username does not exist"); } - public async Task> FindByRangeUsernames(IEnumerable usernames) + public async Task> FindByRangeUsernamesAsync(IEnumerable usernames) { if (usernames is null || !usernames.Any()) throw new ArgumentException("Usernames must not be empty", nameof(usernames)); @@ -69,7 +69,7 @@ public class UsersRepository : IUsersRepository .ToListOrThrowIfEmpty(new NotFoundByKeyException>(usernames, "Users with given usernames not found")); } - public async Task> FindUsersByCreatedDate(DateOnly createdDate) + public async Task> FindUsersByCreatedDateAsync(DateOnly createdDate) { if(createdDate == DateOnly.MinValue) throw new ArgumentException("Created date cannot be earlier than MinValue", nameof(createdDate)); @@ -80,7 +80,7 @@ public class UsersRepository : IUsersRepository .ToListOrThrowIfEmpty(new NotFoundByKeyException(createdDate, "Users with given created date do not exist")); } - public async Task Add(User user) + public async Task AddAsync(User user) { try { @@ -100,7 +100,7 @@ public class UsersRepository : IUsersRepository } // TODO: Test this block - public async Task Update(User user) + public async Task UpdateAsync(User user) { try { @@ -130,12 +130,12 @@ public class UsersRepository : IUsersRepository } } - public async Task Remove(User user) + public async Task RemoveAsync(User user) { try { _validator.Validate(user); - await Remove(user.Id); + await RemoveAsync(user.Id); } catch (InvalidObjectException ex) { @@ -143,11 +143,11 @@ public class UsersRepository : IUsersRepository } } - public async Task Remove(Guid userId) + public async Task RemoveAsync(Guid userId) { try { - var result = await FindById(userId); + var result = await FindByIdAsync(userId); _context.Users.Remove(result); await _context.SaveChangesAsync(); @@ -162,7 +162,7 @@ public class UsersRepository : IUsersRepository } } - public Task Exists(User user) + public Task ExistsAsync(User user) { _validator.Validate(user); @@ -173,12 +173,12 @@ public class UsersRepository : IUsersRepository ); } - public Task ExistsById(Guid id) + public Task ExistsByIdAsync(Guid id) { return _context.Users.AnyAsync(u => u.Id == id); } - public Task ExistsUsername(string username) + public Task ExistsUsernameAsync(string username) { return _context.Users.AnyAsync(u => u.Name == username); }