Video Store Ada Project#6

Open

rishallen wants to merge 140 commits intoAda-C5:masterfrom

rishallen:master

Commits on Jun 16, 2016

Commits on Jun 17, 2016

Commits on Jun 18, 2016

added the length
melissajimison
committed

Commits on Jun 19, 2016

updated seeds so the same customers didn't check out multiple copies of the same movie in rentals (it was confusing to see the same name listed multiple times when seeing current check-outs)
Lisa-Sano
committed
updated the sql query to use inner joins between movies, rentals, and customers tables to avoid nested callbacks
Lisa-Sano
committed
fixed merge conflicts
Lisa-Sano
committed
replaced nested queries using different model methods with an inner join in Movies model that connects movies/rentals/histry/customers. when a title is given, it retrieves a list of all customers t…
Lisa-Sano
committed
only displays name, phone number, and account credit for each customer when hitting the movies/:title/current and movies/:title/history/... paths
Lisa-Sano
committed
removed a bunch of commented-out code no longer in use
Lisa-Sano
committed
fixed merge conflict
Lisa-Sano
committed
fixed conflict
melissajimison
committed
add functionality for sorting customer history information either by name of customer or checkout_date
Lisa-Sano
committed

Commits on Jun 20, 2016

Commits on Jun 21, 2016

changed method name from sort_by_day to sort_by since it can also sort by title
Lisa-Sano
committed
tests for movies model
Lisa-Sano
committed
added basic controller tests
melissajimison
committed
deleted unsused get_customer_ids
melissajimison
committed
fixed bug tht calculates the copies available
melissajimison
committed
ettempted to write some model tests
melissajimison
committed
added file to the models directory, fixed the test
melissajimison
committed
added more models test and extended the controllers tests
melissajimison
committed
added tests for enpoint /:title/customers
melissajimison
committed
working on flow for customer history flow.
rishallen
committed
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
fixed merge conflicts
rishallen
committed
added overdue column to history table, and update the seed file
melissajimison
committed
added a conditional that checks the request and makes sure there are perameters for the request.
rishallen
committed
first atempt to do post requests
melissajimison
committed
conflicts
melissajimison
committed
more attempting post request, for now the update, apdates all the(movies copy) rentals with that movie id
melissajimison
committed
istanbul does not count spec folders anymore
melissajimison
committed

Commits on Jun 22, 2016

Commits on Jun 23, 2016

Commits on Jun 24, 2016

removed a test
Lisa-Sano
committed
crerating json api flow.
rishallen
committed
Merge branch 'master' into customerspage
rishallen
committed
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
#create_record returns an instance of History
Lisa-Sano
committed
added tests for history model
Lisa-Sano
committed
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
Lisa-Sano
committed
one test
melissajimison
committed
trying to update the customer account
melissajimison
committed
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
melissajimison
committed
removed distinct from select clause so that all entries are found even if customer_id and rental_id are the same (seed file has duplicates, so there should be multiple entries like this)

Lisa-Sano
authored and
melissajimison
committed
added a default order_by for customer history. if an invalid sort option is given, it will sort by id

Lisa-Sano
authored and
melissajimison
committed
added tests for movies model

Lisa-Sano
authored and
melissajimison
committed
changed to status 500 for errors

Lisa-Sano
authored and
melissajimison
committed
added tests for the movies controller

Lisa-Sano
authored and
melissajimison
committed
DRY up movies controller. if sort column for movies/sort/:column path is invalid, sorts by id by default. updated spec to reflect default id sort change

Lisa-Sano
authored and
melissajimison
committed
removed a test

Lisa-Sano
authored and
melissajimison
committed
#create_record returns an instance of History

Lisa-Sano
authored and
melissajimison
committed
added tests for history model

Lisa-Sano
authored and
melissajimison
committed
Merge branch 'practice'
melissajimison
committed
added status codes customers controller methods and updated history method so it returns a status as well as history array
Lisa-Sano
committed
added a space
Lisa-Sano
committed
added overdue functionality. get customer name, movie title, checkout date, and return date at /rentals/overdue
Lisa-Sano
committed
forgot to add with last commit. overdue functionality for rentals
Lisa-Sano
committed
added status code to json response for overdue path
Lisa-Sano
committed
mark_as_checkout and updatecustomer working crispy
melissajimison
committed
updated history seed file to include movies currently rented in rentals table
Lisa-Sano
committed
overdue method returns results of rentals that have a status 'rented' and whose return date is before today's date
Lisa-Sano
committed
dates that are entered when inserting new history records in the table have a string date in the format MM/DD/YYYY using .toLocaleDateString method
Lisa-Sano
committed
removed overdue column from the history table (not needed)
Lisa-Sano
committed
updated tests to reflect changes in seed files
Lisa-Sano
committed
/rentals/:title/return/:id
melissajimison
committed
added history tests
Lisa-Sano
committed
created an html view and changed to json file vs js file
rishallen
committed
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
fixed conflics
melissajimison
committed
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
melissajimison
committed
delete a console.log
melissajimison
committed
added some more tests
rishallen
committed
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
added more tests in the model
rishallen
committed

Commits on Jun 25, 2016