Add fix for issue 1929. … (#6754)

 Add fix for issue 1929. More cleanup for the support request when an account is deleted.

Author: cristinamanum

src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs

@@ -57,7 +57,7 @@ Task<Issue> AddNewSupportRequestAsync(
 
         Task AddAdminAsync(string galleryUsername);
 
-        Task DeleteSupportRequestsAsync(string createdBy);
+        Task DeleteSupportRequestsAsync(User user);
 
         Task<bool> TryAddDeleteSupportRequestAsync(User user);
     }

src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs

@@ -286,26 +286,27 @@ public string GetIssueStatusNameById(int id)
             return issue?.Name;
         }
 
-        public async Task DeleteSupportRequestsAsync(string createdBy)
+        public async Task DeleteSupportRequestsAsync(User user)
         {
-            if (createdBy == null)
+            if (user == null)
             {
-                throw new ArgumentNullException(nameof(createdBy));
+                throw new ArgumentNullException(nameof(user));
             }
-            var userCreatedIssues = GetIssues().Where(i => string.Equals(i.CreatedBy, createdBy, StringComparison.InvariantCultureIgnoreCase)).ToList();
+            var userIssues = GetIssues().Where(i => i.UserKey.HasValue && i.UserKey.Value == user.Key).ToList();
             // Delete all the support requests with exception of the delete account request.
             // For the DeleteAccount support request clean the user data.
-            foreach (var issue in userCreatedIssues.Where(i => !string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
+            foreach (var issue in userIssues.Where(i => !string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
             {
                 _supportRequestDbContext.Issues.Remove(issue);
             }
-            foreach (var accountDeletedIssue in userCreatedIssues.Where(i => string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
+            foreach (var accountDeletedIssue in userIssues.Where(i => string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
             {
                 accountDeletedIssue.OwnerEmail = "deletedaccount";
                 accountDeletedIssue.CreatedBy = null;
+                accountDeletedIssue.Details = "This support request has been redacted as the customer's account has been deleted.";
                 foreach (var historyEntry in accountDeletedIssue.HistoryEntries)
                 {
-                    if (string.Equals(historyEntry.EditedBy, createdBy, StringComparison.InvariantCultureIgnoreCase))
+                    if (string.Equals(historyEntry.EditedBy, user.Username, StringComparison.InvariantCultureIgnoreCase))
                     {
                         historyEntry.EditedBy = null;
                     }

src/NuGetGallery/Services/DeleteAccountService.cs

@@ -282,7 +282,7 @@ private async Task RemoveUserDataInUserTable(User user)
 
         private async Task RemoveSupportRequests(User user)
         {
-            await _supportRequestService.DeleteSupportRequestsAsync(user.Username);
+            await _supportRequestService.DeleteSupportRequestsAsync(user);
         }
 
         private async Task RemoveUser(User user)

tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs

@@ -682,7 +682,7 @@ private Mock<ISupportRequestService> SetupSupportRequestService()
                 if (_user != null)
                 {
                     var issue = SupportRequests.Where(i => string.Equals(i.CreatedBy, _user.Username)).FirstOrDefault();
-                    supportService.Setup(m => m.DeleteSupportRequestsAsync(_user.Username))
+                    supportService.Setup(m => m.DeleteSupportRequestsAsync(_user))
                                   .Returns(Task.FromResult(true))
                                   .Callback(() => SupportRequests.Remove(issue));
                 }

tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs

@@ -38,35 +38,53 @@ public async Task DeleteRequestsNormalPath()
                 // Arrange
                 string userName = "Joe";
                 string emailAddress = "[email protected]";
+                User user = new User()
+                {
+                    Username = userName,
+                    EmailAddress = emailAddress,
+                    Key = 11
+                };
 
                 TestSupportRequestDbContext supportRequestContext = new TestSupportRequestDbContext();
                 Issue JoesDeleteAccountRequest = new Issue()
                 {
-                    CreatedBy = userName,
+                    CreatedBy = user.Username,
                     Key = 1,
                     IssueTitle = Strings.AccountDelete_SupportRequestTitle,
-                    OwnerEmail = emailAddress,
+                    OwnerEmail = user.EmailAddress,
                     IssueStatusId = IssueStatusKeys.New,
-                    HistoryEntries = new List<History>() { new History() { EditedBy = userName, IssueId = 1, Key = 1, IssueStatusId = IssueStatusKeys.New } }
+                    HistoryEntries = new List<History>()
+                    {
+                        new History() { EditedBy = userName, IssueId = 1, Key = 1, IssueStatusId = IssueStatusKeys.New }
+                    },
+                    UserKey = user.Key
                 };
                 Issue JoesOldIssue = new Issue()
                 {
-                    CreatedBy = userName,
+                    CreatedBy = user.Username,
                     Key = 2,
                     IssueTitle = "Joe's OldIssue",
-                    OwnerEmail = emailAddress,
+                    OwnerEmail = user.EmailAddress,
                     IssueStatusId = IssueStatusKeys.Resolved,
-                    HistoryEntries = new List<History>() { new History() { EditedBy = userName, IssueId = 2, Key = 2, IssueStatusId = IssueStatusKeys.New },
-                                                           new History() { EditedBy = userName, IssueId = 2, Key = 2, IssueStatusId = IssueStatusKeys.Resolved }}
+                    HistoryEntries = new List<History>()
+                    {
+                        new History() { EditedBy = userName, IssueId = 2, Key = 2, IssueStatusId = IssueStatusKeys.New },
+                        new History() { EditedBy = userName, IssueId = 2, Key = 2, IssueStatusId = IssueStatusKeys.Resolved }
+                    },
+                    UserKey = user.Key
                 };
                 Issue randomIssue = new Issue()
                 {
-                    CreatedBy = $"{userName}_second",
+                    CreatedBy = $"{user.Username}_second",
                     Key = 3,
                     IssueTitle = "Second",
                     OwnerEmail = "random",
                     IssueStatusId = IssueStatusKeys.New,
-                    HistoryEntries = new List<History>() { new History() { EditedBy = $"{userName}_second", IssueId = 3, Key = 3, IssueStatusId = IssueStatusKeys.New } }
+                    HistoryEntries = new List<History>()
+                    {
+                        new History() { EditedBy = $"{userName}_second", IssueId = 3, Key = 3, IssueStatusId = IssueStatusKeys.New }
+                    },
+                    UserKey = user.Key + 1
                 };
                 supportRequestContext.Issues.Add(JoesDeleteAccountRequest);
                 supportRequestContext.Issues.Add(JoesOldIssue);
@@ -76,7 +94,7 @@ public async Task DeleteRequestsNormalPath()
                 SupportRequestService supportRequestService = new SupportRequestService(supportRequestContext, GetAppConfig(),auditingService.Object);
 
                 // Act
-                await supportRequestService.DeleteSupportRequestsAsync(userName);
+                await supportRequestService.DeleteSupportRequestsAsync(user);
 
                 //Assert
                 Assert.Equal<int>(2, supportRequestContext.Issues.Count());