From a0aa85c247bec9d8edeee8d51d030b37d90e9ca1 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 22 Apr 2023 11:09:02 +0300
Subject: [PATCH] Rename query function

---
 .../badges/{countsByUserId.sql => findByOwnerId.sql}   | 10 +++++++++-
 app/db/models/badges/queries.server.ts                 | 10 +++++-----
 app/routes/u.$identifier.tsx                           |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
 rename app/db/models/badges/{countsByUserId.sql => findByOwnerId.sql} (69%)

diff --git a/app/db/models/badges/countsByUserId.sql b/app/db/models/badges/findByOwnerId.sql
similarity index 69%
rename from app/db/models/badges/countsByUserId.sql
rename to app/db/models/badges/findByOwnerId.sql
index 1fa602c6c..6f16c0e99 100644
--- a/app/db/models/badges/countsByUserId.sql
+++ b/app/db/models/badges/findByOwnerId.sql
@@ -13,4 +13,12 @@ group by
   "BadgeOwner"."badgeId",
   "BadgeOwner"."userId"
 order by
-  "Badge"."id" = (select "favoriteBadgeId" from "User" where "id" = @userId) desc, "Badge"."id" asc
+  "Badge"."id" = (
+    select
+      "favoriteBadgeId"
+    from
+      "User"
+    where
+      "id" = @userId
+  ) desc,
+  "Badge"."id" asc
diff --git a/app/db/models/badges/queries.server.ts b/app/db/models/badges/queries.server.ts
index 0434830d3..a0d550254 100644
--- a/app/db/models/badges/queries.server.ts
+++ b/app/db/models/badges/queries.server.ts
@@ -5,7 +5,7 @@ import deleteManyManagersSql from "./deleteManyManagers.sql";
 import createManagerSql from "./createManager.sql";
 import deleteManyOwnersSql from "./deleteManyOwners.sql";
 import createOwnerSql from "./createOwner.sql";
-import countsByUserIdSql from "./countsByUserId.sql";
+import findByOwnerIdSql from "./findByOwnerId.sql";
 import findAllSql from "./findAll.sql";
 import ownersByBadgeIdSql from "./ownersByBadgeId.sql";
 import managersByBadgeIdSql from "./managersByBadgeId.sql";
@@ -57,16 +57,16 @@ export const upsertManyOwners = sql.transaction(
   }
 );
 
-const countsByUserIdStm = sql.prepare(countsByUserIdSql);
+const findByOwnerIdStm = sql.prepare(findByOwnerIdSql);
 
-export type CountsByUserId = Array<
+export type FindByOwnerId = Array<
   Pick<Badge, "code" | "displayName" | "id" | "hue"> & {
     count: number;
   }
 >;
 
-export function countsByUserId(userId: User["id"]) {
-  return countsByUserIdStm.all({ userId }) as CountsByUserId;
+export function findByOwnerId(userId: User["id"]) {
+  return findByOwnerIdStm.all({ userId }) as FindByOwnerId;
 }
 
 const findAllStm = sql.prepare(findAllSql);
diff --git a/app/routes/u.$identifier.tsx b/app/routes/u.$identifier.tsx
index 4bf0994b9..83aabe6b8 100644
--- a/app/routes/u.$identifier.tsx
+++ b/app/routes/u.$identifier.tsx
@@ -92,7 +92,7 @@ export const loader = ({ params }: LoaderArgs) => {
     team: user.team,
     country: user.country,
     css: canAddCustomizedColorsToUserProfile(user) ? user.css : undefined,
-    badges: db.badges.countsByUserId(user.id),
+    badges: db.badges.findByOwnerId(user.id),
     results: db.calendarEvents.findResultsByUserId(user.id),
     buildsCount: db.builds.countByUserId(user.id),
     vods: findVods({ userId: user.id }),