Video Store Ada Project - #6

Open

rishallen wants to merge 140 commits into

Ada-C5:masterfrom

rishallen:master

Commits on Jun 14, 2016

Commits on Jun 15, 2016

created two tables, history and rentals.
rishallen
committed
fe63389
adjusted value type in customer table from integer to deciaml for accoutnt credit.
rishallen
committed
2a14601
we updated the script seed task and added it to the reset script.
rishallen
committed
1c48825
created an algorithm for seeding the data tables.
rishallen
committed
6d44257
seeded the Rentals table
melissajimison
committed
0133392
Added 'status' as INDEX in the rentals schema
melissajimison
committed
c5cb407

Commits on Jun 16, 2016

Commits on Jun 17, 2016

added sort route and functionality to movies
Lisa-Sano
committed
def45be
created tests for sort by column
melissajimison
committed
1eeb907
added the flow to send requests and retrieve json response.
rishallen
committed
4d837ac
apart of the flow request and response to json.
rishallen
committed
23280a7
added rentals seeds
melissajimison
committed
119ceb5
removed seed file for rentals. unnecessary
Lisa-Sano
committed
1dc3d4a
fixed bug with populating rentals table. assign a few customers to rentals.
Lisa-Sano
committed
a86b233
working on the customers movie call
rishallen
committed
6909f39
Merge branch 'master' into customerspage
rishallen
committed
f3f25ef
deleted reference to rental seed file since it was removed
Lisa-Sano
committed
03fb910
Merge branch 'master' into customerspage
rishallen
committed
6c01dc7
when given a movie title in movies/:title/current, gives a list of customers who currently have that movie checked out
Lisa-Sano
committed
7d8f6d8
added some history seed data
Lisa-Sano
committed
41ba9d0
changed method and variable names to be more descriptive
Lisa-Sano
committed
0d3b09b
added a method, current to find the rentals of a single customer id and added a route to access the rentals by customer id.
rishallen
committed
2b6f758
fixed a merge conflict within the customers controller.
rishallen
committed
5486691
can find history of all past rentals for a specific movie
Lisa-Sano
committed
3b20c69
fixed colon error
rishallen
committed
b89b146
uncommment routes for Rantals
melissajimison
committed
51252e2
added '/:title endpoint
melissajimison
committed
4cc4653
added find_movie method that calls Movies.find, Rentals.available, and render an object
melissajimison
committed
0f40cf6
created Rentals.available that returns a nummber, the length of the array that matches movies_id and status 'available'
melissajimison
committed
d51dbda
solved conflicts
melissajimison
committed
10fe85a
replace the massive setup for the fancy two lines of code
melissajimison
committed
db21a3e
coment out a non-used route
melissajimison
committed
e6c5a15

Commits on Jun 18, 2016

added the length
melissajimison
committed
beb2bcd

Commits on Jun 19, 2016

Commits on Jun 20, 2016

