chore: minor improvements

nmshd · Feb 12, 2024 · 3c3f612 · 3c3f612
1 parent 1b1f3e8
commit 3c3f612
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/Modules/Quotas/src/Quotas.Application/DTOs/IndividualQuotaDTO.cs b/Modules/Quotas/src/Quotas.Application/DTOs/IndividualQuotaDTO.cs
@@ -1,5 +1,4 @@
 using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
 
 namespace Backbone.Modules.Quotas.Application.DTOs;
 

diff --git a/Modules/Quotas/src/Quotas.Application/DTOs/MetricDTO.cs b/Modules/Quotas/src/Quotas.Application/DTOs/MetricDTO.cs
@@ -1,6 +1,4 @@
-using AutoMapper;
-using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
+using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
 
 namespace Backbone.Modules.Quotas.Application.DTOs;
 

diff --git a/Modules/Quotas/src/Quotas.Application/Metrics/Queries/ListMetrics/Handler.cs b/Modules/Quotas/src/Quotas.Application/Metrics/Queries/ListMetrics/Handler.cs
@@ -1,17 +1,14 @@
-using AutoMapper;
-using Backbone.Modules.Quotas.Application.DTOs;
+using Backbone.Modules.Quotas.Application.DTOs;
 using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
 using MediatR;
 
 namespace Backbone.Modules.Quotas.Application.Metrics.Queries.ListMetrics;
 public class Handler : IRequestHandler<ListMetricsQuery, ListMetricsResponse>
 {
-    private readonly IMapper _mapper;
     private readonly IMetricsRepository _metricsRepository;
 
-    public Handler(IMapper mapper, IMetricsRepository metricsRepository)
+    public Handler(IMetricsRepository metricsRepository)
     {
-        _mapper = mapper;
         _metricsRepository = metricsRepository;
     }
 

diff --git a/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/Identity.cs b/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/Identity.cs
@@ -20,6 +20,8 @@ private Identity()
         _tierQuotas = null!;
         _individualQuotas = null!;
         _metricStatuses = null!;
+        Address = null!;
+        TierId = null!;
     }
 
     public Identity(string address, TierId tierId)
@@ -31,8 +33,8 @@ public Identity(string address, TierId tierId)
         _metricStatuses = new List<MetricStatus>();
     }
 
-    public string Address { get; } = null!;
-    public TierId TierId { get; private set; } = null!;
+    public string Address { get; }
+    public TierId TierId { get; private set; }
 
     public IReadOnlyCollection<MetricStatus> MetricStatuses => _metricStatuses.AsReadOnly();
 

diff --git a/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/AddMockTiersRepository.cs b/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/AddMockTiersRepository.cs
@@ -1,15 +1,16 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using System.Diagnostics.CodeAnalysis;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
 using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
 
 namespace Backbone.Modules.Quotas.Application.Tests.TestDoubles;
 public class AddMockTiersRepository : ITiersRepository
 {
-    public bool WasCalled { get; private set; }
-    public Tier WasCalledWith { get; private set; } = null!;
+    [MemberNotNullWhen(true, nameof(WasCalledWith))]
+    public bool WasCalled => WasCalledWith != null;
+    public Tier? WasCalledWith { get; private set; }
 
     public Task Add(Tier tier, CancellationToken cancellationToken)
     {
-        WasCalled = true;
         WasCalledWith = tier;
         return Task.CompletedTask;
     }

diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Repositories/MessagesRepositoryTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Repositories/MessagesRepositoryTests.cs
@@ -1,7 +1,6 @@
 using Backbone.DevelopmentKit.Identity.ValueObjects;
 using Backbone.Modules.Messages.Domain.Entities;
 using Backbone.Modules.Messages.Infrastructure.Persistence.Database;
-using Backbone.Modules.Quotas.Domain.Aggregates;
 using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
 using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
 using Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;

diff --git a/...otas/test/Quotas.Application.Tests/Tests/Tiers/TierCreatedIntegrationEventHandlerTests.cs b/...otas/test/Quotas.Application.Tests/Tests/Tiers/TierCreatedIntegrationEventHandlerTests.cs
@@ -23,7 +23,7 @@ public async void Creates_tier_after_consuming_integration_event()
 
         // Assert
         mockTierRepository.WasCalled.Should().BeTrue();
-        mockTierRepository.WasCalledWith.Id.Should().Be(id);
+        mockTierRepository.WasCalledWith!.Id.Should().Be(id);
         mockTierRepository.WasCalledWith.Name.Should().Be(name);
     }