Skip to content

Commit

Permalink
Merge pull request #133 from AntonioFalcao/release
Browse files Browse the repository at this point in the history
Updating
  • Loading branch information
AntonioFalcaoJr authored Feb 6, 2021
2 parents 277bd0a + e0ed2cb commit 30af862
Show file tree
Hide file tree
Showing 11 changed files with 269 additions and 76 deletions.
46 changes: 23 additions & 23 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
README.md
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
23 changes: 23 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
* **Please check if the PR fulfills these requirements**
- [ ] The commit message follows our guidelines
- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)


* **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)



* **What is the current behavior?** (You can also link to an open issue here)



* **What is the new behavior (if this is a feature change)?**



* **Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)



* **Other information**:
82 changes: 41 additions & 41 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/Dotnet5.GraphQL3.Store.WebAPI/Dotnet5.GraphQL3.Store.WebAPI.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/Dotnet5.GraphQL3.Store.WebAPI/Dotnet5.GraphQL3.Store.WebAPI.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/src/Dotnet5.GraphQL3.Store.WebAPI/Dotnet5.GraphQL3.Store.WebAPI.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/Dotnet5.GraphQL3.Store.WebAPI/Dotnet5.GraphQL3.Store.WebAPI.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/Dotnet5.GraphQL3.Store.WebAPI/Dotnet5.GraphQL3.Store.WebAPI.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/src/Dotnet5.GraphQL3.Store.WebAPI/Dotnet5.GraphQL3.Store.WebAPI.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<!--GraphQL-->
<GraphQL_Server_Version>4.4.1</GraphQL_Server_Version>
<GraphQL_Client_Version>3.2.1</GraphQL_Client_Version>
<GraphQL_Version>3.3.1</GraphQL_Version>
<GraphQL_Version>3.3.2</GraphQL_Version>

<!--AutoMapper-->
<AutoMapper_DependencyInjection_Version>8.1.0</AutoMapper_DependencyInjection_Version>
<AutoMapper_Version>10.1.1</AutoMapper_Version>

<!--Others-->
<FluentValidation_Version>9.4.0</FluentValidation_Version>
<FluentValidation_Version>9.5.0</FluentValidation_Version>
<Scrutor_Version>3.3.0</Scrutor_Version>

</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Bogus" Version="32.0.2" />
<PackageReference Include="Bogus" Version="32.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(Microsoft_EntityFrameworkCore_Version)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(Microsoft_EntityFrameworkCore_Version)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(Microsoft_EntityFrameworkCore_Version)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ namespace Dotnet5.GraphQL3.Store.Repositories.Extensions.DependencyInjection
{
public static class ServiceCollectionExtensions
{
private const int MaxRetryCount = 5;
private static readonly TimeSpan MaxRetryDelay = TimeSpan.FromSeconds(5);
private static readonly RepositoriesOptions Options = new();
private static readonly RepositoryOptions Options = new();

public static IServiceCollection AddApplicationDbContext(this IServiceCollection services, Action<RepositoriesOptions> options)
public static IServiceCollection AddApplicationDbContext(this IServiceCollection services, Action<RepositoryOptions> optionsAction)
{
options.Invoke(Options);
optionsAction(Options);

return services
.AddScoped<DbContext, StoreDbContext>()
Expand All @@ -31,12 +29,42 @@ private static void DbContextOptionsBuilderAction(DbContextOptionsBuilder option

private static void SqlServerOptionsAction(SqlServerDbContextOptionsBuilder optionsBuilder)
=> optionsBuilder
.EnableRetryOnFailure(MaxRetryCount, MaxRetryDelay, null)
.EnableRetryOnFailure(
maxRetryCount: Options.ResilientConnection.MaxRetryCount,
maxRetryDelay: Options.ResilientConnection.MaxRetryDelay,
errorNumbersToAdd: Options.ResilientConnection.ErrorNumbersToAdd)
.MigrationsAssembly(typeof(StoreDbContext).Assembly.GetName().Name);
}

public class RepositoriesOptions
public class DatabaseResilientConnection
{
private const int DefaultMaxRetryCount = 5;
private const int DefaultMaxRetryDelay = 5;

private int _maxRetryCount;
private int _maxSecondsRetryDelay;

public int MaxRetryCount
{
get => _maxRetryCount;
set => _maxRetryCount = value is default(int) ? DefaultMaxRetryCount : value;
}

public int MaxSecondsRetryDelay
{
get => _maxSecondsRetryDelay;
set => _maxSecondsRetryDelay = value is default(int) ? DefaultMaxRetryDelay : value;
}

public int[] ErrorNumbersToAdd { get; set; }

internal TimeSpan MaxRetryDelay
=> TimeSpan.FromSeconds(MaxSecondsRetryDelay);
}

public class RepositoryOptions
{
public string ConnectionString { get; set; }
public DatabaseResilientConnection ResilientConnection { get; set; } = new();
}
}
7 changes: 5 additions & 2 deletions src/Dotnet5.GraphQL3.Store.WebAPI/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@ public void ConfigureServices(IServiceCollection services)
.AddSubjects()
.AddNotificationContext();

services.AddApplicationDbContext(options
=> options.ConnectionString = _configuration.GetConnectionString("DefaultConnection"));
services.AddApplicationDbContext(options =>
{
options.ConnectionString = _configuration.GetConnectionString("DefaultConnection");
_configuration.Bind("DatabaseResilientConnection", options.ResilientConnection);
});

services.AddApplicationGraphQL(options
=> options.IsDevelopment = _env.IsDevelopment());
Expand Down
Loading

0 comments on commit 30af862

Please sign in to comment.