Rydding i tester

packages/api/AlvTime.Business/HourRates/HourRateService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -24,8 +25,13 @@ public async Task<HourRateDto> UpdateHourRate(HourRateDto hourRate)
         await _hourRateStorage.UpdateHourRate(hourRate);
         return await GetHourRateById(hourRate.Id);
     }
+
+    public async Task<IEnumerable<HourRateDto>> GetHourRates(HourRateQuerySearch criterias)
+    {
+        return await _hourRateStorage.GetHourRates(criterias);
+    }
 
-    private async Task<HourRateDto> GetHourRateById(int hourRateId)
+    public async Task<HourRateDto> GetHourRateById(int hourRateId)
     {
         return (await _hourRateStorage.GetHourRates(new HourRateQuerySearch
         {

packages/api/AlvTime.Persistence/Repositories/CustomerStorage.cs → packages/api/AlvTime.Persistence/Repositories/CustomerService.cs

@@ -12,11 +12,11 @@
 
 namespace AlvTime.Persistence.Repositories;
 
-public class CustomerStorage : ICustomerStorage
+public class CustomerService : ICustomerStorage
 {
     private readonly AlvTime_dbContext _context;
 
-    public CustomerStorage(AlvTime_dbContext context)
+    public CustomerService(AlvTime_dbContext context)
     {
         _context = context;
     }
@@ -37,7 +37,7 @@
         await _context.SaveChangesAsync();
     }
 
     public async Task<CustomerAdminDto?> GetCustomerDetailedById(int customerId)
     {
         return await _context.Customer
             .Where(c => c.Id == customerId)

packages/api/AlvTime.Persistence/Repositories/HourRateStorage.cs → packages/api/AlvTime.Persistence/Repositories/HourRateService.cs

@@ -8,11 +8,11 @@
 
 namespace AlvTime.Persistence.Repositories;
 
-public class HourRateStorage : IHourRateStorage
+public class HourRateService : IHourRateStorage
 {
     private readonly AlvTime_dbContext _context;
 
-    public HourRateStorage(AlvTime_dbContext context)
+    public HourRateService(AlvTime_dbContext context)
     {
         _context = context;
     }

packages/api/AlvTime.Persistence/Repositories/ProjectStorage.cs → packages/api/AlvTime.Persistence/Repositories/ProjectService.cs

@@ -9,11 +9,11 @@
 
 namespace AlvTime.Persistence.Repositories;
 
-public class ProjectStorage : IProjectStorage
+public class ProjectService : IProjectStorage
 {
     private readonly AlvTime_dbContext _context;
 
-    public ProjectStorage(AlvTime_dbContext context)
+    public ProjectService(AlvTime_dbContext context)
     {
         _context = context;
     }

packages/api/AlvTimeWebApi/ServiceRegistrator.cs

@@ -17,6 +17,9 @@
 using AlvTimeWebApi.Controllers.Utils;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using CustomerService = AlvTime.Persistence.Repositories.CustomerService;
+using HourRateService = AlvTime.Persistence.Repositories.HourRateService;
+using ProjectService = AlvTime.Persistence.Repositories.ProjectService;
 
 namespace AlvTimeWebApi
 {
@@ -30,12 +33,12 @@ public static void AddAlvtimeServices(this IServiceCollection services, IConfigu
             services.AddScoped<UserService>();
             services.AddScoped<ITaskStorage, TaskStorage>();
             services.AddScoped<ITimeRegistrationStorage, TimeRegistrationStorage>();
-            services.AddScoped<IHourRateStorage, HourRateStorage>();
-            services.AddScoped<HourRateService>();
-            services.AddScoped<IProjectStorage, ProjectStorage>();
-            services.AddScoped<ProjectService>();
-            services.AddScoped<ICustomerStorage, CustomerStorage>();
-            services.AddScoped<CustomerService>();
+            services.AddScoped<IHourRateStorage, HourRateService>();
+            services.AddScoped<AlvTime.Business.HourRates.HourRateService>();
+            services.AddScoped<IProjectStorage, ProjectService>();
+            services.AddScoped<AlvTime.Business.Projects.ProjectService>();
+            services.AddScoped<ICustomerStorage, CustomerService>();
+            services.AddScoped<AlvTime.Business.Customers.CustomerService>();
             services.AddScoped<IEconomyStorage, EconomyStorage>();
             services.AddScoped<IAccessTokenStorage, AccessTokenStorage>();
             services.AddScoped<IAssociatedTaskStorage, AssociatedTaskStorage>();

packages/api/Tests/Tests.csproj

@@ -16,10 +16,6 @@
     <PackageReference Include="coverlet.collector" Version="1.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="IntegrationTests\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AlvTime.Business\AlvTime.Business.csproj" />
     <ProjectReference Include="..\AlvTime.Persistence\AlvTime.Persistence.csproj" />

packages/api/Tests/UnitTests/AccessToken/AccessTokenServiceTests.cs

@@ -9,72 +9,68 @@
 using User = AlvTime.Business.Users.User;
 using AlvTime.Business.Users;
 
-namespace Tests.UnitTests.AccessToken
+namespace Tests.UnitTests.AccessToken;
+
+public class AccessTokenServiceTests
 {
-    public class AccessTokenServiceTests
+    private readonly AlvTime_dbContext _context;
+
+    public AccessTokenServiceTests()
     {
-        [Fact]
-        public async Task GetActiveAccessTokens_UserSpecified_ActiveTokensForUser()
-        {
-            var dbContext = new AlvTimeDbContextBuilder()
-                .WithUsers()
-                .CreateDbContext();
-
-            var service = CreateAccessTokenService(dbContext);
-
-            var tokens = await service.GetActiveTokens();
-
-            Assert.Equal(dbContext.AccessTokens.Where(x => x.UserId == 1).ToList().Count, tokens.Count());
-        }
+        _context = new AlvTimeDbContextBuilder()
+            .WithPersonalAccessTokens()
+            .WithUsers()
+            .CreateDbContext();
+    }
+
+    [Fact]
+    public async Task GetActiveAccessTokens_UserSpecified_ActiveTokensForUser()
+    {
+        var service = CreateAccessTokenService(_context);
 
-        [Fact]
-        public async Task CreateLifetimeToken_FriendlyNameSpecified_TokenWithFriendlyNameCreated()
-        {
-            var dbContext = new AlvTimeDbContextBuilder()
-                .WithPersonalAccessTokens()
-                .WithUsers()
-                .CreateDbContext();
+        var tokens = await service.GetActiveTokens();
 
-            var service = CreateAccessTokenService(dbContext);
+        Assert.Equal(_context.AccessTokens.Where(x => x.UserId == 1).ToList().Count, tokens.Count());
+    }
 
-            await service.CreateLifeTimeToken("new token");
+    [Fact]
+    public async Task CreateLifetimeToken_FriendlyNameSpecified_TokenWithFriendlyNameCreated()
+    {
+        var service = CreateAccessTokenService(_context);
 
-            var tokens = await service.GetActiveTokens();
+        await service.CreateLifeTimeToken("new token");
 
-            Assert.Equal(dbContext.AccessTokens.Where(x => x.UserId == 1).ToList().Count(), tokens.Count());
-        }
+        var tokens = (await service.GetActiveTokens()).ToList();
 
-        [Fact]
-        public async Task DeleteToken_TokenIdSpecified_TokenWithIdDeleted()
-        {
-            var dbContext = new AlvTimeDbContextBuilder()
-                .WithPersonalAccessTokens()
-                .WithUsers()
-                .CreateDbContext();
+        Assert.Equal(2, tokens.Count);
+        Assert.Equal("new token", tokens.Last().FriendlyName);
+    }
 
-            var service = CreateAccessTokenService(dbContext);
+    [Fact]
+    public async Task DeleteToken_TokenIdSpecified_TokenWithIdDeleted()
+    {
+        var service = CreateAccessTokenService(_context);
 
-            await service.DeleteActiveTokens(new List<int>{1});
+        await service.DeleteActiveTokens(new List<int>{1});
 
-            var tokens = await service.GetActiveTokens();
+        var tokens = await service.GetActiveTokens();
 
-            Assert.Empty(tokens);
-        }
+        Assert.Empty(tokens);
+    }
+
+    private static AccessTokenService CreateAccessTokenService(AlvTime_dbContext dbContext)
+    {
+        var mockUserContext = new Mock<IUserContext>();
 
-        private static AccessTokenService CreateAccessTokenService(AlvTime_dbContext dbContext)
+        var user = new User
         {
-            var mockUserContext = new Mock<IUserContext>();
-
-            var user = new User
-            {
-                Id = 1,
-                Email = "[email protected]",
-                Name = "Someone"
-            };
+            Id = 1,
+            Email = "[email protected]",
+            Name = "Someone"
+        };
 
-            mockUserContext.Setup(context => context.GetCurrentUser()).Returns(System.Threading.Tasks.Task.FromResult(user));
+        mockUserContext.Setup(context => context.GetCurrentUser()).Returns(Task.FromResult(user));
 
-            return new AccessTokenService(new AccessTokenStorage(dbContext), mockUserContext.Object);
-        }
+        return new AccessTokenService(new AccessTokenStorage(dbContext), mockUserContext.Object);
     }
-}
+}