From db2df661ee75d9b915b9c4605021f2f0cdbd5c04 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Fri, 18 Feb 2022 08:46:20 +0200
Subject: [PATCH] Make only one DB query in looking loader

---
 ...nrankedMatchInfo.tsx => FinishedGroup.tsx} |  2 +-
 app/models/LFGGroup.server.ts                 | 21 +++++-------------
 app/routes/play/looking.tsx                   | 22 ++++++++++---------
 3 files changed, 18 insertions(+), 27 deletions(-)
 rename app/components/play/{UnrankedMatchInfo.tsx => FinishedGroup.tsx} (96%)

diff --git a/app/components/play/UnrankedMatchInfo.tsx b/app/components/play/FinishedGroup.tsx
similarity index 96%
rename from app/components/play/UnrankedMatchInfo.tsx
rename to app/components/play/FinishedGroup.tsx
index 432b31525..f6f0c67be 100644
--- a/app/components/play/UnrankedMatchInfo.tsx
+++ b/app/components/play/FinishedGroup.tsx
@@ -4,7 +4,7 @@ import { LookingLoaderData } from "~/routes/play/looking";
 import { Button } from "../Button";
 import { GroupCard } from "./GroupCard";
 
-export function UnrankedMatchInfo() {
+export function FinishedGroup() {
   const data = useLoaderData<LookingLoaderData>();
 
   return (
diff --git a/app/models/LFGGroup.server.ts b/app/models/LFGGroup.server.ts
index d59b45c91..63303c881 100644
--- a/app/models/LFGGroup.server.ts
+++ b/app/models/LFGGroup.server.ts
@@ -185,25 +185,12 @@ export function findLooking() {
       active: true,
       looking: true,
     },
-    select: {
-      id: true,
-      ranked: true,
-      type: true,
-      lastActionAt: true,
+    include: {
       members: {
-        select: {
+        include: {
           user: {
-            select: {
-              id: true,
-              discordAvatar: true,
-              discordDiscriminator: true,
-              discordName: true,
-              discordId: true,
+            include: {
               skill: {
-                select: {
-                  mu: true,
-                  sigma: true,
-                },
                 orderBy: {
                   createdAt: "desc",
                 },
@@ -213,6 +200,8 @@ export function findLooking() {
           },
         },
       },
+      likedGroups: true,
+      likesReceived: true,
     },
     orderBy: {
       createdAt: "desc",
diff --git a/app/routes/play/looking.tsx b/app/routes/play/looking.tsx
index b988739a7..bc72d7bdd 100644
--- a/app/routes/play/looking.tsx
+++ b/app/routes/play/looking.tsx
@@ -12,7 +12,7 @@ import invariant from "tiny-invariant";
 import { z } from "zod";
 import { GroupCard } from "~/components/play/GroupCard";
 import { LookingInfoText } from "~/components/play/LookingInfoText";
-import { UnrankedMatchInfo } from "~/components/play/UnrankedMatchInfo";
+import { FinishedGroup } from "~/components/play/FinishedGroup";
 import { Tab } from "~/components/Tab";
 import { LFG_GROUP_FULL_SIZE } from "~/constants";
 import {
@@ -194,10 +194,12 @@ export interface LookingLoaderData {
 
 export const loader: LoaderFunction = async ({ context }) => {
   const user = requireUser(context);
-  const [ownGroup, allGroups] = await Promise.all([
-    LFGGroup.findActiveByMember(user),
-    LFGGroup.findLooking(),
-  ]);
+  const groups = await LFGGroup.findLooking();
+
+  const ownGroup = groups.find((g) =>
+    g.members.some((m) => m.user.id === user.id)
+  );
+
   if (!ownGroup) return redirect("/play");
   if (ownGroup.matchId) return redirect(`/play/match/${ownGroup.matchId}`);
   if (!ownGroup.looking) return redirect("/play/add-players");
@@ -206,7 +208,7 @@ export const loader: LoaderFunction = async ({ context }) => {
     ownGroup.type === "VERSUS" &&
     ownGroup.members.length === LFG_GROUP_FULL_SIZE;
 
-  const groups = allGroups.filter((g) => g.type === ownGroup.type);
+  const groupsOfType = groups.filter((g) => g.type === ownGroup.type);
 
   const likesGiven = ownGroup.likedGroups.reduce(
     (acc, lg) => acc.add(lg.targetId),
@@ -217,8 +219,8 @@ export const loader: LoaderFunction = async ({ context }) => {
     new Set<string>()
   );
 
-  const isRanked = groups.every((g) => g.ranked);
-  const ownGroupWithMembers = groups.find((g) => g.id === ownGroup.id);
+  const isRanked = groupsOfType.every((g) => g.ranked);
+  const ownGroupWithMembers = groupsOfType.find((g) => g.id === ownGroup.id);
   invariant(ownGroupWithMembers, "ownGroupWithMembers is undefined");
   const ownGroupForResponse: LookingLoaderDataGroup = {
     id: ownGroup.id,
@@ -247,7 +249,7 @@ export const loader: LoaderFunction = async ({ context }) => {
     type: ownGroup.type,
     isCaptain: isGroupAdmin({ group: ownGroup, user }),
     lastActionAtTimestamp: ownGroup.lastActionAt.getTime(),
-    ...groups
+    ...groupsOfType
       .filter(
         (group) =>
           (lookingForMatch && group.members.length === LFG_GROUP_FULL_SIZE) ||
@@ -322,7 +324,7 @@ export default function LookingPage() {
   const lastUpdated = usePolling(isPolling);
 
   if (lookingOver(data.type, data.ownGroup)) {
-    return <UnrankedMatchInfo />;
+    return <FinishedGroup />;
   }
 
   const lookingForMatch = data.ownGroup.members?.length === LFG_GROUP_FULL_SIZE;