[Official] Implement list of all officials (employees) for for the provider

OutOfSchool/OutOfSchool.BusinessLogic/Models/Official/OfficialDto.cs

@@ -0,0 +1,15 @@
+using OutOfSchool.Services.Enums;
+
+namespace OutOfSchool.BusinessLogic.Models.Official;
+public class OfficialDto
+{
+    public Guid Id { get; set; }
+    public OfficialPositionDto Position { get; set; }
+    public OfficialIndividualDto Individual { get; set; }
+    public string DismissalOrder { get; set; } = string.Empty;
+    public string RecruitmentOrder { get; set; } = string.Empty;
+    public string DismissalReason { get; set; } = string.Empty;
+    public EmploymentType EmploymentType { get; set; }
+    public DateOnly ActiveFrom { get; set; }
+    public DateOnly ActiveTo { get; set; }
+}

OutOfSchool/OutOfSchool.BusinessLogic/Models/Official/OfficialIndividualDto.cs

@@ -0,0 +1,8 @@
+namespace OutOfSchool.BusinessLogic.Models.Official;
+public class OfficialIndividualDto
+{
+    public string FirstName { get; set; }
+    public string MiddleName { get; set; }
+    public string LastName { get; set; }
+    public string Rnokpp { get; set; }
+}

OutOfSchool/OutOfSchool.BusinessLogic/Models/Official/OfficialPositionDto.cs

@@ -0,0 +1,6 @@
+namespace OutOfSchool.BusinessLogic.Models.Official;
+public class OfficialPositionDto
+{
+    public Guid Id { get; set; }
+    public string FullName { get; set; }
+}

OutOfSchool/OutOfSchool.BusinessLogic/Services/IOfficialService.cs

@@ -0,0 +1,14 @@
+using OutOfSchool.BusinessLogic.Models;
+using OutOfSchool.BusinessLogic.Models.Official;
+
+namespace OutOfSchool.BusinessLogic.Services;
+public interface IOfficialService
+{
+    /// <summary>
+    /// Gets officials by filter.
+    /// </summary>
+    /// <param name="providerId">Provider's Id.</param>
+    /// <param name="filter">Filter for list of Officials.</param>
+    /// <returns>SearchResult that contains a filtered list of Officials and the total amount of officials in the list.</returns>
+    Task<SearchResult<OfficialDto>> GetByFilter(Guid providerId, SearchStringFilter filter);
+}

OutOfSchool/OutOfSchool.BusinessLogic/Services/OfficialService.cs