added status codes to json responses for /movies/ routes
Lisa-Sano
committed
5b52bd9
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
melissajimison
committed
5e0bcec
See a list of customers that have currently checked out any of the movie's inventory (/rentals/Jaws/customers)
melissajimison
committed
c40ce34
moved sql code for finding customers that currently have a given movie checked out to a new sql file in the db folder
Lisa-Sano
committed
74129c6
added the history function
rishallen
committed
5eb45ae
change the name of the controller for one more semantic current_customers
melissajimison
committed
8dc5e53
made merge changes to the history model
rishallen
committed
76b10c3
refactor find_customers_by_title
melissajimison
committed
ace87c3
refactor the object reteurned in /rentals/Jaws. The status is included and the movie info is an object
melissajimison
committed
fdcebcc
set istanbul
melissajimison
committed
1a5a585
removed history model file (not being used)
Lisa-Sano
committed
f766f18
added SQL files that have the inner join scripts to get customer information from movie titles
Lisa-Sano
committed
f343231
call .sql files in db/sql/movies instead of having SQL hard-coded (forgot to commit - belongs with the last 2 commits)
Lisa-Sano
committed
7048b8f
fixed merge conflict
Lisa-Sano
committed
e77258e
refactored to DRY up callbacks
Lisa-Sano
committed
4b9eac0

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
2f2277e
tests for movies model
Lisa-Sano
committed
20ebb10
added basic controller tests
melissajimison
committed
465cb2f
deleted unsused get_customer_ids
melissajimison
committed
1f9ebcc
fixed bug tht calculates the copies available
melissajimison
committed
fad591e
ettempted to write some model tests
melissajimison
committed
150c125
added file to the models directory, fixed the test
melissajimison
committed
a32d540
added more models test and extended the controllers tests
melissajimison
committed
1be5b99
added tests for enpoint /:title/customers
melissajimison
committed
8d20e52
working on flow for customer history flow.
rishallen
committed
931c5a0
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
8b6ed98
fixed merge conflicts
rishallen
committed
8ea896b
added overdue column to history table, and update the seed file
melissajimison
committed
0528ccf
added a conditional that checks the request and makes sure there are perameters for the request.
rishallen
committed
94ad964
first atempt to do post requests
melissajimison
committed
37c99e7
conflicts
melissajimison
committed
cf07dd7
more attempting post request, for now the update, apdates all the(movies copy) rentals with that movie id
melissajimison
committed
612129d
istanbul does not count spec folders anymore
melissajimison
committed
dc97e66

Commits on Jun 22, 2016

Commits on Jun 23, 2016

Commits on Jun 24, 2016

removed a test
Lisa-Sano
committed
4491e30
crerating json api flow.
rishallen
committed
2881e5c
Merge branch 'master' into customerspage
rishallen
committed
2c72efa
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
1b99b53
#create_record returns an instance of History
Lisa-Sano
committed
c505728
added tests for history model
Lisa-Sano
committed
305e238
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
Lisa-Sano
committed
357c165
one test
melissajimison
committed
2c2d322
trying to update the customer account
melissajimison
committed
71822d3
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
melissajimison
committed
d4cf818
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
0e3961f
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
cc9435d
added tests for movies model

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

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

Lisa-Sano
authored and
melissajimison
committed
64aedb6
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
37a54e5
removed a test

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

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

Lisa-Sano
authored and
melissajimison
committed
f485379
Merge branch 'practice'
melissajimison
committed
58e0f9b
added status codes customers controller methods and updated history method so it returns a status as well as history array
Lisa-Sano
committed
6c3a17a
added a space
Lisa-Sano
committed
ea1a682
added overdue functionality. get customer name, movie title, checkout date, and return date at /rentals/overdue
Lisa-Sano
committed
276aec5
forgot to add with last commit. overdue functionality for rentals
Lisa-Sano
committed
97cfe56
added status code to json response for overdue path
Lisa-Sano
committed
2fb800d
mark_as_checkout and updatecustomer working crispy
melissajimison
committed
8addb9c
updated history seed file to include movies currently rented in rentals table
Lisa-Sano
committed
d912c35
overdue method returns results of rentals that have a status 'rented' and whose return date is before today's date
Lisa-Sano
committed
4b7f7c0
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
780df87
removed overdue column from the history table (not needed)
Lisa-Sano
committed
89cf0e5
updated tests to reflect changes in seed files
Lisa-Sano
committed
5b0212e
/rentals/:title/return/:id
melissajimison
committed
4d81bb4
added history tests
Lisa-Sano
committed
8c7d072
created an html view and changed to json file vs js file
rishallen
committed
62e30f5
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
c6a18f5
fixed conflics
melissajimison
committed
928f188
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
melissajimison
committed
1251668
delete a console.log
melissajimison
committed
d24fdbf
added some more tests
rishallen
committed
8c01984
Merge branch 'master' of github.com:rishallen/VideoStoreAPI
rishallen
committed
90b6453
added more tests in the model
rishallen
committed
932ecf2

Commits on Jun 25, 2016

fixed some styling issues, attempt to make test fot posr request, it makes too many changes in the data base that alterates the other test, it also behave weird the second time is ran
melissajimison
committed
bf35bbf
added more tests to the rentals model, edited some of the controllers
melissajimison
committed
fad219e