clean up

Author: nadav867

docker-compose-dev.yml

@@ -6,8 +6,6 @@ services:
     image: postgres
     networks:
       - database
-    ports:
-      - 5432:5432
     env_file:
       - ./database/.env
     restart: always
@@ -30,8 +28,6 @@ services:
       - ./server/.env
     volumes:
       - ./server/src:/app/src
-    links:
-      - postgres_db
     depends_on:
       - postgres_db
     restart: always
@@ -53,8 +49,6 @@ services:
     ports:
       - 3000:3000
     command: npm start
-    links:
-      - server
     stdin_open: true
     restart: always
     container_name: client

docker-compose.yml

@@ -11,8 +11,6 @@ services:
       - database
     depends_on:
       - postgres_db
-    links:
-      - postgres_db
     env_file:
       - ./server/.env
     restart: always
@@ -28,8 +26,6 @@ services:
       - webapp
     ports:
       - 80:80
-    links:
-      - server
     restart: always
     container_name: client
   ##############
@@ -43,8 +39,6 @@ services:
     volumes:
       - ./database/data/prod:/var/lib/postgresql/data/
       - ./database/initdb.sql:/docker-entrypoint-initdb.d/init.sql
-    ports:
-      - 5432:5432
     restart: always
     container_name: postgres_db
 

server/src/api/routes/routes.ts

@@ -8,10 +8,12 @@ router.get('/get_todos', async (req, res) => {
     .connect()
     .then((client) => {
       client.query(
-        `SELECT id,todo,completed,created_at FROM Todolist ORDER BY created_at DESC`,
+        `SELECT * FROM Todolist ORDER BY created_at DESC`,
         (err, queryRes) => {
-          if (err) throw err;
-          res.json({ data: queryRes.rows });
+          if (err) {
+            console.log(err.stack);
+            res.status(500).send();
+          } else res.json({ data: queryRes.rows });
           client.release();
         }
       );
@@ -22,7 +24,7 @@ router.get('/get_todos', async (req, res) => {
 router.post('/create_todo', async (req, res) => {
   const { todo } = req.body;
   const sqlQuery = {
-    text: 'INSERT INTO Todolist(todo) VALUES($1)',
+    text: `INSERT INTO Todolist(todo) VALUES($1)`,
     values: [todo]
   };
   pool
@@ -31,9 +33,8 @@ router.post('/create_todo', async (req, res) => {
       client.query(sqlQuery, (err) => {
         if (err) {
           console.log(err.stack);
-          res.status(500).send({ err: err.stack });
-        }
-        res.status(200).send(true);
+          res.status(500).send();
+        } else res.status(200).send();
         client.release();
       });
     })
@@ -49,9 +50,8 @@ router.put('/update_todo', (req, res) => {
     .then((client) => {
       client.query(sqlQuery, (err) => {
         if (err) {
-          res.status(500).send(err);
-        }
-        res.send();
+          res.status(500).send();
+        } else res.status(200).send();
         client.release();
       });
     })
@@ -66,11 +66,10 @@ router.delete('/delete_todo/', (req, res) => {
     .connect()
     .then((client) => {
       client.query(sqlQuery, (err) => {
-        res.status(200).send(true);
         if (err) {
-          res.status(500).send(err);
+          res.status(500).send();
           console.log(err.stack);
-        }
+        } else res.status(200).send();
       });
       client.release();
     })