Fixed 403 error when area admin tries to get applications #1197

OutOfSchool/OutOfSchool.WebApi.Tests/Services/ApplicationServiceTests.cs

@@ -43,6 +43,7 @@ public class ApplicationServiceTests
     private Mock<ICurrentUserService> currentUserServiceMock;
     private Mock<IMinistryAdminService> ministryAdminServiceMock;
     private Mock<IRegionAdminService> regionAdminServiceMock;
+    private Mock<IAreaAdminService> areaAdminServiceMock;
     private Mock<ICodeficatorService> codeficatorServiceMock;
 
     private Mock<IOptions<ApplicationsConstraintsConfig>> applicationsConstraintsConfig;
@@ -59,6 +60,7 @@ public void SetUp()
         currentUserServiceMock = new Mock<ICurrentUserService>();
         ministryAdminServiceMock = new Mock<IMinistryAdminService>();
         regionAdminServiceMock = new Mock<IRegionAdminService>();
+        areaAdminServiceMock = new Mock<IAreaAdminService>();
         codeficatorServiceMock = new Mock<ICodeficatorService>();
 
         logger = new Mock<ILogger<ApplicationService>>();
@@ -85,6 +87,7 @@ public void SetUp()
             currentUserServiceMock.Object,
             ministryAdminServiceMock.Object,
             regionAdminServiceMock.Object,
+            areaAdminServiceMock.Object,
             codeficatorServiceMock.Object);
     }
 
@@ -184,6 +187,47 @@ public async Task GetApplications_WhenRegionAdminCalled_ShouldReturnApplications
         Assert.That(result.Entities.FirstOrDefault().Workshop.InstitutionId, Is.EqualTo(institutionId));
     }
 
