From 2c563b95f023225bae6a8789cd68d3cdfc17d2a1 Mon Sep 17 00:00:00 2001
From: manuelurenah <manuel.ureh@hotmail.com>
Date: Thu, 31 Oct 2024 11:41:05 -0400
Subject: [PATCH] Fixes clickhouse connection to run metrics

---
 .env-example                          | 2 +-
 Makefile                              | 6 ++++++
 docker-compose.yml                    | 3 ++-
 src/env/server.mjs                    | 2 +-
 src/server/clickhouse/client.ts       | 2 +-
 src/server/metrics/article.metrics.ts | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.env-example b/.env-example
index ce1a249371..7cd691c8f8 100644
--- a/.env-example
+++ b/.env-example
@@ -74,7 +74,7 @@ NEXT_PUBLIC_ADS=true
 # Clickhouse
 CLICKHOUSE_HOST=http://localhost:18123
 CLICKHOUSE_USERNAME=default
-CLICKHOUSE_PASSWORD=clickhouse
+CLICKHOUSE_PASSWORD=
 CLICKHOUSE_TRACKER_URL=http://localhost:3000
 
 # Email
diff --git a/Makefile b/Makefile
index 313c34fe02..2583c8bfbf 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,12 @@ down:
 .PHONY: restart
 restart: down start
 
+# Rebuilds the containers
+.PHONY: rebuild
+rebuild:
+	docker-compose down \
+		&& docker-compose up --build -d
+
 # Stop and remove all containers, networks, images, and volumes
 .PHONY: burn
 burn:
diff --git a/docker-compose.yml b/docker-compose.yml
index 7407b1571e..272c676b44 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -89,7 +89,8 @@ services:
     restart: unless-stopped
 
   clickhouse:
-    image: clickhouse/clickhouse-server:22.2
+    image: clickhouse/clickhouse-server
+    container_name: clickhouse
     ports:
       - "18123:8123"
       - "19000:9000"
diff --git a/src/env/server.mjs b/src/env/server.mjs
index ce6769465b..889677fd1d 100644
--- a/src/env/server.mjs
+++ b/src/env/server.mjs
@@ -8,7 +8,7 @@ import { env as clientEnv, formatErrors } from './client.mjs';
 import { serverSchema } from './schema.mjs';
 
 if (process.env.NODE_ENV === 'development') {
-  dotenv.config({ path: __dirname + '/../../.env.development' });
+  dotenv.config({ path: ['.env.local', '.env.development'] });
 }
 
 const _serverEnv = serverSchema.safeParse(process.env);
diff --git a/src/server/clickhouse/client.ts b/src/server/clickhouse/client.ts
index 3281f7000d..2c4da78fdb 100644
--- a/src/server/clickhouse/client.ts
+++ b/src/server/clickhouse/client.ts
@@ -69,7 +69,7 @@ function getClickHouse() {
 }
 
 export let clickhouse: CustomClickHouseClient | undefined;
-const shouldConnect = env.CLICKHOUSE_HOST && env.CLICKHOUSE_USERNAME && env.CLICKHOUSE_PASSWORD;
+const shouldConnect = env.CLICKHOUSE_HOST && env.CLICKHOUSE_USERNAME;
 if (shouldConnect) {
   if (isProd) clickhouse = getClickHouse();
   else {
diff --git a/src/server/metrics/article.metrics.ts b/src/server/metrics/article.metrics.ts
index 72248631b5..6aeaaa7d37 100644
--- a/src/server/metrics/article.metrics.ts
+++ b/src/server/metrics/article.metrics.ts
@@ -204,7 +204,7 @@ async function getEngagementTasks(ctx: MetricProcessorRunContext) {
         tf.timeframe,
         ${snippets.timeframeSum('ae."createdAt"')} "hideCount"
       FROM "ArticleEngagement" ae
-      JOIN "Article" a ON a.id = bt."entityId" -- ensure the article exists
+      JOIN "Article" a ON a.id = ae."articleId" -- ensure the article exists
       CROSS JOIN (SELECT unnest(enum_range(NULL::"MetricTimeframe")) AS timeframe) tf
       WHERE "articleId" IN (${ids}) AND ae.type = 'Hide'
       GROUP BY "articleId", tf.timeframe