Merge pull request #56 from bdach/update-username

Ensure creator username is updated on set updates

Author: peppy

osu.Server.BeatmapSubmission.Tests/BeatmapSubmissionControllerTest.cs

@@ -1840,14 +1840,14 @@ osu file format v14
         }
 
         [Fact]
-        public async Task TestPatch_BeatmapWithNoChanges_BumpsLastUpdateDate()
+        public async Task TestPatch_BeatmapWithNoChanges_BumpsLastUpdateDateAndUpdatesCreatorUsername()
         {
             using var db = await DatabaseAccess.GetConnectionAsync();
             await db.ExecuteAsync(
                 "INSERT INTO `phpbb_users` (`user_id`, `username`, `username_clean`, `country_acronym`, `user_permissions`, `user_sig`, `user_occ`, `user_interests`) VALUES (1000, 'test', 'test', 'JP', '', '', '', '')");
 
             await db.ExecuteAsync(
-                @"INSERT INTO `osu_beatmapsets` (`beatmapset_id`, `user_id`, `creator`, `approved`, `thread_id`, `active`, `submit_date`) VALUES (241526, 1000, 'test user', -1, 0, -1, CURRENT_TIMESTAMP)");
+                @"INSERT INTO `osu_beatmapsets` (`beatmapset_id`, `user_id`, `creator`, `approved`, `thread_id`, `active`, `submit_date`) VALUES (241526, 1000, 'old username', -1, 0, -1, CURRENT_TIMESTAMP)");
 
             foreach (uint beatmapId in new uint[] { 557815, 557814, 557821, 557816, 557817, 557818, 557812, 557810, 557811, 557820, 557813, 557819 })
                 await db.ExecuteAsync(@"INSERT INTO `osu_beatmaps` (`beatmap_id`, `user_id`, `beatmapset_id`, `approved`) VALUES (@beatmapId, 1000, 241526, -1)", new { beatmapId = beatmapId });
@@ -1875,6 +1875,41 @@ await db.ExecuteAsync(
             Assert.True(response.IsSuccessStatusCode);
 
             WaitForDatabaseState(@"SELECT COUNT(1) FROM `osu_beatmapsets` WHERE `beatmapset_id` = 241526 AND `last_update` > '2020-01-01 00:00:00'", 1, CancellationToken);
+            WaitForDatabaseState(@"SELECT `creator` FROM `osu_beatmapsets` WHERE `beatmapset_id` = 241526", "test", CancellationToken);
+        }
+
+        [Fact]
+        public async Task TestPatchPackage_UpdatesCreatorUsername()
+        {
+            using var db = await DatabaseAccess.GetConnectionAsync();
+            await db.ExecuteAsync(
+                "INSERT INTO `phpbb_users` (`user_id`, `username`, `username_clean`, `country_acronym`, `user_permissions`, `user_sig`, `user_occ`, `user_interests`) VALUES (1000, 'test', 'test', 'JP', '', '', '', '')");
+
+            await db.ExecuteAsync(
+                @"INSERT INTO `osu_beatmapsets` (`beatmapset_id`, `user_id`, `creator`, `approved`, `thread_id`, `active`, `submit_date`) VALUES (241526, 1000, 'old username', -1, 0, -1, CURRENT_TIMESTAMP)");
+
+            foreach (uint beatmapId in new uint[] { 557815, 557814, 557821, 557816, 557817, 557818, 557812, 557810, 557811, 557820, 557813, 557819 })
+                await db.ExecuteAsync(@"INSERT INTO `osu_beatmaps` (`beatmap_id`, `user_id`, `beatmapset_id`, `approved`) VALUES (@beatmapId, 1000, 241526, -1)", new { beatmapId = beatmapId });
+
+            using (var dstStream = File.OpenWrite(Path.Combine(beatmapStorage.BaseDirectory, "241526")))
+            using (var srcStream = TestResources.GetResource(osz_filename)!)
+                await srcStream.CopyToAsync(dstStream);
+            await db.ExecuteAsync(@"INSERT INTO `beatmapset_versions` (`beatmapset_id`) VALUES (241526)");
+
+            var request = new HttpRequestMessage(HttpMethod.Patch, "/beatmapsets/241526");
+
+            using var content = new MultipartFormDataContent($"{Guid.NewGuid()}----");
+            using var osuFileStream = TestResources.GetResource(osu_filename)!;
+            content.Add(new StreamContent(osuFileStream), "filesChanged", osu_filename);
+            content.Add(new StringContent("Soleily - Renatus (test) [Platter].osu"), "filesDeleted");
+            request.Content = content;
+            request.Headers.Add(HeaderBasedAuthenticationHandler.USER_ID_HEADER, "1000");
+
+            var response = await Client.SendAsync(request);
+            Assert.True(response.IsSuccessStatusCode);
+
+            WaitForDatabaseState(@"SELECT COUNT(1) FROM `osu_beatmaps` WHERE `beatmapset_id` = 241526 AND `deleted_at` IS NULL", 12, CancellationToken);
+            WaitForDatabaseState(@"SELECT `creator` FROM `osu_beatmapsets` WHERE `beatmapset_id` = 241526", "test", CancellationToken);
         }
 
         [Fact]

