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

Merge pull request 'SubmitRegistrationForm - fixes' (#49) from MoreEndpoints into master

Browse Source
This commit is contained in:
Zonar 2020-09-27 12:03:46 +02:00
commit 1899b934b0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/InternshipSystem.Api/Controllers/InternshipRegistrationController.cs
View File

@ -1,15 +1,11 @@
using System.Linq; using System.Threading;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using InternshipSystem.Api.Queries; using InternshipSystem.Api.Queries;
using InternshipSystem.Api.Security; using InternshipSystem.Api.Security;
using InternshipSystem.Core.Commands;
using InternshipSystem.Repository; using InternshipSystem.Repository;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using InternshipSystem.Api.Security;
using InternshipSystem.Api.Services; using InternshipSystem.Api.Services;
using InternshipSystem.Core; using InternshipSystem.Core;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;

10
src/InternshipSystem.Api/Services/InternshipService.cs
View File

@ -25,11 +25,16 @@ namespace InternshipSystem.Api.Services
public async Task<ActionResult> SubmitRegistration(RegistrationFormQuery registrationQuery, User user, public async Task<ActionResult> SubmitRegistration(RegistrationFormQuery registrationQuery, User user,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var edition = await _context.Editions.FindAsync(user.EditionId); var edition = await _context.Editions
.Include(e => e.AvailableInternshipTypes)
.FirstOrDefaultAsync(e => e.Id.Equals(user.EditionId), cancellationToken: cancellationToken);
var internship = await _context.Entry(edition) var internship = await _context.Entry(edition)
.Collection(e => e.Internships) .Collection(e => e.Internships)
.Query() .Query()
.Include(i => i.InternshipRegistration)
.Include(i => i.InternshipRegistration.Company)
.Include(i => i.InternshipRegistration.BranchAddress)
.SingleAsync(i => i.Student.Id == user.PersonNumber, cancellationToken); .SingleAsync(i => i.Student.Id == user.PersonNumber, cancellationToken);
var internshipRegistration = internship.InternshipRegistration; var internshipRegistration = internship.InternshipRegistration;
@ -74,7 +79,7 @@ namespace InternshipSystem.Api.Services
return new BadRequestObjectResult("Edition doesn't have this type of employment in available employments type"); return new BadRequestObjectResult("Edition doesn't have this type of employment in available employments type");
} }
internshipRegistration.Type = registrationQuery.Type ?? internshipRegistration.Type; internshipRegistration.Type = registrationQuery.Type != null ? edition.AvailableInternshipTypes.Find(ai => ai.Id.Equals(registrationQuery.Type.Id)) : internshipRegistration.Type;
await _context.SaveChangesAsync(cancellationToken); await _context.SaveChangesAsync(cancellationToken);
return new OkResult(); return new OkResult();
@ -88,6 +93,7 @@ namespace InternshipSystem.Api.Services
var internship = await _context.Entry(edition) var internship = await _context.Entry(edition)
.Collection(e => e.Internships) .Collection(e => e.Internships)
.Query() .Query()
.Include(i => i.Documentation)
.SingleAsync(i => i.Student.Id == user.PersonNumber, cancellationToken); .SingleAsync(i => i.Student.Id == user.PersonNumber, cancellationToken);
var document = Mapper.Map<Document>(documentRequest); var document = Mapper.Map<Document>(documentRequest);