Skip to content

Commit f740c70

Browse files
foxminchanfoxminchan
committed
chore: Remove unnecessary using statements and update namespaces in multiple test and builder files
1 parent 12b9dc4 commit f740c70

File tree

48 files changed

+89
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+89
-114
lines changed

‎Directory.Packages.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
<AspireVersion>8.2.0</AspireVersion>
66
<AspirantVersion>0.0.4</AspirantVersion>
7-
<MicrosoftExtensionsVersion>8.8.0</MicrosoftExtensionsVersion>
7+
<MicrosoftExtensionsVersion>8.9.1</MicrosoftExtensionsVersion>
88
<AspnetVersion>8.0.8</AspnetVersion>
99
<EfCoreVersion>8.0.8</EfCoreVersion>
1010
<XabarilVersion>8.0.1</XabarilVersion>
@@ -27,7 +27,7 @@
2727
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(AspireUnstablePackagesVersion)" />
2828
<PackageVersion Include="Aspire.StackExchange.Redis" Version="$(AspireVersion)" />
2929
<PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="$(AspireVersion)" />
30-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
30+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
3131
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
3232
<!-- Aspirant -->
3333
<PackageVersion Include="Aspirant.Hosting" Version="$(AspirantVersion)" />

‎bun.lockb

-5.62 KB
Binary file not shown.

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"url": "git+https://github.com/foxminchan/BookWorm"
1313
},
1414
"devDependencies": {
15-
"@commitlint/cli": "^19.4.0",
16-
"@commitlint/config-conventional": "^19.2.2",
15+
"@commitlint/cli": "^19.5.0",
16+
"@commitlint/config-conventional": "^19.5.0",
1717
"@types/bun": "latest",
18-
"husky": "^9.1.5"
18+
"husky": "^9.1.6"
1919
},
2020
"peerDependencies": {
2121
"typescript": "^5.5.3"

‎src/BookWorm.Basket/Grpc/BasketService.cs

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using BookWorm.Basket.Features;
22
using BookWorm.Basket.Features.Get;
3+
using Google.Protobuf.WellKnownTypes;
34
using GrpcBasketBase = BookWorm.Basket.Grpc.Basket.BasketBase;
45

56
namespace BookWorm.Basket.Grpc;
@@ -8,21 +9,21 @@ public sealed class BasketService(ISender sender, IBookService bookService, ILog
89
: GrpcBasketBase
910
{
1011
[AllowAnonymous]
11-
public override async Task<BasketResponse> GetBasket(BasketRequest request, ServerCallContext context)
12+
public override async Task<BasketResponse> GetBasket(Empty request, ServerCallContext context)
1213
{
13-
if (logger.IsEnabled(LogLevel.Debug))
14-
{
15-
logger.LogDebug("[{Service}] - - Begin grpc call {Method} with {BasketId}",
16-
nameof(BasketService), nameof(GetBasket), request.BasketId);
17-
}
18-
1914
var userId = context.GetUserIdentity();
2015

2116
if (string.IsNullOrEmpty(userId))
2217
{
2318
return new();
2419
}
2520

21+
if (logger.IsEnabled(LogLevel.Debug))
22+
{
23+
logger.LogDebug("[{Service}] - - Begin grpc call {Method} with {BasketId}",
24+
nameof(BasketService), nameof(GetBasket), userId);
25+
}
26+
2627
var basket = await sender.Send(new GetBasketQuery());
2728

2829
return basket.Value is not null ? await MapToBasketResponse(basket.Value) : new();

‎src/BookWorm.Basket/Protos/basket.proto

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
syntax = "proto3";
22

3+
import "google/protobuf/empty.proto";
4+
35
option csharp_namespace = "BookWorm.Basket.Grpc";
46

57
package BasketApi;
68

79
service Basket {
8-
rpc GetBasket (BasketRequest) returns (BasketResponse);
9-
}
10-
11-
message BasketRequest {
12-
string basketId = 1;
10+
rpc GetBasket (google.protobuf.Empty) returns (BasketResponse);
1311
}
1412

1513
message BasketResponse {

‎src/BookWorm.Catalog/BookWorm.Catalog.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
<ItemGroup>
2121
<PackageReference Include="Polly" />
2222
<PackageReference Include="Polly.Extensions" />
23-
<PackageReference Include="Pgvector.EntityFrameworkCore" />
2423
<PackageReference Include="Grpc.AspNetCore" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<PackageReference Include="Pgvector.EntityFrameworkCore" />
2528
<PackageReference Include="EFCore.NamingConventions" />
2629
<PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" />
2730
</ItemGroup>

‎src/BookWorm.Catalog/Infrastructure/Ai/Extension.cs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public static IHostApplicationBuilder AddAi(this IHostApplicationBuilder builder
1010

1111
builder.AddAzureOpenAIClient(ServiceName.OpenAi);
1212
builder.Services.AddOpenAITextEmbeddingGeneration(modelName);
13-
1413
builder.Services.AddSingleton<IAiService, AiService>();
1514

1615
return builder;

‎src/BookWorm.MailDev.Hosting/MailDevResource.cs

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
namespace BookWorm.MailDev.Hosting;
22

3+
/// <summary>
4+
/// https://github.com/davidfowl/Build2024AspireDemo/blob/main/AppHost/MailDev/MailDevResource.cs
5+
/// </summary>
6+
/// <param name="name"></param>
37
public sealed class MailDevResource(string name) : ContainerResource(name), IResourceWithConnectionString
48
{
59
internal const string SmtpEndpointName = "smtp";

‎src/BookWorm.MailDev.Hosting/MailDevResourceBuilderExtensions.cs

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
namespace BookWorm.MailDev.Hosting;
22

3+
/// <summary>
4+
/// https://github.com/davidfowl/Build2024AspireDemo/blob/main/AppHost/MailDev/MailDevResourceBuilderExtensions.cs
5+
/// </summary>
36
public static class MailDevResourceBuilderExtensions
47
{
58
public static IResourceBuilder<MailDevResource> AddMailDev(

‎src/BookWorm.Ordering/Grpc/BasketService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public async Task<Basket> GetBasketAsync(Guid basketId, CancellationToken cancel
1414
basketId);
1515
}
1616

17-
var response = await basketClient.GetBasketAsync(new() { BasketId = basketId.ToString() },
17+
var response = await basketClient.GetBasketAsync(new(),
1818
cancellationToken: cancellationToken);
1919

2020
return MapBasket(response);

‎src/BookWorm.ServiceDefaults/BookWorm.ServiceDefaults.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
13-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
1412
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
1513
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
1614
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
1715
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" />
16+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
1817
</ItemGroup>
1918

2019
<ItemGroup>
21-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
20+
<PackageReference Include="MongoDB.Bson" />
2221
<PackageReference Include="Swashbuckle.AspNetCore" />
23-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
2422
<PackageReference Include="MicroElements.Swashbuckle.FluentValidation" />
25-
<PackageReference Include="MongoDB.Bson" />
23+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
2624
</ItemGroup>
2725

2826
<ItemGroup>

‎src/BookWorm.Shared/BookWorm.Shared.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
</ItemGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Scrutor" />
98
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
109
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
1110
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
1211
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
13-
<PackageReference Include="FluentValidation.AspNetCore" />
1412
</ItemGroup>
1513

1614
<ItemGroup>
15+
<PackageReference Include="Scrutor" />
1716
<PackageReference Include="MassTransit.RabbitMQ" />
17+
<PackageReference Include="FluentValidation.AspNetCore" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎tests/BookWorm.Basket.IntegrationTests/BookWorm.Basket.IntegrationTests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
2121
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2223
</ItemGroup>
2324

2425
<ItemGroup>
25-
<PackageReference Include="coverlet.collector" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2726
<PackageReference Include="xunit" />
2827
<PackageReference Include="xunit.runner.visualstudio" />
29-
<PackageReference Include="ReportGenerator" />
3028
<PackageReference Include="FluentAssertions" />
29+
<PackageReference Include="coverlet.collector" />
30+
<PackageReference Include="ReportGenerator" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎tests/BookWorm.Basket.UnitTests/Application/GetBasketHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Basket.Domain;
2-
using BookWorm.Basket.Features;
1+
using BookWorm.Basket.Features;
32
using BookWorm.Basket.Features.Get;
43
using BasketModel = BookWorm.Basket.Domain.Basket;
54

‎tests/BookWorm.Basket.UnitTests/Application/ReduceItemQuantityHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Basket.Domain;
2-
using BookWorm.Basket.Features.ReduceItemQuantity;
1+
using BookWorm.Basket.Features.ReduceItemQuantity;
32
using BasketModel = BookWorm.Basket.Domain.Basket;
43

54
namespace BookWorm.Basket.UnitTests.Application;

‎tests/BookWorm.Basket.UnitTests/Application/RemoveItemHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Basket.Domain;
2-
using BookWorm.Basket.Features.RemoveItem;
1+
using BookWorm.Basket.Features.RemoveItem;
32
using BasketModel = BookWorm.Basket.Domain.Basket;
43

54
namespace BookWorm.Basket.UnitTests.Application;

‎tests/BookWorm.Basket.UnitTests/BookWorm.Basket.UnitTests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="coverlet.collector" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
119
<PackageReference Include="xunit" />
1210
<PackageReference Include="xunit.runner.visualstudio" />
1311
<PackageReference Include="Xunit.Combinatorial" />
@@ -16,7 +14,9 @@
1614
<ItemGroup>
1715
<PackageReference Include="Moq" />
1816
<PackageReference Include="ReportGenerator" />
17+
<PackageReference Include="coverlet.collector" />
1918
<PackageReference Include="FluentAssertions" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎tests/BookWorm.Basket.UnitTests/Domain/BasketItemTests.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using BookWorm.Basket.Domain;
2-
3-
namespace BookWorm.Basket.UnitTests.Domain;
1+
namespace BookWorm.Basket.UnitTests.Domain;
42

53
public class BasketItemTests
64
{

‎tests/BookWorm.Basket.UnitTests/Domain/BasketTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Basket.Domain;
2-
using BasketModel = BookWorm.Basket.Domain.Basket;
1+
using BasketModel = BookWorm.Basket.Domain.Basket;
32

43
namespace BookWorm.Basket.UnitTests.Domain;
54

‎tests/BookWorm.Basket.UnitTests/GlobalUsings.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
global using Ardalis.GuardClauses;
1+
global using Ardalis.GuardClauses;
2+
global using BookWorm.Basket.Domain;
23
global using BookWorm.Basket.Grpc;
34
global using BookWorm.Basket.Infrastructure.Redis;
45
global using BookWorm.Shared.Identity;
6+
global using Google.Protobuf.WellKnownTypes;
57
global using Grpc.Core;
8+
global using MediatR;
9+
global using Microsoft.AspNetCore.Http;
10+
global using Microsoft.Extensions.Logging;

‎tests/BookWorm.Basket.UnitTests/Services/BasketServiceTests.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
using BookWorm.Basket.Features;
22
using BookWorm.Basket.Features.Get;
33
using BookWorm.Basket.UnitTests.Helpers;
4-
using MediatR;
5-
using Microsoft.AspNetCore.Http;
6-
using Microsoft.Extensions.Logging;
74

85
namespace BookWorm.Basket.UnitTests.Services;
96

@@ -25,7 +22,6 @@ public BasketServiceTests()
2522
public async Task GetBasket_ShouldReturnBasketResponse_WhenBasketExists()
2623
{
2724
// Arrange
28-
var basketId = Guid.NewGuid().ToString();
2925
var basket = new BasketDto(Guid.NewGuid(),
3026
[
3127
new(Guid.NewGuid(), "Dummy Book", 10, 15m, 12m)
@@ -41,7 +37,7 @@ public async Task GetBasket_ShouldReturnBasketResponse_WhenBasketExists()
4137
.Setup(x => x.GetBookAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
4238
.ReturnsAsync(book);
4339

44-
var request = new BasketRequest { BasketId = basketId };
40+
var request = new Empty();
4541
var context = TestServerCallContext.Create();
4642
context.SetUserState("__HttpContext", new DefaultHttpContext());
4743

@@ -56,13 +52,11 @@ public async Task GetBasket_ShouldReturnBasketResponse_WhenBasketExists()
5652
public async Task GetBasket_ShouldReturnEmpty_WhenBasketNotFound()
5753
{
5854
// Arrange
59-
var basketId = Guid.NewGuid().ToString();
60-
6155
_senderMock
6256
.Setup(x => x.Send(It.IsAny<GetBasketQuery>(), It.IsAny<CancellationToken>()))
6357
.ReturnsAsync((BasketDto?)null!);
6458

65-
var request = new BasketRequest { BasketId = basketId };
59+
var request = new Empty();
6660
var context = TestServerCallContext.Create();
6761
context.SetUserState("__HttpContext", new DefaultHttpContext());
6862

‎tests/BookWorm.Catalog.IntegrationTests/BookWorm.Catalog.IntegrationTests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
2020
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2122
</ItemGroup>
2223

2324
<ItemGroup>
24-
<PackageReference Include="coverlet.collector" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2625
<PackageReference Include="xunit" />
2726
<PackageReference Include="xunit.runner.visualstudio" />
28-
<PackageReference Include="ReportGenerator" />
2927
<PackageReference Include="FluentAssertions" />
28+
<PackageReference Include="coverlet.collector" />
29+
<PackageReference Include="ReportGenerator" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎tests/BookWorm.Catalog.UnitTests/Application/Authors/CreateAuthorHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Catalog.Domain;
2-
using BookWorm.Catalog.Features.Authors.Create;
1+
using BookWorm.Catalog.Features.Authors.Create;
32

43
namespace BookWorm.Catalog.UnitTests.Application.Authors;
54

‎tests/BookWorm.Catalog.UnitTests/Application/Authors/DeleteAuthorHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Catalog.Domain;
2-
using BookWorm.Catalog.Features.Authors.Delete;
1+
using BookWorm.Catalog.Features.Authors.Delete;
32
using BookWorm.Catalog.UnitTests.Builder;
43

54
namespace BookWorm.Catalog.UnitTests.Application.Authors;

‎tests/BookWorm.Catalog.UnitTests/Application/Authors/ListAuthorsHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Catalog.Domain;
2-
using BookWorm.Catalog.Features.Authors.List;
1+
using BookWorm.Catalog.Features.Authors.List;
32
using BookWorm.Catalog.UnitTests.Builder;
43

54
namespace BookWorm.Catalog.UnitTests.Application.Authors;

‎tests/BookWorm.Catalog.UnitTests/Application/Categories/CreateCategoryHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Catalog.Domain;
2-
using BookWorm.Catalog.Features.Categories.Create;
1+
using BookWorm.Catalog.Features.Categories.Create;
32

43
namespace BookWorm.Catalog.UnitTests.Application.Categories;
54

‎tests/BookWorm.Catalog.UnitTests/Application/Categories/ListCategoriesHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Catalog.Domain;
2-
using BookWorm.Catalog.Features.Categories.List;
1+
using BookWorm.Catalog.Features.Categories.List;
32
using BookWorm.Catalog.UnitTests.Builder;
43

54
namespace BookWorm.Catalog.UnitTests.Application.Categories;

‎tests/BookWorm.Catalog.UnitTests/Application/Publishers/CreatePublisherHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Catalog.Domain;
2-
using BookWorm.Catalog.Features.Publishers.Create;
1+
using BookWorm.Catalog.Features.Publishers.Create;
32

43
namespace BookWorm.Catalog.UnitTests.Application.Publishers;
54

‎tests/BookWorm.Catalog.UnitTests/Application/Publishers/ListPublishersHandlerTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using BookWorm.Catalog.Domain;
2-
using BookWorm.Catalog.Features.Publishers.List;
1+
using BookWorm.Catalog.Features.Publishers.List;
32
using BookWorm.Catalog.UnitTests.Builder;
43

54
namespace BookWorm.Catalog.UnitTests.Application.Publishers;

‎tests/BookWorm.Catalog.UnitTests/BookWorm.Catalog.UnitTests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="coverlet.collector" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
119
<PackageReference Include="xunit" />
1210
<PackageReference Include="xunit.runner.visualstudio" />
1311
<PackageReference Include="Xunit.Combinatorial" />
@@ -16,7 +14,9 @@
1614
<ItemGroup>
1715
<PackageReference Include="Moq" />
1816
<PackageReference Include="ReportGenerator" />
19-
<PackageReference Include="FluentAssertions" />
17+
<PackageReference Include="coverlet.collector" />
18+
<PackageReference Include="FluentAssertions" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

0 commit comments

Comments
 (0)