Version 4.1 (#569)

* update packages

* Import data From UI (#554)

* Add URL and Click Stats import functionality with CSV support

* Checks if URL is archived before redirecting. (#561) Co-authored-by: Frank Boucher

* Feature/562 url filter (#565)

* Adds vanity URL filtering to the URL manager

* Adds title filtering to URL manager

* Adds CreatedDate to ShortUrlEntity (#567)


---------

Co-authored-by: Frank

* Fix SLN file removing extra line. Update build workflow and improve Help page content

- Added a step to clean up previous builds in the GitHub Actions workflow.
- Revised Help page content to clarify tool functionality and provide links to GitHub issues and discussions.
- Simplified Home page welcome message for clarity.

---------

Author: fboucher

.github/copilot-instructions.md

@@ -0,0 +1 @@
+- @azure Rule - Use Azure Best Practices: When generating code for Azure, running terminal commands for Azure, or performing operations related to Azure, invoke your `azure_development-get_best_practices` tool if available.

doc/how-to-migrate-data.md

@@ -1,6 +1,8 @@
 # How to migrate your data
 
-The easiest way to migrate your data between account or from an ealier version of AzUrlShortener is to use the **Azure Storage Explorer** to export the data as a CSV files and then import it into the new account or version.
+
+The easiest way to migrate your data between account or from an ealier version of AzUrlShortener is to use the **Azure Storage Explorer** to export the data as a CSV files and use the TinyBlazorAdmin to import the files .
+
 
 Azure Storage Explorer is a free tool to manage your Azure cloud storage resources (aka your short URLs) from your desktop. It’s a cross-platform and can be downloaded [here](https://azure.microsoft.com/en-us/products/storage/storage-explorer/). 
 
@@ -9,3 +11,6 @@ In the resources deployed to Azure there will be 2 storage accounts. One for the
 You need to expot to CSV the following tables:
 - UrlsDetails: This table contains the details of the short URLs, including the original URL, the short URL, schedules, etc.
 - ClickStats: This table contains the clicks informations.
+
+
+To import the data use the Import button in the Settings page.

src/Api/ShortenerEnpoints.cs

@@ -41,6 +41,14 @@ public static void MapShortenerEnpoints(this IEndpointRouteBuilder app)
             .WithDescription("Provide Click Statistics by Day")
             .WithDisplayName("Url Click Statistics By Day");
 
+        endpoints.MapPost("/UrlDataImport", UrlDataImport)
+            .WithDescription("Import Urls from a CSV file")
+            .WithDisplayName("Url Data Import");
+
+        endpoints.MapPost("/UrlClickStatsImport", UrlClickStatsImport)
+            .WithDescription("Import Click Statistics from a CSV file")
+            .WithDisplayName("Url Click Statistics Import");
+
     }
 
     static private string GetWelcomeMessage()
@@ -182,5 +190,46 @@ private static string GetHost(HttpContext context)
         return host ?? string.Empty;
     }
 
+
+    static private async Task<Results<
+									Ok,
+									InternalServerError<DetailedBadRequest>>>
+									UrlDataImport(UrlDetails data,
+													TableServiceClient tblClient,
+													ILogger logger)
+	{
+		try
+		{
+			var urlServices = new UrlServices(logger, new AzStrorageTablesService(tblClient));
+			await urlServices.ImportUrlDataAsync(data);
+			return TypedResults.Ok();
+		}
+		catch (Exception ex)
+		{
+			logger.LogError(ex.Message);
+			return TypedResults.InternalServerError<DetailedBadRequest>(new DetailedBadRequest { Message = ex.Message });
+		}
+	}
+
+	static private async Task<Results<
+									Ok,
+									InternalServerError<DetailedBadRequest>>>
+									UrlClickStatsImport(List<ClickStatsEntity> lstClickStats,
+												TableServiceClient tblClient,
+												ILogger logger)
+	{
+		try
+		{
+			var urlServices = new UrlServices(logger, new AzStrorageTablesService(tblClient));
+			await urlServices.ImportClickStatsAsync(lstClickStats);
+			return TypedResults.Ok();
+		}
+		catch (Exception ex)
+		{
+			logger.LogError(ex.Message);
+			return TypedResults.InternalServerError<DetailedBadRequest>(new DetailedBadRequest { Message = ex.Message });
+		}
+	}
+
 }
 

src/AppHost/appsettings.json

@@ -5,5 +5,10 @@
       "Microsoft.AspNetCore": "Warning",
       "Aspire.Hosting.Dcp": "Warning"
     }
+  },
+  "Parameters":{
+    "CustomDomain": "https://c5m.ca",
+    "DefaultRedirectUrl": "https://azure.com"
+
   }
 }

