XD

README.MD

@@ -1,49 +0,0 @@
-# Uruchomienie
-
-Aby uruchomić środowisko deweloperskie wystarczy
-
-```bash
-docker build -f ./InternshipSystem.Api/Dockerfile -t internship.api .
-docker-compose -f ./.docker/docker-compose.yaml --build --volumes
-```
-
-# Opis struktury
-
-Opis struktury projektu
-
-## src/
-
-zawiera kod podzielony na 3 projekty
-
-- Api - Definicja interfejsu wystawianego dla częsci frontendowej
-- Core - Logika biznesowa aplikacji, definicja domeny.
-- Repository - Definicja repozytorium EFCore
-
-## test/
-
-Zawiera testy jednostkowe projektu. Przy pisaniu wykorzystano Machine-Specification
-
-## .build/
-
-Folder zawierający pliki definiujące CI/CD projektu
-
-## .docker/
-
-Folder zawiera pliki docker-compose przeznaczone do uruchamiania środowiska deweloperskiego, stanowiące również dokumentacje zmiennych środowiskowych konfigurujących projekt
-
-```yaml
-CONNECTIONSTRINGS__INTERNSHIPDATABASE: "Host=db.postgres;Port=5432;Database=postgres;Username=postgres;Password=password"
-ASPNETCORE_ENVIRONMENT: Development
-ASPNETCORE_URLS: http://+:80
-SECURITYOPTIONS__SECRET: secret
-SECURITYOPTIONS__EXPIRATION: 1440     # 24h in minutes
-SECURITYOPTIONS__BASEURL: https://logowanie.pg.edu.pl
-SECURITYOPTIONS__TOKENPATH: /oauth2.0/accessToken
-SECURITYOPTIONS__PROFILEPATH: /oauth2.0/profile
-SECURITYOPTIONS__CLIENTID: PraktykiClientId
-SECURITYOPTIONS__REDIRECTURL: https://system-praktyk.net/user/login/check/pg
-```
-
-## props/
-
-Folder ze współdzieloną konfiguracją dla grup projektów, np. wersji bibliotek używanych przy pisaniu testów.

src/InternshipSystem.Api/ApiProfile.cs

@@ -3,7 +3,6 @@ using AutoMapper;
 using InternshipSystem.Api.Queries;
 using InternshipSystem.Api.Result;
 using InternshipSystem.Core;
-using InternshipSystem.Core.Entity;
 using InternshipSystem.Core.Entity.Internship;
 using InternshipSystem.Core.UglyOrmArtifacts;
 
@@ -34,11 +33,6 @@ namespace InternshipSystem.Api
             CreateMap<EditionInternshipType, InternshipType>()
                 .IncludeMembers(eit => eit.InternshipType);
 
-            CreateMap<ReportFieldEdition, ReportField>()
-                .IncludeMembers(e => e.Field);
-
-            CreateMap<ReportField, ReportField>();
-
             CreateMap<InternshipType, InternshipType>();
         }
     }

src/InternshipSystem.Api/Controllers/DocumentManagementController.cs

