Skip to content

Fix: fluent validation for cpf and cnpj with update dependencies #73

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

Merged
Takasakiii merged 2 commits into from
Apr 21, 2025
Merged

Fix: fluent validation for cpf and cnpj with update dependencies #73

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a655aae
Fix: fluent validation for cpf and cnpj with update dependencies
vulcandragi Apr 21, 2025
81e0d69
Fix: version
vulcandragi Apr 21, 2025
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 .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
needs: [ sonar ]
environment: 'Production'
runs-on: ubuntu-latest
if: github.ref_name == 'dotnet8' && github.event_name == 'push'
if: github.ref_name == 'main' && github.event_name == 'push'

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
needs: [ sonar ]
environment: 'Production Nuget'
runs-on: ubuntu-latest
if: github.ref_name == 'dotnet8' && github.event_name == 'push'
if: github.ref_name == 'main' && github.event_name == 'push'

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions TakasakiStudio.Lina.AspNet/TakasakiStudio.Lina.AspNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<Copyright>TakasakiStudio</Copyright>
<PackageProjectUrl>https://github.com/Takasaki-Studio/Lina</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>2.4.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions ...akiStudio.Lina.AutoDependencyInjection/TakasakiStudio.Lina.AutoDependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
<Copyright>TakasakiStudio</Copyright>
<PackageProjectUrl>https://github.com/Takasaki-Studio/Lina</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>2.4.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 9 additions & 6 deletions TakasakiStudio.Lina.Common/Extensions/RuleBuilderExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ namespace TakasakiStudio.Lina.Common.Extensions;

public static partial class RuleBuilderExtension
{
public static IRuleBuilder<T, string> ValidCpf<T>(this IRuleBuilder<T, string> ruleBuilder)
public static IRuleBuilderOptions<T, string> IsCnpj<T>(
this IRuleBuilder<T, string> ruleBuilder)
{
return ruleBuilder.Must(BeAValidCpf);
return ruleBuilder.Must(BeAValidCnpj);
}

public static IRuleBuilder<T, string> ValidCnpj<T>(this IRuleBuilder<T, string> ruleBuilder)

public static IRuleBuilderOptions<T, string> IsCpf<T>(
this IRuleBuilder<T, string> ruleBuilder)
{
return ruleBuilder.Must(BeAValidCnpj);
return ruleBuilder.Must(BeAValidCpf);
}

private static bool BeAValidCpf(string input)
public static bool BeAValidCpf(string input)
{
var numbers = ToNumbers(input);
if (numbers.Length != 11 || numbers.Distinct().Count() == 1)
Expand All @@ -40,7 +43,7 @@ private static bool BeAValidCpf(string input)
return numbers[9] == v1 && numbers[10] == v2;
}

private static bool BeAValidCnpj(string input)
public static bool BeAValidCnpj(string input)
{
var numbers = ToNumbers(input);
if (numbers.Length != 14)
Expand Down
1 change: 1 addition & 0 deletions TakasakiStudio.Lina.Common/TakasakiStudio.Lina.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<Copyright>TakasakiStudio</Copyright>
<PackageProjectUrl>https://github.com/Takasaki-Studio/Lina</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>2.4.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions TakasakiStudio.Lina.Database/TakasakiStudio.Lina.Database.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
<Copyright>TakasakiStudio</Copyright>
<PackageProjectUrl>https://github.com/Takasaki-Studio/Lina</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>2.4.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions TakasakiStudio.Lina.Test/TakasakiStudio.Lina.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Version>2.4.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
3 changes: 2 additions & 1 deletion TakasakiStudio.Lina.Utils/TakasakiStudio.Lina.Utils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
<Copyright>TakasakiStudio</Copyright>
<PackageProjectUrl>https://github.com/Takasaki-Studio/Lina</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>2.4.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Config.Net" Version="5.2.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions TakasakiStudio.Lina/TakasakiStudio.Lina.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<Copyright>TakasakiStudio</Copyright>
<PackageProjectUrl>https://github.com/Takasaki-Studio/Lina</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>2.4.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down