src/arcaea_offline/external/andreal/api_data.py

@@ -84,15 +84,11 @@ class AndrealImageGeneratorApiDataConverter:
             raise ValueError("No score available.")
         best30_avg = self.session.scalar(select(CalculatedPotential.b30))
 
-        best30_overflow = (
-            [self.score(score) for score in scores[30:40]] if len(scores) > 30 else []
-        )
-
         return {
             "content": {
                 "account_info": self.account_info(),
                 "best30_avg": best30_avg,
                 "best30_list": [self.score(score) for score in scores[:30]],
-                "best30_overflow": best30_overflow,
+                "best30_overflow": [self.score(score) for score in scores[-10:]],
             }
         }

src/arcaea_offline/external/smartrte/__init__.py

@@ -1 +0,0 @@
-from .b30_csv import SmartRteB30CsvConverter

src/arcaea_offline/external/smartrte/b30_csv.py

@@ -1,64 +0,0 @@
-from sqlalchemy.orm import Session
-
-from ...models import Chart, ScoreBest
-from ...utils.rating import rating_class_to_text
-
-
-class SmartRteB30CsvConverter:
-    CSV_ROWS = [
-        "songname",
-        "songId",
-        "Difficulty",
-        "score",
-        "Perfect",
-        "criticalPerfect",
-        "Far",
-        "Lost",
-        "Constant",
-        "singlePTT",
-    ]
-
-    def __init__(
-        self,
-        session: Session,
-    ):
-        self.session = session
-
-    def rows(self) -> list:
-        csv_rows = [self.CSV_ROWS.copy()]
-
-        with self.session as session:
-            results = (
-                session.query(
-                    Chart.title,
-                    ScoreBest.song_id,
-                    ScoreBest.rating_class,
-                    ScoreBest.score,
-                    ScoreBest.pure,
-                    ScoreBest.shiny_pure,
-                    ScoreBest.far,
-                    ScoreBest.lost,
-                    Chart.constant,
-                    ScoreBest.potential,
-                )
-                .join(
-                    Chart,
-                    (Chart.song_id == ScoreBest.song_id)
-                    & (Chart.rating_class == ScoreBest.rating_class),
-                )
-                .all()
-            )
-
-            for result in results:
-                # replace the comma in song title because the target project
-                # cannot handle quoted string
-                result = list(result)
-                result[0] = result[0].replace(",", "")
-                result[2] = rating_class_to_text(result[2])
-                # divide constant to float
-                result[-2] = result[-2] / 10
-                # round potential
-                result[-1] = round(result[-1], 5)
-                csv_rows.append(result)
-
-        return csv_rows

src/arcaea_offline/models/scores.py

@@ -80,12 +80,7 @@ class ScoreCalculated(ScoresViewBase):
             (
                 case(
                     (
-                        (
+                        (ChartInfo.notes.isnot(None) & ChartInfo.notes != 0),
-                            ChartInfo.notes.is_not(None)
-                            & Score.pure.is_not(None)
-                            & Score.far.is_not(None)
-                            & (ChartInfo.notes != 0)
-                        ),
                         Score.score
                         - func.floor(
                             (Score.pure * 10000000.0 / ChartInfo.notes)