Merge pull request #909 from ita-social-projects/develop

Stage update (#908)
ita-social-projects · Dec 3, 2023 · a9ec0aa · a9ec0aa
2 parents daea670 + ed8c6bc
commit a9ec0aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/...etcode/Streetcode.BLL/MediatR/Streetcode/Streetcode/GetCount/GetStreetcodesCountHander.cs b/...etcode/Streetcode.BLL/MediatR/Streetcode/Streetcode/GetCount/GetStreetcodesCountHander.cs
@@ -1,16 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using FluentResults;
 using MediatR;
 using Microsoft.Extensions.Localization;
-using Streetcode.BLL.DTO.Streetcode;
 using Streetcode.BLL.Interfaces.Logging;
-using Streetcode.BLL.MediatR.Streetcode.Streetcode.GetAllShort;
 using Streetcode.BLL.SharedResource;
+using Streetcode.DAL.Entities.Streetcode;
+using Streetcode.DAL.Enums;
 using Streetcode.DAL.Repositories.Interfaces.Base;
 
 namespace Streetcode.BLL.MediatR.Streetcode.Streetcode.GetCount
@@ -31,7 +26,17 @@ public GetStreetcodesCountHander(IRepositoryWrapper repositoryWrapper, IMapper m
 
         public async Task<Result<int>> Handle(GetStreetcodesCountQuery request, CancellationToken cancellationToken)
         {
-            var streetcodes = await _repositoryWrapper.StreetcodeRepository.GetAllAsync();
+            IEnumerable<StreetcodeContent> streetcodes;
+
+            if (request.onlyPublished)
+            {
+                streetcodes = await _repositoryWrapper.StreetcodeRepository
+                    .GetAllAsync(s => s.Status == StreetcodeStatus.Published);
+            }
+            else
+            {
+                streetcodes = await _repositoryWrapper.StreetcodeRepository.GetAllAsync();
+            }
 
             if (streetcodes != null)
             {

diff --git a/Streetcode/Streetcode.BLL/MediatR/Streetcode/Streetcode/GetCount/GetStreetcodesCountQuery.cs b/Streetcode/Streetcode.BLL/MediatR/Streetcode/Streetcode/GetCount/GetStreetcodesCountQuery.cs
@@ -3,5 +3,5 @@
 
 namespace Streetcode.BLL.MediatR.Streetcode.Streetcode.GetCount
 {
-    public record GetStreetcodesCountQuery : IRequest<Result<int>>;
+    public record GetStreetcodesCountQuery(bool onlyPublished) : IRequest<Result<int>>;
 }
diff --git a/Streetcode/Streetcode.WebApi/Controllers/Streetcode/StreetcodeController.cs b/Streetcode/Streetcode.WebApi/Controllers/Streetcode/StreetcodeController.cs
@@ -90,9 +90,9 @@ public async Task<IActionResult> GetAllCatalog([FromQuery] int page, [FromQuery]
     }
 
     [HttpGet]
-    public async Task<IActionResult> GetCount()
+    public async Task<IActionResult> GetCount([FromQuery] bool? onlyPublished)
     {
-        return HandleResult(await Mediator.Send(new GetStreetcodesCountQuery()));
+        return HandleResult(await Mediator.Send(new GetStreetcodesCountQuery(onlyPublished ?? false)));
     }
 
     [HttpGet("{url}")]