Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

69 account page pagination approve decline multiple #67

Merged
merged 5 commits into from
Apr 28, 2024
Merged

69 account page pagination approve decline multiple #67

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41092c3
added keyword search for approved-accounts route
Apr 16, 2024
d21f633
changed approved-acounts route for pagination
Apr 17, 2024
c8fe1a2
added query in pending accounts for admin and student
chloecheng8 Apr 21, 2024
2f534e7
fixed userCount returning based on search
Apr 22, 2024
73e48da
Merge branch 'dev' into 69-account-page-pagination-approve-decline-mu…
ThatMegamind Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 42 additions & 8 deletions routes/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const express = require('express');
const { keysToCamel } = require('../common/utils');
const { keysToCamel, isInteger } = require('../common/utils');
const { db } = require('../server/db');

const userRouter = express.Router();
Expand All @@ -17,9 +17,14 @@ userRouter.get('/', async (req, res) => {

userRouter.get('/pending-accounts', async (req, res) => {
try {
const pendingAccounts = await db.query(
`SELECT * FROM users WHERE approved = FALSE ORDER BY first_name ASC;`,
);
const { accountType } = req.query;
let queryString = 'SELECT * FROM users WHERE approved = FALSE ';
if (accountType === 'admin') {
queryString += `AND type = 'admin'`;
} else if (accountType === 'student') {
queryString += `AND type = 'student'`;
}
const pendingAccounts = await db.query(`${queryString} ORDER BY first_name ASC;`);
res.status(200).json(keysToCamel(pendingAccounts));
} catch (err) {
res.status(500).send(err.message);
Expand All @@ -28,10 +33,39 @@ userRouter.get('/pending-accounts', async (req, res) => {

userRouter.get('/approved-accounts', async (req, res) => {
try {
const pendingAccounts = await db.query(
`SELECT * FROM users WHERE approved = TRUE ORDER BY first_name ASC;`,
);
res.status(200).json(keysToCamel(pendingAccounts));
const { keyword, accountType } = req.query;
let { page, limit } = req.query;
page = isInteger(page) ? parseInt(page, 10) : 1;
limit = isInteger(limit) ? parseInt(limit, 10) : 10;
const offset = (page - 1) * limit;
let queryString = 'FROM users WHERE approved = TRUE ';
if (accountType === 'admin') {
queryString += `AND type = 'admin'`;
} else if (accountType === 'student') {
queryString += `AND type = 'student'`;
}
let approvedAccounts;
let userCount;
let params = [];
if (keyword) {
params = [`%${keyword}%`, `%${keyword}%`, `%${keyword}%`, `%${keyword}%`, limit, offset];
approvedAccounts = await db.query(
`SELECT * ${queryString} AND (first_name ILIKE $1 OR last_name ILIKE $2 OR email ILIKE $3 OR CONCAT(first_name, ' ', last_name) ILIKE $4) ORDER BY first_name ASC LIMIT $5 OFFSET $6;`,
params,
);
userCount = await db.query(
`SELECT COUNT(*) ${queryString} AND (first_name ILIKE $1 OR last_name ILIKE $2 OR email ILIKE $3 OR CONCAT(first_name, ' ', last_name) ILIKE $4);`,
params,
);
} else {
params = [limit, offset];
approvedAccounts = await db.query(
`SELECT * ${queryString} ORDER BY first_name ASC LIMIT $1 OFFSET $2;`,
params,
);
userCount = await db.query(`SELECT COUNT(*) ${queryString};`, params);
}
res.status(200).json(keysToCamel({ accounts: approvedAccounts, count: userCount }));
} catch (err) {
res.status(500).send(err.message);
}
Expand Down
Loading