Fix the properties on UserMergedMessage - they were backwards (#787)

DFE-Digital · Mar 7, 2024 · f3709f8 · f3709f8
1 parent eaab6df
commit f3709f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Notifications/Messages/UserMergedMessage.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Notifications/Messages/UserMergedMessage.cs
@@ -5,5 +5,5 @@ public record UserMergedMessage : INotificationMessage
     public const string MessageTypeName = "UserMerged";
 
     public required Guid MergedUserId { get; init; }
-    public required User MasterUser { get; init; }
+    public required Guid MasterUserId { get; init; }
 }
diff --git a/...hserver/src/TeacherIdentity.AuthServer/Notifications/PublishNotificationsEventObserver.cs b/...hserver/src/TeacherIdentity.AuthServer/Notifications/PublishNotificationsEventObserver.cs
@@ -74,8 +74,8 @@ private static IEnumerable<NotificationEnvelope> GetNotificationsForEvent(EventB
                 NotificationId = Guid.NewGuid(),
                 Message = new UserMergedMessage()
                 {
-                    MasterUser = userMerged.User,
-                    MergedUserId = userMerged.MergedWithUserId
+                    MasterUserId = userMerged.MergedWithUserId,
+                    MergedUserId = userMerged.User.UserId
                 },
                 MessageType = UserMergedMessage.MessageTypeName,
                 TimeUtc = userMerged.CreatedUtc

diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/WebHooks/WebHooksEndToEndTests.cs b/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/WebHooks/WebHooksEndToEndTests.cs
@@ -381,7 +381,7 @@ public async Task UserMerged_WhenPublished_IsOnlySentToWebHookEndpointsWhichSubs
             NotificationId = Guid.NewGuid(),
             Message = new UserMergedMessage()
             {
-                MasterUser = user,
+                MasterUserId = user.UserId,
                 MergedUserId = mergedUserId
             },
             MessageType = UserMergedMessage.MessageTypeName,
@@ -408,19 +408,7 @@ public async Task UserMerged_WhenPublished_IsOnlySentToWebHookEndpointsWhichSubs
                     notificationId = userCreatedNotification.NotificationId,
                     message = new
                     {
-                        masterUser = new
-                        {
-                            userId = user.UserId,
-                            dateOfBirth = user.DateOfBirth,
-                            emailAddress = user.EmailAddress,
-                            firstName = user.FirstName,
-                            middleName = user.MiddleName,
-                            lastName = user.LastName,
-                            preferredName = user.PreferredName,
-                            mobileNumber = user.MobileNumber,
-                            trn = user.Trn,
-                            trnLookupStatus = user.TrnLookupStatus.ToString()
-                        },
+                        masterUserId = user.UserId,
                         mergedUserId = mergedUserId
                     },
                     messageType = UserMergedMessage.MessageTypeName,