@@ -0,0 +1,85 @@
+using AutoMapper;
+using OutOfSchool.BusinessLogic.Models;
+using OutOfSchool.BusinessLogic.Models.Official;
+using OutOfSchool.BusinessLogic.Services.ProviderServices;
+using OutOfSchool.Services.Repository.Base.Api;
+using System.Linq.Expressions;
+
+namespace OutOfSchool.BusinessLogic.Services;
+public class OfficialService : IOfficialService
+{
+    private readonly IEntityRepositorySoftDeleted<Guid, Official> officialRepository;
+    private readonly IProviderService providerService;
+    private readonly ILogger<OfficialService> logger;
+    private readonly IMapper mapper;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OfficialService"/> class.
+    /// </summary>
+    /// <param name="officialRepository">Repository for Officials.</param>
+    /// <param name="providerService">Service for Provider.</param>
+    /// <param name="logger">Logger.</param>
+    /// <param name="mapper">Mapper.</param>
+    public OfficialService(
+        IEntityRepositorySoftDeleted<Guid, Official> officialRepository,
+        IProviderService providerService,
+        ILogger<OfficialService> logger,
+        IMapper mapper
+        )
+    {
+        this.officialRepository = officialRepository ?? throw new ArgumentNullException(nameof(officialRepository));
+        this.providerService = providerService ?? throw new ArgumentNullException(nameof(providerService));
+        this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        this.mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
+    }
+
+    /// <inheritdoc/>
+    public async Task<SearchResult<OfficialDto>> GetByFilter(Guid providerId, SearchStringFilter filter)
+    {
+        await providerService.HasProviderRights(providerId);
+
+        logger.LogDebug("Getting Officials by filter started.");
+
+        filter ??= new SearchStringFilter();
+        var predicate = BuildPredicate(filter);
+        int count = await officialRepository.Count(predicate).ConfigureAwait(false);
+
+        var officials = await officialRepository
+            .Get(
+             skip: filter.From,
+             take: filter.Size,
+             includeProperties: "Position,Individual",
+             whereExpression: predicate
+            ).AsNoTracking()
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        logger.LogDebug("{Count} records were successfully received from the Officials table", officials.Count);
+
+        var result = new SearchResult<OfficialDto>
+        {
+            Entities = mapper.Map<List<OfficialDto>>(officials),
+            TotalAmount = count
+        };
+
+        return result;
+    }
+
+    private static Expression<Func<Official, bool>> BuildPredicate(SearchStringFilter filter)
+    {
+        var predicate = PredicateBuilder.True<Official>();
+
+        if (!string.IsNullOrEmpty(filter.SearchString))
+        {
+            predicate = predicate.And(o => o.Individual.FirstName.Contains(filter.SearchString, StringComparison.OrdinalIgnoreCase)
+                || o.Individual.MiddleName.Contains(filter.SearchString, StringComparison.OrdinalIgnoreCase)
+                || o.Individual.LastName.Contains(filter.SearchString, StringComparison.OrdinalIgnoreCase)
+                || o.Individual.Rnokpp.Contains(filter.SearchString, StringComparison.OrdinalIgnoreCase)
+                || o.Position.FullName.Contains(filter.SearchString, StringComparison.OrdinalIgnoreCase));
+        }
+
+        predicate = predicate.And(o => !o.IsDeleted);
+
+        return predicate;
+    }
+}

OutOfSchool/OutOfSchool.BusinessLogic/Util/MappingProfile.cs

@@ -29,6 +29,7 @@
 using OutOfSchool.Common.Models;
 using OutOfSchool.Services.Models.CompetitiveEvents;
 using OutOfSchool.Services.Models.Images;
+using OutOfSchool.BusinessLogic.Models.Official;
 
 namespace OutOfSchool.BusinessLogic.Util;
 
@@ -942,6 +943,15 @@ public MappingProfile()
             .ForMember(dest => dest.WorkshopId, opt => opt.Ignore());
 
         CreateMap<Language, LanguageDto>().ReverseMap();
+
+        CreateMap<Official, OfficialDto>()
+            .ForMember(dest => dest.DismissalOrder, opt => opt.MapFrom(src => src.DismissalOrder ?? string.Empty))
+            .ForMember(dest => dest.RecruitmentOrder, opt => opt.MapFrom(src => src.RecruitmentOrder ?? string.Empty))
+            .ForMember(dest => dest.DismissalReason, opt => opt.MapFrom(src => src.DismissalReason ?? string.Empty));
+
+        CreateMap<Position, OfficialPositionDto>();
+
+        CreateMap<Individual, OfficialIndividualDto>();
     }
 
     public IMappingExpression<TSource, TDestination> CreateSoftDeletedMap<TSource, TDestination>()

OutOfSchool/OutOfSchool.DataAccess/OutOfSchoolDbContext.cs

@@ -185,6 +185,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         builder.ApplyConfiguration(new InstitutionFieldDescriptionConfiguration());
         builder.ApplyConfiguration(new InstitutionHierarchyConfiguration());
         builder.ApplyConfiguration(new InstitutionStatusConfiguration());
+        builder.ApplyConfiguration(new LanguageConfiguration());
         builder.ApplyConfiguration(new NotificationConfiguration());
         builder.ApplyConfiguration(new OfficialConfiguration());
         builder.ApplyConfiguration(new OperationWithObjectConfiguration());
@@ -196,13 +197,12 @@ protected override void OnModelCreating(ModelBuilder builder)
         builder.ApplyConfiguration(new RatingConfiguration());
         builder.ApplyConfiguration(new RegionAdminConfiguration());
         builder.ApplyConfiguration(new SocialGroupConfiguration());
