Add user IDs to outbox messages

DFE-Digital · Feb 11, 2025 · ab7058d · ab7058d
1 parent 46bcfdd
commit ab7058d
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 64 deletions.
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Api/V2/Handlers/SetIttOutcomeHandler.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Api/V2/Handlers/SetIttOutcomeHandler.cs
@@ -46,6 +46,7 @@ public async Task<SetIttOutcomeResponse> Handle(SetIttOutcomeRequest request, Ca
             request.IttProviderUkprn,
             ittResult,
             request.AssessmentDate,
+            Core.DataStore.Postgres.Models.SystemUser.SystemUserId,
             request.SlugId);
 
         if (!result.Succeeded)

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/DataverseAdapter.CreateTeacher.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/DataverseAdapter.CreateTeacher.cs
@@ -283,7 +283,8 @@ public dfeta_TrsOutboxMessage CreateSetInductionOutboxMessage()
                 return serializer.CreateCrmOutboxMessage(new AddInductionExemptionMessage()
                 {
                     PersonId = TeacherId,
-                    ExemptionReasonId = exemptionReasonId!.Value
+                    ExemptionReasonId = exemptionReasonId!.Value,
+                    TrsUserId = _command.TrsUserId
                 });
             }
             else
@@ -292,7 +293,8 @@ public dfeta_TrsOutboxMessage CreateSetInductionOutboxMessage()
 
                 return serializer.CreateCrmOutboxMessage(new SetInductionRequiredToCompleteMessage()
                 {
-                    PersonId = TeacherId
+                    PersonId = TeacherId,
+                    TrsUserId = _command.TrsUserId
                 });
             }
         }

diff --git a/...RecordSystem/src/TeachingRecordSystem.Core/Dqt/DataverseAdapter.SetIttResultForTeacher.cs b/...RecordSystem/src/TeachingRecordSystem.Core/Dqt/DataverseAdapter.SetIttResultForTeacher.cs
@@ -15,9 +15,10 @@ public async Task<SetIttResultForTeacherResult> SetIttResultForTeacherAsync(
         string ittProviderUkprn,
         dfeta_ITTResult result,
         DateOnly? assessmentDate,
+        Guid trsUserId,
         string slugId = null)
     {
-        var (r, _) = await SetIttResultForTeacherImplAsync(teacherId, ittProviderUkprn, result, assessmentDate, slugId);
+        var (r, _) = await SetIttResultForTeacherImplAsync(teacherId, ittProviderUkprn, result, assessmentDate, trsUserId, slugId);
         return r;
     }
 