osu.Server.BeatmapSubmission/BeatmapSubmissionController.cs

@@ -404,7 +404,8 @@ private static async Task reviveBeatmapSet(MySqlConnection connection, uint user
         private async Task<bool> updateBeatmapSetFromArchiveAsync(osu_beatmapset beatmapSet, Stream beatmapStream, MySqlConnection db)
         {
             using var archiveReader = new ZipArchiveReader(beatmapStream);
-            var parser = new BeatmapPackageParser(await db.GetUsernameAsync(beatmapSet.user_id));
+            string username = await db.GetUsernameAsync(beatmapSet.user_id);
+            var parser = new BeatmapPackageParser(username);
             var parseResult = parser.Parse(beatmapSet.beatmapset_id, archiveReader);
 
             checkPackageSize(beatmapStream.Length, parseResult);
@@ -421,6 +422,7 @@ private async Task<bool> updateBeatmapSetFromArchiveAsync(osu_beatmapset beatmap
 
                 if (fileSet.SetEquals(parseResult.Files))
                 {
+                    beatmapSet.creator = username;
                     await db.MarkBeatmapSetUpdatedAsync(beatmapSet, transaction);
                     await transaction.CommitAsync();
                     return false;
@@ -454,6 +456,7 @@ private async Task<bool> updateBeatmapSetFromArchiveAsync(osu_beatmapset beatmap
             if (beatmapIds.Count > 0)
                 throw new InvariantException($"Beatmap package is missing .osu files for beatmaps with IDs: {string.Join(", ", beatmapIds)}", LogLevel.Warning);
 
+            parseResult.BeatmapSet.creator = username;
             await db.UpdateBeatmapSetAsync(parseResult.BeatmapSet, transaction);
 
             await transaction.CommitAsync();

osu.Server.BeatmapSubmission/DatabaseOperationExtensions.cs

@@ -286,7 +286,7 @@ public static Task UpdateBeatmapSetAsync(this MySqlConnection db, osu_beatmapset
                 UPDATE `osu_beatmapsets`
                 SET
                     `artist` = @artist, `artist_unicode` = @artist_unicode, `title` = @title, `title_unicode` = @title_unicode,
-                    `source` = @source, `tags` = @tags, `video` = @video, `storyboard` = @storyboard,
+                    `creator` = @creator, `source` = @source, `tags` = @tags, `video` = @video, `storyboard` = @storyboard,
                     `storyboard_hash` = @storyboard_hash, `bpm` = @bpm, `filename` = @filename, `displaytitle` = @displaytitle,
                     `body_hash` = NULL, `header_hash` = NULL, `osz2_hash` = NULL, `active` = 1, `last_update` = CURRENT_TIMESTAMP
                 WHERE `beatmapset_id` = @beatmapset_id
@@ -296,14 +296,15 @@ public static Task UpdateBeatmapSetAsync(this MySqlConnection db, osu_beatmapset
         }
 
         /// <summary>
-        /// Only bumps the <paramref name="beatmapset"/>'s <c>last_update</c> date without performing any other changes.
+        /// Only updates the <paramref name="beatmapset"/>'s <c>last_update</c> date and <c>creator</c> name without performing any other changes.
         /// Used in scenarios where a submission occurred for a beatmap with no changes.
         /// Bumping the update date is important in such cases, because if it is e.g. an update after reviving the beatmap,
         /// not bumping the update date will cause the beatmap to move to the graveyard again on the next day after the update.
+        /// Updating the creator name is important in cases of name changes, especially ones with username history scrubbed.
         /// </summary>
         public static Task MarkBeatmapSetUpdatedAsync(this MySqlConnection db, osu_beatmapset beatmapset, MySqlTransaction? transaction = null)
         {
-            return db.ExecuteAsync("UPDATE `osu_beatmapsets` SET `last_update` = CURRENT_TIMESTAMP WHERE `beatmapset_id` = @beatmapset_id", beatmapset, transaction);
+            return db.ExecuteAsync("UPDATE `osu_beatmapsets` SET `last_update` = CURRENT_TIMESTAMP, `creator` = @creator WHERE `beatmapset_id` = @beatmapset_id", beatmapset, transaction);
         }
 
         public static async Task<ulong> InsertBeatmapsetFileAsync(this MySqlConnection db, beatmapset_file file, MySqlTransaction? transaction = null)