@@ -1,110 +0,0 @@
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using InternshipSystem.Api.Security;
-using InternshipSystem.Core;
-using InternshipSystem.Repository;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace InternshipSystem.Api.Controllers
-{
-
-    [ApiController]
-    [Route("management/document")]
-    public class DocumentManagementController : ControllerBase
-    {
-        private InternshipDbContext Context { get; }
-        
-        public DocumentManagementController(InternshipDbContext context)
-        {
-            Context = context;
-        }
-        
-        [HttpDelete("{documentId}/delete")]
-        [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("{documentId}/accept")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [Authorize(Policy = Policies.IsOverseer)]
-        public async Task<ActionResult> AcceptDocument(long documentId, [FromBody] string comment, CancellationToken token)
-        {
-            var internship = await Context.Internships
-                .Include(i => i.Documentation)
-                .FirstOrDefaultAsync(i => i.Documentation.Any(d => d.Id.Equals(documentId)), token);
-
-            if (internship == null)
-            {
-                return NotFound();
-            }
-            
-            var document = internship.Documentation
-                .FirstOrDefault(d => d.Id.Equals(documentId));
-            
-            if (document == null)
-            {
-                return NotFound();
-            }
-
-            document.State = DocumentState.Accepted;
-            document.ChangeStateComment = string.IsNullOrEmpty(comment) ? null : comment;
-            
-            await Context.SaveChangesAsync(token);
-            
-            return Ok();
-        }
-        
-        [HttpPut("{documentId}/reject")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [Authorize(Policy = Policies.IsOverseer)]
-        public async Task<ActionResult> RejectDocument(long documentId, [FromBody] string comment, CancellationToken token)
-        {
-            var internship = await Context.Internships
-                .Include(i => i.Documentation)
-                .FirstOrDefaultAsync(i => i.Documentation.Any(d => d.Id.Equals(documentId)), token);
-
-            if (internship == null)
-            {
-                return NotFound();
-            }
-            
-            var document = internship.Documentation
-                .FirstOrDefault(d => d.Id.Equals(documentId));
-            
-            if (document == null)
-            {
-                return NotFound();
-            }
-
-            document.State = DocumentState.Rejected;
-            document.ChangeStateComment = string.IsNullOrEmpty(comment) ? null : comment;
-            
-            await Context.SaveChangesAsync(token);
-            
-            return Ok();
-        }
-    }
-}

src/InternshipSystem.Api/Controllers/InternshipManagementController.cs

@@ -38,14 +38,11 @@ namespace InternshipSystem.Api.Controllers
                     .Include(i => i.InternshipRegistration.Type)
                     .Include(i => i.Student)
                     .Include(i => i.Documentation)
-                    .Include(i => i.Report)
-                    .Where(i => !searchQuery.EditionId.HasValue || i.Edition.Id == searchQuery.EditionId)
-                    .Where(i => !searchQuery.InternshipState.HasValue || i.InternshipRegistration.State == searchQuery.InternshipState)
-                    .Where(i => !searchQuery.InternshipState.HasValue || i.Report.State == searchQuery.ReportState)
-                    .Where(i => !searchQuery.StudentAlbumNumber.HasValue || i.Student.AlbumNumber == searchQuery.StudentAlbumNumber)
+                    .Where(i => !searchQuery.EditionId.HasValue || i.Edition.Id.Equals(searchQuery.EditionId))
+                    .Where(i => !searchQuery.InternshipState.HasValue || i.InternshipRegistration.State.Equals(searchQuery.InternshipState))
+                    .Where(i => !searchQuery.StudentAlbumNumber.HasValue || i.Student.AlbumNumber.Equals(searchQuery.StudentAlbumNumber))
                     .Where(i => string.IsNullOrEmpty(searchQuery.StudentFirstName) || i.Student.FirstName.ToLower().Contains(searchQuery.StudentFirstName.ToLower()))
                     .Where(i => string.IsNullOrEmpty(searchQuery.StudentLastName) || i.Student.LastName.ToLower().Contains(searchQuery.StudentLastName.ToLower()))
-                    .Where(i => !searchQuery.DocumentWithState.HasValue || i.Documentation.Any(d => d.State == searchQuery.DocumentWithState))
                     .Skip(searchQuery.Page * searchQuery.PerPage)
                     .Take(searchQuery.PerPage);
             
@@ -97,54 +94,12 @@ namespace InternshipSystem.Api.Controllers
             return Ok(internship);
         }
         
-        [HttpGet("{internshipId}/status")]
+        [HttpPut("accept/{internshipId}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [Authorize(Policy = Policies.IsOverseer)]
-        public async Task<ActionResult> GetInternshipStatus(long internshipId, CancellationToken token)
-        {
-            var internship = await Context.Internships
-                .Include(i => i.InternshipRegistration)
-                .Include(i => i.Report)
-                .Include(i => i.Documentation)
-                .FirstOrDefaultAsync(i => i.Id.Equals(internshipId), token);
-
-            if (internship == null)
-            {
-                return NotFound();
-            }
-            
-            return new JsonResult(new { Errors = internship.ValidateStatus() });
-        }
-        
-        [HttpPut("{internshipId}/grade")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [Authorize(Policy = Policies.IsOverseer)]
-        public async Task<ActionResult> GradeInternship(long internshipId, [FromBody] float grade, CancellationToken token)
-        {
-            var internship = await Context.Internships
-                .FirstOrDefaultAsync(i => i.Id.Equals(internshipId), token);
-
-            if (internship == null)
-            {
-                return NotFound();
-            }
-
-            internship.Grade = grade;
-            await Context.SaveChangesAsync(token);
-            
-            return new JsonResult(new { Errors = internship.ValidateStatus() });
-        }
-        
-        [HttpPut("{internshipId}/registration/accept")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [Authorize(Policy = Policies.IsOverseer)]
-        public async Task<ActionResult> AcceptInternshipRegistration(long internshipId, [FromBody] string comment, CancellationToken token)
+        public async Task<ActionResult> AcceptInternship(long internshipId, [FromBody] string comment, CancellationToken token)
         {
             var internship = await Context.Internships
                 .Include(i => i.InternshipRegistration)
@@ -163,12 +118,12 @@ namespace InternshipSystem.Api.Controllers
             return Ok();
         }
         
-        [HttpPut("{internshipId}/registration/reject")]
+        [HttpPut("reject/{internshipId}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [Authorize(Policy = Policies.IsOverseer)]
-        public async Task<ActionResult> RejectInternshipRegistration(long internshipId, [FromBody] string comment, CancellationToken token)
+        public async Task<ActionResult> RejectInternship(long internshipId, [FromBody] string comment, CancellationToken token)
         {
             var internship = await Context.Internships
                 .Include(i => i.InternshipRegistration)

src/InternshipSystem.Api/Controllers/InternshipRegistrationController.cs

@@ -47,7 +47,7 @@ namespace InternshipSystem.Api.Controllers
                     .ThenInclude(t => t.Subject)
                 .FirstAsync(e => e.Id == user.EditionId, cancellationToken);
 
-            var internship =
+            var internshipRegistration =
                 await _context
                     .Entry(edition)
                     .Collection(e => e.Internships)
@@ -62,11 +62,12 @@ 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, internship, edition, user);
+            
+            
+            var useCase = new UpdateInternshipRegistrationUseCase(_context, internshipRegistration, edition, user);
 
             try
             {

src/InternshipSystem.Api/Controllers/ReportController.cs

@@ -1,62 +0,0 @@
-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;
-using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace InternshipSystem.Api.Controllers
-{
-    [Route("internship/report")]
-    public class ReportController : ControllerBase
-    {
-        private readonly InternshipDbContext _context;
-
-        public ReportController(InternshipDbContext context)
-        {
-            _context = context;
-        }
-        
-        [HttpPost]
-        [Authorize(Policy = Policies.RegisteredOnly)]
-        public async Task<ActionResult> PostReport([FromBody] JObject reportValue, [FromServices] User user, CancellationToken ct)
-        {
-            var edition = await _context.Editions
-                .FindAsync(user.EditionId);
-            
-            var internship = await _context.Entry(edition)
-                .Collection(e => e.Internships)
-                .Query()
-                .Include(i => i.Report)
-                .Include(i => i.Documentation)
-                .SingleAsync(i => i.Student.Id == user.PersonNumber, ct);
-
-            internship.Report.UpdateReport(reportValue.ToString(Formatting.None));
-            internship.AddNewDocument("", DocumentType.InternshipEvaluation);
-            
-            await _context.SaveChangesAsync(ct);
-
-            return Ok();
-        }
-        
-        [HttpGet]
-        [Authorize(Policy = Policies.RegisteredOnly)]
-        public async Task<ActionResult> GetReport([FromServices] User user, CancellationToken ct)
-        {
-            var edition = await _context.Editions
-                .FindAsync(user.EditionId);
-            
-            var internship = await _context.Entry(edition)
-                .Collection(e => e.Internships)
-                .Query()
-                .Include(i => i.Report)
-                .SingleAsync(i => i.Student.Id == user.PersonNumber, ct);
-
-            return Ok(JsonConvert.DeserializeObject(internship.Report.Value));
-        }
-    }
-}

src/InternshipSystem.Api/Controllers/ReportFieldsController.cs

@@ -79,7 +79,6 @@ namespace InternshipSystem.Api.Controllers
 
     public class FieldCreateRequest
     {
-        public long? Id { get; set; }
         public string Label { get; set; }
         public string LabelEng { get; set; }
         public string Description { get; set; }

src/InternshipSystem.Api/Queries/SearchQuery/InternshipSearchQuery.cs

@@ -7,7 +7,6 @@ namespace InternshipSystem.Api.Queries.SearchQuery
     {
         public Guid? EditionId { get; set; } = null;
         public DocumentState? InternshipState { get; set; } = null;
-        public DocumentState? ReportState { get; set; }
         public int? StudentAlbumNumber { get; set; } = null;
         public string StudentFirstName { get; set; } = "";
         public string StudentLastName { get; set; } = "";
@@ -16,7 +15,5 @@ namespace InternshipSystem.Api.Queries.SearchQuery
         /// </summary>
         public string OrderByField { get; set; } = "";
         public SortOrder SortOrder { get; set; } = SortOrder.None;
-
-        public DocumentState? DocumentWithState { get; set; }
     }
 }

src/InternshipSystem.Api/UseCases/UpdateInternshipRegistrationUseCase.cs

@@ -9,7 +9,6 @@ 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;
 
@@ -18,27 +17,25 @@ 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,
-            Internship internship, Edition edition, User user)
+            InternshipRegistration internshipRegistration, Edition edition, User user)
         {
             _dbContext = dbContext;
-            _internship = internship;
             _edition = edition;
             _user = user;
-            _internship = internship;
-            subjectRegistration = internship.InternshipRegistration;
+            subjectRegistration = internshipRegistration;
         }
 
         public async Task<(DocumentState State, IEnumerable<ErrorDescription>)> UpdateInternshipRegistration(
             UpdateRegistrationForm registrationCommand,
             CancellationToken cancellationToken)
         {
-            UpdateTimeFrame(registrationCommand);
+            subjectRegistration.Start = registrationCommand.Start ?? subjectRegistration.Start;
+            subjectRegistration.End = registrationCommand.End ?? subjectRegistration.End;
             subjectRegistration.DeclaredHours = registrationCommand.Hours ?? subjectRegistration.DeclaredHours;
 
             if (registrationCommand.Type.HasValue)
@@ -64,43 +61,9 @@ 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);
-            }
-            
-            if (editionInternshipType?.InternshipType.RequireInsurance == true)
-            {
-                _internship.AddNewDocument("", DocumentType.NnwInsurance);
-            }
-            else
-            {
-                _internship.RemoveDocument(DocumentType.NnwInsurance);
-            }
-            
             subjectRegistration.Type = editionInternshipType?.InternshipType ?? subjectRegistration.Type;
         }
 

src/InternshipSystem.Core/Entity/Document.cs

@@ -9,7 +9,7 @@ namespace InternshipSystem.Core
         public DocumentScan Scan { get; set; }
         public DocumentType Type { get; set; }
         public DocumentState State { get; set; }
-        public string ChangeStateComment { get; set; }
+        public string RejectionReason { get; set; }
     }
 
     public class DocumentScan

src/InternshipSystem.Core/Entity/Edition.cs

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

src/InternshipSystem.Core/Entity/Internship/Internship.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentValidation;
 using InternshipSystem.Core.ValueObject;
 
 namespace InternshipSystem.Core.Entity.Internship
@@ -27,19 +26,14 @@ 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 (type != DocumentType.Other && Documentation.Any(d => d.Type == type))
+            if (Documentation.Any(d => d.Type == type))
             {
-                return;
+                throw new ArgumentException("Internship already has a document of given type");                
             }
             
             var document = new Document
@@ -52,54 +46,12 @@ namespace InternshipSystem.Core.Entity.Internship
             Documentation.Add(document);
         }
 
-        public void RemoveDocument(DocumentType documentType)
+        public void UpdateDocumentScan(long documentId, byte[] documentScan)
         {
-            if (documentType == DocumentType.Other)
-            {
-                return;
-            }
-            
-            var doc = Documentation.FirstOrDefault(d => d.Type == documentType);
+            var document = Documentation.First(d => d.Id == documentId);
 
-            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);
-            }
-        }
-
-        public IEnumerable<ErrorDescription> ValidateStatus()
-        {
-            var validator = new Validator();
-
-            var result = validator.Validate(this);
-
-            return result.ToErrorDescription();
-        }
-
-        private class Validator : AbstractValidator<Internship>
-        {
-            public Validator()
-            {
-                RuleFor(i => i.Report)
-                    .Must(r => r.State == DocumentState.Accepted)
-                    .WithMessage("error.report.not_accepted");
-                RuleFor(i => i.InternshipRegistration)
-                    .Must(r => r.State == DocumentState.Accepted)
-                    .WithMessage("error.registration.not_accepted");
-                RuleForEach(i => i.Documentation)
-                    .Must(d => d.State == DocumentState.Accepted)
-                    .WithMessage("error.documentation.not_accepted");
-            }
+            // document.Scan = documentScan;
+            // document.State = DocumentState.Submitted;
         }
     }
 }

