system-praktyk/system-praktyk-api
3
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

fix/fix #81

Merged
maxchil merged 1 commits from feat/errors into master 2020-11-12 01:16:24 +01:00
Conversation 0 Commits 1 Files Changed 3 +25 -3
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/InternshipSystem.Api/UseCases/UpdateInternshipRegistrationUseCase.cs
View File

@ -30,7 +30,7 @@ namespace InternshipSystem.Api.UseCases
subjectRegistration = internshipRegistration; subjectRegistration = internshipRegistration;
} }
public async Task<(DocumentState State, IEnumerable<string>)> UpdateInternshipRegistration( public async Task<(DocumentState State, IEnumerable<ErrorDescription>)> UpdateInternshipRegistration(
UpdateRegistrationForm registrationCommand, UpdateRegistrationForm registrationCommand,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {

15
src/InternshipSystem.Core/Entity/Internship/Extensions.cs Normal file
View File

@ -0,0 +1,15 @@
using System.Collections.Generic;
using System.Linq;
using FluentValidation.Results;
using InternshipSystem.Core.Entity.Internship;
namespace InternshipSystem.Core
{
static internal class Extensions
{
public static IEnumerable<ErrorDescription> ToErrorDescription(this ValidationResult result)
{
return result.Errors.Select(failure => new ErrorDescription { Key = failure.ErrorCode, Parameters = failure.FormattedMessagePlaceholderValues });
}
}
}

11
src/InternshipSystem.Core/Entity/Internship/InternshipRegistration.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using FluentValidation; using FluentValidation;
using FluentValidation.Results;
using InternshipSystem.Core.UglyOrmArtifacts; using InternshipSystem.Core.UglyOrmArtifacts;
namespace InternshipSystem.Core.Entity.Internship namespace InternshipSystem.Core.Entity.Internship
@ -27,7 +28,7 @@ namespace InternshipSystem.Core.Entity.Internship
} }
public (DocumentState State, IEnumerable<string>) ValidateStatus(Edition edition) public (DocumentState State, IEnumerable<ErrorDescription>) ValidateStatus(Edition edition)
{ {
var validator = new Validator(edition); var validator = new Validator(edition);
@ -35,7 +36,7 @@ namespace InternshipSystem.Core.Entity.Internship
State = result.IsValid ? DocumentState.Submitted : DocumentState.Draft; State = result.IsValid ? DocumentState.Submitted : DocumentState.Draft;
return (State, result.Errors.Select(failure => failure.ToString())); return (State, result.ToErrorDescription());
} }
public class Validator : AbstractValidator<InternshipRegistration> public class Validator : AbstractValidator<InternshipRegistration>
@ -75,4 +76,10 @@ namespace InternshipSystem.Core.Entity.Internship
} }
} }
} }
public class ErrorDescription
{
public string Key { get; set; }
public Dictionary<string, object> Parameters { get; set; }
}
} }