From d291e3a0e8c1fe3e10ee97c9753a79d0a4e41acb Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Thu, 5 Sep 2024 21:31:24 -0400 Subject: [PATCH 01/11] Prepare seed data --- src/testUsers.json | 470 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 470 insertions(+) create mode 100644 src/testUsers.json diff --git a/src/testUsers.json b/src/testUsers.json new file mode 100644 index 0000000..9234de9 --- /dev/null +++ b/src/testUsers.json @@ -0,0 +1,470 @@ +[ + { + "parentName": "Olaf", + "email": "count.olaf@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": ["Monday", "Wednesday"], + "neighborhood": "French Quarter" + }, + { + "parentName": "Drew Pickles", + "email": "drew.pickles@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday" ], + "availablePickUpDays": [], + "neighborhood": "Toluca Lake" + }, + { + "parentName": "Hal Wilkerson", + "email": "hal.wilkerson@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": [], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Northridge" + }, + { + "parentName": "David Read", + "email": "david.read@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday"], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday"], + "neighborhood": "Elwood City" + }, + { + "parentName": "Delia Ketchum", + "email": "delia.ketchum@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": [], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday"], + "neighborhood": "Pallet Town" + }, + { + "parentName": "Phil Funnie", + "email": "phil.funnie@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": [], + "availablePickUpDays": ["Thursday", "Friday"], + "neighborhood": "Bluffington" + }, + { + "parentName": "Judy Neutron", + "email": "judy.neutron@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Wednesday"], + "availablePickUpDays": ["Monday", "Tuesday", "Friday"], + "neighborhood": "Retroville" + }, + { + "parentName": "Wilma Flintstone", + "email": "wilma.flintstone@test.com", + "password": "secret", + "numberOfSeatsInCar": 5, + "availableDropOffDays": ["Thursday", "Friday"], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Bedrock" + }, + { + "parentName": "George Jetson", + "email": "george.jetson@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": [], + "neighborhood": "Orbit City" + }, + { + "parentName": "Ellen Talbot", + "email": "ellen.talbot@test.com", + "password": "secret", + "numberOfSeatsInCar": 6, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": [], + "neighborhood": "Oakdale" + }, + { + "parentName": "Mary Darling", + "email": "jane.darling@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday", "Thursday", "Friday"], + "availablePickUpDays": ["Tuesday", "Wednesday"], + "neighborhood": "Bloomsbury" + }, + { + "parentName": "Caroline Ingalls", + "email": "caroline.ingalls@test.com", + "password": "secret", + "numberOfSeatsInCar": 4, + "availableDropOffDays": [], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Walnut Grove" + }, + { + "parentName": "Nani Pelekai", + "email": "nani.pelekai@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": [], + "availablePickUpDays": [], + "neighborhood": "Kokaua" + }, + { + "parentName": "Arthur Weasley", + "email": "arthur.weasley@test.com", + "password": "secret", + "numberOfSeatsInCar": 12, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": [], + "neighborhood": "Ottery St. Catchpole" + }, + { + "parentName": "Mary Poppins", + "email": "mary.poppins@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": [], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Kensington" + }, + { + "parentName": "Charlie Jones", + "email": "charlie.jones@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Sellwood-Moreland" + }, + { + "parentName": "Betty Rubble", + "email": "betty.rubble@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": ["Tuesday", "Thursday"], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Bedrock" + }, + { + "parentName": "Elizabeth Brewer", + "email": "elizabeth.brewer@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": [], + "availablePickUpDays": [], + "neighborhood": "Stoneybrook" + }, + { + "parentName": "Richard Spier", + "email": "richard.spier@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday"], + "neighborhood": "Stoneybrook" + }, + { + "parentName": "Narcissa Malfoy", + "email": "narcissa.malfoy@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Wednesday"], + "availablePickUpDays": ["Friday"], + "neighborhood": "Wiltshire" + }, + { + "parentName": "June Cleaver", + "email": "june.cleaver@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Mayfield" + }, + { + "parentName": "Bitzi Baxter", + "email": "bitzi.baxter@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Monday", "Tuesday"], + "availablePickUpDays": [], + "neighborhood": "Elwood City" + }, + { + "parentName": "Hilda/Zelda Spellman", + "email": "hilda.spellman@test.com", + "password": "secret", + "numberOfSeatsInCar": 17, + "availableDropOffDays": ["Monday", "Wednesday", "Friday"], + "availablePickUpDays": ["Monday", "Thursday"], + "neighborhood": "Westbridge" + }, + { + "parentName": "Ann Valentine", + "email": "ann.valentine@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday", "Thursday"], + "availablePickUpDays": ["Monday", "Wednesday"], + "neighborhood": "Bluffington" + }, + { + "parentName": "Josephine Rabbit", + "email": "josephine.rabbit@test.com", + "password": "secret", + "numberOfSeatsInCar": 4, + "availableDropOffDays": ["Monday", "Friday"], + "availablePickUpDays": ["Wednesday", "Thursday"], + "neighborhood": "Lake District" + }, + { + "parentName": "Chas Finster", + "email": "chas.finster@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday"], + "availablePickUpDays": ["Friday"], + "neighborhood": "Toluca Lake" + }, + { + "parentName": "Opal Otter", + "email": "opal.otter@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Wednesday"], + "availablePickUpDays": ["Wednesday"], + "neighborhood": "Lake Hoohaw" + }, + { + "parentName": "Oliver Frensky", + "email": "oliver.frensky@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Monday", "Thursday"], + "availablePickUpDays": ["Tuesday", "Thursday"], + "neighborhood": "Elwood City" + }, + { + "parentName": "Morticia Addams", + "email": "morticia.addams@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Friday"], + "availablePickUpDays": ["Friday"], + "neighborhood": "Sleepy Hallow" + }, + { + "parentName": "Petunia Dursley", + "email": "petunia.dursley@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": ["Monday", "Wednesday"], + "availablePickUpDays": ["Tuesday", "Thursday"], + "neighborhood": "Little Whinging" + }, + { + "parentName": "Danny Tanner", + "email": "danny.tanner@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Thursday"], + "availablePickUpDays": ["Thursday"], + "neighborhood": "Alamo Square" + }, + { + "parentName": "Bob Belcher", + "email": "bob.belcher@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Wednesday", "Friday"], + "availablePickUpDays": ["Monday"], + "neighborhood": "Asbury Park" + }, + { + "parentName": "Miriam Pataki", + "email": "miriam.pataki@test.com", + "password": "secret", + "numberOfSeatsInCar": 4, + "availableDropOffDays": ["Tuesday", "Friday"], + "availablePickUpDays": ["Monday", "Thursday"], + "neighborhood": "Corktown" + }, + { + "parentName": "Chilli(Bandit) Heeler", + "email": "chilli.heeler@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Wednesday"], + "availablePickUpDays": ["Tuesday", "Thursday"], + "neighborhood": "Paddington" + }, + { + "parentName": "Mary Edwards", + "email": "mary.edwards@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday", "Thursday"], + "availablePickUpDays": ["Monday", "Friday"], + "neighborhood": "Mount Bedford" + }, + { + "parentName": "Margaret Kittredge", + "email": "margaret.kittredge@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Monday"], + "availablePickUpDays": ["Wednesday"], + "neighborhood": "Hyde Park" + }, + { + "parentName": "Helen McIntire", + "email": "helen.mcintire@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday", "Friday"], + "availablePickUpDays": ["Thursday"], + "neighborhood": "Jefferson" + }, + { + "parentName": "Ruth Walker", + "email": "ruth.walker@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Monday", "Friday"], + "availablePickUpDays": ["Thursday"], + "neighborhood": "Seventh Ward" + }, + { + "parentName": "Cpt. Ralph Crewe", + "email": "ralph.crewe@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Thursday"], + "availablePickUpDays": ["Wednesday"], + "neighborhood": "Kensington" + }, + { + "parentName": "Karin Larson", + "email": "karin.larson@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday", "Thursday"], + "availablePickUpDays": ["Monday"], + "neighborhood": "Minnesota Territory" + }, + { + "parentName": "John Hiddle", + "email": "john.hiddle@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Friday"], + "availablePickUpDays": ["Tuesday"], + "neighborhood": "Euclid" + }, + { + "parentName": "Martha Merriman", + "email": "martha.merriman@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": ["Monday", "Wednesday"], + "availablePickUpDays": ["Thursday"], + "neighborhood": "Williamsburg" + }, + { + "parentName": "Wayne Szalinski", + "email": "diane.szalinski@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Tuesday"], + "availablePickUpDays": ["Thursday"], + "neighborhood": "Burbank" + }, + { + "parentName": "Kate McCallister", + "email": "kate.mccallister@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Thursday"], + "availablePickUpDays": ["Friday"], + "neighborhood": "Winnetka" + }, + { + "parentName": "Tatsuo Kusakabe", + "email": "tatsuo.kusakabe@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Monday", "Wednesday"], + "availablePickUpDays": ["Thursday"], + "neighborhood": "Tokigawa" + }, + { + "parentName": "Marilla & Matthew Cuthbert", + "email": "matthew.cuthbert@test.com", + "password": "secret", + "numberOfSeatsInCar": 4, + "availableDropOffDays": ["Tuesday", "Friday"], + "availablePickUpDays": ["Wednesday"], + "neighborhood": "Avonlea" + }, + { + "parentName": "Eleanor Little", + "email": "eleanor.little@test.com", + "password": "secret", + "numberOfSeatsInCar": 2, + "availableDropOffDays": ["Monday", "Thursday"], + "availablePickUpDays": ["Wednesday"], + "neighborhood": "Upper West Side" + }, + { + "parentName": "Ray Rocket", + "email": "ray.rocket@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Wednesday", "Friday"], + "availablePickUpDays": ["Thursday"], + "neighborhood": "Ocean Shores" + }, + { + "parentName": "Lois Foutley", + "email": "lois.foutley@test.com", + "password": "secret", + "numberOfSeatsInCar": 1, + "availableDropOffDays": ["Thursday"], + "availablePickUpDays": ["Friday"], + "neighborhood": "Shelterville" + }, + { + "parentName": "Amy Adams", + "email": "amy.adams@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": ["Monday", "Wednesday"], + "availablePickUpDays": ["Friday"], + "neighborhood": "Roxborough" + }, + { + "parentName": "Oliver Warbucks", + "email": "oliver.warbucks@test.com", + "password": "secret", + "numberOfSeatsInCar": 4, + "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "neighborhood": "Upper East Side" + }, + { + "parentName": "Jill Taylor", + "email": "jill.taylor@test.com", + "password": "secret", + "numberOfSeatsInCar": 3, + "availableDropOffDays": [], + "availablePickUpDays": ["Tuesday", "Wednesday", "Thursday"], + "neighborhood": "Grosse Pointe" + } +] \ No newline at end of file From c908e6c9416483ce4a6da0cd3d39479553adcb8e Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Thu, 5 Sep 2024 22:03:47 -0400 Subject: [PATCH 02/11] Build users seeding script --- src/populateUsers.js | 21 +++++++++++++++++++++ src/testUsers.json | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/populateUsers.js diff --git a/src/populateUsers.js b/src/populateUsers.js new file mode 100644 index 0000000..29a7b13 --- /dev/null +++ b/src/populateUsers.js @@ -0,0 +1,21 @@ +require('dotenv').config(); + +const connectDB = require('./db/conn'); +const users = require('./models/usersModel'); + +const testUsers = require('./testUsers.json'); + +const start = async () => { + try { + await connectDB(process.env.MONGO_URI); + await users.deleteMany(); + await users.create(testUsers); + console.log('Success seeding database!!!!'); + process.exit(0); + } catch (error) { + console.error(error); + process.exit(1); + } +}; + +start(); \ No newline at end of file diff --git a/src/testUsers.json b/src/testUsers.json index 9234de9..498295e 100644 --- a/src/testUsers.json +++ b/src/testUsers.json @@ -201,7 +201,7 @@ "parentName": "Hilda/Zelda Spellman", "email": "hilda.spellman@test.com", "password": "secret", - "numberOfSeatsInCar": 17, + "numberOfSeatsInCar": 13, "availableDropOffDays": ["Monday", "Wednesday", "Friday"], "availablePickUpDays": ["Monday", "Thursday"], "neighborhood": "Westbridge" From 8de1e5c3cfb502239da1b0a5bc7f87f474fe7d44 Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Thu, 5 Sep 2024 23:01:04 -0400 Subject: [PATCH 03/11] Prepare ride requests seed data --- src/testRequests.json | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 src/testRequests.json diff --git a/src/testRequests.json b/src/testRequests.json new file mode 100644 index 0000000..830de69 --- /dev/null +++ b/src/testRequests.json @@ -0,0 +1,87 @@ +[ + { + "requester": "66da634df62f6553ab5c19bc", + "profile": "66da634df62f6553ab5c19c3", + "requestedPickUpDays": ["Tuesday", "Thursday", "Friday"], + "status": "Pending" + }, + { + "requester": "66da634df62f6553ab5c19c3", + "profile": "66da634df62f6553ab5c19cc", + "requestedDropOffDays": ["Monday", "Wednesday", "Friday"], + "requestedPickUpDays": ["Monday", "Wednesday", "Friday"], + "status": "Approved" + }, + { + "requester": "66da634df62f6553ab5c19cc", + "profile": "66da634df62f6553ab5c19c3", + "requestedDropOffDays": ["Thursday"], + "requestedPickUpDays": ["Tuesday", "Thursday"], + "status": "Approved" + }, + { + "requester": "66da634df62f6553ab5c19c2", + "profile": "66da634df62f6553ab5c19c4", + "requestedDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], + "status": "Approved" + }, + { + "requester": "66da634df62f6553ab5c19c4", + "profile": "66da634df62f6553ab5c19c2", + "requestedPickUpDays": ["Monday", "Tuesday", "Friday"], + "status": "Pending" + }, + { + "requester": "66da634df62f6553ab5c19cd", + "profile": "66da634df62f6553ab5c19ce", + "requestedDropOffDays": ["Tuesday", "Thursday"], + "requestedPickUpDays": ["Tuesday", "Thursday"], + "status": "Pending" + }, + { + "requester": "66da634df62f6553ab5c19cf", + "profile": "66da634df62f6553ab5c19bc", + "requestedDropOffDays": ["Monday", "Tuesday", "Thursday"], + "requestedPickUpDays": ["Monday"], + "status": "Denied" + }, + { + "requester": "66da634df62f6553ab5c19bd", + "profile": "66da634df62f6553ab5c19c7", + "requestedPickUpDays": ["Wednesday"], + "status": "Pending" + }, + { + "requester": "66da634df62f6553ab5c19c8", + "profile": "66da634df62f6553ab5c19d2", + "requestedDropOffDays": ["Monday", "Friday"], + "requestedPickUpDays": ["Monday", "Thursday"], + "status": "Approved" + }, + { + "requester": "66da634df62f6553ab5c19c8", + "profile": "66da634df62f6553ab5c19d6", + "requestedDropOffDays": ["Wednesday"], + "requestedPickUpDays": ["Wednesday"], + "status": "Approved" + }, + { + "requester": "66da634df62f6553ab5c19c8", + "profile": "66da634df62f6553ab5c19eb", + "requestedDropOffDays": ["Friday"], + "requestedPickUpDays": ["Thursday"], + "status": "Denied" + }, + { + "requester": "66da634df62f6553ab5c19d6", + "profile": "66da634df62f6553ab5c19eb", + "requestedDropOffDays": ["Friday"], + "status": "Approved" + }, + { + "requester": "66da634df62f6553ab5c19e2", + "profile": "66da634df62f6553ab5c19ca", + "requestedPickUpDays": ["Monday", "Friday"], + "status": "Approved" + } +] \ No newline at end of file From 0c96e3017f6dcf9c8aeb5f593cfbf3c3e3406d89 Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Fri, 6 Sep 2024 10:10:18 -0400 Subject: [PATCH 04/11] Create seeding script for ride requests data --- src/populateRequests.js | 21 +++++++++++++++++++++ src/testRequests.json | 26 +++++++++++++------------- 2 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 src/populateRequests.js diff --git a/src/populateRequests.js b/src/populateRequests.js new file mode 100644 index 0000000..44537eb --- /dev/null +++ b/src/populateRequests.js @@ -0,0 +1,21 @@ +require('dotenv').config(); + +const connectDB = require('./db/conn'); +const RideRequest = require('./models/requestModel'); + +const rideRequests = require('./testRequests.json'); + +const start = async () => { + try { + await connectDB(process.env.MONGO_URI); + await RideRequest.deleteMany(); + await RideRequest.create(rideRequests); + console.log('Success seeding ride requests!!!!'); + process.exit(0); + } catch (error) { + console.log(error); + process.exit(1); + } +}; + +start(); diff --git a/src/testRequests.json b/src/testRequests.json index 830de69..ab07a9d 100644 --- a/src/testRequests.json +++ b/src/testRequests.json @@ -3,85 +3,85 @@ "requester": "66da634df62f6553ab5c19bc", "profile": "66da634df62f6553ab5c19c3", "requestedPickUpDays": ["Tuesday", "Thursday", "Friday"], - "status": "Pending" + "status": "pending" }, { "requester": "66da634df62f6553ab5c19c3", "profile": "66da634df62f6553ab5c19cc", "requestedDropOffDays": ["Monday", "Wednesday", "Friday"], "requestedPickUpDays": ["Monday", "Wednesday", "Friday"], - "status": "Approved" + "status": "approved" }, { "requester": "66da634df62f6553ab5c19cc", "profile": "66da634df62f6553ab5c19c3", "requestedDropOffDays": ["Thursday"], "requestedPickUpDays": ["Tuesday", "Thursday"], - "status": "Approved" + "status": "approved" }, { "requester": "66da634df62f6553ab5c19c2", "profile": "66da634df62f6553ab5c19c4", "requestedDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "status": "Approved" + "status": "approved" }, { "requester": "66da634df62f6553ab5c19c4", "profile": "66da634df62f6553ab5c19c2", "requestedPickUpDays": ["Monday", "Tuesday", "Friday"], - "status": "Pending" + "status": "pending" }, { "requester": "66da634df62f6553ab5c19cd", "profile": "66da634df62f6553ab5c19ce", "requestedDropOffDays": ["Tuesday", "Thursday"], "requestedPickUpDays": ["Tuesday", "Thursday"], - "status": "Pending" + "status": "pending" }, { "requester": "66da634df62f6553ab5c19cf", "profile": "66da634df62f6553ab5c19bc", "requestedDropOffDays": ["Monday", "Tuesday", "Thursday"], "requestedPickUpDays": ["Monday"], - "status": "Denied" + "status": "declined" }, { "requester": "66da634df62f6553ab5c19bd", "profile": "66da634df62f6553ab5c19c7", "requestedPickUpDays": ["Wednesday"], - "status": "Pending" + "status": "pending" }, { "requester": "66da634df62f6553ab5c19c8", "profile": "66da634df62f6553ab5c19d2", "requestedDropOffDays": ["Monday", "Friday"], "requestedPickUpDays": ["Monday", "Thursday"], - "status": "Approved" + "status": "approved" }, { "requester": "66da634df62f6553ab5c19c8", "profile": "66da634df62f6553ab5c19d6", "requestedDropOffDays": ["Wednesday"], "requestedPickUpDays": ["Wednesday"], - "status": "Approved" + "status": "approved" }, { "requester": "66da634df62f6553ab5c19c8", "profile": "66da634df62f6553ab5c19eb", "requestedDropOffDays": ["Friday"], "requestedPickUpDays": ["Thursday"], - "status": "Denied" + "status": "declined" }, { "requester": "66da634df62f6553ab5c19d6", "profile": "66da634df62f6553ab5c19eb", "requestedDropOffDays": ["Friday"], - "status": "Approved" + "status": "approved" }, { "requester": "66da634df62f6553ab5c19e2", "profile": "66da634df62f6553ab5c19ca", "requestedPickUpDays": ["Monday", "Friday"], - "status": "Approved" + "status": "approved" } ] \ No newline at end of file From cea72405b06220a4232b93b290790c3636bc7466 Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Tue, 10 Sep 2024 14:05:39 -0400 Subject: [PATCH 05/11] Complete db seeding logic for users and ride requests --- src/populateRequests.js | 2 +- src/populateUsers.js | 2 +- src/testUsers.json | 104 ++++++++++++++++++++-------------------- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/populateRequests.js b/src/populateRequests.js index 44537eb..cee2ea1 100644 --- a/src/populateRequests.js +++ b/src/populateRequests.js @@ -10,7 +10,7 @@ const start = async () => { await connectDB(process.env.MONGO_URI); await RideRequest.deleteMany(); await RideRequest.create(rideRequests); - console.log('Success seeding ride requests!!!!'); + console.log('Success seeding ride requests database!!!!'); process.exit(0); } catch (error) { console.log(error); diff --git a/src/populateUsers.js b/src/populateUsers.js index 29a7b13..6f96307 100644 --- a/src/populateUsers.js +++ b/src/populateUsers.js @@ -10,7 +10,7 @@ const start = async () => { await connectDB(process.env.MONGO_URI); await users.deleteMany(); await users.create(testUsers); - console.log('Success seeding database!!!!'); + console.log('Success seeding users database!!!!'); process.exit(0); } catch (error) { console.error(error); diff --git a/src/testUsers.json b/src/testUsers.json index 498295e..2613255 100644 --- a/src/testUsers.json +++ b/src/testUsers.json @@ -1,7 +1,7 @@ [ { "parentName": "Olaf", - "email": "count.olaf@test.com", + "email": "count.olaf@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], @@ -10,7 +10,7 @@ }, { "parentName": "Drew Pickles", - "email": "drew.pickles@test.com", + "email": "drew.pickles@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday" ], @@ -19,7 +19,7 @@ }, { "parentName": "Hal Wilkerson", - "email": "hal.wilkerson@test.com", + "email": "hal.wilkerson@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": [], @@ -28,7 +28,7 @@ }, { "parentName": "David Read", - "email": "david.read@test.com", + "email": "david.read@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday"], @@ -37,7 +37,7 @@ }, { "parentName": "Delia Ketchum", - "email": "delia.ketchum@test.com", + "email": "delia.ketchum@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": [], @@ -46,7 +46,7 @@ }, { "parentName": "Phil Funnie", - "email": "phil.funnie@test.com", + "email": "phil.funnie@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": [], @@ -55,7 +55,7 @@ }, { "parentName": "Judy Neutron", - "email": "judy.neutron@test.com", + "email": "judy.neutron@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday"], @@ -64,7 +64,7 @@ }, { "parentName": "Wilma Flintstone", - "email": "wilma.flintstone@test.com", + "email": "wilma.flintstone@testmail.com", "password": "secret", "numberOfSeatsInCar": 5, "availableDropOffDays": ["Thursday", "Friday"], @@ -73,7 +73,7 @@ }, { "parentName": "George Jetson", - "email": "george.jetson@test.com", + "email": "george.jetson@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], @@ -82,7 +82,7 @@ }, { "parentName": "Ellen Talbot", - "email": "ellen.talbot@test.com", + "email": "ellen.talbot@testmail.com", "password": "secret", "numberOfSeatsInCar": 6, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], @@ -91,7 +91,7 @@ }, { "parentName": "Mary Darling", - "email": "jane.darling@test.com", + "email": "jane.darling@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday", "Thursday", "Friday"], @@ -100,7 +100,7 @@ }, { "parentName": "Caroline Ingalls", - "email": "caroline.ingalls@test.com", + "email": "caroline.ingalls@testmail.com", "password": "secret", "numberOfSeatsInCar": 4, "availableDropOffDays": [], @@ -109,7 +109,7 @@ }, { "parentName": "Nani Pelekai", - "email": "nani.pelekai@test.com", + "email": "nani.pelekai@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": [], @@ -118,7 +118,7 @@ }, { "parentName": "Arthur Weasley", - "email": "arthur.weasley@test.com", + "email": "arthur.weasley@testmail.com", "password": "secret", "numberOfSeatsInCar": 12, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], @@ -127,7 +127,7 @@ }, { "parentName": "Mary Poppins", - "email": "mary.poppins@test.com", + "email": "mary.poppins@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": [], @@ -136,7 +136,7 @@ }, { "parentName": "Charlie Jones", - "email": "charlie.jones@test.com", + "email": "charlie.jones@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], @@ -145,7 +145,7 @@ }, { "parentName": "Betty Rubble", - "email": "betty.rubble@test.com", + "email": "betty.rubble@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": ["Tuesday", "Thursday"], @@ -154,7 +154,7 @@ }, { "parentName": "Elizabeth Brewer", - "email": "elizabeth.brewer@test.com", + "email": "elizabeth.brewer@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": [], @@ -163,7 +163,7 @@ }, { "parentName": "Richard Spier", - "email": "richard.spier@test.com", + "email": "richard.spier@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], @@ -172,7 +172,7 @@ }, { "parentName": "Narcissa Malfoy", - "email": "narcissa.malfoy@test.com", + "email": "narcissa.malfoy@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Wednesday"], @@ -181,7 +181,7 @@ }, { "parentName": "June Cleaver", - "email": "june.cleaver@test.com", + "email": "june.cleaver@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], @@ -190,7 +190,7 @@ }, { "parentName": "Bitzi Baxter", - "email": "bitzi.baxter@test.com", + "email": "bitzi.baxter@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday", "Tuesday"], @@ -199,7 +199,7 @@ }, { "parentName": "Hilda/Zelda Spellman", - "email": "hilda.spellman@test.com", + "email": "hilda.spellman@testmail.com", "password": "secret", "numberOfSeatsInCar": 13, "availableDropOffDays": ["Monday", "Wednesday", "Friday"], @@ -208,7 +208,7 @@ }, { "parentName": "Ann Valentine", - "email": "ann.valentine@test.com", + "email": "ann.valentine@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday", "Thursday"], @@ -217,7 +217,7 @@ }, { "parentName": "Josephine Rabbit", - "email": "josephine.rabbit@test.com", + "email": "josephine.rabbit@testmail.com", "password": "secret", "numberOfSeatsInCar": 4, "availableDropOffDays": ["Monday", "Friday"], @@ -226,7 +226,7 @@ }, { "parentName": "Chas Finster", - "email": "chas.finster@test.com", + "email": "chas.finster@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday"], @@ -235,7 +235,7 @@ }, { "parentName": "Opal Otter", - "email": "opal.otter@test.com", + "email": "opal.otter@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday"], @@ -244,7 +244,7 @@ }, { "parentName": "Oliver Frensky", - "email": "oliver.frensky@test.com", + "email": "oliver.frensky@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Thursday"], @@ -253,7 +253,7 @@ }, { "parentName": "Morticia Addams", - "email": "morticia.addams@test.com", + "email": "morticia.addams@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Friday"], @@ -262,7 +262,7 @@ }, { "parentName": "Petunia Dursley", - "email": "petunia.dursley@test.com", + "email": "petunia.dursley@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Wednesday"], @@ -271,7 +271,7 @@ }, { "parentName": "Danny Tanner", - "email": "danny.tanner@test.com", + "email": "danny.tanner@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Thursday"], @@ -280,7 +280,7 @@ }, { "parentName": "Bob Belcher", - "email": "bob.belcher@test.com", + "email": "bob.belcher@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday", "Friday"], @@ -289,7 +289,7 @@ }, { "parentName": "Miriam Pataki", - "email": "miriam.pataki@test.com", + "email": "miriam.pataki@testmail.com", "password": "secret", "numberOfSeatsInCar": 4, "availableDropOffDays": ["Tuesday", "Friday"], @@ -298,7 +298,7 @@ }, { "parentName": "Chilli(Bandit) Heeler", - "email": "chilli.heeler@test.com", + "email": "chilli.heeler@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday"], @@ -307,7 +307,7 @@ }, { "parentName": "Mary Edwards", - "email": "mary.edwards@test.com", + "email": "mary.edwards@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday", "Thursday"], @@ -316,7 +316,7 @@ }, { "parentName": "Margaret Kittredge", - "email": "margaret.kittredge@test.com", + "email": "margaret.kittredge@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday"], @@ -325,7 +325,7 @@ }, { "parentName": "Helen McIntire", - "email": "helen.mcintire@test.com", + "email": "helen.mcintire@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday", "Friday"], @@ -334,7 +334,7 @@ }, { "parentName": "Ruth Walker", - "email": "ruth.walker@test.com", + "email": "ruth.walker@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday", "Friday"], @@ -343,7 +343,7 @@ }, { "parentName": "Cpt. Ralph Crewe", - "email": "ralph.crewe@test.com", + "email": "ralph.crewe@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Thursday"], @@ -352,7 +352,7 @@ }, { "parentName": "Karin Larson", - "email": "karin.larson@test.com", + "email": "karin.larson@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday", "Thursday"], @@ -361,7 +361,7 @@ }, { "parentName": "John Hiddle", - "email": "john.hiddle@test.com", + "email": "john.hiddle@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Friday"], @@ -370,7 +370,7 @@ }, { "parentName": "Martha Merriman", - "email": "martha.merriman@test.com", + "email": "martha.merriman@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Wednesday"], @@ -379,7 +379,7 @@ }, { "parentName": "Wayne Szalinski", - "email": "diane.szalinski@test.com", + "email": "diane.szalinski@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday"], @@ -388,7 +388,7 @@ }, { "parentName": "Kate McCallister", - "email": "kate.mccallister@test.com", + "email": "kate.mccallister@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Thursday"], @@ -397,7 +397,7 @@ }, { "parentName": "Tatsuo Kusakabe", - "email": "tatsuo.kusakabe@test.com", + "email": "tatsuo.kusakabe@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday", "Wednesday"], @@ -406,7 +406,7 @@ }, { "parentName": "Marilla & Matthew Cuthbert", - "email": "matthew.cuthbert@test.com", + "email": "matthew.cuthbert@testmail.com", "password": "secret", "numberOfSeatsInCar": 4, "availableDropOffDays": ["Tuesday", "Friday"], @@ -415,7 +415,7 @@ }, { "parentName": "Eleanor Little", - "email": "eleanor.little@test.com", + "email": "eleanor.little@testmail.com", "password": "secret", "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday", "Thursday"], @@ -424,7 +424,7 @@ }, { "parentName": "Ray Rocket", - "email": "ray.rocket@test.com", + "email": "ray.rocket@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday", "Friday"], @@ -433,7 +433,7 @@ }, { "parentName": "Lois Foutley", - "email": "lois.foutley@test.com", + "email": "lois.foutley@testmail.com", "password": "secret", "numberOfSeatsInCar": 1, "availableDropOffDays": ["Thursday"], @@ -442,7 +442,7 @@ }, { "parentName": "Amy Adams", - "email": "amy.adams@test.com", + "email": "amy.adams@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Wednesday"], @@ -451,7 +451,7 @@ }, { "parentName": "Oliver Warbucks", - "email": "oliver.warbucks@test.com", + "email": "oliver.warbucks@testmail.com", "password": "secret", "numberOfSeatsInCar": 4, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], @@ -460,7 +460,7 @@ }, { "parentName": "Jill Taylor", - "email": "jill.taylor@test.com", + "email": "jill.taylor@testmail.com", "password": "secret", "numberOfSeatsInCar": 3, "availableDropOffDays": [], From d070413d86ef83e7606b8e776e8b0e01c1fef577 Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Tue, 10 Sep 2024 14:50:48 -0400 Subject: [PATCH 06/11] Organize seeding files into dedicated folder --- src/{ => db/seeders}/populateRequests.js | 4 ++-- src/{ => db/seeders}/populateUsers.js | 6 +++--- src/{ => db/seeders}/testRequests.json | 0 src/{ => db/seeders}/testUsers.json | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename src/{ => db/seeders}/populateRequests.js (81%) rename src/{ => db/seeders}/populateUsers.js (79%) rename src/{ => db/seeders}/testRequests.json (100%) rename src/{ => db/seeders}/testUsers.json (100%) diff --git a/src/populateRequests.js b/src/db/seeders/populateRequests.js similarity index 81% rename from src/populateRequests.js rename to src/db/seeders/populateRequests.js index cee2ea1..0c1e514 100644 --- a/src/populateRequests.js +++ b/src/db/seeders/populateRequests.js @@ -1,7 +1,7 @@ require('dotenv').config(); -const connectDB = require('./db/conn'); -const RideRequest = require('./models/requestModel'); +const connectDB = require('../conn'); +const RideRequest = require('../../models/requestModel'); const rideRequests = require('./testRequests.json'); diff --git a/src/populateUsers.js b/src/db/seeders/populateUsers.js similarity index 79% rename from src/populateUsers.js rename to src/db/seeders/populateUsers.js index 6f96307..2fcc1c6 100644 --- a/src/populateUsers.js +++ b/src/db/seeders/populateUsers.js @@ -1,7 +1,7 @@ require('dotenv').config(); -const connectDB = require('./db/conn'); -const users = require('./models/usersModel'); +const connectDB = require('../conn'); +const users = require('../../models/usersModel'); const testUsers = require('./testUsers.json'); @@ -18,4 +18,4 @@ const start = async () => { } }; -start(); \ No newline at end of file +start(); diff --git a/src/testRequests.json b/src/db/seeders/testRequests.json similarity index 100% rename from src/testRequests.json rename to src/db/seeders/testRequests.json diff --git a/src/testUsers.json b/src/db/seeders/testUsers.json similarity index 100% rename from src/testUsers.json rename to src/db/seeders/testUsers.json From 49bfd4e192bb1b8eee76b921e6fa52e0a99a381d Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Tue, 10 Sep 2024 15:26:39 -0400 Subject: [PATCH 07/11] Add children names to user seeding --- src/db/seeders/testUsers.json | 216 ++++++++++++---------------------- 1 file changed, 78 insertions(+), 138 deletions(-) diff --git a/src/db/seeders/testUsers.json b/src/db/seeders/testUsers.json index 2613255..acc73cd 100644 --- a/src/db/seeders/testUsers.json +++ b/src/db/seeders/testUsers.json @@ -6,7 +6,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], "availablePickUpDays": ["Monday", "Wednesday"], - "neighborhood": "French Quarter" + "neighborhood": "French Quarter", + "childrenNames": ["Sunny Baudelaire", "Violet Baudelaire", "Klaus Baudelaire"] }, { "parentName": "Drew Pickles", @@ -15,7 +16,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday" ], "availablePickUpDays": [], - "neighborhood": "Toluca Lake" + "neighborhood": "Toluca Lake", + "childrenNames": ["Angelica Pickles"] }, { "parentName": "Hal Wilkerson", @@ -24,7 +26,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": [], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Northridge" + "neighborhood": "Northridge", + "childrenNames": ["Malcolm", "Reese", "Dewey"] }, { "parentName": "David Read", @@ -33,7 +36,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday"], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday"], - "neighborhood": "Elwood City" + "neighborhood": "Elwood City", + "childrenNames": ["Arthur Read", "D.W. Read"] }, { "parentName": "Delia Ketchum", @@ -42,7 +46,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": [], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday"], - "neighborhood": "Pallet Town" + "neighborhood": "Pallet Town", + "childrenNames": ["Ash Ketchum"] }, { "parentName": "Phil Funnie", @@ -51,7 +56,8 @@ "numberOfSeatsInCar": 2, "availableDropOffDays": [], "availablePickUpDays": ["Thursday", "Friday"], - "neighborhood": "Bluffington" + "neighborhood": "Bluffington", + "childrenNames": ["Doug Funnie", "Judy Funnie"] }, { "parentName": "Judy Neutron", @@ -60,7 +66,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday"], "availablePickUpDays": ["Monday", "Tuesday", "Friday"], - "neighborhood": "Retroville" + "neighborhood": "Retroville", + "childrenNames": ["Jimmy Neutron"] }, { "parentName": "Wilma Flintstone", @@ -69,7 +76,8 @@ "numberOfSeatsInCar": 5, "availableDropOffDays": ["Thursday", "Friday"], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Bedrock" + "neighborhood": "Bedrock", + "childrenNames": ["Pebbles Flintstone"] }, { "parentName": "George Jetson", @@ -78,7 +86,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], "availablePickUpDays": [], - "neighborhood": "Orbit City" + "neighborhood": "Orbit City", + "childrenNames": ["Elroy Jetson", "Judy Jetson"] }, { "parentName": "Ellen Talbot", @@ -89,15 +98,6 @@ "availablePickUpDays": [], "neighborhood": "Oakdale" }, - { - "parentName": "Mary Darling", - "email": "jane.darling@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Tuesday", "Thursday", "Friday"], - "availablePickUpDays": ["Tuesday", "Wednesday"], - "neighborhood": "Bloomsbury" - }, { "parentName": "Caroline Ingalls", "email": "caroline.ingalls@testmail.com", @@ -105,7 +105,8 @@ "numberOfSeatsInCar": 4, "availableDropOffDays": [], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Walnut Grove" + "neighborhood": "Walnut Grove", + "childrenNames": ["Laura Ingalls", "Mary Ingalls"] }, { "parentName": "Nani Pelekai", @@ -114,7 +115,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": [], "availablePickUpDays": [], - "neighborhood": "Kokaua" + "neighborhood": "Kokaua", + "childrenNames": ["Lilo Pelekai"] }, { "parentName": "Arthur Weasley", @@ -123,7 +125,8 @@ "numberOfSeatsInCar": 12, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], "availablePickUpDays": [], - "neighborhood": "Ottery St. Catchpole" + "neighborhood": "Ottery St. Catchpole", + "childrenNames": ["Percy Weasley", "Fred Weasley", "George Weasley", "Ron Weasley"] }, { "parentName": "Mary Poppins", @@ -132,7 +135,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": [], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Kensington" + "neighborhood": "Kensington", + "childrenNames": ["Jane Banks", "Michael Banks"] }, { "parentName": "Charlie Jones", @@ -141,7 +145,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], "availablePickUpDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Sellwood-Moreland" + "neighborhood": "Sellwood-Moreland", + "childrenNames": "Caroline Jones" }, { "parentName": "Betty Rubble", @@ -150,7 +155,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": ["Tuesday", "Thursday"], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Bedrock" + "neighborhood": "Bedrock", + "childrenNames": ["Bamm-Bamm Rubble"] }, { "parentName": "Elizabeth Brewer", @@ -159,7 +165,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": [], "availablePickUpDays": [], - "neighborhood": "Stoneybrook" + "neighborhood": "Stoneybrook", + "childrenNames": ["Kristy Thomas", "David Michael Thomas"] }, { "parentName": "Richard Spier", @@ -168,7 +175,8 @@ "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday", "Wednesday", "Thursday", "Friday"], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday"], - "neighborhood": "Stoneybrook" + "neighborhood": "Stoneybrook", + "childrenNames": ["Mary Anne Spier"] }, { "parentName": "Narcissa Malfoy", @@ -177,7 +185,8 @@ "numberOfSeatsInCar": 2, "availableDropOffDays": ["Wednesday"], "availablePickUpDays": ["Friday"], - "neighborhood": "Wiltshire" + "neighborhood": "Wiltshire", + "childrenNames": ["Draco Malfoy"] }, { "parentName": "June Cleaver", @@ -186,7 +195,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Mayfield" + "neighborhood": "Mayfield", + "childrenNames": ["Wally Cleaver", "Theodore 'Beaver' Cleaver"] }, { "parentName": "Bitzi Baxter", @@ -195,7 +205,8 @@ "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday", "Tuesday"], "availablePickUpDays": [], - "neighborhood": "Elwood City" + "neighborhood": "Elwood City", + "childrenNames": ["Buster Baxter"] }, { "parentName": "Hilda/Zelda Spellman", @@ -204,16 +215,8 @@ "numberOfSeatsInCar": 13, "availableDropOffDays": ["Monday", "Wednesday", "Friday"], "availablePickUpDays": ["Monday", "Thursday"], - "neighborhood": "Westbridge" - }, - { - "parentName": "Ann Valentine", - "email": "ann.valentine@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Tuesday", "Thursday"], - "availablePickUpDays": ["Monday", "Wednesday"], - "neighborhood": "Bluffington" + "neighborhood": "Westbridge", + "childrenNames": ["Sabrina Spellman"] }, { "parentName": "Josephine Rabbit", @@ -222,7 +225,8 @@ "numberOfSeatsInCar": 4, "availableDropOffDays": ["Monday", "Friday"], "availablePickUpDays": ["Wednesday", "Thursday"], - "neighborhood": "Lake District" + "neighborhood": "Lake District", + "childrenNames": ["Peter Rabbit", "Flopsy Rabbit", "Mopsy Rabbit", "Cotton-Tail Rabbit"] }, { "parentName": "Chas Finster", @@ -231,7 +235,8 @@ "numberOfSeatsInCar": 2, "availableDropOffDays": ["Tuesday"], "availablePickUpDays": ["Friday"], - "neighborhood": "Toluca Lake" + "neighborhood": "Toluca Lake", + "childrenNames": ["Chuckie Finster"] }, { "parentName": "Opal Otter", @@ -249,7 +254,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Monday", "Thursday"], "availablePickUpDays": ["Tuesday", "Thursday"], - "neighborhood": "Elwood City" + "neighborhood": "Elwood City", + "childrenNames": ["Francine Frensky", "Catherine Frensky"] }, { "parentName": "Morticia Addams", @@ -258,7 +264,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Friday"], "availablePickUpDays": ["Friday"], - "neighborhood": "Sleepy Hallow" + "neighborhood": "Sleepy Hallow", + "childrenNames": ["Wednesday Addams", "Pugsley Addams"] }, { "parentName": "Petunia Dursley", @@ -267,7 +274,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Wednesday"], "availablePickUpDays": ["Tuesday", "Thursday"], - "neighborhood": "Little Whinging" + "neighborhood": "Little Whinging", + "childrenNames": ["Dudley Dursley"] }, { "parentName": "Danny Tanner", @@ -276,7 +284,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Thursday"], "availablePickUpDays": ["Thursday"], - "neighborhood": "Alamo Square" + "neighborhood": "Alamo Square", + "childrenNames": ["D.J. Tanner", "Stephanie Tanner", "Michelle Tanner"] }, { "parentName": "Bob Belcher", @@ -285,7 +294,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday", "Friday"], "availablePickUpDays": ["Monday"], - "neighborhood": "Asbury Park" + "neighborhood": "Asbury Park", + "childrenNames": ["Tina Belcher", "Gene Belcher", "Louise Belcher"] }, { "parentName": "Miriam Pataki", @@ -294,7 +304,8 @@ "numberOfSeatsInCar": 4, "availableDropOffDays": ["Tuesday", "Friday"], "availablePickUpDays": ["Monday", "Thursday"], - "neighborhood": "Corktown" + "neighborhood": "Corktown", + "childrenNames": ["Helga Pataki"] }, { "parentName": "Chilli(Bandit) Heeler", @@ -303,43 +314,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday"], "availablePickUpDays": ["Tuesday", "Thursday"], - "neighborhood": "Paddington" - }, - { - "parentName": "Mary Edwards", - "email": "mary.edwards@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Tuesday", "Thursday"], - "availablePickUpDays": ["Monday", "Friday"], - "neighborhood": "Mount Bedford" - }, - { - "parentName": "Margaret Kittredge", - "email": "margaret.kittredge@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Monday"], - "availablePickUpDays": ["Wednesday"], - "neighborhood": "Hyde Park" - }, - { - "parentName": "Helen McIntire", - "email": "helen.mcintire@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Tuesday", "Friday"], - "availablePickUpDays": ["Thursday"], - "neighborhood": "Jefferson" - }, - { - "parentName": "Ruth Walker", - "email": "ruth.walker@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Monday", "Friday"], - "availablePickUpDays": ["Thursday"], - "neighborhood": "Seventh Ward" + "neighborhood": "Paddington", + "childrenNames": ["Bluey Heeler", "Bingo Heeler"] }, { "parentName": "Cpt. Ralph Crewe", @@ -348,25 +324,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Thursday"], "availablePickUpDays": ["Wednesday"], - "neighborhood": "Kensington" - }, - { - "parentName": "Karin Larson", - "email": "karin.larson@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Tuesday", "Thursday"], - "availablePickUpDays": ["Monday"], - "neighborhood": "Minnesota Territory" - }, - { - "parentName": "John Hiddle", - "email": "john.hiddle@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Friday"], - "availablePickUpDays": ["Tuesday"], - "neighborhood": "Euclid" + "neighborhood": "Kensington", + "childrenNames": ["Sara Crewe"] }, { "parentName": "Martha Merriman", @@ -375,25 +334,8 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": ["Monday", "Wednesday"], "availablePickUpDays": ["Thursday"], - "neighborhood": "Williamsburg" - }, - { - "parentName": "Wayne Szalinski", - "email": "diane.szalinski@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 2, - "availableDropOffDays": ["Tuesday"], - "availablePickUpDays": ["Thursday"], - "neighborhood": "Burbank" - }, - { - "parentName": "Kate McCallister", - "email": "kate.mccallister@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 1, - "availableDropOffDays": ["Thursday"], - "availablePickUpDays": ["Friday"], - "neighborhood": "Winnetka" + "neighborhood": "Williamsburg", + "childrenNames": ["Felicity Merriman"] }, { "parentName": "Tatsuo Kusakabe", @@ -402,7 +344,8 @@ "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday", "Wednesday"], "availablePickUpDays": ["Thursday"], - "neighborhood": "Tokigawa" + "neighborhood": "Tokigawa", + "childrenNames": ["Satsuki Kusakabe", "Mei Kusakabe"] }, { "parentName": "Marilla & Matthew Cuthbert", @@ -411,7 +354,8 @@ "numberOfSeatsInCar": 4, "availableDropOffDays": ["Tuesday", "Friday"], "availablePickUpDays": ["Wednesday"], - "neighborhood": "Avonlea" + "neighborhood": "Avonlea", + "childrenNames": ["Anne Shirley"] }, { "parentName": "Eleanor Little", @@ -420,7 +364,8 @@ "numberOfSeatsInCar": 2, "availableDropOffDays": ["Monday", "Thursday"], "availablePickUpDays": ["Wednesday"], - "neighborhood": "Upper West Side" + "neighborhood": "Upper West Side", + "childrenNames": ["Stuart Little", "George Little"] }, { "parentName": "Ray Rocket", @@ -429,7 +374,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Wednesday", "Friday"], "availablePickUpDays": ["Thursday"], - "neighborhood": "Ocean Shores" + "neighborhood": "Ocean Shores", + "childrenNames": ["Reggie Rocket", "Otto Rocket"] }, { "parentName": "Lois Foutley", @@ -438,16 +384,8 @@ "numberOfSeatsInCar": 1, "availableDropOffDays": ["Thursday"], "availablePickUpDays": ["Friday"], - "neighborhood": "Shelterville" - }, - { - "parentName": "Amy Adams", - "email": "amy.adams@testmail.com", - "password": "secret", - "numberOfSeatsInCar": 3, - "availableDropOffDays": ["Monday", "Wednesday"], - "availablePickUpDays": ["Friday"], - "neighborhood": "Roxborough" + "neighborhood": "Shelterville", + "childrenNames": ["Ginger Foutley", "Carl Foutley"] }, { "parentName": "Oliver Warbucks", @@ -456,7 +394,8 @@ "numberOfSeatsInCar": 4, "availableDropOffDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], "availablePickUpDays": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"], - "neighborhood": "Upper East Side" + "neighborhood": "Upper East Side", + "childrenNames": ["Annie"] }, { "parentName": "Jill Taylor", @@ -465,6 +404,7 @@ "numberOfSeatsInCar": 3, "availableDropOffDays": [], "availablePickUpDays": ["Tuesday", "Wednesday", "Thursday"], - "neighborhood": "Grosse Pointe" + "neighborhood": "Grosse Pointe", + "childrenNames": ["Brad Taylor", "Randy Taylor", "Mark Taylor"] } ] \ No newline at end of file From 572e70fbfb2f3fff768c0eacbf4d815c56882fa9 Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Tue, 10 Sep 2024 17:11:06 -0400 Subject: [PATCH 08/11] Adjust timeouts to accomodate test operations --- src/test/authController.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/authController.test.js b/src/test/authController.test.js index eb83a47..1be5284 100644 --- a/src/test/authController.test.js +++ b/src/test/authController.test.js @@ -24,7 +24,10 @@ async function cleanupTestUsers() { } describe('Authentication Controller', function () { + this.timeout(15000); + before(async () => { + this.timeout(15000); await connectDB(); await cleanupTestUsers(); }); From 986933299279b686adbea4b4c7e8ebc27fe2b3b6 Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Tue, 10 Sep 2024 19:03:39 -0400 Subject: [PATCH 09/11] Set up ride request API testing --- src/test/requestController.test.js | 78 ++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 src/test/requestController.test.js diff --git a/src/test/requestController.test.js b/src/test/requestController.test.js new file mode 100644 index 0000000..130aac7 --- /dev/null +++ b/src/test/requestController.test.js @@ -0,0 +1,78 @@ +const chai = require('chai'); +const chaiHttp = require('chai-http'); +const app = require('../app'); +const mongoose = require('mongoose'); +const User = require('../models/usersModel'); +const RideRequest = require('../models/requestModel'); + +chai.use(chaiHttp); +chai.should(); + +async function connectDB() { + const uri = process.env.MONGO_URI; + await mongoose.connect(uri, { + useNewUrlParser: true, + useUnifiedTopology: true, + }); +} + +async function disconnectDB() { + await mongoose.connection.close(); +} + +async function cleanupTestRequests() { + await RideRequest.deleteMany({ + pickupLocation: { $regex: /Test St/ }, + }); + await RideRequest.deleteMany({ + dropoffLocation: { $regex: /Test St/ }, + }); +} + +describe('Ride Request Controller', function () { + this.timeout(15000); + + before(async function () { + await connectDB(); + await cleanupTestRequests(); + }); + + after(async () => { + await cleanupTestRequests(); + await disconnectDB(); + }); + + describe('POST /api/v1/requests', function () { + it('should create a new ride request', async function () { + const requester = await chai + .request(app) + .post('/api/v1/auth/register') + .send({ + parentName: 'Test Requester', + email: 'test.requester@test.com', + password: 'secret', + }) + + const token = requester.body.token; + + const profile = await User.create({ + parentName: 'Test Profile', + email: 'test.profile@test.com', + password: 'secret', + }); + + const res = await chai + .request(app) + .post('/api/v1/requests') + .set('Authorization', `Bearer ${token}`) + .send({ + requestedBy: requester._id, + profile: profile._id, + requestedDropOffDays: ['Monday', 'Wednesday', 'Friday'], + requestedPickupDays: ['Tuesday', 'Thursday'], + }); + + res.should.have.status(201); + }); + }); +}); From 34b975d9aee583cb8fefea9bb1736d906be0a01c Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Tue, 10 Sep 2024 21:23:21 -0400 Subject: [PATCH 10/11] Write unit test for create ride request route --- src/controllers/authController.js | 69 ++++++++++++++++++------------ src/test/requestController.test.js | 31 +++++++++++--- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/src/controllers/authController.js b/src/controllers/authController.js index b680faf..240a37b 100644 --- a/src/controllers/authController.js +++ b/src/controllers/authController.js @@ -1,16 +1,20 @@ const jwt = require('jsonwebtoken'); -const formdata = require('form-data') -const Mailgun = require('mailgun.js') -const mailgun = new Mailgun(formdata) +const formdata = require('form-data'); +const Mailgun = require('mailgun.js'); +const mailgun = new Mailgun(formdata); const User = require('../models/usersModel.js'); const { StatusCodes } = require('http-status-codes'); -const { BadRequestError, UnauthenticatedError, NotFoundError } = require('../errors'); +const { + BadRequestError, + UnauthenticatedError, + NotFoundError, +} = require('../errors'); // Create the maildun client const mg = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY || 'apiKey', - domain: process.env.MAILGUN_DOMAIN || 'sandbox-123.mailgun.org' + domain: process.env.MAILGUN_DOMAIN || 'sandbox-123.mailgun.org', }); // Register controller @@ -37,6 +41,7 @@ const register = async (req, res, next) => { // Respond with user data and token res.status(StatusCodes.CREATED).json({ user: { + _id: user._id, parentName: user.parentName, email: user.email, }, @@ -63,26 +68,27 @@ const login = async (req, res, next) => { if (!user) { throw new UnauthenticatedError('Invalid Credentials'); - }; + } const isPasswordCorrect = await user.comparePassword(password); if (!isPasswordCorrect) { throw new UnauthenticatedError('Invalid Credentials'); - }; + } const token = await user.generateAuthToken(); - await user.save() + await user.save(); - res.status(StatusCodes.OK).json({ user: { name: user.parentName }, token }); + res + .status(StatusCodes.OK) + .json({ user: { name: user.parentName }, token }); } catch (error) { console.error('Login Error;', error); next(error); - }; + } }; - // Forgot Password Controller const forgotPassword = async (req, res) => { const { email } = req.body; @@ -107,20 +113,24 @@ const forgotPassword = async (req, res) => { from: process.env.EMAIL_USER, to: user.email, subject: 'Password reset', - text: `You requested a password reset. Please click on the following link to reset your password: ${resetUrl}` + text: `You requested a password reset. Please click on the following link to reset your password: ${resetUrl}`, }; - mg.messages.create(process.env.MAILGUN_DOMAIN, data) + mg.messages + .create(process.env.MAILGUN_DOMAIN, data) .then(() => { - res.status(StatusCodes.OK).json({ message: 'Password reset link sent to your email' }); + res + .status(StatusCodes.OK) + .json({ message: 'Password reset link sent to your email' }); }) - .catch(error => { + .catch((error) => { console.error('Error sending email:', error); - res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ message: 'Failed to send email' }); + res + .status(StatusCodes.INTERNAL_SERVER_ERROR) + .json({ message: 'Failed to send email' }); }); }; - const resetPassword = async (req, res) => { const { token } = req.params; const { password } = req.body; @@ -130,7 +140,7 @@ const resetPassword = async (req, res) => { try { decoded = jwt.verify(token, process.env.JWT_SECRET); } catch (err) { - throw new BadRequestError("Token is invalid or has expired"); + throw new BadRequestError('Token is invalid or has expired'); } // Find the user by ID @@ -145,31 +155,36 @@ const resetPassword = async (req, res) => { await user.save(); - res.status(StatusCodes.OK).json({ message: "Password has been reset successfully" }); + res + .status(StatusCodes.OK) + .json({ message: 'Password has been reset successfully' }); }; // Logout API const logout = async (req, res) => { - const { token } = req.user + const { token } = req.user; - const user = await User.findOne({ 'tokens.token' : token}) + const user = await User.findOne({ 'tokens.token': token }); if (!user) { - throw new UnauthenticatedError('Invalid Token') + throw new UnauthenticatedError('Invalid Token'); } - user.tokens = user.tokens.filter((userToken) => userToken.token !== token) + user.tokens = user.tokens.filter( + (userToken) => userToken.token !== token + ); await user.save(); - res.status(StatusCodes.OK).json({ message: 'Logged out successfully'}) -} - + res + .status(StatusCodes.OK) + .json({ message: 'Logged out successfully' }); +}; module.exports = { register, login, forgotPassword, resetPassword, - logout + logout, }; diff --git a/src/test/requestController.test.js b/src/test/requestController.test.js index 130aac7..d027a21 100644 --- a/src/test/requestController.test.js +++ b/src/test/requestController.test.js @@ -44,16 +44,21 @@ describe('Ride Request Controller', function () { describe('POST /api/v1/requests', function () { it('should create a new ride request', async function () { - const requester = await chai + const requesterRes = await chai .request(app) .post('/api/v1/auth/register') .send({ parentName: 'Test Requester', email: 'test.requester@test.com', password: 'secret', - }) + }); + + console.log('Requester Response:', requesterRes.body); - const token = requester.body.token; + const token = requesterRes.body.token; + const requesterId = requesterRes.body.user._id.toString(); + + requesterId.should.not.be.undefined; const profile = await User.create({ parentName: 'Test Profile', @@ -66,13 +71,29 @@ describe('Ride Request Controller', function () { .post('/api/v1/requests') .set('Authorization', `Bearer ${token}`) .send({ - requestedBy: requester._id, + requester: requesterId, profile: profile._id, requestedDropOffDays: ['Monday', 'Wednesday', 'Friday'], - requestedPickupDays: ['Tuesday', 'Thursday'], + requestedPickUpDays: ['Tuesday', 'Thursday'], }); + console.log('Ride request response body:', res.body); + res.should.have.status(201); + res.body.should.be.an('object'); + res.body.should.have.property('rideRequest'); + res.body.rideRequest.should.have + .property('requester') + .eql(requesterId); + res.body.rideRequest.should.have + .property('profile') + .eql(profile._id.toString()); + res.body.rideRequest.should.have + .property('requestedDropOffDays') + .eql(['Monday', 'Wednesday', 'Friday']); + res.body.rideRequest.should.have + .property('requestedPickUpDays') + .eql(['Tuesday', 'Thursday']); }); }); }); From 3214fe0bda84687f6d6cb9fcf4f98a640bf612d8 Mon Sep 17 00:00:00 2001 From: Brittany Halterman Date: Fri, 13 Sep 2024 19:16:12 -0400 Subject: [PATCH 11/11] Begin request controller API testing --- src/test/requestController.test.js | 55 ++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/src/test/requestController.test.js b/src/test/requestController.test.js index d027a21..6cede56 100644 --- a/src/test/requestController.test.js +++ b/src/test/requestController.test.js @@ -53,12 +53,12 @@ describe('Ride Request Controller', function () { password: 'secret', }); - console.log('Requester Response:', requesterRes.body); + // console.log('Requester Response:', requesterRes.body); const token = requesterRes.body.token; const requesterId = requesterRes.body.user._id.toString(); - requesterId.should.not.be.undefined; + // requesterId.should.not.be.undefined; const profile = await User.create({ parentName: 'Test Profile', @@ -77,7 +77,7 @@ describe('Ride Request Controller', function () { requestedPickUpDays: ['Tuesday', 'Thursday'], }); - console.log('Ride request response body:', res.body); + // console.log('Ride request response body:', res.body); res.should.have.status(201); res.body.should.be.an('object'); @@ -96,4 +96,53 @@ describe('Ride Request Controller', function () { .eql(['Tuesday', 'Thursday']); }); }); + + // describe('GET /api/v1/requests/:id', function () { + // it('should get a ride request by ID', async function () { + // const requesterRes = await chai + // .request(app) + // .post('/api/v1/auth/register') + // .send({ + // parentName: 'Test Requester', + // email: 'test.requester@test.com', + // password: 'secret', + // }); + + // console.log('Requester response', requesterRes.body); + + // const token = requesterRes.body.token; + // const requesterId = requesterRes.body.user._id.toString(); + + // const profile = await User.create({ + // parentName: 'Test Profile', + // email: 'test.profile@test.com', + // password: 'secret', + // }); + + // const createRequestRes = await chai + // .request(app) + // .post('/api/v1/requests') + // .set('Authorization', `Bearer {token}`) + // .send({ + // requester: requesterId, + // profile: profile._id, + // requestedDropOffDays: ['Monday', 'Wednesday', 'Friday'], + // requestedPickUpDays: ['Tuesday', 'Thursday'], + // }); + + // console.log( + // 'Ride request creation response:', + // createRequestRes.body + // ); + + // const rideRequestId = createRequestRes.body.rideRequest._id; + + // const res = await chai + // .request(app) + // .get(`/api/v1/requests/${rideRequestId}`) + // .set('Authorization', `Bearer ${token}`); + + // console.log('Ride request response body:', res.body); + // }); + // }); });