♻️ refactor(graphql/GetTalksForTag): replace lastRelevant_DESC

ythecombinator · Feb 28, 2024 · 514723f · 514723f
1 parent f819cc8
commit 514723f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 27 deletions.
diff --git a/src/graphql/GetTalksForTag.graphql b/src/graphql/GetTalksForTag.graphql
@@ -1,14 +1,15 @@
 query GetTalksForTag($tag: String, $limit: Int) {
-  talkCollection(
-    where: { contentfulMetadata: { tags: { id_contains_some: [$tag] } } }
-    order: lastRelevant_DESC
-    limit: $limit
-  ) {
+  talkCollection(where: { contentfulMetadata: { tags: { id_contains_some: [$tag] } } }, limit: $limit) {
     items {
       title
       slug
       sessionsCollection {
         total
+        items {
+          event {
+            endingDate
+          }
+        }
       }
     }
   }

diff --git a/src/graphql/schema.ts b/src/graphql/schema.ts
@@ -2457,7 +2457,7 @@ export type GetTalksForTagQueryVariables = Exact<{
 }>;
 
 
-export type GetTalksForTagQuery = { __typename?: 'Query', talkCollection?: { __typename?: 'TalkCollection', items: Array<{ __typename?: 'Talk', title?: string | null, slug?: string | null, sessionsCollection?: { __typename?: 'TalkSessionsCollection', total: number } | null } | null> } | null };
+export type GetTalksForTagQuery = { __typename?: 'Query', talkCollection?: { __typename?: 'TalkCollection', items: Array<{ __typename?: 'Talk', title?: string | null, slug?: string | null, sessionsCollection?: { __typename?: 'TalkSessionsCollection', total: number, items: Array<{ __typename?: 'Session', event?: { __typename?: 'Event', endingDate?: any | null } | null } | null> } | null } | null> } | null };
 
 export type GetTalksStatsQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -2763,14 +2763,18 @@ export const GetTalksForTagDocument = gql`
     query GetTalksForTag($tag: String, $limit: Int) {
   talkCollection(
     where: {contentfulMetadata: {tags: {id_contains_some: [$tag]}}}
-    order: lastRelevant_DESC
     limit: $limit
   ) {
     items {
       title
       slug
       sessionsCollection {
         total
+        items {
+          event {
+            endingDate
+          }
+        }
       }
     }
   }

diff --git a/src/services/content/talks.ts b/src/services/content/talks.ts
@@ -160,24 +160,8 @@ export default class TalksContentService {
 //  ---------------------------------------------------------------------------
 
 const allTransformer = (result: GetAllTalksQuery) => {
-  const items = [...(result as DeepNonNullable<GetAllTalksQuery>).talkCollection.items];
-
-  const sorted = items.sort(function (talkA, talkB) {
-    const aSessions = [...talkA.sessionsCollection.items];
-    const bSessions = [...talkB.sessionsCollection.items];
-
-    const latestA = aSessions.sort((sessionA, sessionB) => {
-      const sub = new Date(sessionB.event.endingDate).getTime() - new Date(sessionA.event.endingDate).getTime();
-      return sub;
-    })[0];
-
-    const latestB = bSessions.sort((sessionA, sessionB) => {
-      const sub = new Date(sessionB.event.endingDate).getTime() - new Date(sessionA.event.endingDate).getTime();
-      return sub;
-    })[0];
-
-    return new Date(latestB.event.endingDate).getTime() - new Date(latestA.event.endingDate).getTime();
-  });
+  const items = extractTalkCollectionItems(result);
+  const sorted = items.sort(talksSorter);
 
   return sorted.map((item) => {
     const { title, category, abstract, slug, sessionsCollection, contentfulMetadata } = item;
@@ -218,9 +202,10 @@ const featuredTransformer = (result: GetFeaturedTalksQuery) => {
 };
 
 const talksPerTagTransformer = (result: GetTalksForTagQuery) => {
-  const items = (result as DeepNonNullable<GetTalksForTagQuery>).talkCollection.items;
+  const items = extractTalkCollectionItems(result);
+  const sorted = items.sort(talksSorter);
 
-  return items.map((item) => ({
+  return sorted.map((item) => ({
     talkTitle: item.title,
     talkSlug: `/${Routes.talks}/${item.slug}`,
     sessionsCount: item.sessionsCollection.total,
@@ -281,6 +266,27 @@ const transformers = {
 //  TRANSFORMERS: UTILS
 //  ---------------------------------------------------------------------------
 
+function extractTalkCollectionItems(result: GetAllTalksQuery | GetTalksForTagQuery) {
+  return [...(result as DeepNonNullable<GetAllTalksQuery>).talkCollection.items] as DeepNonNullable<Talk>[];
+}
+
+function talksSorter(talkA: DeepNonNullable<Talk>, talkB: DeepNonNullable<Talk>) {
+  const aSessions = [...talkA.sessionsCollection.items];
+  const bSessions = [...talkB.sessionsCollection.items];
+
+  const latestA = aSessions.sort((sessionA, sessionB) => {
+    const sub = new Date(sessionB.event.endingDate).getTime() - new Date(sessionA.event.endingDate).getTime();
+    return sub;
+  })[0];
+
+  const latestB = bSessions.sort((sessionA, sessionB) => {
+    const sub = new Date(sessionB.event.endingDate).getTime() - new Date(sessionA.event.endingDate).getTime();
+    return sub;
+  })[0];
+
+  return new Date(latestB.event.endingDate).getTime() - new Date(latestA.event.endingDate).getTime();
+}
+
 const locationTransformer = (city: City) => `${city.name}, ${city.country?.name} ${city.country?.flag} `;
 
 const sessionTransformer = (session: DeepNonNullable<Session>) => ({