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

5fb44c0b2c2818016e8c23d3 (#96)

Browse Source 
Add approvals

Merge branch 'master' of http://git.kadet.net/system-praktyk/system-praktyk-api into 5fb44c0b2c2818016e8c23d3

XD

Co-authored-by: Michal Bohdanowicz <m.w.bohdanowicz@gmail.com>
This commit is contained in:
maxchil 2021-01-11 20:45:59 +01:00
parent 11de1c5dfe
commit 9b3aff4dd0
10 changed files with 92 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/InternshipSystem.Api/Controllers/DocumentManagementController.cs
View File

@ -22,6 +22,26 @@ namespace InternshipSystem.Api.Controllers
{
Context = context;
}
[HttpDelete("delete/{documentId}")]
[Authorize(Policy = Policies.IsOverseer)]
public async Task<ActionResult> DeleteDocument(long documentId, CancellationToken ct)
{
var internship = await Context.Internships
.Include(i => i.Documentation)
.FirstOrDefaultAsync(i => i.Documentation.Any(d => d.Id.Equals(documentId)), ct);
if (internship == null)
{
return NotFound();
}
internship.RemoveDocument(documentId);
await Context.SaveChangesAsync(ct);
return Ok();
}
[HttpPut("accept/{documentId}")]
[ProducesResponseType(StatusCodes.Status200OK)]
@ -60,7 +80,7 @@ namespace InternshipSystem.Api.Controllers
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
[Authorize(Policy = Policies.IsOverseer)]
public async Task<ActionResult> RejectInternship(long documentId, [FromBody] string comment, CancellationToken token)
public async Task<ActionResult> RejectDocument(long documentId, [FromBody] string comment, CancellationToken token)
{
var internship = await Context.Internships
.Include(i => i.Documentation)

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

@ -47,7 +47,7 @@ namespace InternshipSystem.Api.Controllers
.ThenInclude(t => t.Subject)
.FirstAsync(e => e.Id == user.EditionId, cancellationToken);
var internshipRegistration =
var internship =
await _context
.Entry(edition)
.Collection(e => e.Internships)
@ -62,12 +62,11 @@ namespace InternshipSystem.Api.Controllers
.ThenInclude(c => c.Type)
.Include(i => i.InternshipRegistration)
.ThenInclude(c => c.Subjects)
.Include(i => i.Documentation)
.Where(i => i.Student.Id == user.PersonNumber)
.Select(i => i.InternshipRegistration)
.FirstAsync(cancellationToken);
var useCase = new UpdateInternshipRegistrationUseCase(_context, internshipRegistration, edition, user);
var useCase = new UpdateInternshipRegistrationUseCase(_context, internship, edition, user);
try
{

3
src/InternshipSystem.Api/Controllers/ReportController.cs
View File

@ -1,6 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using InternshipSystem.Api.Security;
using InternshipSystem.Core.ValueObject;
using InternshipSystem.Repository;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@ -35,7 +36,7 @@ namespace InternshipSystem.Api.Controllers
.SingleAsync(i => i.Student.Id == user.PersonNumber, ct);
internship.Report.UpdateReport(reportValue.ToString(Formatting.None));
internship.AddInternshipEvaluation();
internship.AddNewDocument("", DocumentType.InternshipEvaluation);
await _context.SaveChangesAsync(ct);

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

@ -9,6 +9,7 @@ using InternshipSystem.Api.Security;
using InternshipSystem.Core;
using InternshipSystem.Core.Entity.Internship;
using InternshipSystem.Core.UglyOrmArtifacts;
using InternshipSystem.Core.ValueObject;
using InternshipSystem.Repository;
using Microsoft.EntityFrameworkCore;
@ -17,25 +18,27 @@ namespace InternshipSystem.Api.UseCases
public class UpdateInternshipRegistrationUseCase
{
private readonly InternshipDbContext _dbContext;
private readonly Internship _internship;
private readonly Edition _edition;
private readonly User _user;
private readonly InternshipRegistration subjectRegistration;
public UpdateInternshipRegistrationUseCase(InternshipDbContext dbContext,
InternshipRegistration internshipRegistration, Edition edition, User user)
Internship internship, Edition edition, User user)
{
_dbContext = dbContext;
_internship = internship;
_edition = edition;
_user = user;
subjectRegistration = internshipRegistration;
_internship = internship;
subjectRegistration = internship.InternshipRegistration;
}
public async Task<(DocumentState State, IEnumerable<ErrorDescription>)> UpdateInternshipRegistration(
UpdateRegistrationForm registrationCommand,
CancellationToken cancellationToken)
{
subjectRegistration.Start = registrationCommand.Start ?? subjectRegistration.Start;
subjectRegistration.End = registrationCommand.End ?? subjectRegistration.End;
UpdateTimeFrame(registrationCommand);
subjectRegistration.DeclaredHours = registrationCommand.Hours ?? subjectRegistration.DeclaredHours;
if (registrationCommand.Type.HasValue)
@ -61,9 +64,34 @@ namespace InternshipSystem.Api.UseCases
return subjectRegistration.ValidateStatus(_edition);
}
private void UpdateTimeFrame(UpdateRegistrationForm registrationCommand)
{
subjectRegistration.Start = registrationCommand.Start ?? subjectRegistration.Start;
subjectRegistration.End = registrationCommand.End ?? subjectRegistration.End;
if (!_edition.IsDateDuringEdition(subjectRegistration.Start, subjectRegistration.End))
{
_internship.AddNewDocument("", DocumentType.OutsideTermApproval);
}
else
{
_internship.RemoveDocument(DocumentType.OutsideTermApproval);
}
}
private void UpdateInternshipType(long typeId)
{
var editionInternshipType = _edition.AvailableInternshipTypes.FirstOrDefault(i => i.InternshipTypeId == typeId);
if (editionInternshipType?.InternshipType.RequireDeansApproval == true)
{
_internship.AddNewDocument("", DocumentType.InternshipTypeApproval);
}
else
{
_internship.RemoveDocument(DocumentType.InternshipTypeApproval);
}
subjectRegistration.Type = editionInternshipType?.InternshipType ?? subjectRegistration.Type;
}

4
src/InternshipSystem.Core/Entity/Edition.cs
View File

@ -120,9 +120,7 @@ namespace InternshipSystem.Core
}
var internship = Internship.CreateStudentsInternship(student);
Internships.Add(internship);
}

45
src/InternshipSystem.Core/Entity/Internship/Internship.cs
View File

@ -26,14 +26,19 @@ namespace InternshipSystem.Core.Entity.Internship
internship.Report = Report.Create();
internship.Documentation = new List<Document>();
if (student.Semester != 6)
{
internship.AddNewDocument("", DocumentType.OutsideSemesterApproval);
}
return internship;
}
public void AddNewDocument(string description, DocumentType type)
{
if (Documentation.Any(d => d.Type == type))
if (type != DocumentType.Other && Documentation.Any(d => d.Type == type))
{
throw new ArgumentException("Internship already has a document of given type");
return;
}
var document = new Document
@ -46,29 +51,29 @@ namespace InternshipSystem.Core.Entity.Internship
Documentation.Add(document);
}
public void UpdateDocumentScan(long documentId, byte[] documentScan)
public void RemoveDocument(DocumentType documentType)
{
var document = Documentation.First(d => d.Id == documentId);
// document.Scan = documentScan;
// document.State = DocumentState.Submitted;
}
public void AddInternshipEvaluation()
{
if (Documentation.Any(d => d.Type == DocumentType.InternshipEvaluation))
if (documentType == DocumentType.Other)
{
return;
}
var document = new Document
{
Description = "",
Type = DocumentType.InternshipEvaluation,
State = DocumentState.Draft
};
Documentation.Add(document);
var doc = Documentation.FirstOrDefault(d => d.Type == documentType);
if (doc != null)
{
Documentation.Remove(doc);
}
}
public void RemoveDocument(long id)
{
var doc = Documentation.FirstOrDefault(d => d.Id == id);
if (doc != null)
{
Documentation.Remove(doc);
}
}
}
}

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

