diff --git a/server/StrDss.Data/Entities/DssDbContext.cs b/server/StrDss.Data/Entities/DssDbContext.cs index 5a35c158..d601402f 100644 --- a/server/StrDss.Data/Entities/DssDbContext.cs +++ b/server/StrDss.Data/Entities/DssDbContext.cs @@ -730,6 +730,15 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasColumnName("secondary_takedown_request_contact_email"); entity.Property(e => e.SecondaryTakedownRequestContactId).HasColumnName("secondary_takedown_request_contact_id"); entity.Property(e => e.UpdDtm).HasColumnName("upd_dtm"); + entity.Property(e => e.UpdUserDisplayNm) + .HasMaxLength(250) + .HasColumnName("upd_user_display_nm"); + entity.Property(e => e.UpdUserFamilyNm) + .HasMaxLength(250) + .HasColumnName("upd_user_family_nm"); + entity.Property(e => e.UpdUserGivenNm) + .HasMaxLength(250) + .HasColumnName("upd_user_given_nm"); entity.Property(e => e.UpdUserGuid).HasColumnName("upd_user_guid"); }); @@ -1268,6 +1277,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasMaxLength(320) .HasComment("E-mail address associated with the user by the identity provider") .HasColumnName("email_address_dsc"); + entity.Property(e => e.ExternalIdentityCd) + .HasMaxLength(100) + .HasComment("A non-guid unique identifier assigned by the identity provider") + .HasColumnName("external_identity_cd"); entity.Property(e => e.FamilyNm) .HasMaxLength(25) .HasComment("A name that is often shared amongst members of the same family (commonly known as a surname within some cultures)") diff --git a/server/StrDss.Data/Entities/DssPlatformVw.cs b/server/StrDss.Data/Entities/DssPlatformVw.cs index 4d580643..34248027 100644 --- a/server/StrDss.Data/Entities/DssPlatformVw.cs +++ b/server/StrDss.Data/Entities/DssPlatformVw.cs @@ -25,6 +25,12 @@ public partial class DssPlatformVw public Guid? UpdUserGuid { get; set; } + public string? UpdUserDisplayNm { get; set; } + + public string? UpdUserGivenNm { get; set; } + + public string? UpdUserFamilyNm { get; set; } + public long? PrimaryNoticeOfTakedownContactId { get; set; } public string? PrimaryNoticeOfTakedownContactEmail { get; set; } diff --git a/server/StrDss.Data/Entities/DssUserIdentity.cs b/server/StrDss.Data/Entities/DssUserIdentity.cs index 31d82a26..663b6d15 100644 --- a/server/StrDss.Data/Entities/DssUserIdentity.cs +++ b/server/StrDss.Data/Entities/DssUserIdentity.cs @@ -88,6 +88,11 @@ public partial class DssUserIdentity /// public Guid? UpdUserGuid { get; set; } + /// + /// A non-guid unique identifier assigned by the identity provider + /// + public string? ExternalIdentityCd { get; set; } + public virtual DssAccessRequestStatus AccessRequestStatusCdNavigation { get; set; } = null!; public virtual ICollection DssEmailMessageAffectedByUserIdentities { get; set; } = new List(); diff --git a/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs index a963a1e1..9d69e736 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs @@ -13,11 +13,10 @@ public PlatformViewDto() public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } public Guid? UpdUserGuid { get; set; } - //TODO: Add FullName to Platformvw. Remove default value below after Leif Updates the view to include "Full Name". - public string UpdUserNm { get; } = "Richard Anderson"; - - //TODO: Add ManagingOrganizationID to PlatFormvw. Comment in line below when completed - //public long ManagingOrganizationId { get; set; } + public string? UpdUserDisplayNm { get; set; } + public string? UpdUserGivenNm { get; set; } + public string? UpdUserFamilyNm { get; set; } + public long? ManagingOrganizationId { get; set; } public long? PrimaryNoticeOfTakedownContactId { get; set; } public string? PrimaryNoticeOfTakedownContactEmail { get; set; } public long? PrimaryTakedownRequestContactId { get; set; } diff --git a/server/StrDss.Model/UserDtos/UserCreateDto.cs b/server/StrDss.Model/UserDtos/UserCreateDto.cs index dd958ae1..cdebff93 100644 --- a/server/StrDss.Model/UserDtos/UserCreateDto.cs +++ b/server/StrDss.Model/UserDtos/UserCreateDto.cs @@ -3,7 +3,7 @@ public class UserCreateDto { public Guid UserGuid { get; set; } - + public string? ExternalIdentityCd { get; set; } public string DisplayNm { get; set; } = null!; public string IdentityProviderNm { get; set; } = null!; diff --git a/server/StrDss.Model/UserDtos/UserDto.cs b/server/StrDss.Model/UserDtos/UserDto.cs index 8adf8c2f..54082a65 100644 --- a/server/StrDss.Model/UserDtos/UserDto.cs +++ b/server/StrDss.Model/UserDtos/UserDto.cs @@ -9,6 +9,7 @@ public class UserDto [JsonIgnore] public Guid UserGuid { get; set; } + public string? ExternalIdentityCd { get; set; } public string DisplayNm { get; set; } = null!;