wip

Author: stusherwin

TeachingRecordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Mappings/UserMapping.cs

@@ -46,7 +46,6 @@ public void Configure(EntityTypeBuilder<ApplicationUser> builder)
         builder.HasIndex(e => e.OneLoginAuthenticationSchemeName).IsUnique().HasDatabaseName(ApplicationUser.OneLoginAuthenticationSchemeNameUniqueIndexName)
             .HasFilter("one_login_authentication_scheme_name is not null");
         builder.HasIndex(e => e.ClientId).IsUnique().HasDatabaseName(ApplicationUser.ClientIdUniqueIndexName).HasFilter("client_id is not null");
-        builder.Property(e => e.ShortName).HasMaxLength(ApplicationUser.ShortNameMaxLength);
 
         builder.HasData(new ApplicationUser { UserId = ApplicationUser.NpqApplicationUserGuid, Name = "NPQ", Active = true });
     }

TeachingRecordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Migrations/20251127113103_RemoveApplicationUserShortName.Designer.cs

@@ -0,0 +1,37 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TeachingRecordSystem.Core.DataStore.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class RemoveApplicationUserShortName : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "short_name",
+                table: "users");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "short_name",
+                table: "users",
+                type: "character varying(25)",
+                maxLength: 25,
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "users",
+                keyColumn: "user_id",
+                keyValue: new Guid("0f18f1ec-a102-4023-843f-1cadef3e6e14"),
+                column: "short_name",
+                value: null);
+        }
+    }
+}

TeachingRecordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Migrations/20251127113103_RemoveApplicationUserShortName.cs

@@ -20764,11 +20764,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("varchar[]")
                         .HasColumnName("redirect_uris");
 
-                    b.Property<string>("ShortName")
-                        .HasMaxLength(25)
-                        .HasColumnType("character varying(25)")
-                        .HasColumnName("short_name");
-
                     b.HasIndex("ClientId")
                         .IsUnique()
                         .HasDatabaseName("ix_users_client_id")

TeachingRecordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Migrations/TrsDbContextModelSnapshot.cs

@@ -35,7 +35,6 @@ public class ApplicationUser : UserBase
     public const int ClientSecretMaxLength = 200;
     public const int ClientSecretMinLength = 16;
     public const int OneLoginClientIdMaxLength = 50;
-    public const int ShortNameMaxLength = 25;
     public const string NameUniqueIndexName = "ix_users_application_user_name";
     public const string ClientIdUniqueIndexName = "ix_users_client_id";
     public const string OneLoginAuthenticationSchemeNameUniqueIndexName = "ix_users_one_login_authentication_scheme_name";
@@ -55,7 +54,6 @@ public class ApplicationUser : UserBase
     public string? OneLoginAuthenticationSchemeName { get; set; }
     public string? OneLoginRedirectUriPath { get; set; }
     public string? OneLoginPostLogoutRedirectUriPath { get; set; }
-    public string? ShortName { get; set; }
 
     [MemberNotNull(
         nameof(OneLoginClientId),

TeachingRecordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Models/User.cs

@@ -23,6 +23,5 @@ public enum ApplicationUserUpdatedEventChanges
     ClientId = 1 << 8,
     ClientSecret = 1 << 9,
     RedirectUris = 1 << 10,
-    PostLogoutRedirectUris = 1 << 11,
-    ShortName = 1 << 12
+    PostLogoutRedirectUris = 1 << 11
 }

TeachingRecordSystem/src/TeachingRecordSystem.Core/Events/Legacy/ApplicationUserUpdatedEvent.cs

@@ -15,7 +15,6 @@ public record ApplicationUser
     public string? OneLoginAuthenticationSchemeName { get; init; }
     public string? OneLoginRedirectUriPath { get; init; }
     public string? OneLoginPostLogoutRedirectUriPath { get; init; }
-    public string? ShortName { get; init; }
 
     public static ApplicationUser FromModel(DataStore.Postgres.Models.ApplicationUser user) => new()
     {
@@ -32,6 +31,5 @@ public record ApplicationUser
         OneLoginAuthenticationSchemeName = user.OneLoginAuthenticationSchemeName,
         OneLoginRedirectUriPath = user.OneLoginRedirectUriPath,
         OneLoginPostLogoutRedirectUriPath = user.OneLoginPostLogoutRedirectUriPath,
-        ShortName = user.ShortName
     };
 }

TeachingRecordSystem/src/TeachingRecordSystem.Core/Events/Models/ApplicationUser.cs

@@ -0,0 +1,2 @@
+alter table trs_users drop column short_name
+

TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0100_RemoveUserShortName.sql

@@ -117,6 +117,7 @@
     <None Remove="Services\DqtReporting\Migrations\0093_RemoveITRPersonForeignKey.sql" />
     <None Remove="Services\DqtReporting\Migrations\0098_RemoveITRForeignKey.sql" />
     <None Remove="Services\DqtReporting\Migrations\0099_Users.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0100_RemoveUserShortName.sql" />
   </ItemGroup>
 
   <ItemGroup>
@@ -256,6 +257,7 @@
     <EmbeddedResource Include="Services\DqtReporting\Migrations\0091_InsertRouteToProfessionalTypeData.sql" />
     <EmbeddedResource Include="Services\DqtReporting\Migrations\0092_Processes.sql" />
     <EmbeddedResource Include="Services\DqtReporting\Migrations\0093_RemoveITRPersonForeignKey.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0100_RemoveUserShortName.sql" />
     <EmbeddedResource Include="Services\DqtReporting\Migrations\0094_SupportTasksDeletedOn.sql" />
     <EmbeddedResource Include="Services\DqtReporting\Migrations\0095_IntegrationTransactionWarningCount.sql" />
     <EmbeddedResource Include="Services\DqtReporting\Migrations\0096_TrnRequestMetadata.sql" />

TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj

@@ -17,10 +17,6 @@
                 <govuk-input-label class="govuk-label--m">Name</govuk-input-label>
             </govuk-input>
 
-            <govuk-input for="ShortName" input-class="govuk-input--width-10">
-                <govuk-input-label class="govuk-label--m">Short name</govuk-input-label>
-            </govuk-input>
-
             <govuk-button type="submit">Save</govuk-button>
         </form>
     </div>