Merge branch 'dev' into 21-set-up-nodemailer-backend

Author: SubinQKim

app.js

@@ -3,8 +3,13 @@ const cors = require('cors');
 
 require('dotenv').config();
 
+// routes
+const users = require('./routes/users');
+
 const app = express();
 
+const catalogRouter = require('./routes/catalog');
+
 const PORT = process.env.PORT || 3001;
 
 app.use(
@@ -15,6 +20,9 @@ app.use(
 
 // add all routes under here
 app.use(express.json()); // for req.body
+app.use('/users', users);
+
+app.use('/catalog', catalogRouter);
 
 app.listen(PORT, () => {
   console.log(`Server listening on ${PORT}`);

routes/catalog.js

@@ -0,0 +1,92 @@
+const express = require('express');
+
+const { db } = require('../server/db');
+
+const catalogRouter = express.Router();
+const { keysToCamel } = require('../common/utils');
+
+// -- GET - Returns all data from the catalog table
+catalogRouter.get('/', async (req, res) => {
+  try {
+    const allInfo = await db.query(`SELECT * from catalog;`);
+    res.status(200).json(keysToCamel(allInfo));
+  } catch (err) {
+    res.status(500).send(err.message);
+  }
+});
+
+// -- GET/:id - Returns the row that matches the id
+catalogRouter.get('/:id', async (req, res) => {
+  try {
+    const { id } = req.params;
+    const allUsers = await db.query(`SELECT * FROM catalog WHERE id = $1;`, [id]);
+    res.status(200).json(keysToCamel(allUsers));
+  } catch (err) {
+    res.status(500).send(err.message);
+  }
+});
+
+// -- POST - Adds a new row to the catalog table
+catalogRouter.post('/', async (req, res) => {
+  const { id, host, title, eventType, subject, description, year } = req.body;
+  try {
+    await db.query(
+      `INSERT INTO catalog (id, host, title, event_type, subject, description, year)
+      VALUES ($1, $2, $3, $4, $5, $6, $7);`,
+      [id, host, title, eventType, subject, description, year],
+    );
+    res.status(201).json({ id, status: 'Success' });
+  } catch (err) {
+    res.status(500).json({
+      status: 'Failed',
+      msg: err.message,
+    });
+  }
+});
+
+// -- PUT - Updates an existing row given an id
+// -- All fields are optional
+catalogRouter.put('/:id', async (req, res) => {
+  try {
+    const { id } = req.params;
+    const { host, title, eventType, subject, description, year } = req.body;
+
+    const updatedCatalog = await db.query(
+      `UPDATE catalog SET 
+       ${host ? 'host = $(host), ' : ''}
+       ${title ? 'title = $(title),' : ''}
+       ${eventType ? 'event_type = $(eventType), ' : ''}
+       ${subject ? 'subject = $(subject), ' : ''}
+       ${description ? 'description = $(description), ' : ''}
+       ${year ? 'year = $(year), ' : ''}
+       id = '${id}'
+        WHERE id = '${id}' 
+        RETURNING *;`,
+      {
+        host,
+        title,
+        eventType,
+        subject,
+        description,
+        year,
+        id,
+      },
+    );
+    res.status(200).send(keysToCamel(updatedCatalog));
+  } catch (err) {
+    res.status(500).send(err.message);
+  }
+});
+
+// -- DELETE - deletes an existing row given an id
+catalogRouter.delete('/:id', async (req, res) => {
+  try {
+    const { id } = req.params;
+    const delUser = await db.query(`DELETE FROM catalog WHERE id = $1 RETURNING *;`, [id]);
+    res.status(200).send(keysToCamel(delUser));
+  } catch (err) {
+    res.status(500).send(err.message);
+  }
+});
+
+module.exports = catalogRouter;

routes/users.js

@@ -0,0 +1,68 @@
+const express = require('express');
+const { keysToCamel } = require('../common/utils');
+const { db } = require('../server/db');
+
+const userRouter = express.Router();
+
+userRouter.get('/', async (req, res) => {
+  try {
+    const allUsers = await db.query(`SELECT * FROM users;`);
+    res.status(200).json(keysToCamel(allUsers));
+  } catch (err) {
+    res.status(500).send(err.message);
+  }
+});
+
+userRouter.get('/pending-accounts', async (req, res) => {
+  try {
+    const pendingAccounts = await db.query(`SELECT * FROM users WHERE approved = FALSE;`);
+    res.status(200).json(keysToCamel(pendingAccounts));
+  } catch (err) {
+    res.status(500).send(err.message);
+  }
+});
+
+userRouter.post('/', async (req, res) => {
+  try {
+    const { id, email, type, approved } = req.body;
+    await db.query(`INSERT INTO users (id, email, "type", approved) VALUES ($1, $2, $3, $4);`, [
+      id,
+      email,
+      type,
+      approved,
+    ]);
+    res.status(201).json({
+      id,
+    });
+  } catch (err) {
+    res.status(500).json({
+      status: 'Failed',
+      msg: err.message,
+    });
+  }
+});
+
+userRouter.put('/:uid', async (req, res) => {
+  try {
+    const { uid } = req.params;
+    const updatedApproval = await db.query(
+      `UPDATE users SET approved = TRUE WHERE id = $1 RETURNING *;`,
+      [uid],
+    );
+    return res.status(200).send(keysToCamel(updatedApproval));
+  } catch (err) {
+    return res.status(500).send(err.message);
+  }
+});
+
+userRouter.delete('/:uid', async (req, res) => {
+  try {
+    const { uid } = req.params;
+    const deletedUser = await db.query(`DELETE FROM users WHERE id = $1 RETURNING *;`, [uid]);
+    res.status(200).send(keysToCamel(deletedUser));
+  } catch (err) {
+    res.status(500).send(err.message);
+  }
+});
+
+module.exports = userRouter;

server/queries/catalog.sql

@@ -2497,4 +2497,4 @@ yallist@^4.0.0:
 yaml@^1.10.0:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==