Jillian & Jade's EXTREME VIDEO EXPRESS (it's the 90s) API!!!!!11!!!!1! kewl. - #3

Open

JBoshart wants to merge 102 commits into

Ada-C5:masterfrom

JBoshart:master

Commits on Jun 14, 2016

Commits on Jun 15, 2016

added high level routes for customers, movies and rentals
jadevance
committed
3f994c9
Added tasks folder with load schema functionality
jadevance
committed
bbec298
Pushing broken code so we can work on it tonight: Most of the work done was an exercise in understanding.
JBoshart
committed
448164b

Commits on Jun 16, 2016

Changed some things?
jadevance
committed
a46f4b2
merge conflicts
jadevance
committed
e0611b6
Seed.js is now working.
JBoshart
committed
bb8ed63
Added schema for rentals database.
JBoshart
committed
df311ed
Added ERD to git.
JBoshart
committed
cf69655
added setup for the database in app.js
jadevance
committed
9aa4d2b
added a models folder as well as model function to find all customers
jadevance
committed
e929b92
wrote a method in the video controller to find all customers in the database
jadevance
committed
cc7ebf3
forgot to reference the model in the controller. Fixed that. Renamed the model to customers to better reflect that it is getting customers, not videos
jadevance
committed
de5b757
resolved merge conflict.
JBoshart
committed
944c7a9
Added module.exports to app
jadevance
committed
38d4c13
required massive and cleaned up errors
jadevance
committed
e4ff73c

Commits on Jun 17, 2016

Fixed a syntax error that broke everything
jadevance
committed
22e7117
Switching drivers. Working on getting JSON response.
JBoshart
committed
fca5fdd
endpoint customers is now serving up customer data in JSON
jadevance
committed
4117137
renamed video.js to customers.js to split out the functionality of customers from videos
jadevance
committed
1dc233a
Organizational changes only.
JBoshart
committed
a1f4b7f
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
JBoshart
committed
7e73318
More org changes.
JBoshart
committed
22c9cc3
Added functionality for sorting customers
jadevance
committed
e704d83
managing merge conflicts
jadevance
committed
59ed614
Customers can be sorted now and the return is JSON data. yay
jadevance
committed
dd0eabe
Set h1 for funsies.
JBoshart
committed
dc60de7
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
JBoshart
committed
3ff63c7
Made models and controllers for rentals and videos.
JBoshart
committed
ef395bf
added seed data for rentals database, and adjusted seeding code.
JBoshart
committed
dacb023
broke out routes for clarity (and because express had callback issues when they were all together) and everything is working
jadevance
committed
2b4eeda
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
jadevance
committed
b259277
work in rentals model and controller.
JBoshart
committed
65ab567
fixed routing where it was nested one level too deep (/customers/customers)
jadevance
committed
e18f050
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
jadevance
committed
75164a2
Working on Rentals.find in controller.
JBoshart
committed
ef2faa5
routes
jadevance
committed
3c56b1f
still. with. rentals. find. :(
JBoshart
committed
a2faf4f
merge conflicts manages in app.js and rentals controller
jadevance
committed
8ca4618
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
jadevance
committed
b87aea8
Completed the find_current rentals funciton in model and contorller. Made progress on find_history of rentals. Currently it returns a history of all checked in rentals, but does not sort them as re…
JBoshart
committed
2970cb0

Commits on Jun 20, 2016

Commits on Jun 21, 2016

Worked on adding checkout functionality to our video store. Routing needs to be finished but model and controller are in place and need testing
jadevance
committed
f450b9b
debugging code, have the first two pieces of checkout working but the rentals transaction is not working.
jadevance
committed
fd2f0c5
Created a constructor function to test checkout rentals
jadevance
committed
61d640f
Fixed date and time
jadevance
committed
a155863
Worked on rentals checkin function.
JBoshart
committed
de7a513
Debugging work on checking process.
JBoshart
committed
7221273
Checkin function is now working
JBoshart
committed
85797a9
Fixed error handling to display json rather than render a view for errors
jadevance
committed
1a25dd2
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
jadevance
committed
34aa7a5
Wrote error handling for customers, cleaned up unused code
jadevance
committed
76fcb75
added video error handling
jadevance
committed
b5cb520
Working on overdue rentals.
JBoshart
committed
1fcd557
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
JBoshart
committed
9fc2fc3

Commits on Jun 22, 2016

Wrote tests for the videos controller (renamed from movies for clarity) and added shell specs for rentals
jadevance
committed
b715f0f
Added tests for customers controller.
jadevance
committed
92a93db
Wrote some tests for the rentals controller
jadevance
committed
070171c
Merging tests with local
JBoshart
committed
d537234
overdue function for rentals is now working.
JBoshart
committed
72dfb1b
Added model specs and cleaned up error responses in the controllers
jadevance
committed
21fc575
Made rentals#overdue tests, as well as model spec directory.
JBoshart
committed
33fe746
isolated the failing test and it is currently x and commented out in rentals
jadevance
committed
cf20434

Commits on Jun 23, 2016

Commits on Jun 24, 2016

error handling tests for models controllers is now in place and at 91% coverage.
JBoshart
committed
4f0e70e
customers spec is now testing at 94% coverage.
JBoshart
committed
dfdf543
wrote tests for rentals to handle error handling
jadevance
committed
a373466
cleaning up the files
jadevance
committed
fae25cf
Removed views that were not being used. Added Api Documentation.
JBoshart
committed
34d7557
Merge branch 'master' of github.com:JBoshart/VideoStoreAPI
JBoshart
committed
ceba217