Add GroupName to a SwiftLink

mohammadKarimi · mohammadKarimi · commit 65f444db79d4 · 2024-02-13T14:16:22.000+03:30
diff --git a/src/SwiftLink.Application/Common/Interfaces/ICacheProvider.cs b/src/SwiftLink.Application/Common/Interfaces/ICacheProvider.cs
@@ -29,7 +29,7 @@ public interface ICacheProvider
     /// Removes the object associated with the given key.
     /// </summary>
     /// <param name="key">An object identifying the requested entry.</param>
-    Task Remove(string key);
+    Task<bool> Remove(string key);
 
     /// <summary>
     /// Gets the item associated with this key if present.
diff --git a/src/SwiftLink.Application/UseCases/Links/Commands/GenerateShortCode/GenerateShortCodeCommand.cs b/src/SwiftLink.Application/UseCases/Links/Commands/GenerateShortCode/GenerateShortCodeCommand.cs
@@ -4,6 +4,7 @@ namespace SwiftLink.Application.UseCases.Links.Commands;
 
 public record GenerateShortCodeCommand : IRequest<Result<LinksDto>>
 {
+    public string GroupName { get; set; }
     public string Url { get; set; }
     public string Description { get; set; }
     public string Title { get; set; }
diff --git a/src/SwiftLink.Application/UseCases/Links/Commands/GenerateShortCode/GenerateShortCodeCommandHandler.cs b/src/SwiftLink.Application/UseCases/Links/Commands/GenerateShortCode/GenerateShortCodeCommandHandler.cs
@@ -33,6 +33,7 @@ public async Task<Result<LinksDto>> Handle(GenerateShortCodeCommand request,
             Password = request.Password?.Hash(request.Url),
             Title = request.Title,
             Tags = request.Tags?.ToList(),
+            GroupName = request.GroupName
         };
 
         linkTable.Add(link);
diff --git a/src/SwiftLink.Application/UseCases/Links/Commands/GenerateShortCode/GenerateShortCodeValidator.cs b/src/SwiftLink.Application/UseCases/Links/Commands/GenerateShortCode/GenerateShortCodeValidator.cs
@@ -5,7 +5,7 @@ namespace SwiftLink.Application.UseCases.Links.Commands;
 
 public class GenerateShortCodeValidator : AbstractValidator<GenerateShortCodeCommand>
 {
-    public readonly IApplicationDbContext _dbContext;
+    private readonly IApplicationDbContext _dbContext;
 
     public GenerateShortCodeValidator(IApplicationDbContext dbContext)
     {
diff --git a/src/SwiftLink.Application/UseCases/Links/Commands/UpdateLink/UpdateLinkCommandHandler.cs b/src/SwiftLink.Application/UseCases/Links/Commands/UpdateLink/UpdateLinkCommandHandler.cs
@@ -29,6 +29,7 @@ public async Task<Result<bool>> Handle(UpdateLinkCommand request, CancellationTo
         if (dbResult.IsFailure)
             return Result.Failure<bool>(CommonMessages.Database.InsertFailed);
 
+        await _cache.Remove(link.ShortCode);
         await _cache.Set(link.ShortCode, JsonSerializer.Serialize(link), link.ExpirationDate);
 
         return Result.Success(true);
diff --git a/src/SwiftLink.Domain/Entities/Link.cs b/src/SwiftLink.Domain/Entities/Link.cs
@@ -15,14 +15,15 @@ public class Link : IEntity
     public string Description { get; set; }
     public DateTime ExpirationDate { get; set; }
     public bool IsBanned { get; set; }
-    public bool IsDisabled { get; set; }
+    public bool IsDisabled { get; private set; }
     public string Password { get; set; }
+    public string GroupName { get; set; }
     public List<Tags> Tags { get; set; }
     public ICollection<LinkVisit> LinkVisits { get; set; }
-    
-    public void Enable() 
+
+    public void Enable()
         => IsDisabled = false;
-        
+
     public void Disable()
         => IsDisabled = true;
 }
diff --git a/src/SwiftLink.Infrastructure/CacheProvider/RedisCacheProvider.cs b/src/SwiftLink.Infrastructure/CacheProvider/RedisCacheProvider.cs
@@ -15,8 +15,23 @@ public class RedisCacheService(IDistributedCache cache, IOptions<AppSettings> op
 
     private readonly AppSettings _options = options.Value;
 
-    public Task Remove(string key)
-        => _cache.RemoveAsync(key);
+    public async Task<bool> Remove(string key)
+    {
+        var removeCacheCircuitBreaker = _policyRegistry.Get<AsyncCircuitBreakerPolicy<bool>>(nameof(RedisCashServiceResiliencyKey.RemoveCircuitBreaker));
+        return removeCacheCircuitBreaker.CircuitState is not CircuitState.Open &&
+            await removeCacheCircuitBreaker.ExecuteAsync(async () =>
+            {
+                try
+                {
+                    await _cache.RemoveAsync(key);
+                }
+                catch (RedisConnectionException)
+                {
+                    return false;
+                }
+                return true;
+            });
+    }
 
     public async Task<bool> Set(string key, string value)
         => await Set(key, value, DateTime.Now.AddDays(_options.DefaultExpirationTimeInDays));
@@ -67,5 +82,6 @@ public async Task<string> Get(string key)
 public enum RedisCashServiceResiliencyKey
 {
     SetCircuitBreaker,
-    GetCircuitBreaker
+    GetCircuitBreaker,
+    RemoveCircuitBreaker
 }
diff --git a/src/SwiftLink.Infrastructure/Persistence/Migrations/20240213102938_AddGroupNameInLink.Designer.cs b/src/SwiftLink.Infrastructure/Persistence/Migrations/20240213102938_AddGroupNameInLink.Designer.cs
diff --git a/src/SwiftLink.Infrastructure/Persistence/Migrations/20240213102938_AddGroupNameInLink.cs b/src/SwiftLink.Infrastructure/Persistence/Migrations/20240213102938_AddGroupNameInLink.cs
@@ -0,0 +1,32 @@
+﻿using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SwiftLink.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddGroupNameInLink : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "GroupName",
+                schema: "BASE",
+                table: "Link",
+                type: "varchar(200)",
+                unicode: false,
+                maxLength: 200,
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GroupName",
+                schema: "BASE",
+                table: "Link");
+        }
+    }
+}
diff --git a/src/SwiftLink.Infrastructure/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs b/src/SwiftLink.Infrastructure/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -40,6 +40,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("ExpirationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("GroupName")
+                        .HasMaxLength(200)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(200)");
+
                     b.Property<bool>("IsBanned")
                         .HasColumnType("bit");
 
diff --git a/src/SwiftLink.Presentation/Controllers/V1/LinkController.cs b/src/SwiftLink.Presentation/Controllers/V1/LinkController.cs
@@ -19,7 +19,7 @@ public async Task<IActionResult> Shorten([FromBody] GenerateShortCodeCommand com
     public async Task<IActionResult> Visit(string shortCode, [FromQuery] string password,
         CancellationToken cancellationToken = default)
     {
-        HttpContext.Items.TryGetValue("ClientMetaData", out object clientMetaData);
+        HttpContext.Items.TryGetValue("ClientMetaData", out var clientMetaData);
         var response = await MediatR.Send(new VisitShortenLinkQuery()
         {
             ShortCode = shortCode,
@@ -33,7 +33,7 @@ public async Task<IActionResult> Visit(string shortCode, [FromQuery] string pass
     [HttpGet]
     public async Task<IActionResult> List([FromQuery] ListOfLinksQuery listOfLinksQuery,
         CancellationToken cancellationToken = default)
-        => Ok(await MediatR.Send(listOfLinksQuery, cancellationToken));
+        => Ok(await MediatR.Send(listOfLinksQuery , cancellationToken));
 
     [HttpGet]
     public async Task<IActionResult> Count([FromQuery] CountVisitShortenLinkQuery countOfLinksQuery,

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ namespace SwiftLink.Application.UseCases.Links.Commands;`
`4`	`4`
`5`	`5`	`public record GenerateShortCodeCommand : IRequest<Result<LinksDto>>`
`6`	`6`	`{`
	`7`	`+ public string GroupName { get; set; }`
`7`	`8`	`public string Url { get; set; }`
`8`	`9`	`public string Description { get; set; }`
`9`	`10`	`public string Title { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace SwiftLink.Application.UseCases.Links.Commands;`
`5`	`5`
`6`	`6`	`public class GenerateShortCodeValidator : AbstractValidator<GenerateShortCodeCommand>`
`7`	`7`	`{`
`8`		`- public readonly IApplicationDbContext _dbContext;`
	`8`	`+ private readonly IApplicationDbContext _dbContext;`
`9`	`9`
`10`	`10`	`public GenerateShortCodeValidator(IApplicationDbContext dbContext)`
`11`	`11`	`{`