From 63f5ba8ce72c0eb1e97b75161a197d2cf5aa47b7 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 26 Mar 2022 17:34:07 +0200
Subject: [PATCH] Load less stuff in memory for leaderboards

---
 app/core/mmr/leaderboards.ts | 8 ++------
 app/models/Skill.server.ts   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/core/mmr/leaderboards.ts b/app/core/mmr/leaderboards.ts
index 610533321..6d7099df4 100644
--- a/app/core/mmr/leaderboards.ts
+++ b/app/core/mmr/leaderboards.ts
@@ -1,16 +1,15 @@
 import { Skill } from "@prisma/client";
 import { AMOUNT_OF_ENTRIES_REQUIRED_FOR_LEADERBOARD } from "~/constants";
-import { UserLean } from "~/utils";
 import { muSigmaToSP } from "./utils";
 
 export interface LeaderboardEntry {
   MMR: number;
-  user: UserLean;
+  user: { id: string; discordName: string };
   entries: number;
 }
 type SkillInput = Pick<Skill, "mu" | "sigma" | "userId"> & {
   match: { createdAt: Date } | null;
-  user: UserLean;
+  user: { id: string; discordName: string };
 };
 type UserId = string;
 
@@ -35,9 +34,6 @@ export function skillsToLeaderboard(skills: SkillInput[]): LeaderboardEntry[] {
       peakMMR[skill.userId] = {
         MMR,
         user: {
-          discordAvatar: skill.user.discordAvatar,
-          discordDiscriminator: skill.user.discordDiscriminator,
-          discordId: skill.user.discordId,
           discordName: skill.user.discordName,
           id: skill.user.id,
         },
diff --git a/app/models/Skill.server.ts b/app/models/Skill.server.ts
index 3eaa7b3f1..8fc949057 100644
--- a/app/models/Skill.server.ts
+++ b/app/models/Skill.server.ts
@@ -25,7 +25,7 @@ export function findAllByMonth({
   const to = new Date(Date.UTC(year, month, 0));
 
   return db.skill.findMany({
-    include: { match: true, user: true },
+    include: { match: { select: { createdAt: true } }, user: true },
     where: {
       match: { AND: [{ createdAt: { gte: from } }, { createdAt: { lt: to } }] },
     },