From 39e37b6078314de6bf8cdbeff35f728c6d2285f2 Mon Sep 17 00:00:00 2001
From: gprunet <gprunet@42Cursus.myguest.virtualbox.org>
Date: Wed, 7 Jan 2026 17:39:46 +0100
Subject: [PATCH] database + tables creation

---
 docker-compose.yml                  | 41 ++++++++--------
 {docker => srcs}/backend/dockerfile |  6 ++-
 srcs/backend/index.js               | 76 +++++++++++++++++++++++++++++
 srcs/backend/main.js                |  0
 srcs/backend/package.json           |  6 +++
 5 files changed, 107 insertions(+), 22 deletions(-)
 rename {docker => srcs}/backend/dockerfile (56%)
 create mode 100644 srcs/backend/index.js
 delete mode 100644 srcs/backend/main.js
 create mode 100644 srcs/backend/package.json

diff --git a/docker-compose.yml b/docker-compose.yml
index 49bde23..62847d7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ volumes:
 
 networks:
   transcendence:
+    driver: bridge
   
 services:
   database:
@@ -11,39 +12,39 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - data:/var/lib/postgresql/data
+      - data:/var/lib/postgresql/data/pg15/
     env_file:
-      //
+      - ../.env
     networks:
       - transcendence
     restart: always
 
   backend:
     container_name: backend
-    build: ./docker/backend
+    build: ./srcs/backend
     ports:
       - "3001:3001"
     depends_on:
       - database
-    volumes:
-      //
+    # volumes:
+    #   //
     env_file:
-      //
+      - ../.env
     networks:
       - transcendence
     restart: always
 
-  frontend:
-    container_name: frontend
-    build: ./docker/frontend
-    ports:
-      - "3000:3000"
-    depends_on:
-      - backend
-    volumes:
-      //
-    env_file:
-      //
-    networks:
-      - transcendence
-    restart: always
\ No newline at end of file
+  # frontend:
+  #   container_name: frontend
+  #   build: ./docker/frontend
+  #   ports:
+  #     - "3000:3000"
+  #   depends_on:
+  #     - backend
+  #   volumes:
+  #     //
+  #   env_file:
+  #     //
+  #   networks:
+  #     - transcendence
+  #   restart: always
\ No newline at end of file
diff --git a/docker/backend/dockerfile b/srcs/backend/dockerfile
similarity index 56%
rename from docker/backend/dockerfile
rename to srcs/backend/dockerfile
index d4dfcfe..5621044 100644
--- a/docker/backend/dockerfile
+++ b/srcs/backend/dockerfile
@@ -4,7 +4,9 @@ WORKDIR /app
 
 COPY package*.json ./
 
-RUN npm install --production
+RUN npm install
+RUN npm install dotenv
+RUN npm install pg
 
 COPY . .
 
@@ -12,4 +14,4 @@ EXPOSE 3001
 
 ENV NODE_ENV=development
 
-CMD ["node", "server.js"]
\ No newline at end of file
+CMD ["node", "index.js"]
\ No newline at end of file
diff --git a/srcs/backend/index.js b/srcs/backend/index.js
new file mode 100644
index 0000000..66b39bd
--- /dev/null
+++ b/srcs/backend/index.js
@@ -0,0 +1,76 @@
+require('dotenv').config();
+const { Pool } = require('pg');
+
+const pool = new Pool
+({
+	user: process.env.POSTGRES_USER,
+	host: process.env.POSTGRES_HOST,
+	database: process.env.POSTGRES_DB,
+	password: process.env.POSTGRES_PASSWORD,
+	port: 5432,
+});
+
+async function waitForDb(retries = 10, delay = 2000)
+{
+	for (let i = 0; i < retries; i++)
+	{
+		try
+		{
+			await pool.query('SELECT 1');
+			console.log('Database is ready!');
+			return ;
+		}
+		catch (err)
+		{
+			await new Promise(r =>  setTimeout(r, delay));
+		}
+	}
+	throw new Error('Could not connect to database after multiple attempts');
+}
+
+async function createTables()
+{
+	try
+	{
+		await pool.query(`
+			CREATE TABLE IF NOT EXISTS users (
+				id SERIAL PRIMARY KEY,
+				username VARCHAR(50) UNIQUE NOT NULL,
+				email VARCHAR(100),
+				created_at TIMESTAMP DEFAULT NOW()
+			);
+			
+			CREATE TABLE IF NOT EXISTS messages(
+				id SERIAL PRIMARY KEY,
+				sender_id INT REFERENCES users(id),
+				received_id INT REFERENCES users(id),
+				content TEXT,
+				created_at TIMESTAMP DEFAULT NOW()
+			);
+		`);
+		console.log('Tables created!');
+	}
+	catch (err)
+	{
+		console.error('Error creating tables:', err);
+	}
+}
+
+const express = require('express');
+const app = express();
+
+async function startServer()
+{
+	await waitForDb();
+
+	await createTables();
+
+	app.get('/', (req, res) => res.send('Backend running'));
+
+	app.listen(3001, () =>
+	{
+		console.log('Server ready and listening');
+	});
+}
+
+startServer();
\ No newline at end of file
diff --git a/srcs/backend/main.js b/srcs/backend/main.js
deleted file mode 100644
index e69de29..0000000
diff --git a/srcs/backend/package.json b/srcs/backend/package.json
new file mode 100644
index 0000000..3e66dbe
--- /dev/null
+++ b/srcs/backend/package.json
@@ -0,0 +1,6 @@
+{
+	"dependencies":
+	{
+		"express": "^4.18.2"
+	}
+}
\ No newline at end of file