From f30aabf76399ffcccea52707f47f4d0951996925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ante=20Bari=C4=87?= <ante@kickass.website>
Date: Thu, 16 Jan 2025 21:28:56 +0100
Subject: [PATCH] feat: add grouped argument so we can extract grouped dates
 (#2601)

---
 src/schema/users.ts | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/schema/users.ts b/src/schema/users.ts
index 62a45882b..ddc5054bd 100644
--- a/src/schema/users.ts
+++ b/src/schema/users.ts
@@ -602,7 +602,7 @@ export const typeDefs = /* GraphQL */ `
   }
 
   type ReadHistory {
-    date: DateTime!
+    date: String!
     reads: Int!
   }
 
@@ -796,7 +796,16 @@ export const typeDefs = /* GraphQL */ `
     """
     Get a heatmap of reads per day in a given time frame.
     """
-    userReadHistory(id: ID!, after: String!, before: String!): [ReadHistory]
+    userReadHistory(
+      id: ID!
+      after: String!
+      before: String!
+
+      """
+      Group by day stamp yyyy-MM-dd
+      """
+      grouped: Boolean
+    ): [ReadHistory]
     """
     Get the number of articles the user read
     """
@@ -1105,16 +1114,35 @@ export const getUserReadHistory = async ({
   userId,
   after,
   before,
+  grouped,
 }: {
   con: DataSource;
   userId: string;
   after: Date;
   before: Date;
+  grouped?: boolean;
 }) => {
-  return con
+  const readHistoryQuery = con
     .getRepository(ActiveView)
-    .createQueryBuilder('view')
-    .select('view.timestamp', 'date')
+    .createQueryBuilder('view');
+
+  if (grouped) {
+    readHistoryQuery.select(
+      `date_trunc('day', ${timestampAtTimezone})::date::text`,
+      'date',
+    );
+  } else {
+    // format to ISO 8601 because we can't use DateTime of gql due to grouped format
+    readHistoryQuery
+      .select(
+        `to_char(view.timestamp, 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')`,
+        'date',
+      )
+      // limit to 30 events for ungrouped views, reading streak
+      .limit(30);
+  }
+
+  return readHistoryQuery
     .addSelect(`count(*) AS "reads"`)
     .innerJoin(User, 'user', 'user.id = view.userId')
     .where('view.userId = :userId', { userId })
@@ -1130,6 +1158,7 @@ interface ReadingHistyoryArgs {
   after: string;
   before: string;
   limit?: number;
+  grouped?: boolean;
 }
 
 interface userStreakProfileArgs {
@@ -1443,7 +1472,7 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
     },
     userReadHistory: async (
       source,
-      { id, after, before }: ReadingHistyoryArgs,
+      { id, after, before, grouped }: ReadingHistyoryArgs,
       ctx: Context,
     ): Promise<GQLReadingRankHistory[]> =>
       getUserReadHistory({
@@ -1451,6 +1480,7 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
         userId: id,
         after: new Date(after),
         before: new Date(before),
+        grouped,
       }),
     userStreak: async (
       _,