Update app.js

app.js

@@ -5,93 +5,99 @@ const port = 7860;
 
 app.use(express.json());
 
-const client = new Client({
-  host: 'db',
-  user: 'user',
-  password: 'password',
-  database: 'mydatabase',
-  port: 5432,
-});
-
 const connectWithRetry = () => {
+  const client = new Client({
+    host: 'db',
+    user: 'user',
+    password: 'password',
+    database: 'mydatabase',
+    port: 5432,
+  });
+
   client.connect(err => {
     if (err) {
       console.error('Failed to connect to database:', err);
       setTimeout(connectWithRetry, 5000); // wait 5 seconds then retry connection
     } else {
       console.log('Connected to database');
+      initializeRoutes(client);
     }
   });
 };
 
-connectWithRetry();
-
-app.post('/case', (req, res) => {
-  const { caseId, description } = req.body;
-  client.query('INSERT INTO cases (caseId, description) VALUES ($1, $2)', [caseId, description], (err, result) => {
-    if (err) {
-      res.status(500).send(err);
-    } else {
-      res.status(200).send('Case added');
-    }
+const initializeRoutes = (client) => {
+  // Route to handle cases
+  app.post('/case', (req, res) => {
+    const { caseId, description } = req.body;
+    client.query('INSERT INTO cases (caseId, description) VALUES ($1, $2)', [caseId, description], (err, result) => {
+      if (err) {
+        res.status(500).send(err);
+      } else {
+        res.status(200).send('Case added');
+      }
+    });
   });
-});
 
-app.get('/case/:caseId', (req, res) => {
-  const caseId = req.params.caseId;
-  client.query('SELECT * FROM cases WHERE caseId = $1', [caseId], (err, result) => {
-    if (err) {
-      res.status(500).send(err);
-    } else {
-      res.status(200).json(result.rows);
-    }
+  app.get('/case/:caseId', (req, res) => {
+    const caseId = req.params.caseId;
+    client.query('SELECT * FROM cases WHERE caseId = $1', [caseId], (err, result) => {
+      if (err) {
+        res.status(500).send(err);
+      } else {
+        res.status(200).json(result.rows);
+      }
+    });
   });
-});
 
-app.post('/questionnaire', (req, res) => {
-  const { questionnaireId, responses } = req.body;
-  client.query('INSERT INTO questionnaires (questionnaireId, responses) VALUES ($1, $2)', [questionnaireId, responses], (err, result) => {
-    if (err) {
-      res.status(500).send(err);
-    } else {
-      res.status(200).send('Questionnaire added');
-    }
+  // Route to handle questionnaires
+  app.post('/questionnaire', (req, res) => {
+    const { questionnaireId, responses } = req.body;
+    client.query('INSERT INTO questionnaires (questionnaireId, responses) VALUES ($1, $2)', [questionnaireId, responses], (err, result) => {
+      if (err) {
+        res.status(500).send(err);
+      } else {
+        res.status(200).send('Questionnaire added');
+      }
+    });
   });
-});
 
-app.get('/questionnaire/:questionnaireId', (req, res) => {
-  const questionnaireId = req.params.questionnaireId;
-  client.query('SELECT * FROM questionnaires WHERE questionnaireId = $1', [questionnaireId], (err, result) => {
-    if (err) {
-      res.status(500).send(err);
-    } else {
-      res.status(200).json(result.rows);
-    }
+  app.get('/questionnaire/:questionnaireId', (req, res) => {
+    const questionnaireId = req.params.questionnaireId;
+    client.query('SELECT * FROM questionnaires WHERE questionnaireId = $1', [questionnaireId], (err, result) => {
+      if (err) {
+        res.status(500).send(err);
+      } else {
+        res.status(200).json(result.rows);
+      }
+    });
   });
-});
 
-app.post('/jury', (req, res) => {
-  const { juryId, details } = req.body;
-  client.query('INSERT INTO jury (juryId, details) VALUES ($1, $2)', [juryId, details], (err, result) => {
-    if (err) {
-      res.status(500).send(err);
-    } else {
-      res.status(200).send('Jury details added');
-    }
+  // Route to handle jury details
+  app.post('/jury', (req, res) => {
+    const { juryId, details } = req.body;
+    client.query('INSERT INTO jury (juryId, details) VALUES ($1, $2)', [juryId, details], (err, result) => {
+      if (err) {
+        res.status(500).send(err);
+      } else {
+        res.status(200).send('Jury details added');
+      }
+    });
   });
-});
 
-app.get('/jury/:juryId', (req, res) => {
-  const juryId = req.params.juryId;
-  client.query('SELECT * FROM jury WHERE juryId = $1', [juryId], (err, result) => {
-    if (err) {
-      res.status(500).send(err);
-    } else {
-      res.status(200).json(result.rows);
-    }
+  app.get('/jury/:juryId', (req, res) => {
+    const juryId = req.params.juryId;
+    client.query('SELECT * FROM jury WHERE juryId = $1', [juryId], (err, result) => {
+      if (err) {
+        res.status(500).send(err);
+      } else {
+        res.status(200).json(result.rows);
+      }
+    });
   });
-});
+};
+
+connectWithRetry();
 
 app.listen(port, () => {
   console.log(`App running on port ${port}`);
-});
+});