optimize last validation timestamp

nager · Jan 2, 2024 · 95d1912 · 95d1912
1 parent da1a999
commit 95d1912
Show file tree

Hide file tree

Showing 10 changed files with 180 additions and 41 deletions.
diff --git a/...Service.MssqlRepository/Migrations/20240102204018_OptimizeValidationTimestamp.Designer.cs b/...Service.MssqlRepository/Migrations/20240102204018_OptimizeValidationTimestamp.Designer.cs
diff --git a/...nticationService.MssqlRepository/Migrations/20240102204018_OptimizeValidationTimestamp.cs b/...nticationService.MssqlRepository/Migrations/20240102204018_OptimizeValidationTimestamp.cs
@@ -0,0 +1,60 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Nager.AuthenticationService.MssqlRepository.Migrations
+{
+    /// <inheritdoc />
+    public partial class OptimizeValidationTimestamp : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LastValidationTimestamp",
+                table: "Users");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "LastSuccessfulValidationTimestamp",
+                table: "Users",
+                type: "datetime2",
+                nullable: true,
+                oldClrType: typeof(DateTime),
+                oldType: "datetime2");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastFailedValidationTimestamp",
+                table: "Users",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.Sql("UPDATE Users SET LastSuccessfulValidationTimestamp = NULL");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LastFailedValidationTimestamp",
+                table: "Users");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "LastSuccessfulValidationTimestamp",
+                table: "Users",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                oldClrType: typeof(DateTime),
+                oldType: "datetime2",
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastValidationTimestamp",
+                table: "Users",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+        }
+    }
+}
diff --git a/...nd/Nager.AuthenticationService.MssqlRepository/Migrations/DatabaseContextModelSnapshot.cs b/...nd/Nager.AuthenticationService.MssqlRepository/Migrations/DatabaseContextModelSnapshot.cs
@@ -37,10 +37,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(200)
                         .HasColumnType("nvarchar(200)");
 
-                    b.Property<DateTime>("LastSuccessfulValidationTimestamp")
+                    b.Property<DateTime?>("LastFailedValidationTimestamp")
                         .HasColumnType("datetime2");
 
-                    b.Property<DateTime>("LastValidationTimestamp")
+                    b.Property<DateTime?>("LastSuccessfulValidationTimestamp")
                         .HasColumnType("datetime2");
 
                     b.Property<string>("Lastname")

