Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Anne & Dikla - VideoStoreApi - Octos #2

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
c919709
rails new
diklaaharoni May 7, 2018
35b2b97
generated movie model
diklaaharoni May 7, 2018
c6fa949
controller for movies
annehwatson May 7, 2018
3ccaa1c
customer scontroller
annehwatson May 7, 2018
9a0fa37
Added index route and index method in customer controller
diklaaharoni May 7, 2018
3ff55aa
Added the zomg method and route
diklaaharoni May 7, 2018
2d0b5c0
rental model and relations
annehwatson May 7, 2018
4111a91
foreign keys for rentals on customer and movie
annehwatson May 7, 2018
7947ee0
readded the seed snippet back in because it disappeared
annehwatson May 7, 2018
7062f43
Added index method to movies controoler and created a route
diklaaharoni May 7, 2018
f598025
Fixed typo
diklaaharoni May 7, 2018
793906e
index customers controller test
annehwatson May 7, 2018
85716c8
Added tests for movie model
diklaaharoni May 7, 2018
0acfd34
stubs for customer test
annehwatson May 7, 2018
bd8b50f
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
annehwatson May 7, 2018
b81e1d9
Added route for movie show and the show method for movie controller
diklaaharoni May 7, 2018
4c1ced3
create a new movie test and method
annehwatson May 7, 2018
2459e1b
Added tests for the show method in the movie controller test file
diklaaharoni May 7, 2018
f9eae11
Added validation for movie title and validation tests
diklaaharoni May 7, 2018
3766bf4
Added validation for customer name and validation tests
diklaaharoni May 7, 2018
50c033e
Added before block to customer model tests
diklaaharoni May 7, 2018
6b0c4f3
controller test
annehwatson May 8, 2018
817ca16
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
diklaaharoni May 8, 2018
f52adc5
Generate rental controller
diklaaharoni May 8, 2018
f568c87
through relations
annehwatson May 8, 2018
204b78a
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
annehwatson May 8, 2018
a0cdbb8
two new columns
annehwatson May 8, 2018
a73e287
Added create and show methods and tests for customers controller
diklaaharoni May 8, 2018
811c7cf
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
diklaaharoni May 8, 2018
480ead3
added new fields to controllers
annehwatson May 8, 2018
a3183ac
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
annehwatson May 8, 2018
0881dec
Added routes for rentals check-in and rentals check-out
diklaaharoni May 8, 2018
b747f21
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
diklaaharoni May 8, 2018
dd5e071
rename rental controller as rentals
diklaaharoni May 8, 2018
2e19a10
Added create method for rentals controller
diklaaharoni May 8, 2018
b50e221
Added create method and test for rental controller
diklaaharoni May 8, 2018
6829d45
Updated the routes
diklaaharoni May 8, 2018
fe21dfe
added date columns on rental
annehwatson May 8, 2018
18f5012
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
diklaaharoni May 8, 2018
71b0876
Skiped a test
diklaaharoni May 8, 2018
b8d78c0
Updated the schema
diklaaharoni May 8, 2018
dd7c16a
fields migration
annehwatson May 8, 2018
8eaaf44
passed rentals controller test and successfully pass customer_id and …
diklaaharoni May 8, 2018
eebef0f
Updated the routes
diklaaharoni May 8, 2018
4d21038
relations test for customer rentals
annehwatson May 8, 2018
9ca99ed
Added relation tests for movie model
diklaaharoni May 8, 2018
5d3e8f9
added after_initialize on customer and movie to set default field val…
annehwatson May 9, 2018
d4bb46c
rental model test
annehwatson May 9, 2018
4118031
available to rent test
annehwatson May 9, 2018
2a59298
still need available inventory decrement test to pass
annehwatson May 9, 2018
ba34b9b
Fixed code to make the postman test to pass
diklaaharoni May 9, 2018
1d1d1e7
future model method commented out
annehwatson May 9, 2018
aa59b82
fix merge conflict
annehwatson May 9, 2018
f038dae
rental checkout test passing
annehwatson May 9, 2018
6d25a39
Added check_in method to rental controller
diklaaharoni May 9, 2018
fb8f8b8
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
diklaaharoni May 9, 2018
6a0fd5c
Added test for chek_in method
diklaaharoni May 9, 2018
648827e
update smoke test
annehwatson May 9, 2018
eaa4b4d
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
annehwatson May 9, 2018
8ccb977
Updated the check_in method and test
diklaaharoni May 9, 2018
f0a37b1
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
annehwatson May 9, 2018
ca6941b
updated the smoke tests
diklaaharoni May 9, 2018
c4e5a48
Merge branch 'master' of https://github.com/diklaaharoni/VideoStoreAPI
diklaaharoni May 9, 2018
af9ebcf
available to rent tests on movie
annehwatson May 9, 2018
fc5e53a
Added test for reduce_available_inventory method
diklaaharoni May 9, 2018
0c59aca
Added test for reduce_available_inventory
diklaaharoni May 9, 2018
e7befc6
adding back available to rent tests on movie
annehwatson May 9, 2018
a44fce7
Added test for increase_available_inventory
diklaaharoni May 9, 2018
36c73fa
change the status from created to ok
diklaaharoni May 9, 2018
84c1c75
Added the movies_checked_out_count method for the customer
diklaaharoni May 10, 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.
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# 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

.byebug_history
50 changes: 50 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.6'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
# gem 'rack-cors'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
end

group :development do
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :development, :test do
gem 'pry-rails'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
154 changes: 154 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (8.0.0)
builder (3.2.3)
byebug (10.0.2)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
erubi (1.7.1)
ffi (1.9.23)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
pg (1.0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
puma (3.11.4)
rack (2.0.5)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)

PLATFORMS
ruby

DEPENDENCIES
byebug
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
spring
spring-watcher-listen (~> 2.0.0)
tzinfo-data

BUNDLED WITH
1.16.1
Loading