Completed VideoStoreAPI project - #7

Open

sallyamoore wants to merge 104 commits into

Ada-Developers-Academy:lw+sm/masterfrom

sallyamoore:lw+sm/master

Commits on Sep 15, 2015

Commits on Sep 17, 2015

Added database.js, movies controller, and movies routes files.
sallyamoore
committed
fcb55f5
Added mocha for testing, wrote a coupel preliminary tests, wrote initial query method for movies table.
sallyamoore
committed
eeec08d
Created schema and seed functionality for customers table, then seeded.
sallyamoore
committed
b4c36e9
moved seed files
sallyamoore
committed
2b7f39b
added number available to movie schema
wangg131
committed
aa9440c
added foreign keys to rental tables
wangg131
committed
eead190
Merge pull request #1 from sallyamoore/rental-setup
wangg131
committed
fea1b24
Implemented a few more tests. WIP movies table initial tests.
sallyamoore
committed
bc2e17b

Commits on Sep 18, 2015

reorganized file structure and updated package.json
wangg131
committed
03adb91
WIP relationship between movies model and controller
wangg131
committed
64b73a3
First endpoint (to get all movies) is working. YAY.
sallyamoore
committed
d3e40d7
Set up schema in test.db and wrote test for /movies endpoint.
sallyamoore
committed
da3013e
Added endpoint to select column and return movie info for n movies offset by p records.
sallyamoore
committed
a0176d1
created endpoints for all customers and subset of customers
wangg131
committed
9b57fe7
tests for customer
wangg131
committed
f4aad09
wip rental checkout
wangg131
committed
0168cea

Commits on Sep 19, 2015

WIP checkout functionality.
sallyamoore
committed
8a12d82

Commits on Sep 21, 2015

Commits on Sep 22, 2015

fixed subset queries for movies and customers so all columns are returned and results are sorted by specified column.
sallyamoore
committed
be6c43e
Reformatted dates in rental seed file. Created endpoint for list of customers with overdue movies.
sallyamoore
committed
4e73359
look up movie by title
wangg131
committed
8483a13
customers by movie history ordered
wangg131
committed
228a157
started some wip tests for movies_by_customer_history
wangg131
committed
9269e25
added different sort columns for movie's history
wangg131
committed
6c7db67
Merge pull request #4 from sallyamoore/sm-sort-cust-and-movies
sallyamoore
committed
d3f97ae
Merge pull request #5 from sallyamoore/sm-overdue-movies
sallyamoore
committed
37a4e27
movie history and info
wangg131
committed
b5bed27
sorting customers that previously checked out specified movie.
sallyamoore
committed
b30fc88
mergin changes
wangg131
committed
4840bc8
Merge pull request #6 from sallyamoore/get_movie_title
sallyamoore
committed
b134815
resolving merge conflicts.
sallyamoore
committed
793096f
Merge pull request #7 from sallyamoore/cust-movie-hist-sort
sallyamoore
committed
d8fb238
Refined endpoints to get customer who checked out specified movie in the past, sorting on rentals or customer info.
sallyamoore
committed
7038991
Post to checkout a movie. YAY
sallyamoore
committed
3d8bc2c
checkout out a rental subtracts account credit
wangg131
committed
cb0e751
rental cost as variable
wangg131
committed
308db04
Merge pull request #8 from sallyamoore/subtract-credit
sallyamoore
committed
2daf11b

Commits on Sep 23, 2015

