From fcf8a1432199586b5220c439e92280237c41d4f4 Mon Sep 17 00:00:00 2001 From: michellelin1 Date: Mon, 4 Mar 2024 15:11:40 -0800 Subject: [PATCH 1/2] sort events by start time --- routes/publishedSchedule.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/publishedSchedule.js b/routes/publishedSchedule.js index 0008790..b33a70d 100644 --- a/routes/publishedSchedule.js +++ b/routes/publishedSchedule.js @@ -198,6 +198,7 @@ publishedScheduleRouter.get('/season', async (req, res) => { WHERE D.event_date >= $1::date AND D.event_date <= $2::date AND D.id = PS.day_id + ORDER BY PS.start_time ASC ) SELECT event_date, json_build_object ( From 5d962dccfec200695e4feb358c51ae7f51e78108 Mon Sep 17 00:00:00 2001 From: ctc-devops <90984711+ctc-devops@users.noreply.github.com> Date: Mon, 4 Mar 2024 21:10:24 -0800 Subject: [PATCH 2/2] Added names to accounts (#55) * Create a pull trequest for branch 52-add-names-to-accounts * added first and last name to db and create user route --------- Co-authored-by: Cheryl Chen --- routes/users.js | 6 +++--- server/schema/users.sql | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/routes/users.js b/routes/users.js index 9f2b5cd..7f2ce2a 100644 --- a/routes/users.js +++ b/routes/users.js @@ -37,10 +37,10 @@ userRouter.get('/:uid', async (req, res) => { userRouter.post('/create', async (req, res) => { try { - const { id, email, type, approved, approvedOn } = req.body; + const { id, email, type, approved, approvedOn, firstName, lastName } = req.body; await db.query( - `INSERT INTO users (id, email, "type", approved, approved_on) VALUES ($1, $2, $3, $4, $5);`, - [id, email, type, approved, approvedOn], + `INSERT INTO users (id, email, "type", approved, approved_on, first_name, last_name) VALUES ($1, $2, $3, $4, $5, $6, $7);`, + [id, email, type, approved, approvedOn, firstName, lastName], ); res.status(201).json({ id, diff --git a/server/schema/users.sql b/server/schema/users.sql index 785246f..e45297a 100644 --- a/server/schema/users.sql +++ b/server/schema/users.sql @@ -8,4 +8,6 @@ CREATE TABLE users ( type account_type NOT NULL, approved BOOLEAN NOT NULL, approved_on DATE NOT NULL, + first_name VARCHAR(50) NOT NULL, + last_name VARCHAR(50) NOT NULL ); \ No newline at end of file