Kja+vs/master - #17

Open

ktrops wants to merge 89 commits into

Ada-Developers-Academy:kja+vs/masterfrom

vikshab:kja+vs/master

Commits on Sep 15, 2015

added notes.md
ktrops
committed
f2efda4
Created express
vikshab
committed
8558b23

Commits on Sep 16, 2015

Created a new express app
vikshab
committed
388b534

Commits on Sep 17, 2015

Added module folder to gitignore and gs
vikshab
committed
bd0118c
Node module folder was removed from git
vikshab
committed
5150624
Created database and schema
vikshab
committed
fe64a4e
Seeded our customers and movies tables
vikshab
committed
3905da6

Commits on Sep 18, 2015

Database wip
vikshab
committed
2cf76bb
updated notes to be more specific
ktrops
committed
cbad32e
set up database tests and stuff
ktrops
committed
291c4b9
1 green test. yay.
ktrops
committed
025adf7
Created schema for test
vikshab
committed
4793b2b

Commits on Sep 21, 2015

Commits on Sep 22, 2015

Got 10 green tests, created route for another endpoint - sorting movies by title
vikshab
committed
71d253e
merge conflicts
ktrops
committed
d7822ec
merge conflicts
ktrops
committed
677b9bd
removing db files
ktrops
committed
fcd3f8f
Added new methods in customer controller
vikshab
committed
e084d87
Added new method ffindMovieByTitle in movies conroller, added routed accordingly
vikshab
committed
5e6e24d
Added method sortCustomersByPostalCode in customers controller, added route for new endpoint
vikshab
committed
0a8f99e
Merge pull request #1 from vikshab/vica
ktrops
committed
6945f02
seed data for rentals
ktrops
committed
ed8402a
merge conflicts
ktrops
committed
ef29082
Merge pull request #2 from vikshab/kja
vikshab
committed
dd3d2ac
Small changed to notes file
vikshab
committed
9bb8db2
Got rid of the db folder from git
vikshab
committed
92aa329
Added available method in database, added a new route for movies/:title/available endpoint and added a new method availableMovies in movies contoller
vikshab
committed
6d3c6af
Commented out unnessasary information in customer model
vikshab
committed
266834c
Merge pull request #3 from vikshab/movies_title_available
ktrops
committed
6e60589
WIP working on /:title/customers/current endpoint
ktrops
committed
43920e5
small changes in notes
vikshab
committed
84333af
Merge branch 'kja+vs/master' of github.com:vikshab/C3Projects--VideoStoreAPI into kja+vs/master
vikshab
committed
acf9555
merge conflicts
ktrops
committed
e4e52db
Merge pull request #4 from vikshab/kja
vikshab
committed
c4c647c
Merge branch 'kja+vs/master' of github.com:vikshab/C3Projects--VideoStoreAPI into kja+vs/master
vikshab
committed
17b581a

Commits on Sep 23, 2015

Created method to display all customer rental history, wrote tests, added a new controller for rentals and route for rent
vikshab
committed
2ce0f32
working /movies/:title/customers/current endpoint. Need more tests
ktrops
committed
e31df61
Overdue function WIP
vikshab
committed
10b78f0
Overdue function almost done
vikshab
committed
018ede8
added one new seed rental data
ktrops
committed
4260c67
Finished overdue function, will return customers and there overdue info
vikshab
committed
ff4989d
Small changes added to rental model tests
vikshab
committed
d040267
Merge pull request #5 from vikshab/kja
vikshab
committed
d717626
Fixed merge conflicts
vikshab
committed
e13e95e
refactored currentCustomerRentals, so that the logic is in the model.
ktrops
committed
347bd7d
merging
ktrops
committed
de58064
Merge pull request #7 from vikshab/katie
vikshab
committed
17842aa
Notes - check marks for completed tasks
vikshab
committed
563943f
Merge branch 'kja+vs/master' of github.com:vikshab/C3Projects--VideoStoreAPI into kja+vs/master
vikshab
committed
4ed5dcc
notes added checkmarks
vikshab
committed
a1a4d80
Refactored code
vikshab
committed
accc5ce
Merge pull request #6 from vikshab/rentals
ktrops
committed
b76f68e
Merge branch 'kja+vs/master' of github.com:vikshab/C3Projects--VideoStoreAPI into kja+vs/master
vikshab
committed
04609f6
added sort_by_name and sort_by_id for /movies/:title/customers/past/ endpoint
ktrops
committed
cd8e7ff
checkin function WIP
vikshab
committed
4794fde

Commits on Sep 24, 2015

Commits on Sep 25, 2015

Rentals controller - Wrote method for checkin
vikshab
committed
9b854ff
Did some refactoring
vikshab
committed
814cb76
Refactored some code
vikshab
committed
88428bc
Merge pull request #8 from vikshab/katie
vikshab
committed
0f418d1
finshed /customers/:id/movies/past endpoint
ktrops
committed
f8d20d7
Fixed merge conflicts
vikshab
committed
39adcee
merge conflicts
ktrops
committed
f60d61e
Merge pull request #9 from vikshab/checkin
ktrops
committed
af10cd0
merging conflicts
ktrops
committed
e2c3ba2
Merge pull request #10 from vikshab/katie
vikshab
committed
9948607
Added url for test purpose
vikshab
committed
b7099ac
Deleted commented out code
vikshab
committed
3bc7410
refactoring, tests wip
vikshab
committed
1486bc7
WIP schema
ktrops
committed
9f1f825
changed seed and schema so that it runs one command as a time(i.e. added callbacks) and I have a passing post test
ktrops
committed
bbf6dbc
added scripts so that I can run the seed and schema from the runner(i.e. run_schema.js, run_seed.js)
ktrops
committed
c1ea0c5
Merge pull request #11 from vikshab/katie
vikshab
committed
6dea048
Deleted only from tests
vikshab
committed
a442471
fixed seed adn schema
ktrops
committed
1583720
Merge branch 'kja+vs/master' of github.com:vikshab/C3Projects--VideoStoreAPI into katie
ktrops
committed
213ec66
fixing syntax error
ktrops
committed
b4fe7f3
Merge pull request #12 from vikshab/katie
vikshab
committed
97db1f0
29 green tests, fixed movies_controller_test and custome_contollers_test, added a new function in database - sort_by_registered_at
vikshab
committed
0b73b8a
Merge pull request #13 from vikshab/vika
vikshab
committed
ef3096c
Added tests for /movies endpoints - movies_controller_test is completed
vikshab
committed
e4aece5
refactoring some code, added tests, 35 green tests
vikshab
committed
d8f0b82

Commits on Sep 26, 2015

added /customers/2/movies/current endpoint
ktrops
committed
8b44564
merge conflicts
ktrops
committed
9f7ad8f
Merge pull request #14 from vikshab/katie
ktrops
committed
4f1748f