Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(Orm): Masa.Contrib.Data.Contracts.EFCore -> Masa.Contrib.Data.Contracts #346

Merged
merged 1 commit into from
Nov 25, 2022
+166 −212
Merged

refactor(Orm): Masa.Contrib.Data.Contracts.EFCore -> Masa.Contrib.Data.Contracts #346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Masa.Framework.sln
View file
Original file line number Diff line number Diff line change
@@ -243,7 +243,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orm", "Orm", "{343A61CC-45B
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UoW", "UoW", "{E8B3FB42-C450-4B12-9C2C-7B9A02B616BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Contracts.EFCore", "src\Contrib\Data\Contracts\Masa.Contrib.Data.Contracts.EFCore\Masa.Contrib.Data.Contracts.EFCore.csproj", "{8353A1CE-B6F0-42A2-B7F1-BC87707719AD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Contracts", "src\Contrib\Data\Contracts\Masa.Contrib.Data.Contracts\Masa.Contrib.Data.Contracts.csproj", "{8353A1CE-B6F0-42A2-B7F1-BC87707719AD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{83E5A183-56D6-4CAC-95A6-FB280AA7AE3D}"
EndProject
@@ -477,7 +477,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Dispatcher.Eve
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.EFCore.PostgreSql", "src\Contrib\Data\Orm\EFCore\Masa.Contrib.Data.EFCore.PostgreSql\Masa.Contrib.Data.EFCore.PostgreSql.csproj", "{6616A9E2-66F3-4AEB-BE0D-77346B3F3B06}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Contracts.EFCore.Tests", "src\Contrib\Data\Contracts\Tests\Masa.Contrib.Data.Contracts.EFCore.Tests\Masa.Contrib.Data.Contracts.EFCore.Tests.csproj", "{979FBAA7-EC54-4183-B2A7-3C5BE5510F16}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Contracts.Tests", "src\Contrib\Data\Contracts\Tests\Masa.Contrib.Data.Contracts.Tests\Masa.Contrib.Data.Contracts.Tests.csproj", "{979FBAA7-EC54-4183-B2A7-3C5BE5510F16}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.UoW.EFCore", "src\Contrib\Data\UoW\Masa.Contrib.Data.UoW.EFCore\Masa.Contrib.Data.UoW.EFCore.csproj", "{44DB6ED1-71DC-487B-8DD7-3F872CB23254}"
EndProject
11 changes: 11 additions & 0 deletions src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/IMasaDbContextBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.BuildingBlocks.Data;

public interface IMasaDbContextBuilder
{
public bool EnableSoftDelete { get; set; }

public IServiceCollection Services { get; }
}
27 changes: 0 additions & 27 deletions src/Contrib/Data/Contracts/Masa.Contrib.Data.Contracts.EFCore/Internal/InstanceBuilder.cs
View file

This file was deleted.

69 changes: 0 additions & 69 deletions ...ata/Contracts/Masa.Contrib.Data.Contracts.EFCore/MasaDbContextOptionsBuilderExtensions.cs
View file

This file was deleted.

17 changes: 0 additions & 17 deletions src/Contrib/Data/Contracts/Masa.Contrib.Data.Contracts.EFCore/_Imports.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...tracts.EFCore/DataFiltering/DataFilter.cs → ...ata.Contracts/DataFiltering/DataFilter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.DataFiltering;
namespace Masa.Contrib.Data.Contracts.DataFiltering;

public class DataFilter : IDataFilter
{
2 changes: 1 addition & 1 deletion ...tracts.EFCore/Internal/DataFilterState.cs → ...ata.Contracts/Internal/DataFilterState.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Internal;
namespace Masa.Contrib.Data.Contracts.Internal;

internal class DataFilterState
{
2 changes: 1 addition & 1 deletion ...ontracts.EFCore/Internal/DisposeAction.cs → ....Data.Contracts/Internal/DisposeAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Internal;
namespace Masa.Contrib.Data.Contracts.Internal;

internal sealed class DisposeAction : IDisposable
{
6 changes: 5 additions & 1 deletion ...ntracts.EFCore/Internal/NullDisposable.cs → ...Data.Contracts/Internal/NullDisposable.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Internal;
namespace Masa.Contrib.Data.Contracts.Internal;

[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
internal sealed class NullDisposable : IDisposable
{
public static NullDisposable Instance { get; } = new();

/// <summary>
/// no need to release resources
/// </summary>
public void Dispose()
{
}
2 changes: 1 addition & 1 deletion ...Masa.Contrib.Data.Contracts.EFCore.csproj → ...tracts/Masa.Contrib.Data.Contracts.csproj
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\BuildingBlocks\Data\Masa.BuildingBlocks.Data\Masa.BuildingBlocks.Data.csproj" />
<ProjectReference Include="..\..\..\..\Utils\Caching\Masa.Utils.Caching.Memory\Masa.Utils.Caching.Memory.csproj" />
<ProjectReference Include="..\..\Orm\EFCore\Masa.Contrib.Data.EFCore\Masa.Contrib.Data.EFCore.csproj" />
</ItemGroup>

</Project>
29 changes: 29 additions & 0 deletions src/Contrib/Data/Contracts/Masa.Contrib.Data.Contracts/MasaDbContextBuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

// ReSharper disable once CheckNamespace

namespace Microsoft.EntityFrameworkCore;

public static class MasaDbContextBuilderExtensions
{
public static IMasaDbContextBuilder UseFilter(
this IMasaDbContextBuilder masaDbContextBuilder,
Action<FilterOptions>? options = null)
=> masaDbContextBuilder.UseFilterCore(options);

private static IMasaDbContextBuilder UseFilterCore(
this IMasaDbContextBuilder masaDbContextBuilder,
Action<FilterOptions>? options = null)
{
var filterOptions = new FilterOptions();
options?.Invoke(filterOptions);

masaDbContextBuilder.Services.TryAddScoped(typeof(DataFilter<>));
masaDbContextBuilder.Services.TryAddScoped<IDataFilter, DataFilter>();

masaDbContextBuilder.EnableSoftDelete = filterOptions.EnableSoftDelete;

return masaDbContextBuilder;
}
}
2 changes: 1 addition & 1 deletion ...Contracts.EFCore/Options/FilterOptions.cs → ...b.Data.Contracts/Options/FilterOptions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Options;
namespace Masa.Contrib.Data.Contracts.Options;

public class FilterOptions
{
6 changes: 3 additions & 3 deletions ...a.Contrib.Data.Contracts.EFCore/README.md → ...cts/Masa.Contrib.Data.Contracts/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[中](README.zh-CN.md) | EN

## Masa.Contrib.Data.Contracts.EFCore
## Masa.Contrib.Data.Contracts

Example:

``` powershelll
Install-Package Masa.Contrib.Data.EFCore.Sqlite
Install-Package Masa.Contrib.Data.Contracts.EFCore //Use the data filtering and soft delete capabilities provided by the protocol
Install-Package Masa.Contrib.Data.Contracts //Use the data filtering and soft delete capabilities provided by the protocol
```

### Usage 1
@@ -26,8 +26,8 @@ Install-Package Masa.Contrib.Data.Contracts.EFCore //Use the data filtering and
``` C#
builder.Services.AddMasaDbContext<CustomDbContext>(optionsBuilder =>
{
optionsBuilder.UseFilter(); //Enable filtering
optionsBuilder.UseSqlite(); //Using Sqlite database
optionsBuilder.UseFilter(); //Enable filtering
});
```

6 changes: 3 additions & 3 deletions ...rib.Data.Contracts.EFCore/README.zh-CN.md → ...sa.Contrib.Data.Contracts/README.zh-CN.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
中 | [EN](README.md)

## Masa.Contrib.Data.Contracts.EFCore
## Masa.Contrib.Data.Contracts

提供的数据过滤(用于禁用租户、环境或软删除)、软删除能力

用例:

``` powershelll
Install-Package Masa.Contrib.Data.EFCore.Sqlite //以Sqlite数据库为例
Install-Package Masa.Contrib.Data.Contracts.EFCore //使用规约提供的数据过滤、软删除能力
Install-Package Masa.Contrib.Data.Contracts //使用规约提供的数据过滤、软删除能力
```

1. 配置appsettings.json
@@ -26,8 +26,8 @@ Install-Package Masa.Contrib.Data.Contracts.EFCore //使用规约提供的数据
``` C#
builder.Services.AddMasaDbContext<CustomDbContext>(optionsBuilder =>
{
optionsBuilder.UseFilter();//启用过滤
optionsBuilder.UseSqlite();//使用Sqlite数据库
optionsBuilder.UseFilter();//启用过滤
});
```

12 changes: 12 additions & 0 deletions src/Contrib/Data/Contracts/Masa.Contrib.Data.Contracts/_Imports.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

global using Masa.BuildingBlocks.Data;
global using Masa.Contrib.Data.Contracts.DataFiltering;
global using Masa.Contrib.Data.Contracts.Internal;
global using Masa.Contrib.Data.Contracts.Options;
global using Masa.Utils.Caching.Memory;
global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.DependencyInjection.Extensions;
global using System.Linq.Expressions;
global using System.Reflection;
2 changes: 1 addition & 1 deletion ...Contracts.EFCore.Tests/CustomDbContext.cs → ...b.Data.Contracts.Tests/CustomDbContext.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Tests;
namespace Masa.Contrib.Data.Contracts.Tests;

public class CustomDbContext : MasaDbContext<CustomDbContext>
{
4 changes: 1 addition & 3 deletions ....Contracts.EFCore.Tests/DataFilterTest.cs → ...ib.Data.Contracts.Tests/DataFilterTest.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

using System.Reflection;

namespace Masa.Contrib.Data.Contracts.EFCore.Tests;
namespace Masa.Contrib.Data.Contracts.Tests;

[TestClass]
public class DataFilterTest
2 changes: 1 addition & 1 deletion ...rations/AddressEntityTypeConfiguration.cs → ...rations/AddressEntityTypeConfiguration.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Tests.EntityConfigurations;
namespace Masa.Contrib.Data.Contracts.Tests.EntityConfigurations;

public class AddressEntityTypeConfiguration : IEntityTypeConfiguration<Address>
{
2 changes: 1 addition & 1 deletion ...rations/StudentEntityTypeConfiguration.cs → ...rations/StudentEntityTypeConfiguration.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Tests.EntityConfigurations;
namespace Masa.Contrib.Data.Contracts.Tests.EntityConfigurations;

public class StudentEntityTypeConfiguration : IEntityTypeConfiguration<Student>
{
2 changes: 1 addition & 1 deletion ...ontrib.Data.Contracts.EFCore.Tests.csproj → .../Masa.Contrib.Data.Contracts.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\Orm\EFCore\Masa.Contrib.Data.EFCore.Sqlite\Masa.Contrib.Data.EFCore.Sqlite.csproj" />
<ProjectReference Include="..\..\Masa.Contrib.Data.Contracts.EFCore\Masa.Contrib.Data.Contracts.EFCore.csproj" />
<ProjectReference Include="..\..\Masa.Contrib.Data.Contracts\Masa.Contrib.Data.Contracts.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ....Contracts.EFCore.Tests/Models/Address.cs → ...ib.Data.Contracts.Tests/Models/Address.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Tests.Models;
namespace Masa.Contrib.Data.Contracts.Tests.Models;

public class Address : ISoftDelete
{
2 changes: 1 addition & 1 deletion ...ta.Contracts.EFCore.Tests/Models/Hobby.cs → ...trib.Data.Contracts.Tests/Models/Hobby.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Tests.Models;
namespace Masa.Contrib.Data.Contracts.Tests.Models;

public class Hobby
{
2 changes: 1 addition & 1 deletion ....Contracts.EFCore.Tests/Models/LogItem.cs → ...ib.Data.Contracts.Tests/Models/LogItem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Tests.Models;
namespace Masa.Contrib.Data.Contracts.Tests.Models;

public class LogItem
{
2 changes: 1 addition & 1 deletion ....Contracts.EFCore.Tests/Models/Student.cs → ...ib.Data.Contracts.Tests/Models/Student.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Data.Contracts.EFCore.Tests.Models;
namespace Masa.Contrib.Data.Contracts.Tests.Models;

public class Student : IAuditEntity<int>, ISoftDelete
{
Loading