Canaan and Marisa (we already submitted one but maybe it didn't upload?) - #26

Open

canaanwest wants to merge 102 commits into

Ada-C8:masterfrom

marisamorris:master

Commits on Nov 6, 2017

project created
HelloMarisaMorris
committed
bbaad6e
created models
HelloMarisaMorris
committed
97c8ac1
adding registered_at to customers model
canaanwest
committed
b786c10
adding account_credit to customer
canaanwest
committed
b9036c9
added validations to customer and movie
canaanwest
committed
1201bc2
updating test helper
canaanwest
committed
ecf68ac
adding testing vadidations for customers
canaanwest
committed
145d907
created movie model validation tests.
HelloMarisaMorris
committed
18b3723
adding zomg test
canaanwest
committed
5082276
adding numericality validation to movie inventory
canaanwest
committed
d060dc5
add test for validation failures with negative numbers
canaanwest
committed
ea6de0a
adding validationg that inventory must be a number
canaanwest
committed
fcea4dc
added routes
HelloMarisaMorris
committed
9ff43fb
migration for customers and model tests
HelloMarisaMorris
committed
1481778
removed some spaces
canaanwest
committed
dc84865
merging conflicts
canaanwest
committed
15123ba
movies controller tests for index
canaanwest
committed
b21bea6
completed customer index tests
HelloMarisaMorris
committed
ea90bcd
completed testing for index movies
canaanwest
committed
35d4939
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
b25ec6c
tests for show method movies
canaanwest
committed
dd503df
method for show movie
canaanwest
committed
ff20e3a
create movie methods and tests
canaanwest
committed
e9487b5
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
6342ccd
added simple cov to gem file
HelloMarisaMorris
committed
114eb3d
updated simple cov
HelloMarisaMorris
committed
d07548e
adding coverage to gitignore
canaanwest
committed
efcb97b
removing gemfile.lock
canaanwest
committed
c2452ca
updating bundle install
canaanwest
committed
7287a00
fixing show method and index method for movies
canaanwest
committed
8b6a302
added coverage folder to gitignore
HelloMarisaMorris
committed
5748f73
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
4c5bedc
adding available_inventory
canaanwest
committed
4b2d529
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
b2105b4
modifying show route for movie:
canaanwest
committed
1183bb7
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
a734d38

Commits on Nov 7, 2017

fixing controllers based on smoke tests
canaanwest
committed
78eea36
fixed typ0
HelloMarisaMorris
committed
787ae54
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
3811308
fixing routes
canaanwest
committed
678a3f1
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
canaanwest
committed
03c7226
adding id
canaanwest
committed
a3ad889
customer serializer
canaanwest
committed
7ee1cb8
added serializer for movie. Working in development not in test so skipping the two tests that are not passing for now.
HelloMarisaMorris
committed
a0c5fba
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
cf74d06
pseudocode for rentals controller
canaanwest
committed
be31d52
added test questions for rental controller
HelloMarisaMorris
committed
0ba8907
migration to set checkout date to created_at
HelloMarisaMorris
committed
3fc3da4
removed the created date default valued for the checkout date
HelloMarisaMorris
committed
4ec15fc
adding has_many relationship to customer and movie
canaanwest
committed
beabc1b
fixing foreign key constraints for rental model
canaanwest
committed
5a3f4ff
checkout method completed along with tests
HelloMarisaMorris
committed
a5b16a5
moving some functionality to model methods from controller methods
canaanwest
committed
405b13f
writing negative case for checkout
canaanwest
committed
69ac466
adding check in method and test
canaanwest
committed
fe72854
adding validations for available_inventory in rentals
canaanwest
committed
4cf31c3
removed self methods from rental model and moved them to the movie model
HelloMarisaMorris
committed
42c5e17
minor changes to be overwritten by merge
canaanwest
committed
52da43c
fixing merge conflicts
canaanwest
committed
e203868
removing self methods from rentals model
canaanwest
committed
810ef96

Commits on Nov 8, 2017

moving increase inventory to movie controller
canaanwest
committed
1cc94ed
removing increase inventory; it was a duplicate
canaanwest
committed
cb28c98
changing 'increase invetory' to 'Add invetor'
canaanwest
committed
4c6f13f
fixing issue with inventory count in tests
canaanwest
committed
177d3bb
overdue method and test
canaanwest
committed
bdd7440
adding edge case for no overdue rentals
canaanwest
committed
d8bf063
Added nullify so that we can delete a customer and movie without affecting customer
HelloMarisaMorris
committed
4640cd9
some changes that need merging
canaanwest
committed
229bc8e
merging?
canaanwest
committed
486966a
merging conflicts in coverage files
canaanwest
committed
800574c
skipped failing test due to serialize issue. spoke to dan about it and was not able to come to a solution
HelloMarisaMorris
committed
d6dc9ac

Commits on Nov 11, 2017

adding routes for sorting
canaanwest
committed
004751e

Commits on Nov 12, 2017

adding model method to sort by search term, controller method to display results
canaanwest
committed
d6e0ff4
adding list of acceptable sort terms
canaanwest
committed
e00c465
adding rescue for arg error
canaanwest
committed
e4bb9e4
connecting params to index function
canaanwest
committed
26e0f4b
fixing mistake in the routes
canaanwest
committed
b5417d8
adding dedicated sort_by method to customers controller
canaanwest
committed
7c79dd9
consolidating paths to accept optional params
canaanwest
committed
4fb05bf
adding tests for sort params
canaanwest
committed
da38a75
adding more tests for optional params, including response type
canaanwest
committed
b3fd4f6
adding test for order of output with optional params
canaanwest
committed
a101e59
adding testing for model method sort_by; argument error failing on account of argument error being raised
canaanwest
committed
5b4df1f
adding testing for model method sort_by; argument error failing on account of argument error being raised
canaanwest
committed
9140704
missing some tests for rental?
canaanwest
committed
a239c65
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
HelloMarisaMorris
committed
b1d6419
adding tests for rental?
canaanwest
committed
bbab420
adding tests for rentals.rb
canaanwest
committed
57893bb
adding model tests for rental
canaanwest
committed
85460c8
Merge branch 'master' of https://github.com/HelloMarisaMorris/VideoStoreAPI
canaanwest
committed
d35ba73
adding tests for movie model
canaanwest
committed
12a134f
Adding application controller test
canaanwest
committed
288f0de

Commits on Nov 13, 2017

100% coverage
canaanwest
committed
b0d3c05
commiting before merging optionals
canaanwest
committed
aa2c73e
removing stuff
canaanwest
committed
3d052a7
fixing tests that broke with optionals
canaanwest
committed
52941d6
adding pagination optional
canaanwest
committed
7bb88c7
fixing bug in pagination
canaanwest
committed
7dcbd5d
adding test for pagination
canaanwest
committed
b9be6c4
edge case tests for sort_by customer method
canaanwest
committed
af63e2d
adding extra params for movies
canaanwest
committed
2c7dcad
adding tests for movie custom methods for sorting
canaanwest
committed
a60cd11