Update to match blog post

UrlShortener.Cli/Program.cs

@@ -2,8 +2,6 @@
 using StackExchange.Redis;
 using UrlShortener.Data;
 
-#region Options
-
 var destinationOption = new Option<string>(
     new[] {"--destination-url", "-d"},
     description: "The URL that the shortened URL will forward to."
@@ -43,22 +41,18 @@
     connectionStringOption.IsRequired = true;
 }
 
-#endregion
-
 var rootCommand = new RootCommand("Manage the shortened URLs.");
 
 async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
 {
     var redisConnection = await ConnectionMultiplexer.ConnectAsync(
         connectionString ??
         envConnectionString ??
-        throw new Exception("Missing connection string")
+        throw new Exception("Missing connection string.")
     );
     return redisConnection;
 }
 
-#region Create Command
-
 var createCommand = new Command("create", "Create a shortened URL")
 {
     destinationOption,
@@ -72,7 +66,7 @@ async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
     try
     {
         await shortUrlRepository.Create(new ShortUrl(destination, path));
-        Console.WriteLine($"Shortened URL created.");
+        Console.WriteLine("Shortened URL created.");
     }
     catch (Exception e)
     {
@@ -82,9 +76,28 @@ async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
 
 rootCommand.AddCommand(createCommand);
 
-#endregion
+var updateCommand = new Command("update", "Update a shortened URL")
+{
+    destinationOption,
+    pathOption,
+    connectionStringOption
+};
+
+updateCommand.SetHandler(async (destination, path, connectionString) =>
+{
+    var shortUrlRepository = new ShortUrlRepository(await GetRedisConnection(connectionString));
+    try
+    {
+        await shortUrlRepository.Update(new ShortUrl(destination, path));
+        Console.WriteLine("Shortened URL updated.");
+    }
+    catch (Exception e)
+    {
+        Console.Error.WriteLine(e.Message);
+    }
+}, destinationOption, pathOption, connectionStringOption);
 
-#region Delete Command
+rootCommand.AddCommand(updateCommand);
 
 var deleteCommand = new Command("delete", "Delete a shortened URL")
 {
@@ -98,7 +111,7 @@ async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
     try
     {
         await shortUrlRepository.Delete(path);
-        Console.WriteLine($"Shortened URL deleted.");
+        Console.WriteLine("Shortened URL deleted.");
     }
     catch (Exception e)
     {
@@ -108,10 +121,6 @@ async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
 
 rootCommand.AddCommand(deleteCommand);
 
-#endregion
-
-#region Get Command
-
 var getCommand = new Command("get", "Get a shortened URL")
 {
     pathOption,
@@ -123,7 +132,7 @@ async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
     var shortUrlRepository = new ShortUrlRepository(await GetRedisConnection(connectionString));
     try
     {
-        var shortUrl = await shortUrlRepository.GetByPath(path);
+        var shortUrl = await shortUrlRepository.Get(path);
         if (shortUrl == null)
             Console.Error.WriteLine($"Shortened URL for path '{path}' not found.");
         else
@@ -137,10 +146,6 @@ async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
 
 rootCommand.AddCommand(getCommand);
 
-#endregion
-
-#region List Command
-
 var listCommand = new Command("list", "List shortened URLs")
 {
     connectionStringOption
@@ -165,6 +170,4 @@ async Task<ConnectionMultiplexer> GetRedisConnection(string? connectionString)
 
 rootCommand.AddCommand(listCommand);
 
-#endregion
-
 return rootCommand.InvokeAsync(args).Result;

UrlShortener.Data/ShortUrl.cs

@@ -1,3 +1,3 @@
 namespace UrlShortener.Data;
 
-public record ShortUrl(string? Destination, string? Path);
+public sealed record ShortUrl(string? Destination, string? Path);

UrlShortener.Data/ShortUrlRepository.cs

@@ -2,7 +2,7 @@
 
 using StackExchange.Redis;
 
-public class ShortUrlRepository
+public sealed class ShortUrlRepository
 {
     private readonly ConnectionMultiplexer redisConnection;
     private readonly IDatabase redisDatabase;
@@ -23,6 +23,16 @@ public async Task Create(ShortUrl shortUrl)
             throw new Exception($"Failed to create shortened URL.");
     }
 
+    public async Task Update(ShortUrl shortUrl)
+    {
+        if (await Exists(shortUrl.Path) == false)
+            throw new Exception($"Shortened URL with path '{shortUrl.Path}' does not exist.");
+
+        var urlWasSet = await redisDatabase.StringSetAsync(shortUrl.Path, shortUrl.Destination);
+        if (!urlWasSet)
+            throw new Exception($"Failed to update shortened URL.");
+    }
+
     public async Task Delete(string path)
     {
         if (await Exists(path) == false)
@@ -33,11 +43,8 @@ public async Task Delete(string path)
             throw new Exception("Failed to delete shortened URL.");
     }
 
-    public async Task<ShortUrl?> GetByPath(string path)
+    public async Task<ShortUrl?> Get(string path)
     {
-        if (await Exists(path) == false)
-            throw new Exception($"Shortened URL with path '{path}' does not exist.");
-
         var redisValue = await redisDatabase.StringGetAsync(path);
         if (redisValue.IsNullOrEmpty)
             return null;

UrlShortener.Data/ShortUrlValidator.cs

@@ -5,7 +5,7 @@ namespace UrlShortener.Data;
 public static class ShortUrlValidator
 {
     private static readonly Regex PathRegex = new Regex(
-        "^[a-zA-Z0-9_]*$",
+        "^[a-zA-Z0-9_-]*$",
         RegexOptions.None,
         TimeSpan.FromMilliseconds(1)
     );
@@ -71,7 +71,7 @@ public static bool ValidatePath(string? path, out string[] validationResults)
             validationResultsList.Add("Path cannot be longer than 10 characters.");
 
         if (!PathRegex.IsMatch(path))
-            validationResultsList.Add("Path can only contain alphanumeric characters and underscores.");
+            validationResultsList.Add("Path can only contain alphanumeric characters, underscores, and dashes.");
 
         validationResults = validationResultsList.ToArray();
         return validationResultsList.Count > 0;

UrlShortener.Forwarder/Program.cs

@@ -3,8 +3,8 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-var connectionString = builder.Configuration.GetConnectionString("UrlsDb")
-            ?? throw new Exception("Missing 'UrlsDb' connection string");
+var connectionString = builder.Configuration.GetConnectionString("ShortenedUrlsDb")
+            ?? throw new Exception("Missing 'ShortenedUrlsDb' connection string");
 var redisConnection = await ConnectionMultiplexer.ConnectAsync(connectionString);
 builder.Services.AddSingleton(redisConnection);
 builder.Services.AddTransient<ShortUrlRepository>();
@@ -19,7 +19,7 @@ ShortUrlRepository shortUrlRepository
     if(ShortUrlValidator.ValidatePath(path, out _))
         return Results.BadRequest();
 
-    var shortUrl = await shortUrlRepository.GetByPath(path);
+    var shortUrl = await shortUrlRepository.Get(path);
     if (shortUrl == null || string.IsNullOrEmpty(shortUrl.Destination))
         return Results.NotFound();
 

UrlShortener.Forwarder/UrlShortener.Forwarder.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>7662012d-f58c-4d03-9218-e470bde971a6</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

UrlShortener.Forwarder/appsettings.Development.json

@@ -6,6 +6,6 @@
     }
   },
   "ConnectionStrings": {
-    "UrlsDb": "localhost"
+    "ShortenedUrlsDb": "localhost"
   }
 }

UrlShortener.Forwarder/appsettings.json

@@ -7,6 +7,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "UrlsDb": "[USE_SECRETS_OR_ENV_OR_VAULT]"
+    "ShortenedUrlsDb": "[USE_SECRETS_OR_ENV_OR_VAULT]"
   }
 }