From da3a5181df0eb0c91caac83590c9e5245f17dcb1 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Tue, 29 Oct 2024 14:32:16 +0100
Subject: [PATCH] Fix connection things

---
 api/.env.example               | 9 +++++++++
 api/src/controllers/entries.ts | 2 ++
 api/src/db/index.ts            | 8 ++++++--
 api/src/index.ts               | 9 +--------
 4 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 api/.env.example

diff --git a/api/.env.example b/api/.env.example
new file mode 100644
index 00000000..dfd8f53b
--- /dev/null
+++ b/api/.env.example
@@ -0,0 +1,9 @@
+# vi: ft=sh
+# shellcheck disable=SC2034
+
+
+POSTGRES_USER=kyoo
+POSTGRES_PASSWORD=password
+POSTGRES_DB=kyooDB
+POSTGRES_SERVER=postgres
+POSTGRES_PORT=5432
diff --git a/api/src/controllers/entries.ts b/api/src/controllers/entries.ts
index 18d659cf..45941576 100644
--- a/api/src/controllers/entries.ts
+++ b/api/src/controllers/entries.ts
@@ -1,2 +1,4 @@
+import { Elysia } from "elysia";
+
 export const EntriesController = new Elysia()
 	.get('/entries', () => "hello");
diff --git a/api/src/db/index.ts b/api/src/db/index.ts
index 980d98b0..e336c6ad 100644
--- a/api/src/db/index.ts
+++ b/api/src/db/index.ts
@@ -1,8 +1,12 @@
 import { drizzle } from "drizzle-orm/node-postgres";
 
-const db = drizzle({
+export const db = drizzle({
 	connection: {
-		connectionString: process.env.DATABASE_URL!,
+		user: process.env.POSTGRES_USER ?? "kyoo",
+		password: process.env.POSTGRES_PASSWORD ?? "password",
+		database: process.env.POSTGRES_DB ?? "kyooDB",
+		host: process.env.POSTGRES_SERVER ?? "postgres",
+		port: Number(process.env.POSTGRES_PORT) || 5432,
 		ssl: true,
 	},
 	casing: "snake_case",
diff --git a/api/src/index.ts b/api/src/index.ts
index f43b0f3b..240bb828 100644
--- a/api/src/index.ts
+++ b/api/src/index.ts
@@ -1,15 +1,8 @@
 import { Elysia } from "elysia";
 import { swagger } from "@elysiajs/swagger";
-import { drizzle } from "drizzle-orm/node-postgres";
+import { db } from "./db";
 import { migrate } from "drizzle-orm/node-postgres/migrator";
 
-if (!process.env.DATABASE_URL) {
-	console.error("Missing `DATABASE_URL` environment variable. Exiting");
-	process.exit(1);
-}
-
-const db = drizzle(process.env.DATABASE_URL);
-
 await migrate(db, { migrationsFolder: "" });
 
 const app = new Elysia()