@ -62,13 +62,9 @@ namespace InternshipSystem.Core.Entity.Internship
.Must(edition.IsTypeAvailable)
.WithMessage("error.type.not_available");
RuleFor(x => x.Start)
.GreaterThanOrEqualTo(edition.EditionStart)
.LessThan(x => x.End)
.NotEmpty()
.WithMessage("error.start_date.empty");
RuleFor(x => x.End)
.LessThanOrEqualTo(edition.EditionFinish)
.GreaterThan(x => x.Start)
.NotEmpty()
.WithMessage("error.end_date.empty");
RuleFor(x => x.DeclaredHours)

9
src/InternshipSystem.Core/ValueObject/DocumentType.cs
View File

@ -3,8 +3,11 @@
public enum DocumentType
{
IppScan,
DeanConsent,
NnwIsurance,
InternshipEvaluation
OutsideTermApproval,
InternshipTypeApproval,
OutsideSemesterApproval,
NnwInsurance,
InternshipEvaluation,
Other
}
}

1
src/InternshipSystem.Repository/DatabaseFiller.cs
View File

@ -159,6 +159,7 @@ namespace InternshipSystem.Repository
{
Label = "Umowa zlecenia (w tym B2B)",
LabelEng = "Contract of mandate (including B2B)",
RequireDeansApproval = true
},
};
await Context.InternshipTypes.AddRangeAsync(internshipTypes);

2
test/InternshipSystem.Api.Test/InternshipSystem.cs
View File

@ -123,7 +123,6 @@ namespace InternshipSystem.Api.Test
.Include(i => i.InternshipRegistration)
.ThenInclude(c => c.Subjects)
.Where(i => i.Student.Id == user.PersonNumber)
.Select(i => i.InternshipRegistration)
.First();
var useCase = new UpdateInternshipRegistrationUseCase(db, ir, ed, user);
@ -161,7 +160,6 @@ namespace InternshipSystem.Api.Test
.Include(i => i.InternshipRegistration)
.ThenInclude(c => c.Subjects)
.Where(i => i.Student.Id == user.PersonNumber)
.Select(i => i.InternshipRegistration)
.First();
};