From 9bde113558104ec4e57b17810937d93859159654 Mon Sep 17 00:00:00 2001
From: asesidaa <1061472754@qq.com>
Date: Thu, 1 Sep 2022 22:54:46 +0800
Subject: [PATCH] Include dan stage scores everywhere

---
 TaikoLocalServer/Controllers/BaidController.cs       | 10 ++++++----
 TaikoLocalServer/Controllers/PlayResultController.cs |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/TaikoLocalServer/Controllers/BaidController.cs b/TaikoLocalServer/Controllers/BaidController.cs
index fa826c7..3de7d42 100644
--- a/TaikoLocalServer/Controllers/BaidController.cs
+++ b/TaikoLocalServer/Controllers/BaidController.cs
@@ -1,6 +1,5 @@
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text.Json;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
 
 namespace TaikoLocalServer.Controllers;
 
@@ -107,7 +106,10 @@ public class BaidController:ControllerBase
         var costumeFlag = new byte[10];
         Array.Fill(costumeFlag, byte.MaxValue);
 
-        var danData = context.DanScoreData.Where(datum => datum.Baid == baid).ToList();
+        var danData = context.DanScoreData
+            .Where(datum => datum.Baid == baid)
+            .Include(datum => datum.DanStageScoreData)
+            .ToList();
         var maxDan = danData.Where(datum => datum.ClearState != DanClearState.NotClear)
             .Select(datum => datum.DanId)
             .DefaultIfEmpty()
diff --git a/TaikoLocalServer/Controllers/PlayResultController.cs b/TaikoLocalServer/Controllers/PlayResultController.cs
index 73154fc..4b32201 100644
--- a/TaikoLocalServer/Controllers/PlayResultController.cs
+++ b/TaikoLocalServer/Controllers/PlayResultController.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
 using ProtoBuf;
 
 namespace TaikoLocalServer.Controllers;
@@ -68,7 +69,8 @@ public class PlayResultController : ControllerBase
         }
         var danScoreDataQuery = context.DanScoreData
              .Where(datum => datum.Baid == request.BaidConf &&
-                             datum.DanId == playResultDataRequest.DanId);
+                             datum.DanId == playResultDataRequest.DanId)
+             .Include(datum => datum.DanStageScoreData);
         var danScoreData = new DanScoreDatum
         {
             Baid = request.BaidConf,