forked from AdaGold/video-store-api
-
Notifications
You must be signed in to change notification settings - Fork 25
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
Phoebe & Jackie - Ampers #12
Open
Jackiesan
wants to merge
62
commits into
Ada-C9:master
Choose a base branch
from
Jackiesan:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
62 commits
Select commit
Hold shift + click to select a range
6c7f76c
new rails api project
pmanni02 f8b5cce
Created model and controller customer
Jackiesan 80d5ea8
create movies model and controller
pmanni02 2ea77d4
merged routes
pmanni02 7928265
basic validation tests for movie model
pmanni02 1f890f3
Added model tests for customer, added customers to yaml file
Jackiesan 9c5cf54
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
Jackiesan 95fcee9
added routes
pmanni02 664c67e
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
pmanni02 730ce45
adds /zomg test, index method for movies, and related tests
pmanni02 e8af202
api request for one movie and related tests
pmanni02 bfa9fbc
Added tests for customers controller
Jackiesan 262ff85
controller tests for create
pmanni02 256d81d
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
pmanni02 706d25f
Added test for customer controller to return empty array if no customers
Jackiesan aa271c7
removed require(movie) from strong params and updated movie controlle…
pmanni02 5695be3
Created rental model and added relations to models
Jackiesan 01940ff
rental yml file
pmanni02 e4d23f1
Added relational testing to customer model
Jackiesan e1215dc
movie model relation tests
pmanni02 19d7392
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
pmanni02 3bbb61b
Added validations to rental model
Jackiesan d18bb11
rental relation tests
pmanni02 9f6470a
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
pmanni02 5434e29
Added validation testing for rental model
Jackiesan 7d371f4
resolved conflict in rental test
Jackiesan fba7c12
Completed initialization and relation testing for rental model
Jackiesan 93b5750
checkout and checkin routes
pmanni02 ecb4578
rental controller
pmanni02 1e864d7
Added column to rental schema, updated yamls for rental
Jackiesan 740b9db
migrations for movie_checkout_count and available_inventory
pmanni02 59b92c7
schema merge conflict
pmanni02 f48762e
Removed columns movies checked out count and available inventory
Jackiesan adf1ed3
Updated model customer and movie to destroy rentals if customer is de…
Jackiesan 783ac88
Created basic checkout controller method, added get due date method t…
Jackiesan 085e62a
check in method logic
pmanni02 30727d3
rental.rb merge
pmanni02 1b08e6c
Revised check out method to validate movies inventory
Jackiesan 4de7a44
fixed merge conflict with rental model
Jackiesan 08cd870
removes duplicate code
pmanni02 442741f
merge conflict
pmanni02 df48149
checkin controller tests
pmanni02 802b284
Added few assertions to rentals controller
Jackiesan 3da6dae
fixed conflicts in rentals controller test
Jackiesan d9a0921
added few more assertions to rentals checkout test
Jackiesan 13bbae3
updated rental available method to return if movie is nil
Jackiesan ecb6841
rental controller checkin method tests
pmanni02 78f341b
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
pmanni02 8831a98
available inventory custom method
pmanni02 0fc3545
Created custom method to return number of movies checked out for cust…
Jackiesan 71c3e84
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
Jackiesan dfe3877
Revised get count customer method to consider empty array
Jackiesan bfdbf3a
added test for custom method get count method
Jackiesan 9e63bc7
updates testing for checkin and checkout based on new custom method a…
pmanni02 1457c4d
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
pmanni02 5bba1dd
added assertion to get count method to return 0 if no movies are chec…
Jackiesan 2884119
updates model test for custom method available inventory
pmanni02 6b7241f
Fixed merge conflict in yaml
Jackiesan 077f100
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
Jackiesan 748fdf5
comments out last test
pmanni02 397a941
Merge branch 'master' of https://github.com/Jackiesan/VideoStoreAPI
pmanni02 42832c7
refactored routes
pmanni02 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# Add your own tasks in files placed in lib/tasks ending in .rake, | ||
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. | ||
|
||
require_relative 'config/application' | ||
|
||
Rails.application.load_tasks |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
module ApplicationCable | ||
class Channel < ActionCable::Channel::Base | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
module ApplicationCable | ||
class Connection < ActionCable::Connection::Base | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
class ApplicationController < ActionController::API | ||
end |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
class CustomersController < ApplicationController | ||
def index | ||
@customers = Customer.all | ||
@customers_data = [] | ||
@customers.each do |customer| | ||
movies_checked_out_count = {"movies_checked_out_count" => customer.get_count } | ||
customer = JSON::parse(customer.to_json(only: [:id, :name, :registered_at, :postal_code, :phone])).merge(movies_checked_out_count) | ||
@customers_data << customer | ||
end | ||
|
||
render json: @customers_data.as_json | ||
end | ||
|
||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
class MoviesController < ApplicationController | ||
def index | ||
movies = Movie.all | ||
render json: movies.as_json( only: [:id, :title, :release_date] ), status: :ok | ||
end | ||
|
||
def show | ||
movie = Movie.find_by(id: params[:id]) | ||
|
||
if movie != nil | ||
render json: movie.as_json( only: [:title, :overview, :release_date, :inventory]).merge(available_inventory: movie.available_inventory), status: :ok | ||
else | ||
render json: { errors: { title: ["Movie not found"] } }, status: :bad_request | ||
end | ||
end | ||
|
||
def create | ||
movie = Movie.create(movies_params) | ||
if movie.valid? | ||
render json: { id: movie.id }, status: :ok | ||
else | ||
render json: { errors: movie.errors }, status: :bad_request | ||
end | ||
end | ||
|
||
private | ||
def movies_params | ||
return params.permit(:title, :overview, :release_date, :inventory) | ||
end | ||
|
||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
require 'date' | ||
|
||
class RentalsController < ApplicationController | ||
|
||
def check_in | ||
rental = Rental.find_by(customer_id: rental_params[:customer_id], movie_id: rental_params[:movie_id], check_in_status: false) | ||
if rental | ||
rental.update(check_in_status: true) | ||
render json: { status: 'Success', rental: rental }, status: :ok | ||
else | ||
render json: { errors: 'Rental does not exist' }, status: :bad_request | ||
end | ||
end | ||
|
||
def check_out | ||
rental = Rental.new(rental_params) | ||
rental.checked_out = DateTime.now.to_date | ||
rental.due_date = rental.checked_out + 7 | ||
rental.check_in_status = false | ||
|
||
if rental.save | ||
render json: { id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id, checked_out_date: rental.checked_out, due_date: rental.due_date }, status: :ok | ||
else | ||
render json: { errors: rental.errors }, status: :bad_request | ||
end | ||
end | ||
|
||
private | ||
|
||
def rental_params | ||
return params.permit(:movie_id, :customer_id) | ||
end | ||
|
||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
class ApplicationJob < ActiveJob::Base | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
class ApplicationMailer < ActionMailer::Base | ||
default from: '[email protected]' | ||
layout 'mailer' | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
class ApplicationRecord < ActiveRecord::Base | ||
self.abstract_class = true | ||
end |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
class Customer < ApplicationRecord | ||
has_many :rentals, dependent: :destroy | ||
validates :name, presence: true | ||
validates :registered_at, presence: true | ||
validates :address, presence: true | ||
validates :city, presence: true | ||
validates :state, presence: true | ||
validates :postal_code, presence: true | ||
validates :phone, presence: true | ||
|
||
def get_count | ||
items_checked_out = self.rentals.select { |rental| rental.check_in_status == false } | ||
|
||
if !items_checked_out.empty? | ||
return items_checked_out.count | ||
else | ||
return 0 | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
class Movie < ApplicationRecord | ||
has_many :rentals, dependent: :destroy | ||
validates :title, presence: true | ||
validates :overview, presence: true | ||
validates :release_date, presence: true | ||
validates :inventory, presence: true | ||
|
||
def available_inventory | ||
return self.inventory - self.rentals.where(check_in_status: false).count | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
class Rental < ApplicationRecord | ||
belongs_to :movie | ||
belongs_to :customer | ||
validates :checked_out, presence: true | ||
validates :due_date, presence: true | ||
validates :check_in_status, inclusion: { in: [ true, false ] } | ||
validate :rental_available | ||
|
||
|
||
def rental_available | ||
return unless errors.blank? | ||
|
||
units_checked_out = movie.rentals.select { |rental| rental.check_in_status == false } | ||
units_available = movie.inventory - units_checked_out.count | ||
if units_available == 0 | ||
errors.add(:movie, "This movie is not available") | ||
end | ||
end | ||
|
||
end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not just return
items_checked_out.length
or.count
why have the if statement?