Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
6778ed4
rails api setup, customer, rental, movie models created
elle-johnnie Nov 5, 2018
8f0d812
add customer and movie refs to rentals
elle-johnnie Nov 5, 2018
b2ad5e0
customers, movies, rentals, controllers all added
elle-johnnie Nov 5, 2018
dea6384
cleaned up controller actions layout
elle-johnnie Nov 5, 2018
ad22fbf
Added routes.rb and pseudocode-routes.md
sjlee3157 Nov 5, 2018
d9ed3a7
Fixed typos in routes and models to run db:reset
sjlee3157 Nov 5, 2018
df862f9
added default 0 to customers checked out count
elle-johnnie Nov 5, 2018
58d2945
created validations in customers, movies and rentals and added availa…
elle-johnnie Nov 5, 2018
0b458de
added default 0 to inventory available in movies table - requires db:…
elle-johnnie Nov 5, 2018
7231940
Removed movie count column from Customer model
sjlee3157 Nov 5, 2018
388ba8c
Fixtures updated
sjlee3157 Nov 5, 2018
b736b76
added shoulda gem
elle-johnnie Nov 5, 2018
203031e
merged stash
sjlee3157 Nov 6, 2018
75efeda
resolved merge conflicts
elle-johnnie Nov 6, 2018
9f8edf4
Model tests pass
sjlee3157 Nov 6, 2018
0634c38
Custom model method tests passing
sjlee3157 Nov 6, 2018
4e69b63
Added simplecov gem
sjlee3157 Nov 6, 2018
69826ea
Added protect_from_forgery
sjlee3157 Nov 6, 2018
d23f411
tests for model relationships complete
elle-johnnie Nov 6, 2018
ab3450d
added rabl gem
elle-johnnie Nov 6, 2018
1f7c8dd
Set up rabl for Customers index and show
sjlee3157 Nov 6, 2018
86eda10
added api testing for movies controller
elle-johnnie Nov 6, 2018
0c61aa8
merge conflicts resolving
elle-johnnie Nov 6, 2018
18a131d
Controller test for customers/index passing
sjlee3157 Nov 6, 2018
fe75ac2
Merge branch 'master' of https://github.com/xLJohnsonx/VideoStoreAPI
sjlee3157 Nov 6, 2018
3336d9b
Cleaned up view
sjlee3157 Nov 6, 2018
df7f190
Merged LJ relationship tests into SJs v tests
sjlee3157 Nov 6, 2018
1c2fa8c
adding rabl to movies controller
elle-johnnie Nov 6, 2018
8413590
resolved merge conflicts
elle-johnnie Nov 6, 2018
efb28fa
added rabl to movie show and index plus index test
elle-johnnie Nov 6, 2018
473be1d
.idea to gitignore
elle-johnnie Nov 6, 2018
b8f6721
resolved merge conflicts
elle-johnnie Nov 6, 2018
7b3c29c
matched initial inv_avail value to inv value in Movies table
elle-johnnie Nov 6, 2018
81ea61a
Fixed up current test syntax so they run
sjlee3157 Nov 6, 2018
223d563
Merge branch 'master' into controller/movies
elle-johnnie Nov 6, 2018
6915930
Added movie and customer controllers, views, and tests (in prog)
sjlee3157 Nov 6, 2018
b1bd5dd
Finished movie controller tests, passing
sjlee3157 Nov 6, 2018
1ee5ad2
rental_controller
elle-johnnie Nov 7, 2018
ad3dcc1
Added updated Wave2 Postman smoke test
sjlee3157 Nov 7, 2018
247d627
Changed variable name to match our schema (to inventory_available) in…
sjlee3157 Nov 7, 2018
8ed29cf
Small refactors to movies contrl and cust ctrl tests
sjlee3157 Nov 7, 2018
bccaf53
checkout and checkin actions tests built and model and controller pass
elle-johnnie Nov 7, 2018
f6a63ae
Merge branch 'master' of https://github.com/xLJohnsonx/VideoStoreAPI
elle-johnnie Nov 7, 2018
723b7f7
Implemented sort= query params for Movie and Customer controllers, te…
sjlee3157 Nov 7, 2018
89f21ee
Merge branch 'master' of https://github.com/xLJohnsonx/VideoStoreAPI
sjlee3157 Nov 7, 2018
3f1b80f
changed routes to check-out and check-in with dashes so smoke tests pass
sjlee3157 Nov 7, 2018
2c01ad4
migration to remove default col val in movie inventory available, upd…
elle-johnnie Nov 7, 2018
7632b3b
Added 2 tests to mimic postman smoke test
sjlee3157 Nov 7, 2018
bbcf27d
Fixed bug in rental checkin to find first nil checkin date
sjlee3157 Nov 7, 2018
0d19817
Retry of the previous commit
sjlee3157 Nov 7, 2018
55c962c
error message for movies that are all checked out
elle-johnnie Nov 7, 2018
e9d711d
resolved merge conflicts
elle-johnnie Nov 7, 2018
18b75f9
Added zomg path test
sjlee3157 Nov 7, 2018
7c691f2
Changed .json.rabl to .rabl
sjlee3157 Nov 7, 2018
edae0a2
checkout msg tests pass but original tests fail womp womp
elle-johnnie Nov 8, 2018
1b95198
setting up rentals/overdue endpoint
sjlee3157 Nov 8, 2018
eaaa23a
rental checkin checkout with bad datapasses validation tests
elle-johnnie Nov 8, 2018
1a47679
Added Pacific time zone to initializers and replaced Date.today to Da…
sjlee3157 Nov 9, 2018
be2b829
Updated seed data- overdue rentals, upped movie inventory #s
sjlee3157 Nov 9, 2018
9baa06d
Added rentals to fixtures, updated rental contrlr test to pass, overd…
sjlee3157 Nov 9, 2018
30b80ac
Added overdue rentals sorting (not tested) and cleaned up code and co…
sjlee3157 Nov 9, 2018
2cce4c0
SJ savepoint before mergin with LJ
sjlee3157 Nov 9, 2018
b767a59
err msgs
elle-johnnie Nov 9, 2018
2efd67b
Merged in SJ's sorting branch
sjlee3157 Nov 9, 2018
feb7ad9
rental validators
elle-johnnie Nov 9, 2018
249da92
Can sort overdue rentals by checkout date and due date
sjlee3157 Nov 9, 2018
f394042
Merge remote branch 'master' into SJ's queryparams
sjlee3157 Nov 9, 2018
1ae2c55
Can sort by movie title and customer name (untested)
sjlee3157 Nov 9, 2018
fd38cde
New tests for sorting overdue rentals pass
sjlee3157 Nov 9, 2018
d012cc1
paging
elle-johnnie Nov 10, 2018
2de8289
paginate with tests for n and p queries on customers
elle-johnnie Nov 10, 2018
db759c6
Merge branch 'paginate'
elle-johnnie Nov 10, 2018
0666b52
endpoints and tests finished
elle-johnnie Nov 11, 2018
b5c26d1
Edited comments and added some docu
sjlee3157 Nov 11, 2018
6248c54
Merged LJ master into local master
sjlee3157 Nov 11, 2018
5eef56c
sorting: subcategorized valid_sorters in appctrlr by controller actio…
sjlee3157 Nov 11, 2018
f962a61
customers#index will now default to showing all records if no p= quer…
sjlee3157 Nov 11, 2018
6298602
Minor fix to a ctrlr test
sjlee3157 Nov 11, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore uploaded files in development
/storage/*
!/storage/.keep

.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key


# Simplecov
/coverage/*

.idea
.sandbox*
77 changes: 77 additions & 0 deletions .idea/VideoStoreAPI.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading