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.

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

Reports Configuration #25

Merged
merged 24 commits into from
Jun 10, 2020
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8d6795b
remove duplicated items by bad merge
ivaneliasoo Jun 5, 2020
4b01ecb
add security tier
ivaneliasoo Jun 6, 2020
bed221d
change pass move token controller, change tokencontroller to authcont…
ivaneliasoo Jun 6, 2020
0f0b56b
Merge branch 'master' into dev
ivaneliasoo Jun 6, 2020
c389b3e
Corrige Bug al gueardar seeds
ivaneliasoo Jun 6, 2020
3c3351d
Merge branch 'dev' of https://github.com/ivaneliasoo/Inspections into…
ivaneliasoo Jun 6, 2020
f92da27
Backend CheckLists
ivaneliasoo Jun 9, 2020
f1ab44c
Backend Signatures, Report COnfiguration repository, queires checklis…
ivaneliasoo Jun 9, 2020
a792dd6
Uploads service & Storage helper class, paths on settings
ivaneliasoo Jun 9, 2020
fbd9226
Merge branch 'master' into dev
ivaneliasoo Jun 9, 2020
90cf2b0
solve typo in Shared proyect reference
ivaneliasoo Jun 9, 2020
0c534d8
Merge branch 'dev' of https://github.com/ivaneliasoo/Inspections into…
ivaneliasoo Jun 9, 2020
1d6fd4e
Fix Bug Querying CheckLists
ivaneliasoo Jun 9, 2020
3de5506
Ignore some local files
ivaneliasoo Jun 9, 2020
e3045e7
Optional items in query
ivaneliasoo Jun 9, 2020
1e83c1a
Merge branch 'master' into dev
ivaneliasoo Jun 9, 2020
531a621
update dev branch (#21)
ivaneliasoo Jun 10, 2020
0b218b3
Solves Signature add and update bug
ivaneliasoo Jun 10, 2020
dfadd53
Merge branch 'dev' of https://github.com/ivaneliasoo/Inspections into…
ivaneliasoo Jun 10, 2020
1003e18
simplify api routes
ivaneliasoo Jun 10, 2020
3e667d7
Quering and DTO mappin for signatures
ivaneliasoo Jun 10, 2020
388ed49
Backend Reports Configurations
ivaneliasoo Jun 10, 2020
42ed763
Backend Reports Config
ivaneliasoo Jun 10, 2020
b0651c9
Merge branch 'master' into dev
ivaneliasoo Jun 10, 2020
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
Prev Previous commit
Next Next commit
Merge branch 'master' into dev
ivaneliasoo authored Jun 9, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit fbd9226a0f64d76d3d30ad16d3d3f047755cdb09
3 changes: 3 additions & 0 deletions src/Backend/Inspections.API/Startup.cs
Original file line number Diff line number Diff line change
@@ -147,6 +147,7 @@ public void ConfigureServices(IServiceCollection services)
services.AddScoped<ICheckListsQueries, CheckListsQueries>();



//ConfigurarDbContextInMemoryDb(services);
ConfigurarDbContextInSqlDb(services);
}
@@ -174,6 +175,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

app.UseRouting();


app.UseExceptionsMiddleware();

app.UseAuthentication();
@@ -200,6 +202,7 @@ private void ConfigurarDbContextInSqlDb(IServiceCollection services)
}

private static bool ValidUserToken(TokenValidatedContext context, IServiceCollection services)

{
bool result = false;

1 change: 1 addition & 0 deletions src/Backend/Inspections.API/appsettings.json
Original file line number Diff line number Diff line change
@@ -20,4 +20,5 @@
"SecretKey": "e5df4ae6-b61f-4df9-98c7-8c4dafbb2571",
"ExpirationHours": 8
}

}
Original file line number Diff line number Diff line change
@@ -24,16 +24,19 @@ public class InspectionsContext : DbContext
private readonly IMediator _mediator;
private readonly IUserNameResolver _userNameResolver;


public InspectionsContext(DbContextOptions options)
: base(options)
{

}


public InspectionsContext(DbContextOptions options, IMediator mediator, IUserNameResolver userNameResolver) : base(options)
{
_mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));
_userNameResolver = userNameResolver ?? throw new ArgumentNullException(nameof(userNameResolver));

}

public DbSet<Report> Inspections { get; set; }
@@ -52,7 +55,6 @@ public InspectionsContext(DbContextOptions options, IMediator mediator, IUserNam

public DbSet<ResumenCheckList> ResumenCheckLists { get; set; }


protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.ApplyConfiguration(new PhotoRecordEntityTypeConfiguration());
@@ -96,6 +98,7 @@ public override Task<int> SaveChangesAsync(CancellationToken cancellationToken =
entidad.Property("LastEdit").CurrentValue = DateTimeOffset.UtcNow;
// TODO: add JWT secutiry in API
entidad.Property("LastEditUser").CurrentValue = _userNameResolver.UserName ?? "Seed";

}
return base.SaveChangesAsync(cancellationToken);
}
You are viewing a condensed version of this merge commit. You can view the full changes here.