From 7f2c133440e376495111c42c8dfb097158f85d00 Mon Sep 17 00:00:00 2001 From: Kiera Date: Mon, 7 May 2018 15:27:25 -0700 Subject: [PATCH 01/29] rails initial setup. --- .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..466d14f77 --- /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: c4b22199943110b0f78908e75221446e187f9db1002924224ff22dad06e766f15d8c91c674e4253a2ca2f2addba0a87bfb1628ce819d4f1712dbabd586579d86 + +test: + secret_key_base: 4d4fb42aa129879d5b53ed188407a69d1b6e80d13d4c4b6c286fa463757fbc38eee53a52143244ad94bf8775182d6605bf063f8e51406a3171724af52351cb68 + +# 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 11e364d24e59aea8d459fc3ce7b46ff4096603ca Mon Sep 17 00:00:00 2001 From: Kiera Date: Mon, 7 May 2018 15:35:29 -0700 Subject: [PATCH 02/29] created customer model --- app/models/customer.rb | 2 ++ db/migrate/20180507223315_create_customers.rb | 15 +++++++++++++++ db/schema.rb | 18 ++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/models/customer_test.rb | 9 +++++++++ 5 files changed, 63 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20180507223315_create_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb 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/db/migrate/20180507223315_create_customers.rb b/db/migrate/20180507223315_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180507223315_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/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..95767c6da --- /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 15:33:15 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 15:33:15 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString 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 From 2e467755ba6b204fe2fc8000250d78963c5a835b Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Mon, 7 May 2018 15:40:05 -0700 Subject: [PATCH 03/29] Added in Movies model, created local database --- app/models/movie.rb | 2 ++ db/migrate/20180507223602_create_movies.rb | 12 +++++++++++ db/schema.rb | 23 +++++++++++++++++++++- test/fixtures/movies.yml | 11 +++++++++++ test/models/movie_test.rb | 9 +++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20180507223602_create_movies.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb 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/db/migrate/20180507223602_create_movies.rb b/db/migrate/20180507223602_create_movies.rb new file mode 100644 index 000000000..1fc656cd4 --- /dev/null +++ b/db/migrate/20180507223602_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 :date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..d02d1210f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,30 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20180507223602) 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 "date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value 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 From 801ab5f5624f2262c8f5dd30a5784ea6ea00f884 Mon Sep 17 00:00:00 2001 From: Kiera Date: Mon, 7 May 2018 16:11:00 -0700 Subject: [PATCH 04/29] generated a movies controller, added validations to the movies model,updated movies table with migrations. --- app/controllers/movies_controller.rb | 6 ++++++ app/models/movie.rb | 4 ++++ config/routes.rb | 2 ++ ...180507224315_add_release_date_column_to_movies_table.rb | 5 +++++ .../20180507230705_remove_date_field_in_movies_table.rb | 5 +++++ db/schema.rb | 4 ++-- test/controllers/movies_controller_test.rb | 7 +++++++ 7 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 app/controllers/movies_controller.rb create mode 100644 db/migrate/20180507224315_add_release_date_column_to_movies_table.rb create mode 100644 db/migrate/20180507230705_remove_date_field_in_movies_table.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..792e9ea00 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,6 @@ +class MoviesController < ApplicationController + + def index + render json: { ready_dinner: 'yaaaasssss'} + end +end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..1f34b4ac4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :inventory, numericality: true + validates :inventory, numericality: {greater_than: 0} + end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..5aafe787f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + get '/movies', to: 'movies#index', as: 'movies' end diff --git a/db/migrate/20180507224315_add_release_date_column_to_movies_table.rb b/db/migrate/20180507224315_add_release_date_column_to_movies_table.rb new file mode 100644 index 000000000..de71a9be2 --- /dev/null +++ b/db/migrate/20180507224315_add_release_date_column_to_movies_table.rb @@ -0,0 +1,5 @@ +class AddReleaseDateColumnToMoviesTable < ActiveRecord::Migration[5.1] + def change + add_column :movies, :release_date, :date + end +end diff --git a/db/migrate/20180507230705_remove_date_field_in_movies_table.rb b/db/migrate/20180507230705_remove_date_field_in_movies_table.rb new file mode 100644 index 000000000..c50b86331 --- /dev/null +++ b/db/migrate/20180507230705_remove_date_field_in_movies_table.rb @@ -0,0 +1,5 @@ +class RemoveDateFieldInMoviesTable < ActiveRecord::Migration[5.1] + def change + remove_column :movies, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index d02d1210f..75fcda323 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: 20180507223602) do +ActiveRecord::Schema.define(version: 20180507230705) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -30,10 +30,10 @@ create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" - t.date "date" t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.date "release_date" 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 From acafe5f4fca0ddfa62c92b22ba3a90506eb37a82 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Mon, 7 May 2018 16:55:01 -0700 Subject: [PATCH 05/29] Model validation testing for Movie --- test/fixtures/movies.yml | 7 +++++-- test/models/movie_test.rb | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..3a1d50b4a 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,11 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +movie_1: { + title: "300", + inventory: 2 + } # column: value # -two: {} +movie_2: {} # column: value diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..fb62402bc 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,40 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + before do + @movie_data = { + title: 'test title', + inventory: 2 + } + end + + it 'is valid with title and an inventory greater then 1' do + movie = Movie.new(@movie_data) + movie.must_be :valid? + end + + it 'is invalid with no name' do + movie = Movie.new(@movie_data) + movie.title = "" + + movie.wont_be :valid? + movie.errors.messages.must_include :title + end + + #REVIEW: Consider test case for a movie with 0 inventory + it 'is invalid with an inventory < 0' do + movie = Movie.new(@movie_data) + movie.inventory = -1 + + movie.wont_be :valid? + movie.errors.messages.must_include :inventory + end + + it 'is invalid with a non-numerical inventory' do + movie = Movie.new(@movie_data) + movie.inventory = "Aaaa" - it "must be valid" do - value(movie).must_be :valid? + movie.wont_be :valid? + movie.errors.messages.must_include :inventory end end From 083bcee0919f9c3b10a68e2b7c787959d84eabbe Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Tue, 8 May 2018 09:45:23 -0700 Subject: [PATCH 06/29] Added for model validation tests --- test/models/movie_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index fb62402bc..443f4ada2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -36,5 +36,6 @@ movie.wont_be :valid? movie.errors.messages.must_include :inventory + end end From 0b8a18358671cfcac8c18b25ce2265e1d944643e Mon Sep 17 00:00:00 2001 From: Kiera Date: Tue, 8 May 2018 10:04:55 -0700 Subject: [PATCH 07/29] created tests for customer model validations. Tests are passing. --- app/models/customer.rb | 3 +++ test/models/customer_test.rb | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..4fc46ff79 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,5 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :phone, presence: true + validates :phone, length: { is: 10 } end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..739cbb4ab 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,39 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + before do + @customer_data = { + name: 'tester', + phone: '0000000000' + } + @customer = Customer.new(@customer_data) + end + + it "is valid with a name and phone number length of 10" do - it "must be valid" do - value(customer).must_be :valid? + @customer.must_be :valid? end + + it "is invalid with no name" do + @customer.name = nil + + @customer.wont_be :valid? + @customer.errors.messages.must_include :name + end + + it "is invalid with no phone number" do + @customer.phone = nil + + @customer.wont_be :valid? + @customer.errors.messages.must_include :phone + end + + it "is invalid with a phone number less than 10 char" do + @customer.phone = '3' + @customer.wont_be :valid? + @customer.errors.messages.must_include :phone + end + + + end From 4db1e2b7d6fd46c8a7672dee4de23a0df34bcbec Mon Sep 17 00:00:00 2001 From: Kiera Date: Tue, 8 May 2018 10:48:44 -0700 Subject: [PATCH 08/29] Added index method to controller, created test to evaluate functionality of index method. --- app/controllers/movies_controller.rb | 3 +- config/routes.rb | 2 ++ test/controllers/movies_controller_test.rb | 34 ++++++++++++++++++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 792e9ea00..d49c52f97 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,7 @@ class MoviesController < ApplicationController def index - render json: { ready_dinner: 'yaaaasssss'} + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :overview, :inventory, :release_date]), status: :ok end end diff --git a/config/routes.rb b/config/routes.rb index 5aafe787f..04ece321b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/movies', to: 'movies#index', as: 'movies' + get '/movies/:id', to: 'movies#show', as: 'movie' + post '/movies', to: 'movies#create', as: 'add_movie' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..00ce7c79e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,35 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'index' do + it "it is a real route" do + get movies_path + + must_respond_with :success + end + + it "returns json" do + get movies_path + + response.header['Content-type'].must_include 'json' + end + + it "returns all the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns the movies with all required fields" do + keys = %w(id inventory overview release_date title) + + get movies_path + + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end end From 80d73368377994769856a57279369d879fba489d Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Tue, 8 May 2018 11:23:42 -0700 Subject: [PATCH 09/29] Movies Controller action Show with associated tests --- app/controllers/movies_controller.rb | 13 +++++++++++ test/controllers/movies_controller_test.rb | 26 ++++++++++++++++++++++ test/fixtures/movies.yml | 5 ++++- test/models/movie_test.rb | 2 +- 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d49c52f97..ca098428a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,4 +4,17 @@ def index movies = Movie.all render json: movies.as_json(only: [:id, :title, :overview, :inventory, :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, :inventory, :release_date], status: :ok) + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 00ce7c79e..3e4ecc6ac 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,4 +32,30 @@ end end end + + describe 'show' do + it 'can get a movie' do + keys = %w(id inventory overview release_date title) + + movie = movies(:movie_1) + + get movie_path(movie.id) + + must_respond_with :success + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + body['id'].must_equal movie.id + end + + it 'returns not found if the movie DNE' do + movie_id = Movie.last.id + 1 + get movie_path(movie_id) + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_include 'errors' + body['errors'].must_include 'id' + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 3a1d50b4a..9d5f66859 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -10,5 +10,8 @@ movie_1: { } # column: value # -movie_2: {} +movie_2: { + title: 'Some Like It Hot', + inventory: 5 + } # column: value diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 443f4ada2..fb2a7ce3b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -13,7 +13,7 @@ movie.must_be :valid? end - it 'is invalid with no name' do + it 'is invalid with no title' do movie = Movie.new(@movie_data) movie.title = "" From 5d3ff7aa2678cfe7acc48535634012523c4c5612 Mon Sep 17 00:00:00 2001 From: Kiera Date: Tue, 8 May 2018 11:51:56 -0700 Subject: [PATCH 10/29] completed movie show controller method and tests are passing. --- app/controllers/movies_controller.rb | 16 ++++++++++ test/controllers/movies_controller_test.rb | 36 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ca098428a..ca6f77427 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,4 +17,20 @@ def show render json: movie.as_json(only: [:id, :title, :overview, :inventory, :release_date], 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, :inventory, :release_date) + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3e4ecc6ac..3aba9bf3a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -58,4 +58,40 @@ body['errors'].must_include 'id' end end + + describe 'create' do + before do + @movie_data = { + title: "whatever you want", + inventory: 3 + } + end + + it "can create a new movie" do + before_movie_count = Movie.count + + post movies_path, params: { movie: @movie_data } + + must_respond_with :success + Movie.count.must_equal before_movie_count + 1 + + body = JSON.parse(response.body) + body.must_include "id" + 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_path, params: { movie: bad_data } + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_include "errors" + body['errors'].must_include 'title' + end + end end From 5d3fb0135dbd45397d56091a7807cdee00177ae0 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Tue, 8 May 2018 12:07:36 -0700 Subject: [PATCH 11/29] Added in Customer routes, Customer Controller actions, Customer Controller tests --- app/controllers/customers_controller.rb | 7 ++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 35 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..0908330eb --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + + render json: customers.as_json(only: [:id, :address, :city, :name, :phone, :postal_code, :registered_at]) + end +end diff --git a/config/routes.rb b/config/routes.rb index 04ece321b..23436ee72 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,6 @@ get '/movies', to: 'movies#index', as: 'movies' get '/movies/:id', to: 'movies#show', as: 'movie' post '/movies', to: 'movies#create', as: 'add_movie' + + get '/customers', to: 'customers#index', as: 'customers' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..b00178929 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,35 @@ +require "test_helper" + +describe CustomersController do + describe 'index' do + it 'is a real route' do + get customers_path + + must_respond_with :success + end + + it 'returns json' do + get customers_path + + response.header['Content-Type'].must_include 'json' + end + + it 'returns all customers' do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it 'returns customers with all required fields' do + keys = %w(address city id name phone postal_code registered_at) + + get customers_path + + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end +end From 5c8ffd3bd9d1dd63ed855556793d594a4152fdff Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Tue, 8 May 2018 14:00:59 -0700 Subject: [PATCH 12/29] Fixed minor seed database issues --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- test/models/customer_test.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 4fc46ff79..5cb84e6bd 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord validates :name, presence: true validates :phone, presence: true - validates :phone, length: { is: 10 } + validates :phone, length: { is: 14 } end diff --git a/app/models/movie.rb b/app/models/movie.rb index 1f34b4ac4..86f8ff854 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, numericality: true - validates :inventory, numericality: {greater_than: 0} + validates :inventory, numericality: {greater_than_or_equal_to: 0} end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 739cbb4ab..fe77de6d7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,12 +4,12 @@ before do @customer_data = { name: 'tester', - phone: '0000000000' + phone: '(000) 000-0000' } @customer = Customer.new(@customer_data) end - it "is valid with a name and phone number length of 10" do + it "is valid with a name and phone number length of 14" do @customer.must_be :valid? end @@ -28,7 +28,7 @@ @customer.errors.messages.must_include :phone end - it "is invalid with a phone number less than 10 char" do + it "is invalid with a phone number less than 14 char" do @customer.phone = '3' @customer.wont_be :valid? @customer.errors.messages.must_include :phone From c9e071d87a1ebad68ba2bcdd55e9dd9c8603dd37 Mon Sep 17 00:00:00 2001 From: Kiera Date: Tue, 8 May 2018 14:25:48 -0700 Subject: [PATCH 13/29] updated create movie method and movie_params method removed :movie. --- 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 ca6f77427..a344c628f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -21,7 +21,7 @@ def show def create movie = Movie.new(movie_params) if movie.save - render json: { id: movie.id }, status: :created + render json: { id: movie.id }, status: :ok else render json: { errors: movie.errors.messages @@ -31,6 +31,6 @@ def create private def movie_params - return params.require(:movie).permit(:title, :overview, :inventory, :release_date) + return params.permit(:title, :overview, :inventory, :release_date) end end From 1bda46d045f5fcbe1975fd9102cd93dfa243a299 Mon Sep 17 00:00:00 2001 From: Kiera Date: Tue, 8 May 2018 14:51:56 -0700 Subject: [PATCH 14/29] create rental model. add movie and customer foreign keys. --- app/models/rental.rb | 2 ++ db/migrate/20180508214607_create_rentals.rb | 10 ++++++++++ ...8214734_add_movie_and_customer_foriegn_keys.rb | 6 ++++++ db/schema.rb | 15 ++++++++++++++- test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180508214607_create_rentals.rb create mode 100644 db/migrate/20180508214734_add_movie_and_customer_foriegn_keys.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb 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/20180508214607_create_rentals.rb b/db/migrate/20180508214607_create_rentals.rb new file mode 100644 index 000000000..92a30efed --- /dev/null +++ b/db/migrate/20180508214607_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.date :checkout + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20180508214734_add_movie_and_customer_foriegn_keys.rb b/db/migrate/20180508214734_add_movie_and_customer_foriegn_keys.rb new file mode 100644 index 000000000..3f0511b11 --- /dev/null +++ b/db/migrate/20180508214734_add_movie_and_customer_foriegn_keys.rb @@ -0,0 +1,6 @@ +class AddMovieAndCustomerForiegnKeys < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 75fcda323..c17e66068 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: 20180507230705) do +ActiveRecord::Schema.define(version: 20180508214734) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,17 @@ t.date "release_date" end + create_table "rentals", force: :cascade do |t| + t.date "checkout" + t.date "due_date" + 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 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..1aaac3437 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout: 2018-05-08 + due_date: 2018-05-08 + +two: + checkout: 2018-05-08 + due_date: 2018-05-08 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 c2c895545dbd0b7eb8d91f952d15d3810c7f6ee2 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Tue, 8 May 2018 15:46:47 -0700 Subject: [PATCH 15/29] Fixed Movie Create test and action --- app/models/rental.rb | 1 + test/controllers/movies_controller_test.rb | 8 +++--- test/fixtures/customers.yml | 4 +-- test/models/rental_test.rb | 30 +++++++++++++++++++--- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..068498b4a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,3 @@ class Rental < ApplicationRecord + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3aba9bf3a..346bba058 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'pry' describe MoviesController do describe 'index' do @@ -70,9 +71,8 @@ it "can create a new movie" do before_movie_count = Movie.count - post movies_path, params: { movie: @movie_data } - - must_respond_with :success + post movies_path, params: @movie_data + assert_response :success Movie.count.must_equal before_movie_count + 1 body = JSON.parse(response.body) @@ -85,7 +85,7 @@ bad_data.delete(:title) assert_no_difference "Movie.count" do - post movies_path, params: { movie: bad_data } + post movies_path, params: bad_data assert_response :bad_request end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 95767c6da..b5aeeb642 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: Dan registered_at: 2018-05-07 15:33:15 address: MyString city: MyString @@ -10,7 +10,7 @@ one: phone: MyString two: - name: MyString + name: Dee registered_at: 2018-05-07 15:33:15 address: MyString city: MyString diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..c8df3b649 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,33 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + before do + date = Date.today + @rental_data = { + check_out: date, + due_date: date + 7, + customer_id: Customer.first.id, + movie_id: Movie.first.id + } + end + + it 'can be created with all valid information' do + skip + end + + it 'cannot be created without customer_id' do + skip + end + + it 'cannot be created without movie_id' do + skip + end + + it 'cannot be created without check_out date' do + skip + end - it "must be valid" do - value(rental).must_be :valid? + it 'cannot be created without due_date' do + skip end end From 9a5a63f620740b972bad5ab6a35baa96e5aafd92 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Tue, 8 May 2018 16:28:24 -0700 Subject: [PATCH 16/29] Added Model Validations Tests for Rental Model --- Gemfile | 2 ++ Gemfile.lock | 2 ++ app/models/rental.rb | 5 ++++- test/models/rental_test.rb | 42 ++++++++++++++++++++++++++++++++------ 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 78bff8d26..523c0e986 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_date_time' # 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 e547d2449..e2c11a506 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,6 +130,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) + validates_date_time (1.0.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -149,6 +150,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + validates_date_time BUNDLED WITH 1.16.1 diff --git a/app/models/rental.rb b/app/models/rental.rb index 068498b4a..72a9872f6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,3 +1,6 @@ class Rental < ApplicationRecord - + validates :checkout, presence: true + validates :due_date, presence: true + validates :customer_id, presence: true + validates :movie_id, presence: true end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c8df3b649..f437a2ba1 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,10 +1,11 @@ require "test_helper" +require 'pry' describe Rental do before do date = Date.today @rental_data = { - check_out: date, + checkout: date, due_date: date + 7, customer_id: Customer.first.id, movie_id: Movie.first.id @@ -12,22 +13,51 @@ end it 'can be created with all valid information' do - skip + rental = Rental.new(@rental_data) + # binding.pry + rental.checkout.must_be_kind_of Date + rental.due_date.must_be_kind_of Date + rental.must_be :valid? end it 'cannot be created without customer_id' do - skip + rental = Rental.new(@rental_data) + rental.customer_id = nil + + rental.wont_be :valid? + rental.errors.messages.must_include :customer_id end it 'cannot be created without movie_id' do - skip + rental = Rental.new(@rental_data) + rental.movie_id = nil + + rental.wont_be :valid? + rental.errors.messages.must_include :movie_id end it 'cannot be created without check_out date' do - skip + rental = Rental.new(@rental_data) + rental.checkout = nil + + rental.wont_be :valid? + rental.errors.messages.must_include :checkout end it 'cannot be created without due_date' do - skip + rental = Rental.new(@rental_data) + rental.due_date = nil + + rental.wont_be :valid? + rental.errors.messages.must_include :due_date + end + + it 'cannot be created with a checkout date not in the date format' do + rental = Rental.new(@rental_data) + rental.checkout = "" + + rental.checkout.wont_be_kind_of Date + rental.wont_be :valid? + rental.errors.messages.must_include :checkout end end From 32cd0ff72b9848ecb52dcc10ce43fc3ab26d72e0 Mon Sep 17 00:00:00 2001 From: Kiera Date: Tue, 8 May 2018 16:59:19 -0700 Subject: [PATCH 17/29] Added relationships to models. --- app/models/customer.rb | 3 + app/models/movie.rb | 3 + app/models/rental.rb | 3 + test/models/customer_test.rb | 39 +++++++------ test/models/movie_test.rb | 50 +++++++++------- test/models/rental_test.rb | 107 ++++++++++++++++++++--------------- 6 files changed, 121 insertions(+), 84 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 5cb84e6bd..8881b695b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,7 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals + validates :name, presence: true validates :phone, presence: true validates :phone, length: { is: 14 } diff --git a/app/models/movie.rb b/app/models/movie.rb index 86f8ff854..75616ec9a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals + validates :title, presence: true validates :inventory, numericality: true validates :inventory, numericality: {greater_than_or_equal_to: 0} diff --git a/app/models/rental.rb b/app/models/rental.rb index 72a9872f6..a56fbd488 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord + belongs_to :movies + belongs_to :customers + validates :checkout, presence: true validates :due_date, presence: true validates :customer_id, presence: true diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index fe77de6d7..244bf1c3e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,31 +9,36 @@ @customer = Customer.new(@customer_data) end - it "is valid with a name and phone number length of 14" do + describe 'validations' do + it "is valid with a name and phone number length of 14" do - @customer.must_be :valid? - end + @customer.must_be :valid? + end - it "is invalid with no name" do - @customer.name = nil + it "is invalid with no name" do + @customer.name = nil - @customer.wont_be :valid? - @customer.errors.messages.must_include :name - end + @customer.wont_be :valid? + @customer.errors.messages.must_include :name + end - it "is invalid with no phone number" do - @customer.phone = nil + it "is invalid with no phone number" do + @customer.phone = nil - @customer.wont_be :valid? - @customer.errors.messages.must_include :phone - end + @customer.wont_be :valid? + @customer.errors.messages.must_include :phone + end - it "is invalid with a phone number less than 14 char" do - @customer.phone = '3' - @customer.wont_be :valid? - @customer.errors.messages.must_include :phone + it "is invalid with a phone number less than 14 char" do + @customer.phone = '3' + @customer.wont_be :valid? + @customer.errors.messages.must_include :phone + end end + describe 'relations' do + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index fb2a7ce3b..e58ebea42 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -8,34 +8,40 @@ } end - it 'is valid with title and an inventory greater then 1' do - movie = Movie.new(@movie_data) - movie.must_be :valid? - end + describe 'validations' do + it 'is valid with title and an inventory greater then 1' do + movie = Movie.new(@movie_data) + movie.must_be :valid? + end - it 'is invalid with no title' do - movie = Movie.new(@movie_data) - movie.title = "" + it 'is invalid with no title' do + movie = Movie.new(@movie_data) + movie.title = "" - movie.wont_be :valid? - movie.errors.messages.must_include :title - end + movie.wont_be :valid? + movie.errors.messages.must_include :title + end - #REVIEW: Consider test case for a movie with 0 inventory - it 'is invalid with an inventory < 0' do - movie = Movie.new(@movie_data) - movie.inventory = -1 + #REVIEW: Consider test case for a movie with 0 inventory + it 'is invalid with an inventory < 0' do + movie = Movie.new(@movie_data) + movie.inventory = -1 - movie.wont_be :valid? - movie.errors.messages.must_include :inventory - end + movie.wont_be :valid? + movie.errors.messages.must_include :inventory + end - it 'is invalid with a non-numerical inventory' do - movie = Movie.new(@movie_data) - movie.inventory = "Aaaa" + it 'is invalid with a non-numerical inventory' do + movie = Movie.new(@movie_data) + movie.inventory = "Aaaa" - movie.wont_be :valid? - movie.errors.messages.must_include :inventory + movie.wont_be :valid? + movie.errors.messages.must_include :inventory + + end + end + + describe 'relations' do end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index f437a2ba1..fc88d95df 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,62 +2,79 @@ require 'pry' describe Rental do - before do - date = Date.today - @rental_data = { - checkout: date, - due_date: date + 7, - customer_id: Customer.first.id, - movie_id: Movie.first.id - } - end - it 'can be created with all valid information' do - rental = Rental.new(@rental_data) - # binding.pry - rental.checkout.must_be_kind_of Date - rental.due_date.must_be_kind_of Date - rental.must_be :valid? - end + describe 'validations' do + before do + customer = Customer.first + movie = Movie.first + date = Date.today + + @rental_data = { + checkout: date, + due_date: date + 7, + customer_id: customer.id, + movie_id: movie.id + } + end - it 'cannot be created without customer_id' do - rental = Rental.new(@rental_data) - rental.customer_id = nil + it 'can be created with all valid information' do + rental = Rental.new(@rental_data) + # binding.pry + rental.checkout.must_be_kind_of Date + rental.due_date.must_be_kind_of Date + rental.must_be :valid? + end - rental.wont_be :valid? - rental.errors.messages.must_include :customer_id - end + it 'cannot be created without customer_id' do + rental = Rental.new(@rental_data) + rental.customer_id = nil - it 'cannot be created without movie_id' do - rental = Rental.new(@rental_data) - rental.movie_id = nil + rental.wont_be :valid? + rental.errors.messages.must_include :customer_id + end - rental.wont_be :valid? - rental.errors.messages.must_include :movie_id - end + it 'cannot be created without movie_id' do + rental = Rental.new(@rental_data) + rental.movie_id = nil - it 'cannot be created without check_out date' do - rental = Rental.new(@rental_data) - rental.checkout = nil + rental.wont_be :valid? + rental.errors.messages.must_include :movie_id + end - rental.wont_be :valid? - rental.errors.messages.must_include :checkout - end + it 'cannot be created without check_out date' do + rental = Rental.new(@rental_data) + rental.checkout = nil - it 'cannot be created without due_date' do - rental = Rental.new(@rental_data) - rental.due_date = nil + rental.wont_be :valid? + rental.errors.messages.must_include :checkout + end - rental.wont_be :valid? - rental.errors.messages.must_include :due_date + it 'cannot be created without due_date' do + rental = Rental.new(@rental_data) + rental.due_date = nil + + rental.wont_be :valid? + rental.errors.messages.must_include :due_date + end + + it 'cannot be created with a checkout date not in the date format' do + rental = Rental.new(@rental_data) + rental.checkout = "" + + rental.checkout.wont_be_kind_of Date + rental.wont_be :valid? + rental.errors.messages.must_include :checkout + end end - it 'cannot be created with a checkout date not in the date format' do - rental = Rental.new(@rental_data) - rental.checkout = "" + describe 'relations' do + it "associates the correct customer with customer_id" do + skip + rental = Rental.new(@rental_data) + customer = Customer.first + + rental.customer.name.must_equal customer.name + end - rental.checkout.wont_be_kind_of Date - rental.wont_be :valid? - rental.errors.messages.must_include :checkout end end From 6499f5ac70ed365d8efa3114ee056f881e8f0eb8 Mon Sep 17 00:00:00 2001 From: Kiera Date: Wed, 9 May 2018 09:35:16 -0700 Subject: [PATCH 18/29] All validations are passing. --- app/models/rental.rb | 4 ++-- test/models/rental_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index a56fbd488..404686819 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,6 @@ class Rental < ApplicationRecord - belongs_to :movies - belongs_to :customers + belongs_to :movie + belongs_to :customer validates :checkout, presence: true validates :due_date, presence: true diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index fc88d95df..37ea45655 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -8,7 +8,7 @@ customer = Customer.first movie = Movie.first date = Date.today - + @rental_data = { checkout: date, due_date: date + 7, @@ -22,7 +22,7 @@ # binding.pry rental.checkout.must_be_kind_of Date rental.due_date.must_be_kind_of Date - rental.must_be :valid? + rental.must_be :valid?, rental.errors.messages end it 'cannot be created without customer_id' do From bbb8791ab0071a48fd120674fec5bb85831231a8 Mon Sep 17 00:00:00 2001 From: Kiera Date: Wed, 9 May 2018 09:46:01 -0700 Subject: [PATCH 19/29] completed rental relationship tests. --- test/models/rental_test.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 37ea45655..a237ffb40 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -68,12 +68,16 @@ end describe 'relations' do - it "associates the correct customer with customer_id" do - skip - rental = Rental.new(@rental_data) + it "associates the correct customer and moveie with customer_id and movie_id" do customer = Customer.first + movie = Movie.first + + rental = Rental.new(@rental_data) + rental.customer = customer + rental.movie = movie - rental.customer.name.must_equal customer.name + rental.customer_id.must_equal customer.id + rental.movie_id.must_equal movie.id end end From 2b0db9465de2ea03559917447c97df4efbfc55e4 Mon Sep 17 00:00:00 2001 From: Kiera Date: Wed, 9 May 2018 10:34:17 -0700 Subject: [PATCH 20/29] completed the model relations tests for movie, customer, and rental. --- test/models/customer_test.rb | 26 ++++++++++++++++++++++++ test/models/movie_test.rb | 30 ++++++++++++++++++++++++++- test/models/rental_test.rb | 39 ++++++++++++++++++++++++------------ 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 244bf1c3e..febf503f5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -37,7 +37,33 @@ end describe 'relations' do + it "associate correct rental with customer" do + #Arrange + date = Date.today + rental = Rental.new( + checkout: date, + due_date: date + 7, + customer_id: @customer.id, + movie_id: Movie.first.id + ) + #Assert + rental.customer_id.must_equal @customer.id + end + + it "is invalid if customer DNE" do + date = Date.today + rental = Rental.new( + checkout: date, + due_date: date + 7, + customer_id: Customer.last.id + 1, + movie_id: Movie.first.id + ) + + #Assert + rental.wont_be :valid? + rental.errors.messages.must_include :customer + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e58ebea42..95e86697f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -6,6 +6,7 @@ title: 'test title', inventory: 2 } + @movie = Movie.new(@movie_data) end describe 'validations' do @@ -40,8 +41,35 @@ end end - + describe 'relations' do + it "associates correct rental with movie" do + + date = Date.today + rental = Rental.new( + checkout: date, + due_date: date + 7, + customer_id: Customer.first.id, + movie_id: @movie.id + ) + + #Assert + rental.movie_id.must_equal @movie.id + end + it "is invalid if movie DNE" do + date = Date.today + rental = Rental.new( + checkout: date, + due_date: date + 7, + customer_id: Customer.first.id, + movie_id: Movie.last.id + 1 + ) + + #Assert + rental.wont_be :valid? + rental.errors.messages.must_include :movie + end end + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a237ffb40..0b7eae386 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,20 +2,20 @@ require 'pry' describe Rental do + before do + customer = Customer.first + movie = Movie.first + date = Date.today + + @rental_data = { + checkout: date, + due_date: date + 7, + customer_id: customer.id, + movie_id: movie.id + } + end describe 'validations' do - before do - customer = Customer.first - movie = Movie.first - date = Date.today - - @rental_data = { - checkout: date, - due_date: date + 7, - customer_id: customer.id, - movie_id: movie.id - } - end it 'can be created with all valid information' do rental = Rental.new(@rental_data) @@ -68,7 +68,7 @@ end describe 'relations' do - it "associates the correct customer and moveie with customer_id and movie_id" do + it "associates the correct customer and movie with customer_id and movie_id" do customer = Customer.first movie = Movie.first @@ -80,5 +80,18 @@ rental.movie_id.must_equal movie.id end + it "is invalid if movie DNE" do + # binding.pry + @rental_data[:customer_id] = Customer.last.id + 1 + @rental_data[:movie_id] = Movie.last.id + 1 + + rental = Rental.new(@rental_data) + + + rental.wont_be :valid? + rental.errors.messages.must_include :movie + rental.errors.messages.must_include :customer + end + end end From 3c0a3d2ec782ccd53beec66c2fb271c03d5491e5 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Wed, 9 May 2018 10:54:44 -0700 Subject: [PATCH 21/29] Added skeleton framework for checkin and checkout controller action tests --- app/controllers/rentals_controller.rb | 2 + config/routes.rb | 3 ++ test/controllers/rentals_controller_test.rb | 47 +++++++++++++++++++++ test/models/rental_test.rb | 2 - 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index 23436ee72..b43e67f00 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,4 +6,7 @@ post '/movies', to: 'movies#create', as: 'add_movie' get '/customers', to: 'customers#index', as: 'customers' + + post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..b79ccac29 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,47 @@ +require "test_helper" + +describe RentalsController do + describe 'checkout' do + it 'is real route' do + skip + end + + it 'can checkout a movie' do + skip + end + + it 'assigns a checkout date' do + skip + end + + it 'changes the due date to 7 days from the checkout date' do + skip + end + + it 'changes inventory of movie with creation of a new checkout' do + skip + end + + it 'throws an error if inventory of movie is 0 and someone tries to checkout' do + skip + end + end + + describe 'checkin' do + it 'is real route' do + skip + end + + it 'can checkin a movie' do + skip + end + + it 'changes the inventory of movie when it is checked in' do + skip + end + + it 'throws an error if a movie is not checked out and you attempt a checkin' do + skip + end + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 0b7eae386..51071b0fe 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -19,7 +19,6 @@ it 'can be created with all valid information' do rental = Rental.new(@rental_data) - # binding.pry rental.checkout.must_be_kind_of Date rental.due_date.must_be_kind_of Date rental.must_be :valid?, rental.errors.messages @@ -81,7 +80,6 @@ end it "is invalid if movie DNE" do - # binding.pry @rental_data[:customer_id] = Customer.last.id + 1 @rental_data[:movie_id] = Movie.last.id + 1 From 6e37985b3083a12394d955c7d4531cd98812876e Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Wed, 9 May 2018 14:46:05 -0700 Subject: [PATCH 22/29] Implemented first test in Checkout action for Rentals Controller --- app/controllers/rentals_controller.rb | 28 ++++++++ test/controllers/rentals_controller_test.rb | 74 ++++++++++++++------- 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..b0b682c72 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,30 @@ class RentalsController < ApplicationController + + def checkout + movie_id = params[:movie_id] + customer_id = params[:customer_id] + + date = Date.today + rental_params = { + checkout: nil, + due_date: nil, + customer_id: customer_id, + movie_id: movie_id + } + + movie = Movie.find_by(id: movie_id) + customer = Customer.find_by(id: customer_id) + + new_rental = Rental.new(rental_params) + new_rental[:checkout] = date + new_rental[:due_date] = date + 7 + + if new_rental.save + render json: { id: new_rental.id}, status: :ok + # movie_inventory = Movie.find_by(movie_id).inventory + # movie_inventory -= 1 + else + render json: { errors: new_rental.errors.messages }, status: :bad_request + end + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b79ccac29..ba127a175 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,47 +1,73 @@ require "test_helper" describe RentalsController do + before do + movie = Movie.first + customer = Customer.first + @date = Date.today + + @rental_data = { + checkout: nil, + due_date: nil, + customer_id: customer.id, + movie_id: movie.id + } + + end + describe 'checkout' do it 'is real route' do - skip + post checkout_path, params: @rental_data + + must_respond_with :success end it 'can checkout a movie' do - skip - end + before_count = Rental.count - it 'assigns a checkout date' do - skip - end + # Act + post checkout_path, params: @rental_data - it 'changes the due date to 7 days from the checkout date' do - skip - end + assert_response :success + Rental.count.must_equal before_count + 1 - it 'changes inventory of movie with creation of a new checkout' do - skip - end + body = JSON.parse(response.body) + body.must_include "id" + new_rental = Rental.find(body["id"]) - it 'throws an error if inventory of movie is 0 and someone tries to checkout' do - skip - end - end + new_rental.customer_id.must_equal @rental_data[:customer_id] - describe 'checkin' do - it 'is real route' do - skip - end + new_rental.movie_id.must_equal @rental_data[:movie_id] - it 'can checkin a movie' do - skip + new_rental.checkout.must_equal @date + + new_rental.due_date.must_equal @date + 7 end - it 'changes the inventory of movie when it is checked in' do + it 'changes inventory of movie with creation of a new checkout' do skip end - it 'throws an error if a movie is not checked out and you attempt a checkin' do + it 'throws an error if inventory of movie is 0 and someone tries to checkout' do skip end end + + # describe 'checkin' do + # it 'is real route' do + # skip + # end + # + # it 'can checkin a movie' do + # skip + # end + # + # it 'changes the inventory of movie when it is checked in' do + # skip + # end + # + # it 'throws an error if a movie is not checked out and you attempt a checkin' do + # skip + # end + # end end From c391644e70ded4f1a3a7020fbe4911207b6a7c66 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Wed, 9 May 2018 15:05:47 -0700 Subject: [PATCH 23/29] Updated Checkout to include inventory alterations --- app/controllers/rentals_controller.rb | 3 +++ test/controllers/rentals_controller_test.rb | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b0b682c72..9b12c558e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,3 +1,4 @@ +require 'pry' class RentalsController < ApplicationController def checkout @@ -18,8 +19,10 @@ def checkout new_rental = Rental.new(rental_params) new_rental[:checkout] = date new_rental[:due_date] = date + 7 + movie[:inventory] -= 1 if new_rental.save + movie.save render json: { id: new_rental.id}, status: :ok # movie_inventory = Movie.find_by(movie_id).inventory # movie_inventory -= 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ba127a175..7bf65b42c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,7 +2,7 @@ describe RentalsController do before do - movie = Movie.first + @movie = Movie.first customer = Customer.first @date = Date.today @@ -10,7 +10,7 @@ checkout: nil, due_date: nil, customer_id: customer.id, - movie_id: movie.id + movie_id: @movie.id } end @@ -22,8 +22,15 @@ must_respond_with :success end - it 'can checkout a movie' do + it 'returns json' do + post checkout_path, params: @rental_data + + response.header['Content-Type'].must_include 'json' + end + + it 'can checkout a movie and updates inventory' do before_count = Rental.count + before_inventory_count = @movie.inventory # Act post checkout_path, params: @rental_data @@ -42,10 +49,8 @@ new_rental.checkout.must_equal @date new_rental.due_date.must_equal @date + 7 - end - - it 'changes inventory of movie with creation of a new checkout' do - skip + @movie.reload + @movie.inventory.must_equal before_inventory_count - 1 end it 'throws an error if inventory of movie is 0 and someone tries to checkout' do From 900eeb54c4456d7a7a9773686a36ef9b75a8f241 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Wed, 9 May 2018 15:30:50 -0700 Subject: [PATCH 24/29] Checkout action in Rentals Controller complete. Tests complete too. --- app/controllers/rentals_controller.rb | 14 ++++++++++---- test/controllers/rentals_controller_test.rb | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9b12c558e..4896ef00b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -16,18 +16,24 @@ def checkout movie = Movie.find_by(id: movie_id) customer = Customer.find_by(id: customer_id) + if movie[:inventory] == 0 + render json: { + errors: { + inventory: ["Movie is currently all checked out. Sorry."] + } + } , status: :bad_request + return + end + new_rental = Rental.new(rental_params) new_rental[:checkout] = date new_rental[:due_date] = date + 7 movie[:inventory] -= 1 - if new_rental.save movie.save render json: { id: new_rental.id}, status: :ok - # movie_inventory = Movie.find_by(movie_id).inventory - # movie_inventory -= 1 else - render json: { errors: new_rental.errors.messages }, status: :bad_request + render json: { errors: new_rental.errors.messages }, status: :bad_request end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7bf65b42c..d912fb2a7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -54,7 +54,22 @@ end it 'throws an error if inventory of movie is 0 and someone tries to checkout' do - skip + before_count = Rental.count + @movie.inventory = 0 + @movie.save + + # binding.pry + + assert_no_difference "Rental.count" do + post checkout_path, params: @rental_data + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_include "errors" + body['errors'].must_include 'inventory' + + @movie.inventory.must_equal 0 end end From efefc9ea1070693c6d5dda83c8ffdc569103fb45 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Fri, 11 May 2018 14:24:03 -0700 Subject: [PATCH 25/29] Currently only two tests not passing, working on those tests now --- app/controllers/rentals_controller.rb | 28 ++++++++- test/controllers/rentals_controller_test.rb | 70 +++++++++++++++------ 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4896ef00b..d6365c283 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,7 +24,7 @@ def checkout } , status: :bad_request return end - + new_rental = Rental.new(rental_params) new_rental[:checkout] = date new_rental[:due_date] = date + 7 @@ -36,4 +36,30 @@ def checkout render json: { errors: new_rental.errors.messages }, status: :bad_request end end + + def checkin + rental = Rental.find_by(params[:id]) + + if rental[:checkout].nil? || rental[:due_date].nil? + render json: { + errors: { + checkout: ["Movie has not been checked out."], + due_date: ["Movie has not been checked out."] + } + }, status: :bad_request + return + end + movie = Movie.find_by(rental.movie_id) + movie[:inventory] += 1 + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { errors: movie.errors.messages }, status: :bad_request + end + end + + private + def rental_params + return params.permit(:checkout, :due_date, :customer_id, :movie_id) + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d912fb2a7..95c0757bc 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -58,8 +58,6 @@ @movie.inventory = 0 @movie.save - # binding.pry - assert_no_difference "Rental.count" do post checkout_path, params: @rental_data assert_response :bad_request @@ -73,21 +71,55 @@ end end - # describe 'checkin' do - # it 'is real route' do - # skip - # end - # - # it 'can checkin a movie' do - # skip - # end - # - # it 'changes the inventory of movie when it is checked in' do - # skip - # end - # - # it 'throws an error if a movie is not checked out and you attempt a checkin' do - # skip - # end - # end + describe 'checkin' do + it 'is real route' do + post checkout_path, params: @rental_data + assert_response :success + + post checkin_path, params: @rental_data + + must_respond_with :success + end + + it 'renders json' do + post checkin_path, params: @rental_data + + response.header['Content-Type'].must_include 'json' + end + + it 'can checkin a movie and changes the inventory when checked in' do + before_inventory_count = @movie.inventory + before_count = Rental.count + + post checkout_path, params: @rental_data + assert_response :success + Rental.count.must_equal before_count + 1 + + post checkin_path, params: @rental_data + assert_response :success + + @movie.reload + # binding.pry + @movie.inventory.must_equal before_inventory_count + 1 + end + + it 'throws an error if a movie is not checked out and you attempt a checkin' do + before_inventory_count = @movie.inventory + + post checkin_path, params: @rental_data + assert_response :success + + @movie.reload + + assert_no_difference "#{@movie.inventory}" do + post checkin_path, params: @rental_data + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_include "errors" + body['errors'].must_include 'checkout' + body['errors'].must_include 'due_date' + end + end end From 930bc59e359bbdddc240d3de99b564fe0b83af6f Mon Sep 17 00:00:00 2001 From: Kiera Date: Fri, 11 May 2018 14:42:06 -0700 Subject: [PATCH 26/29] no changes --- config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 38 ++++++++++----------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index b43e67f00..3846a253d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,5 +8,6 @@ get '/customers', to: 'customers#index', as: 'customers' post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d912fb2a7..aa98c28f3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -42,9 +42,7 @@ body.must_include "id" new_rental = Rental.find(body["id"]) - new_rental.customer_id.must_equal @rental_data[:customer_id] - - new_rental.movie_id.must_equal @rental_data[:movie_id] + @rental_data[:movie_id] new_rental.checkout.must_equal @date @@ -73,21 +71,21 @@ end end - # describe 'checkin' do - # it 'is real route' do - # skip - # end - # - # it 'can checkin a movie' do - # skip - # end - # - # it 'changes the inventory of movie when it is checked in' do - # skip - # end - # - # it 'throws an error if a movie is not checked out and you attempt a checkin' do - # skip - # end - # end + describe 'checkin' do + it 'is real route' do + skip + end + + it 'can checkin a movie' do + skip + end + + it 'changes the inventory of movie when it is checked in' do + skip + end + + it 'throws an error if a movie is not checked out and you attempt a checkin' do + skip + end + end end From d768dc997c69c5a1e06c96e55bfede0479014987 Mon Sep 17 00:00:00 2001 From: Ana Lisa Sutherland Date: Fri, 11 May 2018 15:01:12 -0700 Subject: [PATCH 27/29] Now checkin test is passing, passing in customer_id and movie_id --- app/controllers/rentals_controller.rb | 13 +++-- test/controllers/rentals_controller_test.rb | 61 +++++++++++---------- test/fixtures/rentals.yml | 4 ++ 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d6365c283..13b87cedd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -38,7 +38,9 @@ def checkout end def checkin - rental = Rental.find_by(params[:id]) + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) + puts "DPR: found rental #{rental}" + # binding.pry if rental[:checkout].nil? || rental[:due_date].nil? render json: { @@ -49,12 +51,11 @@ def checkin }, status: :bad_request return end - movie = Movie.find_by(rental.movie_id) - movie[:inventory] += 1 - if movie.save - render json: { id: movie.id }, status: :ok + rental.movie.inventory += 1 + if rental.movie.save + render json: { id: rental.movie.id }, status: :ok else - render json: { errors: movie.errors.messages }, status: :bad_request + render json: { errors: rental.movie.errors.messages }, status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 95c0757bc..69d9d28ba 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,21 +1,21 @@ require "test_helper" describe RentalsController do - before do - @movie = Movie.first - customer = Customer.first - @date = Date.today - - @rental_data = { - checkout: nil, - due_date: nil, - customer_id: customer.id, - movie_id: @movie.id - } - - end describe 'checkout' do + before do + @movie = Movie.first + customer = Customer.first + @date = Date.today + + @rental_data = { + checkout: nil, + due_date: nil, + customer_id: customer.id, + movie_id: @movie.id + } + + end it 'is real route' do post checkout_path, params: @rental_data @@ -72,47 +72,48 @@ end describe 'checkin' do - it 'is real route' do - post checkout_path, params: @rental_data - assert_response :success + before do + date = Date.today + @movie = Movie.first + customer = Customer.first + + @rental = { + checkout: date, + due_date: date + 7, + customer_id: customer.id, + movie_id: @movie.id + } + Rental.create!(@rental) + end - post checkin_path, params: @rental_data + it 'is real route' do + post checkin_path, params: @rental must_respond_with :success end it 'renders json' do - post checkin_path, params: @rental_data + post checkin_path, params: @rental response.header['Content-Type'].must_include 'json' end it 'can checkin a movie and changes the inventory when checked in' do before_inventory_count = @movie.inventory - before_count = Rental.count - - post checkout_path, params: @rental_data - assert_response :success - Rental.count.must_equal before_count + 1 - post checkin_path, params: @rental_data + post checkin_path, params: @rental assert_response :success @movie.reload - # binding.pry @movie.inventory.must_equal before_inventory_count + 1 end it 'throws an error if a movie is not checked out and you attempt a checkin' do before_inventory_count = @movie.inventory - - post checkin_path, params: @rental_data - assert_response :success - @movie.reload assert_no_difference "#{@movie.inventory}" do - post checkin_path, params: @rental_data + post checkin_path, params: @rental assert_response :bad_request end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 1aaac3437..deaf193c9 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,7 +3,11 @@ one: checkout: 2018-05-08 due_date: 2018-05-08 + movie: movie_1 + customer: one two: checkout: 2018-05-08 due_date: 2018-05-08 + movie: movie_1 + customer: two From 1fbc05cfed13587284ca365156e7efc1be9aff1a Mon Sep 17 00:00:00 2001 From: Kiera Date: Fri, 11 May 2018 15:06:21 -0700 Subject: [PATCH 28/29] another merge --- app/controllers/rentals_controller.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 13b745281..35c3425c2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -36,8 +36,6 @@ def checkout render json: { errors: new_rental.errors.messages }, status: :bad_request end end -<<<<<<< HEAD -======= def checkin rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) @@ -65,5 +63,4 @@ def checkin def rental_params return params.permit(:checkout, :due_date, :customer_id, :movie_id) end ->>>>>>> d768dc997c69c5a1e06c96e55bfede0479014987 end From 1f11a7dba0dde19299ec7c4649099a56d8cfefb2 Mon Sep 17 00:00:00 2001 From: Kiera Date: Fri, 11 May 2018 15:59:46 -0700 Subject: [PATCH 29/29] completed final testing --- app/controllers/movies_controller.rb | 5 ++- app/controllers/rentals_controller.rb | 23 ++++++----- app/models/movie.rb | 2 + config/routes.rb | 6 +-- db/migrate/20180511223301_add_checkin_to.rb | 5 +++ ...change_inventory_to_available_inventory.rb | 6 +++ db/schema.rb | 6 ++- test/controllers/movies_controller_test.rb | 4 +- test/controllers/rentals_controller_test.rb | 39 +++++++++++-------- test/fixtures/movies.yml | 2 + 10 files changed, 63 insertions(+), 35 deletions(-) create mode 100644 db/migrate/20180511223301_add_checkin_to.rb create mode 100644 db/migrate/20180511224512_change_inventory_to_available_inventory.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a344c628f..261ba0312 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:id, :title, :overview, :inventory, :release_date]), status: :ok + render json: movies.as_json(only: [:id, :title, :overview, :inventory, :available_inventory, :release_date]), status: :ok end def show @@ -14,12 +14,13 @@ def show } }, status: :not_found else - render json: movie.as_json(only: [:id, :title, :overview, :inventory, :release_date], status: :ok) + render json: movie.as_json(only: [:id, :title, :overview, :inventory, :available_inventory, :release_date], status: :ok) end end def create movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory if movie.save render json: { id: movie.id }, status: :ok else diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 35c3425c2..bbc5658e3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -16,10 +16,10 @@ def checkout movie = Movie.find_by(id: movie_id) customer = Customer.find_by(id: customer_id) - if movie[:inventory] == 0 + if movie[:available_inventory] == 0 render json: { errors: { - inventory: ["Movie is currently all checked out. Sorry."] + available_inventory: ["Movie is currently all checked out. Sorry."] } } , status: :bad_request return @@ -27,8 +27,8 @@ def checkout new_rental = Rental.new(rental_params) new_rental[:checkout] = date - = date + 7 - movie[:inventory] -= 1 + new_rental[:due_date] = date + 7 + movie[:available_inventory] -= 1 if new_rental.save movie.save render json: { id: new_rental.id}, status: :ok @@ -40,21 +40,26 @@ def checkout def checkin rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) puts "DPR: found rental #{rental}" - # binding.pry - if rental[:checkout].nil? || rental[:due_date].nil? + + if rental.checked_in render json: { errors: { - checkout: ["Movie has not been checked out."], - due_date: ["Movie has not been checked out."] + checked_in: ["Movie has not been checked out."] } }, status: :bad_request return end - rental.movie.inventory += 1 + + # TODO: error handling + rental.update!(checked_in: true) + + + rental.movie.available_inventory += 1 if rental.movie.save render json: { id: rental.movie.id }, status: :ok else + render json: { errors: rental.movie.errors.messages }, status: :bad_request end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 75616ec9a..66fa4f342 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,5 +5,7 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, numericality: true validates :inventory, numericality: {greater_than_or_equal_to: 0} + validates :available_inventory, numericality: true + validates :available_inventory, numericality: {greater_than_or_equal_to: 0} end diff --git a/config/routes.rb b/config/routes.rb index 3846a253d..21e0ebf35 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,7 +7,7 @@ get '/customers', to: 'customers#index', as: 'customers' - post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' - - post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + + post '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' end diff --git a/db/migrate/20180511223301_add_checkin_to.rb b/db/migrate/20180511223301_add_checkin_to.rb new file mode 100644 index 000000000..136d52ea3 --- /dev/null +++ b/db/migrate/20180511223301_add_checkin_to.rb @@ -0,0 +1,5 @@ +class AddCheckinTo < ActiveRecord::Migration[5.1] + def change + add_column :rentals, :checked_in, :boolean, default: false + end +end diff --git a/db/migrate/20180511224512_change_inventory_to_available_inventory.rb b/db/migrate/20180511224512_change_inventory_to_available_inventory.rb new file mode 100644 index 000000000..32056909e --- /dev/null +++ b/db/migrate/20180511224512_change_inventory_to_available_inventory.rb @@ -0,0 +1,6 @@ +class ChangeInventoryToAvailableInventory < ActiveRecord::Migration[5.1] + def change + rename_column :movies, :inventory, :available_inventory + add_column :movies, :inventory, :integer, default: 8 + end +end diff --git a/db/schema.rb b/db/schema.rb index c17e66068..0ec1a848f 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: 20180508214734) do +ActiveRecord::Schema.define(version: 20180511224512) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -30,10 +30,11 @@ create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" - t.integer "inventory" + t.integer "available_inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.date "release_date" + t.integer "inventory", default: 8 end create_table "rentals", force: :cascade do |t| @@ -43,6 +44,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.boolean "checked_in", default: false t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 346bba058..f9297c699 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -23,7 +23,7 @@ end it "returns the movies with all required fields" do - keys = %w(id inventory overview release_date title) + keys = %w(available_inventory id inventory overview release_date title) get movies_path @@ -36,7 +36,7 @@ describe 'show' do it 'can get a movie' do - keys = %w(id inventory overview release_date title) + keys = %w(available_inventory id inventory overview release_date title) movie = movies(:movie_1) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c2b8516e8..7254eaa8d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -28,9 +28,9 @@ response.header['Content-Type'].must_include 'json' end - it 'can checkout a movie and updates inventory' do + it 'can checkout a movie and updates available_inventory' do before_count = Rental.count - before_inventory_count = @movie.inventory + before_available_inventory_count = @movie.available_inventory # Act post checkout_path, params: @rental_data @@ -48,12 +48,12 @@ new_rental.due_date.must_equal @date + 7 @movie.reload - @movie.inventory.must_equal before_inventory_count - 1 + @movie.available_inventory.must_equal before_available_inventory_count - 1 end - it 'throws an error if inventory of movie is 0 and someone tries to checkout' do + it 'throws an error if available_inventory of movie is 0 and someone tries to checkout' do before_count = Rental.count - @movie.inventory = 0 + @movie.available_inventory = 0 @movie.save assert_no_difference "Rental.count" do @@ -63,9 +63,9 @@ body = JSON.parse(response.body) body.must_include "errors" - body['errors'].must_include 'inventory' + body['errors'].must_include 'available_inventory' - @movie.inventory.must_equal 0 + @movie.available_inventory.must_equal 0 end end @@ -73,15 +73,15 @@ before do date = Date.today @movie = Movie.first - customer = Customer.first + @customer = Customer.first @rental = { checkout: date, due_date: date + 7, - customer_id: customer.id, + customer_id: @customer.id, movie_id: @movie.id } - Rental.create!(@rental) + @rental_db_entry = Rental.create!(@rental) end it 'is real route' do @@ -96,29 +96,34 @@ response.header['Content-Type'].must_include 'json' end - it 'can checkin a movie and changes the inventory when checked in' do - before_inventory_count = @movie.inventory + it 'can checkin a movie and changes the available_inventory when checked in' do + before_available_inventory_count = @movie.available_inventory post checkin_path, params: @rental assert_response :success + @rental_db_entry.reload + @rental_db_entry.must_be :checked_in + @movie.reload - @movie.inventory.must_equal before_inventory_count + 1 + @movie.available_inventory.must_equal before_available_inventory_count + 1 end it 'throws an error if a movie is not checked out and you attempt a checkin' do - before_inventory_count = @movie.inventory + before_available_inventory_count = @movie.available_inventory @movie.reload - assert_no_difference "#{@movie.inventory}" do + @rental_db_entry.checked_in = true + @rental_db_entry.save! + + assert_no_difference "#{@movie.available_inventory}" do post checkin_path, params: @rental assert_response :bad_request end body = JSON.parse(response.body) body.must_include "errors" - body['errors'].must_include 'checkout' - body['errors'].must_include 'due_date' + body['errors'].must_include 'checked_in' end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 9d5f66859..5f927c502 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -6,12 +6,14 @@ # movie_1: { title: "300", + available_inventory: 2, inventory: 2 } # column: value # movie_2: { title: 'Some Like It Hot', + available_inventory: 5, inventory: 5 } # column: value