Merge branch 'main' into Release-7.1.0

microsoft · Apr 5, 2023 · e01a031 · e01a031
2 parents 25d7159 + 363cae0
commit e01a031
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/ApiService/ApiService/onefuzzlib/NotificationOperations.cs b/src/ApiService/ApiService/onefuzzlib/NotificationOperations.cs
@@ -9,7 +9,7 @@ public interface INotificationOperations : IOrm<Notification> {
     IAsyncEnumerable<Notification> GetNotifications(Container container);
     IAsyncEnumerable<(Task, IEnumerable<Container>)> GetQueueTasks();
     Async.Task<OneFuzzResult<Notification>> Create(Container container, NotificationTemplate config, bool replaceExisting);
-    Async.Task<Notification> GetNotification(Guid notifificationId);
+    Async.Task<Notification?> GetNotification(Guid notifificationId);
 }
 
 public class NotificationOperations : Orm<Notification>, INotificationOperations {
@@ -155,7 +155,7 @@ private async Async.Task<NotificationTemplate> HideSecrets(NotificationTemplate
         return null;
     }
 
-    public async Async.Task<Notification> GetNotification(Guid notifificationId) {
-        return await SearchByPartitionKeys(new[] { notifificationId.ToString() }).SingleAsync();
+    public async Async.Task<Notification?> GetNotification(Guid notifificationId) {
+        return await SearchByPartitionKeys(new[] { notifificationId.ToString() }).SingleOrDefaultAsync();
     }
 }
diff --git a/src/ApiService/IntegrationTests/JinjaToScribanMigrationTests.cs b/src/ApiService/IntegrationTests/JinjaToScribanMigrationTests.cs
@@ -49,7 +49,7 @@ public async Async.Task Dry_Run_Does_Not_Make_Changes() {
         var dryRunResult = BodyAs<JinjaToScribanMigrationDryRunResponse>(result);
         dryRunResult.NotificationIdsToUpdate.Should().BeEquivalentTo(new List<Guid> { notificationBefore.NotificationId });
 
-        var notificationAfter = await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId);
+        var notificationAfter = (await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId))!;
         var adoTemplateAfter = (notificationAfter.Config as AdoTemplate)!;
 
         notificationBefore.Should().BeEquivalentTo(notificationAfter, options =>
@@ -88,7 +88,7 @@ public async Async.Task Migration_Happens_When_Not_Dry_run() {
         migrationResult.FailedNotificationIds.Should().BeEmpty();
         migrationResult.UpdatedNotificationIds.Should().BeEquivalentTo(new List<Guid> { notificationBefore.NotificationId });
 
-        var notificationAfter = await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId);
+        var notificationAfter = (await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId))!;
         var adoTemplateAfter = (notificationAfter.Config as AdoTemplate)!;
 
         adoTemplateBefore.Should().NotBeEquivalentTo(adoTemplateAfter);
@@ -172,7 +172,7 @@ public async Async.Task All_ADO_Fields_Are_Migrated() {
         migrationResult.FailedNotificationIds.Should().BeEmpty();
         migrationResult.UpdatedNotificationIds.Should().BeEquivalentTo(new List<Guid> { notificationBefore.NotificationId });
 
-        var notificationAfter = await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId);
+        var notificationAfter = (await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId))!;
         var adoTemplateAfter = (notificationAfter.Config as AdoTemplate)!;
 
         adoTemplateBefore.Should().NotBeEquivalentTo(adoTemplateAfter);
@@ -224,7 +224,7 @@ public async Async.Task All_Github_Fields_Are_Migrated() {
         migrationResult.FailedNotificationIds.Should().BeEmpty();
         migrationResult.UpdatedNotificationIds.Should().BeEquivalentTo(new List<Guid> { notificationBefore.NotificationId });
 
-        var notificationAfter = await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId);
+        var notificationAfter = (await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId))!;
         var githubTemplateAfter = (notificationAfter.Config as GithubIssuesTemplate)!;
 
         githubTemplateBefore.Should().NotBeEquivalentTo(githubTemplateAfter);
@@ -279,7 +279,7 @@ public async Async.Task Teams_Template_Not_Migrated() {
         migrationResult.FailedNotificationIds.Should().BeEmpty();
         migrationResult.UpdatedNotificationIds.Should().BeEmpty();
 
-        var notificationAfter = await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId);
+        var notificationAfter = (await Context.NotificationOperations.GetNotification(notificationBefore.NotificationId))!;
         var teamsTemplateAfter = (notificationAfter.Config as TeamsTemplate)!;
 
         teamsTemplateBefore.Should().BeEquivalentTo(teamsTemplateAfter);
@@ -330,9 +330,9 @@ public async Async.Task Can_Migrate_Multiple_Notification_Configs() {
 
         result.StatusCode.Should().Be(System.Net.HttpStatusCode.OK);
 
-        var teamsNotificationAfter = await Context.NotificationOperations.GetNotification(teamsNotificationBefore.NotificationId);
-        var adoNotificationAfter = await Context.NotificationOperations.GetNotification(adoNotificationBefore.NotificationId);
-        var githubNotificationAfter = await Context.NotificationOperations.GetNotification(githubNotificationBefore.NotificationId);
+        var teamsNotificationAfter = (await Context.NotificationOperations.GetNotification(teamsNotificationBefore.NotificationId))!;
+        var adoNotificationAfter = (await Context.NotificationOperations.GetNotification(adoNotificationBefore.NotificationId))!;
+        var githubNotificationAfter = (await Context.NotificationOperations.GetNotification(githubNotificationBefore.NotificationId))!;
 
         var migrationResult = BodyAs<JinjaToScribanMigrationResponse>(result);
         migrationResult.FailedNotificationIds.Should().BeEmpty();