From 5a435a7c54550bfe0f825bd0da72d49e27b10d25 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Tue, 9 May 2017 13:47:02 -0700 Subject: [PATCH 01/37] Baseline setup of controllers and models --- .gitignore | 17 ++ Gemfile | 53 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 34 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 34 ++++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++++ config/environments/production.rb | 78 ++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 6 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 18 ++ config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 3 + config/secrets.yml | 22 +++ config/spring.rb | 6 + db/migrate/20170509204510_create_movies.rb | 13 ++ db/migrate/20170509204630_create_customers.rb | 14 ++ db/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 7 + test/controllers/movies_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/customers.yml | 17 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 15 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 26 +++ tmp/.keep | 0 66 files changed, 1027 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/migrate/20170509204510_create_movies.rb create mode 100644 db/migrate/20170509204630_create_customers.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# 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 Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..0ed2648fb --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +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.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# 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', '~> 3.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', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # 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 do + gem 'better_errors' + gem 'pry-rails' +end + +gem 'awesome_print' +gem 'foundation-rails' +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..dc0da7400 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + concurrent-ruby (1.0.5) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + 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-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + byebug + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -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 diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..54782d010 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,34 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..aead51124 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..082a013ab --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..49275a9d6 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,78 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..d859e4bea --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,18 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..92a11b034 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 69412db0f73849905707f6eb0efce555db1a8243cff11366b4c0fd8adfdc80feb8a78af4f63a0473c9772086399e0d32a92d689344ad27d08794d65f83d0defb + +test: + secret_key_base: d66250e821646a20c4bab1d761ce248cacc2464edaa515806a54f41f126b5558eeb5915866cac66e1ca248549db73b7da3b4d0de94997adefbfc59d0026baf1f + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/migrate/20170509204510_create_movies.rb b/db/migrate/20170509204510_create_movies.rb new file mode 100644 index 000000000..a153b8919 --- /dev/null +++ b/db/migrate/20170509204510_create_movies.rb @@ -0,0 +1,13 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20170509204630_create_customers.rb b/db/migrate/20170509204630_create_customers.rb new file mode 100644 index 000000000..baeae2171 --- /dev/null +++ b/db/migrate/20170509204630_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..2823d1188 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..26af7cc7f --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + available_inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + available_inventory: 1 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb From da08a3dbcc504a1b0ac939cd173d12766e1a92e9 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Tue, 9 May 2017 13:56:47 -0700 Subject: [PATCH 02/37] zomg it works --- app/controllers/application_controller.rb | 5 +++++ config/routes.rb | 9 +++++++++ db/schema.rb | 23 ++++++++++++++++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..842723e78 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::API + +def index + render json:{ zomg: "it works!" } +end + end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..a240702da 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,12 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/movies', to: 'movies#index', as: 'movies' + get '/movies/:title', to: 'movies#show', as: 'movie' + post '/movies', to: 'movies#create' + + get '/customers', to: 'customers#index', as: 'customers' + post '/customers', to: 'customers#create' + + + get '/zomg', to: 'application#index', as: 'zomg' end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..a4c045783 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,30 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20170509204630) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.integer "available_inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end From e8487f166e06c464a8bb5b118e6101213c64059a Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 14:09:33 -0700 Subject: [PATCH 03/37] Added two additional columns to customer model --- db/migrate/20170509210202_add_attribute_to_customer.rb | 5 +++++ db/migrate/20170509210736_add_column_to_customer.rb | 5 +++++ db/schema.rb | 8 +++++--- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20170509210202_add_attribute_to_customer.rb create mode 100644 db/migrate/20170509210736_add_column_to_customer.rb diff --git a/db/migrate/20170509210202_add_attribute_to_customer.rb b/db/migrate/20170509210202_add_attribute_to_customer.rb new file mode 100644 index 000000000..7feac1dd3 --- /dev/null +++ b/db/migrate/20170509210202_add_attribute_to_customer.rb @@ -0,0 +1,5 @@ +class AddAttributeToCustomer < ActiveRecord::Migration[5.0] + def change + add_column :customers, :registered_at, :string + end +end diff --git a/db/migrate/20170509210736_add_column_to_customer.rb b/db/migrate/20170509210736_add_column_to_customer.rb new file mode 100644 index 000000000..c4fa085e8 --- /dev/null +++ b/db/migrate/20170509210736_add_column_to_customer.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomer < ActiveRecord::Migration[5.0] + def change + add_column :customers, :account_credit, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index a4c045783..0231750b7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170509204630) do +ActiveRecord::Schema.define(version: 20170509210736) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,8 +22,10 @@ t.string "state" t.string "postal_code" t.string "phone" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "registered_at" + t.integer "account_credit" end create_table "movies", force: :cascade do |t| From 3895334355d5e1840f656b3006f52e38041c5f0b Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 14:26:39 -0700 Subject: [PATCH 04/37] Wrote index method for movies controller, as well as tests --- app/controllers/application_controller.rb | 6 ++--- app/controllers/movies_controller.rb | 5 +++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 26 +++++++++++++++++++--- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 842723e78..a369a2e53 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,7 +1,7 @@ class ApplicationController < ActionController::API -def index - render json:{ zomg: "it works!" } -end +# def index +# render json:{ zomg: "it works!" } +# end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..cb66c0fa4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,7 @@ class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: movies.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) + end end diff --git a/config/routes.rb b/config/routes.rb index a240702da..3fb196215 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,5 +8,5 @@ post '/customers', to: 'customers#create' - get '/zomg', to: 'application#index', as: 'zomg' + # get '/zomg', to: 'application#index', as: 'zomg' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..15e7ce2d9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,27 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + +KEYS = %w(title overview release_date inventory available_inventory) + +describe "index" do + it "is a working route" do + get movies_url + must_respond_with :success + end + + it "returns json" do + get movies_url + response.header["Content-Type"].must_include 'json' + end + + it "returns an array" do + get movies_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + +end end From 58b2457c0451893952c1a0967d28e4e1dcc714e8 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 14:35:38 -0700 Subject: [PATCH 05/37] Index tests for movies controller --- test/controllers/movies_controller_test.rb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 15e7ce2d9..88b5bd67f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,7 +3,7 @@ describe MoviesController do -KEYS = %w(title overview release_date inventory available_inventory) +KEYS = %w(title overview release_date inventory available_inventory).sort describe "index" do it "is a working route" do @@ -23,5 +23,22 @@ body.must_be_kind_of Array end + it "returns all of the movies" do + get movies_url + + body = JSON.parse(response.body) + + body.length.must_equal Movie.count + end + + it "returns movies with the required fields" do + get movies_url + body = JSON.parse(response.body) + + body.each do |movie| + movie.keys.sort.must_equal KEYS + end + end + end end From 5304f18a97f26788ce52edbb87b59b116ffb434c Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 14:50:31 -0700 Subject: [PATCH 06/37] Wrote show method for movies controller --- .gitignore | 1 + Gemfile | 1 + Gemfile.lock | 8 +++ app/controllers/movies_controller.rb | 10 ++++ test/controllers/movies_controller_test.rb | 61 +++++++++++++--------- test/fixtures/movies.yml | 6 +-- test/test_helper.rb | 3 ++ 7 files changed, 62 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 48fb168f6..c2a339997 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ # Ignore Byebug command history file. .byebug_history +coverage/ diff --git a/Gemfile b/Gemfile index 0ed2648fb..772a6742c 100644 --- a/Gemfile +++ b/Gemfile @@ -50,4 +50,5 @@ gem 'foundation-rails' group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov', :require => false end diff --git a/Gemfile.lock b/Gemfile.lock index dc0da7400..bcc923bb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,6 +53,7 @@ GEM byebug (9.0.6) coderay (1.1.1) concurrent-ruby (1.0.5) + docile (1.1.5) erubis (2.7.0) execjs (2.7.0) ffi (1.9.18) @@ -63,6 +64,7 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + json (2.1.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -127,6 +129,11 @@ GEM ffi (>= 0.5.0) ruby-progressbar (1.8.1) sass (3.4.23) + simplecov (0.14.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) slop (3.6.0) spring (2.0.1) activesupport (>= 4.2) @@ -167,6 +174,7 @@ DEPENDENCIES pry-rails puma (~> 3.0) rails (~> 5.0.2) + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index cb66c0fa4..2438426a4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,4 +4,14 @@ def index movies = Movie.all render json: movies.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) end + + def show + movie = Movie.find_by(title: params[:title]) + + if movie + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + else + render json:{ nothing: true }, status: :not_found + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 88b5bd67f..8f1d8d235 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,42 +3,53 @@ describe MoviesController do -KEYS = %w(title overview release_date inventory available_inventory).sort + KEYS = %w(title overview release_date inventory available_inventory).sort -describe "index" do - it "is a working route" do - get movies_url - must_respond_with :success - end + describe "index" do + it "is a working route" do + get movies_url + must_respond_with :success + end - it "returns json" do - get movies_url - response.header["Content-Type"].must_include 'json' - end + it "returns json" do + get movies_url + response.header["Content-Type"].must_include 'json' + end - it "returns an array" do - get movies_url + it "returns an array" do + get movies_url - body = JSON.parse(response.body) - body.must_be_kind_of Array - end + body = JSON.parse(response.body) + body.must_be_kind_of Array + end - it "returns all of the movies" do - get movies_url + it "returns all of the movies" do + get movies_url - body = JSON.parse(response.body) + body = JSON.parse(response.body) - body.length.must_equal Movie.count + body.length.must_equal Movie.count + end + + it "returns movies with the required fields" do + get movies_url + body = JSON.parse(response.body) + + body.each do |movie| + movie.keys.sort.must_equal KEYS + end + end end - it "returns movies with the required fields" do - get movies_url - body = JSON.parse(response.body) + describe "show" do + it "can get a movie" do + get movie_url(movies(:one).title) + must_respond_with :success - body.each do |movie| - movie.keys.sort.must_equal KEYS + body = JSON.parse(response.body) + body.must_be_instance_of Hash + body.keys.sort.must_equal KEYS end end end -end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 26af7cc7f..e0103a44f 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,9 +1,9 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString - release_date: MyString + title: "A new movie" + overview: "Unbelievable" + release_date: "2016" inventory: 1 available_inventory: 1 diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..597d04043 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,6 @@ +require 'simplecov' +SimpleCov.start + ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" From 0aa5f15214f7f82e7ad127865cfc39e6092bb1df Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Tue, 9 May 2017 15:26:28 -0700 Subject: [PATCH 07/37] Adds testing for create method in movies controller --- app/controllers/movies_controller.rb | 18 ++++++++ app/models/movie.rb | 5 ++ test/controllers/movies_controller_test.rb | 54 ++++++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2438426a4..67ddc119d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,4 +14,22 @@ def show render json:{ nothing: true }, status: :not_found end end + + + def create + movie = Movie.new(movie_params) + if movie.save + render status: :ok, json: {id: movie.id} + else + render status: :bad_request, json: {errors: movie.errors.messages} + end + end + + + private + + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..54cd5b179 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,7 @@ class Movie < ApplicationRecord + + validates :title, presence: true + validates :inventory, presence: true, numericality: { only_integer: true } + + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 8f1d8d235..43f891b1d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -50,6 +50,60 @@ body.must_be_instance_of Hash body.keys.sort.must_equal KEYS end + + it "returns nothing true if movie not found" do + get movie_url("lkasjdpivjdiasd") + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_equal({"nothing" => true}) + end + + it "Movie found has all the correct information" do + get movie_url(movies(:one).title) + body = JSON.parse(response.body) + KEYS.each do |key| + body[key].must_equal movies(:one)[key] + end + end + end + + describe "Create" do + + let(:movie_data) { + { + title: "Spongebob", + overview: "Square pants", + release_date: "2001", + inventory: 5, + available_inventory: 0 + } + } + + it "Can create a new movie" do + proc { + post movies_url, params: {movie: movie_data} + }.must_change 'Movie.count', 1 + must_respond_with :ok + end + + it "Won't create with missing title" do + movie_data.delete(:title) + proc { + post movies_url, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + must_respond_with :bad_request + end + + it "Won't create with missing inventory" do + movie_data.delete(:inventory) + proc { + post movies_url, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + must_respond_with :bad_request + end + + + end end From dfd6828c90fbf45a8b222c1106d3b61c3658a6e1 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 15:37:54 -0700 Subject: [PATCH 08/37] Writing tests for customer controller --- app/controllers/customers_controller.rb | 5 +++ test/controllers/customers_controller_test.rb | 40 +++++++++++++++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..e1f2c2b51 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,7 @@ class CustomersController < ApplicationController + + def index + customers = Customer.all + render json: customers.as_json(only: [:name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit]) + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..af8baf511 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,41 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + CUST_KEYS = %w(name address city state postal_code phone registered_at account_credit).sort + + describe "index" do + it "is a real working route" do + get customers_url + must_respond_with :success + end + end + + it 'returns json' do + get customers_url + response.header["Content-Type"].must_include 'json' + end + + it "returns an array" do + get customers_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all the customers" do + get customers_url + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customer with the required fields" do + get customers_url + body = JSON.parse(response.body) + + body.each do |customer| + customer.keys.sort.must_equal CUST_KEYS + end + end end From fe3619ad984268f1b9733a1aaf79bb659dcaa04e Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 15:49:17 -0700 Subject: [PATCH 09/37] Writing create method for customer model --- app/controllers/customers_controller.rb | 18 +++++++++++++++ test/controllers/customers_controller_test.rb | 22 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e1f2c2b51..43af29be4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,4 +4,22 @@ def index customers = Customer.all render json: customers.as_json(only: [:name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit]) end + + def create + customer = Customer.new(customer_params) + + if customer.save + render status: :ok, json: { id: customer.id} + else + render status: :bad_request, json: { errors: customer.errors.messages } + end + end + + + private + + + def customer_params + params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit) + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index af8baf511..44ad60039 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -38,4 +38,26 @@ customer.keys.sort.must_equal CUST_KEYS end end + + describe "Create" do + let(:customer_data) { + { name: "Jack", + address: "1234 Ada Avenue", + city: "Seattle", + state: "Washington", + postal_code: "98100", + phone: "6517234456", + registered_at: "2017", + account_credit: 10 + } + } + + it "Can create a customer" do + proc { + post customers_url, params: { customer: customer_data } + }.must_change 'Customer.count', 1 + must_respond_with :ok + + end + end end From 8893f40465428ee4e908f48e54caa3666dbe9a61 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 16:00:42 -0700 Subject: [PATCH 10/37] Added column to customers model, movies_checked_out_count --- app/controllers/customers_controller.rb | 1 - app/models/customer.rb | 5 +++++ app/models/movie.rb | 1 + db/migrate/20170509225842_add_column_to_customer_field.rb | 5 +++++ db/schema.rb | 7 ++++--- 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20170509225842_add_column_to_customer_field.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 43af29be4..f17eaefd5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -15,7 +15,6 @@ def create end end - private diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..7d64a6350 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,7 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :phone, presence: true + validates :postal_code, presence: true + validates :movies_checked_out_count, presence: true, numericality: { only_integer: true} end diff --git a/app/models/movie.rb b/app/models/movie.rb index 54cd5b179..8a32cd71d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,6 +2,7 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: { only_integer: true } + validates :release_date, presence: true end diff --git a/db/migrate/20170509225842_add_column_to_customer_field.rb b/db/migrate/20170509225842_add_column_to_customer_field.rb new file mode 100644 index 000000000..7f4236487 --- /dev/null +++ b/db/migrate/20170509225842_add_column_to_customer_field.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomerField < ActiveRecord::Migration[5.0] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 0231750b7..1598703d6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170509210736) do +ActiveRecord::Schema.define(version: 20170509225842) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,10 +22,11 @@ t.string "state" t.string "postal_code" t.string "phone" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "registered_at" t.integer "account_credit" + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| From 1bdc89c6655ef9d91e2bacea1dfd2ee9debe0d9e Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 16:08:55 -0700 Subject: [PATCH 11/37] Wrote negative tests for customer validations --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 51 +++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f17eaefd5..1f3a17b8d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -19,6 +19,6 @@ def create def customer_params - params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit) + params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit, :movies_checked_out_count) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 44ad60039..0a77f022d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -48,16 +48,61 @@ postal_code: "98100", phone: "6517234456", registered_at: "2017", - account_credit: 10 + account_credit: 10, + movies_checked_out_count: 2 } } - it "Can create a customer" do + + it "Can create a new customer" do proc { post customers_url, params: { customer: customer_data } }.must_change 'Customer.count', 1 must_respond_with :ok - end + + it "Won't create a new customer with missing name" do + customer_data.delete(:name) + proc { + post customers_url, params: { customer: customer_data } + }.wont_change 'Customer.count' + must_respond_with :bad_request + + end + + it "Won't create a new customer with missing registered_at field" do + customer_data.delete(:registered_at) + proc { + post customers_url, params: { customer: customer_data } + }.wont_change 'Customer.count' + must_respond_with :bad_request + + end + + it "Won't create a new customer with missing phone" do + customer_data.delete(:phone) + proc { + post customers_url, params: { customer: customer_data } + }.wont_change 'Customer.count' + must_respond_with :bad_request + end + + it "Won't create a new customer with missing postal_code" do + customer_data.delete(:postal_code) + proc { + post customers_url, params: { customer: customer_data } + }.wont_change 'Customer.count' + must_respond_with :bad_request + end + + it "Won't create a new customer with missing movies_checked_out_count" do + customer_data.delete(:movies_checked_out_count) + proc { + post customers_url, params: { customer: customer_data } + }.wont_change 'Customer.count' + must_respond_with :bad_request + + end + end end From 365afe592ea526b63d76886c88bc1e240432a14d Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 9 May 2017 16:15:06 -0700 Subject: [PATCH 12/37] Added test to movies model --- test/controllers/movies_controller_test.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 43f891b1d..dcf73c897 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -102,7 +102,15 @@ must_respond_with :bad_request end - + it "Won't create with missing release_date" do + movie_data.delete(:release_date) + proc { + post movies_url, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + must_respond_with :bad_request + end + + end From bbb5480ececb35c2fa3d502c307aa7856c9a64f4 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Tue, 9 May 2017 16:29:58 -0700 Subject: [PATCH 13/37] Passes smoke test with small changes --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1f3a17b8d..75fe2b312 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit]) + render json: customers.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit, :movies_checked_out_count]) end def create diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 0a77f022d..06e08ac44 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,7 @@ describe CustomersController do - CUST_KEYS = %w(name address city state postal_code phone registered_at account_credit).sort + CUST_KEYS = ["account_credit", "address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at", "state"].sort describe "index" do it "is a real working route" do From 6ff9d2a53fdb26d11826f3e85847232129f96555 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Wed, 10 May 2017 13:49:03 -0700 Subject: [PATCH 14/37] Added rentals controller and model, as well as references --- app/controllers/rentals_controller.rb | 2 ++ app/models/rental.rb | 4 ++++ db/migrate/20170510204415_create_rentals.rb | 11 +++++++++++ db/schema.rb | 14 +++++++++++++- test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 7 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20170510204415_create_rentals.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20170510204415_create_rentals.rb b/db/migrate/20170510204415_create_rentals.rb new file mode 100644 index 000000000..6006a3be6 --- /dev/null +++ b/db/migrate/20170510204415_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.references :movie, foreign_key: true + t.references :customer, foreign_key: true + t.string :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 1598703d6..581a55018 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170509225842) do +ActiveRecord::Schema.define(version: 20170510204415) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -39,4 +39,16 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.integer "movie_id" + t.integer "customer_id" + t.string "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree + t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..1af66a47b --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + movie: one + customer: one + due_date: MyString + +two: + movie: two + customer: two + due_date: MyString diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 2a5131d9e7aa2698ce5805cfcf64562031c56fdd Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Wed, 10 May 2017 15:14:17 -0700 Subject: [PATCH 15/37] adds checkout_movie method --- app/controllers/rentals_controller.rb | 35 +++++++++++++++++++++++++++ app/models/movie.rb | 2 ++ config/routes.rb | 3 +++ 3 files changed, 40 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..5de802ff0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,37 @@ class RentalsController < ApplicationController + + def initailize + + + end + + + def checkout_movie + mov_id = Movie.where(title: params[:title]).first.id + rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) + + if rental.save + render status: :ok, json: { id: rental.id} + #update_avail_inventory + else + render status: :bad_request, json: { errors: rental.errors.messages} + end + + end + + def checkin_movie + + + end + + + + private + + def rental_params + puts params + params.require(:rental).permit(:customer_id, :due_date, :title) + + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 8a32cd71d..1a29597be 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,5 +4,7 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { only_integer: true } validates :release_date, presence: true + has_many :rentals + end diff --git a/config/routes.rb b/config/routes.rb index 3fb196215..0d319dec1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,9 @@ get '/customers', to: 'customers#index', as: 'customers' post '/customers', to: 'customers#create' + post '/rentals/:title/checkout', to: 'rentals#checkout_movie', as: 'checkout' + + # get '/zomg', to: 'application#index', as: 'zomg' end From b39b052b582a5365ef3c440e0362f051fd5ba1a2 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Wed, 10 May 2017 15:45:17 -0700 Subject: [PATCH 16/37] Added fixtures, for rentals, and set default value of 0 to movies_checkout_out --- app/controllers/rentals_controller.rb | 7 +------ ...223857_set_default_value_to_movies_checked_out.rb | 5 +++++ db/schema.rb | 8 ++++---- test/fixtures/customers.yml | 12 ++++++------ test/fixtures/rentals.yml | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 db/migrate/20170510223857_set_default_value_to_movies_checked_out.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5de802ff0..8ac9fabd0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,6 @@ class RentalsController < ApplicationController - def initailize - - - end - - + def checkout_movie mov_id = Movie.where(title: params[:title]).first.id rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) diff --git a/db/migrate/20170510223857_set_default_value_to_movies_checked_out.rb b/db/migrate/20170510223857_set_default_value_to_movies_checked_out.rb new file mode 100644 index 000000000..ecf0317d8 --- /dev/null +++ b/db/migrate/20170510223857_set_default_value_to_movies_checked_out.rb @@ -0,0 +1,5 @@ +class SetDefaultValueToMoviesCheckedOut < ActiveRecord::Migration[5.0] + def change + change_column_default :customers, :movies_checked_out_count, 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 581a55018..f50662a48 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170510204415) do +ActiveRecord::Schema.define(version: 20170510223857) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,11 +22,11 @@ t.string "state" t.string "postal_code" t.string "phone" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "registered_at" t.integer "account_credit" - t.integer "movies_checked_out_count" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 2823d1188..08817be3c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,12 +1,12 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: "Jay" + address: "1233 colde street" + city: "Seattle" + state: "Washington" + postal_code: "98100" + phone: "8765667767" two: name: MyString diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 1af66a47b..a4bb5570c 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,9 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - movie: one + movie: "A new movie" customer: one - due_date: MyString + due_date: "20170601" two: movie: two From 4bbbc4ef2767783db0de1d42fb77580b1dc761fe Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Wed, 10 May 2017 16:01:02 -0700 Subject: [PATCH 17/37] Working on create test in rentals --- test/controllers/rentals_controller_test.rb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..0c431f34f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,22 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + KEYS = %w(customer_id movie_id due_date) + + describe "create" do + let(:rental_data) { + { + customer_id: 1, + movie_id: (movies(:one)).id, + due_date: "20170609", + title: "time" + } + } + it "creates a new rental with valid data" do + proc { + post checkout_path("title"), params: { rental: rental_data } + }.must_change 'Rental.count', 1 + must_respond_with :ok + end + end end From d6f173311e1faa1d136563a1496e554caaa286b7 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Fri, 12 May 2017 09:51:35 -0700 Subject: [PATCH 18/37] Adds find available_inventory method --- app/controllers/movies_controller.rb | 6 +++-- app/controllers/rentals_controller.rb | 36 +++++++++++++++++++-------- app/models/movie.rb | 7 ++++++ app/models/rental.rb | 6 +++++ config/routes.rb | 2 +- 5 files changed, 43 insertions(+), 14 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 67ddc119d..6768e9dcf 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,7 +7,6 @@ def index def show movie = Movie.find_by(title: params[:title]) - if movie render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else @@ -18,7 +17,9 @@ def show def create movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory if movie.save + # movie.available_inventory = movie.inventory render status: :ok, json: {id: movie.id} else render status: :bad_request, json: {errors: movie.errors.messages} @@ -26,10 +27,11 @@ def create end + private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8ac9fabd0..28aa3b1bc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,22 +1,37 @@ +require 'rental' + class RentalsController < ApplicationController - def checkout_movie - mov_id = Movie.where(title: params[:title]).first.id + movie = Movie.where(title: params[:title]).first + mov_id = movie.id rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) - - if rental.save - render status: :ok, json: { id: rental.id} - #update_avail_inventory + # debugger + movie.find_available_inventory + if movie.available_inventory > 0 + if rental.save + render status: :ok, json: { id: rental.id} + #update_avail_inventory + else + render status: :bad_request, json: { errors: rental.errors.messages} + end else - render status: :bad_request, json: { errors: rental.errors.messages} + render status: :bad_request, json: { errors: "Out of Stock"} end - end def checkin_movie - - + mov_id = Movie.where(title: params[:title]).first.id + rental = Rental.where(movie_id: mov_id, customer_id: params[:customer_id]) + if rental.length > 0 + if rental.first.delete + render status: :ok, json: { customer_id: params[:customer_id]} + else + render status: :bad_request, json: { errors: "Unable to delete" } + end + else + render status: :bad_request, json: { errors: "Rental not found" } + end end @@ -24,7 +39,6 @@ def checkin_movie private def rental_params - puts params params.require(:rental).permit(:customer_id, :due_date, :title) end diff --git a/app/models/movie.rb b/app/models/movie.rb index 1a29597be..dc7e7b79a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,4 +7,11 @@ class Movie < ApplicationRecord has_many :rentals + + def find_available_inventory + self.available_inventory = self.inventory - self.rentals.count + self.save + end + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..dcc221203 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,10 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + def find_overdue + + + end + end diff --git a/config/routes.rb b/config/routes.rb index 0d319dec1..350433572 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,7 +8,7 @@ post '/customers', to: 'customers#create' post '/rentals/:title/checkout', to: 'rentals#checkout_movie', as: 'checkout' - + delete '/rentals/:title/checkin', to: 'rentals#checkin_movie', as: 'checkin' # get '/zomg', to: 'application#index', as: 'zomg' From 2949c979657615ad85764a8ba4f4e9d221417c37 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 09:52:48 -0700 Subject: [PATCH 19/37] Rentals controller testing --- test/controllers/movies_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index dcf73c897..9fd2aeaa1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,7 +3,7 @@ describe MoviesController do - KEYS = %w(title overview release_date inventory available_inventory).sort + KEYS = %w(title overview release_date inventory available_inventory movie_id customer_id due_date).sort describe "index" do it "is a working route" do diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0c431f34f..14853b53d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -12,11 +12,19 @@ title: "time" } } + it "creates a new rental with valid data" do proc { post checkout_path("title"), params: { rental: rental_data } }.must_change 'Rental.count', 1 must_respond_with :ok end + + it "won't create a new rental with missing data" do + proc { + post checkout_path("title"), params: { rental: rental_data } + }.wont_change 'Rental.count' + must_respond_with :bad_request end end +end From d7fd259a042a07420295353f1e741a82000866fc Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Fri, 12 May 2017 10:06:07 -0700 Subject: [PATCH 20/37] Adds to checkout and available inventory method --- app/controllers/rentals_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 28aa3b1bc..a75c105d1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,7 +6,6 @@ def checkout_movie movie = Movie.where(title: params[:title]).first mov_id = movie.id rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) - # debugger movie.find_available_inventory if movie.available_inventory > 0 if rental.save From 410160d93513d871a8683d97f825e075640a3001 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 10:40:07 -0700 Subject: [PATCH 21/37] Create a rental test passing --- Gemfile | 1 + Gemfile.lock | 3 +++ app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 29 +++++++++------------ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 772a6742c..48bb3ff75 100644 --- a/Gemfile +++ b/Gemfile @@ -50,5 +50,6 @@ gem 'foundation-rails' group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'minitest-skip', '~> 0.0.1' gem 'simplecov', :require => false end diff --git a/Gemfile.lock b/Gemfile.lock index bcc923bb7..b7d8da156 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,6 +86,8 @@ GEM builder minitest (>= 5.0) ruby-progressbar + minitest-skip (0.0.1) + minitest (~> 5.0) nio4r (2.0.0) nokogiri (1.7.1) mini_portile2 (~> 2.1.0) @@ -170,6 +172,7 @@ DEPENDENCIES listen (~> 3.0.5) minitest-rails minitest-reporters + minitest-skip (~> 0.0.1) pg (~> 0.18) pry-rails puma (~> 3.0) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 28aa3b1bc..a2535442f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -39,7 +39,7 @@ def checkin_movie private def rental_params - params.require(:rental).permit(:customer_id, :due_date, :title) + params.permit(:customer_id, :due_date, :title) end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 14853b53d..b8e91b0be 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,30 +1,27 @@ require "test_helper" describe RentalsController do - KEYS = %w(customer_id movie_id due_date) + RENT_KEYS = %w(customer_id movie_id due_date) + + describe "checkout_movie" do - describe "create" do - let(:rental_data) { - { - customer_id: 1, - movie_id: (movies(:one)).id, - due_date: "20170609", - title: "time" - } - } - it "creates a new rental with valid data" do proc { - post checkout_path("title"), params: { rental: rental_data } + post checkout_path(movies(:one).title), params: { customer_id: (customers(:one).id) + } }.must_change 'Rental.count', 1 must_respond_with :ok end it "won't create a new rental with missing data" do proc { - post checkout_path("title"), params: { rental: rental_data } - }.wont_change 'Rental.count' - must_respond_with :bad_request + post checkout_path(movies(:one).title), params: { customer_id: nil} + }.wont_change 'Rental.count' + must_respond_with :bad_request + end + + it "will checkout a title" do skip + proc { } + end end end -end From df10e68be3d1a9fc336a17ad51bdc362d4a496dc Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Fri, 12 May 2017 10:42:53 -0700 Subject: [PATCH 22/37] Adds error for movie not found during checkout --- app/controllers/rentals_controller.rb | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a2535442f..70293338e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,19 +4,23 @@ class RentalsController < ApplicationController def checkout_movie movie = Movie.where(title: params[:title]).first - mov_id = movie.id - rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) - # debugger - movie.find_available_inventory - if movie.available_inventory > 0 - if rental.save - render status: :ok, json: { id: rental.id} - #update_avail_inventory + if movie + mov_id = movie.id + rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) + # debugger + movie.find_available_inventory + if movie.available_inventory > 0 + if rental.save + render status: :ok, json: { id: rental.id} + #update_avail_inventory + else + render status: :bad_request, json: { errors: rental.errors.messages} + end else - render status: :bad_request, json: { errors: rental.errors.messages} + render status: :bad_request, json: { errors: "Out of Stock"} end else - render status: :bad_request, json: { errors: "Out of Stock"} + render status: :bad_request, json: { errors: "Movie not found"} end end From b8a88cb9681f52bbbd77d3453e18b46950a489a7 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 11:05:39 -0700 Subject: [PATCH 23/37] Fixing broken tests in movies controller tests --- test/controllers/movies_controller_test.rb | 19 ++++++++++++++----- test/controllers/rentals_controller_test.rb | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 9fd2aeaa1..1d47c756d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,7 +3,7 @@ describe MoviesController do - KEYS = %w(title overview release_date inventory available_inventory movie_id customer_id due_date).sort + KEYS = ["available_inventory", "inventory", "overview", "release_date", "title"].sort describe "index" do it "is a working route" do @@ -79,35 +79,44 @@ } } - it "Can create a new movie" do + it "Can create a new movie" do skip proc { post movies_url, params: {movie: movie_data} }.must_change 'Movie.count', 1 must_respond_with :ok end - it "Won't create with missing title" do + it "Won't create with missing title" do skip movie_data.delete(:title) proc { post movies_url, params: {movie: movie_data} }.must_change 'Movie.count', 0 must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => { "title" => ["can't be blank"] } end - it "Won't create with missing inventory" do + it "Won't create with missing inventory" do skip movie_data.delete(:inventory) proc { post movies_url, params: {movie: movie_data} }.must_change 'Movie.count', 0 must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => { "inventory" => ["can't be blank", "is not a number"] } end - it "Won't create with missing release_date" do + it "Won't create with missing release_date" do skip movie_data.delete(:release_date) proc { post movies_url, params: {movie: movie_data} }.must_change 'Movie.count', 0 must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => { "release_date" => ["can't be blank"] } end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b8e91b0be..1d78784fd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -13,11 +13,24 @@ must_respond_with :ok end - it "won't create a new rental with missing data" do + it "won't create a new rental with missing customer" do proc { post checkout_path(movies(:one).title), params: { customer_id: nil} }.wont_change 'Rental.count' must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => { "customer" => ["must exist"] } + end + + it "won't create a new rental with missing title" do + proc { + post checkout_path("title"), params: { customer_id: customers(:one).id } + }.wont_change 'Rental.count' + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => "Movie not found" end it "will checkout a title" do skip From d30dadb1b7cd884dc26bf319652a883179720a82 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 11:14:21 -0700 Subject: [PATCH 24/37] Working on tests in movies controller tests --- test/controllers/movies_controller_test.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1d47c756d..981ad7b4b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -79,11 +79,20 @@ } } - it "Can create a new movie" do skip + it "Can create a new movie" do proc { - post movies_url, params: {movie: movie_data} + post movies_url, params: movie_data }.must_change 'Movie.count', 1 must_respond_with :ok + + + + + # post checkout_path(movies(:one).title), params: { customer_id: (customers(:one).id) + # } + # }.must_change 'Rental.count', 1 + # must_respond_with :ok + end it "Won't create with missing title" do skip From 1d6b3edbba0027ea133405fe9582e44b2361a85e Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 11:16:51 -0700 Subject: [PATCH 25/37] Tests for create movie working in movies controller tests --- test/controllers/movies_controller_test.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 981ad7b4b..3fa6464d7 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -81,7 +81,7 @@ it "Can create a new movie" do proc { - post movies_url, params: movie_data + post movies_url, params: movie_data }.must_change 'Movie.count', 1 must_respond_with :ok @@ -95,10 +95,10 @@ end - it "Won't create with missing title" do skip + it "Won't create with missing title" do movie_data.delete(:title) proc { - post movies_url, params: {movie: movie_data} + post movies_url, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request @@ -106,10 +106,10 @@ body.must_equal "errors" => { "title" => ["can't be blank"] } end - it "Won't create with missing inventory" do skip + it "Won't create with missing inventory" do movie_data.delete(:inventory) proc { - post movies_url, params: {movie: movie_data} + post movies_url, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request @@ -117,10 +117,10 @@ body.must_equal "errors" => { "inventory" => ["can't be blank", "is not a number"] } end - it "Won't create with missing release_date" do skip + it "Won't create with missing release_date" do movie_data.delete(:release_date) proc { - post movies_url, params: {movie: movie_data} + post movies_url, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request From 353c351add5dfc72898d822c16fc1023c521660b Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 11:37:00 -0700 Subject: [PATCH 26/37] Writing tests for checkout movie --- test/controllers/movies_controller_test.rb | 3 --- test/controllers/rentals_controller_test.rb | 27 +++++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3fa6464d7..03b388576 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -127,9 +127,6 @@ body = JSON.parse(response.body) body.must_equal "errors" => { "release_date" => ["can't be blank"] } end - - - end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1d78784fd..a38a0569c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -32,9 +32,32 @@ body = JSON.parse(response.body) body.must_equal "errors" => "Movie not found" end + end + + describe "checkin_movie" do + + it "returns a rental with valid data" do + post checkout_path(movies(:one).title), params: { customer_id: (customers(:one).id) + } + + proc { + delete checkin_path(movies(:one).title), params: { customer_id: (customers(:one).id) + } + }.must_change 'Rental.count', -1 + must_respond_with :ok + end - it "will checkout a title" do skip - proc { } + it "won't return a rental if not checked out title" do + + proc { + delete checkin_path(movies(:one).title), params: { customer_id: (customers(:one).id) + } + }.wont_change 'Rental.count' + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => "Rental not found" end end + end From 5cc9abd21c02f827fa277a9e1e25a9defc1d19b3 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 13:27:05 -0700 Subject: [PATCH 27/37] Writing overdue method --- app/controllers/rentals_controller.rb | 15 +++++++ config/routes.rb | 2 +- db/migrate/20170510203637_create_rentals.rb | 11 +++++ test/controllers/customers_controller_test.rb | 10 ----- test/controllers/rentals_controller_test.rb | 44 ++++++++++++------- 5 files changed, 56 insertions(+), 26 deletions(-) create mode 100644 db/migrate/20170510203637_create_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 70293338e..256d9eaa8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -38,7 +38,22 @@ def checkin_movie end end + def find_overdue + rentals = Rental.all + overdue = [] + + rentals.each do |rental| + due = Date.parse (rental.due_date) + if due.past? + overdue << rental + end + end + return overdue + end + + # due = Date.parse (rental.due_date) + # due.past? private diff --git a/config/routes.rb b/config/routes.rb index 350433572..2fc006903 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,6 @@ post '/rentals/:title/checkout', to: 'rentals#checkout_movie', as: 'checkout' delete '/rentals/:title/checkin', to: 'rentals#checkin_movie', as: 'checkin' - +get '/rentals/overdue', to: 'rentals#find_overdue', as: 'overdue' # get '/zomg', to: 'application#index', as: 'zomg' end diff --git a/db/migrate/20170510203637_create_rentals.rb b/db/migrate/20170510203637_create_rentals.rb new file mode 100644 index 000000000..6006a3be6 --- /dev/null +++ b/db/migrate/20170510203637_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.references :movie, foreign_key: true + t.references :customer, foreign_key: true + t.string :due_date + + t.timestamps + end + end +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 06e08ac44..398ecc1ef 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -94,15 +94,5 @@ }.wont_change 'Customer.count' must_respond_with :bad_request end - - it "Won't create a new customer with missing movies_checked_out_count" do - customer_data.delete(:movies_checked_out_count) - proc { - post customers_url, params: { customer: customer_data } - }.wont_change 'Customer.count' - must_respond_with :bad_request - - end - end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a38a0569c..3d5585207 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -32,32 +32,46 @@ body = JSON.parse(response.body) body.must_equal "errors" => "Movie not found" end - end - - describe "checkin_movie" do - it "returns a rental with valid data" do + it "won't checkout movie if movie is out of stock " do post checkout_path(movies(:one).title), params: { customer_id: (customers(:one).id) } proc { - delete checkin_path(movies(:one).title), params: { customer_id: (customers(:one).id) - } - }.must_change 'Rental.count', -1 - must_respond_with :ok - end - - it "won't return a rental if not checked out title" do - - proc { - delete checkin_path(movies(:one).title), params: { customer_id: (customers(:one).id) + post checkout_path(movies(:one).title), params: { customer_id: (customers(:one).id) } }.wont_change 'Rental.count' must_respond_with :bad_request body = JSON.parse(response.body) - body.must_equal "errors" => "Rental not found" + body.must_equal "errors" => "Out of Stock" end +end + +describe "checkin_movie" do + + it "returns a rental with valid data" do + post checkout_path(movies(:one).title), params: { customer_id: (customers(:one).id) + } + + proc { + delete checkin_path(movies(:one).title), params: { customer_id: (customers(:one).id) + } + }.must_change 'Rental.count', -1 + must_respond_with :ok + end + + it "won't return a rental if not checked out title" do + + proc { + delete checkin_path(movies(:one).title), params: { customer_id: (customers(:one).id) + } + }.wont_change 'Rental.count' + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => "Rental not found" end +end end From e6bbc41ec0c44da1b03a9b7d6fa3d7e459e8a95f Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 13:29:36 -0700 Subject: [PATCH 28/37] Writing json render for overdue mehtod --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 256d9eaa8..1c377c74f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -49,7 +49,7 @@ def find_overdue overdue << rental end end - return overdue + render json: overdue.as_json(only: [:movie_id, :customer_id, :due_date]), status: :ok end # due = Date.parse (rental.due_date) From ee29e2bb3749b6a70701bb00c1b3f7a33212b5e7 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Fri, 12 May 2017 13:51:17 -0700 Subject: [PATCH 29/37] Working on overdue message, returns overdue, needs error handling --- app/controllers/rentals_controller.rb | 4 +--- app/models/rental.rb | 4 +--- db/migrate/20170510203637_create_rentals.rb | 11 ----------- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 db/migrate/20170510203637_create_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1c377c74f..3465f8790 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -37,7 +37,7 @@ def checkin_movie render status: :bad_request, json: { errors: "Rental not found" } end end - + def find_overdue rentals = Rental.all @@ -52,8 +52,6 @@ def find_overdue render json: overdue.as_json(only: [:movie_id, :customer_id, :due_date]), status: :ok end - # due = Date.parse (rental.due_date) - # due.past? private diff --git a/app/models/rental.rb b/app/models/rental.rb index dcc221203..7a9ad07c3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,10 +1,8 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + validates :due_date, presence: true, allow_nil: false - def find_overdue - end - end diff --git a/db/migrate/20170510203637_create_rentals.rb b/db/migrate/20170510203637_create_rentals.rb deleted file mode 100644 index 6006a3be6..000000000 --- a/db/migrate/20170510203637_create_rentals.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRentals < ActiveRecord::Migration[5.0] - def change - create_table :rentals do |t| - t.references :movie, foreign_key: true - t.references :customer, foreign_key: true - t.string :due_date - - t.timestamps - end - end -end From 734c83b2326bba7d7470d3f278fd474145f7622b Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Fri, 12 May 2017 14:36:16 -0700 Subject: [PATCH 30/37] decrements available inventory when movie checked out. --- app/controllers/rentals_controller.rb | 30 +++++++++++++++++++-------- config/routes.rb | 4 ++-- db/seeds.rb | 4 +++- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3465f8790..f87377d3d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,13 +4,23 @@ class RentalsController < ApplicationController def checkout_movie movie = Movie.where(title: params[:title]).first + customer = Customer.where(id: params[:customer_id]) + + if movie mov_id = movie.id rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) # debugger - movie.find_available_inventory + if movie.available_inventory == nil + movie.available_inventory = movie.inventory + # debugger + end + if movie.available_inventory > 0 if rental.save + movie.available_inventory -= 1 + # customer.movies_checked_out_count += 1 + # customer.save render status: :ok, json: { id: rental.id} #update_avail_inventory else @@ -37,19 +47,21 @@ def checkin_movie render status: :bad_request, json: { errors: "Rental not found" } end end - + def find_overdue rentals = Rental.all - overdue = [] - - rentals.each do |rental| - due = Date.parse (rental.due_date) - if due.past? - overdue << rental + if rentals.length > 0 + rentals.each do |rental| + due = Date.parse (rental.due_date) + if due.past? + overdue << rental + end end + render json: overdue.as_json(only: [:movie_id, :customer_id, :due_date]), status: :ok + else + render json: { nothing: true }, status: :not_found end - render json: overdue.as_json(only: [:movie_id, :customer_id, :due_date]), status: :ok end diff --git a/config/routes.rb b/config/routes.rb index 2fc006903..42b736d9e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,8 +7,8 @@ get '/customers', to: 'customers#index', as: 'customers' post '/customers', to: 'customers#create' - post '/rentals/:title/checkout', to: 'rentals#checkout_movie', as: 'checkout' - delete '/rentals/:title/checkin', to: 'rentals#checkin_movie', as: 'checkin' + post '/rentals/:title/check-out', to: 'rentals#checkout_movie', as: 'checkout' + post '/rentals/:title/check-in', to: 'rentals#checkin_movie', as: 'checkin' get '/rentals/overdue', to: 'rentals#find_overdue', as: 'overdue' # get '/zomg', to: 'application#index', as: 'zomg' diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..552596fad 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,7 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + mov = Movie.create!(movie) + mov.available_inventory = mov.inventory + mov.save end From df21691d05cbf87a16cb18047182d4dd45f43131 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 12 May 2017 14:54:28 -0700 Subject: [PATCH 31/37] Added customer checked out count --- app/controllers/rentals_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f87377d3d..dfe0ec518 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -19,8 +19,7 @@ def checkout_movie if movie.available_inventory > 0 if rental.save movie.available_inventory -= 1 - # customer.movies_checked_out_count += 1 - # customer.save + customer.movies_checked_out_count += 1 render status: :ok, json: { id: rental.id} #update_avail_inventory else From c49e2a3a3236a324e091773ebdf37aba29391651 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Fri, 12 May 2017 15:03:50 -0700 Subject: [PATCH 32/37] increments movies_checked_out_count for movie checkout method --- app/controllers/rentals_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dfe0ec518..bb8c414a1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,8 +4,8 @@ class RentalsController < ApplicationController def checkout_movie movie = Movie.where(title: params[:title]).first - customer = Customer.where(id: params[:customer_id]) - + @customer = Customer.find_by(id: params[:customer_id]) + if movie mov_id = movie.id @@ -19,7 +19,7 @@ def checkout_movie if movie.available_inventory > 0 if rental.save movie.available_inventory -= 1 - customer.movies_checked_out_count += 1 + @customer.movies_checked_out_count += 1 render status: :ok, json: { id: rental.id} #update_avail_inventory else From 849bad7f86c6baecc8ccda11984d8136539cb0ec Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Fri, 12 May 2017 16:00:11 -0700 Subject: [PATCH 33/37] Increment and decrement mcoc and avail inventory on checkin and checkout --- app/controllers/rentals_controller.rb | 41 ++++++++++++++++----------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d3d2a0f0f..c7a40bdf5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,17 +11,14 @@ def checkout_movie mov_id = movie.id rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) # debugger - if movie.available_inventory == nil - movie.available_inventory = movie.inventory - # debugger - end - if movie.available_inventory > 0 if rental.save movie.available_inventory -= 1 + movie.save @customer.movies_checked_out_count += 1 + @customer.save + # debugger render status: :ok, json: { id: rental.id} - #update_avail_inventory else render status: :bad_request, json: { errors: rental.errors.messages} end @@ -34,17 +31,27 @@ def checkout_movie end def checkin_movie - mov_id = Movie.where(title: params[:title]).first.id - rental = Rental.where(movie_id: mov_id, customer_id: params[:customer_id]) - if rental.length > 0 - if rental.first.delete - render status: :ok, json: { customer_id: params[:customer_id]} - else - render status: :bad_request, json: { errors: "Unable to delete" } - end - else - render status: :bad_request, json: { errors: "Rental not found" } - end + + movie = Movie.where(title: params[:title]).first + movie.available_inventory += 1 + movie.save + customer = Customer.find_by(id: params[:customer_id]) + customer.movies_checked_out_count -= 1 + customer.save + render status: :ok, json: { customer_id: params[:customer_id]} + + + # rental = Rental.where(movie_id: mov_id, customer_id: params[:customer_id]) + # + # if rental.length > 0 + # if rental.first.delete + # render status: :ok, json: { customer_id: params[:customer_id]} + # else + # render status: :bad_request, json: { errors: "Unable to delete" } + # end + # else + # render status: :bad_request, json: { errors: "Rental not found" } + # end end def find_overdue From 390e745e49ef847b83e1f414fb896d936ed15763 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Sat, 13 May 2017 10:30:54 -0700 Subject: [PATCH 34/37] adding conditionals to checkin method --- app/controllers/rentals_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c7a40bdf5..f23104393 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,8 +5,6 @@ class RentalsController < ApplicationController def checkout_movie movie = Movie.where(title: params[:title]).first @customer = Customer.find_by(id: params[:customer_id]) - - if movie mov_id = movie.id rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) @@ -38,7 +36,11 @@ def checkin_movie customer = Customer.find_by(id: params[:customer_id]) customer.movies_checked_out_count -= 1 customer.save - render status: :ok, json: { customer_id: params[:customer_id]} + rental = Rental.find_by(movie_id: movie.id, customer_id: params[:customer_id]) + rental.due_date = "in" + if rental.save + render status: :ok, json: { customer_id: params[:customer_id]} + end # rental = Rental.where(movie_id: mov_id, customer_id: params[:customer_id]) From bfcc582cb180b64ad911e9bf99b5e011a84bf5bd Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Sat, 13 May 2017 12:58:02 -0700 Subject: [PATCH 35/37] Rental checking now has error handling and new checkin date column --- app/controllers/rentals_controller.rb | 72 +++++++++++-------- ...2048_add_checkin_date_column_to_rentals.rb | 5 ++ db/schema.rb | 7 +- 3 files changed, 53 insertions(+), 31 deletions(-) create mode 100644 db/migrate/20170513182048_add_checkin_date_column_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f23104393..27ed14339 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,39 +21,53 @@ def checkout_movie render status: :bad_request, json: { errors: rental.errors.messages} end else - render status: :bad_request, json: { errors: "Out of Stock"} + render status: :bad_request, json: { errors: ["Out of Stock"]} end else - render status: :bad_request, json: { errors: "Movie not found"} + render status: :bad_request, json: { errors: ["Movie not found"]} end end def checkin_movie - movie = Movie.where(title: params[:title]).first - movie.available_inventory += 1 - movie.save customer = Customer.find_by(id: params[:customer_id]) - customer.movies_checked_out_count -= 1 - customer.save - rental = Rental.find_by(movie_id: movie.id, customer_id: params[:customer_id]) - rental.due_date = "in" - if rental.save - render status: :ok, json: { customer_id: params[:customer_id]} + if !movie || !customer + render status: :bad_request, json: + if !movie && !customer + { errors: + { + movie: ["not found"], + customer: ["not found"] + } + } + elsif !customer + { errors: + { + customer: ["not found"] + } + } + else + { errors: + { + movie: ["not found"] + } + } + end + else + rental = Rental.find_by(movie_id: movie.id, customer_id: params[:customer_id], checkin_date: nil) + if !rental + render status: :bad_request, json: { errors: { rental: ["not found"]}} + else + rental.checkin_date = Time.now + if rental.save + movie.available_inventory += 1 + movie.save + customer.movies_checked_out_count -= 1 + customer.save + render status: :ok, json: { customer_id: params[:customer_id], checkin_date: rental.checkin_date} + end + end end - - - # rental = Rental.where(movie_id: mov_id, customer_id: params[:customer_id]) - # - # if rental.length > 0 - # if rental.first.delete - # render status: :ok, json: { customer_id: params[:customer_id]} - # else - # render status: :bad_request, json: { errors: "Unable to delete" } - # end - # else - # render status: :bad_request, json: { errors: "Rental not found" } - # end end def find_overdue @@ -61,12 +75,14 @@ def find_overdue overdue = [] if rentals.length > 0 rentals.each do |rental| - due = Date.parse (rental.due_date) - if due.past? - overdue << rental + if !rental.checkin_date + due = Date.parse (rental.due_date) + if due.past? + overdue << rental + end end end - render json: overdue.as_json(only: [:movie_id, :customer_id, :due_date]), status: :ok + render json: overdue.as_json(only: [:movie_id, :customer_id, :due_date, :checkin_date]), status: :ok else render json: { nothing: true }, status: :not_found end diff --git a/db/migrate/20170513182048_add_checkin_date_column_to_rentals.rb b/db/migrate/20170513182048_add_checkin_date_column_to_rentals.rb new file mode 100644 index 000000000..8d0011b63 --- /dev/null +++ b/db/migrate/20170513182048_add_checkin_date_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCheckinDateColumnToRentals < ActiveRecord::Migration[5.0] + def change + add_column :rentals, :checkin_date, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index f50662a48..360fbcbb5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170510223857) do +ActiveRecord::Schema.define(version: 20170513182048) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,8 +43,9 @@ t.integer "movie_id" t.integer "customer_id" t.string "due_date" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "checkin_date" t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree end From b9678a3163272bb2d2bad1434f366df397bcf68c Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Sat, 13 May 2017 13:50:48 -0700 Subject: [PATCH 36/37] Adds Adjust Inventory Method --- app/controllers/rentals_controller.rb | 29 ++++++++++++++++++--------- app/models/rental.rb | 1 - config/routes.rb | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 27ed14339..1f36b8c9c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,18 +4,14 @@ class RentalsController < ApplicationController def checkout_movie movie = Movie.where(title: params[:title]).first - @customer = Customer.find_by(id: params[:customer_id]) + customer = Customer.find_by(id: params[:customer_id]) if movie mov_id = movie.id rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) # debugger if movie.available_inventory > 0 if rental.save - movie.available_inventory -= 1 - movie.save - @customer.movies_checked_out_count += 1 - @customer.save - # debugger + adjust_inventory_out(movie, customer) render status: :ok, json: { id: rental.id} else render status: :bad_request, json: { errors: rental.errors.messages} @@ -60,10 +56,7 @@ def checkin_movie else rental.checkin_date = Time.now if rental.save - movie.available_inventory += 1 - movie.save - customer.movies_checked_out_count -= 1 - customer.save + adjust_inventory_in(movie, customer) render status: :ok, json: { customer_id: params[:customer_id], checkin_date: rental.checkin_date} end end @@ -89,8 +82,24 @@ def find_overdue end + private + def adjust_inventory_in(movie, customer) + movie.available_inventory += 1 + movie.save + customer.movies_checked_out_count -= 1 + customer.save + end + + def adjust_inventory_out(movie, customer) + movie.available_inventory -= 1 + movie.save + customer.movies_checked_out_count += 1 + customer.save + end + + def rental_params params.permit(:customer_id, :due_date, :title) diff --git a/app/models/rental.rb b/app/models/rental.rb index 7a9ad07c3..b344f3020 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,5 +4,4 @@ class Rental < ApplicationRecord validates :due_date, presence: true, allow_nil: false - end diff --git a/config/routes.rb b/config/routes.rb index 42b736d9e..f6d695525 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,6 @@ post '/rentals/:title/check-out', to: 'rentals#checkout_movie', as: 'checkout' post '/rentals/:title/check-in', to: 'rentals#checkin_movie', as: 'checkin' -get '/rentals/overdue', to: 'rentals#find_overdue', as: 'overdue' + get '/rentals/overdue', to: 'rentals#find_overdue', as: 'overdue' # get '/zomg', to: 'application#index', as: 'zomg' end From aa2e321696da9c090723fb2eb4482a13c681d666 Mon Sep 17 00:00:00 2001 From: Kelly Souza Date: Sat, 13 May 2017 15:59:31 -0700 Subject: [PATCH 37/37] Created model methods to adjust inventory for customer and movie --- app/controllers/customers_controller.rb | 3 +- app/controllers/rentals_controller.rb | 48 ++++++++----------------- app/models/customer.rb | 11 ++++++ app/models/movie.rb | 9 +++-- 4 files changed, 33 insertions(+), 38 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 75fe2b312..394008124 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -7,7 +7,6 @@ def index def create customer = Customer.new(customer_params) - if customer.save render status: :ok, json: { id: customer.id} else @@ -15,8 +14,8 @@ def create end end - private + private def customer_params params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :phone, :registered_at, :account_credit, :movies_checked_out_count) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1f36b8c9c..d8286b2bf 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,17 +1,14 @@ -require 'rental' - class RentalsController < ApplicationController def checkout_movie - movie = Movie.where(title: params[:title]).first - customer = Customer.find_by(id: params[:customer_id]) - if movie - mov_id = movie.id - rental = Rental.new(movie_id: mov_id, customer_id: params[:customer_id], due_date: params[:due_date]) - # debugger - if movie.available_inventory > 0 + @movie = Movie.where(title: params[:title]).first + @customer = Customer.find_by(id: params[:customer_id]) + if @movie + rental = Rental.new(movie_id: @movie.id, customer_id: params[:customer_id], due_date: params[:due_date]) + if @movie.available_inventory > 0 if rental.save - adjust_inventory_out(movie, customer) + @customer.adjust_inventory_in + @movie.adjust_inventory_out render status: :ok, json: { id: rental.id} else render status: :bad_request, json: { errors: rental.errors.messages} @@ -25,18 +22,18 @@ def checkout_movie end def checkin_movie - movie = Movie.where(title: params[:title]).first - customer = Customer.find_by(id: params[:customer_id]) - if !movie || !customer + @movie = Movie.where(title: params[:title]).first + @customer = Customer.find_by(id: params[:customer_id]) + if !@movie || !@customer render status: :bad_request, json: - if !movie && !customer + if !@movie && !@customer { errors: { movie: ["not found"], customer: ["not found"] } } - elsif !customer + elsif !@customer { errors: { customer: ["not found"] @@ -50,13 +47,14 @@ def checkin_movie } end else - rental = Rental.find_by(movie_id: movie.id, customer_id: params[:customer_id], checkin_date: nil) + rental = Rental.find_by(movie_id: @movie.id, customer_id: params[:customer_id], checkin_date: nil) if !rental render status: :bad_request, json: { errors: { rental: ["not found"]}} else rental.checkin_date = Time.now if rental.save - adjust_inventory_in(movie, customer) + @movie.adjust_inventory_in + @customer.adjust_inventory_out render status: :ok, json: { customer_id: params[:customer_id], checkin_date: rental.checkin_date} end end @@ -85,24 +83,8 @@ def find_overdue private - def adjust_inventory_in(movie, customer) - movie.available_inventory += 1 - movie.save - customer.movies_checked_out_count -= 1 - customer.save - end - - def adjust_inventory_out(movie, customer) - movie.available_inventory -= 1 - movie.save - customer.movies_checked_out_count += 1 - customer.save - end - - def rental_params params.permit(:customer_id, :due_date, :title) - end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 7d64a6350..086a2b7e4 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,4 +4,15 @@ class Customer < ApplicationRecord validates :phone, presence: true validates :postal_code, presence: true validates :movies_checked_out_count, presence: true, numericality: { only_integer: true} + + def adjust_inventory_in + self.movies_checked_out_count += 1 + self.save + end + + def adjust_inventory_out + self.movies_checked_out_count -= 1 + self.save + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc7e7b79a..c3bb23fcf 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,11 +7,14 @@ class Movie < ApplicationRecord has_many :rentals - - def find_available_inventory - self.available_inventory = self.inventory - self.rentals.count + def adjust_inventory_in + self.available_inventory += 1 self.save end + def adjust_inventory_out + self.available_inventory -= 1 + self.save + end end