Can't send an application while a service provider is blocked (#1002)

* Can't send an application while a service provider is blocked * Refactoring --------- Co-authored-by: Valerii <[email protected]>
ita-social-projects · Feb 27, 2023 · 4a9ff64 · 4a9ff64
1 parent 0bb9772
commit 4a9ff64
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/OutOfSchool/OutOfSchool.WebApi/Services/ApplicationService.cs b/OutOfSchool/OutOfSchool.WebApi/Services/ApplicationService.cs
@@ -30,6 +30,11 @@ public class ApplicationService : IApplicationService, INotificationReciever
     private readonly IRegionAdminService regionAdminService;
     private readonly ICodeficatorService codeficatorService;
 
+    private readonly string errorNullWorkshopMessage = "Operation failed. Workshop in Application dto is null";
+    private readonly string errorBlockedWorkshopMessage = "Unable to create a new application for a workshop because workshop is blocked";
+    private readonly string errorClosedWorkshopMessage = "Unable to create a new application for a workshop because workshop status is closed";
+    private readonly string errorNoAllowedNewApplicationMessage = "Unable to create a new application for a child because there's already appropriate status were found in this workshop";
+
     /// <summary>
     /// Initializes a new instance of the <see cref="ApplicationService"/> class.
     /// </summary>
@@ -594,7 +599,20 @@ private async Task<bool> IsNewApplicationAllowed(Guid workshopId)
             return workshop.Status == WorkshopStatus.Open;
         }
 
-        logger.LogInformation("Operation failed. Workshop in Application dto is null");
+        logger.LogError(this.errorNullWorkshopMessage);
+        throw new ArgumentException(@"Workshop in Application dto is null.", nameof(workshopId));
+    }
+
+    private async Task<bool> IsBlokedWorkshop(Guid workshopId)
+    {
+        var workshop = await combinedWorkshopService.GetById(workshopId).ConfigureAwait(false);
+
+        if (workshop is not null)
+        {
+            return workshop.IsBlocked;
+        }
+
+        logger.LogError(this.errorNullWorkshopMessage);
         throw new ArgumentException(@"Workshop in Application dto is null.", nameof(workshopId));
     }
 
@@ -650,7 +668,7 @@ private void FillProviderAdminInfo(string userId, out Guid providerId, out bool
 
         if (providerAdmin == null)
         {
-            logger.LogInformation("ProviderAdmin with userId = {UserId} not exists", userId);
+            logger.LogError("ProviderAdmin with userId = {UserId} not exists", userId);
 
             throw new ArgumentException($"There is no providerAdmin with userId = {userId}");
         }
@@ -721,14 +739,18 @@ private async Task<ModelWithAdditionalData<ApplicationDto, int>> ExecuteCreateAs
     {
         await currentUserService.UserHasRights(new ParentRights(applicationDto.ParentId, applicationDto.ChildId));
 
+        if (await IsBlokedWorkshop(applicationDto.WorkshopId))
+        {
+            logger.LogError(this.errorBlockedWorkshopMessage);
+            throw new ArgumentException(this.errorBlockedWorkshopMessage);
+        }
+
         var isNewApplicationAllowed = await IsNewApplicationAllowed(applicationDto.WorkshopId).ConfigureAwait(false);
 
         if (!isNewApplicationAllowed)
         {
-            logger.LogInformation(
-                "Unable to create a new application for a workshop because workshop status is closed");
-            throw new ArgumentException(
-                "Unable to create a new application for a workshop because workshop status is closed.");
+            logger.LogError(this.errorClosedWorkshopMessage);
+            throw new ArgumentException(this.errorClosedWorkshopMessage);
         }
 
         var allowedNewApplicationForChild =
@@ -737,10 +759,8 @@ await AllowedNewApplicationByChildStatus(applicationDto.WorkshopId, applicationD
 
         if (!allowedNewApplicationForChild)
         {
-            logger.LogInformation(
-                "Unable to create a new application for a child because there's already appropriate status were found in this workshop");
-            throw new ArgumentException(
-                "Unable to create a new application for a child because there's already appropriate status were found in this workshop.");
+            logger.LogError(this.errorNoAllowedNewApplicationMessage);
+            throw new ArgumentException(this.errorNoAllowedNewApplicationMessage);
         }
 
         (bool IsCorrect, int SecondsRetryAfter) resultOfCheck =

diff --git a/OutOfSchool/OutOfSchool.WebApi/Services/StatisticService.cs b/OutOfSchool/OutOfSchool.WebApi/Services/StatisticService.cs
@@ -200,6 +200,11 @@ public async Task<IEnumerable<WorkshopCard>> GetPopularWorkshopsFromDatabase(int
                 .Where(w => w.InstitutionHierarchy.InstitutionId == regionAdmin.InstitutionId);
         }
 
+        if (!currentUserService.IsAdmin())
+        {
+            workshops = workshops.Where(w => !w.IsBlocked);
+        }
+
         if (catottgId > 0)
         {
             workshops = workshops