Move database to separate project, add migration tool prototype

GameDatabase/Context/TaikoDbContext.cs

@@ -1,4 +1,8 @@
-namespace TaikoLocalServer.Context
+using GameDatabase.Entities;
+using Microsoft.EntityFrameworkCore;
+using SharedProject.Utils;
+
+namespace GameDatabase.Context
 {
     public partial class TaikoDbContext : DbContext
     {
@@ -22,7 +26,7 @@
             {
                 return;
             }
-            var path = Path.Combine(PathHelper.GetRootPath(), Constants.DEFAULT_DB_NAME);
+            var path = Path.Combine(PathHelper.GetRootPath(), "taiko.db3");
             optionsBuilder.UseSqlite($"Data Source={path}");
         }
 

GameDatabase/Context/TaikoDbContextPartial.cs

@@ -1,4 +1,8 @@
-namespace TaikoLocalServer.Context;
+using GameDatabase.Entities;
+using Microsoft.EntityFrameworkCore;
+using SharedProject.Enums;
+
+namespace GameDatabase.Context;
 
 public partial class TaikoDbContext
 {

GameDatabase/Entities/AiScoreDatum.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Entities;
+using SharedProject.Enums;
+
+namespace GameDatabase.Entities;
 
 public class AiScoreDatum
 {

GameDatabase/Entities/AiSectionScoreDatum.cs

@@ -0,0 +1,30 @@
+using SharedProject.Enums;
+
+namespace GameDatabase.Entities;
+
+public class AiSectionScoreDatum
+{
+    public uint Baid { get; set; }
+    
+    public uint SongId { get; set; }
+    
+    public Difficulty Difficulty { get; set; }
+    
+    public int SectionIndex { get; set; }
+    
+    public CrownType Crown { get; set; }
+
+    public bool IsWin { get; set; }
+    
+    public uint Score { get; set; }
+    
+    public uint GoodCount { get; set; }
+    
+    public uint OkCount { get; set; }
+    
+    public uint MissCount { get; set; }
+
+    public uint DrumrollCount { get; set; }
+
+    public AiScoreDatum Parent { get; set; } = null!;
+}

GameDatabase/Entities/Card.cs

@@ -1,4 +1,4 @@
-namespace TaikoLocalServer.Entities
+namespace GameDatabase.Entities
 {
     public partial class Card
     {

GameDatabase/Entities/DanScoreDatum.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Entities;
+using SharedProject.Enums;
+
+namespace GameDatabase.Entities;
 
 public class DanScoreDatum
 {

GameDatabase/Entities/DanStageScoreDatum.cs

@@ -1,4 +1,4 @@
-namespace TaikoLocalServer.Entities;
+namespace GameDatabase.Entities;
 
 public class DanStageScoreDatum
 {

GameDatabase/Entities/SongBestDatum.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Entities
+using SharedProject.Enums;
+
+namespace GameDatabase.Entities
 {
     public partial class SongBestDatum
     {

GameDatabase/Entities/SongBestDatumMethods.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Entities;
+using SharedProject.Enums;
+
+namespace GameDatabase.Entities;
 
 public partial class SongBestDatum
 {

GameDatabase/Entities/SongPlayDatum.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Entities
+using SharedProject.Enums;
+
+namespace GameDatabase.Entities
 {
     public partial class SongPlayDatum
     {

GameDatabase/Entities/UserDatum.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Entities
+using SharedProject.Enums;
+
+namespace GameDatabase.Entities
 {
     public partial class UserDatum
     {

GameDatabase/GameDatabase.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SharedProject\SharedProject.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.1.22426.7" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.1.22426.7" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.1.22426.7">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+    </ItemGroup>
+
+</Project>

GameDatabase/Migrations/20220825070549_Initial.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220827163841_FirstMigration.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220828101620_AddDanDbTest.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220828171353_AddClearState.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220829101052_AdjustDanDb.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220829124927_FixNavigation.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220905132703_AddMoreOptions.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220910055624_AddDrumrollCount.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220914054039_AddRewardFlgs.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220916121143_AddGenericInfoFlg.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220917180457_AddAiBattle.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/20220919022643_AddWinCountToUserdata.Designer.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

GameDatabase/Migrations/TaikoDbContextModelSnapshot.cs

@@ -1,9 +1,9 @@
 // <auto-generated />
 using System;
+using GameDatabase.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using TaikoLocalServer.Context;
 
 #nullable disable
 

LocalSaveModScoreMigrator/DateTimeConverter.cs

@@ -0,0 +1,21 @@
+using System.Diagnostics;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace LocalSaveModScoreMigrator;
+
+public class DateTimeConverter : JsonConverter<DateTime>
+{
+    public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        Debug.Assert(typeToConvert == typeof(DateTime));
+        var dateTime = DateTime.ParseExact(reader.GetString() ?? string.Empty, "dd_MM_yy-HH_mm_ss", CultureInfo.InvariantCulture);
+        return dateTime;
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString(CultureInfo.InvariantCulture));
+    }
+}

LocalSaveModScoreMigrator/LocalSaveModScoreMigrator.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.1.22426.7" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.1.22426.7" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.1.22426.7">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\GameDatabase\GameDatabase.csproj" />
+    </ItemGroup>
+
+</Project>

LocalSaveModScoreMigrator/MusicInfo.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace LocalSaveModScoreMigrator;
+
+public class MusicInfo
+{
+    [JsonPropertyName("items")] 
+    public List<MusicInfoEntry> Items { get; set; } = new();
+}

LocalSaveModScoreMigrator/MusicInfoEntry.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace LocalSaveModScoreMigrator;
+
+public class MusicInfoEntry
+{
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    [JsonPropertyName("uniqueId")]
+    public uint SongId { get; set; }
+}

LocalSaveModScoreMigrator/PlayRecordJson.cs

@@ -0,0 +1,23 @@
+using System.Text.Json.Serialization;
+using SharedProject.Enums;
+
+namespace LocalSaveModScoreMigrator;
+
+public class PlayRecordJson
+{
+    public string SongId { get; set; } = "tmap4";
+    public Difficulty Difficulty { get; set; }
+    
+    [JsonPropertyName("dateTime")]
+    public DateTime DateTime { get; set; }
+    public uint Score { set; get; }
+    public CrownType Crown { get; set; }
+    
+    [JsonPropertyName("scorerank")]
+    public ScoreRank Scorerank { get; set; }
+    public uint Good { get; set; }
+    public uint Ok { get; set; }
+    public uint Bad { get; set; }
+    public uint Combo { get; set; }
+    public uint Drumroll { get; set; }
+}

LocalSaveModScoreMigrator/Program.cs

@@ -0,0 +1,94 @@
+// See https://aka.ms/new-console-template for more information
+
+using System.Text.Json;
+using GameDatabase.Context;
+using GameDatabase.Entities;
+using JorgeSerrano.Json;
+using LocalSaveModScoreMigrator;
+using SharedProject.Enums;
+
+using var db = new TaikoDbContext();
+
+var card = db.Cards.First();
+Console.WriteLine(card.Baid);
+Console.WriteLine(card.AccessCode);
+
+var localSaveJson = File.ReadAllText("record_enso_p1.json");
+var options = new JsonSerializerOptions
+{
+    PropertyNamingPolicy = new JsonSnakeCaseNamingPolicy()
+};
+options.Converters.Add(new DateTimeConverter());
+options.Converters.Add(new ScoreRankConverter());
+var playRecordJson = JsonSerializer.Deserialize<List<PlayRecordJson>>(localSaveJson, options);
+if (playRecordJson is null)
+{
+    throw new ApplicationException("Play record json is null");
+}
+
+Console.WriteLine(playRecordJson.First().SongId);
+
+var musicInfoJson = File.ReadAllText("musicinfo.json");
+var musicInfo = JsonSerializer.Deserialize<MusicInfo>(musicInfoJson);
+
+if (musicInfo is null)
+{
+    throw new ApplicationException("Music info is null");
+}
+
+var user = db.UserData.First();
+var musicInfoMap = musicInfo.Items.DistinctBy(entry => entry.Id).ToDictionary(entry => entry.Id, entry => entry.SongId);
+foreach (var playRecord in playRecordJson)
+{
+    var songId = musicInfoMap[playRecord.SongId.Split("_")[1]];
+    Console.WriteLine(songId);
+    Console.WriteLine(playRecord.DateTime);
+    var playLog = new SongPlayDatum
+    {
+        Baid = user.Baid,
+        Difficulty = playRecord.Difficulty,
+        Crown = playRecord.Crown,
+        Score = playRecord.Score,
+        ScoreRank = playRecord.Scorerank,
+        ComboCount = playRecord.Combo,
+        DrumrollCount = playRecord.Drumroll,
+        PlayTime = playRecord.DateTime,
+        GoodCount = playRecord.Good,
+        MissCount = playRecord.Bad,
+        OkCount = playRecord.Ok,
+        Skipped = false,
+        SongNumber = 0,
+        SongId = songId
+    };
+    db.SongPlayData.Add(playLog);
+    
+    
+    var best = new SongBestDatum
+    {
+        Baid = user.Baid,
+        Difficulty = playRecord.Difficulty,
+        BestCrown = playRecord.Crown,
+        BestScore = playRecord.Score,
+        BestScoreRank = playRecord.Scorerank,
+        SongId = songId
+    };
+
+    var existing = db.SongBestData.FirstOrDefault(datum => datum.Baid == user.Baid &&
+                                                           datum.Difficulty == playLog.Difficulty &&
+                                                           datum.SongId == songId);
+
+
+    if (existing is null)
+    {
+        db.SongBestData.Add(best);
+    }
+    else
+    {
+        existing.BestCrown = (CrownType)Math.Max((int)existing.BestCrown, (int)playRecord.Crown);
+        existing.BestScoreRank = (ScoreRank)Math.Max((int)existing.BestScoreRank, (int)playRecord.Scorerank);
+        existing.BestScore = Math.Max(existing.BestScore, playRecord.Score);
+        db.SongBestData.Update(existing);
+    }
+}
+
+db.SaveChanges();

LocalSaveModScoreMigrator/ScoreRankConverter.cs

@@ -0,0 +1,22 @@
+using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using SharedProject.Enums;
+
+namespace LocalSaveModScoreMigrator;
+
+public class ScoreRankConverter : JsonConverter<ScoreRank>
+{
+    public override ScoreRank Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        Debug.Assert(typeToConvert == typeof(ScoreRank));
+        var scoreRankInt = reader.GetInt32() + 1;
+        return (ScoreRank)scoreRankInt;
+    }
+
+    public override void Write(Utf8JsonWriter writer, ScoreRank value, JsonSerializerOptions options)
+    {
+        var scoreRank = (int)value - 1;
+        writer.WriteStringValue(scoreRank.ToString());
+    }
+}

SharedProject/Utils/PathHelper.cs

@@ -1,4 +1,4 @@
-namespace TaikoLocalServer.Common.Utils;
+namespace SharedProject.Utils;
 
 public static class PathHelper
 {

TaikoLocalServer.sln

@@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedProject", "SharedProj
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaikoWebUI", "TaikoWebUI\TaikoWebUI.csproj", "{3F02C2B8-D970-4E8D-89AA-1B938DA6E2FE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameDatabase", "GameDatabase\GameDatabase.csproj", "{76F2B4D1-C05E-40F4-B577-095CA7DF0528}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalSaveModScoreMigrator", "LocalSaveModScoreMigrator\LocalSaveModScoreMigrator.csproj", "{72FAD857-4791-4925-8536-22FABD5976EE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +31,14 @@ Global
 		{3F02C2B8-D970-4E8D-89AA-1B938DA6E2FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F02C2B8-D970-4E8D-89AA-1B938DA6E2FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F02C2B8-D970-4E8D-89AA-1B938DA6E2FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76F2B4D1-C05E-40F4-B577-095CA7DF0528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76F2B4D1-C05E-40F4-B577-095CA7DF0528}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76F2B4D1-C05E-40F4-B577-095CA7DF0528}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76F2B4D1-C05E-40F4-B577-095CA7DF0528}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72FAD857-4791-4925-8536-22FABD5976EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72FAD857-4791-4925-8536-22FABD5976EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72FAD857-4791-4925-8536-22FABD5976EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72FAD857-4791-4925-8536-22FABD5976EE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TaikoLocalServer/Common/Utils/Extensions.cs

@@ -0,0 +1,24 @@
+using GameDatabase.Entities;
+using SharedProject.Utils;
+
+namespace TaikoLocalServer.Common.Utils;
+
+public static class Extensions
+{
+    public static void UpdateBest(this AiSectionScoreDatum datum, PlayResultDataRequest.StageData.AiStageSectionData sectionData)
+    {
+        var crown = (CrownType)sectionData.Crown;
+        if (crown == CrownType.Gold && sectionData.OkCnt == 0)
+        {
+            crown = CrownType.Dondaful;
+        }
+        
+        datum.IsWin = sectionData.IsWin ? sectionData.IsWin : datum.IsWin;
+        datum.Crown = ValueHelpers.Max(crown, datum.Crown);
+        datum.Score = ValueHelpers.Max(sectionData.Score, datum.Score);
+        datum.GoodCount = ValueHelpers.Max(sectionData.GoodCnt, datum.GoodCount);
+        datum.OkCount = ValueHelpers.Min(sectionData.OkCnt, datum.OkCount);
+        datum.MissCount = ValueHelpers.Min(sectionData.NgCnt, datum.MissCount);
+        datum.DrumrollCount = ValueHelpers.Max(sectionData.PoundCnt, datum.DrumrollCount);
+    }
+}

TaikoLocalServer/Common/Utils/FlagCalculator.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Specialized;
 using System.Runtime.InteropServices;
+using GameDatabase.Entities;
 
 namespace TaikoLocalServer.Common.Utils;
 

TaikoLocalServer/Common/Utils/JsonHelper.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using GameDatabase.Entities;
 
 namespace TaikoLocalServer.Common.Utils;
 

TaikoLocalServer/Common/Utils/ObjectMappers.cs

@@ -1,4 +1,5 @@
-using Swan.Mapping;
+using GameDatabase.Entities;
+using Swan.Mapping;
 
 namespace TaikoLocalServer.Common.Utils;
 

TaikoLocalServer/Controllers/Api/PlayDataController.cs

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
-using SharedProject.Models.Responses;
+using SharedProject.Models.Responses;
 
 namespace TaikoLocalServer.Controllers.Api;
 

TaikoLocalServer/Controllers/Game/BaidController.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using GameDatabase.Entities;
 using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;

TaikoLocalServer/Controllers/Game/CrownsDataController.cs

@@ -1,5 +1,4 @@
-using System.Runtime.InteropServices;
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 using TaikoLocalServer.Settings;
 
 namespace TaikoLocalServer.Controllers.Game;

TaikoLocalServer/Controllers/Game/GetDanScoreController.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Controllers.Game;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/getdanscore.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/MyDonEntryController.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Controllers.Game;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/mydonentry.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/PlayResultController.cs

@@ -1,6 +1,7 @@
 using System.Buffers.Binary;
 using System.Globalization;
 using System.Text.Json;
+using GameDatabase.Entities;
 using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;

TaikoLocalServer/Controllers/Game/SelfBestController.cs

@@ -1,4 +1,5 @@
-using Throw;
+using GameDatabase.Entities;
+using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;
 

TaikoLocalServer/Entities/AiSectionScoreDatum.cs

@@ -1,47 +0,0 @@
-using SharedProject.Utils;
-
-namespace TaikoLocalServer.Entities;
-
-public class AiSectionScoreDatum
-{
-    public uint Baid { get; set; }
-    
-    public uint SongId { get; set; }
-    
-    public Difficulty Difficulty { get; set; }
-    
-    public int SectionIndex { get; set; }
-    
-    public CrownType Crown { get; set; }
-
-    public bool IsWin { get; set; }
-    
-    public uint Score { get; set; }
-    
-    public uint GoodCount { get; set; }
-    
-    public uint OkCount { get; set; }
-    
-    public uint MissCount { get; set; }
-
-    public uint DrumrollCount { get; set; }
-
-    public AiScoreDatum Parent { get; set; } = null!;
-
-    public void UpdateBest(PlayResultDataRequest.StageData.AiStageSectionData sectionData)
-    {
-        var crown = (CrownType)sectionData.Crown;
-        if (crown == CrownType.Gold && sectionData.OkCnt == 0)
-        {
-            crown = CrownType.Dondaful;
-        }
-        
-        IsWin = sectionData.IsWin ? sectionData.IsWin : IsWin;
-        Crown = ValueHelpers.Max(crown, Crown);
-        Score = ValueHelpers.Max(sectionData.Score, Score);
-        GoodCount = ValueHelpers.Max(sectionData.GoodCnt, GoodCount);
-        OkCount = ValueHelpers.Min(sectionData.OkCnt, OkCount);
-        MissCount = ValueHelpers.Min(sectionData.NgCnt, MissCount);
-        DrumrollCount = ValueHelpers.Max(sectionData.PoundCnt, DrumrollCount);
-    }
-}

TaikoLocalServer/GlobalUsings.cs

@@ -7,8 +7,6 @@ global using SharedProject.Enums;
 global using taiko.game;
 global using TaikoLocalServer.Common;
 global using TaikoLocalServer.Common.Utils;
-global using TaikoLocalServer.Context;
-global using TaikoLocalServer.Entities;
 global using TaikoLocalServer.Models;
 global using TaikoLocalServer.Services;
 global using TaikoLocalServer.Services.Interfaces;

TaikoLocalServer/Program.cs

@@ -1,11 +1,13 @@
 using System.Reflection;
 using System.Security.Authentication;
+using GameDatabase.Context;
 using Microsoft.AspNetCore.HttpOverrides;
 using TaikoLocalServer.Middlewares;
 using TaikoLocalServer.Services.Extentions;
 using TaikoLocalServer.Settings;
 using Throw;
 using Serilog;
+using SharedProject.Utils;
 
 Log.Logger = new LoggerConfiguration()
     .WriteTo.Console()

TaikoLocalServer/Services/AiDatumService.cs

@@ -1,4 +1,6 @@
-using Throw;
+using GameDatabase.Context;
+using GameDatabase.Entities;
+using Throw;
 
 namespace TaikoLocalServer.Services;
 

TaikoLocalServer/Services/CardService.cs

@@ -1,4 +1,6 @@
-using SharedProject.Models;
+using GameDatabase.Context;
+using GameDatabase.Entities;
+using SharedProject.Models;
 using Swan.Mapping;
 
 namespace TaikoLocalServer.Services;

TaikoLocalServer/Services/DanScoreDatumService.cs

@@ -1,4 +1,7 @@
-namespace TaikoLocalServer.Services;
+using GameDatabase.Context;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Services;
 
 public class DanScoreDatumService : IDanScoreDatumService
 {

TaikoLocalServer/Services/GameDataService.cs

@@ -3,6 +3,7 @@ using System.Text.Json;
 using ICSharpCode.SharpZipLib.GZip;
 using Microsoft.Extensions.Options;
 using SharedProject.Models;
+using SharedProject.Utils;
 using Swan.Mapping;
 using TaikoLocalServer.Settings;
 using Throw;

TaikoLocalServer/Services/Interfaces/IAiDatumService.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Services.Interfaces;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Services.Interfaces;
 
 public interface IAiDatumService
 {

TaikoLocalServer/Services/Interfaces/ICardService.cs

@@ -1,4 +1,5 @@
-using SharedProject.Models;
+using GameDatabase.Entities;
+using SharedProject.Models;
 
 namespace TaikoLocalServer.Services.Interfaces;
 

TaikoLocalServer/Services/Interfaces/IDanScoreDatumService.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Services.Interfaces;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Services.Interfaces;
 
 public interface IDanScoreDatumService
 {

TaikoLocalServer/Services/Interfaces/ISongBestDatumService.cs

@@ -1,4 +1,5 @@
-using SharedProject.Models;
+using GameDatabase.Entities;
+using SharedProject.Models;
 
 namespace TaikoLocalServer.Services.Interfaces;
 

TaikoLocalServer/Services/Interfaces/ISongPlayDatumService.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Services.Interfaces;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Services.Interfaces;
 
 public interface ISongPlayDatumService
 {

TaikoLocalServer/Services/Interfaces/IUserDatumService.cs

@@ -1,4 +1,6 @@
-namespace TaikoLocalServer.Services.Interfaces;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Services.Interfaces;
 
 public interface IUserDatumService
 {

TaikoLocalServer/Services/SongBestDatumService.cs

@@ -1,4 +1,6 @@
-using SharedProject.Models;
+using GameDatabase.Context;
+using GameDatabase.Entities;
+using SharedProject.Models;
 using Swan.Mapping;
 using Throw;
 

TaikoLocalServer/Services/SongPlayDatumService.cs

@@ -1,4 +1,7 @@
-namespace TaikoLocalServer.Services;
+using GameDatabase.Context;
+using GameDatabase.Entities;
+
+namespace TaikoLocalServer.Services;
 
 class SongPlayDatumService : ISongPlayDatumService
 {

TaikoLocalServer/Services/UserDatumService.cs

@@ -1,4 +1,6 @@
 using System.Text.Json;
+using GameDatabase.Context;
+using GameDatabase.Entities;
 using Throw;
 
 namespace TaikoLocalServer.Services;

TaikoLocalServer/TaikoLocalServer.csproj

@@ -76,6 +76,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\GameDatabase\GameDatabase.csproj" />
       <ProjectReference Include="..\SharedProject\SharedProject.csproj" />
       <ProjectReference Include="..\TaikoWebUI\TaikoWebUI.csproj" />
     </ItemGroup>