From ca6f43d443743e60c2e7bdb422c5fb16a410fde5 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Mon, 30 Sep 2024 07:18:13 +0100
Subject: [PATCH] fix player history

---
 src/app/(pages)/api/player/history/route.ts |  9 +----
 src/common/schema/player-schema.ts          | 42 +++++++++++++++++++--
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/app/(pages)/api/player/history/route.ts b/src/app/(pages)/api/player/history/route.ts
index f5ed437..371a46d 100644
--- a/src/app/(pages)/api/player/history/route.ts
+++ b/src/app/(pages)/api/player/history/route.ts
@@ -35,12 +35,5 @@ export async function GET(request: NextRequest) {
     return NextResponse.json({ error: "Player not found" }, { status: 404 });
   }
 
-  const history: Map<string, PlayerHistory> = foundPlayer.getStatisticHistory();
-  let fetchedHistory = sortPlayerHistory(history);
-  fetchedHistory = fetchedHistory.slice(-50); // Get the last 50 entries
-  const resultHistory: { [key: string]: PlayerHistory } = {};
-  for (const [date, history] of fetchedHistory) {
-    resultHistory[date] = history;
-  }
-  return NextResponse.json(resultHistory);
+  return NextResponse.json(foundPlayer.getHistoryPrevious(50));
 }
diff --git a/src/common/schema/player-schema.ts b/src/common/schema/player-schema.ts
index a215fd1..e81ad35 100644
--- a/src/common/schema/player-schema.ts
+++ b/src/common/schema/player-schema.ts
@@ -1,7 +1,12 @@
 import mongoose, { Document, Schema } from "mongoose";
 import { PlayerHistory } from "@/common/player/player-history";
-import { formatDateMinimal, getMidnightAlignedDate } from "@/common/time-utils";
+import {
+  formatDateMinimal,
+  getDaysAgo,
+  getMidnightAlignedDate,
+} from "@/common/time-utils";
 import ScoreSaberPlayer from "@/common/model/player/impl/scoresaber-player";
+import { sortPlayerHistory } from "@/common/player-utils";
 
 // Interface for Player Document
 export interface IPlayer extends Document {
@@ -32,6 +37,8 @@ export interface IPlayer extends Document {
 
   /**
    * Gets when this player was last tracked.
+   *
+   * @returns the date when the player was last tracked
    */
   getLastTracked(): Date;
 
@@ -39,11 +46,22 @@ export interface IPlayer extends Document {
    * Gets the history for the given date
    *
    * @param date
+   * @returns the player history
    */
-  getHistory(date: Date): PlayerHistory;
+  getHistoryByDate(date: Date): PlayerHistory;
+
+  /**
+   * Gets the history for the previous X days
+   *
+   * @param amount the amount of days
+   * @returns the player history
+   */
+  getHistoryPrevious(amount: number): { [key: string]: PlayerHistory };
 
   /**
    * Gets all the statistic history
+   *
+   * @returns the statistic history
    */
   getStatisticHistory(): Map<string, PlayerHistory>;
 
@@ -57,6 +75,8 @@ export interface IPlayer extends Document {
 
   /**
    * Sorts the statistic history
+   *
+   * @returns the sorted statistic history
    */
   sortStatisticHistory(): Map<string, PlayerHistory>;
 }
@@ -74,7 +94,7 @@ PlayerSchema.methods.getLastTracked = function (): Date {
   return this.ked || new Date();
 };
 
-PlayerSchema.methods.getHistory = function (date: Date): PlayerHistory {
+PlayerSchema.methods.getHistoryByDate = function (date: Date): PlayerHistory {
   return (
     this.statisticHistory.get(
       formatDateMinimal(getMidnightAlignedDate(date)),
@@ -82,6 +102,22 @@ PlayerSchema.methods.getHistory = function (date: Date): PlayerHistory {
   );
 };
 
+PlayerSchema.methods.getHistoryPrevious = function (amount: number): {
+  [key: string]: PlayerHistory;
+} {
+  const toReturn: { [key: string]: PlayerHistory } = {};
+  const history = sortPlayerHistory(this.getStatisticHistory());
+
+  for (let [date, stat] of history) {
+    const parsedDate = new Date(date);
+    if (getDaysAgo(parsedDate) + 1 <= amount) {
+      toReturn[date] = stat;
+    }
+  }
+
+  return toReturn;
+};
+
 PlayerSchema.methods.getStatisticHistory = function (): Map<
   Date,
   PlayerHistory