+        builder.ApplyConfiguration(new StudySubjectConfiguration());
         builder.ApplyConfiguration(new TagConfiguration());
         builder.ApplyConfiguration(new TeacherConfiguration());
         builder.ApplyConfiguration(new UserConfiguration());
         builder.ApplyConfiguration(new WorkshopConfiguration());
         builder.ApplyConfiguration(new WorkshopDescriptionItemConfiguration());
-        builder.ApplyConfiguration(new StudySubjectConfiguration());
-        builder.ApplyConfiguration(new LanguageConfiguration());
         builder.ApplyConfiguration(new EntityImagesConfiguration<WorkshopDraft>());
         builder.ApplyConfiguration(new WorkshopDraftConfiguration());
         builder.ApplyConfiguration(new TeacherDraftConfiguration());

OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/OfficialControllerTests.cs

@@ -0,0 +1,97 @@
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using OutOfSchool.BusinessLogic.Models;
+using OutOfSchool.BusinessLogic.Models.Official;
+using OutOfSchool.BusinessLogic.Services;
+using OutOfSchool.Services.Enums;
+using OutOfSchool.WebApi.Controllers.V1;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace OutOfSchool.WebApi.Tests.Controllers;
+
+[TestFixture]
+public class OfficialControllerTests
+{
+    private OfficialController controller;
+    private Guid providerId;
+    private Mock<IOfficialService> service;
+
+    [SetUp]
+    public void SetUp()
+    {
+        providerId = Guid.NewGuid();
+        service = new Mock<IOfficialService>();
+
+        controller = new OfficialController(service.Object);
+    }
+
+    [Test]
+    public async Task Get_ReturnsNoContent_WhenListIsEmpty()
+    {
+        // Arrange
+        var emptyResult = new SearchResult<OfficialDto>();
+        service.Setup(s => s.GetByFilter(providerId, null)).ReturnsAsync(emptyResult);
+
+        // Act
+        var result = await controller.Get(providerId, null).ConfigureAwait(false) as NoContentResult;
+
+        // Assert
+        Assert.That(result, Is.Not.Null);
+        Assert.That(result.StatusCode, Is.EqualTo(204));
+    }
+
+    [Test]
+    public async Task Get_ReturnsOk_WhenListIsNotEmpty()
+    {
+        // Arrange
+        var searchResult = new SearchResult<OfficialDto>()
+        {
+            Entities = new List<OfficialDto>
+            {
+                FakeOfficialDto(),
+                FakeOfficialDto(),
+                FakeOfficialDto()
+            },
+            TotalAmount = 3
+        };
+        service.Setup(s => s.GetByFilter(providerId, null)).ReturnsAsync(searchResult);
+
+        // Act
+        var result = await controller.Get(providerId, null).ConfigureAwait(false) as OkObjectResult;
+
+        // Assert
+        Assert.That(result, Is.Not.Null);
+        Assert.That(result.StatusCode, Is.EqualTo(200));
+
+        var returnedSearchResult = result.Value as SearchResult<OfficialDto>;
+        Assert.That(returnedSearchResult, Is.Not.Null);
+        Assert.That(returnedSearchResult.TotalAmount, Is.EqualTo(searchResult.TotalAmount));
+        Assert.That(returnedSearchResult.Entities, Is.EqualTo(searchResult.Entities));
+    }
+
+    private OfficialDto FakeOfficialDto()
+    {
+        return new OfficialDto()
+        {
+            ActiveFrom = DateOnly.FromDateTime(DateTime.Now),
+            ActiveTo = DateOnly.FromDateTime(DateTime.Now),
+            Id = Guid.NewGuid(),
+            EmploymentType = EmploymentType.PartTime,
+            Individual = new OfficialIndividualDto()
+            {
+                FirstName = "Test",
+                LastName = "Testov",
+                MiddleName = "Testovich",
+                Rnokpp = "1234567890"
+            },
+            Position = new OfficialPositionDto()
+            {
+                Id = Guid.NewGuid(),
+                FullName = "Test"
+            }
+        };
+    }
+}