Finished check out functionality - updates customer credit and number of copies available.
sallyamoore
committed
e50d5a4
Merge pull request #9 from sallyamoore/sm-more-checkout
sallyamoore
committed
43deb25
movie controller tests
wangg131
committed
cb2054e
movies controller tests wip
wangg131
committed
ad44ab6
separated controller and model tests wip
wangg131
committed
5739bb8
changed some test pathing issues
wangg131
committed
08b8668
Merge pull request #10 from sallyamoore/subtract-credit
sallyamoore
committed
f97fa59
Customer model tests
sallyamoore
committed
63031e3
Finished customer model tests. YAY
sallyamoore
committed
c9768f1
Tested sort order of customers_overdue.
sallyamoore
committed
751fb58
movie controller tests wip
wangg131
committed
ca5de4f
working movie controller tests
wangg131
committed
74948e2
Customer controller tests.
sallyamoore
committed
b9c9895
formatted controller tests
wangg131
committed
2b2f2f1
Merge pull request #11 from sallyamoore/subtract-credit
wangg131
committed
aa864da
Completed controllers tests for all customer endpoints.
sallyamoore
committed
857edf6
Merge conflicts
sallyamoore
committed
9fdaab3
Merging master onto branch.
sallyamoore
committed
d795bcf
wip movie model tests and minor changes to controller tests
wangg131
committed
6e35598
movie model tests
wangg131
committed
134b593
Merge pull request #12 from sallyamoore/sm-test
sallyamoore
committed
7b00ce9
done with movie tests
wangg131
committed
c79a0c6
mergin
wangg131
committed
47f0376
Merge pull request #13 from sallyamoore/lw-movie-mod-tests
wangg131
committed
6db6743
WIP check in movie
sallyamoore
committed
3be0746
Resolving merge conflicts
sallyamoore
committed
fc8892d
Merge pull request #14 from sallyamoore/checkin
sallyamoore
committed
25c3aff

Commits on Sep 24, 2015

check in working for now..
wangg131
committed
bdabfe4
dev db adding forgot
wangg131
committed
7729e50
added back updated_id to check_in
wangg131
committed
8008728
rental model tests, #check_out.
sallyamoore
committed
8ce7452
finished model tests for rentals.
sallyamoore
committed
c288b81
working on date formatting so that customers/overdue works correctly.
sallyamoore
committed
a14cf30
Formatting dates. Extracted function into helpers/date_helper.
sallyamoore
committed
15060dd
account credit cant go below zero
wangg131
committed
5189bd9
Merge pull request #15 from sallyamoore/sm-bugs
sallyamoore
committed
1101e57
mergin
wangg131
committed
0b0cf51
Merge pull request #16 from sallyamoore/lw-bugs
wangg131
committed
ed5281b
updating rental functions to prevent execution of statements if one fails.
sallyamoore
committed
60b4edf
Now only updating movie num_available and customer#account_credit if checkout/checkin was successful.
sallyamoore
committed
3f9f36f

Commits on Sep 25, 2015

Merge pull request #17 from sallyamoore/sm-inventory
sallyamoore
committed
4301e7e
better rental controller tests
wangg131
committed
0be8098
rental controller tests
wangg131
committed
a86b7f5
deleted an unnecessary variable
wangg131
committed
405de1d
rental patch test
wangg131
committed
6461c37
test db
wangg131
committed
56356e2
Added constraints to inventory and num_available in movies. Cannot check out unless available.
sallyamoore
committed
519e657
Merge pull request #18 from sallyamoore/rental-test
wangg131
committed
f4ee0c9
fixing tests that failed b/c of changes to rentals model.
sallyamoore
committed
e6257e6
Cleaning up stray deprecated code.
sallyamoore
committed
1b44276
resolving merge conflicts
sallyamoore
committed
991e714
Merge pull request #19 from sallyamoore/sm-inventory-4real
sallyamoore
committed
be563d5
refactored model files into separate files
wangg131
committed
f0ab961
mergin refactor
wangg131
committed
7d754ed
Merge pull request #20 from sallyamoore/lw-refactor
wangg131
committed
72e5eff
Resetting the databases.
sallyamoore
committed
064a35d
Fixed little things that broke in our tests when we merged.
sallyamoore
committed
f5a456e
Adding back put route for rentals.
sallyamoore
committed
39c8eb7