@@ -27,6 +28,7 @@ public async Task<SetIttResultForTeacherResult> SetIttResultForTeacherAsync(
         string ittProviderUkprn,
         dfeta_ITTResult result,
         DateOnly? assessmentDate,
+        Guid trsUserId,
         string slugId = null)
     {
         switch (result)
@@ -179,7 +181,8 @@ public async Task<SetIttResultForTeacherResult> SetIttResultForTeacherAsync(
                     var outboxMessage = messageSerializer.CreateCrmOutboxMessage(
                         new SetInductionRequiredToCompleteMessage()
                         {
-                            PersonId = teacherId
+                            PersonId = teacherId,
+                            TrsUserId = trsUserId
                         });
 
                     txnRequest.Requests.Add(new CreateRequest() { Target = outboxMessage });

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/IDataverseAdapter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/IDataverseAdapter.cs
@@ -64,6 +64,7 @@ Task<SetIttResultForTeacherResult> SetIttResultForTeacherAsync(
         string ittProviderUkprn,
         dfeta_ITTResult result,
         DateOnly? assessmentDate,
+        Guid trsUserId,
         string slugId = null);
 
     Task SetTsPersonIdAsync(Guid teacherId, string tsPersonId);

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Models/CreateTeacherCommand.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Models/CreateTeacherCommand.cs
@@ -27,6 +27,7 @@ public class CreateTeacherCommand
     public Guid ApplicationUserId { get; set; }
     public bool IdentityVerified { get; set; }
     public string OneLoginUserSubject { get; set; }
+    public Guid? TrsUserId { get; set; }
 }
 
 public class CreateTeacherCommandAddress

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Jobs/EwcWalesImport/InductionImporter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Jobs/EwcWalesImport/InductionImporter.cs
@@ -86,7 +86,8 @@ public async Task<InductionImportResult> ImportAsync(StreamReader csvReaderStrea
                         rowTransaction.AppendQuery(new CreateDqtOutboxMessageTransactionalQuery(new AddInductionExemptionMessage
                         {
                             PersonId = lookupData.Person!.Id,
-                            ExemptionReasonId = InductionExemptionReason.PassedInWalesId
+                            ExemptionReasonId = InductionExemptionReason.PassedInWalesId,
+                            TrsUserId = DataStore.Postgres.Models.SystemUser.SystemUserId
                         }));
 
                         if (lookupData.HasActiveAlerts)

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Jobs/EwcWalesImport/QtsImporter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Jobs/EwcWalesImport/QtsImporter.cs
@@ -128,7 +128,8 @@ public async Task<QtsImportResult> ImportAsync(StreamReader csvReaderStream, str
                     {
                         rowTransaction.AppendQuery(new CreateDqtOutboxMessageTransactionalQuery(new SetInductionRequiredToCompleteMessage()
                         {
-                            PersonId = lookupData.PersonId.Value
+                            PersonId = lookupData.PersonId.Value,
+                            TrsUserId = DataStore.Postgres.Models.SystemUser.SystemUserId
                         }));
                     }
 

diff --git a/...chingRecordSystem.Core/Services/DqtOutbox/Handlers/AddInductionExemptionMessageHandler.cs b/...chingRecordSystem.Core/Services/DqtOutbox/Handlers/AddInductionExemptionMessageHandler.cs
@@ -1,7 +1,5 @@
 using TeachingRecordSystem.Core.DataStore.Postgres;
-using TeachingRecordSystem.Core.DataStore.Postgres.Models;
 using TeachingRecordSystem.Core.Services.DqtOutbox.Messages;
-using SystemUser = TeachingRecordSystem.Core.DataStore.Postgres.Models.SystemUser;
 
 namespace TeachingRecordSystem.Core.Services.DqtOutbox.Handlers;
 
@@ -11,9 +9,13 @@ public async Task HandleMessageAsync(AddInductionExemptionMessage message)
     {
         var person = await dbContext.Persons.SingleAsync(p => p.PersonId == message.PersonId);
 
+        var updatedBy = message.DqtUserId is not null && message.DqtUserName is not null
+            ? EventModels.RaisedByUserInfo.FromDqtUser(message.DqtUserId.Value, message.DqtUserName)
+            : EventModels.RaisedByUserInfo.FromUserId(message.TrsUserId!.Value);
+
         person.AddInductionExemptionReason(
             message.ExemptionReasonId,
-            updatedBy: SystemUser.SystemUserId,
+            updatedBy: updatedBy,
             now: clock.UtcNow,
             out var @event);
 

diff --git a/...rdSystem.Core/Services/DqtOutbox/Handlers/SetInductionRequiredToCompleteMessageHandler.cs b/...rdSystem.Core/Services/DqtOutbox/Handlers/SetInductionRequiredToCompleteMessageHandler.cs
@@ -1,6 +1,5 @@
 using TeachingRecordSystem.Core.DataStore.Postgres;
 using TeachingRecordSystem.Core.Services.DqtOutbox.Messages;
-using SystemUser = TeachingRecordSystem.Core.DataStore.Postgres.Models.SystemUser;
 
 namespace TeachingRecordSystem.Core.Services.DqtOutbox.Handlers;
 
@@ -15,6 +14,10 @@ public async Task HandleMessageAsync(SetInductionRequiredToCompleteMessage messa
             return;
         }
 
+        var updatedBy = message.DqtUserId is not null && message.DqtUserName is not null
+            ? EventModels.RaisedByUserInfo.FromDqtUser(message.DqtUserId.Value, message.DqtUserName)
+            : EventModels.RaisedByUserInfo.FromUserId(message.TrsUserId!.Value);
+
         person.SetInductionStatus(
             InductionStatus.RequiredToComplete,
             startDate: null,
@@ -23,7 +26,7 @@ public async Task HandleMessageAsync(SetInductionRequiredToCompleteMessage messa
             changeReason: null,
             changeReasonDetail: null,
             evidenceFile: null,
-            updatedBy: SystemUser.SystemUserId,
+            updatedBy: updatedBy,
             now: clock.UtcNow,
             out var @event);
 

diff --git a/...src/TeachingRecordSystem.Core/Services/DqtOutbox/Messages/AddInductionExemptionMessage.cs b/...src/TeachingRecordSystem.Core/Services/DqtOutbox/Messages/AddInductionExemptionMessage.cs
@@ -4,4 +4,7 @@ public record AddInductionExemptionMessage
 {
     public required Guid PersonId { get; init; }
     public required Guid ExemptionReasonId { get; init; }
+    public required Guid? TrsUserId { get; init; }
+    public Guid? DqtUserId { get; init; }
+    public string? DqtUserName { get; init; }
 }
diff --git a/...ingRecordSystem.Core/Services/DqtOutbox/Messages/SetInductionRequiredToCompleteMessage.cs b/...ingRecordSystem.Core/Services/DqtOutbox/Messages/SetInductionRequiredToCompleteMessage.cs
@@ -3,4 +3,7 @@ namespace TeachingRecordSystem.Core.Services.DqtOutbox.Messages;
 public record SetInductionRequiredToCompleteMessage
 {
     public required Guid PersonId { get; init; }
+    public required Guid? TrsUserId { get; init; }
+    public Guid? DqtUserId { get; init; }
+    public string? DqtUserName { get; init; }
 }
diff --git a/...hingRecordSystem/tests/TeachingRecordSystem.Api.Tests/V2/Operations/SetIttOutcomeTests.cs b/...hingRecordSystem/tests/TeachingRecordSystem.Api.Tests/V2/Operations/SetIttOutcomeTests.cs
@@ -274,7 +274,7 @@ public async Task Given_teacher_already_has_different_QTS_date_returns_error()
             .ReturnsAsync(new[] { contact });
 
         DataverseAdapterMock
-            .Setup(mock => mock.SetIttResultForTeacherAsync(contact.Id, ittProviderUkprn, outcome.ConvertToITTResult(), assessmentDate, It.IsAny<string>()))
+            .Setup(mock => mock.SetIttResultForTeacherAsync(contact.Id, ittProviderUkprn, outcome.ConvertToITTResult(), assessmentDate, It.IsAny<Guid>(), It.IsAny<string>()))
             .ReturnsAsync(SetIttResultForTeacherResult.Failed(SetIttResultForTeacherFailedReason.QtsDateMismatch));
 
         var requestBody = new SetIttOutcomeRequest()
@@ -314,7 +314,7 @@ public async Task Given_teacher_passing_withdrawn_outcome_for_teacher_that_is_wi
             .ReturnsAsync(new[] { contact });
 
         DataverseAdapterMock
-            .Setup(mock => mock.SetIttResultForTeacherAsync(contact.Id, ittProviderUkprn, outcome.ConvertToITTResult(), null, It.IsAny<string>()))
+            .Setup(mock => mock.SetIttResultForTeacherAsync(contact.Id, ittProviderUkprn, outcome.ConvertToITTResult(), null, It.IsAny<Guid>(), It.IsAny<string>()))
             .ReturnsAsync(SetIttResultForTeacherResult.Success(null));
 
         var requestBody = new SetIttOutcomeRequest()
@@ -361,7 +361,7 @@ public async Task Given_teacher_state_is_invalid_returns_error(
             .ReturnsAsync(new[] { contact });
 
         DataverseAdapterMock
-            .Setup(mock => mock.SetIttResultForTeacherAsync(contact.Id, ittProviderUkprn, outcome.ConvertToITTResult(), assessmentDate, It.IsAny<string>()))
+            .Setup(mock => mock.SetIttResultForTeacherAsync(contact.Id, ittProviderUkprn, outcome.ConvertToITTResult(), assessmentDate, It.IsAny<Guid>(), It.IsAny<string>()))
             .ReturnsAsync(SetIttResultForTeacherResult.Failed(failedReason));
 
         var requestBody = new SetIttOutcomeRequest()