Merge pull request #1020 from ita-social-projects/master

merge master to deve;op
ita-social-projects · Jan 7, 2024 · 1b2ca89 · 1b2ca89
2 parents 65ed037 + 8490f60
commit 1b2ca89
Show file tree

Hide file tree

Showing 7 changed files with 1,652 additions and 15 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.DAL/Entities/Streetcode/StreetcodeContent.cs b/Streetcode/Streetcode.DAL/Entities/Streetcode/StreetcodeContent.cs
@@ -32,7 +32,7 @@ public class StreetcodeContent
     public string? Teaser { get; set; }
 
     [Required]
-    [MaxLength(50)]
+    [MaxLength(100)]
     public string? DateString { get; set; }
 
     [MaxLength(50)]