From b0681d0b8642f73a438c12aacf4006322ca86d96 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Mon, 7 May 2018 12:30:57 -0700 Subject: [PATCH 01/33] Cloned repo and created rails new. --- .gitignore | 16 ++ Gemfile | 50 ++++++ Gemfile.lock | 154 ++++++++++++++++++ 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/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 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 | 35 ++++ bin/spring | 17 ++ bin/update | 29 ++++ config.ru | 5 + config/application.rb | 40 +++++ config/boot.rb | 3 + config/cable.yml | 10 ++ config/database.yml | 85 ++++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 ++++++ config/environments/production.rb | 83 ++++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 8 + 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/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 56 +++++++ config/routes.rb | 3 + config/secrets.yml | 32 ++++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 26 +++ tmp/.keep | 0 vendor/.keep | 0 53 files changed, 907 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/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/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/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 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..78bff8d26 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..e547d2449 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,154 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.1 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/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/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..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/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..2fe7718ea --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +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 + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # 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..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /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..abc82221c --- /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=#{2.days.seconds.to_i}" + } + 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..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = 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..8e5cbde53 --- /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=#{1.hour.seconds.to_i}" + } + + # 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..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end 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/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..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# 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. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# 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..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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 } +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! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# 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 the `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, as 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..f1163cd64 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# 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. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 04aa66a2902b5ca9b7f4c3d03f75d85f1ec33f971830397e4f80a155da1a34f5c7b7c94f790d759104ca31a7176de461a3563b6e9c337ef618caf734dc374424 + +test: + secret_key_base: 31c555c62154d6924c62575b45adc3f058586f3826c98770da99a3556bfa8af2e4b261d5a0ae335c411969dcc998853f1a6b55f6a6244a51010a07baa5026f35 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +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/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..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb 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/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 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 71285ecdc785e76ff5b652ad031e8759a35887d1 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Mon, 7 May 2018 13:43:21 -0700 Subject: [PATCH 02/33] Created customer, movie and rental models --- app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/controllers/rentals_controller.rb | 2 + app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/models/rental.rb | 2 + db/migrate/20180507204100_create_customers.rb | 15 ++++++ db/migrate/20180507204152_create_movies.rb | 12 +++++ db/migrate/20180507204251_create_rentals.rb | 11 +++++ db/schema.rb | 47 +++++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +++ test/controllers/movies_controller_test.rb | 7 +++ test/controllers/rentals_controller_test.rb | 7 +++ test/fixtures/customers.yml | 19 ++++++++ test/fixtures/movies.yml | 13 +++++ test/fixtures/rentals.yml | 11 +++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 19 files changed, 188 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180507204100_create_customers.rb create mode 100644 db/migrate/20180507204152_create_movies.rb create mode 100644 db/migrate/20180507204251_create_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb 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/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/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/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20180507204100_create_customers.rb b/db/migrate/20180507204100_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180507204100_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + 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/migrate/20180507204152_create_movies.rb b/db/migrate/20180507204152_create_movies.rb new file mode 100644 index 000000000..62885a98f --- /dev/null +++ b/db/migrate/20180507204152_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20180507204251_create_rentals.rb b/db/migrate/20180507204251_create_rentals.rb new file mode 100644 index 000000000..922b46f47 --- /dev/null +++ b/db/migrate/20180507204251_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.datetime :check_out + t.datetime :due_date + t.datetime :check_in + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b9901aea2 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,47 @@ +# 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: 20180507204251) 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.datetime "registered_at" + 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.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.datetime "check_out" + t.datetime "due_date" + t.datetime "check_in" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end 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/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/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..fb543452c --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-05-07 13:41:00 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 13:41:00 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..090b19e62 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..774bb2585 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + check_out: 2018-05-07 13:42:51 + due_date: 2018-05-07 13:42:51 + check_in: 2018-05-07 13:42:51 + +two: + check_out: 2018-05-07 13:42:51 + due_date: 2018-05-07 13:42:51 + check_in: 2018-05-07 13:42:51 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/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 1621cf2f59f63dcd70e5fc2b215d26a98cd5abac Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Mon, 7 May 2018 13:52:37 -0700 Subject: [PATCH 03/33] Added relations between movies, customers, and models --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 2 ++ db/migrate/20180507205039_add_movie_id_to_rentals.rb | 5 +++++ db/migrate/20180507205051_add_customer_id_to_rentals.rb | 5 +++++ db/schema.rb | 8 +++++++- 6 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180507205039_add_movie_id_to_rentals.rb create mode 100644 db/migrate/20180507205051_add_customer_id_to_rentals.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..b8b339cbc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie end diff --git a/db/migrate/20180507205039_add_movie_id_to_rentals.rb b/db/migrate/20180507205039_add_movie_id_to_rentals.rb new file mode 100644 index 000000000..133f9252a --- /dev/null +++ b/db/migrate/20180507205039_add_movie_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIdToRentals < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20180507205051_add_customer_id_to_rentals.rb b/db/migrate/20180507205051_add_customer_id_to_rentals.rb new file mode 100644 index 000000000..6b71a1fd9 --- /dev/null +++ b/db/migrate/20180507205051_add_customer_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToRentals < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index b9901aea2..92849e575 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: 20180507204251) do +ActiveRecord::Schema.define(version: 20180507205051) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,12 @@ t.datetime "check_in" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 08edfcc8c9b1e96bdc5831de31069899d7b4b25c Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Mon, 7 May 2018 14:23:46 -0700 Subject: [PATCH 04/33] Updated the movies_controller.rb, created the movies fixture file, and updated the testing for each method --- Gemfile | 1 + Gemfile.lock | 3 +- app/controllers/customers_controller.rb | 6 ++ app/controllers/movies_controller.rb | 35 ++++++++ config/routes.rb | 4 + test/controllers/movies_controller_test.rb | 95 +++++++++++++++++++++- test/fixtures/movies.yml | 14 ++-- 7 files changed, 147 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 78bff8d26..ad43dfe58 100644 --- a/Gemfile +++ b/Gemfile @@ -45,6 +45,7 @@ group :development, :test do end group :test do + gem 'minitest', '5.10.1' gem 'minitest-rails' gem 'minitest-reporters' end diff --git a/Gemfile.lock b/Gemfile.lock index e547d2449..096862a69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM method_source (0.9.0) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.11.3) + minitest (5.10.1) minitest-rails (3.0.0) minitest (~> 5.8) railties (~> 5.0) @@ -140,6 +140,7 @@ PLATFORMS DEPENDENCIES byebug listen (>= 3.0.5, < 3.2) + minitest (= 5.10.1) minitest-rails minitest-reporters pg (>= 0.18, < 2.0) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..dc37cfcbc 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,8 @@ class CustomersController < ApplicationController + + def index + + + end + end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..13625e771 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,37 @@ class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie.nil? + render json: { + errors: { + id: ["No movie with ID #{params[:id]}"] + } + }, status: :not_found + else + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: { + id: movie.id }, status: :created + else + render json: { errors: movie.errors.messages }, status: :bad_request + end + end + + private + def movie_params + return params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..e81e031b1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + +resources :customers, only: [:index] +resources :movies, only: [:index, :show, :create] + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..2823d75ba 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,96 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "gets all the movies" do + # Arrange + keys = %w(id release_date title) + + # Act + get movies_url + + # Assert + must_respond_with :success + + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.length.must_equal Movie.count + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end + + describe "show" do + it "can get a movie" do + # Arrange + keys = %w(id inventory overview release_date title) + movie = movies(:LOTR) + + # Act + get movie_path(movie.id) + + # Assert + must_respond_with :success + + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.keys.sort.must_equal keys + body["id"].must_equal movie.id + end + + it "yields a not_found status and also return some error text if the movie D.N.E." do + movie_id = Movie.last.id + 1 + + get movie_path(movie_id) + + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "id" + end + end + + describe "create" do + let(:movie_data) { + { + title: "Wonder Woman", + overview: "About the most badass superhero in the world", + release_date: Date.parse("02/05/18"), + inventory: 4 + } + } + + it "Creates a new movie" do + assert_difference "Movie.count", 1 do + post movies_url, params: { movie: movie_data } + must_respond_with :success + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + + # Check that the ID matches + Movie.find(body["id"]).title.must_equal movie_data[:title] + end + + it "Returns an error for an invalid movie" do + bad_data = movie_data.clone() + bad_data.delete(:title) + assert_no_difference "Movie.count" do + post movies_url, params: { movie: bad_data } + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "title" + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 090b19e62..1b1c92abc 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString +HP: + title: All Harry Potter Movies + overview: A movie about a wizard boy and his friends release_date: 2018-05-07 - inventory: 1 + inventory: 3 -two: - title: MyString - overview: MyString +LOTR: + title: Lord of the Rings + overview: A quest to find the ring release_date: 2018-05-07 inventory: 1 From 0b1e939553d21d2eec74d56772214d02dda73779 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Mon, 7 May 2018 14:46:44 -0700 Subject: [PATCH 05/33] Updated customer controller#index, created customer fixtures, and updated customers_controller_test.rb --- app/controllers/customers_controller.rb | 5 ++-- test/controllers/customers_controller_test.rb | 23 +++++++++++++++--- test/controllers/movies_controller_test.rb | 2 +- test/fixtures/customers.yml | 24 +++++++++---------- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dc37cfcbc..788ac43a6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,7 @@ class CustomersController < ApplicationController def index - - + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end - end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..9757d3e96 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,24 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "gets all the customers" do + # Arrange + keys = %w(id name phone postal_code registered_at) + + # Act + get customers_path + + # Assert + must_respond_with :success + + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.length.must_equal Customer.count + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2823d75ba..8b2577226 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -7,7 +7,7 @@ keys = %w(id release_date title) # Act - get movies_url + get movies_path # Assert must_respond_with :success diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index fb543452c..5359fed70 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: Dan registered_at: 2018-05-07 13:41:00 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: Lives at Ada + city: Seattle + state: WA + postal_code: 98109 + phone: 234-234-2345 two: - name: MyString + name: Kari registered_at: 2018-05-07 13:41:00 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: Also lives at Ada + city: Seattle + state: WA + postal_code: 98101 + phone: 456-345-2346 From 9d38d52856543cbc53e2cf03e1a6d1deeac5be60 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Mon, 7 May 2018 15:14:17 -0700 Subject: [PATCH 06/33] Added validations to movie.rb model and wrote validation and relations tests --- app/models/customer.rb | 2 + app/models/movie.rb | 5 +++ test/fixtures/customers.yml | 4 +- test/fixtures/rentals.yml | 12 ++++-- test/models/movie_test.rb | 86 +++++++++++++++++++++++++++++++++++-- 5 files changed, 100 insertions(+), 9 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..dc5470003 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord has_many :rentals + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..8ca59c5d2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,8 @@ class Movie < ApplicationRecord has_many :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 5359fed70..44b200687 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +dan: name: Dan registered_at: 2018-05-07 13:41:00 address: Lives at Ada @@ -9,7 +9,7 @@ one: postal_code: 98109 phone: 234-234-2345 -two: +kari: name: Kari registered_at: 2018-05-07 13:41:00 address: Also lives at Ada diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 774bb2585..916a61fa8 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,10 +2,14 @@ one: check_out: 2018-05-07 13:42:51 - due_date: 2018-05-07 13:42:51 - check_in: 2018-05-07 13:42:51 + due_date: 2018-05-14 13:42:51 + check_in: 2018-05-15 13:42:51 + customer: dan + movie: HP two: check_out: 2018-05-07 13:42:51 - due_date: 2018-05-07 13:42:51 - check_in: 2018-05-07 13:42:51 + due_date: 2018-05-14 13:42:51 + check_in: 2018-05-13 13:42:51 + customer: kari + movie: LOTR diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..f4097057f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,89 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + describe "relations" do + it "has a list of rentals" do + movie = movies(:HP) + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end + + describe "validations" do + before do + @movie = Movie.new( + title: "Wonder Woman", + overview: "I don't feel like writing this", + release_date: Date.parse("05/07/18"), + inventory: 3 + ) + end + + it "must be valid with all required fields" do + count_before = Movie.count + @movie.valid?.must_equal true + + @movie.save + + Movie.last.title.must_equal @movie.title + Movie.count.must_equal count_before + 1 + end + + it "is invalid without a title and does not update DB" do + count_before = Movie.count + @movie.title = nil + @movie.valid?.must_equal false + + @movie.save + + @movie.errors.messages.must_include :title + Movie.count.must_equal count_before + end + + it "is invalid without an overview and does not update DB" do + count_before = Movie.count + @movie.overview = nil + @movie.valid?.must_equal false + + @movie.save + + @movie.errors.messages.must_include :overview + Movie.count.must_equal count_before + end + + it "is invalid without a release date and does not update DB" do + count_before = Movie.count + @movie.release_date = nil + @movie.valid?.must_equal false + + @movie.save + + @movie.errors.messages.must_include :release_date + Movie.count.must_equal count_before + end + + it "is invalid without an inventory and does not update DB" do + count_before = Movie.count + @movie.inventory = nil + @movie.valid?.must_equal false + + @movie.save + + @movie.errors.messages.must_include :inventory + Movie.count.must_equal count_before + end + + it "is invalid if inventory is less than 0 and does not update DB" do + count_before = Movie.count + @movie.inventory = -2 + @movie.valid?.must_equal false + + @movie.save - it "must be valid" do - value(movie).must_be :valid? + @movie.errors.messages.must_include :inventory + Movie.count.must_equal count_before + end end end From 6bd3b8b0364f3757d1d81c6ad2446fe3a799398d Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Mon, 7 May 2018 15:30:46 -0700 Subject: [PATCH 07/33] Updated the models for customer and completed the testing --- app/models/customer.rb | 5 ++- test/models/customer_test.rb | 75 ++++++++++++++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index dc5470003..583e23880 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,8 @@ class Customer < ApplicationRecord has_many :rentals - + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..0d2f47949 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,78 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + describe "relations" do + it "has a list of rentals" do + customer = customers(:dan) + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end + + describe "validations" do + before do + @customer = Customer.new( + name: "Dee", + registered_at: DateTime.parse("5/07/2018"), + postal_code: 98232, + phone: "253-867-5309" + ) + end + + it "must be valid with all required fields" do + count_before = Customer.count + @customer.valid?.must_equal true + + @customer.save + + Customer.last.name.must_equal @customer.name + Customer.count.must_equal count_before + 1 + end + + it "is invalid without a name and does not update DB" do + count_before = Customer.count + @customer.name = nil + @customer.valid?.must_equal false + + @customer.save + + @customer.errors.messages.must_include :name + Customer.count.must_equal count_before + end + + it "is invalid without a registered at and does not update DB" do + count_before = Customer.count + @customer.registered_at = nil + @customer.valid?.must_equal false + + @customer.save + + @customer.errors.messages.must_include :registered_at + Customer.count.must_equal count_before + end + + it "is invalid without a postal code and does not update DB" do + count_before = Customer.count + @customer.postal_code = nil + @customer.valid?.must_equal false + + @customer.save + + @customer.errors.messages.must_include :postal_code + Customer.count.must_equal count_before + end + + it "is invalid without a phone and does not update DB" do + count_before = Customer.count + @customer.phone = nil + @customer.valid?.must_equal false + + @customer.save - it "must be valid" do - value(customer).must_be :valid? + @customer.errors.messages.must_include :phone + Customer.count.must_equal count_before + end end end From 932d8877b61aac9bd485b770cc435cfe7ea1d411 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Mon, 7 May 2018 15:58:08 -0700 Subject: [PATCH 08/33] Updated the rentals controller and testing for the new controller#checkout method. Also, created the routes for rentals --- app/controllers/rentals_controller.rb | 25 +++++++++++++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 39 +++++++++++++++++++-- 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..abd4ec435 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,27 @@ class RentalsController < ApplicationController + + def check_out + rental = Rental.new(rental_params) + rental.check_out = DateTime.now + rental.due_date = rental.check_out + 7 + + if rental.save + render json: rental.as_json(only: [:movie_id, :customer_id]), status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + end + + def check_in + rental = Rental.find_by(id: params[:id]) + + + + end + + private + def rental_params + return params.require(:rental).permit(:movie_id, :customer_id) + end + end diff --git a/config/routes.rb b/config/routes.rb index e81e031b1..27689fa46 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] +post '/rentals', to: 'rentals#check_out', as: 'check_out' +post '/rentals', to: 'rentals#check_in', as: 'check_in' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..fdf7e8d7d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,40 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "check_out" do + let(:rental_data) { + { + movie_id: movies(:HP).id, + customer_id: customers(:kari).id + } + } + + it "Creates a new rental" do + assert_difference "Rental.count", 1 do + post check_out_path, params: { rental: rental_data } + must_respond_with :success + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "movie_id" + + # Check that the ID matches + Rental.find_by(movie_id: body["movie_id"]).movie_id.must_equal movies(:HP).id + end + + it "Returns an error for an invalid rental" do + bad_data = rental_data.clone() + bad_data.delete(:movie_id) + assert_no_difference "Rental.count" do + post check_out_path, params: { rental: bad_data } + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "movie_id" + end + end end From 3de9c7fa42cca3f099cf32928670e7cc1a5f2798 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Mon, 7 May 2018 16:07:36 -0700 Subject: [PATCH 09/33] Started validations for rental model and added validated timeliness gem to Gemfile but did not install --- Gemfile | 2 ++ Gemfile.lock | 4 ++++ app/models/rental.rb | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/Gemfile b/Gemfile index ad43dfe58..486ee94ec 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,8 @@ gem 'rails', '~> 5.1.6' gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server gem 'puma', '~> 3.7' + +gem 'validates_timeliness', '~> 4.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 diff --git a/Gemfile.lock b/Gemfile.lock index 096862a69..c48b91b02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,8 +128,11 @@ GEM sprockets (>= 3.0.0) thor (0.20.0) thread_safe (0.3.6) + timeliness (0.3.8) tzinfo (1.2.5) thread_safe (~> 0.1) + validates_timeliness (4.0.2) + timeliness (~> 0.3.7) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -150,6 +153,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + validates_timeliness (~> 4.0) BUNDLED WITH 1.16.1 diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..8d99ec8fc 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,10 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + validates :movie_id, presence: true + validates :customer_id, presence: true + validates :check_out, presence: true + validates :due_date, presence: true + validates :check_in, numericality: greater_than end From 80ceded463c15bb98f2ea79cc9fb3194c75abf22 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Mon, 7 May 2018 23:34:32 -0700 Subject: [PATCH 10/33] Implemented validations on rental model using the timeliness gem. Wrote rental model validation tests --- app/models/rental.rb | 5 +- config/initializers/validates_timeliness.rb | 40 ++++++++++ config/locales/validates_timeliness.en.yml | 16 ++++ test/models/customer_test.rb | 2 +- test/models/movie_test.rb | 2 +- test/models/rental_test.rb | 87 ++++++++++++++++++++- 6 files changed, 145 insertions(+), 7 deletions(-) create mode 100644 config/initializers/validates_timeliness.rb create mode 100644 config/locales/validates_timeliness.en.yml diff --git a/app/models/rental.rb b/app/models/rental.rb index 8d99ec8fc..2f8011d27 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,10 +1,11 @@ class Rental < ApplicationRecord - belongs_to :customer + belongs_to :customer#, counter_cache: :movies_checked_out_count belongs_to :movie validates :movie_id, presence: true validates :customer_id, presence: true validates :check_out, presence: true validates :due_date, presence: true - validates :check_in, numericality: greater_than + validates_datetime :due_date, :after => :check_out + validates_datetime :check_in, :after => :check_out, allow_nil: true end diff --git a/config/initializers/validates_timeliness.rb b/config/initializers/validates_timeliness.rb new file mode 100644 index 000000000..9f004af77 --- /dev/null +++ b/config/initializers/validates_timeliness.rb @@ -0,0 +1,40 @@ +ValidatesTimeliness.setup do |config| + # Extend ORM/ODMs for full support (:active_record included). + config.extend_orms = [ :active_record ] + # + # Default timezone + # config.default_timezone = :utc + # + # Set the dummy date part for a time type values. + # config.dummy_date_for_time_type = [ 2000, 1, 1 ] + # + # Ignore errors when restriction options are evaluated + # config.ignore_restriction_errors = false + # + # Re-display invalid values in date/time selects + # config.enable_date_time_select_extension! + # + # Handle multiparameter date/time values strictly + # config.enable_multiparameter_extension! + # + # Shorthand date and time symbols for restrictions + # config.restriction_shorthand_symbols.update( + # :now => lambda { Time.current }, + # :today => lambda { Date.current } + # ) + # + # Use the plugin date/time parser which is stricter and extendable + # config.use_plugin_parser = false + # + # Add one or more formats making them valid. e.g. add_formats(:date, 'd(st|rd|th) of mmm, yyyy') + # config.parser.add_formats() + # + # Remove one or more formats making them invalid. e.g. remove_formats(:date, 'dd/mm/yyy') + # config.parser.remove_formats() + # + # Change the ambiguous year threshold when parsing a 2 digit year + # config.parser.ambiguous_year_threshold = 30 + # + # Treat ambiguous dates, such as 01/02/1950, as a Non-US date. + # config.parser.remove_us_formats +end diff --git a/config/locales/validates_timeliness.en.yml b/config/locales/validates_timeliness.en.yml new file mode 100644 index 000000000..634c9dad9 --- /dev/null +++ b/config/locales/validates_timeliness.en.yml @@ -0,0 +1,16 @@ +en: + errors: + messages: + invalid_date: "is not a valid date" + invalid_time: "is not a valid time" + invalid_datetime: "is not a valid datetime" + is_at: "must be at %{restriction}" + before: "must be before %{restriction}" + on_or_before: "must be on or before %{restriction}" + after: "must be after %{restriction}" + on_or_after: "must be on or after %{restriction}" + validates_timeliness: + error_value_formats: + date: '%Y-%m-%d' + time: '%H:%M:%S' + datetime: '%Y-%m-%d %H:%M:%S' diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0d2f47949..f1bede466 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,7 +2,7 @@ describe Customer do describe "relations" do - it "has a list of rentals" do + it "has a collection of rentals" do customer = customers(:dan) customer.must_respond_to :rentals customer.rentals.each do |rental| diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f4097057f..5d22a2122 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,7 +2,7 @@ describe Movie do describe "relations" do - it "has a list of rentals" do + it "has a collection of rentals" do movie = movies(:HP) movie.must_respond_to :rentals movie.rentals.each do |rental| diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..b7c065582 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,90 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + before do + @rental = Rental.new( + movie: movies(:LOTR), + customer: customers(:dan), + check_out: DateTime.now, + due_date: DateTime.now + 7 + ) + end + + it "can be created with all required fields" do + count_before = Rental.count + @rental.valid?.must_equal true + + @rental.save + + Rental.last.movie.id.must_equal movies(:LOTR).id + Rental.count.must_equal count_before + 1 + end + + it "is invalid without a movie ID" do + count_before = Rental.count + @rental.movie_id = nil + @rental.valid?.must_equal false + + @rental.save + + @rental.errors.messages.must_include :movie_id + Rental.count.must_equal count_before + end + + it "is invalid without a customer ID" do + count_before = Rental.count + @rental.customer_id = nil + @rental.valid?.must_equal false + + @rental.save + + @rental.errors.messages.must_include :customer_id + Rental.count.must_equal count_before + end + + it "is invalid without a check out date" do + count_before = Rental.count + @rental.check_out = nil + @rental.valid?.must_equal false + + @rental.save + + @rental.errors.messages.must_include :check_out + Rental.count.must_equal count_before + end + + it "is invalid without a due date" do + count_before = Rental.count + @rental.due_date = nil + @rental.valid?.must_equal false + + @rental.save + + @rental.errors.messages.must_include :due_date + Rental.count.must_equal count_before + end + + it "is invalid if the due date is before the check out date" do + count_before = Rental.count + @rental.due_date = DateTime.now + @rental.check_out = DateTime.now + 1 + @rental.valid?.must_equal false + + @rental.save + + @rental.errors.messages.must_include :due_date + Rental.count.must_equal count_before + end + + it "is invalid if the check in date is before the check out date" do + count_before = Rental.count + @rental.check_in = DateTime.now + @rental.check_out = DateTime.now + 1 + @rental.valid?.must_equal false + + @rental.save - it "must be valid" do - value(rental).must_be :valid? + @rental.errors.messages.must_include :check_in + Rental.count.must_equal count_before end end From aedc7f299317867ee9d5d772a44c9b1479114a28 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 09:54:28 -0700 Subject: [PATCH 11/33] Updated the relationship testing for rentals --- test/models/rental_test.rb | 142 +++++++++++++++++++++---------------- 1 file changed, 79 insertions(+), 63 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index b7c065582..419342323 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,90 +1,106 @@ require "test_helper" describe Rental do - before do - @rental = Rental.new( - movie: movies(:LOTR), - customer: customers(:dan), - check_out: DateTime.now, - due_date: DateTime.now + 7 - ) + describe "relations" do + it "has a customer_id" do + rental = rentals(:one) + rental.must_respond_to :customer + rental.customer_id.must_equal customers(:dan).id + end + + it "has a movie_id" do + rental = rentals(:two) + rental.must_respond_to :movie + rental.movie_id.must_equal movies(:LOTR).id + end end - it "can be created with all required fields" do - count_before = Rental.count - @rental.valid?.must_equal true + describe "validations" do + before do + @rental = Rental.new( + movie: movies(:LOTR), + customer: customers(:dan), + check_out: DateTime.now, + due_date: DateTime.now + 7 + ) + end - @rental.save + it "can be created with all required fields" do + count_before = Rental.count + @rental.valid?.must_equal true - Rental.last.movie.id.must_equal movies(:LOTR).id - Rental.count.must_equal count_before + 1 - end + @rental.save - it "is invalid without a movie ID" do - count_before = Rental.count - @rental.movie_id = nil - @rental.valid?.must_equal false + Rental.last.movie.id.must_equal movies(:LOTR).id + Rental.count.must_equal count_before + 1 + end - @rental.save + it "is invalid without a movie ID" do + count_before = Rental.count + @rental.movie_id = nil + @rental.valid?.must_equal false - @rental.errors.messages.must_include :movie_id - Rental.count.must_equal count_before - end + @rental.save - it "is invalid without a customer ID" do - count_before = Rental.count - @rental.customer_id = nil - @rental.valid?.must_equal false + @rental.errors.messages.must_include :movie_id + Rental.count.must_equal count_before + end - @rental.save + it "is invalid without a customer ID" do + count_before = Rental.count + @rental.customer_id = nil + @rental.valid?.must_equal false - @rental.errors.messages.must_include :customer_id - Rental.count.must_equal count_before - end + @rental.save - it "is invalid without a check out date" do - count_before = Rental.count - @rental.check_out = nil - @rental.valid?.must_equal false + @rental.errors.messages.must_include :customer_id + Rental.count.must_equal count_before + end - @rental.save + it "is invalid without a check out date" do + count_before = Rental.count + @rental.check_out = nil + @rental.valid?.must_equal false - @rental.errors.messages.must_include :check_out - Rental.count.must_equal count_before - end + @rental.save - it "is invalid without a due date" do - count_before = Rental.count - @rental.due_date = nil - @rental.valid?.must_equal false + @rental.errors.messages.must_include :check_out + Rental.count.must_equal count_before + end - @rental.save + it "is invalid without a due date" do + count_before = Rental.count + @rental.due_date = nil + @rental.valid?.must_equal false - @rental.errors.messages.must_include :due_date - Rental.count.must_equal count_before - end + @rental.save - it "is invalid if the due date is before the check out date" do - count_before = Rental.count - @rental.due_date = DateTime.now - @rental.check_out = DateTime.now + 1 - @rental.valid?.must_equal false + @rental.errors.messages.must_include :due_date + Rental.count.must_equal count_before + end - @rental.save + it "is invalid if the due date is before the check out date" do + count_before = Rental.count + @rental.due_date = DateTime.now + @rental.check_out = DateTime.now + 1 + @rental.valid?.must_equal false - @rental.errors.messages.must_include :due_date - Rental.count.must_equal count_before - end + @rental.save + + @rental.errors.messages.must_include :due_date + Rental.count.must_equal count_before + end - it "is invalid if the check in date is before the check out date" do - count_before = Rental.count - @rental.check_in = DateTime.now - @rental.check_out = DateTime.now + 1 - @rental.valid?.must_equal false + it "is invalid if the check in date is before the check out date" do + count_before = Rental.count + @rental.check_in = DateTime.now + @rental.check_out = DateTime.now + 1 + @rental.valid?.must_equal false - @rental.save + @rental.save - @rental.errors.messages.must_include :check_in - Rental.count.must_equal count_before + @rental.errors.messages.must_include :check_in + Rental.count.must_equal count_before + end end end From c1e61d7092dd482f3d37b6d769c9ffc08ab55a7e Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 10:01:33 -0700 Subject: [PATCH 12/33] Generated migrations to add inventory and checkout values to customer and movie DB --- .../20180508165533_add_movie_checkout_column_to_customer.rb | 5 +++++ ...20180508165859_add_available_inventory_column_to_movie.rb | 5 +++++ db/schema.rb | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb create mode 100644 db/migrate/20180508165859_add_available_inventory_column_to_movie.rb diff --git a/db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb b/db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb new file mode 100644 index 000000000..ad467c7ab --- /dev/null +++ b/db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb @@ -0,0 +1,5 @@ +class AddMovieCheckoutColumnToCustomer < ActiveRecord::Migration[5.1] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/migrate/20180508165859_add_available_inventory_column_to_movie.rb b/db/migrate/20180508165859_add_available_inventory_column_to_movie.rb new file mode 100644 index 000000000..e62fd4a13 --- /dev/null +++ b/db/migrate/20180508165859_add_available_inventory_column_to_movie.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryColumnToMovie < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 92849e575..53e88fa2e 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: 20180507205051) do +ActiveRecord::Schema.define(version: 20180508165859) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From 889a236ed33adabb89b4563423dc9b3a2e40f7b2 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 10:17:27 -0700 Subject: [PATCH 13/33] Updated the movie model with custom business logic to calculate the inventory --- app/models/movie.rb | 23 +++++++++++++++++++++++ app/models/rental.rb | 1 + 2 files changed, 24 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index 8ca59c5d2..4557a9bfd 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,4 +5,27 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + + + def inventory_available? + if self.available_inventory.nil? + self.available_inventory = self.inventory + end + + return self.inventory > 0 + end + + def inventory_check_out + if self.available? + self.inventory -= 1 + else + return nil + end + end + + + def inventory_check_in + self.inventory += 1 + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 2f8011d27..666625f4b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -8,4 +8,5 @@ class Rental < ApplicationRecord validates :due_date, presence: true validates_datetime :due_date, :after => :check_out validates_datetime :check_in, :after => :check_out, allow_nil: true + end From cf598bf34ab8d9759bca029a1c4a673ee7034eb4 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Tue, 8 May 2018 10:29:40 -0700 Subject: [PATCH 14/33] Added custom business logic to customer.rb and wrote tests for updated movie and customer validations --- app/models/customer.rb | 13 +++++++++++++ app/models/movie.rb | 1 + test/models/customer_test.rb | 11 +++++++++++ test/models/movie_test.rb | 11 +++++++++++ 4 files changed, 36 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 583e23880..beeb148d9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,4 +5,17 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true + validates :movies_checked_out_count, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true + + def movie_check_out + if self.movies_checked_out_count.nil? + self.movies_checked_out_count = 0 + end + + self.movies_checked_out_count += 1 + end + + def movie_check_in + self.movies_checked_out_count -= 1 + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 4557a9bfd..0f667ded9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,6 +5,7 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + validates :available_inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true def inventory_available? diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index f1bede466..93d3f116e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -74,5 +74,16 @@ @customer.errors.messages.must_include :phone Customer.count.must_equal count_before end + + it "is invalid if movies checked out count is less than 0" do + count_before = Customer.count + @customer.movies_checked_out_count = -1 + @customer.valid?.must_equal false + + @customer.save + + @customer.errors.messages.must_include :movies_checked_out_count + Customer.count.must_equal count_before + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 5d22a2122..53659efa0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -85,5 +85,16 @@ @movie.errors.messages.must_include :inventory Movie.count.must_equal count_before end + + it "is invalid if available inventory is less than 0" do + count_before = Movie.count + @movie.available_inventory = -2 + @movie.valid?.must_equal false + + @movie.save + + @movie.errors.messages.must_include :available_inventory + Movie.count.must_equal count_before + end end end From 21c2b4cb3e1f431d6581aa03ae8f8ceec98e2894 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Tue, 8 May 2018 10:41:52 -0700 Subject: [PATCH 15/33] Updated rental#check_out controller method to use new movie and customer business logic methods --- app/controllers/rentals_controller.rb | 13 +++++++++++++ app/models/movie.rb | 4 ---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index abd4ec435..864c11907 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,7 +5,20 @@ def check_out rental.check_out = DateTime.now rental.due_date = rental.check_out + 7 + movie = Movie.find_by(id: params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) + + unless movie.inventory_available? + render json: { + errors: { + :available_inventory: ["#{movie.title} is not currently available."] + } + }, status: :not_found + end + if rental.save + movie.inventory_check_out + customer.movie_check_out render json: rental.as_json(only: [:movie_id, :customer_id]), status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request diff --git a/app/models/movie.rb b/app/models/movie.rb index 0f667ded9..907485710 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -17,11 +17,7 @@ def inventory_available? end def inventory_check_out - if self.available? self.inventory -= 1 - else - return nil - end end From 883400942a15f8aa086dae4d78ff2ad4cc524373 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 11:10:52 -0700 Subject: [PATCH 16/33] Created custom method in rental to find the rental with customer and movie id's. Updated the check_in method in rental_controller.rb to update movie and customer inventory when the movie is checked back in --- app/controllers/rentals_controller.rb | 14 +++++++++++++- app/models/rental.rb | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 864c11907..6fae3a158 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -26,10 +26,22 @@ def check_out end def check_in - rental = Rental.find_by(id: params[:id]) + rental = Rental.find_rental(rental_params) + if rental.empty? + render json: { + errors: { + :movie_id: ["No rental is currently checkout with that criteria."] + } + }, status: :not_found + else + movie = Movie.find_by(id: params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) + movie.inventory_check_in + customer.movie_check_in + end end private diff --git a/app/models/rental.rb b/app/models/rental.rb index 666625f4b..6d3cd3a20 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -9,4 +9,12 @@ class Rental < ApplicationRecord validates_datetime :due_date, :after => :check_out validates_datetime :check_in, :after => :check_out, allow_nil: true + + def self.find_rental(movie_id, customer_id) + + self.all.where(movie_id: movie_id, customer_id: customer_id, check_in: nil) + + + end + end From e6504b16dc1bc777d7d8b1508d577014b4e9dac1 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 11:56:34 -0700 Subject: [PATCH 17/33] Working on tests for the customer business logic --- app/models/movie.rb | 6 +++--- test/models/movie_test.rb | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 907485710..0ad8c18d3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -13,16 +13,16 @@ def inventory_available? self.available_inventory = self.inventory end - return self.inventory > 0 + return self.available_inventory > 0 end def inventory_check_out - self.inventory -= 1 + self.available_inventory -= 1 end def inventory_check_in - self.inventory += 1 + self.available_inventory += 1 end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 53659efa0..0f725cb9f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -97,4 +97,43 @@ Movie.count.must_equal count_before end end + + describe "inventory_available?" do + it "returns true if the movie has available inventory" do + movie = movies(:HP) + + movie.inventory_available?.must_equal true + movie.inventory.must_equal 3 + end + + it "returns false if the movie has not available inventory" do + movie = movies(:LOTR) + movie.inventory = 0 + + movie.inventory_available?.must_equal false + end + end + + + describe "inventory_check_out" do + it "successfully decrease the movie's available inventory" do + movie = movies(:HP) + movie.available_inventory = movie.inventory + inventory_before = movie.available_inventory + + movie.inventory_check_out + movie.available_inventory.must_equal inventory_before - 1 + end + + it "successfully decrease the movie's available inventory and check what happens" do + movie = movies(:LOTR) + movie.available_inventory = movie.inventory + inventory_before = movie.available_inventory + + movie.inventory_check_out + movie.inventory_check_out + # movie.errors.messages.must_include :available_inventory + movie.available_inventory.must_equal 0 + end + end end From 3003d94f4accdf2a7d073411a5395a70c9a50865 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 13:23:35 -0700 Subject: [PATCH 18/33] Still working on testing for methods --- app/controllers/rentals_controller.rb | 29 +++++++++++++++++++++------ test/models/movie_test.rb | 8 ++++---- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6fae3a158..2f9f28d6f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,17 +8,34 @@ def check_out movie = Movie.find_by(id: params[:movie_id]) customer = Customer.find_by(id: params[:customer_id]) - unless movie.inventory_available? + # unless movie.inventory_available? + # render json: { + # errors: { + # :available_inventory: ["#{movie.title} is not currently available."] + # } + # }, status: :not_found + # end + + if movie.nil? render json: { errors: { - :available_inventory: ["#{movie.title} is not currently available."] - } - }, status: :not_found + movie_id: ["No movie with ID #{params[:movie_id]}"] + } + }, status: :not_found + end + + if customer.nil? + render json: { + errors: { + customer_id: ["No customer with ID #{params[:customer_id]}"] + } + }, status: :not_found end if rental.save - movie.inventory_check_out - customer.movie_check_out + movie.update_attributes(available_inventory: movie.inventory_check_out) + customer.update_attributes(movies_checked_out_count: customer.movie_check_out) + render json: rental.as_json(only: [:movie_id, :customer_id]), status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0f725cb9f..eeb50acf2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -130,10 +130,10 @@ movie.available_inventory = movie.inventory inventory_before = movie.available_inventory - movie.inventory_check_out - movie.inventory_check_out - # movie.errors.messages.must_include :available_inventory - movie.available_inventory.must_equal 0 + movie.update(available_inventory: movie.inventory_check_out) + movie.update(available_inventory: movie.inventory_check_out) + movie.errors.messages.must_include :available_inventory + movies(:LOTR).available_inventory.must_equal 0 end end end From 01ea9cfcc59dcbf1948e563423fb29097517983a Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Tue, 8 May 2018 13:40:36 -0700 Subject: [PATCH 19/33] Added available inventory method to movie.rb and modified movie controller to display available inventory --- app/controllers/movies_controller.rb | 3 +- app/models/movie.rb | 34 ++++++++++++---------- test/controllers/movies_controller_test.rb | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 13625e771..a7074cd52 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,7 +15,8 @@ def show } }, status: :not_found else - render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok + available_inventory = movie.available_inventory + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]), status: :ok end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 907485710..bd936ffdb 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,22 +7,26 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :available_inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true - - def inventory_available? - if self.available_inventory.nil? - self.available_inventory = self.inventory - end - - return self.inventory > 0 - end - - def inventory_check_out - self.inventory -= 1 + def available_inventory + checked_out_count = Rental.where(movie_id: self.id, check_in: nil).count + return self.inventory - checked_out_count end - - def inventory_check_in - self.inventory += 1 - end + # def inventory_available? + # if self.available_inventory.nil? + # self.available_inventory = self.inventory + # end + # + # return self.inventory > 0 + # end + # + # def inventory_check_out + # self.inventory -= 1 + # end + # + # + # def inventory_check_in + # self.inventory += 1 + # end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 8b2577226..09e39b09c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -25,7 +25,7 @@ describe "show" do it "can get a movie" do # Arrange - keys = %w(id inventory overview release_date title) + keys = %w(available_inventory id inventory overview release_date title) movie = movies(:LOTR) # Act From 622d254e88d4b66d50f7fba1eb9f3f500a8df8ec Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 14:07:19 -0700 Subject: [PATCH 20/33] Removed the methods and testing that we had earlier for the columns that we created for customer and movie. We updated the customer model with a new method for movies checked out count. Then, we updated the testing for both customer and movie models --- app/controllers/customers_controller.rb | 7 +- app/models/customer.rb | 25 +++-- app/models/movie.rb | 6 +- test/controllers/customers_controller_test.rb | 2 +- test/fixtures/rentals.yml | 7 ++ test/models/customer_test.rb | 29 ++++-- test/models/movie_test.rb | 96 +++++++++++-------- 7 files changed, 111 insertions(+), 61 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 788ac43a6..93a0dcea1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,11 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + + customers.each do |customer| + movies_checked_out_count = customer.movies_checked_out_count + end + + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index beeb148d9..facaf6c88 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,17 +5,22 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true - validates :movies_checked_out_count, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true + # validates :movies_checked_out_count, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true - def movie_check_out - if self.movies_checked_out_count.nil? - self.movies_checked_out_count = 0 - end - - self.movies_checked_out_count += 1 + def movies_checked_out_count + checked_out_count = Rental.where(customer_id: self.id, check_in: nil).count end - def movie_check_in - self.movies_checked_out_count -= 1 - end + + # def movie_check_out + # if self.movies_checked_out_count.nil? + # self.movies_checked_out_count = 0 + # end + # + # self.movies_checked_out_count += 1 + # end + # + # def movie_check_in + # self.movies_checked_out_count -= 1 + # end end diff --git a/app/models/movie.rb b/app/models/movie.rb index bd936ffdb..456bc6b41 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,11 +5,13 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - validates :available_inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true + # validates :available_inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true def available_inventory checked_out_count = Rental.where(movie_id: self.id, check_in: nil).count - return self.inventory - checked_out_count + available_inventory = self.inventory - checked_out_count + + return available_inventory end # def inventory_available? diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9757d3e96..86c2aa5a9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,7 +4,7 @@ describe "index" do it "gets all the customers" do # Arrange - keys = %w(id name phone postal_code registered_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) # Act get customers_path diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 916a61fa8..9877c8f12 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -13,3 +13,10 @@ two: check_in: 2018-05-13 13:42:51 customer: kari movie: LOTR + +three: + check_out: 2018-05-07 13:42:51 + due_date: 2018-05-14 13:42:51 + check_in: + customer: dan + movie: LOTR diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 93d3f116e..52fd327d0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -75,15 +75,30 @@ Customer.count.must_equal count_before end - it "is invalid if movies checked out count is less than 0" do - count_before = Customer.count - @customer.movies_checked_out_count = -1 - @customer.valid?.must_equal false + # it "is invalid if movies checked out count is less than 0" do + # count_before = Customer.count + # @customer.movies_checked_out_count = -1 + # @customer.valid?.must_equal false + # + # @customer.save + # + # @customer.errors.messages.must_include :movies_checked_out_count + # Customer.count.must_equal count_before + # end + end - @customer.save + describe "movies_checked_out_count" do + it "returns the number of movies checked out" do + customer = customers(:dan) - @customer.errors.messages.must_include :movies_checked_out_count - Customer.count.must_equal count_before + customer.movies_checked_out_count.must_equal 1 + end + + it "returns 0 if the customer has no movies checked out" do + customer = customers(:kari) + + customer.movies_checked_out_count.must_equal 0 end end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index eeb50acf2..8c159cb69 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -86,54 +86,70 @@ Movie.count.must_equal count_before end - it "is invalid if available inventory is less than 0" do - count_before = Movie.count - @movie.available_inventory = -2 - @movie.valid?.must_equal false - - @movie.save - - @movie.errors.messages.must_include :available_inventory - Movie.count.must_equal count_before - end + # it "is invalid if available inventory is less than 0" do + # count_before = Movie.count + # @movie.available_inventory = -2 + # @movie.valid?.must_equal false + # + # @movie.save + # + # @movie.errors.messages.must_include :available_inventory + # Movie.count.must_equal count_before + # end end - describe "inventory_available?" do - it "returns true if the movie has available inventory" do + # describe "inventory_available?" do + # it "returns true if the movie has available inventory" do + # movie = movies(:HP) + # + # movie.inventory_available?.must_equal true + # movie.inventory.must_equal 3 + # end + # + # it "returns false if the movie has not available inventory" do + # movie = movies(:LOTR) + # movie.inventory = 0 + # + # movie.inventory_available?.must_equal false + # end + # end + # + # + # describe "inventory_check_out" do + # it "successfully decrease the movie's available inventory" do + # movie = movies(:HP) + # movie.available_inventory = movie.inventory + # inventory_before = movie.available_inventory + # + # movie.inventory_check_out + # movie.available_inventory.must_equal inventory_before - 1 + # end + # + # it "successfully decrease the movie's available inventory and check what happens" do + # movie = movies(:LOTR) + # movie.available_inventory = movie.inventory + # inventory_before = movie.available_inventory + # + # movie.update(available_inventory: movie.inventory_check_out) + # movie.update(available_inventory: movie.inventory_check_out) + # movie.errors.messages.must_include :available_inventory + # movies(:LOTR).available_inventory.must_equal 0 + # end + # end + + + describe "available_inventory" do + it "shows that the available inventory is the same as the inventory if movie is not checked out" do movie = movies(:HP) - movie.inventory_available?.must_equal true - movie.inventory.must_equal 3 + movie.available_inventory.must_equal movie.inventory end - it "returns false if the movie has not available inventory" do + it "will decreate the available inventory when the movie is checked out" do movie = movies(:LOTR) - movie.inventory = 0 - movie.inventory_available?.must_equal false - end - end + movie.available_inventory.must_equal movie.inventory - 1 + end - - describe "inventory_check_out" do - it "successfully decrease the movie's available inventory" do - movie = movies(:HP) - movie.available_inventory = movie.inventory - inventory_before = movie.available_inventory - - movie.inventory_check_out - movie.available_inventory.must_equal inventory_before - 1 - end - - it "successfully decrease the movie's available inventory and check what happens" do - movie = movies(:LOTR) - movie.available_inventory = movie.inventory - inventory_before = movie.available_inventory - - movie.update(available_inventory: movie.inventory_check_out) - movie.update(available_inventory: movie.inventory_check_out) - movie.errors.messages.must_include :available_inventory - movies(:LOTR).available_inventory.must_equal 0 - end end end From c1de1e1f94a2169959888b05dde3063eda23d98d Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Tue, 8 May 2018 15:38:17 -0700 Subject: [PATCH 21/33] Modified rental controller and tests --- app/controllers/rentals_controller.rb | 30 ++++++------------ config/routes.rb | 4 +-- test/controllers/rentals_controller_test.rb | 35 +++++++++++++++++++-- 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2f9f28d6f..12fb2862f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,3 +1,4 @@ +require 'pry' class RentalsController < ApplicationController def check_out @@ -5,37 +6,27 @@ def check_out rental.check_out = DateTime.now rental.due_date = rental.check_out + 7 - movie = Movie.find_by(id: params[:movie_id]) - customer = Customer.find_by(id: params[:customer_id]) - - # unless movie.inventory_available? - # render json: { - # errors: { - # :available_inventory: ["#{movie.title} is not currently available."] - # } - # }, status: :not_found - # end + movie = Movie.find_by(id: params[:rental][:movie_id]) if movie.nil? render json: { errors: { - movie_id: ["No movie with ID #{params[:movie_id]}"] + movie_id: ["No movie with ID #{params[:rental][:movie_id]}"] } }, status: :not_found + return end - if customer.nil? + if movie.available_inventory < 1 render json: { errors: { - customer_id: ["No customer with ID #{params[:customer_id]}"] - } - }, status: :not_found + available_inventory: ["#{movie.title} is not currently available."] + } + }, status: :not_found + return end if rental.save - movie.update_attributes(available_inventory: movie.inventory_check_out) - customer.update_attributes(movies_checked_out_count: customer.movie_check_out) - render json: rental.as_json(only: [:movie_id, :customer_id]), status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request @@ -43,13 +34,12 @@ def check_out end def check_in - rental = Rental.find_rental(rental_params) if rental.empty? render json: { errors: { - :movie_id: ["No rental is currently checkout with that criteria."] + movie_id: ["No rental is currently checkout with that criteria."] } }, status: :not_found else diff --git a/config/routes.rb b/config/routes.rb index 27689fa46..8e2b88c1b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] -post '/rentals', to: 'rentals#check_out', as: 'check_out' -post '/rentals', to: 'rentals#check_in', as: 'check_in' +post '/rentals/', to: 'rentals#check_out', as: 'check_out' +post '/rentals/', to: 'rentals#check_in', as: 'check_in' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index fdf7e8d7d..587aa7584 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -23,12 +23,12 @@ Rental.find_by(movie_id: body["movie_id"]).movie_id.must_equal movies(:HP).id end - it "Returns an error for an invalid rental" do + it "Returns an error for an invalid movie ID" do bad_data = rental_data.clone() - bad_data.delete(:movie_id) + bad_data[:movie_id] = Movie.last.id + 1 assert_no_difference "Rental.count" do post check_out_path, params: { rental: bad_data } - assert_response :bad_request + assert_response :not_found end body = JSON.parse(response.body) @@ -36,5 +36,34 @@ body.must_include "errors" body["errors"].must_include "movie_id" end + + it "Returns an error if movie is not available" do + post check_out_path, params: { rental: { movie_id: movies(:LOTR).id, customer_id: customers(:kari).id }} + movies(:LOTR).available_inventory.must_equal 0 + + assert_no_difference "Rental.count" do + post check_out_path, params: { rental: { movie_id: movies(:LOTR).id, customer_id: customers(:dan).id }} + assert_response :not_found + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "available_inventory" + end + + it "Returns an error for an invalid customer ID" do + bad_data = rental_data.clone() + bad_data[:customer_id] = Customer.last.id + 1 + assert_no_difference "Rental.count" do + post check_out_path, params: { rental: bad_data } + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "customer" + end end end From 4bb533064e28ce3275592f2caba79598f1d9ff96 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Tue, 8 May 2018 16:19:11 -0700 Subject: [PATCH 22/33] Updated the rental#check_in method and rental#find_rental method. Updated the testing for rental.rb and started the testing for the rentals controller --- app/controllers/rentals_controller.rb | 17 +++++++------ app/models/rental.rb | 5 +--- config/routes.rb | 4 +-- test/controllers/rentals_controller_test.rb | 24 ++++++++++++++++++ test/fixtures/rentals.yml | 9 ++++++- test/models/rental_test.rb | 28 +++++++++++++++++++++ 6 files changed, 73 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 12fb2862f..abf0f021f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,20 +34,23 @@ def check_out end def check_in - rental = Rental.find_rental(rental_params) + rental = Rental.find_rental(params[:rental][:movie_id], params[:rental][:customer_id]) - if rental.empty? + if rental.nil? render json: { errors: { movie_id: ["No rental is currently checkout with that criteria."] } }, status: :not_found - else - movie = Movie.find_by(id: params[:movie_id]) - customer = Customer.find_by(id: params[:customer_id]) + return + end + + rental.update_attributes(check_in: DateTime.now) - movie.inventory_check_in - customer.movie_check_in + if rental.save + render json: rental.as_json(only: [:movie_id, :customer_id]), status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 6d3cd3a20..fef1de150 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -11,10 +11,7 @@ class Rental < ApplicationRecord def self.find_rental(movie_id, customer_id) - - self.all.where(movie_id: movie_id, customer_id: customer_id, check_in: nil) - - + self.all.where(movie_id: movie_id, customer_id: customer_id, check_in: nil).first end end diff --git a/config/routes.rb b/config/routes.rb index 8e2b88c1b..2bca59c8d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] -post '/rentals/', to: 'rentals#check_out', as: 'check_out' -post '/rentals/', to: 'rentals#check_in', as: 'check_in' +post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' +post '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 587aa7584..bc7e0fa8f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -66,4 +66,28 @@ body["errors"].must_include "customer" end end + + describe "check_in" do + let(:rental_data) { + { + movie_id: movies(:LOTR).id, + customer_id: customers(:dan).id + } + } + + it "will successfully check in a rental with valid customer and movie id" do + assert_no_difference "Rental.count" do + post check_in_path, params: { rental: rental_data } + must_respond_with :success + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "movie_id" + + # Check that the ID matches + Rental.find_by(movie_id: body["movie_id"]).movie_id.must_equal movies(:LOTR).id + end + + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 9877c8f12..dab17e565 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -17,6 +17,13 @@ two: three: check_out: 2018-05-07 13:42:51 due_date: 2018-05-14 13:42:51 - check_in: + check_in: customer: dan movie: LOTR + +four: + check_out: 2019-05-07 13:42:51 + due_date: 2019-05-14 13:42:51 + check_in: + customer: kari + movie: HP diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 419342323..1cb393850 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'pry' describe Rental do describe "relations" do @@ -103,4 +104,31 @@ Rental.count.must_equal count_before end end + + describe "find_rental" do + it "will find the rental with movie and customer id" do + rental = Rental.find_rental(movies(:LOTR).id, customers(:dan).id) + + rental.must_be_kind_of Rental + rental.id.must_equal rentals(:three).id + end + + it "returns nil when the movie id is not found" do + rental = Rental.find_rental(Movie.last.id + 1, Customer.first.id) + + rental.must_be_nil + end + + it "returns nil when the customer id is not found" do + rental = Rental.find_rental(Movie.first.id, Customer.last.id + 1) + + rental.must_be_nil + end + + it "returns nil when the movie is not checked out" do + rental = Rental.find_rental(movies(:HP).id, customers(:dan).id) + + rental.must_be_nil + end + end end From 2ce25b763bea309d5a3a333e7d2bc7b09787459f Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Tue, 8 May 2018 16:44:57 -0700 Subject: [PATCH 23/33] Updated check in controller and tests --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 61 +++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index abf0f021f..f5e5161ea 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -39,7 +39,7 @@ def check_in if rental.nil? render json: { errors: { - movie_id: ["No rental is currently checkout with that criteria."] + rental: ["No rental is currently checkout with that criteria."] } }, status: :not_found return diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index bc7e0fa8f..0edab36e3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -89,5 +89,66 @@ Rental.find_by(movie_id: body["movie_id"]).movie_id.must_equal movies(:LOTR).id end + it "returns an error if the movie id is not valid" do + bad_data = rental_data.clone() + bad_data[:movie_id] = Movie.last.id + 1 + assert_no_difference "Rental.count" do + post check_in_path, params: { rental: bad_data } + must_respond_with :not_found + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "rental" + end + + it "returns an error if the customer id is not valid" do + bad_data = rental_data.clone() + bad_data[:customer_id] = Customer.last.id + 1 + assert_no_difference "Rental.count" do + post check_in_path, params: { rental: bad_data } + must_respond_with :not_found + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "rental" + end + + it "returns an error if the movie is already returned" do + assert_no_difference "Rental.count" do + post check_in_path, + params: { + rental: { movie_id: movies(:HP).id, + customer_id: customers(:dan).id + } + } + must_respond_with :not_found + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "rental" + end + + it "returns an error if the check in date is before the check out date" do + assert_no_difference "Rental.count" do + post check_in_path, + params: { + rental: { movie_id: movies(:HP).id, + customer_id: customers(:kari).id + } + } + must_respond_with :bad_request + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "check_in" + end end end From 221c5a2a77f8e9b8c56e7a9ef101a4d71501ec6f Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Wed, 9 May 2018 09:42:09 -0700 Subject: [PATCH 24/33] Resolved smoke test issue with movie controller#movie params --- app/controllers/movies_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a7074cd52..dbd68f6b5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -25,7 +25,7 @@ def create if movie.save render json: { - id: movie.id }, status: :created + id: movie.id }, status: :ok else render json: { errors: movie.errors.messages }, status: :bad_request end @@ -33,6 +33,6 @@ def create private def movie_params - return params.require(:movie).permit(:title, :overview, :release_date, :inventory) + return params.permit(:title, :overview, :release_date, :inventory) end end From db98497d23331d9665aed900a61250be20cab6b7 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Wed, 9 May 2018 09:57:34 -0700 Subject: [PATCH 25/33] Resolved wave 3 smoke tests by changing strong params requirements in rental controller --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/rentals_controller.rb | 8 ++++---- config/routes.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c3ac046f6c51a2cd4bc2df32c603e493458c382e GIT binary patch literal 6148 zcmeH~F^{dt=u>Bl;zddfqZjB=JE!l7EiIwCR znHYd=e=Zwf1hAw#vGy=AV?N-4FWm9?zTD5J+wJN_+D8XGrH`2G=e8gPq<|EV0#ZN< z%t(Pe#+RQndL})J6p#Y*P{6+rh3>4$))}7;h8O|Jf#oo+W0oL`7s#4yovhF-rw7Yc zi!sFO(N31Ut|nV&Z-?dZVR>isDTZdf9afmotOgXMfE1W0u;}^d=l`Dm-~2ymQ7Q$b zz?&&x!|t%#@}=@@{quTWKW5d}jZVhp3{O7+O#CQb(Zjf3d_mS^>tuzdAAyiTK?=N7 FfnTX=61e~X literal 0 HcmV?d00001 diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f5e5161ea..f8461e528 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,12 +6,12 @@ def check_out rental.check_out = DateTime.now rental.due_date = rental.check_out + 7 - movie = Movie.find_by(id: params[:rental][:movie_id]) + movie = Movie.find_by(id: params[:movie_id]) if movie.nil? render json: { errors: { - movie_id: ["No movie with ID #{params[:rental][:movie_id]}"] + movie_id: ["No movie with ID #{params[:movie_id]}"] } }, status: :not_found return @@ -34,7 +34,7 @@ def check_out end def check_in - rental = Rental.find_rental(params[:rental][:movie_id], params[:rental][:customer_id]) + rental = Rental.find_rental(params[:movie_id], params[:customer_id]) if rental.nil? render json: { @@ -56,7 +56,7 @@ def check_in private def rental_params - return params.require(:rental).permit(:movie_id, :customer_id) + return params.permit(:movie_id, :customer_id) end end diff --git a/config/routes.rb b/config/routes.rb index 2bca59c8d..6c45f3f41 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] -post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' -post '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' +post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' +post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' end From 2e73569ac2e2e0d7cb37a15e493a1268a83bbc46 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Wed, 9 May 2018 10:24:18 -0700 Subject: [PATCH 26/33] Modified lots of tests because of changes to strong params in multiple controllers --- test/controllers/movies_controller_test.rb | 14 +++--- test/controllers/rentals_controller_test.rb | 52 ++++++++++----------- test/fixtures/customers.yml | 9 ++++ test/fixtures/movies.yml | 6 +++ test/models/customer_test.rb | 2 +- test/models/movie_test.rb | 4 +- 6 files changed, 50 insertions(+), 37 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 09e39b09c..2b3bfe779 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,18 +56,18 @@ end describe "create" do - let(:movie_data) { - { + before do + @movie_data = { title: "Wonder Woman", overview: "About the most badass superhero in the world", release_date: Date.parse("02/05/18"), inventory: 4 } - } + end it "Creates a new movie" do assert_difference "Movie.count", 1 do - post movies_url, params: { movie: movie_data } + post movies_url, params: @movie_data must_respond_with :success end @@ -76,14 +76,14 @@ body.must_include "id" # Check that the ID matches - Movie.find(body["id"]).title.must_equal movie_data[:title] + Movie.find(body["id"]).title.must_equal @movie_data[:title] end it "Returns an error for an invalid movie" do - bad_data = movie_data.clone() + bad_data = @movie_data.clone() bad_data.delete(:title) assert_no_difference "Movie.count" do - post movies_url, params: { movie: bad_data } + post movies_url, params: bad_data assert_response :bad_request end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0edab36e3..4a0fe30b4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,16 +2,22 @@ describe RentalsController do describe "check_out" do - let(:rental_data) { - { + before do + @rental_data = { movie_id: movies(:HP).id, customer_id: customers(:kari).id } - } + end + # let(:rental_data) { + # { + # movie_id: movies(:HP).id, + # customer_id: customers(:kari).id + # } + # } it "Creates a new rental" do assert_difference "Rental.count", 1 do - post check_out_path, params: { rental: rental_data } + post check_out_path, params: @rental_data must_respond_with :success end @@ -24,7 +30,7 @@ end it "Returns an error for an invalid movie ID" do - bad_data = rental_data.clone() + bad_data = @rental_data.clone() bad_data[:movie_id] = Movie.last.id + 1 assert_no_difference "Rental.count" do post check_out_path, params: { rental: bad_data } @@ -38,11 +44,11 @@ end it "Returns an error if movie is not available" do - post check_out_path, params: { rental: { movie_id: movies(:LOTR).id, customer_id: customers(:kari).id }} + post check_out_path, params: { movie_id: movies(:LOTR).id, customer_id: customers(:kari).id } movies(:LOTR).available_inventory.must_equal 0 assert_no_difference "Rental.count" do - post check_out_path, params: { rental: { movie_id: movies(:LOTR).id, customer_id: customers(:dan).id }} + post check_out_path, params: { movie_id: movies(:LOTR).id, customer_id: customers(:dan).id } assert_response :not_found end @@ -53,10 +59,10 @@ end it "Returns an error for an invalid customer ID" do - bad_data = rental_data.clone() + bad_data = @rental_data.clone() bad_data[:customer_id] = Customer.last.id + 1 assert_no_difference "Rental.count" do - post check_out_path, params: { rental: bad_data } + post check_out_path, params: bad_data assert_response :bad_request end @@ -68,16 +74,16 @@ end describe "check_in" do - let(:rental_data) { - { + before do + @rental_data = { movie_id: movies(:LOTR).id, customer_id: customers(:dan).id } - } + end it "will successfully check in a rental with valid customer and movie id" do assert_no_difference "Rental.count" do - post check_in_path, params: { rental: rental_data } + post check_in_path, params: @rental_data must_respond_with :success end @@ -90,10 +96,10 @@ end it "returns an error if the movie id is not valid" do - bad_data = rental_data.clone() + bad_data = @rental_data.clone() bad_data[:movie_id] = Movie.last.id + 1 assert_no_difference "Rental.count" do - post check_in_path, params: { rental: bad_data } + post check_in_path, params: bad_data must_respond_with :not_found end @@ -104,10 +110,10 @@ end it "returns an error if the customer id is not valid" do - bad_data = rental_data.clone() + bad_data = @rental_data.clone() bad_data[:customer_id] = Customer.last.id + 1 assert_no_difference "Rental.count" do - post check_in_path, params: { rental: bad_data } + post check_in_path, params: bad_data must_respond_with :not_found end @@ -120,11 +126,7 @@ it "returns an error if the movie is already returned" do assert_no_difference "Rental.count" do post check_in_path, - params: { - rental: { movie_id: movies(:HP).id, - customer_id: customers(:dan).id - } - } + params: { movie_id: movies(:HP).id, customer_id: customers(:dan).id } must_respond_with :not_found end @@ -137,11 +139,7 @@ it "returns an error if the check in date is before the check out date" do assert_no_difference "Rental.count" do post check_in_path, - params: { - rental: { movie_id: movies(:HP).id, - customer_id: customers(:kari).id - } - } + params: { movie_id: movies(:HP).id, customer_id: customers(:kari).id } must_respond_with :bad_request end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 44b200687..bee01060a 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -17,3 +17,12 @@ kari: state: WA postal_code: 98101 phone: 456-345-2346 + +dee: + name: Dee + registered_at: 2018-05-07 13:41:00 + address: Also lives at Ada + city: Seattle + state: WA + postal_code: 98101 + phone: 456-345-2346 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 1b1c92abc..107ecb402 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,3 +11,9 @@ LOTR: overview: A quest to find the ring release_date: 2018-05-07 inventory: 1 + +HP2: + title: ONLY the second Harry Potter movie + overview: He's still young. It's mostly about quidditch. + release_date: 2012-04-03 + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 52fd327d0..c11077fc2 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -95,7 +95,7 @@ end it "returns 0 if the customer has no movies checked out" do - customer = customers(:kari) + customer = customers(:dee) customer.movies_checked_out_count.must_equal 0 end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8c159cb69..85c6813eb 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -140,7 +140,7 @@ describe "available_inventory" do it "shows that the available inventory is the same as the inventory if movie is not checked out" do - movie = movies(:HP) + movie = movies(:HP2) movie.available_inventory.must_equal movie.inventory end @@ -149,7 +149,7 @@ movie = movies(:LOTR) movie.available_inventory.must_equal movie.inventory - 1 - end + end end end From c9ceff2e27f3527aced92cdd8bc1044a1fffd49d Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Wed, 9 May 2018 10:36:08 -0700 Subject: [PATCH 27/33] Went through all files to refactor code --- app/controllers/rentals_controller.rb | 2 -- app/models/customer.rb | 13 ------- app/models/movie.rb | 18 ---------- app/models/rental.rb | 2 +- config/routes.rb | 9 ++--- test/models/customer_test.rb | 10 ------ test/models/movie_test.rb | 50 --------------------------- test/models/rental_test.rb | 1 - 8 files changed, 6 insertions(+), 99 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f8461e528..b72730de8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,4 +1,3 @@ -require 'pry' class RentalsController < ApplicationController def check_out @@ -58,5 +57,4 @@ def check_in def rental_params return params.permit(:movie_id, :customer_id) end - end diff --git a/app/models/customer.rb b/app/models/customer.rb index facaf6c88..8a3b004d7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,22 +5,9 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true - # validates :movies_checked_out_count, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true def movies_checked_out_count checked_out_count = Rental.where(customer_id: self.id, check_in: nil).count end - - # def movie_check_out - # if self.movies_checked_out_count.nil? - # self.movies_checked_out_count = 0 - # end - # - # self.movies_checked_out_count += 1 - # end - # - # def movie_check_in - # self.movies_checked_out_count -= 1 - # end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 456bc6b41..a38a22da1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,7 +5,6 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - # validates :available_inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, allow_nil: true def available_inventory checked_out_count = Rental.where(movie_id: self.id, check_in: nil).count @@ -14,21 +13,4 @@ def available_inventory return available_inventory end - # def inventory_available? - # if self.available_inventory.nil? - # self.available_inventory = self.inventory - # end - # - # return self.inventory > 0 - # end - # - # def inventory_check_out - # self.inventory -= 1 - # end - # - # - # def inventory_check_in - # self.inventory += 1 - # end - end diff --git a/app/models/rental.rb b/app/models/rental.rb index fef1de150..934c0f2df 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,5 @@ class Rental < ApplicationRecord - belongs_to :customer#, counter_cache: :movies_checked_out_count + belongs_to :customer belongs_to :movie validates :movie_id, presence: true diff --git a/config/routes.rb b/config/routes.rb index 6c45f3f41..915655b0d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,10 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html -resources :customers, only: [:index] -resources :movies, only: [:index, :show, :create] + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] -post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' -post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' + post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index c11077fc2..e1064f058 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -75,16 +75,6 @@ Customer.count.must_equal count_before end - # it "is invalid if movies checked out count is less than 0" do - # count_before = Customer.count - # @customer.movies_checked_out_count = -1 - # @customer.valid?.must_equal false - # - # @customer.save - # - # @customer.errors.messages.must_include :movies_checked_out_count - # Customer.count.must_equal count_before - # end end describe "movies_checked_out_count" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 85c6813eb..7dbd2777b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -86,58 +86,8 @@ Movie.count.must_equal count_before end - # it "is invalid if available inventory is less than 0" do - # count_before = Movie.count - # @movie.available_inventory = -2 - # @movie.valid?.must_equal false - # - # @movie.save - # - # @movie.errors.messages.must_include :available_inventory - # Movie.count.must_equal count_before - # end end - # describe "inventory_available?" do - # it "returns true if the movie has available inventory" do - # movie = movies(:HP) - # - # movie.inventory_available?.must_equal true - # movie.inventory.must_equal 3 - # end - # - # it "returns false if the movie has not available inventory" do - # movie = movies(:LOTR) - # movie.inventory = 0 - # - # movie.inventory_available?.must_equal false - # end - # end - # - # - # describe "inventory_check_out" do - # it "successfully decrease the movie's available inventory" do - # movie = movies(:HP) - # movie.available_inventory = movie.inventory - # inventory_before = movie.available_inventory - # - # movie.inventory_check_out - # movie.available_inventory.must_equal inventory_before - 1 - # end - # - # it "successfully decrease the movie's available inventory and check what happens" do - # movie = movies(:LOTR) - # movie.available_inventory = movie.inventory - # inventory_before = movie.available_inventory - # - # movie.update(available_inventory: movie.inventory_check_out) - # movie.update(available_inventory: movie.inventory_check_out) - # movie.errors.messages.must_include :available_inventory - # movies(:LOTR).available_inventory.must_equal 0 - # end - # end - - describe "available_inventory" do it "shows that the available inventory is the same as the inventory if movie is not checked out" do movie = movies(:HP2) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1cb393850..91bb6433f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,5 +1,4 @@ require "test_helper" -require 'pry' describe Rental do describe "relations" do From d9312b0de6b3d1f7480b6a524b21618a83d77601 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Wed, 9 May 2018 10:40:36 -0700 Subject: [PATCH 28/33] Ran rails db:rollback to remove the columns we created for customer and movie DB --- .../20180508165533_add_movie_checkout_column_to_customer.rb | 5 ----- ...20180508165859_add_available_inventory_column_to_movie.rb | 5 ----- db/schema.rb | 4 +--- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb delete mode 100644 db/migrate/20180508165859_add_available_inventory_column_to_movie.rb diff --git a/db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb b/db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb deleted file mode 100644 index ad467c7ab..000000000 --- a/db/migrate/20180508165533_add_movie_checkout_column_to_customer.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddMovieCheckoutColumnToCustomer < ActiveRecord::Migration[5.1] - def change - add_column :customers, :movies_checked_out_count, :integer - end -end diff --git a/db/migrate/20180508165859_add_available_inventory_column_to_movie.rb b/db/migrate/20180508165859_add_available_inventory_column_to_movie.rb deleted file mode 100644 index e62fd4a13..000000000 --- a/db/migrate/20180508165859_add_available_inventory_column_to_movie.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddAvailableInventoryColumnToMovie < ActiveRecord::Migration[5.1] - def change - add_column :movies, :available_inventory, :integer - end -end diff --git a/db/schema.rb b/db/schema.rb index 53e88fa2e..92849e575 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: 20180508165859) do +ActiveRecord::Schema.define(version: 20180507205051) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,6 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| @@ -35,7 +34,6 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From fdde0ea1a39d9eae8dd8673b3a7fb7c152d0de31 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Wed, 9 May 2018 10:47:51 -0700 Subject: [PATCH 29/33] Modified tests to account for changes to customer and movie DB --- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 86c2aa5a9..9757d3e96 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,7 +4,7 @@ describe "index" do it "gets all the customers" do # Arrange - keys = %w(id movies_checked_out_count name phone postal_code registered_at) + keys = %w(id name phone postal_code registered_at) # Act get customers_path diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2b3bfe779..cfda28841 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -25,7 +25,7 @@ describe "show" do it "can get a movie" do # Arrange - keys = %w(available_inventory id inventory overview release_date title) + keys = %w(id inventory overview release_date title) movie = movies(:LOTR) # Act @@ -83,7 +83,7 @@ bad_data = @movie_data.clone() bad_data.delete(:title) assert_no_difference "Movie.count" do - post movies_url, params: bad_data + post movies_url, params: bad_data assert_response :bad_request end From fb72f63a9b4881a6adfb375c638365aaf52154f8 Mon Sep 17 00:00:00 2001 From: Luxi Lindsey Date: Wed, 9 May 2018 14:53:31 -0700 Subject: [PATCH 30/33] Tried to validate the movies that a customer can check out --- app/models/rental.rb | 20 ++++++++++++ test/controllers/rentals_controller_test.rb | 8 +---- test/fixtures/customers.yml | 9 ++++++ test/models/rental_test.rb | 36 ++++++++++++++++++++- 4 files changed, 65 insertions(+), 8 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 934c0f2df..43d1868b4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,24 @@ +# class RentalValidator < ActiveModel::Validator +# +# def validate(rental) +# duplicate_rental = Rental.find_by( +# movie_id: rental.movie_id, +# customer_id: rental.customer_id, +# check_in: nil +# ) +# +# unless duplicate_rental.nil? +# rental.errors[:movie_id] << "Movie has already been checked out by this customer." +# end +# end +# +# end + + class Rental < ApplicationRecord + # include ActiveModel::Validations + # validates_with RentalValidator + belongs_to :customer belongs_to :movie diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4a0fe30b4..7c7e4be1b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,15 +5,9 @@ before do @rental_data = { movie_id: movies(:HP).id, - customer_id: customers(:kari).id + customer_id: customers(:chris).id } end - # let(:rental_data) { - # { - # movie_id: movies(:HP).id, - # customer_id: customers(:kari).id - # } - # } it "Creates a new rental" do assert_difference "Rental.count", 1 do diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bee01060a..885ea107c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -26,3 +26,12 @@ dee: state: WA postal_code: 98101 phone: 456-345-2346 + +chris: + name: Chris + registered_at: 2018-05-07 13:41:00 + address: Also lives at Ada + city: Seattle + state: WA + postal_code: 98101 + phone: 456-345-2346 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 91bb6433f..87892f640 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -19,7 +19,7 @@ before do @rental = Rental.new( movie: movies(:LOTR), - customer: customers(:dan), + customer: customers(:chris), check_out: DateTime.now, due_date: DateTime.now + 7 ) @@ -46,6 +46,40 @@ Rental.count.must_equal count_before end + # it "invalid if customer currently has checked out that movie" do + # count_before = Rental.count + # rental_2 = Rental.new( + # movie: movies(:HP), + # customer: customers(:kari), + # check_out: DateTime.now, + # due_date: DateTime.now + 7 + # ) + # + # rental_2.valid?.must_equal false + # + # rental_2.save + # + # rental_2.errors.messages.must_include :movie_id + # rental_2.errors.messages[:movie_id].must_include "Movie has already been checked out by this customer." + # Rental.count.must_equal count_before + # end + # + # it "is allows a customer to checkout a previously rented movie if alreaady returned" do + # count_before = Rental.count + # rental_2 = Rental.new( + # movie: movies(:HP), + # customer: customers(:dan), + # check_out: DateTime.now, + # due_date: DateTime.now + 7 + # ) + # rental_2.valid?.must_equal true + # + # rental_2.save + # + # Rental.count.must_equal count_before + 1 + # + # end + it "is invalid without a customer ID" do count_before = Rental.count @rental.customer_id = nil From 17a8312e86a5208886579ac04a7eddd6deb6f608 Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Wed, 9 May 2018 15:32:10 -0700 Subject: [PATCH 31/33] Modified movies and customers controllers to show results of method calls --- app/controllers/customers_controller.rb | 6 +----- app/controllers/movies_controller.rb | 3 +-- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 93a0dcea1..0598a61eb 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,10 +3,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - customers.each do |customer| - movies_checked_out_count = customer.movies_checked_out_count - end - - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customers.as_json(methods: :movies_checked_out_count, only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dbd68f6b5..9cf271858 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,8 +15,7 @@ def show } }, status: :not_found else - available_inventory = movie.available_inventory - render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + render json: movie.as_json(methods: :available_inventory, only: [:id, :title, :overview, :release_date, :inventory]), status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9757d3e96..86c2aa5a9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,7 +4,7 @@ describe "index" do it "gets all the customers" do # Arrange - keys = %w(id name phone postal_code registered_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) # Act get customers_path diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index cfda28841..70635d7c6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -25,7 +25,7 @@ describe "show" do it "can get a movie" do # Arrange - keys = %w(id inventory overview release_date title) + keys = %w(available_inventory id inventory overview release_date title) movie = movies(:LOTR) # Act From f1e6d49afd39368e39a1c1dad535744d3b20cedf Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Fri, 11 May 2018 13:46:22 -0700 Subject: [PATCH 32/33] Minor refactoring and moved logic regarding duplicate rentals to the rental#checkout controller method --- app/controllers/customers_controller.rb | 1 - app/controllers/rentals_controller.rb | 20 ++++++++-- app/models/rental.rb | 22 +---------- test/controllers/customers_controller_test.rb | 3 -- test/controllers/movies_controller_test.rb | 14 ++----- test/controllers/rentals_controller_test.rb | 38 ++++++++++++++----- test/models/movie_test.rb | 4 +- test/models/rental_test.rb | 34 ----------------- 8 files changed, 51 insertions(+), 85 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0598a61eb..b2bead1de 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(methods: :movies_checked_out_count, only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b72730de8..041c863c4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,13 +1,15 @@ class RentalsController < ApplicationController + RENTAL_LIMIT = 7 #days + def check_out rental = Rental.new(rental_params) rental.check_out = DateTime.now - rental.due_date = rental.check_out + 7 + rental.due_date = rental.check_out + RENTAL_LIMIT movie = Movie.find_by(id: params[:movie_id]) - if movie.nil? + unless movie render json: { errors: { movie_id: ["No movie with ID #{params[:movie_id]}"] @@ -25,6 +27,16 @@ def check_out return end + duplicate_rental = Rental.find_rental(params[:movie_id], params[:customer_id]) + if duplicate_rental + render json: { + errors: { + movie_id: ["#{movie.title} is currently checked out by that customer. A customer may not check out more than one copy of a movie at a time."] + } + }, status: :bad_request + return + end + if rental.save render json: rental.as_json(only: [:movie_id, :customer_id]), status: :ok else @@ -35,10 +47,10 @@ def check_out def check_in rental = Rental.find_rental(params[:movie_id], params[:customer_id]) - if rental.nil? + unless rental render json: { errors: { - rental: ["No rental is currently checkout with that criteria."] + rental: ["There is no outstanding rental with that criteria."] } }, status: :not_found return diff --git a/app/models/rental.rb b/app/models/rental.rb index 43d1868b4..ce028a3c9 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,23 +1,4 @@ -# class RentalValidator < ActiveModel::Validator -# -# def validate(rental) -# duplicate_rental = Rental.find_by( -# movie_id: rental.movie_id, -# customer_id: rental.customer_id, -# check_in: nil -# ) -# -# unless duplicate_rental.nil? -# rental.errors[:movie_id] << "Movie has already been checked out by this customer." -# end -# end -# -# end - - class Rental < ApplicationRecord - # include ActiveModel::Validations - # validates_with RentalValidator belongs_to :customer belongs_to :movie @@ -31,7 +12,6 @@ class Rental < ApplicationRecord def self.find_rental(movie_id, customer_id) - self.all.where(movie_id: movie_id, customer_id: customer_id, check_in: nil).first + self.find_by(movie_id: movie_id, customer_id: customer_id, check_in: nil) end - end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 86c2aa5a9..df8c6857d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -3,13 +3,10 @@ describe CustomersController do describe "index" do it "gets all the customers" do - # Arrange keys = %w(id movies_checked_out_count name phone postal_code registered_at) - # Act get customers_path - # Assert must_respond_with :success response.header['Content-Type'].must_include 'json' diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 70635d7c6..fd55685f0 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,13 +3,10 @@ describe MoviesController do describe "index" do it "gets all the movies" do - # Arrange keys = %w(id release_date title) - # Act get movies_path - # Assert must_respond_with :success response.header['Content-Type'].must_include 'json' @@ -24,14 +21,11 @@ describe "show" do it "can get a movie" do - # Arrange keys = %w(available_inventory id inventory overview release_date title) movie = movies(:LOTR) - # Act get movie_path(movie.id) - # Assert must_respond_with :success response.header['Content-Type'].must_include 'json' @@ -41,7 +35,7 @@ body["id"].must_equal movie.id end - it "yields a not_found status and also return some error text if the movie D.N.E." do + it "returns a not_found status and error text if the movie D.N.E." do movie_id = Movie.last.id + 1 get movie_path(movie_id) @@ -65,7 +59,7 @@ } end - it "Creates a new movie" do + it "creates a new movie" do assert_difference "Movie.count", 1 do post movies_url, params: @movie_data must_respond_with :success @@ -74,12 +68,10 @@ body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "id" - - # Check that the ID matches Movie.find(body["id"]).title.must_equal @movie_data[:title] end - it "Returns an error for an invalid movie" do + it "returns an error for an invalid movie" do bad_data = @movie_data.clone() bad_data.delete(:title) assert_no_difference "Movie.count" do diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7c7e4be1b..27f6bb355 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -9,7 +9,7 @@ } end - it "Creates a new rental" do + it "creates a new rental" do assert_difference "Rental.count", 1 do post check_out_path, params: @rental_data must_respond_with :success @@ -18,12 +18,10 @@ body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "movie_id" - - # Check that the ID matches Rental.find_by(movie_id: body["movie_id"]).movie_id.must_equal movies(:HP).id end - it "Returns an error for an invalid movie ID" do + it "returns an error for an invalid movie ID" do bad_data = @rental_data.clone() bad_data[:movie_id] = Movie.last.id + 1 assert_no_difference "Rental.count" do @@ -37,7 +35,7 @@ body["errors"].must_include "movie_id" end - it "Returns an error if movie is not available" do + it "returns an error if movie is not available" do post check_out_path, params: { movie_id: movies(:LOTR).id, customer_id: customers(:kari).id } movies(:LOTR).available_inventory.must_equal 0 @@ -52,7 +50,31 @@ body["errors"].must_include "available_inventory" end - it "Returns an error for an invalid customer ID" do + it "returns an error if movie is already checked out by that customer" do + assert_no_difference "Rental.count" do + post check_out_path, params: { movie_id: movies(:HP).id, customer_id: customers(:kari).id } + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "movie_id" + end + + it "permits a customer to checkout a previously rented movie if it has been returned" do + assert_difference "Rental.count", 1 do + post check_out_path, params: { movie_id: movies(:HP).id, customer_id: customers(:dan).id } + must_respond_with :success + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "movie_id" + Rental.find_by(movie_id: body["movie_id"]).movie_id.must_equal movies(:HP).id + end + + it "returns an error for an invalid customer ID" do bad_data = @rental_data.clone() bad_data[:customer_id] = Customer.last.id + 1 assert_no_difference "Rental.count" do @@ -84,8 +106,6 @@ body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "movie_id" - - # Check that the ID matches Rental.find_by(movie_id: body["movie_id"]).movie_id.must_equal movies(:LOTR).id end @@ -117,7 +137,7 @@ body["errors"].must_include "rental" end - it "returns an error if the movie is already returned" do + it "returns an error if previously rented movie is already returned" do assert_no_difference "Rental.count" do post check_in_path, params: { movie_id: movies(:HP).id, customer_id: customers(:dan).id } diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 7dbd2777b..e2a981781 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -89,13 +89,13 @@ end describe "available_inventory" do - it "shows that the available inventory is the same as the inventory if movie is not checked out" do + it "shows the available inventory is the same as the inventory if movie is not checked out" do movie = movies(:HP2) movie.available_inventory.must_equal movie.inventory end - it "will decreate the available inventory when the movie is checked out" do + it "will decrement the available inventory if the movie is checked out" do movie = movies(:LOTR) movie.available_inventory.must_equal movie.inventory - 1 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 87892f640..bf4ac1ea1 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -46,40 +46,6 @@ Rental.count.must_equal count_before end - # it "invalid if customer currently has checked out that movie" do - # count_before = Rental.count - # rental_2 = Rental.new( - # movie: movies(:HP), - # customer: customers(:kari), - # check_out: DateTime.now, - # due_date: DateTime.now + 7 - # ) - # - # rental_2.valid?.must_equal false - # - # rental_2.save - # - # rental_2.errors.messages.must_include :movie_id - # rental_2.errors.messages[:movie_id].must_include "Movie has already been checked out by this customer." - # Rental.count.must_equal count_before - # end - # - # it "is allows a customer to checkout a previously rented movie if alreaady returned" do - # count_before = Rental.count - # rental_2 = Rental.new( - # movie: movies(:HP), - # customer: customers(:dan), - # check_out: DateTime.now, - # due_date: DateTime.now + 7 - # ) - # rental_2.valid?.must_equal true - # - # rental_2.save - # - # Rental.count.must_equal count_before + 1 - # - # end - it "is invalid without a customer ID" do count_before = Rental.count @rental.customer_id = nil From d81e303fa66243ffd0de2a89f3170ecc8d4afa5e Mon Sep 17 00:00:00 2001 From: Caroline Nardi Date: Fri, 11 May 2018 13:53:16 -0700 Subject: [PATCH 33/33] Added simplecov to look at test coverage --- .gitignore | 2 ++ Gemfile | 1 + Gemfile.lock | 8 ++++++++ test/test_helper.rb | 8 ++++++++ 4 files changed, 19 insertions(+) diff --git a/.gitignore b/.gitignore index 68ac019ec..f0157e449 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ !/tmp/.keep .byebug_history + +coverage/* diff --git a/Gemfile b/Gemfile index 486ee94ec..5805f6f49 100644 --- a/Gemfile +++ b/Gemfile @@ -50,4 +50,5 @@ group :test do gem 'minitest', '5.10.1' gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index c48b91b02..76c6516ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,12 +45,14 @@ GEM coderay (1.1.2) concurrent-ruby (1.0.5) crass (1.0.4) + docile (1.3.0) erubi (1.7.1) ffi (1.9.23) globalid (0.4.1) activesupport (>= 4.2.0) i18n (1.0.1) concurrent-ruby (~> 1.0) + json (2.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -114,6 +116,11 @@ GEM ffi (>= 0.5.0, < 2) ruby-progressbar (1.9.0) ruby_dep (1.5.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -150,6 +157,7 @@ DEPENDENCIES pry-rails puma (~> 3.7) rails (~> 5.1.6) + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..f5e850bfb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,11 @@ +require 'simplecov' +SimpleCov.start 'rails' do + add_filter '/bin/' + add_filter '/db/' + add_filter '/spec/' + add_filter '/test/' +end + ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help"