migrate to new rank/user keys

Author: maslianok

app/by/[rankingType]/[page]/page.tsx

@@ -19,31 +19,31 @@ import { ProfileAvatar } from './components/profile-avatar';
 const ITEMS_PER_PAGE = 100;
 
 function getConfigByRankingType(rankingType: string) {
-  let propName: 'contributedStars' | 'followersCount' | 'ownedStars';
+  let propName: 'c' | 'f' | 's';
   let queryOrder: RankOrder;
   let title: string;
   let subtitle: string;
   let rankingBaseEntity: string;
 
   switch (rankingType) {
     case 'contributions':
-      queryOrder = RankOrder.StarsContributed;
-      propName = 'contributedStars';
+      queryOrder = RankOrder.Contributions;
+      propName = 'c';
       title = 'Contribution ranking';
       subtitle = "Rank is based on the stars from repositories where you've merged pull requests — excluding your own.";
       rankingBaseEntity = 'Stars';
       break;
     case 'followers':
-      queryOrder = RankOrder.FollowersCount;
-      propName = 'followersCount';
+      queryOrder = RankOrder.Followers;
+      propName = 'f';
       title = 'Followers ranking';
       subtitle = 'Rank is based on the number of followers the user has on GitHub.';
       rankingBaseEntity = 'Followers';
       break;
     case 'stars':
     default:
-      queryOrder = RankOrder.StarsOwned;
-      propName = 'ownedStars';
+      queryOrder = RankOrder.Stars;
+      propName = 's';
       title = 'Star ranking';
       subtitle = 'Rank is based on the total number of stars across repositories owned by a user.';
       rankingBaseEntity = 'Stars';

app/by/[rankingType]/[page]/rank-list.query.gql

@@ -1,18 +1,18 @@
 query Rankings($order: RankOrder, $offset: Int) {
   rankings(order: $order, offset: $offset) {
     githubId
-    contributedStars
-    contributedStarsM
-    followersCount
-    followersCountM
-    ownedStars
-    ownedStarsM
+    c
+    cM
+    f
+    fM
+    s
+    sM
     user {
       login
       avatarUrl
-      ownedStars
-      contributedStars
-      followersCount
+      s
+      c
+      f
       location
     }
   }

app/profile/[login]/components/layout-left-column.tsx

@@ -72,7 +72,7 @@ export const LayoutLeftColumn: FC<LayoutLeftColumnProps> = ({ user, children, cl
               Icon={Timer}
             />
             <ProfileListItem
-              value={`${user.followersCount?.toLocaleString('en-US')} followers • ${user.followingCount?.toLocaleString(
+              value={`${user.f?.toLocaleString('en-US')} followers • ${user.followingCount?.toLocaleString(
                 'en-US',
               )} following`}
               Icon={UsersRound}

app/profile/[login]/components/ranks-overview.tsx

@@ -18,28 +18,20 @@ export const RanksOverview: FC<RanksOverviewProps> = ({ ranksData, login }) => {
       <ProfileCardContent>
         <div className="flex items-center">
           ⭐&nbsp;&nbsp;Stars rank:&nbsp;
-          <RankNumber
-            rank={ranksData?.ownedStars}
-            rankPrevious={ranksData?.ownedStarsM}
-            rankProvisional={ranksData?.ownedStarsProvisional}
-          />
+          <RankNumber rank={ranksData?.s} rankPrevious={ranksData?.sM} rankProvisional={ranksData?.sProvisional} />
         </div>
         <div className="flex items-center">
           🔀&nbsp;&nbsp;Contributor rank:&nbsp;
           <RankNumber
-            rank={ranksData?.contributedStars}
-            rankPrevious={ranksData?.contributedStarsM}
-            rankProvisional={ranksData?.contributedStarsProvisional}
+            rank={ranksData?.c}
+            rankPrevious={ranksData?.cM}
+            rankProvisional={ranksData?.cProvisional}
             showDelta={false}
           />
         </div>
         <div className="flex items-center">
           👥&nbsp;&nbsp;Followers rank:&nbsp;
-          <RankNumber
-            rank={ranksData?.followersCount}
-            rankPrevious={ranksData?.followersCountM}
-            rankProvisional={ranksData?.followersCountProvisional}
-          />
+          <RankNumber rank={ranksData?.f} rankPrevious={ranksData?.fM} rankProvisional={ranksData?.fProvisional} />
         </div>
       </ProfileCardContent>
       <ProfileCardActions>

app/profile/[login]/components/repositories-overiview.tsx

@@ -11,17 +11,17 @@ type RepositoriesOverviewProps = {
   topRepoStars?: number;
   contributedRepoCount?: number | null;
   repositoriesCount?: number | null;
-  ownedStars: User['ownedStars'];
-  contributedStars: User['contributedStars'];
+  s: User['s'];
+  c: User['c'];
   login: string;
 };
 
 export const RepositoriesOverview: FC<RepositoriesOverviewProps> = ({
   topRepoStars,
   repositoriesCount,
   contributedRepoCount,
-  ownedStars,
-  contributedStars,
+  s,
+  c,
   login,
 }) => {
   return (
@@ -30,15 +30,15 @@ export const RepositoriesOverview: FC<RepositoriesOverviewProps> = ({
       <ProfileCardContent>
         <p>
           📦&nbsp;&nbsp;Owns {repositoriesCount ?? 0} repos
-          {!!ownedStars && ` • ⭐ ${ownedStars?.toLocaleString('en-US')} total`}
+          {!!s && ` • ⭐ ${s?.toLocaleString('en-US')} total`}
         </p>
         <p>
           🏆&nbsp;&nbsp;Top repository
           {topRepoStars ? ` • ⭐ ${topRepoStars?.toLocaleString('en-US')}` : ' not found ( •_•) 🔍'}
         </p>
         <p>
           🤝&nbsp;&nbsp;Contributed to {contributedRepoCount} repos
-          {!!contributedRepoCount && ` • ⭐ ${contributedStars?.toLocaleString('en-US')} total`}
+          {!!contributedRepoCount && ` • ⭐ ${c?.toLocaleString('en-US')} total`}
         </p>
       </ProfileCardContent>
       <ProfileCardActions>

app/profile/[login]/page.tsx

@@ -16,11 +16,11 @@ export async function generateMetadata({ params }: { params: Promise<{ login: st
     return { title: 'GitHub Profile Analytics & Rankings · GitRanks' };
   }
 
-  const { ownedStars, contributedStars, followersCount } = user.rank ?? {};
+  const { s, c, f } = user.rank ?? {};
 
   return {
     title: `${login} – GitHub Profile Analytics & Rankings · GitRanks`,
-    description: `Explore GitHub analytics for ${login} – ranked #${ownedStars} by stars, #${contributedStars} by contributions, and #${followersCount} by followers. See how your code impacts the world and where you stand in the global developer community with GitRanks.`,
+    description: `Explore GitHub analytics for ${login} – ranked #${s} by stars, #${c} by contributions, and #${f} by followers. See how your code impacts the world and where you stand in the global developer community with GitRanks.`,
     openGraph: {
       images: [user.avatarUrl!],
     },
@@ -50,8 +50,8 @@ export default async function Profile({ params }: { params: Promise<{ login: str
             topRepoStars={user.repositories?.[0]?.stargazerCount ?? 0}
             contributedRepoCount={user.contributedRepoCount}
             repositoriesCount={user.repositoriesCount}
-            ownedStars={user.ownedStars}
-            contributedStars={user.contributedStars}
+            s={user.s}
+            c={user.c}
             login={login}
           />
         </div>

app/profile/[login]/profile-summary.gql

@@ -26,9 +26,9 @@ query User($login: String!) {
     login
     avatarUrl
     location
-    followersCount
-    ownedStars
-    contributedStars
+    f
+    s
+    c
     company
     email
     followingCount
@@ -74,18 +74,15 @@ query User($login: String!) {
       createdAt
     }
     rank {
-      ownedStars
-      ownedStarsProvisional
-      ownedStarsM
-      ownedStarsY
-      contributedStars
-      contributedStarsProvisional
-      contributedStarsM
-      contributedStarsY
-      followersCount
-      followersCountProvisional
-      followersCountM
-      followersCountY
+      s
+      sProvisional
+      sM
+      c
+      cProvisional
+      cM
+      f
+      fProvisional
+      fM
     }
   }
 }

app/profile/[login]/ranks/components/rank-card.tsx

@@ -11,7 +11,6 @@ import { ProfileCard, ProfileCardContent, ProfileCardHeader } from '../../compon
 type RankCardProps = {
   rank?: number | null;
   rankM?: number | null;
-  rankY?: number | null;
   rankProvisional?: number | null;
   showDelta?: boolean;
   title: string;
@@ -24,7 +23,6 @@ export const RankCard: FC<RankCardProps> = ({
   rank,
   rankProvisional,
   rankM,
-  rankY,
   title,
   entityValue,
   entityName,
@@ -43,19 +41,14 @@ export const RankCard: FC<RankCardProps> = ({
         {!!rankPercentile && (
           <RankCardItem Icon={Trophy}>You&apos;re in the top {rankPercentile}% of all users!</RankCardItem>
         )}
-        {(rank !== rankM || rank !== rankY) && showDelta !== false && (
+        {rank !== rankM && showDelta !== false && (
           <RankCardItem Icon={TrendingUp}>
             <span>
               Trend:{' '}
               {rank !== rankM && (
                 <>
                   <RankDelta current={rank} previous={rankM} className="text-base" /> this month;
                 </>
-              )}{' '}
-              {rank !== rankY && (
-                <>
-                  <RankDelta current={rank} previous={rankY} className="text-base" /> this year
-                </>
               )}
             </span>
           </RankCardItem>

app/profile/[login]/ranks/page.tsx

@@ -17,57 +17,41 @@ export default async function ProfileRanks({ params }: { params: Promise<{ login
     notFound();
   }
 
-  const {
-    ownedStars,
-    contributedStars,
-    contributedStarsM,
-    contributedStarsY,
-    followersCount,
-    ownedStarsProvisional,
-    contributedStarsProvisional,
-    followersCountProvisional,
-    ownedStarsM,
-    followersCountM,
-    ownedStarsY,
-    followersCountY,
-  } = user.rank ?? {};
+  const { s, c, cM, f, sProvisional, cProvisional, fProvisional, sM, fM } = user.rank ?? {};
 
-  const bestRankType = getBestRankType({ ownedStars, contributedStars, followersCount });
+  const bestRankType = getBestRankType({ s, c, f });
 
   return (
     <LayoutLeftColumn user={user}>
       <div>
         <div className="flex flex-col md:flex-row flex-wrap gap-6">
           <RankCard
-            rank={ownedStars}
-            rankM={ownedStarsM}
-            rankY={ownedStarsY}
-            rankProvisional={ownedStarsProvisional}
+            rank={s}
+            rankM={sM}
+            rankProvisional={sProvisional}
             title="Stars rank"
-            entityValue={user.ownedStars}
+            entityValue={user.s}
             entityName="stars"
             description="Rank is based on the total number of stars across repositories owned by the user."
           />
 
           <RankCard
-            rank={followersCount}
-            rankM={followersCountM}
-            rankY={followersCountY}
-            rankProvisional={followersCountProvisional}
+            rank={f}
+            rankM={fM}
+            rankProvisional={fProvisional}
             showDelta={false}
             title="Followers rank"
-            entityValue={user.followersCount}
+            entityValue={user.f}
             entityName="followers"
             description="Rank is based on the number of followers the user has on GitHub."
           />
 
           <RankCard
-            rank={contributedStars}
-            rankM={contributedStarsM}
-            rankY={contributedStarsY}
-            rankProvisional={contributedStarsProvisional}
+            rank={c}
+            rankM={cM}
+            rankProvisional={cProvisional}
             title="Contributor rank"
-            entityValue={user.contributedStars}
+            entityValue={user.c}
             entityName="stars"
             description="Rank is based on the total number of stars across repositories where the user has merged pull requests —
               excluding their own repositories."

app/profile/[login]/ranks/utils/get-best-rank-type.ts

@@ -1,20 +1,13 @@
 import { RankingType } from '@/types/ranking.types';
 
-export function getBestRankType(params: {
-  ownedStars?: number | null;
-  contributedStars?: number | null;
-  followersCount?: number | null;
-}): RankingType {
-  const { ownedStars, contributedStars, followersCount } = params;
+export function getBestRankType(params: { s?: number | null; c?: number | null; f?: number | null }): RankingType {
+  const { s, c, f } = params;
 
-  if (
-    (ownedStars || Infinity) < (contributedStars || Infinity) &&
-    (ownedStars || Infinity) < (followersCount || Infinity)
-  ) {
+  if ((s || Infinity) < (c || Infinity) && (s || Infinity) < (f || Infinity)) {
     return RankingType.Star;
   }
 
-  if ((contributedStars || Infinity) < (followersCount || Infinity)) {
+  if ((c || Infinity) < (f || Infinity)) {
     return RankingType.Contribution;
   }