diff --git a/src/Backend/Nager.AuthenticationService.MssqlRepository/MssqlUserRepository.cs b/src/Backend/Nager.AuthenticationService.MssqlRepository/MssqlUserRepository.cs
@@ -94,7 +94,7 @@ public async Task<bool> SetLastValidationTimestampAsync(
         {
             var updatedRows = await this._databaseContext.Users
                 .Where(predicate)
-                .ExecuteUpdateAsync(s => s.SetProperty(e => e.LastValidationTimestamp, DateTime.UtcNow), cancellationToken);
+                .ExecuteUpdateAsync(s => s.SetProperty(e => e.LastFailedValidationTimestamp, DateTime.UtcNow), cancellationToken);
 
             return updatedRows > 0;
         }

diff --git a/....AuthenticationService.MssqlRepository/Nager.AuthenticationService.MssqlRepository.csproj b/....AuthenticationService.MssqlRepository/Nager.AuthenticationService.MssqlRepository.csproj
@@ -13,7 +13,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
-    <PackageReference Include="Nager.Authentication.Abstraction" Version="1.1.0" />
+    <PackageReference Include="Nager.Authentication.Abstraction" Version="1.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Backend/Nager.AuthenticationService.WebApi/MigrationHelper.cs b/src/Backend/Nager.AuthenticationService.WebApi/MigrationHelper.cs
@@ -3,11 +3,19 @@
 
 namespace Nager.AuthenticationService.WebApi
 {
+    /// <summary>
+    /// MigrationHelper
+    /// </summary>
     public class MigrationHelper
     {
         private readonly ILogger<MigrationHelper> _logger;
         private readonly IServiceScopeFactory _serviceScopeFactory;
 
+        /// <summary>
+        /// MigrationHelper
+        /// </summary>
+        /// <param name="logger"></param>
+        /// <param name="serviceScopeFactory"></param>
         public MigrationHelper(
             ILogger<MigrationHelper> logger,
             IServiceScopeFactory serviceScopeFactory)
@@ -16,6 +24,10 @@ public MigrationHelper(
             this._serviceScopeFactory = serviceScopeFactory;
         }
 
+        /// <summary>
+        /// Update the database structure
+        /// </summary>
+        /// <returns></returns>
         public async Task<bool> UpdateDatabaseAsync()
         {
             var retryCount = 60;

diff --git a/src/Backend/Nager.AuthenticationService.WebApi/Nager.AuthenticationService.WebApi.csproj b/src/Backend/Nager.AuthenticationService.WebApi/Nager.AuthenticationService.WebApi.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Nager.Authentication.AspNet" Version="1.1.1" />
+    <PackageReference Include="Nager.Authentication.AspNet" Version="1.2.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

diff --git a/src/Backend/Nager.AuthenticationService.WebApi/Program.cs b/src/Backend/Nager.AuthenticationService.WebApi/Program.cs
@@ -47,7 +47,7 @@
 {
     var issuer = builder.Configuration["Authentication:Tokens:Issuer"];
     var audience = builder.Configuration["Authentication:Tokens:Audience"];
-    var signingKey = builder.Configuration["Authentication:Tokens:SigningKey"];
+    var signingKey = builder.Configuration["Authentication:Tokens:SigningKey"] ?? throw new NullReferenceException("Missing configuration for SigningKey");
 
     //configuration.RequireHttpsMetadata = false;
     configuration.SaveToken = true;
@@ -169,10 +169,7 @@
 app.UseAuthentication();
 app.UseAuthorization();
 
-app.UseEndpoints(endpoints =>
-{
-    endpoints.MapControllers();
-    endpoints.MapFallbackToFile("index.html");
-});
+app.MapFallbackToFile("index.html");
+app.MapControllers();
 
 app.Run();
diff --git a/src/Backend/Nager.AuthenticationService.WebApi/Properties/launchSettings.json b/src/Backend/Nager.AuthenticationService.WebApi/Properties/launchSettings.json
@@ -1,14 +1,6 @@
 {
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Nager.AuthenticationService..WebApi": {
+    "Nager.AuthenticationService.WebApi": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
@@ -18,13 +10,5 @@
       "applicationUrl": "http://localhost:5234"
     }
   },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:60638",
-      "sslPort": 0
-    }
-  }
+  "$schema": "https://json.schemastore.org/launchsettings.json"
 }
diff --git a/src/Frontend/src/components/UserManagementList.vue b/src/Frontend/src/components/UserManagementList.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
-import { QTableProps, useQuasar } from 'quasar'
+import { QTableProps, useQuasar, date } from 'quasar'
 
 import { User } from 'src/models/User'
 
@@ -26,31 +26,42 @@ const columns : QTableProps['columns'] = [
     label: 'Email Address',
     align: 'left',
     field: row => row.emailAddress,
-    format: val => `${val}`
+    format: val => `${val}`,
+    style: 'width: 300px'
+  },
+  {
+    name: 'name',
+    required: true,
+    label: 'Name',
+    align: 'left',
+    field: row => row,
+    format: row => `${row.lastname} ${row.firstname}`,
+    style: 'width: 300px'
   },
   {
     name: 'roles',
     required: true,
     label: 'Roles',
     align: 'left',
-    field: row => row.roles,
-    format: val => `${val}`
+    field: row => row.roles
   },
   {
-    name: 'firstname',
+    name: 'lastFailedValidationTimestamp',
     required: true,
-    label: 'Firstname',
+    label: 'Last Failed Validation',
     align: 'left',
-    field: row => row.firstname,
-    format: val => `${val}`
+    field: row => row.lastValidationTimestamp,
+    format: val => date.formatDate(val, 'YYYY-MM-DD HH:mm'),
+    style: 'width: 180px'
   },
   {
-    name: 'lastname',
+    name: 'roles2',
     required: true,
-    label: 'Lastname',
+    label: 'Last Successful Validation',
     align: 'left',
-    field: row => row.lastname,
-    format: val => `${val}`
+    field: row => row.lastSuccessfulValidationTimestamp,
+    format: val => date.formatDate(val, 'YYYY-MM-DD HH:mm'),
+    style: 'width: 180px'
   },
   {
     name: 'actions',