+    [Test]
+    public async Task GetApplications_WhenAreaAdminCalled_ShouldReturnApplications()
+    {
+        // Arrange
+        var institutionId = new Guid("b929a4cd-ee3d-4bad-b2f0-d40aedf656c4");
+        long catottgId = 31737;
+        var applications = WithApplicationsList();
+        SetupGetAllByInstitutionId(applications);
+
+        currentUserServiceMock.Setup(c => c.IsAdmin()).Returns(true);
+        currentUserServiceMock.Setup(c => c.IsMinistryAdmin()).Returns(false);
+		currentUserServiceMock.Setup(c => c.IsRegionAdmin()).Returns(false);
+		currentUserServiceMock.Setup(c => c.IsAreaAdmin()).Returns(true);
+        areaAdminServiceMock
+            .Setup(m => m.GetByUserId(It.IsAny<string>()))
+            .Returns(Task.FromResult<AreaAdminDto>(new AreaAdminDto()
+            {
+                InstitutionId = institutionId,
+                CATOTTGId = catottgId,
+            }));
+
+        currentUserServiceMock.Setup(c => c.IsAreaAdmin()).Returns(true);
+        areaAdminServiceMock
+            .Setup(m => m.GetByUserId(It.IsAny<string>()))
+            .Returns(Task.FromResult<AreaAdminDto>(new AreaAdminDto()
+            {
+                InstitutionId = institutionId,
+            }));
+
+        codeficatorServiceMock
+            .Setup(x => x.GetAllChildrenIdsByParentIdAsync(It.IsAny<long>()))
+            .Returns(Task.FromResult((IEnumerable<long>)new List<long> { catottgId }));
+
+        // Act
+        var result = await service.GetAll(new ApplicationFilter());
+
+        // Assert
+        Assert.That(result.Entities.Count, Is.EqualTo(1));
+        Assert.That(result.Entities.FirstOrDefault().Workshop.InstitutionId, Is.EqualTo(institutionId));
+    }
+
     [Test]
     public async Task GetApplicationById_WhenIdIsValid_ShouldReturnApplication()
     {

OutOfSchool/OutOfSchool.WebApi/Services/ApplicationService.cs

@@ -30,6 +30,7 @@ public class ApplicationService : IApplicationService, INotificationReciever
     private readonly ICurrentUserService currentUserService;
     private readonly IMinistryAdminService ministryAdminService;
     private readonly IRegionAdminService regionAdminService;
+    private readonly IAreaAdminService areaAdminService;
     private readonly ICodeficatorService codeficatorService;
 
     private readonly string errorNullWorkshopMessage = "Operation failed. Workshop in Application dto is null";
@@ -52,6 +53,7 @@ public class ApplicationService : IApplicationService, INotificationReciever
     /// <param name="currentUserService">Service for managing current user rights.</param>
     /// <param name="ministryAdminService">Service for managing ministry admin rigths.</param>
     /// <param name="regionAdminService">Service for managing region admin rigths.</param>
+    /// <param name="areaAdminService">Service for managing area admin rigths.</param>
     /// <param name="codeficatorService">Codeficator service.</param>
     public ApplicationService(
         IApplicationRepository repository,
@@ -66,6 +68,7 @@ public ApplicationService(
         ICurrentUserService currentUserService,
         IMinistryAdminService ministryAdminService,
         IRegionAdminService regionAdminService,
+        IAreaAdminService areaAdminService,
         ICodeficatorService codeficatorService)
     {
         applicationRepository = repository ?? throw new ArgumentNullException(nameof(repository));
@@ -83,6 +86,7 @@ public ApplicationService(
         this.currentUserService = currentUserService ?? throw new ArgumentNullException(nameof(currentUserService));
         this.ministryAdminService = ministryAdminService ?? throw new ArgumentNullException(nameof(ministryAdminService));
         this.regionAdminService = regionAdminService ?? throw new ArgumentNullException(nameof(regionAdminService));
+        this.areaAdminService = areaAdminService ?? throw new ArgumentNullException(nameof(areaAdminService));
         this.codeficatorService = codeficatorService ?? throw new ArgumentNullException(nameof(codeficatorService));
     }
 
@@ -139,6 +143,28 @@ public async Task<SearchResult<ApplicationDto>> GetAll(ApplicationFilter filter)
             }
         }
 
+        if (currentUserService.IsAreaAdmin())
+        {
+            var areaAdmin = await areaAdminService.GetByUserId(currentUserService.UserId);
+            predicate = predicate
+                .And(p => p.Workshop.InstitutionHierarchy.InstitutionId == areaAdmin.InstitutionId);
+
+            var subSettlementsIds = await codeficatorService
+                .GetAllChildrenIdsByParentIdAsync(areaAdmin.CATOTTGId).ConfigureAwait(false);
+
+            if (subSettlementsIds.Any())
+            {
+                var tempPredicate = PredicateBuilder.False<Application>();
+
+                foreach (var item in subSettlementsIds)
+                {
+                    tempPredicate = tempPredicate.Or(x => x.Workshop.Provider.LegalAddress.CATOTTGId == item);
+                }
+
+                predicate = predicate.And(tempPredicate);
+            }
+        }
+
         var sortPredicate = SortExpressionBuild(filter);
 
         var totalAmount = await applicationRepository.Count(where: predicate).ConfigureAwait(false);
@@ -915,4 +941,4 @@ private async Task<int> GetAmountOfApprovedApplications(Guid workshopId)
     {
         return await applicationRepository.Count(x => x.WorkshopId == workshopId && x.Status == ApplicationStatus.Approved);
     }
-}
+}

OutOfSchool/OutOfSchool.WebApi/Services/CurrentUserService.cs

@@ -66,7 +66,7 @@ public bool IsDeputyOrProviderAdmin() =>
         IsInRole(Role.Provider) &&
         (IsInSubRole(Subrole.ProviderDeputy) || IsInSubRole(Subrole.ProviderAdmin));
 
-    public bool IsAdmin() => IsInRole(Role.TechAdmin) || IsInRole(Role.MinistryAdmin) || IsInRole(Role.RegionAdmin);
+    public bool IsAdmin() => IsInRole(Role.TechAdmin) || IsInRole(Role.MinistryAdmin) || IsInRole(Role.RegionAdmin) || IsInRole(Role.AreaAdmin);
 
     public bool IsTechAdmin() => IsInRole(Role.TechAdmin);