Merge branch 'main' into v-next

Author: fboucher

doc/how-to-migrate-data.md

@@ -1,7 +1,9 @@
 # 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 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/). 
 
 In the resources deployed to Azure there will be 2 storage accounts. One for the redirect service (azfunc-light) and one acting as the data store. That last one is the one you want to use for the data migration. The name of that storage account should start wirh `urldata`. 
@@ -10,4 +12,5 @@ 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

@@ -42,12 +42,12 @@ public static void MapShortenerEnpoints(this IEndpointRouteBuilder app)
             .WithDisplayName("Url Click Statistics By Day");
 
         endpoints.MapPost("/UrlDataImport", UrlDataImport)
-			.WithDescription("Import Urls from a CSV file")
-			.WithDisplayName("Url Data Import");
+            .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");
+        endpoints.MapPost("/UrlClickStatsImport", UrlClickStatsImport)
+            .WithDescription("Import Click Statistics from a CSV file")
+            .WithDisplayName("Url Click Statistics Import");
 
     }
 

src/AppHost/appsettings.json

@@ -9,5 +9,6 @@
   "Parameters":{
     "CustomDomain": "https://c5m.ca",
     "DefaultRedirectUrl": "https://azure.com"
+
   }
 }

src/AzUrlShortener.sln

@@ -1,4 +1,5 @@
 
+
 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,6 +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/ShortUrlEntity.cs

@@ -5,6 +5,7 @@
 using Azure;
 using Azure.Data.Tables;
 
+
 namespace Cloud5mins.ShortenerTools.Core.Domain
 {
     public class ShortUrlEntity : ITableEntity
@@ -63,9 +64,11 @@ public List<Schedule> Schedules
         public string RowKey { get; set; }
         public DateTimeOffset? Timestamp { get; set; }
         public ETag ETag { get; set; }
+
         public string CreatedDate { get; set; }
 
 
+
         public ShortUrlEntity() { }
 
         public ShortUrlEntity(string longUrl, string endUrl)
@@ -100,6 +103,7 @@ 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
@@ -112,6 +116,7 @@ private void Initialize(string longUrl, string endUrl, string title, Schedule[]
         //     };
         // }
 
+
         private string GetActiveUrl()
         {
             if (Schedules != null)

src/Core/Messages/ShortUrlRequest.cs

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

src/Core/Service/AzStrorageTablesService.cs

@@ -2,6 +2,7 @@
 using Azure.Data.Tables;
 using Cloud5mins.ShortenerTools.Core.Domain;
 using System.Globalization;
+
 using System.Text.Json;
 
 namespace Cloud5mins.ShortenerTools.Core.Service;
@@ -153,6 +154,7 @@ public async Task<ShortUrlEntity> ArchiveShortUrlEntity(ShortUrlEntity urlEntity
     }
 
 
+
     public async Task<List<ClickStatsEntity>> GetAllStatsByVanity(string vanity, string startDate, string endDate)
     {
         var tblStats = GetStatsTable();
@@ -196,6 +198,7 @@ public async Task SaveClickStatsEntity(ClickStatsEntity newStats)
         var result = await GetStatsTable().UpsertEntityAsync(newStats);
     }
 
+
     public async Task ImportUrlDataAsync(UrlDetails urlData)
     {
         try

src/Core/Service/Utility.cs

@@ -1,3 +1,4 @@
+
 using Cloud5mins.ShortenerTools.Core.Domain;
 using Cloud5mins.ShortenerTools.Core.Service;
 using System.Security.Cryptography;

src/TinyBlazorAdmin/Components/Pages/Settings.razor

@@ -2,6 +2,7 @@
 
 @using Microsoft.FluentUI.AspNetCore.Components.Extensions
 @using Cloud5mins.ShortenerTools.TinyBlazorAdmin.Components.Shared
+
 @inject ILogger<Settings> Logger
 
 @rendermode InteractiveServer
@@ -31,6 +32,7 @@
 	</FluentStack>
 </div>
 
+
 <div style="padding-top:30px;">
     <ImportData />
 </div>