From 161d2a15155dc06322ae810009410f4102342ea9 Mon Sep 17 00:00:00 2001
From: slawk0 <justgetahouse4@pm.me>
Date: Wed, 4 Sep 2024 22:25:48 +0200
Subject: [PATCH] fixed db connection on first build in docker

---
 backend/db.js     |  5 -----
 backend/socket.js | 13 ++++++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backend/db.js b/backend/db.js
index a68fec2..d71fd95 100644
--- a/backend/db.js
+++ b/backend/db.js
@@ -50,11 +50,6 @@ async function createTables() {
     }
 }
 
-createTables()
-    .catch((err) => {
-        console.error('Error creating tables:', err);
-    });
-
 // function for checking if user exists
 async function isUserExists(username) {
     try {
diff --git a/backend/socket.js b/backend/socket.js
index bcdc850..43a1663 100644
--- a/backend/socket.js
+++ b/backend/socket.js
@@ -27,7 +27,7 @@ function initializeSocket(server) {
             next(new Error('Not logged in'));
         }
     });
-fdjklsdfjkldfsjklsdfjklsdfkljsdf
+
     io.on('connection', (socket) => {
 
         if (!socket.user) {
@@ -36,7 +36,8 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
             return;
         }
         const username = socket.user.username;
-        console.log(username + ' connected');
+        // useless option for log in users activity but why
+        //console.log(username + ' connected');
 
         // Join a room with the user's username
         socket.join(username);
@@ -62,7 +63,6 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
 
                 if (result.rows.length > 0) {
                     const newMessage = result.rows[0];
-                    const formattedMessage = `Username: ${newMessage.username}, recipient: ${newMessage.recipient}, message: ${newMessage.content}`;
                     //console.log(formattedMessage);
 
                     // Emit message to the sender's and recipient's rooms
@@ -72,7 +72,7 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
                 console.error('Error fetching inserted message:', err);
             }
 
-            // i think this is not needed? (it cause duplicate messages with loading messages history)
+            // I think this is not needed? (it cause duplicate messages with loading messages history)
             // if (!socket.recovered) {
             //     try {
             //         const query = 'SELECT id, content, username, recipient FROM messages WHERE id > $1 ORDER BY id ASC';
@@ -103,7 +103,9 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
 
                 if (result.rows.length > 0) {
                     //const { username: sender, recipient: receiver, content: content, id: id } = result.rows;
-                    console.log('Sending historical messages');
+
+                    // useless option
+                    //console.log('Sending historical messages');
                     socket.emit('messages history', result.rows);
                 } else {
                     io.emit('no messages', );
@@ -113,6 +115,7 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
             }
         });
 
+
         // disconnect event
         socket.on('disconnect', () => {
             console.log(username + ' has disconnected');