Merge pull request #1315 from ucdavis/JCS/Pronouns

Pronoun Support
ucdavis · Sep 22, 2023 · a12c4e5 · a12c4e5
2 parents 8235045 + f6b2e97
commit a12c4e5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/Keas.Core/Domain/User.cs b/Keas.Core/Domain/User.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
@@ -34,9 +34,12 @@ public string Name {
         [Required]
         [StringLength(256)]
         [EmailAddress]
-        public string Email { get; set; }
+        public string Email { get; set; }
+
+        [StringLength(50)]
+        public string Pronouns { get; set; }
 
         public List<Person> People { get; set; }
         public List<TeamPermission> TeamPermissions { get; set; }
     }
-}
+}
diff --git a/Keas.Core/Services/IUpdateFromIamService.cs b/Keas.Core/Services/IUpdateFromIamService.cs
@@ -58,13 +58,13 @@ public async Task<int> UpdateUsersFromLastModifiedDateInIam(DateTime modifiedAft
                             //Possible to get null data back for a user. Probably because they are going away
                             if (ietData != null && !string.IsNullOrWhiteSpace(ietData.DFirstName) && !string.IsNullOrWhiteSpace(ietData.DLastName))
                             {
-                                if (user.FirstName != ietData.DFirstName || user.LastName != ietData.DLastName)
+                                if (user.FirstName != ietData.DFirstName || user.LastName != ietData.DLastName || user.Pronouns != ietData.DPronouns)
                                 {
                                     count++;
                                     batchCount++;
                                     user.FirstName = ietData.DFirstName;
                                     user.LastName = ietData.DLastName;
-                                    //user.pronouns = ietData.DPronouns; //if we add pronouns
+                                    user.Pronouns = ietData.DPronouns;
                                     foreach (var person in user.People)
                                     {
                                         person.FirstName = ietData.DFirstName;
@@ -126,13 +126,13 @@ public async Task<int> UpdateAllUsersFromIam()
                             continue;
                         }
 
-                        if (user.FirstName != ietData.DFirstName || user.LastName != ietData.DLastName)
+                        if (user.FirstName != ietData.DFirstName || user.LastName != ietData.DLastName || user.Pronouns != ietData.DPronouns)
                         {
                             count++;
                             batchCount++;
                             user.FirstName = ietData.DFirstName;
                             user.LastName = ietData.DLastName;
-                            //user.pronouns = ietData.DPronouns; //if we add pronouns
+                            user.Pronouns = ietData.DPronouns;
                             foreach (var person in user.People)
                             {
                                 person.FirstName = ietData.DFirstName;

diff --git a/Keas.Mvc/Services/IdentityService.cs b/Keas.Mvc/Services/IdentityService.cs
@@ -172,7 +172,8 @@ private User CreateUser(string email, KerberosResult ucdKerbPerson, string iamId
                 LastName = ucdKerbPerson.LastName,
                 Id = ucdKerbPerson.UserId,
                 Email = email,
-                Iam = iamId
+                Iam = iamId,
+                Pronouns = ucdKerbPerson.DPronouns
             };
             return user;
         }

diff --git a/Keas.Sql/dbo/Tables/Users.sql b/Keas.Sql/dbo/Tables/Users.sql
@@ -1,9 +1,10 @@
-CREATE TABLE [dbo].[Users] (
+CREATE TABLE [dbo].[Users] (
     [Id]        NVARCHAR (450) NOT NULL,
     [Iam]       NVARCHAR (450) NULL,
     [Email]     NVARCHAR (256) NOT NULL,
     [FirstName] NVARCHAR (50)  NOT NULL,
     [LastName]  NVARCHAR (50)  NOT NULL,
+    [Pronouns] NVARCHAR(50) NULL, 
     CONSTRAINT [PK_Users] PRIMARY KEY CLUSTERED ([Id] ASC)
 );
 

diff --git a/Test/TestsDatabase/UserTests.cs b/Test/TestsDatabase/UserTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -96,6 +96,10 @@ public void TestDatabaseFieldAttributes()
                 "[System.ComponentModel.DataAnnotations.StringLengthAttribute((Int32)256)]"
             }));
             expectedFields.Add(new NameAndType("People", "System.Collections.Generic.List`1[Keas.Core.Domain.Person]", new List<string>()));
+            expectedFields.Add(new NameAndType("Pronouns", "System.String", new List<string>
+            {
+                "[System.ComponentModel.DataAnnotations.StringLengthAttribute((Int32)50)]"
+            }));
             expectedFields.Add(new NameAndType("TeamPermissions", "System.Collections.Generic.List`1[Keas.Core.Domain.TeamPermission]", new List<string>()));