Filter out invalid entries in analytics

Prodeko · May 8, 2024 · 9fa81b9 · 9fa81b9
1 parent bbb6025
commit 9fa81b9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/src/analytics/rankings.ts b/src/analytics/rankings.ts
@@ -12,7 +12,8 @@ const topUsersByGuild = async (guild: string, limit: number) => {
     FROM
       "Entry" JOIN "User" ON "Entry"."userId" = "User"."telegramUserId"
     WHERE
-      "guild" = ${guild}
+      "guild" = ${guild} AND
+      "Entry"."valid" IS NOT FALSE
     GROUP BY
       "userId",
       "telegramUsername",

diff --git a/src/analytics/statistics.ts b/src/analytics/statistics.ts
@@ -31,6 +31,8 @@ export async function calculateGuildStatistics(
 			COUNT(DISTINCT "userId") as "uniqueParticipants"
 		FROM
 			"Entry" JOIN "User" ON "Entry"."userId" = "User"."telegramUserId"
+		WHERE
+			"Entry"."valid" IS NOT FALSE
 		GROUP BY
 			guild
 	`) as Aggregate[];
@@ -41,6 +43,8 @@ export async function calculateGuildStatistics(
 				"userId"
 			FROM
 				"Entry"
+			WHERE
+				"Entry"."valid" IS NOT FALSE	
 			GROUP BY
 				"userId"
 			HAVING
@@ -65,7 +69,8 @@ export async function calculateGuildStatistics(
 			FROM
 				"Entry" JOIN "User" ON "Entry"."userId" = "User"."telegramUserId"
 			WHERE
-				"Entry"."createdAt" BETWEEN ${periodStart} AND ${periodEnd}
+				("Entry"."createdAt" BETWEEN ${periodStart} AND ${periodEnd}) AND
+				"Entry"."valid" IS NOT FALSE
 			GROUP BY
 				guild
 		),
@@ -76,7 +81,8 @@ export async function calculateGuildStatistics(
 			FROM
 				"Entry" JOIN "User" ON "Entry"."userId" = "User"."telegramUserId"
 			WHERE
-				"Entry"."createdAt" < ${periodStart}
+				"Entry"."createdAt" < ${periodStart} AND
+				"Entry"."valid" IS NOT FALSE
 			GROUP BY
 				guild
 		)

diff --git a/src/analytics/timeseries.ts b/src/analytics/timeseries.ts
@@ -13,6 +13,8 @@ export const getTimeSeriesData = async (): Promise<TimeSeriesData> => {
                 SUM("earnedPoints") as "totalPoints"
             FROM
                 "Entry" JOIN "User" ON "Entry"."userId" = "User"."telegramUserId"
+            WHERE
+                "Entry"."valid" IS NOT FALSE
             GROUP BY
                 "date",
                 "guild"

diff --git a/src/launchBotDependingOnNodeEnv.ts b/src/launchBotDependingOnNodeEnv.ts
@@ -11,7 +11,7 @@ import app, { launchServer } from "./server";
  */
 async function launchLongPollBot(bot: Telegraf<Context<Update>>) {
 	launchServer();
-	await bot.launch();
+	// await bot.launch();
 }
 
 /**