src/InternshipSystem.Core/Entity/Internship/InternshipRegistration.cs

@@ -62,9 +62,13 @@ 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)

src/InternshipSystem.Core/Entity/Internship/InternshipType.cs

@@ -7,7 +7,5 @@
         public string LabelEng { get; set; }
         public string Description { get; set; }
         public string DescriptionEng { get; set; }
-        public bool RequireDeansApproval { get; set; }
-        public bool RequireInsurance { get; set; }
     }
 }

src/InternshipSystem.Core/Entity/Report.cs

@@ -12,11 +12,5 @@ namespace InternshipSystem.Core
         {
             return new Report();
         }
-
-        public void UpdateReport(string reportValue)
-        {
-            Value = reportValue;
-            State = DocumentState.Submitted;
-        }
     }
 }

src/InternshipSystem.Core/Entity/ReportField.cs

@@ -5,11 +5,6 @@ namespace InternshipSystem.Core.Entity
 {
     public class ReportField
     {
-        public ReportField()
-        {
-            
-        }
-        
         public ReportField(string label, string labelEng, string description, string descriptionEng, FieldType fieldType)
         {
             Label = label;

src/InternshipSystem.Core/ValueObject/DocumentType.cs

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

src/InternshipSystem.Repository/DatabaseFiller.cs

@@ -6,7 +6,6 @@ using InternshipSystem.Core;
 using InternshipSystem.Core.Entity;
 using InternshipSystem.Core.Entity.Internship;
 using InternshipSystem.Core.UglyOrmArtifacts;
-using InternshipSystem.Core.ValueObject;
 using Microsoft.EntityFrameworkCore;
 
 namespace InternshipSystem.Repository
@@ -120,7 +119,6 @@ namespace InternshipSystem.Repository
                     LabelEng = "Internship agreement",
                     Description = "Praktyka bezpłatna",
                     DescriptionEng = "Free internship",
-                    RequireInsurance = true
                 },
                 new InternshipType
                 {
@@ -131,7 +129,6 @@ namespace InternshipSystem.Repository
                 {
                     Label = "Umowa o staż bezpłatny",
                     LabelEng = "Free apprenticeship agreement",
-                    RequireInsurance = true
                 },
                 new InternshipType
                 {
@@ -161,7 +158,6 @@ namespace InternshipSystem.Repository
                 {
                     Label = "Umowa zlecenia (w tym B2B)",
                     LabelEng = "Contract of mandate (including B2B)",
-                    RequireDeansApproval = true
                 },  
             };
             await Context.InternshipTypes.AddRangeAsync(internshipTypes);
@@ -298,14 +294,6 @@ namespace InternshipSystem.Repository
                 {
                     new Internship
                     {
-                        Documentation = new List<Document>
-                        {
-                            new Document
-                            {
-                                Description = "doc",
-                                Type = DocumentType.IppScan
-                            }  
-                        },
                         Student = new Student
                         {
                             FirstName = "Jan",
@@ -350,7 +338,6 @@ namespace InternshipSystem.Repository
                                 }
                             }
                         },
-                        Report = Report.Create()
                     },
                     new Internship
                     {

src/InternshipSystem.Repository/Migrations/20210110173104_Init.Designer.cs

@@ -10,7 +10,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace InternshipSystem.Repository.Migrations
 {
     [DbContext(typeof(InternshipDbContext))]
-    [Migration("20210110210810_Init")]
+    [Migration("20210110173104_Init")]
     partial class Init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -80,10 +80,6 @@ namespace InternshipSystem.Repository.Migrations
                         .HasColumnType("bigint")
                         .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
 
-                    b.Property<string>("ChangeStateComment")
-                        .HasColumnName("change_state_comment")
-                        .HasColumnType("text");
-
                     b.Property<string>("Description")
                         .HasColumnName("description")
                         .HasColumnType("text");
@@ -92,6 +88,10 @@ namespace InternshipSystem.Repository.Migrations
                         .HasColumnName("internship_id")
                         .HasColumnType("bigint");
 
+                    b.Property<string>("RejectionReason")
+                        .HasColumnName("rejection_reason")
+                        .HasColumnType("text");
+
                     b.Property<int>("State")
                         .HasColumnName("state")
                         .HasColumnType("integer");
@@ -342,10 +342,6 @@ namespace InternshipSystem.Repository.Migrations
                         .HasColumnName("label_eng")
                         .HasColumnType("text");
 
-                    b.Property<bool>("RequireDeansApproval")
-                        .HasColumnName("require_deans_approval")
-                        .HasColumnType("boolean");
-
                     b.HasKey("Id")
                         .HasName("pk_internship_types");
 

src/InternshipSystem.Repository/Migrations/20210110173104_Init.cs

@@ -60,8 +60,7 @@ namespace InternshipSystem.Repository.Migrations
                     label = table.Column<string>(nullable: true),
                     label_eng = table.Column<string>(nullable: true),
                     description = table.Column<string>(nullable: true),
-                    description_eng = table.Column<string>(nullable: true),
-                    require_deans_approval = table.Column<bool>(nullable: false)
+                    description_eng = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
@@ -371,7 +370,7 @@ namespace InternshipSystem.Repository.Migrations
                     description = table.Column<string>(nullable: true),
                     type = table.Column<int>(nullable: false),
                     state = table.Column<int>(nullable: false),
-                    change_state_comment = table.Column<string>(nullable: true),
+                    rejection_reason = table.Column<string>(nullable: true),
                     internship_id = table.Column<long>(nullable: true)
                 },
                 constraints: table =>

src/InternshipSystem.Repository/Migrations/20210111195519_Insurance.Designer.cs

@@ -1,798 +0,0 @@
-// <auto-generated />
-using System;
-using InternshipSystem.Repository;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-namespace InternshipSystem.Repository.Migrations
-{
-    [DbContext(typeof(InternshipDbContext))]
-    [Migration("20210111195519_Insurance")]
-    partial class Insurance
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
-                .HasAnnotation("ProductVersion", "3.1.4")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            modelBuilder.Entity("InternshipSystem.Core.BranchOffice", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<long?>("CompanyId")
-                        .HasColumnName("company_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<long>("Provider")
-                        .HasColumnName("provider")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("Id")
-                        .HasName("pk_branch_office");
-
-                    b.HasIndex("CompanyId")
-                        .HasName("ix_branch_office_company_id");
-
-                    b.ToTable("branch_office");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Company", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Name")
-                        .HasColumnName("name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Nip")
-                        .HasColumnName("nip")
-                        .HasColumnType("text");
-
-                    b.Property<long>("Provider")
-                        .HasColumnName("provider")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("Id")
-                        .HasName("pk_companies");
-
-                    b.ToTable("companies");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Document", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("ChangeStateComment")
-                        .HasColumnName("change_state_comment")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Description")
-                        .HasColumnName("description")
-                        .HasColumnType("text");
-
-                    b.Property<long?>("InternshipId")
-                        .HasColumnName("internship_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("State")
-                        .HasColumnName("state")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Type")
-                        .HasColumnName("type")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id")
-                        .HasName("pk_document");
-
-                    b.HasIndex("InternshipId")
-                        .HasName("ix_document_internship_id");
-
-                    b.ToTable("document");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.DocumentScan", b =>
-                {
-                    b.Property<long>("DocumentId")
-                        .HasColumnName("document_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<byte[]>("File")
-                        .HasColumnName("file")
-                        .HasColumnType("bytea");
-
-                    b.Property<string>("Filename")
-                        .HasColumnName("filename")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Mime")
-                        .HasColumnName("mime")
-                        .HasColumnType("text");
-
-                    b.Property<long>("Size")
-                        .HasColumnName("size")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("DocumentId")
-                        .HasName("pk_document_scan");
-
-                    b.ToTable("document_scan");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Edition", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("uuid");
-
-                    b.Property<long?>("CourseId")
-                        .HasColumnName("course_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime>("EditionFinish")
-                        .HasColumnName("edition_finish")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime>("EditionStart")
-                        .HasColumnName("edition_start")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime>("ReportingStart")
-                        .HasColumnName("reporting_start")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.HasKey("Id")
-                        .HasName("pk_editions");
-
-                    b.HasIndex("CourseId")
-                        .HasName("ix_editions_course_id");
-
-                    b.ToTable("editions");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.Course", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Name")
-                        .HasColumnName("name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("NameEng")
-                        .HasColumnName("name_eng")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id")
-                        .HasName("pk_courses");
-
-                    b.ToTable("courses");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.Internship.Internship", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<Guid?>("EditionId")
-                        .HasColumnName("edition_id")
-                        .HasColumnType("uuid");
-
-                    b.Property<float?>("Grade")
-                        .HasColumnName("grade")
-                        .HasColumnType("real");
-
-                    b.Property<long?>("InternshipRegistrationId")
-                        .HasColumnName("internship_registration_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<long?>("ReportId")
-                        .HasColumnName("report_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<long?>("StudentId")
-                        .HasColumnName("student_id")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("Id")
-                        .HasName("pk_internships");
-
-                    b.HasIndex("EditionId")
-                        .HasName("ix_internships_edition_id");
-
-                    b.HasIndex("InternshipRegistrationId")
-                        .HasName("ix_internships_internship_registration_id");
-
-                    b.HasIndex("ReportId")
-                        .HasName("ix_internships_report_id");
-
-                    b.HasIndex("StudentId")
-                        .HasName("ix_internships_student_id");
-
-                    b.ToTable("internships");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.Internship.InternshipRegistration", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<long?>("BranchAddressId")
-                        .HasColumnName("branch_address_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("ChangeStateComment")
-                        .HasColumnName("change_state_comment")
-                        .HasColumnType("text");
-
-                    b.Property<long?>("CompanyId")
-                        .HasColumnName("company_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("DeclaredHours")
-                        .HasColumnName("declared_hours")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("End")
-                        .HasColumnName("end")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime>("Start")
-                        .HasColumnName("start")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int>("State")
-                        .HasColumnName("state")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("SubmissionDate")
-                        .HasColumnName("submission_date")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<long?>("TypeId")
-                        .HasColumnName("type_id")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("Id")
-                        .HasName("pk_internship_registration");
-
-                    b.HasIndex("BranchAddressId")
-                        .HasName("ix_internship_registration_branch_address_id");
-
-                    b.HasIndex("CompanyId")
-                        .HasName("ix_internship_registration_company_id");
-
-                    b.HasIndex("TypeId")
-                        .HasName("ix_internship_registration_type_id");
-
-                    b.ToTable("internship_registration");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.Internship.InternshipSubject", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Description")
-                        .HasColumnName("description")
-                        .HasColumnType("text");
-
-                    b.Property<string>("DescriptionEng")
-                        .HasColumnName("description_eng")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id")
-                        .HasName("pk_internship_subject");
-
-                    b.ToTable("internship_subject");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.Internship.InternshipType", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Description")
-                        .HasColumnName("description")
-                        .HasColumnType("text");
-
-                    b.Property<string>("DescriptionEng")
-                        .HasColumnName("description_eng")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Label")
-                        .HasColumnName("label")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LabelEng")
-                        .HasColumnName("label_eng")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("RequireDeansApproval")
-                        .HasColumnName("require_deans_approval")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("RequireInsurance")
-                        .HasColumnName("require_insurance")
-                        .HasColumnType("boolean");
-
-                    b.HasKey("Id")
-                        .HasName("pk_internship_types");
-
-                    b.ToTable("internship_types");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.ReportField", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Description")
-                        .HasColumnName("description")
-                        .HasColumnType("text");
-
-                    b.Property<string>("DescriptionEng")
-                        .HasColumnName("description_eng")
-                        .HasColumnType("text");
-
-                    b.Property<int>("FieldType")
-                        .HasColumnName("field_type")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Label")
-                        .HasColumnName("label")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LabelEng")
-                        .HasColumnName("label_eng")
-                        .HasColumnType("text");
-
-                    b.Property<string>("field_discrimnator")
-                        .IsRequired()
-                        .HasColumnName("field_discrimnator")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id")
-                        .HasName("pk_report_fields");
-
-                    b.ToTable("report_fields");
-
-                    b.HasDiscriminator<string>("field_discrimnator").HasValue("single");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Report", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<int>("State")
-                        .HasColumnName("state")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Value")
-                        .HasColumnName("value")
-                        .HasColumnType("jsonb");
-
-                    b.HasKey("Id")
-                        .HasName("pk_report");
-
-                    b.ToTable("report");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.StaticPage", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("AccessName")
-                        .HasColumnName("access_name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Content")
-                        .HasColumnName("content")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ContentEng")
-                        .HasColumnName("content_eng")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .HasColumnName("title")
-                        .HasColumnType("text");
-
-                    b.Property<string>("TitleEng")
-                        .HasColumnName("title_eng")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id")
-                        .HasName("pk_static_pages");
-
-                    b.ToTable("static_pages");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Student", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<int>("AlbumNumber")
-                        .HasColumnName("album_number")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Course")
-                        .HasColumnName("course")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .HasColumnName("email")
-                        .HasColumnType("text");
-
-                    b.Property<string>("FirstName")
-                        .HasColumnName("first_name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LastName")
-                        .HasColumnName("last_name")
-                        .HasColumnType("text");
-
-                    b.Property<int?>("Semester")
-                        .HasColumnName("semester")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id")
-                        .HasName("pk_students");
-
-                    b.ToTable("students");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.EditionInternshipType", b =>
-                {
-                    b.Property<Guid>("EditionId")
-                        .HasColumnName("edition_id")
-                        .HasColumnType("uuid");
-
-                    b.Property<long>("InternshipTypeId")
-                        .HasColumnName("internship_type_id")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("EditionId", "InternshipTypeId")
-                        .HasName("pk_edition_internship_type");
-
-                    b.HasIndex("InternshipTypeId")
-                        .HasName("ix_edition_internship_type_internship_type_id");
-
-                    b.ToTable("edition_internship_type");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.EditionSubject", b =>
-                {
-                    b.Property<Guid>("EditionId")
-                        .HasColumnName("edition_id")
-                        .HasColumnType("uuid");
-
-                    b.Property<long>("InternshipSubjectId")
-                        .HasColumnName("internship_subject_id")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("EditionId", "InternshipSubjectId")
-                        .HasName("pk_edition_subject");
-
-                    b.HasIndex("InternshipSubjectId")
-                        .HasName("ix_edition_subject_internship_subject_id");
-
-                    b.ToTable("edition_subject");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.ProgramSubject", b =>
-                {
-                    b.Property<long>("InternshipRegistrationId")
-                        .HasColumnName("internship_registration_id")
-                        .HasColumnType("bigint");
-
-                    b.Property<long>("InternshipSubjectId")
-                        .HasColumnName("internship_subject_id")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("InternshipRegistrationId", "InternshipSubjectId")
-                        .HasName("pk_program_subject");
-
-                    b.HasIndex("InternshipSubjectId")
-                        .HasName("ix_program_subject_internship_subject_id");
-
-                    b.ToTable("program_subject");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.ReportFieldEdition", b =>
-                {
-                    b.Property<Guid>("EditionId")
-                        .HasColumnName("edition_id")
-                        .HasColumnType("uuid");
-
-                    b.Property<long>("ReportFieldId")
-                        .HasColumnName("report_field_id")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("EditionId", "ReportFieldId")
-                        .HasName("pk_report_field_edition");
-
-                    b.HasIndex("ReportFieldId")
-                        .HasName("ix_report_field_edition_report_field_id");
-
-                    b.ToTable("report_field_edition");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.ReportChoiceField", b =>
-                {
-                    b.HasBaseType("InternshipSystem.Core.Entity.ReportField");
-
-                    b.Property<string>("Choices")
-                        .HasColumnName("choices")
-                        .HasColumnType("text");
-
-                    b.HasDiscriminator().HasValue("choice");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.BranchOffice", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Company", null)
-                        .WithMany("Branches")
-                        .HasForeignKey("CompanyId")
-                        .HasConstraintName("fk_branch_office_companies_company_id");
-
-                    b.OwnsOne("InternshipSystem.Core.BranchAddress", "Address", b1 =>
-                        {
-                            b1.Property<long>("BranchOfficeId")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnName("id")
-                                .HasColumnType("bigint")
-                                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                            b1.Property<string>("Building")
-                                .HasColumnName("building")
-                                .HasColumnType("text");
-
-                            b1.Property<string>("City")
-                                .HasColumnName("city")
-                                .HasColumnType("text");
-
-                            b1.Property<string>("Country")
-                                .HasColumnName("country")
-                                .HasColumnType("text");
-
-                            b1.Property<string>("PostalCode")
-                                .HasColumnName("postal_code")
-                                .HasColumnType("text");
-
-                            b1.Property<string>("Street")
-                                .HasColumnName("street")
-                                .HasColumnType("text");
-
-                            b1.HasKey("BranchOfficeId")
-                                .HasName("pk_branch_office");
-
-                            b1.ToTable("branch_office");
-
-                            b1.WithOwner()
-                                .HasForeignKey("BranchOfficeId")
-                                .HasConstraintName("fk_branch_address_branch_office_branch_office_id");
-                        });
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Document", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Entity.Internship.Internship", null)
-                        .WithMany("Documentation")
-                        .HasForeignKey("InternshipId")
-                        .HasConstraintName("fk_document_internships_internship_id");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.DocumentScan", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Document", "Document")
-                        .WithOne("Scan")
-                        .HasForeignKey("InternshipSystem.Core.DocumentScan", "DocumentId")
-                        .HasConstraintName("fk_document_scan_document_document_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Edition", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Entity.Course", "Course")
-                        .WithMany()
-                        .HasForeignKey("CourseId")
-                        .HasConstraintName("fk_editions_courses_course_id");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.Internship.Internship", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Edition", "Edition")
-                        .WithMany("Internships")
-                        .HasForeignKey("EditionId")
-                        .HasConstraintName("fk_internships_editions_edition_id");
-
-                    b.HasOne("InternshipSystem.Core.Entity.Internship.InternshipRegistration", "InternshipRegistration")
-                        .WithMany()
-                        .HasForeignKey("InternshipRegistrationId")
-                        .HasConstraintName("fk_internships_internship_registration_internship_registration");
-
-                    b.HasOne("InternshipSystem.Core.Report", "Report")
-                        .WithMany()
-                        .HasForeignKey("ReportId")
-                        .HasConstraintName("fk_internships_report_report_id");
-
-                    b.HasOne("InternshipSystem.Core.Student", "Student")
-                        .WithMany()
-                        .HasForeignKey("StudentId")
-                        .HasConstraintName("fk_internships_students_student_id");
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.Entity.Internship.InternshipRegistration", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.BranchOffice", "BranchAddress")
-                        .WithMany()
-                        .HasForeignKey("BranchAddressId")
-                        .HasConstraintName("fk_internship_registration_branch_office_branch_address_id");
-
-                    b.HasOne("InternshipSystem.Core.Company", "Company")
-                        .WithMany()
-                        .HasForeignKey("CompanyId")
-                        .HasConstraintName("fk_internship_registration_companies_company_id");
-
-                    b.HasOne("InternshipSystem.Core.Entity.Internship.InternshipType", "Type")
-                        .WithMany()
-                        .HasForeignKey("TypeId")
-                        .HasConstraintName("fk_internship_registration_internship_types_type_id");
-
-                    b.OwnsOne("InternshipSystem.Core.Mentor", "Mentor", b1 =>
-                        {
-                            b1.Property<long>("InternshipRegistrationId")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnName("id")
-                                .HasColumnType("bigint")
-                                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                            b1.Property<string>("Email")
-                                .HasColumnName("email")
-                                .HasColumnType("text");
-
-                            b1.Property<string>("FirstName")
-                                .HasColumnName("first_name")
-                                .HasColumnType("text");
-
-                            b1.Property<string>("LastName")
-                                .HasColumnName("last_name")
-                                .HasColumnType("text");
-
-                            b1.Property<string>("PhoneNumber")
-                                .HasColumnName("phone_number")
-                                .HasColumnType("text");
-
-                            b1.HasKey("InternshipRegistrationId")
-                                .HasName("pk_internship_registration");
-
-                            b1.ToTable("internship_registration");
-
-                            b1.WithOwner()
-                                .HasForeignKey("InternshipRegistrationId")
-                                .HasConstraintName("fk_mentor_internship_registration_internship_registration_id");
-                        });
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.EditionInternshipType", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Edition", "Edition")
-                        .WithMany("AvailableInternshipTypes")
-                        .HasForeignKey("EditionId")
-                        .HasConstraintName("fk_edition_internship_type_editions_edition_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("InternshipSystem.Core.Entity.Internship.InternshipType", "InternshipType")
-                        .WithMany()
-                        .HasForeignKey("InternshipTypeId")
-                        .HasConstraintName("fk_edition_internship_type_internship_types_internship_type_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.EditionSubject", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Edition", "Edition")
-                        .WithMany("AvailableSubjects")
-                        .HasForeignKey("EditionId")
-                        .HasConstraintName("fk_edition_subject_editions_edition_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("InternshipSystem.Core.Entity.Internship.InternshipSubject", "Subject")
-                        .WithMany()
-                        .HasForeignKey("InternshipSubjectId")
-                        .HasConstraintName("fk_edition_subject_internship_subject_internship_subject_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.ProgramSubject", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Entity.Internship.InternshipRegistration", "Registration")
-                        .WithMany("Subjects")
-                        .HasForeignKey("InternshipRegistrationId")
-                        .HasConstraintName("fk_program_subject_internship_registration_internship_registrat")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("InternshipSystem.Core.Entity.Internship.InternshipSubject", "Subject")
-                        .WithMany()
-                        .HasForeignKey("InternshipSubjectId")
-                        .HasConstraintName("fk_program_subject_internship_subject_internship_subject_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("InternshipSystem.Core.UglyOrmArtifacts.ReportFieldEdition", b =>
-                {
-                    b.HasOne("InternshipSystem.Core.Edition", "Edition")
-                        .WithMany("ReportSchema")
-                        .HasForeignKey("EditionId")
-                        .HasConstraintName("fk_report_field_edition_editions_edition_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("InternshipSystem.Core.Entity.ReportField", "Field")
-                        .WithMany()
-                        .HasForeignKey("ReportFieldId")
-                        .HasConstraintName("fk_report_field_edition_report_fields_report_field_id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/InternshipSystem.Repository/Migrations/20210111195519_Insurance.cs

@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace InternshipSystem.Repository.Migrations
-{
-    public partial class Insurance : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "require_insurance",
-                table: "internship_types",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "require_insurance",
-                table: "internship_types");
-        }
-    }
-}

src/InternshipSystem.Repository/Migrations/InternshipDbContextModelSnapshot.cs

@@ -78,10 +78,6 @@ namespace InternshipSystem.Repository.Migrations
                         .HasColumnType("bigint")
                         .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
 
-                    b.Property<string>("ChangeStateComment")
-                        .HasColumnName("change_state_comment")
-                        .HasColumnType("text");
-
                     b.Property<string>("Description")
                         .HasColumnName("description")
                         .HasColumnType("text");
@@ -90,6 +86,10 @@ namespace InternshipSystem.Repository.Migrations
                         .HasColumnName("internship_id")
                         .HasColumnType("bigint");
 
+                    b.Property<string>("RejectionReason")
+                        .HasColumnName("rejection_reason")
+                        .HasColumnType("text");
+
                     b.Property<int>("State")
                         .HasColumnName("state")
                         .HasColumnType("integer");
@@ -340,14 +340,6 @@ namespace InternshipSystem.Repository.Migrations
                         .HasColumnName("label_eng")
                         .HasColumnType("text");
 
-                    b.Property<bool>("RequireDeansApproval")
-                        .HasColumnName("require_deans_approval")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("RequireInsurance")
-                        .HasColumnName("require_insurance")
-                        .HasColumnType("boolean");
-
                     b.HasKey("Id")
                         .HasName("pk_internship_types");
 

test/InternshipSystem.Api.Test/InternshipSystem.cs

@@ -123,6 +123,7 @@ 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);
@@ -160,6 +161,7 @@ namespace InternshipSystem.Api.Test
                 .Include(i => i.InternshipRegistration)
                 .ThenInclude(c => c.Subjects)
                 .Where(i => i.Student.Id == user.PersonNumber)
+                .Select(i => i.InternshipRegistration)
                 .First();
         };