src/AzUrlShortener.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59

src/Core/Cloud5mins.ShortenerTools.Core.csproj

@@ -8,5 +8,8 @@
     <PackageReference Include="Aspire.Azure.Data.Tables" Version="9.1.0" />
     <PackageReference Include="cronos" Version="0.9.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
+
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+
   </ItemGroup>
 </Project>

src/Core/Domain/ImportUrlData.cs

@@ -0,0 +1,14 @@
+namespace Cloud5mins.ShortenerTools.Core.Domain
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+
+    public class UrlDetails
+    {
+        public required NextId NextId { get; set; }
+        public required List<ShortUrlEntity> LstShortUrlEntity { get; set; }
+    }
+}

src/Core/Domain/ShortUrlEntity.cs

@@ -2,6 +2,9 @@
 using Azure.Data.Tables;
 using System.Runtime.Serialization;
 using System.Text.Json;
+using Azure;
+using Azure.Data.Tables;
+
 
 namespace Cloud5mins.ShortenerTools.Core.Domain
 {
@@ -62,6 +65,9 @@ public List<Schedule> Schedules
         public DateTimeOffset? Timestamp { get; set; }
         public ETag ETag { get; set; }
 
+        public string CreatedDate { get; set; }
+
+
 
         public ShortUrlEntity() { }
 
@@ -88,6 +94,7 @@ private void Initialize(string longUrl, string endUrl, string title, Schedule[]
             Title = title;
             Clicks = 0;
             IsArchived = false;
+            CreatedDate = DateTime.UtcNow.ToString("yyyy-MM-dd");
 
             if (schedules?.Length > 0)
             {
@@ -96,17 +103,19 @@ private void Initialize(string longUrl, string endUrl, string title, Schedule[]
             }
         }
 
-        public static ShortUrlEntity GetEntity(string longUrl, string endUrl, string title, Schedule[] schedules)
-        {
-            return new ShortUrlEntity
-            {
-                PartitionKey = endUrl.First().ToString(),
-                RowKey = endUrl,
-                Url = longUrl,
-                Title = title,
-                Schedules = schedules.ToList<Schedule>()
-            };
-        }
+
+        // public static ShortUrlEntity GetEntity(string longUrl, string endUrl, string title, Schedule[] schedules)
+        // {
+        //     return new ShortUrlEntity
+        //     {
+        //         PartitionKey = endUrl.First().ToString(),
+        //         RowKey = endUrl,
+        //         Url = longUrl,
+        //         Title = title,
+        //         Schedules = schedules.ToList<Schedule>()
+        //     };
+        // }
+
 
         private string GetActiveUrl()
         {

src/Core/Messages/ShortUrlRequest.cs

@@ -1,4 +1,6 @@
 using Cloud5mins.ShortenerTools.Core.Domain;
+using System.ComponentModel;
+
 using System.ComponentModel.DataAnnotations;
 
 namespace Cloud5mins.ShortenerTools.Core.Messages

src/Core/Messages/UrlClickStatsRequest.cs

@@ -3,10 +3,14 @@ namespace Cloud5mins.ShortenerTools.Core.Messages
     public class UrlClickStatsRequest
     {
         public string Vanity { get; set; }
+        public string StartDate { get; set; }
+        public string EndDate { get; set; }
 
-        public UrlClickStatsRequest(string vanity)
+        public UrlClickStatsRequest(string vanity, string startDate, string endDate)
         {
             Vanity = vanity;
+            StartDate = startDate;
+            EndDate = endDate;
         }
     }
 }