Skip to content

Commit 8bfadd2

Browse files
AntonioFalcaoJrAntonioFalcaoJr
authored
Merge pull request #123 from AntonioFalcao/feature/adjusts
Feature/adjusts
2 parents 0f91d13 + 845bb56 commit 8bfadd2

File tree

16 files changed

+255
-254
lines changed

16 files changed

+255
-254
lines changed

‎src/Dotnet5.GraphQL3.CrossCutting/DependencyInjection/ConfigureService.cs renamed to ‎src/Dotnet5.GraphQL3.CrossCutting/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Dotnet5.GraphQL3.CrossCutting.Notifications;
2-
using Microsoft.Extensions.DependencyInjection;
3-
4-
namespace Dotnet5.GraphQL3.CrossCutting.DependencyInjection
5-
{
6-
public static class ConfigureService
7-
{
8-
public static IServiceCollection AddNotificationContext(this IServiceCollection services)
9-
=> services.AddScoped<INotificationContext, NotificationContext>();
10-
}
1+
using Dotnet5.GraphQL3.CrossCutting.Notifications;
2+
using Microsoft.Extensions.DependencyInjection;
3+
4+
namespace Dotnet5.GraphQL3.CrossCutting.Extensions.DependencyInjection
5+
{
6+
public static class ServiceCollectionExtensions
7+
{
8+
public static IServiceCollection AddNotificationContext(this IServiceCollection services)
9+
=> services.AddScoped<INotificationContext, NotificationContext>();
10+
}
1111
}

‎src/Dotnet5.GraphQL3.Domain.Abstractions/DependencyInjection/ConfigureService.cs renamed to ‎src/Dotnet5.GraphQL3.Domain.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
using Dotnet5.GraphQL3.CrossCutting.Extensions;
2-
using Dotnet5.GraphQL3.Domain.Abstractions.Builders;
3-
using Microsoft.Extensions.DependencyInjection;
4-
using Scrutor;
5-
6-
namespace Dotnet5.GraphQL3.Domain.Abstractions.DependencyInjection
7-
{
8-
public static class ConfigureService
9-
{
10-
public static IServiceCollection AddBuilders(this IServiceCollection services)
11-
=> services.Scan(selector
12-
=> selector
13-
.FromApplicationDependencies(assembly
14-
=> assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
15-
.AddClasses(filter
16-
=> filter.AssignableToAny(typeof(IBuilder<,>)))
17-
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
18-
.AsImplementedInterfaces()
19-
.WithScopedLifetime());
20-
}
1+
using Dotnet5.GraphQL3.CrossCutting.Extensions;
2+
using Dotnet5.GraphQL3.Domain.Abstractions.Builders;
3+
using Microsoft.Extensions.DependencyInjection;
4+
using Scrutor;
5+
6+
namespace Dotnet5.GraphQL3.Domain.Abstractions.Extensions.DependencyInjection
7+
{
8+
public static class ServiceCollectionExtensions
9+
{
10+
public static IServiceCollection AddBuilders(this IServiceCollection services)
11+
=> services.Scan(selector
12+
=> selector
13+
.FromApplicationDependencies(assembly
14+
=> assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
15+
.AddClasses(filter
16+
=> filter.AssignableToAny(typeof(IBuilder<,>)))
17+
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
18+
.AsImplementedInterfaces()
19+
.WithScopedLifetime());
20+
}
2121
}

‎src/Dotnet5.GraphQL3.Repositories.Abstractions/Dotnet5.GraphQL3.Repositories.Abstractions.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(Microsoft_EntityFrameworkCore_Version)"/>
5-
<PackageReference Include="Scrutor" Version="$(Scrutor_Version)"/>
4+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(Microsoft_EntityFrameworkCore_Version)" />
5+
<PackageReference Include="Scrutor" Version="$(Scrutor_Version)" />
66
</ItemGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\Dotnet5.GraphQL3.Store.Domain\Dotnet5.GraphQL3.Store.Domain.csproj"/>
9+
<ProjectReference Include="..\Dotnet5.GraphQL3.Store.Domain\Dotnet5.GraphQL3.Store.Domain.csproj" />
1010
</ItemGroup>
1111

1212
</Project>

‎src/Dotnet5.GraphQL3.Repositories.Abstractions/DependencyInjection/ConfigureService.cs renamed to ‎src/Dotnet5.GraphQL3.Repositories.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
using Dotnet5.GraphQL3.CrossCutting.Extensions;
2-
using Dotnet5.GraphQL3.Repositories.Abstractions.UnitsOfWork;
3-
using Microsoft.Extensions.DependencyInjection;
4-
using Scrutor;
5-
6-
namespace Dotnet5.GraphQL3.Repositories.Abstractions.DependencyInjection
7-
{
8-
public static class ConfigureService
9-
{
10-
public static IServiceCollection AddRepositories(this IServiceCollection services)
11-
=> services.Scan(selector
12-
=> selector
13-
.FromApplicationDependencies(assembly
14-
=> assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
15-
.AddClasses(filter
16-
=> filter.AssignableToAny(typeof(IRepository<,>)))
17-
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
18-
.AsImplementedInterfaces()
19-
.WithScopedLifetime());
20-
21-
public static IServiceCollection AddUnitOfWork(this IServiceCollection services)
22-
=> services.AddScoped<IUnitOfWork, UnitOfWork>();
23-
}
1+
using Dotnet5.GraphQL3.CrossCutting.Extensions;
2+
using Dotnet5.GraphQL3.Repositories.Abstractions.UnitsOfWork;
3+
using Microsoft.Extensions.DependencyInjection;
4+
using Scrutor;
5+
6+
namespace Dotnet5.GraphQL3.Repositories.Abstractions.Extensions.DependencyInjection
7+
{
8+
public static class ServiceCollectionExtensions
9+
{
10+
public static IServiceCollection AddRepositories(this IServiceCollection services)
11+
=> services.Scan(selector
12+
=> selector
13+
.FromApplicationDependencies(assembly
14+
=> assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
15+
.AddClasses(filter
16+
=> filter.AssignableToAny(typeof(IRepository<,>)))
17+
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
18+
.AsImplementedInterfaces()
19+
.WithScopedLifetime());
20+
21+
public static IServiceCollection AddUnitOfWork(this IServiceCollection services)
22+
=> services.AddScoped<IUnitOfWork, UnitOfWork>();
23+
}
2424
}

‎src/Dotnet5.GraphQL3.Services.Abstractions/Dotnet5.GraphQL3.Services.Abstractions.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="AutoMapper" Version="$(AutoMapper_Version)"/>
5-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="$(AutoMapper_DependencyInjection_Version)"/>
6-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(Microsoft_EntityFrameworkCore_Version)"/>
7-
<PackageReference Include="Scrutor" Version="$(Scrutor_Version)"/>
4+
<PackageReference Include="AutoMapper" Version="$(AutoMapper_Version)" />
5+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="$(AutoMapper_DependencyInjection_Version)" />
6+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(Microsoft_EntityFrameworkCore_Version)" />
7+
<PackageReference Include="Scrutor" Version="$(Scrutor_Version)" />
88
</ItemGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\Dotnet5.GraphQL3.CrossCutting\Dotnet5.GraphQL3.CrossCutting.csproj"/>
12-
<ProjectReference Include="..\Dotnet5.GraphQL3.Repositories.Abstractions\Dotnet5.GraphQL3.Repositories.Abstractions.csproj"/>
13-
<ProjectReference Include="..\Dotnet5.GraphQL3.Store.Domain\Dotnet5.GraphQL3.Store.Domain.csproj"/>
11+
<ProjectReference Include="..\Dotnet5.GraphQL3.CrossCutting\Dotnet5.GraphQL3.CrossCutting.csproj" />
12+
<ProjectReference Include="..\Dotnet5.GraphQL3.Repositories.Abstractions\Dotnet5.GraphQL3.Repositories.Abstractions.csproj" />
13+
<ProjectReference Include="..\Dotnet5.GraphQL3.Store.Domain\Dotnet5.GraphQL3.Store.Domain.csproj" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Dotnet5.GraphQL3.Services.Abstractions/DependencyInjection/ConfigureService.cs renamed to ‎src/Dotnet5.GraphQL3.Services.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
using System;
2-
using System.Linq;
3-
using System.Reactive.Subjects;
4-
using System.Reflection;
5-
using AutoMapper;
6-
using Dotnet5.GraphQL3.Services.Abstractions.Messages;
7-
using Microsoft.Extensions.DependencyInjection;
8-
using Scrutor;
9-
10-
namespace Dotnet5.GraphQL3.Services.Abstractions.DependencyInjection
11-
{
12-
public static class ConfigureService
13-
{
14-
public static IServiceCollection AddApplicationServices(this IServiceCollection services)
15-
=> services.Scan(selector
16-
=> selector
17-
.FromApplicationDependencies(assembly
18-
=> assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
19-
.AddClasses(filter
20-
=> filter.AssignableToAny(typeof(IService<,,>)))
21-
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
22-
.AsImplementedInterfaces()
23-
.WithScopedLifetime());
24-
25-
public static IServiceCollection AddMessageServices(this IServiceCollection services)
26-
=> services.Scan(selector
27-
=> selector
28-
.FromApplicationDependencies(assembly
29-
=> assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
30-
.AddClasses(filter
31-
=> filter.AssignableToAny(typeof(IMessageService<,,>)))
32-
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
33-
.AsImplementedInterfaces()
34-
.WithSingletonLifetime());
35-
36-
public static IServiceCollection AddSubjects(this IServiceCollection services)
37-
=> services.AddSingleton(typeof(ISubject<>), typeof(ReplaySubject<>));
38-
39-
public static IServiceCollection AddAutoMapper(this IServiceCollection services)
40-
=> services.AddAutoMapper(
41-
AppDomain.CurrentDomain.GetAssemblies()
42-
.Where(x => x.FullName?
43-
.Contains(GetAssemblySuffix()) ?? false));
44-
45-
private static string GetAssemblySuffix()
46-
=> Assembly.GetEntryAssembly()?.FullName?.Substring(0, 16);
47-
}
1+
using System;
2+
using System.Linq;
3+
using System.Reactive.Subjects;
4+
using System.Reflection;
5+
using AutoMapper;
6+
using Dotnet5.GraphQL3.Services.Abstractions.Messages;
7+
using Microsoft.Extensions.DependencyInjection;
8+
using Scrutor;
9+
10+
namespace Dotnet5.GraphQL3.Services.Abstractions.Extensions.DependencyInjection
11+
{
12+
public static class ServiceCollectionExtensions
13+
{
14+
public static IServiceCollection AddApplicationServices(this IServiceCollection services)
15+
=> services.Scan(selector
16+
=> selector
17+
.FromApplicationDependencies(assembly
18+
=> assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
19+
.AddClasses(filter
20+
=> filter.AssignableToAny(typeof(IService<,,>)))
21+
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
22+
.AsImplementedInterfaces()
23+
.WithScopedLifetime());
24+
25+
public static IServiceCollection AddMessageServices(this IServiceCollection services)
26+
=> services.Scan(selector
27+
=> selector
28+
.FromApplicationDependencies(assembly
29+
=> assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
30+
.AddClasses(filter
31+
=> filter.AssignableToAny(typeof(IMessageService<,,>)))
32+
.UsingRegistrationStrategy(RegistrationStrategy.Skip)
33+
.AsImplementedInterfaces()
34+
.WithSingletonLifetime());
35+
36+
public static IServiceCollection AddSubjects(this IServiceCollection services)
37+
=> services.AddSingleton(typeof(ISubject<>), typeof(ReplaySubject<>));
38+
39+
public static IServiceCollection AddAutoMapper(this IServiceCollection services)
40+
=> services.AddAutoMapper(
41+
AppDomain.CurrentDomain.GetAssemblies()
42+
.Where(x => x.FullName?
43+
.Contains(GetAssemblySuffix()) ?? false));
44+
45+
private static string GetAssemblySuffix()
46+
=> Assembly.GetEntryAssembly()?.FullName?.Substring(0, 16);
47+
}
4848
}

‎src/Dotnet5.GraphQL3.Services.Abstractions/Service.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public virtual TEntity Save(TModel model)
110110
return OnSave(entity);
111111
}
112112

113-
public virtual async Task<TEntity> SaveAsync(TModel model, CancellationToken cancellationToken = default)
113+
public virtual async Task<TEntity> SaveAsync(TModel model, CancellationToken cancellationToken)
114114
{
115115
if (IsValid(model) is false) return default;
116116
var entity = Mapper.Map<TEntity>(model);
@@ -133,15 +133,15 @@ protected TEntity OnEdit(TEntity entity)
133133
return entity;
134134
}
135135

136-
protected async Task<TEntity> OnEditAsync(TEntity entity, CancellationToken cancellationToken = default)
136+
protected async Task<TEntity> OnEditAsync(TEntity entity, CancellationToken cancellationToken)
137137
{
138138
if (IsValid(entity) is false) return default;
139139
await Repository.UpdateAsync(entity, cancellationToken);
140140
await UnitOfWork.SaveChangesAsync(cancellationToken);
141141
return entity;
142142
}
143143

144-
protected async Task<TEntity> OnSaveAsync(TEntity entity, CancellationToken cancellationToken = default)
144+
protected async Task<TEntity> OnSaveAsync(TEntity entity, CancellationToken cancellationToken)
145145
{
146146
if (IsValid(entity) is false) return default;
147147
await Repository.AddAsync(entity, cancellationToken);

‎src/Dotnet5.GraphQL3.Store.Repositories/DependencyInjection/ConfigureServices.cs renamed to ‎src/Dotnet5.GraphQL3.Store.Repositories/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
using System;
2-
using Dotnet5.GraphQL3.Store.Repositories.Contexts;
3-
using Microsoft.EntityFrameworkCore;
4-
using Microsoft.EntityFrameworkCore.Infrastructure;
5-
using Microsoft.Extensions.DependencyInjection;
6-
7-
namespace Dotnet5.GraphQL3.Store.Repositories.DependencyInjection
8-
{
9-
public static class ConfigureServices
10-
{
11-
private const int MaxRetryCount = 5;
12-
private static readonly TimeSpan MaxRetryDelay = TimeSpan.FromSeconds(5);
13-
private static readonly RepositoriesOptions Options = new();
14-
15-
public static IServiceCollection AddApplicationDbContext(this IServiceCollection services, Action<RepositoriesOptions> options)
16-
{
17-
options.Invoke(Options);
18-
19-
return services
20-
.AddScoped<DbContext, StoreDbContext>()
21-
.AddDbContext<StoreDbContext>(DbContextOptionsBuilderAction);
22-
}
23-
24-
private static void DbContextOptionsBuilderAction(DbContextOptionsBuilder optionsBuilder)
25-
=> optionsBuilder
26-
.EnableDetailedErrors()
27-
.EnableSensitiveDataLogging()
28-
.UseSqlServer(
29-
connectionString: Options.ConnectionString,
30-
sqlServerOptionsAction: SqlServerOptionsAction);
31-
32-
private static void SqlServerOptionsAction(SqlServerDbContextOptionsBuilder optionsBuilder)
33-
=> optionsBuilder
34-
.EnableRetryOnFailure(MaxRetryCount, MaxRetryDelay, null)
35-
.MigrationsAssembly(typeof(StoreDbContext).Assembly.GetName().Name);
36-
}
37-
38-
public class RepositoriesOptions
39-
{
40-
public string ConnectionString { get; set; }
41-
}
1+
using System;
2+
using Dotnet5.GraphQL3.Store.Repositories.Contexts;
3+
using Microsoft.EntityFrameworkCore;
4+
using Microsoft.EntityFrameworkCore.Infrastructure;
5+
using Microsoft.Extensions.DependencyInjection;
6+
7+
namespace Dotnet5.GraphQL3.Store.Repositories.Extensions.DependencyInjection
8+
{
9+
public static class ServiceCollectionExtensions
10+
{
11+
private const int MaxRetryCount = 5;
12+
private static readonly TimeSpan MaxRetryDelay = TimeSpan.FromSeconds(5);
13+
private static readonly RepositoriesOptions Options = new();
14+
15+
public static IServiceCollection AddApplicationDbContext(this IServiceCollection services, Action<RepositoriesOptions> options)
16+
{
17+
options.Invoke(Options);
18+
19+
return services
20+
.AddScoped<DbContext, StoreDbContext>()
21+
.AddDbContext<StoreDbContext>(DbContextOptionsBuilderAction);
22+
}
23+
24+
private static void DbContextOptionsBuilderAction(DbContextOptionsBuilder optionsBuilder)
25+
=> optionsBuilder
26+
.EnableDetailedErrors()
27+
.EnableSensitiveDataLogging()
28+
.UseSqlServer(
29+
connectionString: Options.ConnectionString,
30+
sqlServerOptionsAction: SqlServerOptionsAction);
31+
32+
private static void SqlServerOptionsAction(SqlServerDbContextOptionsBuilder optionsBuilder)
33+
=> optionsBuilder
34+
.EnableRetryOnFailure(MaxRetryCount, MaxRetryDelay, null)
35+
.MigrationsAssembly(typeof(StoreDbContext).Assembly.GetName().Name);
36+
}
37+
38+
public class RepositoriesOptions
39+
{
40+
public string ConnectionString { get; set; }
41+
}
4242
}

‎src/Dotnet5.GraphQL3.Store.Services/IProductService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Dotnet5.GraphQL3.Store.Services
1313
{
1414
public interface IProductService : IService<Product, ProductModel, Guid>
1515
{
16-
public Task<Review> AddReviewAsync(ReviewModel reviewModel, CancellationToken cancellationToken = default);
17-
Task<ILookup<Guid, Review>> GetLookupReviewsByProductIdsAsync(IEnumerable<Guid> productIds, CancellationToken cancellationToken = default);
16+
public Task<Review> AddReviewAsync(ReviewModel reviewModel, CancellationToken cancellationToken);
17+
Task<ILookup<Guid, Review>> GetLookupReviewsByProductIdsAsync(IEnumerable<Guid> productIds, CancellationToken cancellationToken);
1818
}
1919
}

0 commit comments

Comments
 (0)