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

Update master
ita-social-projects · Jan 7, 2024 · b401390 · b401390
2 parents 8490f60 + 1b2ca89
commit b401390
Show file tree

Hide file tree

Showing 38 changed files with 304 additions and 250 deletions.
diff --git a/...tcode/Streetcode.BLL/MediatR/AdditionalContent/Subtitle/GetById/GetSubtitleByIdHandler.cs b/...tcode/Streetcode.BLL/MediatR/AdditionalContent/Subtitle/GetById/GetSubtitleByIdHandler.cs
@@ -33,7 +33,8 @@ public async Task<Result<SubtitleDTO>> Handle(GetSubtitleByIdQuery request, Canc
         {
             string errorMsg = _stringLocalizerCannotFind["CannotFindSubtitleWithCorrespondingId", request.Id].Value;
             _logger.LogError(request, errorMsg);
-            return Result.Fail(new Error(errorMsg));
+            var returner = Result.Fail(new Error(errorMsg));
+            return returner;
         }
 
         return Result.Ok(_mapper.Map<SubtitleDTO>(subtitle));

diff --git a/...etcode.BLL/MediatR/AdditionalContent/Tag/GetByStreetcodeId/GetTagByStreetcodeIdHandler.cs b/...etcode.BLL/MediatR/AdditionalContent/Tag/GetByStreetcodeId/GetTagByStreetcodeIdHandler.cs
@@ -34,7 +34,7 @@ public async Task<Result<IEnumerable<StreetcodeTagDTO>>> Handle(GetTagByStreetco
                 t => t.StreetcodeId == request.StreetcodeId,
                 include: q => q.Include(t => t.Tag));
 
-        if (tagIndexed is null)
+        if (tagIndexed is null || request.StreetcodeId < 1)
         {
             string errorMsg = _stringLocalizerCannotFind?["CannotFindAnyTagByTheStreetcodeId", request.StreetcodeId].Value;
             _logger.LogError(request, errorMsg);

diff --git a/...etcode/Streetcode.BLL/MediatR/Media/Art/GetByStreetcodeId/GetArtsByStreetcodeIdHandler.cs b/...etcode/Streetcode.BLL/MediatR/Media/Art/GetByStreetcodeId/GetArtsByStreetcodeIdHandler.cs
@@ -48,7 +48,7 @@ public async Task<Result<IEnumerable<ArtDTO>>> Handle(GetArtsByStreetcodeIdQuery
                 include: scl => scl
                     .Include(sc => sc.Image) !);
 
-            if (arts is null)
+            if (arts is null || request.StreetcodeId < 1)
             {
                 string errorMsg = _stringLocalizerCannotFind["CannotFindAnyArtWithCorrespondingStreetcodeId", request.StreetcodeId].Value;
                 _logger.LogError(request, errorMsg);

diff --git a/...ode/Streetcode.BLL/MediatR/Media/Image/GetByStreetcodeId/GetImageByStreetcodeIdHandler.cs b/...ode/Streetcode.BLL/MediatR/Media/Image/GetByStreetcodeId/GetImageByStreetcodeIdHandler.cs
@@ -46,7 +46,7 @@ public async Task<Result<IEnumerable<ImageDTO>>> Handle(GetImageByStreetcodeIdQu
                     f => f.Streetcodes.Any(s => s.Id == request.StreetcodeId),
                     include: q => q.Include(img => img.ImageDetails))).OrderBy(img => img.ImageDetails?.Alt);
 
-                if (images is null || images.Count() == 0)
+                if (images is null || request.StreetcodeId < 1)
                 {
                     string errorMsg = _stringLocalizerCannotFind["CannotFindAnImageWithTheCorrespondingStreetcodeId", request.StreetcodeId].Value;
                     _logger.LogError(request, errorMsg);

diff --git a/...LL/MediatR/Media/StreetcodeArt/GetByStreetcodeId/GetStreetcodeArtByStreetcodeIdHandler.cs b/...LL/MediatR/Media/StreetcodeArt/GetByStreetcodeId/GetStreetcodeArtByStreetcodeIdHandler.cs
@@ -52,7 +52,7 @@ public async Task<Result<IEnumerable<StreetcodeArtDTO>>> Handle(GetStreetcodeArt
                     .Include(a => a.Art)
                     .Include(i => i.Art.Image) !);
 
-            if (art is null)
+            if (art is null || request.StreetcodeId < 1)
             {
                 string errorMsg = _stringLocalizerCannotFind["CannotFindAnyArtWithCorrespondingStreetcodeId", request.StreetcodeId].Value;
                 _logger.LogError(request, errorMsg);

diff --git a/Streetcode/Streetcode.BLL/Services/BlobStorageService/BlobService.cs b/Streetcode/Streetcode.BLL/Services/BlobStorageService/BlobService.cs
@@ -61,7 +61,7 @@ public string SaveFileInStorage(string base64, string name, string extension)
 
     public void SaveFileInStorageBase64(string base64, string name, string extension)
     {
-        byte[] imageBytes = Convert.FromBase64String(base64);
+        byte[] imageBytes = Convert.FromBase64String(base64.Trim());
         Directory.CreateDirectory(_blobPath);
         EncryptFile(imageBytes, extension, name);
     }
@@ -87,26 +87,6 @@ public string UpdateFileInStorage(
         return hashBlobStorageName;
     }
 
-    public async Task CleanBlobStorage()
-    {
-        var base64Files = GetAllBlobNames();
-
-        var existingImagesInDatabase = await _repositoryWrapper.ImageRepository.GetAllAsync();
-        var existingAudiosInDatabase = await _repositoryWrapper.AudioRepository.GetAllAsync();
-
-        List<string> existingMedia = new ();
-        existingMedia.AddRange(existingImagesInDatabase.Select(img => img.BlobName));
-        existingMedia.AddRange(existingAudiosInDatabase.Select(img => img.BlobName));
-
-        var filesToRemove = base64Files.Except(existingMedia).ToList();
-
-        foreach (var file in filesToRemove)
-        {
-            Console.WriteLine($"Deleting {file}...");
-            DeleteFileInStorage(file);
-        }
-    }
-
     private IEnumerable<string> GetAllBlobNames()
     {
         var paths = Directory.EnumerateFiles(_blobPath);

diff --git a/Streetcode/Streetcode.BLL/Services/CacheService/CacheService.cs b/Streetcode/Streetcode.BLL/Services/CacheService/CacheService.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
 using Streetcode.BLL.Interfaces.Cache;
 using Streetcode.BLL.Interfaces.Logging;
 
@@ -14,54 +15,58 @@ namespace Streetcode.BLL.Services.CacheService
     public class CacheService : ICacheService
     {
         private readonly IMemoryCache _cache;
-        private readonly ILoggerService _logger;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
         private readonly ConcurrentDictionary<object, SemaphoreSlim> _locks = new ConcurrentDictionary<object, SemaphoreSlim>();
 
-        public CacheService(IMemoryCache cache, ILoggerService logger)
+        public CacheService(IMemoryCache cache, IServiceScopeFactory serviceScopeFactory )
         {
             _cache = cache;
-            _logger = logger;
+            _serviceScopeFactory = serviceScopeFactory;
         }
 
         public async Task<T> GetOrSetAsync<T>(string key, Func<Task<T>> getItemCallback, TimeSpan cacheDuration)
         {
-            _logger.LogInformation(key + "GetOrSetAsync function start!");
-            if (_cache.TryGetValue(key, out T cachedItem))
+            using (var scope = _serviceScopeFactory.CreateAsyncScope())
             {
-                _logger.LogInformation(key + "TryGetValue function true");
-                return cachedItem;
-            }
-
-            _logger.LogInformation(key + "TryGetValue function false");
-            SemaphoreSlim mylock = _locks.GetOrAdd(key, k => new SemaphoreSlim(1, 1));
-
-            await mylock.WaitAsync();
-
-            try
-            {
-                if (_cache.TryGetValue(key, out cachedItem))
+                var logger = scope.ServiceProvider.GetRequiredService<ILoggerService>();
+                logger.LogInformation(key + "GetOrSetAsync function start!");
+                if (_cache.TryGetValue(key, out T cachedItem))
                 {
-                    _logger.LogInformation(key + "TryGetValue function true");
+                    logger.LogInformation(key + "TryGetValue function true");
                     return cachedItem;
                 }
 
-                _logger.LogInformation(key + "TryGetValue function false");
-                T item = await getItemCallback();
+                logger.LogInformation(key + "TryGetValue function false");
+                SemaphoreSlim mylock = _locks.GetOrAdd(key, k => new SemaphoreSlim(1, 1));
+
+                await mylock.WaitAsync();
 
-                var cacheEntryOptions = new MemoryCacheEntryOptions
+                try
                 {
-                    AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30),
-                    SlidingExpiration = cacheDuration,
-                    Priority = CacheItemPriority.Normal,
-                };
+                    if (_cache.TryGetValue(key, out cachedItem))
+                    {
+                        logger.LogInformation(key + "TryGetValue function true");
+                        return cachedItem;
+                    }
 
-                _cache.Set(key, item, cacheEntryOptions);
-                _logger.LogInformation(key + "Set function true");
-                return item;
-            }
-            finally
-            {
-                mylock.Release();
+                    logger.LogInformation(key + "TryGetValue function false");
+                    T item = await getItemCallback();
+
+                    var cacheEntryOptions = new MemoryCacheEntryOptions
+                    {
+                        AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30),
+                        SlidingExpiration = cacheDuration,
+                        Priority = CacheItemPriority.Normal,
+                    };
+
+                    _cache.Set(key, item, cacheEntryOptions);
+                    logger.LogInformation(key + "Set function true");
+                    return item;
+                }
+                finally
+                {
+                    mylock.Release();
+                }
             }
         }
 

diff --git a/Streetcode/Streetcode.BLL/Util/DateToStringConverter.cs b/Streetcode/Streetcode.BLL/Util/DateToStringConverter.cs
diff --git a/Streetcode/Streetcode.BLL/Util/IdComparer.cs b/Streetcode/Streetcode.BLL/Util/IdComparer.cs
diff --git a/Streetcode/Streetcode.DAL/Streetcode.DAL.csproj b/Streetcode/Streetcode.DAL/Streetcode.DAL.csproj
@@ -10,14 +10,14 @@
   <ItemGroup>
     <PackageReference Include="EfCore.SchemaCompare" Version="6.0.0" />
     <PackageReference Include="MailKit" Version="3.6.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.13">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.13">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Streetcode/Streetcode.WebApi/Attributes/AuthorizeRoles.cs b/Streetcode/Streetcode.WebApi/Attributes/AuthorizeRoles.cs
diff --git a/Streetcode/Streetcode.WebApi/Controllers/BaseApiController.cs b/Streetcode/Streetcode.WebApi/Controllers/BaseApiController.cs
@@ -1,8 +1,6 @@
-using System.Resources;
-using FluentResults;
+using FluentResults;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
 using Streetcode.BLL.MediatR.ResultVariations;
 
 namespace Streetcode.WebApi.Controllers;
@@ -11,12 +9,7 @@ namespace Streetcode.WebApi.Controllers;
 [Route("api/[controller]/[action]")]
 public class BaseApiController : ControllerBase
 {
-    private readonly IStringLocalizer _stringLocalizer;
     private IMediator? _mediator;
-    public BaseApiController(IStringLocalizer<BaseApiController> stringLocalizer)
-    {
-        _stringLocalizer = stringLocalizer;
-    }
 
     public BaseApiController()
     {
@@ -28,21 +21,14 @@ protected ActionResult HandleResult<T>(Result<T> result)
     {
         if (result.IsSuccess)
         {
-            if(result is NullResult<T>)
+            if (result is NullResult<T>)
             {
                 return Ok(result.Value);
             }
 
             return (result.Value is null) ?
-                NotFound(_stringLocalizer?["NotFound"].Value) : Ok(result.Value);
-        }
 
-        foreach (var item in result.Reasons)
-        {
-            if (item.Message.Contains(_stringLocalizer?["NotFound"].Value))
-            {
-                return Ok();
-            }
+                NotFound("Not Found") : Ok(result.Value);
         }
 
         return BadRequest(result.Reasons);

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Media/AudioController.cs b/Streetcode/Streetcode.WebApi/Controllers/Media/AudioController.cs
@@ -10,7 +10,6 @@
 using Streetcode.BLL.MediatR.Media.Audio.Update;
 using Streetcode.BLL.MediatR.Media.Image.GetByStreetcodeId;
 using Streetcode.DAL.Enums;
-using Streetcode.WebApi.Attributes;
 
 namespace Streetcode.WebApi.Controllers.Media;
 

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Media/Images/ArtController.cs b/Streetcode/Streetcode.WebApi/Controllers/Media/Images/ArtController.cs
@@ -22,7 +22,7 @@ public async Task<IActionResult> GetById([FromRoute] int id)
     }
 
     [HttpGet("{streetcodeId:int}")]
-    public async Task<IActionResult> GetAllByStreetcodeId([FromRoute] int streetcodeId)
+    public async Task<IActionResult> GetArtsByStreetcodeId([FromRoute] int streetcodeId)
     {
         return HandleResult(await Mediator.Send(new GetArtsByStreetcodeIdQuery(streetcodeId)));
     }

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Media/Images/ImageController.cs b/Streetcode/Streetcode.WebApi/Controllers/Media/Images/ImageController.cs
@@ -7,7 +7,6 @@
 using Streetcode.BLL.MediatR.Media.Image.Create;
 using Streetcode.BLL.MediatR.Media.Image.Delete;
 using Streetcode.BLL.MediatR.Media.Image.Update;
-using Streetcode.WebApi.Attributes;
 using Streetcode.DAL.Enums;
 using Microsoft.Net.Http.Headers;
 

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Partners/PartnersController.cs b/Streetcode/Streetcode.WebApi/Controllers/Partners/PartnersController.cs
@@ -10,7 +10,6 @@
 using Streetcode.BLL.MediatR.Partners.GetByStreetcodeIdToUpdate;
 using Streetcode.DAL.Entities.Partners;
 using Streetcode.DAL.Enums;
-using Streetcode.WebApi.Attributes;
 
 namespace Streetcode.WebApi.Controllers.Partners;
 

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Source/SourcesController.cs b/Streetcode/Streetcode.WebApi/Controllers/Source/SourcesController.cs
@@ -6,7 +6,6 @@
 using Streetcode.BLL.MediatR.Sources.SourceLink.Update;
 using Streetcode.BLL.MediatR.Sources.SourceLink.Delete;
 using Streetcode.DAL.Enums;
-using Streetcode.WebApi.Attributes;
 using Streetcode.BLL.MediatR.Sources.SourceLinkCategory.GetAll;
 using Streetcode.BLL.MediatR.Sources.SourceLinkCategory.GetCategoryContentByStreetcodeId;
 

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Streetcode/TextContent/FactController.cs b/Streetcode/Streetcode.WebApi/Controllers/Streetcode/TextContent/FactController.cs
@@ -7,7 +7,6 @@
 using Streetcode.BLL.MediatR.Streetcode.Fact.GetByStreetcodeId;
 using Streetcode.BLL.MediatR.Streetcode.Fact.Update;
 using Streetcode.DAL.Enums;
-using Streetcode.WebApi.Attributes;
 
 namespace Streetcode.WebApi.Controllers.Streetcode.TextContent;
 

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Team/TeamController.cs b/Streetcode/Streetcode.WebApi/Controllers/Team/TeamController.cs
@@ -8,7 +8,6 @@
 using Streetcode.BLL.MediatR.Team.GetByRoleId;
 using Streetcode.BLL.MediatR.Team.Update;
 using Streetcode.DAL.Enums;
-using Streetcode.WebApi.Attributes;
 
 namespace Streetcode.WebApi.Controllers.Team
 {

diff --git a/Streetcode/Streetcode.WebApi/Controllers/Users/UserController.cs b/Streetcode/Streetcode.WebApi/Controllers/Users/UserController.cs
@@ -4,7 +4,6 @@
 using Streetcode.BLL.MediatR.Users.Login;
 using Streetcode.BLL.MediatR.Users.RefreshToken;
 using Streetcode.DAL.Enums;
-using Streetcode.WebApi.Attributes;
 
 namespace Streetcode.WebApi.Controllers.Users
 {