add consultant-repository and implement getters for the simple use-ca…

…ses (#529)

backend/Api/Common/StorageService.cs

@@ -25,39 +25,6 @@ public StorageService(IMemoryCache cache, ApplicationContext context)
         _dbContext = context;
     }
 
-    public Consultant? GetConsultantByEmail(string orgUrlKey, string email)
-    {
-        var consultant = _dbContext.Consultant.Include(c => c.Department).ThenInclude(d => d.Organization)
-            .SingleOrDefault(c => c.Email == email);
-        if (consultant is null || consultant.Department.Organization.UrlKey != orgUrlKey) return null;
-
-        return consultant;
-    }
-
-    public List<Consultant> GetConsultants(string orgUrlKey)
-    {
-        var consultants = _dbContext.Consultant
-            .Include(c => c.Department)
-            .ThenInclude(d => d.Organization)
-            .Include(c => c.CompetenceConsultant)
-            .ThenInclude(cc => cc.Competence)
-            .Where(c => c.Department.Organization.UrlKey == orgUrlKey)
-            .ToList();
-
-        return consultants;
-    }
-
-    public List<Consultant> GetConsultantsEmploymentVariant(string orgUrlKey)
-    {
-        var consultants = _dbContext.Consultant
-            .Include(c => c.Department)
-            .ThenInclude(d => d.Organization)
-            .Where(c => c.Department.Organization.UrlKey == orgUrlKey)
-            .ToList();
-
-        return consultants;
-    }
-
     public void ClearConsultantCache(string orgUrlKey)
     {
         _cache.Remove($"{ConsultantCacheKey}/{orgUrlKey}");
@@ -158,11 +125,11 @@ private List<Consultant> LoadConsultantsFromDb(string orgUrlKey)
                 : new List<Staffing>();
 
             consultant.PlannedAbsences =
-                plannedAbsencePrConsultant.TryGetValue(consultant.Id, out List<PlannedAbsence>? plannedAbsences)
+                plannedAbsencePrConsultant.TryGetValue(consultant.Id, out var plannedAbsences)
                     ? plannedAbsences
                     : new List<PlannedAbsence>();
 
-            consultant.Vacations = vacationsPrConsultant.TryGetValue(consultant.Id, out List<Vacation>? vacations)
+            consultant.Vacations = vacationsPrConsultant.TryGetValue(consultant.Id, out var vacations)
                 ? vacations
                 : new List<Vacation>();
 
@@ -331,7 +298,7 @@ public void UpdateOrCreatePlannedAbsences(int consultantId, int absenceId, List<
         ClearConsultantCache(orgUrlKey);
     }
 
-    public Consultant CreateConsultant(Organization org, ConsultantWriteModel body)
+    public Consultant? CreateConsultant(Organization org, ConsultantWriteModel body)
     {
         var consultant = new Consultant
         {
@@ -364,7 +331,7 @@ public Consultant CreateConsultant(Organization org, ConsultantWriteModel body)
         return consultant;
     }
 
-    public Consultant UpdateConsultant(Organization org, ConsultantWriteModel body)
+    public Consultant? UpdateConsultant(Organization org, ConsultantWriteModel body)
     {
         var consultant = _dbContext.Consultant
             .Include(c => c.CompetenceConsultant)

backend/Api/Consultants/ConsultantController.cs

@@ -1,4 +1,5 @@
 using Api.Common;
+using Core.Consultants;
 using Core.Organizations;
 using Infrastructure.DatabaseContext;
 using Microsoft.AspNetCore.Authorization;
@@ -13,29 +14,25 @@ namespace Api.Consultants;
 public class ConsultantController(
     ApplicationContext context,
     IMemoryCache cache,
-    IOrganisationRepository organisationRepository) : ControllerBase
+    IOrganisationRepository organisationRepository,
+    IConsultantRepository consultantRepository) : ControllerBase
 {
     [HttpGet]
     [Route("{Email}")]
-    public ActionResult<SingleConsultantReadModel> Get([FromRoute] string orgUrlKey,
+    public async Task<ActionResult<SingleConsultantReadModel>> Get([FromRoute] string orgUrlKey, CancellationToken ct,
         [FromRoute(Name = "Email")] string? email = "")
     {
-        var service = new StorageService(cache, context);
-
-        var consultant = service.GetConsultantByEmail(orgUrlKey, email ?? "");
-
+        var consultant = await consultantRepository.GetConsultantByEmail(orgUrlKey, email ?? "", ct);
 
         if (consultant is null) return NotFound();
 
         return Ok(new SingleConsultantReadModel(consultant));
     }
 
     [HttpGet]
-    public ActionResult<List<SingleConsultantReadModel>> GetAll([FromRoute] string orgUrlKey)
+    public async Task<OkObjectResult> GetAll([FromRoute] string orgUrlKey, CancellationToken ct)
     {
-        var service = new StorageService(cache, context);
-
-        var consultants = service.GetConsultants(orgUrlKey);
+        var consultants = await consultantRepository.GetConsultantsInOrganizationByUrlKey(orgUrlKey, ct);
 
         var readModels = consultants
             .Select(c => new SingleConsultantReadModel(c))
@@ -46,11 +43,9 @@ public ActionResult<List<SingleConsultantReadModel>> GetAll([FromRoute] string o
 
     [HttpGet]
     [Route("employment")]
-    public ActionResult<List<ConsultantsEmploymentReadModel>> GetConsultantsEmployment([FromRoute] string orgUrlKey)
+    public async Task<OkObjectResult> GetConsultantsEmployment([FromRoute] string orgUrlKey, CancellationToken ct)
     {
-        var service = new StorageService(cache, context);
-
-        var consultants = service.GetConsultantsEmploymentVariant(orgUrlKey);
+        var consultants = await consultantRepository.GetConsultantsInOrganizationByUrlKey(orgUrlKey, ct);
 
         var readModels = consultants
             .Select(c => new ConsultantsEmploymentReadModel(c))
@@ -72,7 +67,6 @@ public async Task<ActionResult<SingleConsultantReadModel>> Put([FromRoute] strin
 
         var consultant = service.UpdateConsultant(selectedOrg, body);
 
-
         var responseModel =
             new SingleConsultantReadModel(consultant);
 

backend/Api/Consultants/ConsultantModels.cs

@@ -16,7 +16,7 @@ public record SingleConsultantReadModel(
     [property: Required] Degree Degree)
 
 {
-    public SingleConsultantReadModel(Consultant consultant)
+    public SingleConsultantReadModel(Consultant? consultant)
         : this(
             consultant.Id,
             consultant.Name,

backend/Api/StaffingController/ReadModelFactory.cs

@@ -1,5 +1,4 @@
 using Api.Common;
-using Api.Organisation;
 using Core.Consultants;
 using Core.DomainModels;
 using Core.Engagements;

backend/Api/VacationsController/VacationsController.cs

@@ -16,7 +16,8 @@ namespace Api.VacationsController;
 public class VacationsController(
     ApplicationContext context,
     IMemoryCache cache,
-    IOrganisationRepository organisationRepository) : ControllerBase
+    IOrganisationRepository organisationRepository,
+    IConsultantRepository consultantRepository) : ControllerBase
 {
     [HttpGet]
     [Route("publicHolidays")]
@@ -46,12 +47,12 @@ public async Task<ActionResult<VacationReadModel>> GetVacations([FromRoute] stri
 
         var service = new StorageService(cache, context);
 
-        if (!VacationsValidator.ValidateVacation(consultantId, service, orgUrlKey))
-            return BadRequest();
-
         var vacationDays = service.LoadConsultantVacation(consultantId);
-        var consultant = service.GetBaseConsultantById(consultantId);
-        if (consultant is null) return BadRequest();
+        var consultant = await consultantRepository.GetConsultantById(consultantId, ct);
+
+        if (consultant is null || !VacationsValidator.ValidateVacation(consultant, orgUrlKey))
+            return NotFound();
+
         var vacationMetaData = new VacationMetaData(consultant, DateOnly.FromDateTime(DateTime.Now));
         return new VacationReadModel(consultantId, vacationDays, vacationMetaData);
     }
@@ -68,8 +69,11 @@ public async Task<ActionResult<VacationReadModel>> DeleteVacation([FromRoute] st
 
         var service = new StorageService(cache, context);
 
-        if (!VacationsValidator.ValidateVacation(consultantId, service, orgUrlKey))
-            return BadRequest();
+        var vacationDays = service.LoadConsultantVacation(consultantId);
+        var consultant = await consultantRepository.GetConsultantById(consultantId, ct);
+
+        if (consultant is null || !VacationsValidator.ValidateVacation(consultant, orgUrlKey))
+            return NotFound();
 
         try
         {
@@ -82,9 +86,6 @@ public async Task<ActionResult<VacationReadModel>> DeleteVacation([FromRoute] st
             return BadRequest("Something went wrong");
         }
 
-        var vacationDays = service.LoadConsultantVacation(consultantId);
-        var consultant = service.GetBaseConsultantById(consultantId);
-        if (consultant is null) return BadRequest();
         var vacationMetaData = new VacationMetaData(consultant, DateOnly.FromDateTime(DateTime.Now));
         return new VacationReadModel(consultantId, vacationDays, vacationMetaData);
     }
@@ -101,8 +102,11 @@ public async Task<ActionResult<VacationReadModel>> UpdateVacation([FromRoute] st
 
         var service = new StorageService(cache, context);
 
-        if (!VacationsValidator.ValidateVacation(consultantId, service, orgUrlKey))
-            return BadRequest();
+        var vacationDays = service.LoadConsultantVacation(consultantId);
+        var consultant = await consultantRepository.GetConsultantById(consultantId, ct);
+
+        if (consultant is null || !VacationsValidator.ValidateVacation(consultant, orgUrlKey))
+            return NotFound();
 
         try
         {
@@ -115,9 +119,7 @@ public async Task<ActionResult<VacationReadModel>> UpdateVacation([FromRoute] st
             return BadRequest("Something went wrong");
         }
 
-        var vacationDays = service.LoadConsultantVacation(consultantId);
-        var consultant = service.GetBaseConsultantById(consultantId);
-        if (consultant is null) return BadRequest();
+
         var vacationMetaData = new VacationMetaData(consultant, DateOnly.FromDateTime(DateTime.Now));
         return new VacationReadModel(consultantId, vacationDays, vacationMetaData);
     }

backend/Api/VacationsController/VacationsValidator.cs

@@ -1,13 +1,12 @@
-using Api.Common;
+using Core.Consultants;
 
 namespace Api.VacationsController;
 
 public static class VacationsValidator
 {
-    public static bool ValidateVacation(int consultantId, StorageService storageService,
+    public static bool ValidateVacation(Consultant consultant,
         string orgUrlKey)
     {
-        return storageService.GetBaseConsultantById(consultantId)?.Department.Organization.UrlKey ==
-               orgUrlKey;
+        return consultant.Department.Organization.UrlKey == orgUrlKey;
     }
 }

backend/Core/Consultants/Consultant.cs

@@ -80,7 +80,7 @@ public class Competence
 public class CompetenceConsultant
 {
     public int ConsultantId { get; set; }
-    public Consultant Consultant { get; set; } = null!;
+    public Consultant? Consultant { get; set; } = null!;
     public required string CompetencesId { get; set; }
     public Competence Competence { get; set; } = null!;
 }

backend/Core/Consultants/IConsultantRepository.cs

@@ -0,0 +1,16 @@
+namespace Core.Consultants;
+
+public interface IConsultantRepository
+{
+    /**
+     * Get consultant, including common Department, Organization and Competense-data
+     */
+    Task<Consultant?> GetConsultantById(int id, CancellationToken ct);
+
+    /**
+    * Get consultant, including common Department, Organization and Competense-data
+    */
+    Task<Consultant?> GetConsultantByEmail(string orgUrlKey, string email, CancellationToken ct);
+
+    Task<List<Consultant>> GetConsultantsInOrganizationByUrlKey(string urlKey, CancellationToken ct);
+}

backend/Core/PlannedAbsences/PlannedAbsence.cs

@@ -10,7 +10,7 @@ public class PlannedAbsence
     public required Absence Absence { get; set; } = null!;
 
     public required int ConsultantId { get; set; }
-    public required Consultant Consultant { get; set; } = null!;
+    public required Consultant? Consultant { get; set; } = null!;
     public required Week Week { get; set; }
     public double Hours { get; set; } = 0;
 

backend/Core/Staffings/Staffing.cs

@@ -12,7 +12,7 @@ public class Staffing
 
     public required int ConsultantId { get; set; }
 
-    public required Consultant Consultant { get; set; } = null!;
+    public required Consultant? Consultant { get; set; } = null!;
 
     public required Week Week { get; set; }
 

backend/Core/Vacations/Vacation.cs

@@ -8,6 +8,6 @@ public class Vacation
     [Required] public int Id { get; set; }
 
     public required int ConsultantId { get; set; }
-    public required Consultant Consultant { get; set; }
+    public required Consultant? Consultant { get; set; }
     [Required] public DateOnly Date { get; set; }
 }

backend/Infrastructure/DatabaseContext/ApplicationContext.cs

@@ -18,7 +18,7 @@ public ApplicationContext(DbContextOptions options) : base(options)
     {
     }
 
-    public DbSet<Consultant> Consultant { get; set; } = null!;
+    public DbSet<Consultant?> Consultant { get; set; } = null!;
     public DbSet<Competence> Competence { get; set; } = null!;
     public DbSet<CompetenceConsultant> CompetenceConsultant { get; set; } = null!;
     public DbSet<Department> Department { get; set; } = null!;

backend/Infrastructure/Repositories/Consultants/ConsultantDbRepository.cs

@@ -0,0 +1,46 @@
+using Core.Consultants;
+using Infrastructure.DatabaseContext;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
+
+namespace Infrastructure.Repositories.Consultants;
+
+public class ConsultantDbRepository(ApplicationContext context) : IConsultantRepository
+{
+    public Task<Consultant?> GetConsultantById(int id, CancellationToken ct)
+    {
+        return BaseConsultantQuery()
+            .SingleOrDefaultAsync(c => c.Id == id, ct);
+    }
+
+    public async Task<Consultant?> GetConsultantByEmail(string orgUrlKey, string email, CancellationToken ct)
+    {
+        var consultant = await BaseConsultantQuery()
+            .SingleOrDefaultAsync(c => c.Email == email, ct);
+
+        if (consultant is null || consultant.Department.Organization.UrlKey != orgUrlKey) return null;
+
+        return consultant;
+    }
+
+    public Task<List<Consultant>> GetConsultantsInOrganizationByUrlKey(string urlKey,
+        CancellationToken ct)
+    {
+        return BaseConsultantQuery()
+            .Where(c => c.Department.Organization.UrlKey == urlKey)
+            .ToListAsync(ct);
+    }
+
+
+    /*
+     * Ensures consistent Includes to keep expected base data present
+     */
+    private IIncludableQueryable<Consultant, Competence> BaseConsultantQuery()
+    {
+        return context.Consultant
+            .Include(c => c.Department)
+            .ThenInclude(d => d.Organization)
+            .Include(c => c.CompetenceConsultant)
+            .ThenInclude(cc => cc.Competence);
+    }
+}

backend/Infrastructure/Repositories/RepositoryExtensions.cs

@@ -1,5 +1,7 @@
+using Core.Consultants;
 using Core.Engagements;
 using Core.Organizations;
+using Infrastructure.Repositories.Consultants;
 using Infrastructure.Repositories.Engagement;
 using Infrastructure.Repositories.Organization;
 using Microsoft.AspNetCore.Builder;
@@ -16,5 +18,7 @@ public static void AddRepositories(this WebApplicationBuilder builder)
 
         builder.Services.AddScoped<IEngagementRepository, EngagementDbRepository>();
         builder.Services.AddScoped<IDepartmentRepository, DepartmentDbRepository>();
+
+        builder.Services.AddScoped<IConsultantRepository, ConsultantDbRepository>();
     }
 }