Sara (branches) & Julia K (leaves)#33

Open

Kalakalot wants to merge 67 commits into

Ada-C12:masterfrom

Kalakalot:master

Commits on Nov 5, 2019

model generated
sarashahbaig
committed

Commits on Nov 6, 2019

controller generated
sarashahbaig
committed
Added routes and index action for Movie. /movies works on localhost but is only showing movie id.
Julia A Kingrey
committed
edited
sarashahbaig
committed
Merge branch 'master' of https://github.com/Kalakalot/video-store-api
sarashahbaig
committed
code refactored for customer and movies
sarashahbaig
committed
customer model edited
sarashahbaig
committed
route added for customer
sarashahbaig
committed
Created test fixtures for customers.
Julia A Kingrey
committed
Corrected typo in customers controller keys, index action now working.
Julia A Kingrey
committed
code added
sarashahbaig
committed
code added
sarashahbaig
committed
Saving changes so I can pull in Sara's changes from master.
Julia A Kingrey
committed
Updated Gemfile to accept Ruby 2.5.5 and higher.
Julia A Kingrey
committed
Pulled in Sara's most recent changes and fixed merge conflicts.
Julia A Kingrey
committed
Merge pull request #2 from Kalakalot/customers
Kalakalot
authored
Added movies_checked_out_count with a default value of 0 to customers table.
Julia A Kingrey
committed
Merge pull request #3 from Kalakalot/customers
Kalakalot
authored
Fixed merge conflicts.
Julia A Kingrey
committed
Updated customers controller to add new movies_checkout_out_count column.
Julia A Kingrey
committed
test edited
sarashahbaig
committed
Merge branch 'customers'
Julia A Kingrey
committed
edited
sarashahbaig
committed
Added available_inventory column to movies table and updated seed file with available_inventory numbers.
Julia A Kingrey
committed
Merge branch 'master' of https://github.com/Kalakalot/video-store-api
Julia A Kingrey
committed
controller and model generated for rental
sarashahbaig
committed
Added available_inventory key to movies_controllers and updated customers_controller_test so that keys are correctly alphabetized. All tests passing.
Julia A Kingrey
committed
Merge branch 'master' of https://github.com/Kalakalot/video-store-api
Julia A Kingrey
committed
Fixed error in movies.json
Julia A Kingrey
committed
Updated movies_controller create action to respond with success instead of created.
Julia A Kingrey
committed
refactored code
sarashahbaig
committed
Merge branch 'master' of https://github.com/Kalakalot/video-store-api
Julia A Kingrey
committed

Commits on Nov 7, 2019

Added available movies inventory to movie controller strong params.
Julia A Kingrey
committed
Updated movies_controller_test to include available_inventory key. All tests passing.
Julia A Kingrey
committed
Added note about required param to movies controller and started setting up rentals controller.:
Julia A Kingrey
committed
schema edited
sarashahbaig
committed
code refactored
sarashahbaig
committed
checkin, checkout
sarashahbaig
committed
schema changed
sarashahbaig
committed
route added
sarashahbaig
committed
Merge branch 'master' of https://github.com/Kalakalot/video-store-api
sarashahbaig
committed
code refactored
sarashahbaig
committed
Merge branch 'master' of https://github.com/Kalakalot/video-store-api
Julia A Kingrey
committed
Added fixture for rentals and relationship test for customer model.
Julia A Kingrey
committed
Followed TDD for customer model testing. Tests for relationships and validations passing.
Julia A Kingrey
committed
Small tweaks to customer model tests.
Julia A Kingrey
committed
Fixed spacing in customer model and added assertions to rentals controller test.
Julia A Kingrey
committed

Commits on Nov 8, 2019

Commits on Nov 9, 2019

Added negative tests for customer model.
Julia A Kingrey
committed
model test added
sarashahbaig
committed

Commits on Nov 10, 2019