From 95fa4922e4217fd25779cb2ed7cc6faa70336552 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 13:14:11 -0800 Subject: [PATCH 01/42] controllers set up, zomg works --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 59 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 4 + app/controllers/concerns/.keep | 0 app/controllers/customers_controller.rb | 8 + app/controllers/movies_controller.rb | 2 + app/controllers/rentals_controller.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../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 | 34 ++++ config/routes.rb | 9 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 7 + test/controllers/movies_controller_test.rb | 7 + test/controllers/rentals_controller_test.rb | 7 + 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 | 10 + tmp/.keep | 0 vendor/.keep | 0 64 files changed, 973 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/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/credentials.yml.enc 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/action_view.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/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb 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..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..160fe391c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..8143da43e --- /dev/null +++ b/Gemfile @@ -0,0 +1,59 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# 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 ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# 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 :development do + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +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..981f08e8a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) + erubi (1.9.0) + ffi (1.11.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.7.0) + 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.3.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + minitest-rails (5.2.0) + minitest (~> 5.10) + railties (~> 5.2.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.1) + nio4r (2.5.2) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + ruby_dep (1.5.0) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + 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.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + debase (>= 0.2.4.1) + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.0.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end 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..69ea87a39 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,4 @@ +class ApplicationController < ActionController::API + + +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..004529d16 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,8 @@ +class CustomersController < ApplicationController + + def zomg + working = "it works!" + render json: working, status: :ok + end + +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/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..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..d89ee495f --- /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..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..56f84c20c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +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.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # 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..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6cc616cd1 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video-store-api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..c14eaae7b --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +iRZkg0Bktr2o6F49xaYop8lmsiYr/GDps5tU6LWinZWnCR6j6gKaCWdUg6jATKqdP3qEpH0KHjZHK95g+cVf/fhuaT+OOhQ9Z3vcDTE5XXcP4g9itGp7rUqXda/2FjmbN8LZIPKYO0vW7t/s8dB7fC3DQmo1pNRn9YJm7BLI+Y4dxuo3y7XPH0Xir87dM1bf01gxMP70lJIXCUfG+/mu/RgbIAx0n6G5n2bopx+FyJ+xilvMVbwbvKykw/ZWesBxVtRfPTtpJErolc44DkAjRRrEsySE37Ibbb2oQUHkPpWxN36fqubtoxcMDMeYEL3jhgQkcyrR4bm4w0sdojVtXqjeZVunkA6JmJffY6LDghIR2+1en3OnOtecOqqXDV0YEsUV8FkD49jHEotXv9z0M6EGQadKDqNLY1sn--FZS8b5jQ0o+VrEV3--yd/Q1H2lfMW2STnfb/8o8g== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..25f76c8e1 --- /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: video-store-api_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: video-store-api + + # 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: video-store-api_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: video-store-api_production + username: video-store-api + password: <%= ENV['VIDEO-STORE-API_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..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +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. + # Run rails dev:cache to toggle caching. + 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.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # 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..5f023a796 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +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 + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = 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 + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 = "video-store-api_#{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..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +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.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 + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false 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..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# 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. +# +# preload_app! + +# 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..7518395ee --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,9 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + resources :customers, only: [:index] + get "/customers/zomg", to: "customers#zomg", as: "customer_zomg" + resources :movies + resources :rentals + +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /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/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] 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/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..b11d50cea --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end 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..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +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 e0c10690f07b4c971183b92ab5d95a7788b4b82a Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 14:51:38 -0800 Subject: [PATCH 02/42] established relationships and validations and created models for customer, movie and rental --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/rentals_controller.rb | 2 + app/models/customer.rb | 6 +++ app/models/movie.rb | 7 +++ app/models/rental.rb | 2 + db/migrate/20191105212014_create_customers.rb | 15 ++++++ db/migrate/20191105212446_create_movies.rb | 12 +++++ db/migrate/20191105212750_create_rentals.rb | 10 ++++ db/schema.rb | 46 ++++++++++++++++++ test/fixtures/customers.yml | 1 + test/fixtures/movies.yml | 0 test/fixtures/rentals.yml | 0 test/models/customer_test.rb | 10 ++++ test/models/movie_test.rb | 7 +++ test/models/rental_test.rb | 7 +++ 15 files changed, 125 insertions(+) create mode 100644 .DS_Store create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20191105212014_create_customers.rb create mode 100644 db/migrate/20191105212446_create_movies.rb create mode 100644 db/migrate/20191105212750_create_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c3ac046f6c51a2cd4bc2df32c603e493458c382e GIT binary patch literal 6148 zcmeH~F^{dt=u>Bl;zddfqZjB=JE!l7EiIwCR znHYd=e=Zwf1hAw#vGy=AV?N-4FWm9?zTD5J+wJN_+D8XGrH`2G=e8gPq<|EV0#ZN< z%t(Pe#+RQndL})J6p#Y*P{6+rh3>4$))}7;h8O|Jf#oo+W0oL`7s#4yovhF-rw7Yc zi!sFO(N31Ut|nV&Z-?dZVR>isDTZdf9afmotOgXMfE1W0u;}^d=l`Dm-~2ymQ7Q$b zz?&&x!|t%#@}=@@{quTWKW5d}jZVhp3{O7+O#CQb(Zjf3d_mS^>tuzdAAyiTK?=N7 FfnTX=61e~X literal 0 HcmV?d00001 diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..7e0098d21 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,4 @@ class RentalsController < ApplicationController + belongs_to :customer + belongs_to :movie end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..7ad158446 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,6 @@ +class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals + + validates :name, presence: true +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..2974c5cd6 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,7 @@ +class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals + + validates :title, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than: -1 } +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20191105212014_create_customers.rb b/db/migrate/20191105212014_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20191105212014_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20191105212446_create_movies.rb b/db/migrate/20191105212446_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20191105212446_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20191105212750_create_rentals.rb b/db/migrate/20191105212750_create_rentals.rb new file mode 100644 index 000000000..fe765df63 --- /dev/null +++ b/db/migrate/20191105212750_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :checkin_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..d9548b821 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# 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: 2019_11_05_212750) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "checkin_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..22ded55aa --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1 @@ +: \ No newline at end of file diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..039cede20 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,10 @@ +require "test_helper" + +describe Customer do + describe "relationships" do + it "" do + + end + + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..cd59ab14a --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Movie do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 8b1b9b44a0703787b9960bf9fdbc4910d22809fb Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 15:43:47 -0800 Subject: [PATCH 03/42] added again rental relationships. Started on customer relationships tests --- app/models/rental.rb | 2 ++ ...tomer_and_movie_to_rental_as_foreign_keys.rb | 8 ++++++++ db/schema.rb | 8 +++++++- test/fixtures/customers.yml | 8 +++++++- test/fixtures/movies.yml | 7 +++++++ test/fixtures/rentals.yml | 7 +++++++ test/models/customer_test.rb | 17 +++++++++++++++-- test/test_helper.rb | 6 +++++- 8 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20191105231048_add_customer_and_movie_to_rental_as_foreign_keys.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer end diff --git a/db/migrate/20191105231048_add_customer_and_movie_to_rental_as_foreign_keys.rb b/db/migrate/20191105231048_add_customer_and_movie_to_rental_as_foreign_keys.rb new file mode 100644 index 000000000..e91a9ef03 --- /dev/null +++ b/db/migrate/20191105231048_add_customer_and_movie_to_rental_as_foreign_keys.rb @@ -0,0 +1,8 @@ +class AddCustomerAndMovieToRentalAsForeignKeys < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + + add_reference :rentals, :movie, foreign_key: true + + end +end diff --git a/db/schema.rb b/db/schema.rb index d9548b821..ac5c2d98b 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: 2019_11_05_212750) do +ActiveRecord::Schema.define(version: 2019_11_05_231048) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,6 +41,12 @@ t.date "checkin_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_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/customers.yml b/test/fixtures/customers.yml index 22ded55aa..560cc31e3 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1 +1,7 @@ -: \ No newline at end of file +janice: + name: "Janice" + registered_at: Date.now + +dora: + name: "Dora" + registered_at: Date.now diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e69de29bb..f2b118a78 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -0,0 +1,7 @@ +movie1: + title: "Birds" + inventory: 5 + +movie2: + title: "Clue" + inventory: 3 \ No newline at end of file diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index e69de29bb..186cc984f 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -0,0 +1,7 @@ +rental1: + customer: janice + movie: movie2 + +rental2: + customer: dora + movie: movie1 \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 039cede20..c7c9a2a29 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,9 +2,22 @@ describe Customer do describe "relationships" do - it "" do - + it "can add a movie through rentals" do + new_customer = Customer.new(name: "ada") + new_customer.movies << movies(:movie1) + new_customer.movies.first.id.must_equal movies(:movie1).id end + it "can have many rentals" do + valid_customer = customers(:janice) + + expect(valid_customer.rentals.count).must_equal 1 + valid_customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + + end end + + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..cb3cc1de5 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,11 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' - +require 'minitest' +require 'minitest/autorun' +require 'minitest/reporters' +require 'minitest/rails' +require 'minitest/pride' class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all From 60e5173babc47cedcbaec3b75df77b06a16aeebe Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 16:01:52 -0800 Subject: [PATCH 04/42] add relations tests to movie model test file --- test/fixtures/rentals.yml | 7 ++++++- test/models/customer_test.rb | 15 ++++++++++++++- test/models/movie_test.rb | 36 +++++++++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 186cc984f..53dac0d2a 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,4 +4,9 @@ rental1: rental2: customer: dora - movie: movie1 \ No newline at end of file + movie: movie1 + +rental3: + customer: janice + movie: movie1 + \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index c7c9a2a29..1c03f60fc 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,6 +1,19 @@ require "test_helper" describe Customer do + describe "validations" do + it "is valid when there is a name" do + customer = Customer.new(name: "lois") + expect(customer.valid?).must_equal true + end + + it "is invalid when there is not a name" do + customer = customers(:dora) + customer.name = nil + expect(customer.valid?).must_equal false + end + end + describe "relationships" do it "can add a movie through rentals" do new_customer = Customer.new(name: "ada") @@ -11,7 +24,7 @@ it "can have many rentals" do valid_customer = customers(:janice) - expect(valid_customer.rentals.count).must_equal 1 + expect(valid_customer.rentals.count).must_equal 2 valid_customer.rentals.each do |rental| rental.must_be_kind_of Rental end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cd59ab14a..afa17f7a6 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe Movie do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + it "must be valid with title and non-negative integer inventory" do + end + + it "must be invalid without title" do + end + + it "must be invalid if the inventory is not an integer" do + end + + it "must be invalid without inventory" do + end + + it "must be invalid with a negative inventory" do + end + end + + describe "relations" do + it "can add a customer through rentals" do + customer = Customer.new(name: "Ada") + movie = movies(:movie2) + movie.customers << customer + movie.customers.last.id.must_equal customer.id + end + + it "can have many rentals" do + cur_movie = movies(:movie1) + expect(cur_movie.rentals.count).must_equal 2 + cur_movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end end From 106e13d579c5d2f6e64e9ec888ce4d01c1be42e7 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 16:09:28 -0800 Subject: [PATCH 05/42] add validation tests to movie model test --- test/models/movie_test.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index afa17f7a6..65c008fde 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,19 +2,31 @@ describe Movie do describe "validations" do + before do + @movie = movies(:movie2) + end it "must be valid with title and non-negative integer inventory" do + expect(@movie.valid?).must_equal true end it "must be invalid without title" do + @movie.title = nil + expect(@movie.valid?).must_equal false end it "must be invalid if the inventory is not an integer" do + @movie.inventory = "peaches" + expect(@movie.valid?).must_equal false end - it "must be invalid without inventory" do + it "must be invalid if inventory is nil" do + @movie.inventory = nil + expect(@movie.valid?).must_equal false end it "must be invalid with a negative inventory" do + @movie.inventory = -1 + expect(@movie.valid?).must_equal false end end From 140230c78761fb1324c120327177c54795323fc7 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 16:19:33 -0800 Subject: [PATCH 06/42] fixed syntax of tests --- app/controllers/rentals_controller.rb | 2 -- test/models/customer_test.rb | 4 ++-- test/models/movie_test.rb | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7e0098d21..58c72b791 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,4 +1,2 @@ class RentalsController < ApplicationController - belongs_to :customer - belongs_to :movie end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 1c03f60fc..201469d07 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -18,7 +18,7 @@ it "can add a movie through rentals" do new_customer = Customer.new(name: "ada") new_customer.movies << movies(:movie1) - new_customer.movies.first.id.must_equal movies(:movie1).id + _(new_customer.movies.first.id).must_equal movies(:movie1).id end it "can have many rentals" do @@ -26,7 +26,7 @@ expect(valid_customer.rentals.count).must_equal 2 valid_customer.rentals.each do |rental| - rental.must_be_kind_of Rental + _(rental).must_be_kind_of Rental end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 65c008fde..647d55e55 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -35,14 +35,14 @@ customer = Customer.new(name: "Ada") movie = movies(:movie2) movie.customers << customer - movie.customers.last.id.must_equal customer.id + _(movie.customers.last.id).must_equal customer.id end it "can have many rentals" do cur_movie = movies(:movie1) expect(cur_movie.rentals.count).must_equal 2 cur_movie.rentals.each do |rental| - rental.must_be_kind_of Rental + _(rental).must_be_kind_of Rental end end end From 4bf26c53fdcded9ee61e46853665d9fcef4bf364 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Tue, 5 Nov 2019 19:29:43 -0800 Subject: [PATCH 07/42] rental model relationships tests --- test/models/rental_test.rb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..409bf2db6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,18 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let (:rental1) {rentals(:rental1) } + describe "relationships" do + + it "belongs to movie" do + expect(rental1.movie).must_be_instance_of Movie + expect(rental1.movie).wont_be_nil + end + + it "belongs to customer" do + expect(rental1.customer).must_be_instance_of Customer + expect(rental1.customer).wont_be_nil + end + + end end From 1cef1e8d34eafd4799de321cd28c615f791a96ff Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 20:56:13 -0800 Subject: [PATCH 08/42] add GET customers controller test --- app/controllers/customers_controller.rb | 4 +++- test/controllers/customers_controller_test.rb | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 004529d16..5dbddbb38 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,10 @@ class CustomersController < ApplicationController - + def zomg working = "it works!" render json: working, status: :ok end + + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..8e3a9531a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,13 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "responds with an array of customer hashes" do + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal ["address", "city", "movies_checked_out_count", "name", "phone", "postal_code", "state"] + end + end end From db1399d3d6dd3f1122ae71b06f2b101bf33e5cf9 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Tue, 5 Nov 2019 21:18:25 -0800 Subject: [PATCH 09/42] add edge case (no customers) test for customer controller, add index in customer controller, add dependent nullify to customer and movie models --- app/controllers/customers_controller.rb | 7 ++++++- app/models/customer.rb | 4 ++-- app/models/movie.rb | 4 ++-- ...045734_add_movies_checked_out_count_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- test/controllers/customers_controller_test.rb | 10 +++++++++- 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20191106045734_add_movies_checked_out_count_to_customers.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5dbddbb38..9e3628979 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,3 +1,5 @@ +KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone,:movies_checked_out_count] + class CustomersController < ApplicationController def zomg @@ -5,6 +7,9 @@ def zomg render json: working, status: :ok end - + def index + customers = Customer.all.as_json(only: KEYS) + render json: customers, status: :ok + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 7ad158446..21e55a770 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord - has_many :rentals - has_many :movies, through: :rentals + has_many :rentals, dependent: :nullify + has_many :movies, through: :rentals, dependent: :nullify validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 2974c5cd6..695c9d6b0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord - has_many :rentals - has_many :customers, through: :rentals + has_many :rentals, dependent: :nullify + has_many :customers, through: :rentals, dependent: :nullify validates :title, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than: -1 } diff --git a/db/migrate/20191106045734_add_movies_checked_out_count_to_customers.rb b/db/migrate/20191106045734_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..dac80cbe6 --- /dev/null +++ b/db/migrate/20191106045734_add_movies_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index ac5c2d98b..50ba84836 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: 2019_11_05_231048) do +ActiveRecord::Schema.define(version: 2019_11_06_045734) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 8e3a9531a..4bf877da5 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,7 +7,15 @@ expect(body).must_be_instance_of Array body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal ["address", "city", "movies_checked_out_count", "name", "phone", "postal_code", "state"] + expect(customer.keys.sort).must_equal ["address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "state"] end end + + it "will respond with an empty array when there are no customers" do + Customer.destroy_all + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end end From 6a24fff0d61b485e74298d0845401d3c8dbff1b4 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Tue, 5 Nov 2019 22:28:35 -0800 Subject: [PATCH 10/42] completed movies controller index action and tests --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 8 ++++++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 20 +++++++++++++++++--- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 9e3628979..bda5dcf99 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,4 @@ -KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone,:movies_checked_out_count] +KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count] class CustomersController < ApplicationController diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..1e05a784b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,10 @@ +KEYS = [:id, :title, :release_date] + class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: movies.as_json(only: KEYS), status: :ok + end + end diff --git a/config/routes.rb b/config/routes.rb index 7518395ee..711caf949 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :customers, only: [:index] get "/customers/zomg", to: "customers#zomg", as: "customer_zomg" + resources :customers, only: [:index] resources :movies resources :rentals diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b11d50cea..e410f84fe 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,21 @@ require "test_helper" describe MoviesController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "responds with an array of movie hashes" do + get movies_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + body.each do |movie| + expect(movie).must_be_instance_of Hash + expect(movie.keys.sort).must_equal ["id", "release_date", "title"] + end + end + + it "will respond with an empty array when there are no movies" do + Movie.destroy_all + get movies_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end end From c9df20778eeb9c4298b3fb8fd36427f4c9f52734 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Wed, 6 Nov 2019 12:54:17 -0800 Subject: [PATCH 11/42] add helper method in test helper, DRY up some test code, start show action tests in movies controller test --- app/controllers/customers_controller.rb | 8 ++--- test/controllers/customers_controller_test.rb | 11 +++--- test/controllers/movies_controller_test.rb | 36 +++++++++++-------- test/test_helper.rb | 8 +++++ 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index bda5dcf99..d53e0ae46 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,10 +2,10 @@ class CustomersController < ApplicationController - def zomg - working = "it works!" - render json: working, status: :ok - end + # def zomg + # working = "it works!" + # render json: working, status: :ok + # end def index customers = Customer.all.as_json(only: KEYS) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 4bf877da5..8fcbcb338 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,21 +1,20 @@ require "test_helper" +CUSTOMER_KEYS = ["address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "state"] describe CustomersController do - it "responds with an array of customer hashes" do + it "responds with JSON, success, and an array of customer hashes" do get customers_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal ["address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "state"] + expect(customer.keys.sort).must_equal CUSTOMER_KEYS end end it "will respond with an empty array when there are no customers" do Customer.destroy_all get customers_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) expect(body).must_equal [] end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e410f84fe..140ef618f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,21 +1,29 @@ require "test_helper" describe MoviesController do - it "responds with an array of movie hashes" do - get movies_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - body.each do |movie| - expect(movie).must_be_instance_of Hash - expect(movie.keys.sort).must_equal ["id", "release_date", "title"] + describe "index" do + it "responds with an array of movie hashes" do + get movies_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + body.each do |movie| + expect(movie).must_be_instance_of Hash + expect(movie.keys.sort).must_equal ["id", "release_date", "title"] + end + end + + it "will respond with an empty array when there are no movies" do + Movie.destroy_all + get movies_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body).must_equal [] end end - - it "will respond with an empty array when there are no movies" do - Movie.destroy_all - get movies_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - expect(body).must_equal [] + + describe "show" do + it "responds with one customer's hash" do + + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index cb3cc1de5..678f7ad8f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,4 +11,12 @@ class ActiveSupport::TestCase fixtures :all # Add more helper methods to be used by all tests here... + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end end From 248da73aa975680130245123f438fbd76c3e4ec2 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Wed, 6 Nov 2019 12:56:55 -0800 Subject: [PATCH 12/42] correct customer to movie --- test/controllers/movies_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 140ef618f..ad7b7a5e6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -22,8 +22,8 @@ end describe "show" do - it "responds with one customer's hash" do - + it "responds with one movie's hash" do + end end end From ccd8fea5cd66a52db12d7cf960c20fe9d52c7dfa Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Wed, 6 Nov 2019 13:45:17 -0800 Subject: [PATCH 13/42] add movie show controller tests and method --- app/controllers/movies_controller.rb | 11 +++++++++++ test/controllers/movies_controller_test.rb | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1e05a784b..797a82885 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,4 +7,15 @@ def index render json: movies.as_json(only: KEYS), status: :ok end + def show + movie_id = params[:id] + movie = Movie.find_by(id: movie_id) + if movie + render json: movie.as_json(only: KEYS) + return + else + render json: {"errors"=>["not found"]}, status: :not_found + return + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ad7b7a5e6..3b2484ae6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +MOVIE_KEYS = ["id", "release_date", "title"] describe MoviesController do describe "index" do @@ -8,10 +9,10 @@ expect(body).must_be_instance_of Array body.each do |movie| expect(movie).must_be_instance_of Hash - expect(movie.keys.sort).must_equal ["id", "release_date", "title"] + expect(movie.keys.sort).must_equal MOVIE_KEYS end end - + it "will respond with an empty array when there are no movies" do Movie.destroy_all get movies_path @@ -20,10 +21,14 @@ expect(body).must_equal [] end end - + describe "show" do it "responds with one movie's hash" do - + movie = movies(:movie2) + get movie_path(movie.id) + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal MOVIE_KEYS + expect(body["title"]).must_equal movie.title end end end From fcd036fb0a0ebe871fc30caa33424ce1fe8425a7 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Wed, 6 Nov 2019 14:19:57 -0800 Subject: [PATCH 14/42] movies controller create action and tests --- app/controllers/movies_controller.rb | 20 +++++++++++ test/controllers/movies_controller_test.rb | 39 ++++++++++++++++++---- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 797a82885..5a6891990 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,4 +18,24 @@ def show return end end + + def create + new_movie = Movie.new(movie_params) + if new_movie.save + render json: new_movie.as_json(only: [:id]), status: :created + else + render json: { errors: new_movie.errors.messages }, status: :bad_request + end + + end + + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + + end + + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3b2484ae6..53a9b360a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -5,23 +5,21 @@ describe "index" do it "responds with an array of movie hashes" do get movies_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) body.each do |movie| expect(movie).must_be_instance_of Hash expect(movie.keys.sort).must_equal MOVIE_KEYS end end - + it "will respond with an empty array when there are no movies" do Movie.destroy_all get movies_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) expect(body).must_equal [] end end - + describe "show" do it "responds with one movie's hash" do movie = movies(:movie2) @@ -31,4 +29,33 @@ expect(body["title"]).must_equal movie.title end end + + describe "create" do + let(:movie_data) { + { + movie: { + title: "Birds", + overview: "Lots of birds", + release_date: Date.new, + inventory: 5 + }}} + + it "can create a new movie" do + expect{post movies_path, params: movie_data}.must_differ 'Movie.count', 1 + + must_respond_with :created + end + + it "will respond with bad_request for invalid data" do + movie_data[:movie][:title] = nil + + expect {post movies_path, params: movie_data}.wont_change "Movie.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end + end end From 7c34e6be2bbaf913f96d7245c709fa73e6567921 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Wed, 6 Nov 2019 15:01:09 -0800 Subject: [PATCH 15/42] changed keys in customers controller to fix weird bug, changed fixture movie title --- app/controllers/customers_controller.rb | 2 +- test/fixtures/movies.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d53e0ae46..98471a264 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -8,7 +8,7 @@ class CustomersController < ApplicationController # end def index - customers = Customer.all.as_json(only: KEYS) + customers = Customer.all.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) render json: customers, status: :ok end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f2b118a78..2c0529e7b 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,5 +1,5 @@ movie1: - title: "Birds" + title: "Rear Window" inventory: 5 movie2: From db5997035d063f89e05322c4d42f1e7785507c41 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Wed, 6 Nov 2019 15:01:20 -0800 Subject: [PATCH 16/42] completed customers controller index testing for the weird one --- Gemfile | 1 + Gemfile.lock | 4 ++++ app/controllers/customers_controller.rb | 16 ++++++++++------ test/controllers/customers_controller_test.rb | 2 ++ test/fixtures/customers.yml | 5 +++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 8143da43e..9d52c4312 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,7 @@ gem 'puma', '~> 3.11' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.1.0', require: false +gem 'pry-byebug' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' diff --git a/Gemfile.lock b/Gemfile.lock index 981f08e8a..22e51d9b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,6 +92,9 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) pry-rails (0.3.9) pry (>= 0.10.4) puma (3.12.1) @@ -160,6 +163,7 @@ DEPENDENCIES minitest-rails minitest-reporters pg (>= 0.18, < 2.0) + pry-byebug pry-rails puma (~> 3.11) rails (~> 5.2.3) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d53e0ae46..374270cdd 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,15 +1,19 @@ -KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count] +require 'pry' class CustomersController < ApplicationController - + # def zomg # working = "it works!" # render json: working, status: :ok # end - + def index - customers = Customer.all.as_json(only: KEYS) - render json: customers, status: :ok + # binding.pry + customers = Customer.all + if KEYS.length < 2 + binding.pry + end + render json: customers.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]), status: :ok end - + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 8fcbcb338..4a33d10eb 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'pry' CUSTOMER_KEYS = ["address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "state"] describe CustomersController do @@ -7,6 +8,7 @@ body = check_response(expected_type: Array) body.each do |customer| expect(customer).must_be_instance_of Hash + # binding.pry expect(customer.keys.sort).must_equal CUSTOMER_KEYS end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 560cc31e3..0686861d0 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,11 @@ janice: name: "Janice" registered_at: Date.now + address: bogus + city: Seattle + phone: doh + postal_code: somewhere + state: doh dora: name: "Dora" From 5b9ea2957b3c67cc15da93aeefe70f394397b925 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Wed, 6 Nov 2019 15:07:18 -0800 Subject: [PATCH 17/42] global constants (keys) fixed--left in controllers, took out of controller tests --- app/controllers/customers_controller.rb | 4 +-- app/controllers/movies_controller.rb | 26 +++++++++---------- test/controllers/customers_controller_test.rb | 5 ++-- test/controllers/movies_controller_test.rb | 5 ++-- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 98471a264..99b88a5c5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,4 @@ -KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count] +CUSTOMER_KEYS = ["id", "name", "address", "city", "state", "postal_code", "phone", "movies_checked_out_count"] class CustomersController < ApplicationController @@ -8,7 +8,7 @@ class CustomersController < ApplicationController # end def index - customers = Customer.all.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) + customers = Customer.all.as_json(only: CUSTOMER_KEYS) render json: customers, status: :ok end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5a6891990..9c272d9f5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,24 +1,24 @@ -KEYS = [:id, :title, :release_date] +MOVIE_KEYS = ["id", "title", "release_date"] class MoviesController < ApplicationController - + def index movies = Movie.all - render json: movies.as_json(only: KEYS), status: :ok + render json: movies.as_json(only: MOVIE_KEYS), status: :ok end - + def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) if movie - render json: movie.as_json(only: KEYS) + render json: movie.as_json(only: MOVIE_KEYS) return else render json: {"errors"=>["not found"]}, status: :not_found return end end - + def create new_movie = Movie.new(movie_params) if new_movie.save @@ -26,16 +26,16 @@ def create else render json: { errors: new_movie.errors.messages }, status: :bad_request end - + end - - + + private - + def movie_params params.require(:movie).permit(:title, :overview, :release_date, :inventory) - + end - - + + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 8fcbcb338..2697864b7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,5 +1,4 @@ require "test_helper" -CUSTOMER_KEYS = ["address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "state"] describe CustomersController do it "responds with JSON, success, and an array of customer hashes" do @@ -7,10 +6,10 @@ body = check_response(expected_type: Array) body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal CUSTOMER_KEYS + expect(customer.keys.sort).must_equal CUSTOMER_KEYS.sort end end - + it "will respond with an empty array when there are no customers" do Customer.destroy_all get customers_path diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53a9b360a..2b937d85d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,5 +1,4 @@ require "test_helper" -MOVIE_KEYS = ["id", "release_date", "title"] describe MoviesController do describe "index" do @@ -8,7 +7,7 @@ body = check_response(expected_type: Array) body.each do |movie| expect(movie).must_be_instance_of Hash - expect(movie.keys.sort).must_equal MOVIE_KEYS + expect(movie.keys.sort).must_equal MOVIE_KEYS.sort end end @@ -25,7 +24,7 @@ movie = movies(:movie2) get movie_path(movie.id) body = check_response(expected_type: Hash) - expect(body.keys.sort).must_equal MOVIE_KEYS + expect(body.keys.sort).must_equal MOVIE_KEYS.sort expect(body["title"]).must_equal movie.title end end From bcf2cf04bf32d4cde9739b76e06074a1c5caa895 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Wed, 6 Nov 2019 15:27:41 -0800 Subject: [PATCH 18/42] error handling test for movies controller show action --- test/controllers/movies_controller_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2b937d85d..e3a002a37 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -27,6 +27,16 @@ expect(body.keys.sort).must_equal MOVIE_KEYS.sort expect(body["title"]).must_equal movie.title end + + it "will respond with bad_request for invalid data" do + get movie_path(-1) + body = JSON.parse(response.body) + + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + expect(body).must_be_instance_of Hash + expect(body.keys).must_include "errors" + end end describe "create" do From 584615eebdca47a7564a9733f04e82cbd6bf4916 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Wed, 6 Nov 2019 17:34:40 -0800 Subject: [PATCH 19/42] updated strong params for movies controller --- app/controllers/movies_controller.rb | 2 +- db/schema.rb | 2 +- test/controllers/movies_controller_test.rb | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9c272d9f5..4a8581c97 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -33,7 +33,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end diff --git a/db/schema.rb b/db/schema.rb index 50ba84836..b4a65c2a4 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: 2019_11_06_045734) do +ActiveRecord::Schema.define(version: 2019_11_06_234556) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e3a002a37..7e5585b44 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -42,21 +42,20 @@ describe "create" do let(:movie_data) { { - movie: { title: "Birds", overview: "Lots of birds", release_date: Date.new, inventory: 5 - }}} + }} it "can create a new movie" do - expect{post movies_path, params: movie_data}.must_differ 'Movie.count', 1 + expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 must_respond_with :created end it "will respond with bad_request for invalid data" do - movie_data[:movie][:title] = nil + movie_data[:title] = nil expect {post movies_path, params: movie_data}.wont_change "Movie.count" From 2d741019480dff29565dfdce04b9bef05dbbb6f8 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Wed, 6 Nov 2019 18:09:04 -0800 Subject: [PATCH 20/42] passing all but one of the smoke tests --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 23 +++---- ...07020458_add_available_inventory_column.rb | 5 ++ db/schema.rb | 3 +- test/controllers/movies_controller_test.rb | 63 ++++++++++--------- 5 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 db/migrate/20191107020458_add_available_inventory_column.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 99b88a5c5..297590f32 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,4 @@ -CUSTOMER_KEYS = ["id", "name", "address", "city", "state", "postal_code", "phone", "movies_checked_out_count"] +CUSTOMER_KEYS = ["id", "name", "address", "city", "state", "postal_code", "phone", "movies_checked_out_count", "registered_at"] class CustomersController < ApplicationController diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4a8581c97..f6de39d53 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,24 +1,25 @@ MOVIE_KEYS = ["id", "title", "release_date"] +MOVIE_KEYS2 = ["id", "title", "overview", "release_date", "inventory", "available_inventory"] class MoviesController < ApplicationController - + def index movies = Movie.all render json: movies.as_json(only: MOVIE_KEYS), status: :ok end - + def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) if movie - render json: movie.as_json(only: MOVIE_KEYS) + render json: movie.as_json(only: MOVIE_KEYS2) return else render json: {"errors"=>["not found"]}, status: :not_found return end end - + def create new_movie = Movie.new(movie_params) if new_movie.save @@ -26,16 +27,16 @@ def create else render json: { errors: new_movie.errors.messages }, status: :bad_request end - + end - - + + private - + def movie_params params.permit(:title, :overview, :release_date, :inventory) - + end - - + + end diff --git a/db/migrate/20191107020458_add_available_inventory_column.rb b/db/migrate/20191107020458_add_available_inventory_column.rb new file mode 100644 index 000000000..38809ad92 --- /dev/null +++ b/db/migrate/20191107020458_add_available_inventory_column.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryColumn < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index b4a65c2a4..48e94537d 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: 2019_11_06_234556) do +ActiveRecord::Schema.define(version: 2019_11_07_020458) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 7e5585b44..bf9430fb3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -10,7 +10,7 @@ expect(movie.keys.sort).must_equal MOVIE_KEYS.sort end end - + it "will respond with an empty array when there are no movies" do Movie.destroy_all get movies_path @@ -18,52 +18,53 @@ expect(body).must_equal [] end end - + describe "show" do it "responds with one movie's hash" do movie = movies(:movie2) get movie_path(movie.id) body = check_response(expected_type: Hash) - expect(body.keys.sort).must_equal MOVIE_KEYS.sort + expect(body.keys.sort).must_equal MOVIE_KEYS2.sort expect(body["title"]).must_equal movie.title end - + it "will respond with bad_request for invalid data" do get movie_path(-1) body = JSON.parse(response.body) - + must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' expect(body).must_be_instance_of Hash expect(body.keys).must_include "errors" end end - + describe "create" do let(:movie_data) { - { - title: "Birds", - overview: "Lots of birds", - release_date: Date.new, - inventory: 5 - }} - - it "can create a new movie" do - expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 - - must_respond_with :created - end - - it "will respond with bad_request for invalid data" do - movie_data[:title] = nil - - expect {post movies_path, params: movie_data}.wont_change "Movie.count" - - must_respond_with :bad_request - - expect(response.header['Content-Type']).must_include 'json' - body = JSON.parse(response.body) - expect(body["errors"].keys).must_include "title" + { + title: "Birds", + overview: "Lots of birds", + release_date: Date.new, + inventory: 5 + }} + + it "can create a new movie" do + expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 + + must_respond_with :created + end + + it "will respond with bad_request for invalid data" do + movie_data[:title] = nil + + expect {post movies_path, params: movie_data}.wont_change "Movie.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end + end end - end -end + \ No newline at end of file From fbc783854a7a4b9f12c3b493d482a3e7dd6e721a Mon Sep 17 00:00:00 2001 From: dora1405 Date: Wed, 6 Nov 2019 18:11:16 -0800 Subject: [PATCH 21/42] Wave 2 smoke tests - all passed. Migration added in previous commit --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f6de39d53..76b8e21f0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -23,7 +23,7 @@ def show def create new_movie = Movie.new(movie_params) if new_movie.save - render json: new_movie.as_json(only: [:id]), status: :created + render json: new_movie.as_json(only: [:id]), status: :ok else render json: { errors: new_movie.errors.messages }, status: :bad_request end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index bf9430fb3..62bd7cfcf 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -51,7 +51,7 @@ it "can create a new movie" do expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 - must_respond_with :created + must_respond_with :ok end it "will respond with bad_request for invalid data" do From 457f366caf0acb4c95c3814a560cd879204e724e Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Wed, 6 Nov 2019 20:45:11 -0800 Subject: [PATCH 22/42] minor cleaning up of spaces, zomg --- app/controllers/customers_controller.rb | 5 -- test/controllers/movies_controller_test.rb | 56 ++++++++++------------ 2 files changed, 25 insertions(+), 36 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 297590f32..d754bc3d9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,11 +2,6 @@ class CustomersController < ApplicationController - # def zomg - # working = "it works!" - # render json: working, status: :ok - # end - def index customers = Customer.all.as_json(only: CUSTOMER_KEYS) render json: customers, status: :ok diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 62bd7cfcf..4de42c69f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -10,7 +10,7 @@ expect(movie.keys.sort).must_equal MOVIE_KEYS.sort end end - + it "will respond with an empty array when there are no movies" do Movie.destroy_all get movies_path @@ -18,7 +18,7 @@ expect(body).must_equal [] end end - + describe "show" do it "responds with one movie's hash" do movie = movies(:movie2) @@ -27,44 +27,38 @@ expect(body.keys.sort).must_equal MOVIE_KEYS2.sort expect(body["title"]).must_equal movie.title end - + it "will respond with bad_request for invalid data" do get movie_path(-1) body = JSON.parse(response.body) - + must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' expect(body).must_be_instance_of Hash expect(body.keys).must_include "errors" end end - + describe "create" do let(:movie_data) { - { - title: "Birds", - overview: "Lots of birds", - release_date: Date.new, - inventory: 5 - }} - - it "can create a new movie" do - expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 - - must_respond_with :ok - end - - it "will respond with bad_request for invalid data" do - movie_data[:title] = nil - - expect {post movies_path, params: movie_data}.wont_change "Movie.count" - - must_respond_with :bad_request - - expect(response.header['Content-Type']).must_include 'json' - body = JSON.parse(response.body) - expect(body["errors"].keys).must_include "title" - end - end + { + title: "Birds", + overview: "Lots of birds", + release_date: Date.new, + inventory: 5}} + + it "can create a new movie" do + expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 + must_respond_with :ok end - \ No newline at end of file + + it "will respond with bad_request for invalid data" do + movie_data[:title] = nil + expect {post movies_path, params: movie_data}.wont_change "Movie.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end + end +end From 3d390a1afaf593ca7000c9ca9356fccd7807a22b Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 13:03:12 -0800 Subject: [PATCH 23/42] add column to rental for due date, start writing rentals functionality --- app/controllers/rentals_controller.rb | 39 ++++++++++++++++++- ...107175820_add_column_due_date_to_rental.rb | 5 +++ db/schema.rb | 3 +- test/controllers/rentals_controller_test.rb | 4 +- 4 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20191107175820_add_column_due_date_to_rental.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..310c644bc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,39 @@ class RentalsController < ApplicationController -end + def checkout + movie = Movie.find_by(id: params[movie_id]) + if movie.nil? + render json: {"errors" => ["not found"]}, status: :not_found + return + end + customer = Customer.find_by(id: params[customer_id]) + if customer.nil? + render json: {"errors" => ["not found"]}, status: :not_found + return + end + + if movie.inventory < 1 + render json: {"errors" => ["not in stock"]}, status: :bad_request + return + end + rental = Rental.new(rental_params) + rental.checkout_date = Date.now + rental.due_date = checkout_date + 7 + + if rental.save + render json: rental.as_json, status: :ok + movie.inventory -= 1 + customer.movies_checked_out_count += 1 + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + end + def checkin + # add back to inventory + end + + private + + def rental_params + params.require(:rental).permit(:checkout_date, :checkin_date, :customer_id, :movie_id, :due_date) + end + \ No newline at end of file diff --git a/db/migrate/20191107175820_add_column_due_date_to_rental.rb b/db/migrate/20191107175820_add_column_due_date_to_rental.rb new file mode 100644 index 000000000..c1090f5ed --- /dev/null +++ b/db/migrate/20191107175820_add_column_due_date_to_rental.rb @@ -0,0 +1,5 @@ +class AddColumnDueDateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 48e94537d..2ba5bf4f1 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: 2019_11_07_020458) do +ActiveRecord::Schema.define(version: 2019_11_07_175820) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.date "due_date" 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/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..7c12b8f40 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,5 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + end From fdfb6482fc0a6a26bc9c63899572513eb757c275 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 13:23:07 -0800 Subject: [PATCH 24/42] added checkout and checkin routes to routes file, wrote some rentals controllers tests --- app/controllers/rentals_controller.rb | 11 +++++---- config/routes.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 25 +++++++++++++++++++++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 310c644bc..9d7a27b73 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -10,15 +10,15 @@ def checkout render json: {"errors" => ["not found"]}, status: :not_found return end - + if movie.inventory < 1 render json: {"errors" => ["not in stock"]}, status: :bad_request return end rental = Rental.new(rental_params) - rental.checkout_date = Date.now + rental.checkout_date = Date.today rental.due_date = checkout_date + 7 - + if rental.save render json: rental.as_json, status: :ok movie.inventory -= 1 @@ -30,10 +30,9 @@ def checkout def checkin # add back to inventory end - + private - + def rental_params params.require(:rental).permit(:checkout_date, :checkin_date, :customer_id, :movie_id, :due_date) end - \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 711caf949..5fd2d8c13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,9 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get "/customers/zomg", to: "customers#zomg", as: "customer_zomg" resources :customers, only: [:index] resources :movies resources :rentals + 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 7c12b8f40..b6b440784 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,5 +1,30 @@ require "test_helper" describe RentalsController do + describe "checkout" do + it "creates a new instance of Rental with valid input" do + end + it "assigns the current date to checkout_date" do + end + it "assigns due date as a week from current date" do + end + it "throws an error if invalid movie" do + end + it "throws an error if invalid customer" do + end + it "throws an error if movie inventory is zero" do + end + it "if rental successfully created, movie inventory is decreased by one" do + end + it "if rental succesfully created, custoer's movies checked out count increased by one" do + end + end + describe "checkin" do + it "can successfully check a rental back in with valid input" do + end + it "increases movie's inventory by one if successfully checked back in" do + end + + end end From b4ba1b7b2336c5be0e064015cc0b0c58d8cc3d55 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 13:44:02 -0800 Subject: [PATCH 25/42] try to get checkout working by changing params --- app/controllers/rentals_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9d7a27b73..09acdd366 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,11 @@ class RentalsController < ApplicationController def checkout - movie = Movie.find_by(id: params[movie_id]) + movie = Movie.find_by(id: rental_params[:movie_id]) if movie.nil? render json: {"errors" => ["not found"]}, status: :not_found return end - customer = Customer.find_by(id: params[customer_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) if customer.nil? render json: {"errors" => ["not found"]}, status: :not_found return @@ -24,7 +24,8 @@ def checkout movie.inventory -= 1 customer.movies_checked_out_count += 1 else - render json: { errors: rental.errors.messages }, status: :bad_request + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + rental end end def checkin @@ -36,3 +37,4 @@ def checkin def rental_params params.require(:rental).permit(:checkout_date, :checkin_date, :customer_id, :movie_id, :due_date) end +end \ No newline at end of file From 3b95ecfd3f86dd3648ca86ead8d549085add329b Mon Sep 17 00:00:00 2001 From: dora1405 Date: Thu, 7 Nov 2019 14:05:43 -0800 Subject: [PATCH 26/42] set default values for registered_at and available_inventory in migration --- ...220024_set_available_inventory_default_to_inventory.rb | 8 ++++++++ ...91107220335_set_registered_at_default_to_created_at.rb | 8 ++++++++ db/schema.rb | 2 +- test/fixtures/movies.yml | 4 +++- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20191107220024_set_available_inventory_default_to_inventory.rb create mode 100644 db/migrate/20191107220335_set_registered_at_default_to_created_at.rb diff --git a/db/migrate/20191107220024_set_available_inventory_default_to_inventory.rb b/db/migrate/20191107220024_set_available_inventory_default_to_inventory.rb new file mode 100644 index 000000000..e1e441450 --- /dev/null +++ b/db/migrate/20191107220024_set_available_inventory_default_to_inventory.rb @@ -0,0 +1,8 @@ +class SetAvailableInventoryDefaultToInventory < ActiveRecord::Migration[5.2] + def self.up + Movie.update_all("available_inventory=inventory") + end + + def self.down + end +end diff --git a/db/migrate/20191107220335_set_registered_at_default_to_created_at.rb b/db/migrate/20191107220335_set_registered_at_default_to_created_at.rb new file mode 100644 index 000000000..7b23fae34 --- /dev/null +++ b/db/migrate/20191107220335_set_registered_at_default_to_created_at.rb @@ -0,0 +1,8 @@ +class SetRegisteredAtDefaultToCreatedAt < ActiveRecord::Migration[5.2] + def self.up + Customer.update_all("registered_at=created_at") + end + + def self.down + end +end diff --git a/db/schema.rb b/db/schema.rb index 2ba5bf4f1..10f6cb47b 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: 2019_11_07_175820) do +ActiveRecord::Schema.define(version: 2019_11_07_220335) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 2c0529e7b..3e9d23858 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,7 +1,9 @@ movie1: title: "Rear Window" inventory: 5 + available_inventory: 3 movie2: title: "Clue" - inventory: 3 \ No newline at end of file + inventory: 3 + available_inventory: 3 \ No newline at end of file From 30ef43ebc9a2d40c941da456d7719812f62fb2d1 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 14:12:11 -0800 Subject: [PATCH 27/42] tweaks in rental controller --- app/controllers/rentals_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 09acdd366..51e749e3a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,17 +11,17 @@ def checkout return end - if movie.inventory < 1 + if movie.available_inventory.nil? || movie.available_inventory < 1 render json: {"errors" => ["not in stock"]}, status: :bad_request return end rental = Rental.new(rental_params) rental.checkout_date = Date.today - rental.due_date = checkout_date + 7 + rental.due_date = rental.checkout_date + 7 if rental.save render json: rental.as_json, status: :ok - movie.inventory -= 1 + movie.available_inventory -= 1 customer.movies_checked_out_count += 1 else render json: { ok: false, errors: rental.errors.messages }, status: :bad_request From c4f3e1abd9389e88e7ea7f67f3ff18955d0ecba5 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Thu, 7 Nov 2019 15:07:56 -0800 Subject: [PATCH 28/42] 3 tests passing for rentals controller. Creating a new rental and errors for invalid movie and customer --- app/controllers/rentals_controller.rb | 10 +++++-- test/controllers/rentals_controller_test.rb | 31 +++++++++++++++++++-- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 51e749e3a..f9c5a0e86 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,27 +2,31 @@ class RentalsController < ApplicationController def checkout movie = Movie.find_by(id: rental_params[:movie_id]) if movie.nil? + puts "######################################" render json: {"errors" => ["not found"]}, status: :not_found return end + puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" customer = Customer.find_by(id: rental_params[:customer_id]) if customer.nil? render json: {"errors" => ["not found"]}, status: :not_found return end + puts "********************************************" if movie.available_inventory.nil? || movie.available_inventory < 1 render json: {"errors" => ["not in stock"]}, status: :bad_request return end + p rental_params rental = Rental.new(rental_params) rental.checkout_date = Date.today rental.due_date = rental.checkout_date + 7 - + if rental.save - render json: rental.as_json, status: :ok movie.available_inventory -= 1 customer.movies_checked_out_count += 1 + render json: rental.as_json, status: :ok else render json: { ok: false, errors: rental.errors.messages }, status: :bad_request rental @@ -35,6 +39,6 @@ def checkin private def rental_params - params.require(:rental).permit(:checkout_date, :checkin_date, :customer_id, :movie_id, :due_date) + params.permit(:checkout_date, :checkin_date, :customer_id, :movie_id, :due_date) end end \ No newline at end of file diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b6b440784..f7395e18b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,24 +2,51 @@ describe RentalsController do describe "checkout" do - it "creates a new instance of Rental with valid input" do + let(:customer) { + customers(:janice) + } + let(:movie) { + movies(:movie1) + } + let(:rental_data) { + { + customer_id: customer.id, + movie_id: movie.id + } + } + + it "creates a new Rental with valid input" do + expect{post checkout_path, params: rental_data}.must_change 'Rental.count', 1 + + must_respond_with :ok + end + it "assigns the current date to checkout_date" do end it "assigns due date as a week from current date" do end it "throws an error if invalid movie" do + rental_data[:movie_id] = nil + expect {post checkout_path, params: rental_data}.wont_change "Rental.count" + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' end it "throws an error if invalid customer" do + rental_data[:customer_id] = nil + expect {post checkout_path, params: rental_data}.wont_change "Rental.count" + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' end it "throws an error if movie inventory is zero" do + end it "if rental successfully created, movie inventory is decreased by one" do end it "if rental succesfully created, custoer's movies checked out count increased by one" do end end - + describe "checkin" do it "can successfully check a rental back in with valid input" do end From 46d711b20ef00933cbb7d2999b440610dd203b6b Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 15:11:09 -0800 Subject: [PATCH 29/42] tweak in rental controller --- app/controllers/rentals_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 51e749e3a..48badc875 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -12,7 +12,7 @@ def checkout end if movie.available_inventory.nil? || movie.available_inventory < 1 - render json: {"errors" => ["not in stock"]}, status: :bad_request + render json: {"errors" => ["out of stock"]}, status: :bad_request return end rental = Rental.new(rental_params) @@ -20,9 +20,9 @@ def checkout rental.due_date = rental.checkout_date + 7 if rental.save - render json: rental.as_json, status: :ok movie.available_inventory -= 1 customer.movies_checked_out_count += 1 + render json: rental.as_json, status: :ok else render json: { ok: false, errors: rental.errors.messages }, status: :bad_request rental From 231510d2f3f20055ea1bf2652d1af835eef67a54 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 15:46:07 -0800 Subject: [PATCH 30/42] take out debugging stuff, write more passing tests --- app/controllers/rentals_controller.rb | 8 +++----- test/controllers/rentals_controller_test.rb | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c4f04a326..054205138 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,27 +2,25 @@ class RentalsController < ApplicationController def checkout movie = Movie.find_by(id: rental_params[:movie_id]) if movie.nil? - puts "######################################" render json: {"errors" => ["not found"]}, status: :not_found return end - puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + customer = Customer.find_by(id: rental_params[:customer_id]) if customer.nil? render json: {"errors" => ["not found"]}, status: :not_found return end - puts "********************************************" if movie.available_inventory.nil? || movie.available_inventory < 1 render json: {"errors" => ["out of stock"]}, status: :bad_request return end - p rental_params + rental = Rental.new(rental_params) rental.checkout_date = Date.today rental.due_date = rental.checkout_date + 7 - + if rental.save movie.available_inventory -= 1 customer.movies_checked_out_count += 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f7395e18b..09359079d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,18 +14,24 @@ movie_id: movie.id } } - + it "creates a new Rental with valid input" do expect{post checkout_path, params: rental_data}.must_change 'Rental.count', 1 - must_respond_with :ok - end - + it "assigns the current date to checkout_date" do + post checkout_path, params: rental_data + rental = Rental.last + expect(rental.checkout_date).must_equal Date.today end + it "assigns due date as a week from current date" do + post checkout_path, params: rental_data + rental = Rental.last + expect(rental.due_date).must_equal (Date.today + 7) end + it "throws an error if invalid movie" do rental_data[:movie_id] = nil expect {post checkout_path, params: rental_data}.wont_change "Rental.count" @@ -39,19 +45,19 @@ expect(response.header['Content-Type']).must_include 'json' end it "throws an error if movie inventory is zero" do - + end it "if rental successfully created, movie inventory is decreased by one" do end it "if rental succesfully created, custoer's movies checked out count increased by one" do end end - + describe "checkin" do it "can successfully check a rental back in with valid input" do end it "increases movie's inventory by one if successfully checked back in" do end - + end end From 7967a5e423f862d87fc79f2328947fea17828e01 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 16:13:35 -0800 Subject: [PATCH 31/42] add more passing rental controller tests and two not yet passing --- test/controllers/rentals_controller_test.rb | 15 +++++++++++++-- test/fixtures/customers.yml | 1 + test/fixtures/movies.yml | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 09359079d..34f0a6ad1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -31,25 +31,36 @@ rental = Rental.last expect(rental.due_date).must_equal (Date.today + 7) end - + it "throws an error if invalid movie" do rental_data[:movie_id] = nil expect {post checkout_path, params: rental_data}.wont_change "Rental.count" must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' end + it "throws an error if invalid customer" do rental_data[:customer_id] = nil expect {post checkout_path, params: rental_data}.wont_change "Rental.count" must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' end - it "throws an error if movie inventory is zero" do + it "throws an error if movie inventory is zero" do + rental_data[:movie_id] = movies(:movie3).id + expect {post checkout_path, params: rental_data}.wont_change "Rental.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' end + it "if rental successfully created, movie inventory is decreased by one" do + post checkout_path, params: rental_data + expect(movies(:movie1).available_inventory).must_equal 2 end + it "if rental succesfully created, custoer's movies checked out count increased by one" do + post checkout_path, params: rental_data + expect(customers(:janice).movies_checked_out_count).must_equal 1 end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 0686861d0..418c518d9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,6 +6,7 @@ janice: phone: doh postal_code: somewhere state: doh + movies_checked_out_count: 0 dora: name: "Dora" diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 3e9d23858..7c49fa692 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -6,4 +6,9 @@ movie1: movie2: title: "Clue" inventory: 3 - available_inventory: 3 \ No newline at end of file + available_inventory: 3 + +movie3: + title: "Godzilla" + inventory: 1 + available_inventory: 0 \ No newline at end of file From 8a1928e94682acffe104146319ccf796c17753ed Mon Sep 17 00:00:00 2001 From: dora1405 Date: Thu, 7 Nov 2019 18:33:38 -0800 Subject: [PATCH 32/42] passing tests for rentals controller checkout action --- app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 9 +++++++-- test/fixtures/customers.yml | 2 +- test/fixtures/movies.yml | 7 ++++++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 054205138..b75990ed5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,7 +23,9 @@ def checkout if rental.save movie.available_inventory -= 1 + movie.save customer.movies_checked_out_count += 1 + customer.save render json: rental.as_json, status: :ok else render json: { ok: false, errors: rental.errors.messages }, status: :bad_request diff --git a/config/routes.rb b/config/routes.rb index 5fd2d8c13..6f3cf5590 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ resources :customers, only: [:index] resources :movies resources :rentals - 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/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 34f0a6ad1..0e337fe03 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -55,12 +55,17 @@ it "if rental successfully created, movie inventory is decreased by one" do post checkout_path, params: rental_data - expect(movies(:movie1).available_inventory).must_equal 2 + movie = Movie.find_by(id: movies(:movie1).id) + + expect(movie.available_inventory).must_equal 2 end it "if rental succesfully created, custoer's movies checked out count increased by one" do + rental_data[:movie_id] = movies(:movie4).id post checkout_path, params: rental_data - expect(customers(:janice).movies_checked_out_count).must_equal 1 + customer = Customer.find_by(id: customers(:janice).id) + + expect(customer.movies_checked_out_count).must_equal 3 end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 418c518d9..3453c38ee 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,7 +6,7 @@ janice: phone: doh postal_code: somewhere state: doh - movies_checked_out_count: 0 + movies_checked_out_count: 2 dora: name: "Dora" diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 7c49fa692..3c3e4cbca 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,4 +11,9 @@ movie2: movie3: title: "Godzilla" inventory: 1 - available_inventory: 0 \ No newline at end of file + available_inventory: 0 + +movie4: + title: "Batman" + inventory: 1 + available_inventory: 1 \ No newline at end of file From 79e24054a1681bc3b744fec59fe3b5a762401358 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Thu, 7 Nov 2019 20:54:45 -0800 Subject: [PATCH 33/42] codes for checkin action and tests. 3 tests errors and need to find existing rental id --- app/controllers/rentals_controller.rb | 36 +++++++++++++++++---- test/controllers/rentals_controller_test.rb | 14 +++++++- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b75990ed5..50231488e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,22 +5,22 @@ def checkout render json: {"errors" => ["not found"]}, status: :not_found return end - + customer = Customer.find_by(id: rental_params[:customer_id]) if customer.nil? render json: {"errors" => ["not found"]}, status: :not_found return end - + if movie.available_inventory.nil? || movie.available_inventory < 1 render json: {"errors" => ["out of stock"]}, status: :bad_request return end - + rental = Rental.new(rental_params) rental.checkout_date = Date.today rental.due_date = rental.checkout_date + 7 - + if rental.save movie.available_inventory -= 1 movie.save @@ -32,12 +32,34 @@ def checkout rental end end + def checkin - # add back to inventory + # find rental from rental id + puts "*************************************" + rental = Rental.find_by(id: rental_params[:id]) + p rental + # update checkin_date + rental.checkin_date = Date.today + puts "#####################################" + movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) + + # update rental + if rental.update + movie.available_inventory += 1 + movie.save + customer.movies_checked_out_count -= 1 + customer.save + render json: rental.as_json, status: :ok + else + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + rental + end + end - + private - + def rental_params params.permit(:checkout_date, :checkin_date, :customer_id, :movie_id, :due_date) end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0e337fe03..05f41d22c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -60,7 +60,7 @@ expect(movie.available_inventory).must_equal 2 end - it "if rental succesfully created, custoer's movies checked out count increased by one" do + it "if rental succesfully created, customer's movies checked out count increased by one" do rental_data[:movie_id] = movies(:movie4).id post checkout_path, params: rental_data customer = Customer.find_by(id: customers(:janice).id) @@ -71,9 +71,21 @@ describe "checkin" do it "can successfully check a rental back in with valid input" do + expect{post checkin_path, params: rental_data}.wont_change 'Rental.count' + must_respond_with :ok end it "increases movie's inventory by one if successfully checked back in" do + post checkin_path, params: rental_data + movie = Movie.find_by(id: movies(:movie1).id) + + expect(movie.available_inventory).must_equal 1 end + it "decreases customer's movies checked out count by one" do + rental_data[:movie_id] = movies(:movie4).id + post checkin_path, params: rental_data + customer = Customer.find_by(id: customers(:janice).id) + expect(customer.movies_checked_out_count).must_equal 2 + end end end From a8752c48b1a5b6eeed049d2c05d7378ae45e52cd Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Thu, 7 Nov 2019 21:37:08 -0800 Subject: [PATCH 34/42] add before_initialize method set_available_inventory to movies model --- app/controllers/movies_controller.rb | 23 ++++++++------ app/models/movie.rb | 6 ++++ test/controllers/movies_controller_test.rb | 36 +++++++++++----------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 76b8e21f0..e1720d3a7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,12 +2,13 @@ MOVIE_KEYS2 = ["id", "title", "overview", "release_date", "inventory", "available_inventory"] class MoviesController < ApplicationController - + + def index movies = Movie.all render json: movies.as_json(only: MOVIE_KEYS), status: :ok end - + def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) @@ -19,7 +20,7 @@ def show return end end - + def create new_movie = Movie.new(movie_params) if new_movie.save @@ -27,16 +28,18 @@ def create else render json: { errors: new_movie.errors.messages }, status: :bad_request end - + end - - + + private - + def movie_params params.permit(:title, :overview, :release_date, :inventory) - + + + end - - + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 695c9d6b0..5ebf92a63 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,4 +4,10 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than: -1 } + after_initialize :set_available_inventory, only: [:create] + + def set_available_inventory + self.available_inventory = self.inventory + self.save! + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 4de42c69f..7f5d8be77 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -41,24 +41,24 @@ describe "create" do let(:movie_data) { - { - title: "Birds", - overview: "Lots of birds", - release_date: Date.new, - inventory: 5}} + { + title: "Birds", + overview: "Lots of birds", + release_date: Date.new, + inventory: 5}} - it "can create a new movie" do - expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 - must_respond_with :ok - end + it "can create a new movie" do + expect{post movies_path, params: movie_data}.must_change 'Movie.count', 1 + must_respond_with :ok + end - it "will respond with bad_request for invalid data" do - movie_data[:title] = nil - expect {post movies_path, params: movie_data}.wont_change "Movie.count" - must_respond_with :bad_request - expect(response.header['Content-Type']).must_include 'json' - body = JSON.parse(response.body) - expect(body["errors"].keys).must_include "title" + it "will respond with bad_request for invalid data" do + movie_data[:title] = nil + expect {post movies_path, params: movie_data}.wont_change "Movie.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end + end end - end -end From 1044dec178133d6112c6f880280a0d1de0cf2ad9 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Fri, 8 Nov 2019 06:33:17 -0800 Subject: [PATCH 35/42] copied let blocks into checkin describe block --- test/controllers/rentals_controller_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 05f41d22c..3f4817045 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -70,6 +70,18 @@ end describe "checkin" do + let(:customer) { + customers(:janice) + } + let(:movie) { + movies(:movie1) + } + let(:rental_data) { + { + customer_id: customer.id, + movie_id: movie.id + } + } it "can successfully check a rental back in with valid input" do expect{post checkin_path, params: rental_data}.wont_change 'Rental.count' must_respond_with :ok From 90e5597a836a6c0d0ab1cd66f2e42c36fc7144b1 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Fri, 8 Nov 2019 08:24:52 -0800 Subject: [PATCH 36/42] fixed movie model method so won't throw error on invalid creations --- app/models/movie.rb | 5 ++++- test/models/movie_test.rb | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 5ebf92a63..779fddafd 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,13 +1,16 @@ class Movie < ApplicationRecord has_many :rentals, dependent: :nullify has_many :customers, through: :rentals, dependent: :nullify + after_initialize :set_available_inventory, only: [:save], if: :new_record? validates :title, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than: -1 } - after_initialize :set_available_inventory, only: [:create] + def set_available_inventory + if self.valid? self.available_inventory = self.inventory self.save! + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 647d55e55..00b19cb6b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -46,4 +46,9 @@ end end end + + describe "custom methods" do + it "populates available_inventory field to inventory value upon creation" do + end + end end From e93e072670b35ee5856e5e53aff52a1a2f79e81e Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Fri, 8 Nov 2019 10:56:23 -0800 Subject: [PATCH 37/42] add model test for available_inventory method in movie model --- test/models/movie_test.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 00b19cb6b..a908b9409 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -49,6 +49,9 @@ describe "custom methods" do it "populates available_inventory field to inventory value upon creation" do + new_movie = Movie.new(title: "Mary Poppins", overview: "Magical nanny floats in with a gust of wind", inventory: 3) + new_movie.save + expect(new_movie.available_inventory).must_equal 3 end end end From 006290366110f1a83e8b65ffe0cae9406eb11f26 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Fri, 8 Nov 2019 13:27:49 -0800 Subject: [PATCH 38/42] some change I have forgotten... --- app/controllers/movies_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e1720d3a7..63285ab56 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -24,6 +24,9 @@ def show def create new_movie = Movie.new(movie_params) if new_movie.save + # if new_movie.release_date.class == String + # new_movie.release_date = Date.parse(new_movie.release_date) + # end render json: new_movie.as_json(only: [:id]), status: :ok else render json: { errors: new_movie.errors.messages }, status: :bad_request @@ -36,9 +39,6 @@ def create def movie_params params.permit(:title, :overview, :release_date, :inventory) - - - end From 5cc06b027138eef20715b17ee1bd3d8522148a59 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Fri, 8 Nov 2019 13:28:02 -0800 Subject: [PATCH 39/42] completed checkin action for rentals. Tests are WIP --- app/controllers/rentals_controller.rb | 13 +++---------- test/controllers/rentals_controller_test.rb | 2 ++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 50231488e..79d41694d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,18 +34,11 @@ def checkout end def checkin - # find rental from rental id - puts "*************************************" - rental = Rental.find_by(id: rental_params[:id]) - p rental - # update checkin_date - rental.checkin_date = Date.today - puts "#####################################" + movie = Movie.find_by(id: rental_params[:movie_id]) customer = Customer.find_by(id: rental_params[:customer_id]) - - # update rental - if rental.update + if rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental.checkin_date = Date.today movie.available_inventory += 1 movie.save customer.movies_checked_out_count -= 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3f4817045..91ac37612 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -83,6 +83,8 @@ } } it "can successfully check a rental back in with valid input" do + expect{post checkout_path, params: rental_data}.must_change 'Rental.count', 1 + expect{post checkin_path, params: rental_data}.wont_change 'Rental.count' must_respond_with :ok end From a6797e1abb93d2e373df45fbc1a2a2c59be78666 Mon Sep 17 00:00:00 2001 From: dora1405 Date: Fri, 8 Nov 2019 13:44:36 -0800 Subject: [PATCH 40/42] 3 tests passing for checkin --- test/controllers/rentals_controller_test.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 91ac37612..bcb69a438 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -88,17 +88,24 @@ expect{post checkin_path, params: rental_data}.wont_change 'Rental.count' must_respond_with :ok end + it "increases movie's inventory by one if successfully checked back in" do - post checkin_path, params: rental_data + post checkout_path(rental_data) movie = Movie.find_by(id: movies(:movie1).id) + expect(movie.available_inventory).must_equal 2 - expect(movie.available_inventory).must_equal 1 + post checkin_path, params: rental_data + movie = Movie.find_by(id: movies(:movie1).id) + expect(movie.available_inventory).must_equal 3 end + it "decreases customer's movies checked out count by one" do - rental_data[:movie_id] = movies(:movie4).id - post checkin_path, params: rental_data + post checkout_path(rental_data) customer = Customer.find_by(id: customers(:janice).id) + expect(customer.movies_checked_out_count).must_equal 3 + post checkin_path, params: rental_data + customer = Customer.find_by(id: customers(:janice).id) expect(customer.movies_checked_out_count).must_equal 2 end end From 2637eee30143957e02c0cb04b716887507ec941c Mon Sep 17 00:00:00 2001 From: dora1405 Date: Fri, 8 Nov 2019 14:08:47 -0800 Subject: [PATCH 41/42] final draft for rental controller checkin tests --- app/controllers/rentals_controller.rb | 17 ++++++-- test/controllers/rentals_controller_test.rb | 47 +++++++++++++++++++-- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 79d41694d..723460d0f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,18 +2,18 @@ class RentalsController < ApplicationController def checkout movie = Movie.find_by(id: rental_params[:movie_id]) if movie.nil? - render json: {"errors" => ["not found"]}, status: :not_found + render json: {"errors" => ["movie not found"]}, status: :not_found return end customer = Customer.find_by(id: rental_params[:customer_id]) if customer.nil? - render json: {"errors" => ["not found"]}, status: :not_found + render json: {"errors" => ["customer not found"]}, status: :not_found return end if movie.available_inventory.nil? || movie.available_inventory < 1 - render json: {"errors" => ["out of stock"]}, status: :bad_request + render json: {"errors" => ["movie out of stock"]}, status: :bad_request return end @@ -36,16 +36,25 @@ def checkout def checkin movie = Movie.find_by(id: rental_params[:movie_id]) + if movie.nil? + render json: {"errors" => ["movie not found"]}, status: :not_found + return + end customer = Customer.find_by(id: rental_params[:customer_id]) + if customer.nil? + render json: {"errors" => ["customer not found"]}, status: :not_found + return + end if rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) rental.checkin_date = Date.today + rental.save movie.available_inventory += 1 movie.save customer.movies_checked_out_count -= 1 customer.save render json: rental.as_json, status: :ok else - render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + render json: { ok: false, "errors" => ["rental not found"] }, status: :not_found rental end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index bcb69a438..6a53d5736 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -82,19 +82,28 @@ movie_id: movie.id } } + let(:invalid_movie) { + movies(:movie3) + } + let(:invalid_rental_data) { + { + customer_id: customer.id, + movie_id: invalid_movie.id + } + } it "can successfully check a rental back in with valid input" do expect{post checkout_path, params: rental_data}.must_change 'Rental.count', 1 expect{post checkin_path, params: rental_data}.wont_change 'Rental.count' must_respond_with :ok end - + it "increases movie's inventory by one if successfully checked back in" do post checkout_path(rental_data) movie = Movie.find_by(id: movies(:movie1).id) expect(movie.available_inventory).must_equal 2 - post checkin_path, params: rental_data + post checkin_path(rental_data) movie = Movie.find_by(id: movies(:movie1).id) expect(movie.available_inventory).must_equal 3 end @@ -104,9 +113,41 @@ customer = Customer.find_by(id: customers(:janice).id) expect(customer.movies_checked_out_count).must_equal 3 - post checkin_path, params: rental_data + post checkin_path(rental_data) customer = Customer.find_by(id: customers(:janice).id) expect(customer.movies_checked_out_count).must_equal 2 end + + it "throws an error if invalid movie" do + post checkout_path(rental_data) + movie = Movie.find_by(id: movies(:movie1).id) + expect(movie.available_inventory).must_equal 2 + + rental_data[:movie_id] = nil + post checkin_path(rental_data) + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + end + + it "throws an error if invalid customer" do + post checkout_path(rental_data) + customer = Customer.find_by(id: customers(:janice).id) + expect(customer.movies_checked_out_count).must_equal 3 + + rental_data[:customer_id] = nil + post checkin_path(rental_data) + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + end + + it "throws an error if rental cannot be found" do + post checkout_path(rental_data) + movie = Movie.find_by(id: movies(:movie1).id) + expect(movie.available_inventory).must_equal 2 + + post checkin_path(invalid_rental_data) + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + end end end From 03295e0f938c87eb1959a0c43bb44fbebc9c9077 Mon Sep 17 00:00:00 2001 From: Janice Huang Date: Fri, 8 Nov 2019 14:09:35 -0800 Subject: [PATCH 42/42] clean up files--dele whitespace --- app/controllers/customers_controller.rb | 1 - app/controllers/movies_controller.rb | 5 ----- test/controllers/customers_controller_test.rb | 16 +++++++++------- test/controllers/rentals_controller_test.rb | 5 +---- test/models/customer_test.rb | 1 - test/models/movie_test.rb | 1 + test/models/rental_test.rb | 7 +++---- 7 files changed, 14 insertions(+), 22 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d754bc3d9..b877231a9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -6,5 +6,4 @@ def index customers = Customer.all.as_json(only: CUSTOMER_KEYS) render json: customers, status: :ok end - end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 63285ab56..70ec02f3f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,7 +3,6 @@ class MoviesController < ApplicationController - def index movies = Movie.all render json: movies.as_json(only: MOVIE_KEYS), status: :ok @@ -31,15 +30,11 @@ def create else render json: { errors: new_movie.errors.messages }, status: :bad_request end - end - private def movie_params params.permit(:title, :overview, :release_date, :inventory) end - - end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2697864b7..2f45fe86e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,15 +1,17 @@ require "test_helper" describe CustomersController do - it "responds with JSON, success, and an array of customer hashes" do - get customers_path - body = check_response(expected_type: Array) - body.each do |customer| - expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal CUSTOMER_KEYS.sort + describe "index" do + it "responds with JSON, success, and an array of customer hashes" do + get customers_path + body = check_response(expected_type: Array) + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_KEYS.sort + end end end - + it "will respond with an empty array when there are no customers" do Customer.destroy_all get customers_path diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index bcb69a438..841bd1647 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -56,7 +56,6 @@ it "if rental successfully created, movie inventory is decreased by one" do post checkout_path, params: rental_data movie = Movie.find_by(id: movies(:movie1).id) - expect(movie.available_inventory).must_equal 2 end @@ -64,7 +63,6 @@ rental_data[:movie_id] = movies(:movie4).id post checkout_path, params: rental_data customer = Customer.find_by(id: customers(:janice).id) - expect(customer.movies_checked_out_count).must_equal 3 end end @@ -84,11 +82,10 @@ } it "can successfully check a rental back in with valid input" do expect{post checkout_path, params: rental_data}.must_change 'Rental.count', 1 - expect{post checkin_path, params: rental_data}.wont_change 'Rental.count' must_respond_with :ok end - + it "increases movie's inventory by one if successfully checked back in" do post checkout_path(rental_data) movie = Movie.find_by(id: movies(:movie1).id) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 201469d07..911150af6 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -23,7 +23,6 @@ it "can have many rentals" do valid_customer = customers(:janice) - expect(valid_customer.rentals.count).must_equal 2 valid_customer.rentals.each do |rental| _(rental).must_be_kind_of Rental diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a908b9409..f3ecf440c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -5,6 +5,7 @@ before do @movie = movies(:movie2) end + it "must be valid with title and non-negative integer inventory" do expect(@movie.valid?).must_equal true end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 409bf2db6..75b3c05b2 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -3,16 +3,15 @@ describe Rental do let (:rental1) {rentals(:rental1) } describe "relationships" do - + it "belongs to movie" do expect(rental1.movie).must_be_instance_of Movie expect(rental1.movie).wont_be_nil end - + it "belongs to customer" do expect(rental1.customer).must_be_instance_of Customer - expect(rental1.customer).wont_be_nil + expect(rental1.customer).wont_be_nil end - end end