From 2874f6b4fa707754e8f3c527ac6a4d114cb4ef7e Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 14:01:50 -0800 Subject: [PATCH 01/42] rails initial setup --- .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 | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 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 | 3 + 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/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 58 files changed, 932 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/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/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..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..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..858212ec8 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Rm/sdGMs3drmGKayjiVMs7UJF6NCROp8AY5237+QAB/omm/U5w3+X1vNDWEp0pvYUcD8scMQMTPeujKWvb/r1/k3k4QYul4W8F93YRDHTk2SOWSUWYWQ7jY1J2AdYXYnfy+z77U5iOPpdivaZiJBj3MbgOd39KSgxHBNvy1jhvpi+yDUA1sC2rSQFe3Mc4uh4UX9DXfuOyR0zDjkOWMWWaVQmGBoYNrRSPlmjyr9HjHLEA/HqIUqqipduDXkN4i6fwiGyvqOGsL4ChBkuLm4vKQz0WomvGDtLOZB1oGYDte/MeFnqsDuoDUzJjee/hp+25vhGYuI5aY1AlUMtctgm3Hukp/z12omjudHm7TRE/zkX51sK26MUb+xf5xo0EPBAiAYi9OQMoUSpNAGOOxVWXQxO5OrUwwnvQRW--GQmNsUs0utBNEhFT--cECZM1gflwaLwKtqIHFkvA== \ 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..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/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/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 249764578723f4f5f61058d0299d24d05c2b2231 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 14:07:35 -0800 Subject: [PATCH 02/42] Generated customer and movie models --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + db/migrate/20191105220353_create_customers.rb | 14 +++++++ db/migrate/20191105220616_create_movies.rb | 11 ++++++ db/schema.rb | 39 +++++++++++++++++++ test/models/customer_test.rb | 7 ++++ test/models/movie_test.rb | 7 ++++ 7 files changed, 82 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20191105220353_create_customers.rb create mode 100644 db/migrate/20191105220616_create_movies.rb create mode 100644 db/schema.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20191105220353_create_customers.rb b/db/migrate/20191105220353_create_customers.rb new file mode 100644 index 000000000..fc653de37 --- /dev/null +++ b/db/migrate/20191105220353_create_customers.rb @@ -0,0 +1,14 @@ +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/20191105220616_create_movies.rb b/db/migrate/20191105220616_create_movies.rb new file mode 100644 index 000000000..f100f60f8 --- /dev/null +++ b/db/migrate/20191105220616_create_movies.rb @@ -0,0 +1,11 @@ +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/schema.rb b/db/schema.rb new file mode 100644 index 000000000..405c5ab45 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# 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_220616) 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 + +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # 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 From fa47ea5a578c4d09293c5dcf46f8b1270a5e51f1 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 14:09:06 -0800 Subject: [PATCH 03/42] Generate Customers and Movies controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 18 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/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 From e5e74358e12417923536238485884276b0214683 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 14:13:06 -0800 Subject: [PATCH 04/42] Added validations for customer and movie; created test stubs for customer model; edited test helper --- app/models/customer.rb | 4 ++++ app/models/movie.rb | 4 ++++ test/models/customer_test.rb | 25 ++++++++++++++++++++++--- test/test_helper.rb | 3 ++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d8c8c2071 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,6 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..08eaa70f4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :release_date, presence: true + validates :overview, presence: true + validates :inventory, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..5684af074 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,26 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + + it "is valid for a customer with a name, registered_at, postal_code, and phone" do + + end + + it "is invalid for a customer without a name" do + + end + + it "is invalid for a customer without a registered_at" do + + end + + it "is invalid for a customer without a postal_code" do + + end + + it "is invalid for a customer without a phone" do + + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..a70e720e0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,10 +1,11 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require 'minitest/rails' 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 From ff195f2e1298b4e8aa76f03d688ab98366e19322 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 14:30:08 -0800 Subject: [PATCH 05/42] added validation test for customer and customer with no name --- test/models/customer_test.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5684af074..70c3a1507 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,13 +2,18 @@ describe Customer do describe "validations" do - it "is valid for a customer with a name, registered_at, postal_code, and phone" do + customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: "1234567890") + expect(customer.valid?).must_equal true end it "is invalid for a customer without a name" do + customer = Customer.new(name: nil, registered_at: DateTime.now, postal_code: "98104", phone: "1234567890") + expect(customer.valid?).must_equal false + expect(customer.errors.messages).must_include :name + expect(customer.errors.messages[:name]).must_equal ["can't be blank"] end it "is invalid for a customer without a registered_at" do From 547053f22dfd5670b7fb48b5c4a50bf82d650207 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 14:32:11 -0800 Subject: [PATCH 06/42] finished tests for customer model validation --- test/models/customer_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 70c3a1507..2ae5070b9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -17,15 +17,27 @@ end it "is invalid for a customer without a registered_at" do + customer = Customer.new(name: "Fred Flintstone", registered_at: nil, postal_code: "98104", phone: "1234567890") + expect(customer.valid?).must_equal false + expect(customer.errors.messages).must_include :registered_at + expect(customer.errors.messages[:registered_at]).must_equal ["can't be blank"] end it "is invalid for a customer without a postal_code" do + customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: nil, phone: "1234567890") + expect(customer.valid?).must_equal false + expect(customer.errors.messages).must_include :postal_code + expect(customer.errors.messages[:postal_code]).must_equal ["can't be blank"] end it "is invalid for a customer without a phone" do + customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: nil) + expect(customer.valid?).must_equal false + expect(customer.errors.messages).must_include :phone + expect(customer.errors.messages[:phone]).must_equal ["can't be blank"] end end end From b59354af37f8c7e85fd10461fa6e38eec2e4c728 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 14:52:28 -0800 Subject: [PATCH 07/42] Added tests for movie model validations --- app/controllers/customers_controller.rb | 3 ++ config/routes.rb | 1 + test/models/movie_test.rb | 38 +++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..dcd28a77d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,5 @@ class CustomersController < ApplicationController + def zomg + render json: { test: "it works!"}, status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..8b2ec2fc1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/zomg", to: "customers#zomg", as: "zomg" end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cd59ab14a..19995d5cf 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,39 @@ require "test_helper" describe Movie do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + describe "validations" do + it "is valid for a movie with a title, release_date, overview, and inventory" do + movie = Movie.new(title: "The Ada Escape", release_date: Date.today, overview: "A thrilling caper", inventory: 12) + expect(movie.valid?).must_equal true + end + + it "is invalid for a movie without a title" do + movie = Movie.new(title: nil, release_date: Date.today, overview: "A thrilling caper", inventory: 12) + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :title + expect(movie.errors.messages[:title]).must_equal ["can't be blank"] + end + + it "is invalid for a movie without a release date" do + movie = Movie.new(title: "The Ada Escape", release_date: nil, overview: "A thrilling caper", inventory: 12) + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :release_date + expect(movie.errors.messages[:release_date]).must_equal ["can't be blank"] + end + + it "is invalid for a movie without an overview" do + movie = Movie.new(title: "The Ada Escape", release_date: Date.today, overview: nil, inventory: 12) + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :overview + expect(movie.errors.messages[:overview]).must_equal ["can't be blank"] + end + + it "is invalid for a movie without an inventory" do + movie = Movie.new(title: "The Ada Escape", release_date: Date.today, overview: "A thrilling caper", inventory: nil) + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_equal ["can't be blank"] + end + end end From 572ac6936b9a913cf35fe67d7218f580fbbed76e Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 15:18:53 -0800 Subject: [PATCH 08/42] Generated rental model and set up relationships --- app/models/customer.rb | 3 +++ app/models/movie.rb | 3 +++ app/models/rental.rb | 4 ++++ db/migrate/20191105230546_create_rentals.rb | 8 ++++++++ .../20191105231057_add_movie_id_to_rentals.rb | 5 +++++ .../20191105231204_add_customer_id_to_rentals.rb | 5 +++++ db/schema.rb | 13 ++++++++++++- test/models/rental_test.rb | 7 +++++++ 8 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20191105230546_create_rentals.rb create mode 100644 db/migrate/20191105231057_add_movie_id_to_rentals.rb create mode 100644 db/migrate/20191105231204_add_customer_id_to_rentals.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index d8c8c2071..28431630e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,4 +3,7 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true + + has_many :rentals + has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 08eaa70f4..88773c1b7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,7 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :overview, presence: true validates :inventory, presence: true + + has_many :rentals + has_many :customers, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20191105230546_create_rentals.rb b/db/migrate/20191105230546_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20191105230546_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20191105231057_add_movie_id_to_rentals.rb b/db/migrate/20191105231057_add_movie_id_to_rentals.rb new file mode 100644 index 000000000..67797e6d0 --- /dev/null +++ b/db/migrate/20191105231057_add_movie_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20191105231204_add_customer_id_to_rentals.rb b/db/migrate/20191105231204_add_customer_id_to_rentals.rb new file mode 100644 index 000000000..0c5d8d5d6 --- /dev/null +++ b/db/migrate/20191105231204_add_customer_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 405c5ab45..b7131c075 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_220616) do +ActiveRecord::Schema.define(version: 2019_11_05_231204) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,15 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/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 cd5e4d55d1ec1504d04835f226b297f5b562f2cc Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 15:34:54 -0800 Subject: [PATCH 09/42] added test for customer relationship to rental --- app/models/customer.rb | 3 +++ test/fixtures/customers.yml | 6 ++++++ test/fixtures/movies.yml | 5 +++++ test/models/customer_test.rb | 11 +++++++++++ 4 files changed, 25 insertions(+) create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml diff --git a/app/models/customer.rb b/app/models/customer.rb index 28431630e..aefbd0956 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,7 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals + + def movies_checked_out_count + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..5f05ffd11 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,6 @@ +customer_one: + name: Fred Flintstone + registered_at: May 1, 2019 + postal_code: 98104 + phone: 1234567890 + \ No newline at end of file diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..4b421c939 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,5 @@ +matrix: + title: The Matrix + release_date: January 1, 1999 + inventory: 5 + overview: Sci-fi movie diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2ae5070b9..02efc66ec 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -40,4 +40,15 @@ expect(customer.errors.messages[:phone]).must_equal ["can't be blank"] end end + + describe "relationships" do + let(:customer) { customers(:customer_one)} + let(:movie) { movies(:matrix)} + it "can have many rentals" do + new_rental = Rental.create(customer: customer, movie: movie) + + expect(customer.rentals.count).must_equal 1 + expect(customer.rentals.first).must_be_instance_of Rental + end + end end From 09f97e181d49ad04efdc92135cb8cfcf33cd345a Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 15:36:22 -0800 Subject: [PATCH 10/42] added test for customer's relationship to movie --- test/models/customer_test.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 02efc66ec..ae26be8bc 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -50,5 +50,12 @@ expect(customer.rentals.count).must_equal 1 expect(customer.rentals.first).must_be_instance_of Rental end - end + + it "can have a movie through a rental" do + new_rental = Rental.create(customer: customer, movie: movie) + + expect(customer.movies.count).must_equal 1 + expect(customer.movies.first).must_be_instance_of Movie + end + end end From dbd8da6533bcea8c714fb85d6e934b554e0871a0 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 15:48:14 -0800 Subject: [PATCH 11/42] added validation tests for rental model --- app/models/rental.rb | 2 ++ test/models/movie_test.rb | 21 +++++++++++++++++- test/models/rental_test.rb | 45 +++++++++++++++++++++++++++++++++++--- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..29f387c31 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + validates :movie_id, presence: true + validates :customer_id, presence: true end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 19995d5cf..7ff1c30fa 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe Movie do - describe "validations" do it "is valid for a movie with a title, release_date, overview, and inventory" do movie = Movie.new(title: "The Ada Escape", release_date: Date.today, overview: "A thrilling caper", inventory: 12) @@ -36,4 +35,24 @@ expect(movie.errors.messages[:inventory]).must_equal ["can't be blank"] end end + + describe "relationships" do + let(:customer) { customers(:customer_one)} + let(:movie) { movies(:matrix)} + it "can have many rentals" do + new_rental = Rental.create(customer: customer, movie: movie) + + expect(movie.rentals.count).must_equal 1 + expect(movie.rentals.first).must_be_instance_of Rental + end + + it "can have a customer through a rental" do + new_rental = Rental.create(customer: customer, movie: movie) + + expect(movie.customers.count).must_equal 1 + expect(movie.customers.first).must_be_instance_of Customer + end + end + end + diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..81d467ea3 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,46 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:customer) { customers(:customer_one)} + let(:movie) { movies(:matrix)} + + describe "validations" do + it "is valid if given a valid movie id and valid customer id" do + new_rental = Rental.create(customer_id: customer.id, movie_id: movie.id) + + expect(new_rental.valid?).must_equal true + end + + it "is invalid if not given a movie id" do + bad_rental = Rental.create(customer_id: customer.id) + + expect(bad_rental.valid?).must_equal false + expect(bad_rental.errors.messages).must_include :movie_id + expect(bad_rental.errors.messages[:movie_id]).must_equal ["can't be blank"] + end + + it "is invaid if not given a customer id" do + bad_rental = Rental.create(movie_id: movie.id) + + expect(bad_rental.valid?).must_equal false + expect(bad_rental.errors.messages).must_include :customer_id + expect(bad_rental.errors.messages[:customer_id]).must_equal ["can't be blank"] + end + + it "is invalid if given an invalid movie id" do + bad_rental = Rental.create(customer_id: customer.id, movie_id: -1) + + expect(bad_rental.valid?).must_equal false + expect(bad_rental.errors.messages).must_include :movie + expect(bad_rental.errors.messages[:movie]).must_equal ["must exist"] + end + + it "is invalid if given an invalid customer id" do + bad_rental = Rental.create(customer_id: -1, movie_id: movie.id) + + expect(bad_rental.valid?).must_equal false + expect(bad_rental.errors.messages).must_include :customer + expect(bad_rental.errors.messages[:customer]).must_equal ["must exist"] + end + end end From ca4df2dc04f0f10b932932b6e8205aea445b0ef2 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 16:11:43 -0800 Subject: [PATCH 12/42] Created tests and customers#index method in customer controller --- app/controllers/customers_controller.rb | 5 +++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 35 +++++++++++++++++-- test/models/rental_test.rb | 16 +++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dcd28a77d..58fabd661 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,4 +2,9 @@ class CustomersController < ApplicationController def zomg render json: { test: "it works!"}, status: :ok end + + def index + customers = Customer.all + render json: customers.as_json(only: ["id", "name", "phone", "postal_code", "registered_at"]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index 8b2ec2fc1..60ef31765 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get "/zomg", to: "customers#zomg", as: "zomg" + + resources :customers, only: [:index] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..9a63a35eb 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,36 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responds with JSON and success" do + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + 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 + expect(body.count).must_equal Customer.count + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal ["id", "name", "phone", "postal_code", "registered_at"] + # ADD movies_checked_out_count + end + end + + it "responds 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 end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 81d467ea3..a36130eb1 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -43,4 +43,20 @@ expect(bad_rental.errors.messages[:customer]).must_equal ["must exist"] end end + + describe "relationships" do + before do + @new_rental = Rental.create(customer: customer, movie: movie) + end + + it "can belong to a movie" do + expect(@new_rental.movie_id).must_equal movie.id + expect(@new_rental.movie).must_be_instance_of Movie + end + + it "can belong to a customer" do + expect(@new_rental.customer_id).must_equal customer.id + expect(@new_rental.customer).must_be_instance_of Customer + end + end end From 397abebee2d3a597a564634ac70227eacb4428ae Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 16:15:40 -0800 Subject: [PATCH 13/42] added movie#index action and test --- app/controllers/movies_controller.rb | 4 +++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 34 ++++++++++++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..8ac7230c4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,6 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: ["id", "release_date", "title"]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index 60ef31765..476f70e7d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,5 @@ get "/zomg", to: "customers#zomg", as: "zomg" resources :customers, only: [:index] + resources :movies, only: [:index] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b11d50cea..5a5f80385 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,35 @@ require "test_helper" describe MoviesController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responds with JSON and success" do + get movies_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + 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 + expect(body.count).must_equal Movie.count + body.each do |movie| + expect(movie).must_be_instance_of Hash + expect(movie.keys.sort).must_equal ["id", "release_date", "title"] + end + end + + it "responds with an empty array when there are no movie" 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 end From f1f513edb65ac84dec78e11c6b2e480aca975642 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 16:24:34 -0800 Subject: [PATCH 14/42] added movies_checked_out_count column to customer controller and test --- app/controllers/customers_controller.rb | 2 +- ...191106001839_add_movies_checked_out_count_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- test/controllers/customers_controller_test.rb | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20191106001839_add_movies_checked_out_count_to_customers.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 58fabd661..e1a59b84f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,6 +5,6 @@ def zomg def index customers = Customer.all - render json: customers.as_json(only: ["id", "name", "phone", "postal_code", "registered_at"]), status: :ok + render json: customers.as_json(only: ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"]), status: :ok end end diff --git a/db/migrate/20191106001839_add_movies_checked_out_count_to_customers.rb b/db/migrate/20191106001839_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..9aca60313 --- /dev/null +++ b/db/migrate/20191106001839_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 b7131c075..a5507b3e8 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_231204) do +ActiveRecord::Schema.define(version: 2019_11_06_001839) 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 9a63a35eb..bc469c3b4 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -18,7 +18,7 @@ expect(body.count).must_equal Customer.count body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal ["id", "name", "phone", "postal_code", "registered_at"] + expect(customer.keys.sort).must_equal ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"] # ADD movies_checked_out_count end end From e4d5a68445be992b7e15aecb76f0527f98f16d44 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Tue, 5 Nov 2019 17:08:31 -0800 Subject: [PATCH 15/42] added application method for updating inventory --- app/controllers/application_controller.rb | 10 +++++++++- app/controllers/movies_controller.rb | 2 ++ app/models/movie.rb | 1 + ...002758_add_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 3 ++- .../controllers/application_controller_test.rb | 18 ++++++++++++++++++ 6 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20191106002758_add_available_inventory_to_movies.rb create mode 100644 test/controllers/application_controller_test.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..045f295f8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,10 @@ class ApplicationController < ActionController::API -end + before_action :update_inventory + + def update_inventory + Movie.all.each do |movie| + movie.available_inventory = movie.inventory + movie.save + end + end +end \ No newline at end of file diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 8ac7230c4..1236ae4ac 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,8 @@ class MoviesController < ApplicationController + def index movies = Movie.all + render json: movies.as_json(only: ["id", "release_date", "title"]), status: :ok end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 88773c1b7..db7fb79dd 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,4 +6,5 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + end diff --git a/db/migrate/20191106002758_add_available_inventory_to_movies.rb b/db/migrate/20191106002758_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..4890d9cb3 --- /dev/null +++ b/db/migrate/20191106002758_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < 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 a5507b3e8..f53ea7679 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_001839) do +ActiveRecord::Schema.define(version: 2019_11_06_002758) 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/application_controller_test.rb b/test/controllers/application_controller_test.rb new file mode 100644 index 000000000..194ace724 --- /dev/null +++ b/test/controllers/application_controller_test.rb @@ -0,0 +1,18 @@ +require "test_helper" + +describe ApplicationController do + describe "update inventory" do + it "sets the available inventory equal to the movie's inventory" do + movie = movies(:matrix) + + + p Movie.all + expect(movie.available_inventory).must_be_nil + + get movies_path + + p movie.errors + expect(movie.available_inventory).must_equal movie.inventory + end + end +end From 3f7ecdbef9c5c1f8471523aec15dea3dbb6da37b Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 08:45:56 -0800 Subject: [PATCH 16/42] rearranged tests and fixed test for movie available inventory --- app/controllers/application_controller.rb | 2 +- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 4 +- app/models/customer.rb | 4 +- app/models/movie.rb | 3 +- app/models/rental.rb | 7 +-- .../application_controller_test.rb | 7 +-- test/controllers/customers_controller_test.rb | 3 +- test/controllers/movies_controller_test.rb | 2 + test/models/customer_test.rb | 11 ++++- test/models/movie_test.rb | 32 ++++++------- test/models/rental_test.rb | 48 +++++++++---------- 12 files changed, 63 insertions(+), 62 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 045f295f8..bad559db4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,4 +7,4 @@ def update_inventory movie.save end end -end \ No newline at end of file +end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e1a59b84f..435f7fd1d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def zomg - render json: { test: "it works!"}, status: :ok + render json: { test: "it works!" }, status: :ok end def index diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1236ae4ac..a000a3495 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,8 +1,6 @@ class MoviesController < ApplicationController - def index - movies = Movie.all - + movies = Movie.all render json: movies.as_json(only: ["id", "release_date", "title"]), status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index aefbd0956..0eb9c4ade 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,10 +3,8 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true + validates :movies_checked_out_count, presence: true has_many :rentals has_many :movies, through: :rentals - - def movies_checked_out_count - end end diff --git a/app/models/movie.rb b/app/models/movie.rb index db7fb79dd..3ae52942b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,10 +1,9 @@ class Movie < ApplicationRecord validates :title, presence: true - validates :release_date, presence: true validates :overview, presence: true + validates :release_date, presence: true validates :inventory, presence: true has_many :rentals has_many :customers, through: :rentals - end diff --git a/app/models/rental.rb b/app/models/rental.rb index 29f387c31..3caeaec1b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,7 @@ class Rental < ApplicationRecord - belongs_to :movie - belongs_to :customer - validates :movie_id, presence: true validates :customer_id, presence: true + validates :movie_id, presence: true + + belongs_to :customer + belongs_to :movie end diff --git a/test/controllers/application_controller_test.rb b/test/controllers/application_controller_test.rb index 194ace724..a6d59b6d7 100644 --- a/test/controllers/application_controller_test.rb +++ b/test/controllers/application_controller_test.rb @@ -4,15 +4,12 @@ describe "update inventory" do it "sets the available inventory equal to the movie's inventory" do movie = movies(:matrix) - - - p Movie.all expect(movie.available_inventory).must_be_nil get movies_path - p movie.errors - expect(movie.available_inventory).must_equal movie.inventory + updated_movie = Movie.find_by(title: "The Matrix") + expect(updated_movie.available_inventory).must_equal updated_movie.inventory end end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index bc469c3b4..cab89cb01 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -19,8 +19,8 @@ body.each do |customer| expect(customer).must_be_instance_of Hash expect(customer.keys.sort).must_equal ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"] - # ADD movies_checked_out_count end + must_respond_with :ok end it "responds with an empty array when there are no customers" do @@ -31,6 +31,7 @@ expect(body).must_be_instance_of Array expect(body).must_equal [] + must_respond_with :ok end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5a5f80385..5eb3db393 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -20,6 +20,7 @@ expect(movie).must_be_instance_of Hash expect(movie.keys.sort).must_equal ["id", "release_date", "title"] end + must_respond_with :ok end it "responds with an empty array when there are no movie" do @@ -30,6 +31,7 @@ expect(body).must_be_instance_of Array expect(body).must_equal [] + must_respond_with :ok end end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ae26be8bc..b875ead67 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,8 +2,8 @@ describe Customer do describe "validations" do - it "is valid for a customer with a name, registered_at, postal_code, and phone" do - customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: "1234567890") + it "is valid for a customer with a name, registered_at, postal_code, phone, and movies_checked_out_count" do + customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: "1234567890", movies_checked_out_count: 0) expect(customer.valid?).must_equal true end @@ -39,6 +39,13 @@ expect(customer.errors.messages).must_include :phone expect(customer.errors.messages[:phone]).must_equal ["can't be blank"] end + + it "gets a default value of 0 for movies_checked_out_count" do + customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: "1234567890") + + expect(customer.valid?).must_equal true + expect(customer.movies_checked_out_count).must_equal 0 + end end describe "relationships" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 7ff1c30fa..8a24806e7 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,34 +2,34 @@ describe Movie do describe "validations" do - it "is valid for a movie with a title, release_date, overview, and inventory" do - movie = Movie.new(title: "The Ada Escape", release_date: Date.today, overview: "A thrilling caper", inventory: 12) + it "is valid for a movie with a title, overview, release_date, and inventory" do + movie = Movie.new(title: "The Ada Escape", overview: "A thrilling caper", release_date: Date.today, inventory: 12) expect(movie.valid?).must_equal true end it "is invalid for a movie without a title" do - movie = Movie.new(title: nil, release_date: Date.today, overview: "A thrilling caper", inventory: 12) + movie = Movie.new(title: nil, overview: "A thrilling caper", release_date: Date.today, inventory: 12) expect(movie.valid?).must_equal false expect(movie.errors.messages).must_include :title expect(movie.errors.messages[:title]).must_equal ["can't be blank"] end - it "is invalid for a movie without a release date" do - movie = Movie.new(title: "The Ada Escape", release_date: nil, overview: "A thrilling caper", inventory: 12) - expect(movie.valid?).must_equal false - expect(movie.errors.messages).must_include :release_date - expect(movie.errors.messages[:release_date]).must_equal ["can't be blank"] - end - it "is invalid for a movie without an overview" do - movie = Movie.new(title: "The Ada Escape", release_date: Date.today, overview: nil, inventory: 12) + movie = Movie.new(title: "The Ada Escape", overview: nil, release_date: Date.today, inventory: 12) expect(movie.valid?).must_equal false expect(movie.errors.messages).must_include :overview expect(movie.errors.messages[:overview]).must_equal ["can't be blank"] end + it "is invalid for a movie without a release date" do + movie = Movie.new(title: "The Ada Escape", overview: "A thrilling caper", release_date: nil, inventory: 12) + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :release_date + expect(movie.errors.messages[:release_date]).must_equal ["can't be blank"] + end + it "is invalid for a movie without an inventory" do - movie = Movie.new(title: "The Ada Escape", release_date: Date.today, overview: "A thrilling caper", inventory: nil) + movie = Movie.new(title: "The Ada Escape", overview: "A thrilling caper", release_date: Date.today, inventory: nil) expect(movie.valid?).must_equal false expect(movie.errors.messages).must_include :inventory expect(movie.errors.messages[:inventory]).must_equal ["can't be blank"] @@ -37,8 +37,8 @@ end describe "relationships" do - let(:customer) { customers(:customer_one)} - let(:movie) { movies(:matrix)} + let(:customer) { customers(:customer_one) } + let(:movie) { movies(:matrix) } it "can have many rentals" do new_rental = Rental.create(customer: customer, movie: movie) @@ -52,7 +52,5 @@ expect(movie.customers.count).must_equal 1 expect(movie.customers.first).must_be_instance_of Customer end - end - + end end - diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a36130eb1..3017f45e0 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,24 +1,16 @@ require "test_helper" describe Rental do - let(:customer) { customers(:customer_one)} - let(:movie) { movies(:matrix)} + let(:customer) { customers(:customer_one) } + let(:movie) { movies(:matrix) } describe "validations" do - it "is valid if given a valid movie id and valid customer id" do + it "is valid if given a valid customer id and valid movie id" do new_rental = Rental.create(customer_id: customer.id, movie_id: movie.id) expect(new_rental.valid?).must_equal true end - it "is invalid if not given a movie id" do - bad_rental = Rental.create(customer_id: customer.id) - - expect(bad_rental.valid?).must_equal false - expect(bad_rental.errors.messages).must_include :movie_id - expect(bad_rental.errors.messages[:movie_id]).must_equal ["can't be blank"] - end - it "is invaid if not given a customer id" do bad_rental = Rental.create(movie_id: movie.id) @@ -27,14 +19,6 @@ expect(bad_rental.errors.messages[:customer_id]).must_equal ["can't be blank"] end - it "is invalid if given an invalid movie id" do - bad_rental = Rental.create(customer_id: customer.id, movie_id: -1) - - expect(bad_rental.valid?).must_equal false - expect(bad_rental.errors.messages).must_include :movie - expect(bad_rental.errors.messages[:movie]).must_equal ["must exist"] - end - it "is invalid if given an invalid customer id" do bad_rental = Rental.create(customer_id: -1, movie_id: movie.id) @@ -42,6 +26,22 @@ expect(bad_rental.errors.messages).must_include :customer expect(bad_rental.errors.messages[:customer]).must_equal ["must exist"] end + + it "is invalid if not given a movie id" do + bad_rental = Rental.create(customer_id: customer.id) + + expect(bad_rental.valid?).must_equal false + expect(bad_rental.errors.messages).must_include :movie_id + expect(bad_rental.errors.messages[:movie_id]).must_equal ["can't be blank"] + end + + it "is invalid if given an invalid movie id" do + bad_rental = Rental.create(customer_id: customer.id, movie_id: -1) + + expect(bad_rental.valid?).must_equal false + expect(bad_rental.errors.messages).must_include :movie + expect(bad_rental.errors.messages[:movie]).must_equal ["must exist"] + end end describe "relationships" do @@ -49,14 +49,14 @@ @new_rental = Rental.create(customer: customer, movie: movie) end - it "can belong to a movie" do - expect(@new_rental.movie_id).must_equal movie.id - expect(@new_rental.movie).must_be_instance_of Movie - end - it "can belong to a customer" do expect(@new_rental.customer_id).must_equal customer.id expect(@new_rental.customer).must_be_instance_of Customer end + + it "can belong to a movie" do + expect(@new_rental.movie_id).must_equal movie.id + expect(@new_rental.movie).must_be_instance_of Movie + end end end From bbd212b19d0750a3130d28b6a50e78bd29ee52a5 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 12:52:53 -0800 Subject: [PATCH 17/42] fixed typos --- app/models/customer.rb | 1 - test/controllers/movies_controller_test.rb | 8 ++++++++ test/fixtures/movies.yml | 4 ++-- test/models/customer_test.rb | 6 +++--- test/models/movie_test.rb | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0eb9c4ade..28431630e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,7 +3,6 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true - validates :movies_checked_out_count, presence: true has_many :rentals has_many :movies, through: :rentals diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5eb3db393..cd9e2a349 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -34,4 +34,12 @@ must_respond_with :ok end end + + describe "show" do + it "responds with success for a valid movie" do + end + + it "responds with not_found for an invalid movie" do + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 4b421c939..c97579d21 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,5 +1,5 @@ matrix: title: The Matrix - release_date: January 1, 1999 + release_date: March 31, 1999 inventory: 5 - overview: Sci-fi movie + overview: Science fiction action film. diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b875ead67..bad72b536 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,8 +2,8 @@ describe Customer do describe "validations" do - it "is valid for a customer with a name, registered_at, postal_code, phone, and movies_checked_out_count" do - customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: "1234567890", movies_checked_out_count: 0) + it "is valid for a customer with a name, registered_at, postal_code, and phone" do + customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: "1234567890") expect(customer.valid?).must_equal true end @@ -51,7 +51,7 @@ describe "relationships" do let(:customer) { customers(:customer_one)} let(:movie) { movies(:matrix)} - it "can have many rentals" do + it "can have a rental" do new_rental = Rental.create(customer: customer, movie: movie) expect(customer.rentals.count).must_equal 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8a24806e7..04d7ad50d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -39,7 +39,7 @@ describe "relationships" do let(:customer) { customers(:customer_one) } let(:movie) { movies(:matrix) } - it "can have many rentals" do + it "can have a rental" do new_rental = Rental.create(customer: customer, movie: movie) expect(movie.rentals.count).must_equal 1 From fa886ccbcfd4ae6027add45309a020906d247eb5 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 13:19:49 -0800 Subject: [PATCH 18/42] added check response to test helper --- test/controllers/customers_controller_test.rb | 12 ++++-------- test/controllers/movies_controller_test.rb | 14 +++++--------- test/test_helper.rb | 8 ++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index cab89cb01..f9d277096 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -5,33 +5,29 @@ it "responds with JSON and success" do get customers_path - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + check_response(expected_type: Array) end it "responds with an array of Customer hashes" do get customers_path - body = JSON.parse(response.body) + body = check_response(expected_type: Array) - expect(body).must_be_instance_of Array expect(body.count).must_equal Customer.count body.each do |customer| expect(customer).must_be_instance_of Hash expect(customer.keys.sort).must_equal ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"] end - must_respond_with :ok end it "responds 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 [] - must_respond_with :ok end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index cd9e2a349..719e35750 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -5,33 +5,29 @@ it "responds with JSON and success" do get movies_path - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + check_response(expected_type: Array) end it "responds with an array of Movie hashes" do get movies_path - body = JSON.parse(response.body) + body = check_response(expected_type: Array) - expect(body).must_be_instance_of Array expect(body.count).must_equal Movie.count body.each do |movie| expect(movie).must_be_instance_of Hash expect(movie.keys.sort).must_equal ["id", "release_date", "title"] end - must_respond_with :ok end it "responds with an empty array when there are no movie" 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 [] - must_respond_with :ok end end @@ -39,7 +35,7 @@ it "responds with success for a valid movie" do end - it "responds with not_found for an invalid movie" do + it "responds with bad_request for an invalid movie" do end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index a70e720e0..48b5accb4 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -8,4 +8,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 fd761ef0fe268cc8b556b4f6526aa06cf84921ed Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 13:52:13 -0800 Subject: [PATCH 19/42] created movie show and tests --- app/controllers/movies_controller.rb | 12 ++++++++++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 16 ++++++++++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a000a3495..17ef4433a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,4 +3,16 @@ def index movies = Movie.all render json: movies.as_json(only: ["id", "release_date", "title"]), status: :ok end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: ["title", "overview", "release_date", "inventory", "available_inventory"]), status: :ok + return + else + render json: {"errors": { "movie": ["Movie not found"] } }, status: :not_found + return + end + end end diff --git a/config/routes.rb b/config/routes.rb index 476f70e7d..bcdfc6d3e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ get "/zomg", to: "customers#zomg", as: "zomg" resources :customers, only: [:index] - resources :movies, only: [:index] + resources :movies, only: [:index, :show] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 719e35750..364b47a74 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,10 +32,22 @@ end describe "show" do - it "responds with success for a valid movie" do + it "responds with success and gives back one hash for a valid movie" do + movie = movies(:matrix) + + get movie_path(movie) + + body = check_response(expected_type: Hash) + + expect(body.keys.sort).must_equal ["available_inventory", "inventory", "overview", "release_date", "title" ] end - it "responds with bad_request for an invalid movie" do + it "responds with not_found and gives back an error message for an invalid movie" do + get movie_path(-1) + + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body.keys).must_include "errors" end end end From 2eedea0f7525f7388cd4b6773ba99567a859e4bb Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 14:43:33 -0800 Subject: [PATCH 20/42] Added create method for movies controller and tests --- app/controllers/movies_controller.rb | 18 ++++++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 50 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 17ef4433a..ad81b8c76 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,4 +15,22 @@ def show return end end + + def create + new_movie = Movie.new(movie_params) + if new_movie.save + render json: {id: new_movie.id}, status: :ok + return + else + render json: {"errors": new_movie.errors.messages }, status: :bad_request + return + end + end + + private + + def movie_params + params.permit(:title, :overview, :release_date, :inventory) + end + end diff --git a/config/routes.rb b/config/routes.rb index bcdfc6d3e..9249d7503 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ get "/zomg", to: "customers#zomg", as: "zomg" resources :customers, only: [:index] - resources :movies, only: [:index, :show] + resources :movies, only: [:index, :show, :create] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 364b47a74..3a2ece74c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -50,4 +50,54 @@ expect(body.keys).must_include "errors" end end + + describe "create" do + + before do + @movie_hash = { + title: "Twilight", + overview: "Vampire love story", + release_date: "2008-11-21", + inventory: 100 } + end + + it "responds with status created when given a valid request and gives back id as a key" do + expect{post movies_path, params: @movie_hash}.must_differ "Movie.count", 1 + body = check_response(expected_type: Hash, expected_status: :ok) + expect(body.keys).must_equal ['id'] + end + + it "responds with bad_request when request has no title" do + @movie_hash[:title] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'title' + end + + it "responds with bad_request when request has no overview" do + @movie_hash[:overview] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'overview' + end + + it "responds with bad_request when request has no release_date" do + @movie_hash[:release_date] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'release_date' + end + + it "responds with bad_request when request has no inventory" do + @movie_hash[:inventory] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'inventory' + end + + end end From 99a0cdbfdb90c9f87f310106f9a6fdbeb2900dcd Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 15:01:24 -0800 Subject: [PATCH 21/42] changed find_available_inventory to model method --- app/controllers/application_controller.rb | 8 -------- app/controllers/movies_controller.rb | 5 +++-- app/models/movie.rb | 4 ++++ test/controllers/application_controller_test.rb | 11 ----------- test/controllers/movies_controller_test.rb | 1 - 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bad559db4..4ac8823b0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,10 +1,2 @@ class ApplicationController < ActionController::API - before_action :update_inventory - - def update_inventory - Movie.all.each do |movie| - movie.available_inventory = movie.inventory - movie.save - end - end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ad81b8c76..73d17a6ef 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,8 @@ def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: ["title", "overview", "release_date", "inventory", "available_inventory"]), status: :ok + available_inventory = movie.find_available_inventory + render json: movie.as_json(only: ["title", "overview", "release_date", "inventory"]).merge(:available_inventory => available_inventory), status: :ok return else render json: {"errors": { "movie": ["Movie not found"] } }, status: :not_found @@ -18,6 +19,7 @@ def show def create new_movie = Movie.new(movie_params) + if new_movie.save render json: {id: new_movie.id}, status: :ok return @@ -32,5 +34,4 @@ def create 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 3ae52942b..b23e666c4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,4 +6,8 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + def find_available_inventory + self.available_inventory = self.inventory + end end diff --git a/test/controllers/application_controller_test.rb b/test/controllers/application_controller_test.rb index a6d59b6d7..f613a5a8a 100644 --- a/test/controllers/application_controller_test.rb +++ b/test/controllers/application_controller_test.rb @@ -1,15 +1,4 @@ require "test_helper" describe ApplicationController do - describe "update inventory" do - it "sets the available inventory equal to the movie's inventory" do - movie = movies(:matrix) - expect(movie.available_inventory).must_be_nil - - get movies_path - - updated_movie = Movie.find_by(title: "The Matrix") - expect(updated_movie.available_inventory).must_equal updated_movie.inventory - end - end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3a2ece74c..9c516453a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -98,6 +98,5 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body['errors'].keys).must_include 'inventory' end - end end From bbfcaae3271d45974ec1c2287bd4e7d8bade16e6 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 15:15:14 -0800 Subject: [PATCH 22/42] added new routes for rentals --- config/routes.rb | 3 +++ test/controllers/movies_controller_test.rb | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 9249d7503..21f658fdb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,7 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + + get "/rentals/check-out", to: "rentals#check_out", as: "check_out" + get "/rentals/check-in", to: "rentals#check_in", as: "check_in" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 9c516453a..349792049 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -52,7 +52,6 @@ end describe "create" do - before do @movie_hash = { title: "Twilight", From 6c11f340fc536ab45f2d435f21fed049d5da0436 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 15:36:02 -0800 Subject: [PATCH 23/42] removed available inventory column --- app/models/movie.rb | 2 +- config/routes.rb | 2 +- .../20191106233029_remove_available_inventory_from_movies.rb | 5 +++++ db/schema.rb | 3 +-- test/controllers/movies_controller_test.rb | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20191106233029_remove_available_inventory_from_movies.rb diff --git a/app/models/movie.rb b/app/models/movie.rb index b23e666c4..1215a330d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,6 +8,6 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals def find_available_inventory - self.available_inventory = self.inventory + return self.inventory end end diff --git a/config/routes.rb b/config/routes.rb index 21f658fdb..908de2779 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get "/zomg", to: "customers#zomg", as: "zomg" - resources :customers, only: [:index] + resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] get "/rentals/check-out", to: "rentals#check_out", as: "check_out" diff --git a/db/migrate/20191106233029_remove_available_inventory_from_movies.rb b/db/migrate/20191106233029_remove_available_inventory_from_movies.rb new file mode 100644 index 000000000..1e3eb0431 --- /dev/null +++ b/db/migrate/20191106233029_remove_available_inventory_from_movies.rb @@ -0,0 +1,5 @@ +class RemoveAvailableInventoryFromMovies < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :available_inventory + end +end diff --git a/db/schema.rb b/db/schema.rb index f53ea7679..1e309cb05 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_002758) do +ActiveRecord::Schema.define(version: 2019_11_06_233029) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,7 +35,6 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 349792049..45d4c8ed8 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -48,6 +48,8 @@ body = check_response(expected_type: Hash, expected_status: :not_found) expect(body.keys).must_include "errors" + + expect(body["errors"]["movie"]).must_equal ["Movie not found"] end end From 53445f8bf202621759efd6a08c426a1faa28bd04 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Wed, 6 Nov 2019 15:45:30 -0800 Subject: [PATCH 24/42] created rentals controller, added checked_out date and due_date --- app/controllers/rentals_controller.rb | 2 ++ db/migrate/20191106233755_add_checkout_date_to_rentals.rb | 5 +++++ db/migrate/20191106233954_add_due_date_to_rentals.rb | 5 +++++ db/schema.rb | 4 +++- test/controllers/rentals_controller_test.rb | 7 +++++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 db/migrate/20191106233755_add_checkout_date_to_rentals.rb create mode 100644 db/migrate/20191106233954_add_due_date_to_rentals.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/db/migrate/20191106233755_add_checkout_date_to_rentals.rb b/db/migrate/20191106233755_add_checkout_date_to_rentals.rb new file mode 100644 index 000000000..0a0d6be22 --- /dev/null +++ b/db/migrate/20191106233755_add_checkout_date_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCheckoutDateToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkout_date, :date + end +end diff --git a/db/migrate/20191106233954_add_due_date_to_rentals.rb b/db/migrate/20191106233954_add_due_date_to_rentals.rb new file mode 100644 index 000000000..61af77fc2 --- /dev/null +++ b/db/migrate/20191106233954_add_due_date_to_rentals.rb @@ -0,0 +1,5 @@ +class AddDueDateToRentals < 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 1e309cb05..5dbcafd7e 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_233029) do +ActiveRecord::Schema.define(version: 2019_11_06_233954) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,8 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.date "checkout_date" + 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 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 From bf6a8552ac3d70dc53beb0491f919e25607f2a72 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 08:42:15 -0800 Subject: [PATCH 25/42] stubbed out tests for rental check in and check out --- config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 65 ++++++++++++++++++++- test/fixtures/customers.yml | 2 +- test/models/customer_test.rb | 2 +- test/models/movie_test.rb | 14 ++++- test/models/rental_test.rb | 2 +- 6 files changed, 79 insertions(+), 10 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 908de2779..dd23c0855 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - get "/rentals/check-out", to: "rentals#check_out", as: "check_out" - get "/rentals/check-in", to: "rentals#check_in", as: "check_in" + post "/rentals/check-out", to: "rentals#check_out", as: "check_out" + patch "/rentals/check-in", to: "rentals#check_in", as: "check_in" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..4c169f52c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,66 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let (:customer1) { customers(:fred) } + let (:movie1) { movies(:matrix) } + + before do + @rental_hash = { customer: customer1, movie: movie1 } + end + + describe "check-out" do + it "can check out a movie to a customer" do + expect { post check_out_path, params: @rental_hash }.must_differ "Rental.count", 1 + + customer1.reload + expect(customer1.rentals.count).must_equal 1 + expect(movie1.rentals.count).must_equal 1 + end + + it "responds with bad_request and gives an error message if given invalid customer id" do + end + + it "responds with bad_request and gives an error message if given invalid movie id" do + end + + it "will increase a customer's movies_checked_out_count for a successful rental" do + end + + it "won't change a customer's movies_checked_out_count for an invalid rental" do + end + + it "will decrease a movie's available_inventory for a successful rental" do + + end + + it "won't change a movie's available_inventory for an invalid rental" do + end + + # Move to rental model method? + it "sets the check out date to today and sets the due date to a week from today" do + end + end + + describe "check-in" do + it "can check in a movie from a customer" do + end + + it "responds with bad_request and gives an error message if given invalid customer id" do + end + + it "responds with bad_request and gives an error message if given invalid movie id" do + end + + it "will decrease a customer's movies_checked_out_count for a successful check_in" do + end + + it "won't change a customer's movies_checked_out_count for an invalid check_in" do + end + + it "will increase a movie's available_inventory for a successful check_in" do + end + + it "won't change a movie's available_inventory for an invalid check_in" do + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 5f05ffd11..e35711db1 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,4 +1,4 @@ -customer_one: +fred: name: Fred Flintstone registered_at: May 1, 2019 postal_code: 98104 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index bad72b536..694994932 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -49,7 +49,7 @@ end describe "relationships" do - let(:customer) { customers(:customer_one)} + let(:customer) { customers(:fred)} let(:movie) { movies(:matrix)} it "can have a rental" do new_rental = Rental.create(customer: customer, movie: movie) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 04d7ad50d..8ce6002a9 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -37,7 +37,7 @@ end describe "relationships" do - let(:customer) { customers(:customer_one) } + let(:customer) { customers(:fred) } let(:movie) { movies(:matrix) } it "can have a rental" do new_rental = Rental.create(customer: customer, movie: movie) @@ -52,5 +52,15 @@ expect(movie.customers.count).must_equal 1 expect(movie.customers.first).must_be_instance_of Customer end - end + end + + describe "find_available_inventory" do + it "sets the available inventory equal to the movie's inventory" do + movie = movies(:matrix) + + inventory = movie.inventory + + expect(movie.find_available_inventory).must_equal inventory + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3017f45e0..ff178c4c8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - let(:customer) { customers(:customer_one) } + let(:customer) { customers(:fred) } let(:movie) { movies(:matrix) } describe "validations" do From a5de380ce8f7eda58d398c62a5a4f6f636b5eb40 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 10:23:17 -0800 Subject: [PATCH 26/42] added test for check out movie to customer --- app/controllers/rentals_controller.rb | 17 +++++++++++++++++ test/controllers/rentals_controller_test.rb | 16 ++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..380e40b4e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,19 @@ class RentalsController < ApplicationController + def check_out + new_rental = Rental.new(rental_params) + + if new_rental.save + render json: {id: new_rental.id}, status: :ok + return + else + render json: {"errors": new_rental.errors.messages }, status: :bad_request + return + end + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4c169f52c..e8d08acb7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,19 +5,31 @@ let (:movie1) { movies(:matrix) } before do - @rental_hash = { customer: customer1, movie: movie1 } + @rental_hash = { customer_id: customer1.id, movie_id: movie1.id } end - describe "check-out" do + describe "check_out" do it "can check out a movie to a customer" do expect { post check_out_path, params: @rental_hash }.must_differ "Rental.count", 1 + body = check_response(expected_type: Hash) + customer1.reload expect(customer1.rentals.count).must_equal 1 expect(movie1.rentals.count).must_equal 1 + expect(body.keys.first).must_equal "id" + expect(body.values.first).must_equal Rental.last.id end it "responds with bad_request and gives an error message if given invalid customer id" do + @rental_hash[:customer_id] = -1 + + expect { post check_out_path, params: @rental_hash }.must_differ "Rental.count", 0 + must_respond_with :bad_request + + customer1.reload + expect(customer1.rentals.count).must_equal 0 + expect(movie1.rentals.count).must_equal 0 end it "responds with bad_request and gives an error message if given invalid movie id" do From f4ed25ec3394726e7e20aba03e9907e9b954e490 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 10:30:16 -0800 Subject: [PATCH 27/42] added rental test for bad customer and bad movie --- test/controllers/rentals_controller_test.rb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e8d08acb7..9c4963e17 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,7 +14,6 @@ body = check_response(expected_type: Hash) - customer1.reload expect(customer1.rentals.count).must_equal 1 expect(movie1.rentals.count).must_equal 1 expect(body.keys.first).must_equal "id" @@ -25,14 +24,24 @@ @rental_hash[:customer_id] = -1 expect { post check_out_path, params: @rental_hash }.must_differ "Rental.count", 0 - must_respond_with :bad_request - customer1.reload - expect(customer1.rentals.count).must_equal 0 + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body.keys).must_include "errors" + expect(body["errors"]["customer"]).must_equal ["must exist"] + expect(movie1.rentals.count).must_equal 0 end it "responds with bad_request and gives an error message if given invalid movie id" do + @rental_hash[:movie_id] = -1 + + expect { post check_out_path, params: @rental_hash }.must_differ "Rental.count", 0 + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body.keys).must_include "errors" + expect(body["errors"]["movie"]).must_equal ["must exist"] + + expect(customer1.rentals.count).must_equal 0 end it "will increase a customer's movies_checked_out_count for a successful rental" do From b576e3da1b392077b96139dc27e1d6629f558700 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 13:02:03 -0800 Subject: [PATCH 28/42] finished tests for rental check out method --- app/controllers/movies_controller.rb | 2 +- app/models/movie.rb | 2 +- test/controllers/rentals_controller_test.rb | 29 ++++++++++++++++----- test/models/movie_test.rb | 4 +-- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 73d17a6ef..f7796bc19 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie - available_inventory = movie.find_available_inventory + available_inventory = movie.available_inventory render json: movie.as_json(only: ["title", "overview", "release_date", "inventory"]).merge(:available_inventory => available_inventory), status: :ok return else diff --git a/app/models/movie.rb b/app/models/movie.rb index 1215a330d..062d4b170 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,7 +7,7 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - def find_available_inventory + def available_inventory return self.inventory end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9c4963e17..e986c21dd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -23,9 +23,10 @@ it "responds with bad_request and gives an error message if given invalid customer id" do @rental_hash[:customer_id] = -1 - expect { post check_out_path, params: @rental_hash }.must_differ "Rental.count", 0 + expect { post check_out_path, params: @rental_hash }.wont_differ "Rental.count" body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body.keys).must_include "errors" expect(body["errors"]["customer"]).must_equal ["must exist"] @@ -35,9 +36,10 @@ it "responds with bad_request and gives an error message if given invalid movie id" do @rental_hash[:movie_id] = -1 - expect { post check_out_path, params: @rental_hash }.must_differ "Rental.count", 0 + expect { post check_out_path, params: @rental_hash }.wont_differ "Rental.count" body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body.keys).must_include "errors" expect(body["errors"]["movie"]).must_equal ["must exist"] @@ -45,20 +47,35 @@ end it "will increase a customer's movies_checked_out_count for a successful rental" do + expect(customer1.movies_checked_out_count).must_equal 0 + + post check_out_path, params: @rental_hash + + expect(customer1.movies_checked_out_count).must_equal 1 end it "won't change a customer's movies_checked_out_count for an invalid rental" do + expect(customer1.movies_checked_out_count).must_equal 0 + + @rental_hash[:movie_id] = -1 + + post check_out_path, params: @rental_hash + + expect(customer1.movies_checked_out_count).must_equal 0 end it "will decrease a movie's available_inventory for a successful rental" do + starting_inventory = movie1.available_inventory + expect{ post check_out_path, params: @rental_hash }.must_differ "starting_inventory", -1 end it "won't change a movie's available_inventory for an invalid rental" do - end - - # Move to rental model method? - it "sets the check out date to today and sets the due date to a week from today" do + starting_inventory = movie1.available_inventory + + @rental_hash[:customer_id] = -1 + + expect{ post check_out_path, params: @rental_hash }.wont_differ "starting_inventory" end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8ce6002a9..e3d94dc31 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -54,13 +54,13 @@ end end - describe "find_available_inventory" do + describe "available_inventory" do it "sets the available inventory equal to the movie's inventory" do movie = movies(:matrix) inventory = movie.inventory - expect(movie.find_available_inventory).must_equal inventory + expect(movie.available_inventory).must_equal inventory end end end From f5b67d347533f51f8f83b4794326ebe354b52602 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 14:19:42 -0800 Subject: [PATCH 29/42] Added default check_out dates and due_dates; defined change_movies_checked_out_count in customer model; added column check_in_date to rentals table --- app/controllers/rentals_controller.rb | 2 ++ app/models/customer.rb | 5 +++++ db/migrate/20191107214904_add_check_in_date_to_rentals.rb | 7 +++++++ db/schema.rb | 5 +++-- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20191107214904_add_check_in_date_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 380e40b4e..bd53f7245 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,6 +1,8 @@ class RentalsController < ApplicationController def check_out new_rental = Rental.new(rental_params) + new_rental.check_out_date = Date.today + new_rental.due_date = Date.today + 7 if new_rental.save render json: {id: new_rental.id}, status: :ok diff --git a/app/models/customer.rb b/app/models/customer.rb index 28431630e..f871b5596 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,9 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals + + def change_movies_checked_out_count + checked_out = self.rentals.where(:check_in_date == nil).count + return checked_out + end end diff --git a/db/migrate/20191107214904_add_check_in_date_to_rentals.rb b/db/migrate/20191107214904_add_check_in_date_to_rentals.rb new file mode 100644 index 000000000..fafac0546 --- /dev/null +++ b/db/migrate/20191107214904_add_check_in_date_to_rentals.rb @@ -0,0 +1,7 @@ +class AddCheckInDateToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :check_in_date, :date + remove_column :rentals, :checkout_date + add_column :rentals, :check_out_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 5dbcafd7e..2544fbc5b 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_233954) do +ActiveRecord::Schema.define(version: 2019_11_07_214904) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,8 +42,9 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" - t.date "checkout_date" t.date "due_date" + t.date "check_in_date" + t.date "check_out_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From d83f3aed63389869c4cfed1e80f0a1332d707667 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 15:52:40 -0800 Subject: [PATCH 30/42] Changed movies_checked_out_count from a column to a method in the rental model --- app/controllers/customers_controller.rb | 5 +++-- app/models/customer.rb | 14 +++++++++++++- ...move_movies_checked_out_count_from_customers.rb | 5 +++++ db/schema.rb | 3 +-- 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20191107231624_remove_movies_checked_out_count_from_customers.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 435f7fd1d..dd9952d41 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,8 @@ def zomg end def index - customers = Customer.all - render json: customers.as_json(only: ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"]), status: :ok + customer_json = Customer.update_customer_json + + render json: customer_json, status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index f871b5596..983096eff 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,7 +7,19 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - def change_movies_checked_out_count + def self.update_customer_json + customers = Customer.all + + customer_json = customers.as_json(only: ["id", "name", "phone", "postal_code", "registered_at"]) + + customer_json.each do |customer| + customer[:movies_checked_out_count] = Customer.find_by(id: customer["id"]).movies_checked_out_count + end + + return customer_json + end + + def movies_checked_out_count checked_out = self.rentals.where(:check_in_date == nil).count return checked_out end diff --git a/db/migrate/20191107231624_remove_movies_checked_out_count_from_customers.rb b/db/migrate/20191107231624_remove_movies_checked_out_count_from_customers.rb new file mode 100644 index 000000000..09b69afff --- /dev/null +++ b/db/migrate/20191107231624_remove_movies_checked_out_count_from_customers.rb @@ -0,0 +1,5 @@ +class RemoveMoviesCheckedOutCountFromCustomers < ActiveRecord::Migration[5.2] + def change + remove_column :customers, :movies_checked_out_count + end +end diff --git a/db/schema.rb b/db/schema.rb index 2544fbc5b..b8f95d28b 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_214904) do +ActiveRecord::Schema.define(version: 2019_11_07_231624) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,6 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| From 1f94c57dd0c7c6b6ff7acc073a9885db9772b48c Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 16:05:32 -0800 Subject: [PATCH 31/42] Updated available_inventory method in the movie model --- app/models/movie.rb | 3 ++- test/controllers/rentals_controller_test.rb | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 062d4b170..152558ede 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,6 +8,7 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals def available_inventory - return self.inventory + checked_out = self.rentals.where(:check_in_date == nil).count + return self.inventory - checked_out end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e986c21dd..daad1ad10 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -65,9 +65,11 @@ end it "will decrease a movie's available_inventory for a successful rental" do - starting_inventory = movie1.available_inventory + expect(movie1.available_inventory).must_equal 5 + + expect{ post check_out_path, params: @rental_hash }.must_differ "movie1.available_inventory", -1 - expect{ post check_out_path, params: @rental_hash }.must_differ "starting_inventory", -1 + expect(movie1.available_inventory).must_equal 4 end it "won't change a movie's available_inventory for an invalid rental" do From c85cb75bd42c74db676c72e0265ff78c78ed3ea1 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 17:03:24 -0800 Subject: [PATCH 32/42] fixed movie available inventory method --- app/controllers/rentals_controller.rb | 20 +++++++++++++ app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 31 +++++++++++++++++---- test/models/movie_test.rb | 15 ++++++++-- 6 files changed, 60 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index bd53f7245..3b07b9a7d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,9 +13,29 @@ def check_out end end + def check_in + matching_rentals = Rental.where(customer_id: params[:customer_id], movie_id: params[:movie_id]) + rental = matching_rentals[0] + + rental.check_in_date = Date.today + + + if rental.save + # p rental[:check_in_date] == nil + # checked_out = self.rentals.where(:check_in_date == nil).count + render json: {id: rental.id}, status: :ok + return + else + render json: {"errors": rental.errors.messages }, status: :bad_request + return + end + end + private def rental_params params.permit(:customer_id, :movie_id) end end + +# TEST MODEL METHODS \ No newline at end of file diff --git a/app/models/customer.rb b/app/models/customer.rb index 983096eff..bce03cd28 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -20,7 +20,7 @@ def self.update_customer_json end def movies_checked_out_count - checked_out = self.rentals.where(:check_in_date == nil).count + checked_out = self.rentals.where(check_in_date: nil).count return checked_out end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 152558ede..01d054d65 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,7 +8,7 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals def available_inventory - checked_out = self.rentals.where(:check_in_date == nil).count + checked_out = self.rentals.where(check_in_date: nil).count return self.inventory - checked_out end end diff --git a/config/routes.rb b/config/routes.rb index dd23c0855..f4219c50e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,5 +6,5 @@ resources :movies, only: [:index, :show, :create] post "/rentals/check-out", to: "rentals#check_out", as: "check_out" - patch "/rentals/check-in", to: "rentals#check_in", as: "check_in" + post "/rentals/check-in", to: "rentals#check_in", as: "check_in" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index daad1ad10..66e58d3b4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -79,25 +79,44 @@ expect{ post check_out_path, params: @rental_hash }.wont_differ "starting_inventory" end + + it "won't check out a movie if there is no available inventory" do + end end describe "check-in" do - it "can check in a movie from a customer" do + before do + @new_rental = Rental.create(customer_id: customer1.id, movie_id: movie1.id) end - it "responds with bad_request and gives an error message if given invalid customer id" do + it "can check in a movie from a customer and decrease their movies_checked_out_count for a sucessful check_in" do + expect(customer1.movies_checked_out_count).must_equal 1 + + expect { post check_in_path, params: @rental_hash }.wont_change "Rental.count" + + body = check_response(expected_type: Hash) + + expect(customer1.rentals.count).must_equal 1 + expect(movie1.rentals.count).must_equal 1 + expect(body.keys.first).must_equal "id" + expect(body.values.first).must_equal Rental.last.id + + expect(customer1.movies_checked_out_count).must_equal 0 end - it "responds with bad_request and gives an error message if given invalid movie id" do + it "will increase a movie's available_inventory for a successful check_in" do + expect(movie1.available_inventory).must_equal 4 + expect { post check_in_path, params: @rental_hash }.must_differ "movie1.available_inventory", 1 + expect(movie1.available_inventory).must_equal 5 end - it "will decrease a customer's movies_checked_out_count for a successful check_in" do + it "responds with bad_request and gives an error message if given invalid customer id" do end - it "won't change a customer's movies_checked_out_count for an invalid check_in" do + it "responds with bad_request and gives an error message if given invalid movie id" do end - it "will increase a movie's available_inventory for a successful check_in" do + it "won't change a customer's movies_checked_out_count for an invalid check_in" do end it "won't change a movie's available_inventory for an invalid check_in" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e3d94dc31..ec77d0233 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -55,12 +55,21 @@ end describe "available_inventory" do - it "sets the available inventory equal to the movie's inventory" do + let(:customer) { customers(:fred) } + let(:movie) { movies(:matrix) } + it "sets the available inventory equal to the movie's inventory minus rented movies" do movie = movies(:matrix) - inventory = movie.inventory - expect(movie.available_inventory).must_equal inventory + new_rental = Rental.create(customer_id: customer.id, movie_id: movie.id) + new_rental2 = Rental.create(customer_id: customer.id, movie_id: movie.id) + + expect(movie.available_inventory).must_equal (inventory - 2) + + new_rental2.check_in_date = Date.today + new_rental2.save + + expect(movie.available_inventory).must_equal (inventory - 1) end end end From 01bfdf9bdeaf36c58c6905943249a003e991742d Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 17:23:26 -0800 Subject: [PATCH 33/42] updated rental check_in test for bad customer id --- app/controllers/rentals_controller.rb | 8 +++++--- test/controllers/rentals_controller_test.rb | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3b07b9a7d..d449ff028 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,12 +17,14 @@ def check_in matching_rentals = Rental.where(customer_id: params[:customer_id], movie_id: params[:movie_id]) rental = matching_rentals[0] - rental.check_in_date = Date.today + if rental.nil? + render json: {"errors": "Rental not found" }, status: :not_found + return + end + rental.check_in_date = Date.today if rental.save - # p rental[:check_in_date] == nil - # checked_out = self.rentals.where(:check_in_date == nil).count render json: {id: rental.id}, status: :ok return else diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 66e58d3b4..6c84607a7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -110,10 +110,21 @@ expect(movie1.available_inventory).must_equal 5 end - it "responds with bad_request and gives an error message if given invalid customer id" do + it "responds with not_found and gives an error message if given invalid customer id" do + expect(customer1.movies_checked_out_count).must_equal 1 + @rental_hash[:customer_id] = -1 + + expect { post check_in_path, params: @rental_hash }.wont_differ "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body.keys).must_include "errors" + expect(body["errors"]).must_equal "Rental not found" + + expect(customer1.movies_checked_out_count).must_equal 1 end - it "responds with bad_request and gives an error message if given invalid movie id" do + it "responds with not_found and gives an error message if given invalid movie id" do end it "won't change a customer's movies_checked_out_count for an invalid check_in" do From 0a734dbcfe006f79865ce26847f6c094aea0aa03 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 20:10:24 -0800 Subject: [PATCH 34/42] added tests for checking out movie with available inventory 0 --- app/controllers/customers_controller.rb | 6 +-- app/controllers/rentals_controller.rb | 21 ++++++++++- app/models/customer.rb | 12 +++--- config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 41 +++++++++++++++------ test/fixtures/movies.yml | 7 +++- test/models/customer_test.rb | 7 ---- 7 files changed, 63 insertions(+), 35 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dd9952d41..e8e91de33 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,4 @@ -class CustomersController < ApplicationController - def zomg - render json: { test: "it works!" }, status: :ok - end - +class CustomersController < ApplicationController def index customer_json = Customer.update_customer_json diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d449ff028..275d924b3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,28 @@ class RentalsController < ApplicationController def check_out + + + new_movie = Movie.find_by(id: params[:movie_id]) + + # if new_movie.nil? + # render json: {"errors": "Movie not found" }, status: :not_found + # return + # end + new_rental = Rental.new(rental_params) new_rental.check_out_date = Date.today new_rental.due_date = Date.today + 7 + if !new_rental.valid? + render json: {"errors": new_rental.errors.messages }, status: :bad_request + return + end + + if new_movie.available_inventory <= 0 + render json: {"errors": "No available inventory" }, status: :bad_request + return + end + if new_rental.save render json: {id: new_rental.id}, status: :ok return @@ -39,5 +58,3 @@ def rental_params params.permit(:customer_id, :movie_id) end end - -# TEST MODEL METHODS \ No newline at end of file diff --git a/app/models/customer.rb b/app/models/customer.rb index bce03cd28..2d8acfa23 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,6 +7,13 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals + def movies_checked_out_count + checked_out = self.rentals.where(check_in_date: nil).count + return checked_out + end + + private + def self.update_customer_json customers = Customer.all @@ -18,9 +25,4 @@ def self.update_customer_json return customer_json end - - def movies_checked_out_count - checked_out = self.rentals.where(check_in_date: nil).count - return checked_out - end end diff --git a/config/routes.rb b/config/routes.rb index f4219c50e..09344adc5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,5 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get "/zomg", to: "customers#zomg", as: "zomg" - + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6c84607a7..04e121b86 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,6 +3,7 @@ describe RentalsController do let (:customer1) { customers(:fred) } let (:movie1) { movies(:matrix) } + let (:movie2) { movies(:twilight) } before do @rental_hash = { customer_id: customer1.id, movie_id: movie1.id } @@ -81,6 +82,23 @@ end it "won't check out a movie if there is no available inventory" do + expect(movie2.available_inventory).must_equal 1 + new_rental = Rental.create(customer: customer1, movie: movie2) + expect(movie2.available_inventory).must_equal 0 + expect(customer1.movies_checked_out_count).must_equal 1 + + + expect{ another_rental = Rental.create(customer: customer1, movie: movie2) }.wont_differ "Rental.count" + + + + + expect(customer1.movies_checked_out_count).must_equal 1 + + body = check_response(expected_type: Hash, expected_status: :bad_request) + + expect(body.keys).must_include "errors" + expect(body["errors"]).must_equal "No available inventory" end end @@ -110,27 +128,26 @@ expect(movie1.available_inventory).must_equal 5 end - it "responds with not_found and gives an error message if given invalid customer id" do - expect(customer1.movies_checked_out_count).must_equal 1 + it "responds with not_found, gives an error message, and doesn't change the movie's available inventory if given invalid customer id" do @rental_hash[:customer_id] = -1 - expect { post check_in_path, params: @rental_hash }.wont_differ "Rental.count" + expect { post check_in_path, params: @rental_hash }.wont_differ "movie1.available_inventory" body = check_response(expected_type: Hash, expected_status: :not_found) expect(body.keys).must_include "errors" expect(body["errors"]).must_equal "Rental not found" - - expect(customer1.movies_checked_out_count).must_equal 1 - end - - it "responds with not_found and gives an error message if given invalid movie id" do end - it "won't change a customer's movies_checked_out_count for an invalid check_in" do - end - - it "won't change a movie's available_inventory for an invalid check_in" do + it "responds with not_found, gives an error message, and doesn't change the customer's movies_checked_out_count if given invalid movie id" do + @rental_hash[:movie_id] = -1 + + expect { post check_in_path, params: @rental_hash }.wont_differ "customer1.movies_checked_out_count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body.keys).must_include "errors" + expect(body["errors"]).must_equal "Rental not found" end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index c97579d21..508db5c35 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -2,4 +2,9 @@ matrix: title: The Matrix release_date: March 31, 1999 inventory: 5 - overview: Science fiction action film. + overview: Science fiction action film +twilight: + title: Twilight + release_date: November 21, 2008 + inventory: 1 + overview: Vampire love story diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 694994932..8cf3d29a5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -39,13 +39,6 @@ expect(customer.errors.messages).must_include :phone expect(customer.errors.messages[:phone]).must_equal ["can't be blank"] end - - it "gets a default value of 0 for movies_checked_out_count" do - customer = Customer.new(name: "Fred Flintstone", registered_at: DateTime.now, postal_code: "98104", phone: "1234567890") - - expect(customer.valid?).must_equal true - expect(customer.movies_checked_out_count).must_equal 0 - end end describe "relationships" do From 8c86d7627b59e73b860e4b555f25d05b7386c4c0 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 20:37:51 -0800 Subject: [PATCH 35/42] fixed rentals controller check_out method --- app/controllers/rentals_controller.rb | 22 +++++---------------- app/models/customer.rb | 2 +- test/controllers/rentals_controller_test.rb | 7 ++----- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 275d924b3..e9db805c6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,28 +1,16 @@ class RentalsController < ApplicationController def check_out - - new_movie = Movie.find_by(id: params[:movie_id]) - # if new_movie.nil? - # render json: {"errors": "Movie not found" }, status: :not_found - # return - # end + if new_movie && new_movie.available_inventory <= 0 + render json: {"errors": "No available inventory" }, status: :bad_request + return + end new_rental = Rental.new(rental_params) new_rental.check_out_date = Date.today new_rental.due_date = Date.today + 7 - if !new_rental.valid? - render json: {"errors": new_rental.errors.messages }, status: :bad_request - return - end - - if new_movie.available_inventory <= 0 - render json: {"errors": "No available inventory" }, status: :bad_request - return - end - if new_rental.save render json: {id: new_rental.id}, status: :ok return @@ -33,7 +21,7 @@ def check_out end def check_in - matching_rentals = Rental.where(customer_id: params[:customer_id], movie_id: params[:movie_id]) + matching_rentals = Rental.where(customer_id: params[:customer_id], movie_id: params[:movie_id], check_in_date: nil) rental = matching_rentals[0] if rental.nil? diff --git a/app/models/customer.rb b/app/models/customer.rb index 2d8acfa23..751218a42 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -12,7 +12,7 @@ def movies_checked_out_count return checked_out end - private + private def self.update_customer_json customers = Customer.all diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 04e121b86..60dc6726a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -87,11 +87,8 @@ expect(movie2.available_inventory).must_equal 0 expect(customer1.movies_checked_out_count).must_equal 1 - - expect{ another_rental = Rental.create(customer: customer1, movie: movie2) }.wont_differ "Rental.count" - - - + @rental_hash2 = { customer_id: customer1.id, movie_id: movie2.id } + expect{ post check_out_path, params: @rental_hash2 }.wont_differ "Rental.count" expect(customer1.movies_checked_out_count).must_equal 1 From 8cf23f2912d3a35d23d996cfb1c9df95ad5be4d0 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Thu, 7 Nov 2019 21:06:24 -0800 Subject: [PATCH 36/42] all rake and postman tests passing --- test/controllers/rentals_controller_test.rb | 12 +++++++ test/models/customer_test.rb | 36 +++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 60dc6726a..5cb0bea39 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -146,5 +146,17 @@ expect(body.keys).must_include "errors" expect(body["errors"]).must_equal "Rental not found" end + + it "responds with not_found, gives an error message, and doesn't change the customer's movies_checked_out_count if no rentals found" do + @new_rental.check_in_date = Date.today + @new_rental.save + + expect { post check_in_path, params: @rental_hash }.wont_differ "customer1.movies_checked_out_count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body.keys).must_include "errors" + expect(body["errors"]).must_equal "Rental not found" + end end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 8cf3d29a5..f7eeb9643 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -44,6 +44,7 @@ describe "relationships" do let(:customer) { customers(:fred)} let(:movie) { movies(:matrix)} + it "can have a rental" do new_rental = Rental.create(customer: customer, movie: movie) @@ -58,4 +59,39 @@ expect(customer.movies.first).must_be_instance_of Movie end end + + describe "movies_checked_out_count" do + let(:customer) { customers(:fred)} + let(:movie) { movies(:matrix)} + let(:rental) { Rental.create(customer_id: customer.id, movie_id: movie.id) } + + it "returns 0 if the customer doesn't have any movies checked out" do + customer_rentals = Rental.where(customer_id: customer.id, check_in_date: nil) + + expect(customer_rentals).must_equal [] + expect(customer.movies_checked_out_count).must_equal 0 + end + + it "returns the appropriate number if the customer has a movie checked out" do + rental.save + + customer_rentals = Rental.where(customer_id: customer.id, check_in_date: nil) + expect(customer_rentals.length).must_equal 1 + expect(customer.movies_checked_out_count).must_equal 1 + end + + it "won't count movies that have been checked in" do + rental.save + customer_rentals = Rental.where(customer_id: customer.id, check_in_date: nil) + expect(customer_rentals.count).must_equal 1 + expect(customer.movies_checked_out_count).must_equal 1 + + rental.check_in_date = Date.today + rental.save + + updated_customer_rentals = Rental.where(customer_id: customer.id, check_in_date: nil) + expect(updated_customer_rentals).must_equal [] + expect(customer.movies_checked_out_count).must_equal 0 + end + end end From 0c49f7adb7a540613cdfa6af48d059ce23835521 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Fri, 8 Nov 2019 13:53:46 -0800 Subject: [PATCH 37/42] Added rental controller edge case test and movie model edge tests --- test/controllers/rentals_controller_test.rb | 28 ++++++++++++++++++++- test/fixtures/customers.yml | 6 ++++- test/models/movie_test.rb | 16 +++++++++++- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 5cb0bea39..09b373c2f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,6 +2,7 @@ describe RentalsController do let (:customer1) { customers(:fred) } + let (:customer2) { customers(:wilma) } let (:movie1) { movies(:matrix) } let (:movie2) { movies(:twilight) } @@ -21,6 +22,13 @@ expect(body.values.first).must_equal Rental.last.id end + it "accurately sets the check_out date to today and the due_date to a week from today with valid input" do + post check_out_path, params: @rental_hash + + expect(Rental.last.check_out_date).must_equal Date.today + expect(Rental.last.due_date).must_equal Date.today + 7 + end + it "responds with bad_request and gives an error message if given invalid customer id" do @rental_hash[:customer_id] = -1 @@ -125,6 +133,13 @@ expect(movie1.available_inventory).must_equal 5 end + it "accurately sets the check_in_date to today for a successful check_in" do + expect(@new_rental.check_in_date).must_be_nil + post check_in_path, params: @rental_hash + @new_rental.reload + expect(@new_rental.check_in_date).must_equal Date.today + end + it "responds with not_found, gives an error message, and doesn't change the movie's available inventory if given invalid customer id" do @rental_hash[:customer_id] = -1 @@ -147,7 +162,7 @@ expect(body["errors"]).must_equal "Rental not found" end - it "responds with not_found, gives an error message, and doesn't change the customer's movies_checked_out_count if no rentals found" do + it "responds with not_found, gives an error message, and doesn't change the customer's movies_checked_out_count if the customer already returned the movie" do @new_rental.check_in_date = Date.today @new_rental.save @@ -158,5 +173,16 @@ expect(body.keys).must_include "errors" expect(body["errors"]).must_equal "Rental not found" end + + it "responds with not_found, gives an error message, and doesn't change the customer's movies_checked_out_count if the given customer did not check out the given movie" do + rental_hash_2 = { customer_id: customer2.id, movie_id: movie1.id } + + expect { post check_in_path, params: rental_hash_2 }.wont_differ "customer2.movies_checked_out_count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body.keys).must_include "errors" + expect(body["errors"]).must_equal "Rental not found" + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index e35711db1..788e1376b 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -3,4 +3,8 @@ fred: registered_at: May 1, 2019 postal_code: 98104 phone: 1234567890 - \ No newline at end of file +wilma: + name: Wilma Flintstone + registered_at: April 2, 2019 + postal_code: 98104 + phone: 1234567890 \ No newline at end of file diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ec77d0233..170c21bb8 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -57,8 +57,9 @@ describe "available_inventory" do let(:customer) { customers(:fred) } let(:movie) { movies(:matrix) } + let(:movie2) { movies(:twilight) } it "sets the available inventory equal to the movie's inventory minus rented movies" do - movie = movies(:matrix) + inventory = movie.inventory new_rental = Rental.create(customer_id: customer.id, movie_id: movie.id) @@ -71,5 +72,18 @@ expect(movie.available_inventory).must_equal (inventory - 1) end + + it "returns the same value as the inventory if no copies of the movie are checked out" do + inventory = movie2.inventory + + expect(movie2.available_inventory).must_equal inventory + end + + it "returns 0 if all copies of the movie are checked out" do + inventory = movie2.inventory + new_rental = Rental.create(customer_id: customer.id, movie_id: movie2.id) + + expect(movie2.available_inventory).must_equal 0 + end end end From cfc475ee270f45bace0849eb80a4934cea0dfcc2 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Fri, 8 Nov 2019 14:08:31 -0800 Subject: [PATCH 38/42] Added controller tests for when no parameters are given --- test/controllers/movies_controller_test.rb | 89 ++++++++++++--------- test/controllers/rentals_controller_test.rb | 19 +++++ 2 files changed, 69 insertions(+), 39 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 45d4c8ed8..dc0dd08fc 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,48 +56,59 @@ describe "create" do before do @movie_hash = { - title: "Twilight", - overview: "Vampire love story", - release_date: "2008-11-21", - inventory: 100 } - end - - it "responds with status created when given a valid request and gives back id as a key" do - expect{post movies_path, params: @movie_hash}.must_differ "Movie.count", 1 - body = check_response(expected_type: Hash, expected_status: :ok) - expect(body.keys).must_equal ['id'] - end - - it "responds with bad_request when request has no title" do - @movie_hash[:title] = nil + title: "Twilight", + overview: "Vampire love story", + release_date: "2008-11-21", + inventory: 100 } + end - expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body['errors'].keys).must_include 'title' - end - - it "responds with bad_request when request has no overview" do - @movie_hash[:overview] = nil + it "responds with status created when given a valid request and gives back id as a key" do + expect{post movies_path, params: @movie_hash}.must_differ "Movie.count", 1 + body = check_response(expected_type: Hash, expected_status: :ok) + expect(body.keys).must_equal ['id'] + end - expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body['errors'].keys).must_include 'overview' - end - - it "responds with bad_request when request has no release_date" do - @movie_hash[:release_date] = nil + it "responds with bad_request when request is not given parameters" do + expect{post movies_path}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + + expect(body['errors']['title']).must_equal ["can't be blank"] + expect(body['errors']['overview']).must_equal ["can't be blank"] + expect(body['errors']['release_date']).must_equal ["can't be blank"] + expect(body['errors']['inventory']).must_equal ["can't be blank"] + end - expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body['errors'].keys).must_include 'release_date' - end - - it "responds with bad_request when request has no inventory" do - @movie_hash[:inventory] = nil + it "responds with bad_request when request has no title" do + @movie_hash[:title] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'title' + end - expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body['errors'].keys).must_include 'inventory' + it "responds with bad_request when request has no overview" do + @movie_hash[:overview] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'overview' + end + + it "responds with bad_request when request has no release_date" do + @movie_hash[:release_date] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'release_date' + end + + it "responds with bad_request when request has no inventory" do + @movie_hash[:inventory] = nil + + expect{post movies_path, params: @movie_hash}.wont_change "Movie.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors'].keys).must_include 'inventory' + end end 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 09b373c2f..1a673a795 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -105,6 +105,16 @@ expect(body.keys).must_include "errors" expect(body["errors"]).must_equal "No available inventory" end + + it "responds with bad_request and gives an error message if not given any parameters" do + expect { post check_out_path }.wont_differ "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + + expect(body.keys).must_include "errors" + expect(body["errors"]["movie"]).must_equal ["must exist"] + expect(body["errors"]["customer"]).must_equal ["must exist"] + end end describe "check-in" do @@ -184,5 +194,14 @@ expect(body.keys).must_include "errors" expect(body["errors"]).must_equal "Rental not found" end + + it "responds with not_found and gives an error message if not given any parameters" do + expect { post check_in_path }.wont_differ "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body.keys).must_include "errors" + expect(body["errors"]).must_equal "Rental not found" + end end end From 7aa500daad0b8a1ac866d3a1a8b7e33063775713 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Fri, 8 Nov 2019 16:05:10 -0800 Subject: [PATCH 39/42] fixed test for sort --- app/controllers/customers_controller.rb | 15 +++ test/controllers/customers_controller_test.rb | 12 ++ test/fixtures/customers.yml | 114 +++++++++++++++++- 3 files changed, 140 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e8e91de33..3825ba7dc 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,21 @@ class CustomersController < ApplicationController def index customer_json = Customer.update_customer_json + if params[:sort] == "name" || params[:sort] == "postal_code" || params[:sort] == "registered_at" + customer_json = customer_json.sort_by { |hash| hash[params[:sort]] } + end + + if params[:n] && params[:p] == nil + n = params[:n].to_i + customer_json = customer_json[0..n] + elsif params[:n] && params[:p] + n = params[:n].to_i + p = params[:p].to_i + starting = n * ( p - 1 ) + ending = (n * p) - 1 + customer_json = customer_json[starting..ending] + end + render json: customer_json, status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index f9d277096..6686fb448 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,5 +29,17 @@ expect(body).must_equal [] end + + it "responds with JSON and success for sorting by name with number of responses and pages" do + get customers_path, params: {sort: "name", n: 5, p: 2} + + body = check_response(expected_type: Array) + + expect(body.count).must_equal 5 + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"] + end + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 788e1376b..d5dcea47d 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -7,4 +7,116 @@ wilma: name: Wilma Flintstone registered_at: April 2, 2019 postal_code: 98104 - phone: 1234567890 \ No newline at end of file + phone: 1234567890 +shelly: + name: Shelley Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: Ap #292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 +curran: + name: Curran Stout + registered_at: Wed, 16 Apr 2014 21:40:20 -0700 + address: Ap #658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: 94267 + phone: (908) 949-6758 +roanna: + name: Roanna Robinson + registered_at: Fri, 28 Nov 2014 13:14:08 -0800 + address: Ap #561-4214 Eget St. + city: Harrisburg + state: PA + postal_code: 15867 + phone: (323) 336-1841 +carolyn: + name: Carolyn Chandler + registered_at: Fri, 04 Jul 2014 11:05:11 -0700 + address: 133-8707 Arcu. Avenue + city: Fort Wayne + state: IN + postal_code: 73684 + phone: (234) 837-2886 +aquila: + name: Aquila Riddle + registered_at: Thu, 27 Aug 2015 08:17:24 -0700 + address: Ap #187-9582 Primis St. + city: Tacoma + state: WA + postal_code: 73251 + phone: (925) 161-2223 +phyllis: + name: Phyllis Russell + registered_at: Wed, 02 Apr 2014 21:44:46 -0700 + address: 746-8511 Ipsum Ave + city: Boise + state: Idaho + postal_code: 76759 + phone: (961) 964-5158 +rajah: + name: Rajah Riggs + registered_at: Tue, 28 Jan 2014 22:28:45 -0800 + address: Ap #881-3920 Malesuada Avenue + city: Norman + state: OK + postal_code: 36134 + phone: (540) 515-2339 +amanda: + name: Amanda Curtis + registered_at: Tue, 18 Nov 2014 00:43:15 -0800 + address: Ap #773-125 Nunc St. + city: Iowa City + state: Iowa + postal_code: 18538 + phone: (253) 271-5290 +jacqueline: + name: Jacqueline Perry + registered_at: Thu, 23 Jul 2015 10:18:35 -0700 + address: Ap #288-7228 Dis Rd. + city: Anchorage + state: AK + postal_code: 99789 + phone: (479) 207-8414 +quinlan: + name: Quinlan Rich + registered_at: Fri, 10 Jul 2015 15:23:06 -0700 + address: Ap #727-9607 Nibh Avenue + city: Hilo + state: HI + postal_code: 63747 + phone: (521) 124-5753 +ciara: + name: Ciara Summers + registered_at: Thu, 09 Jul 2015 22:12:11 -0700 + address: Ap #412-1462 Molestie St. + city: Grand Rapids + state: Michigan + postal_code: 44906 + phone: (473) 496-4835 +alfreda: + name: Alfreda Hines + registered_at: Wed, 19 Aug 2015 23:18:27 -0700 + address: P.O. Box 754, 627 Erat Avenue + city: Anchorage + state: Alaska + postal_code: 99915 + phone: (921) 910-1283 +eugenia: + name: Eugenia Roberson + registered_at: Sun, 23 Feb 2014 10:19:11 -0800 + address: Ap #781-1953 Suspendisse Road + city: Jackson + state: MS + postal_code: 67415 + phone: (900) 501-6947 +ferris: + name: Ferris Robles + registered_at: Mon, 16 Mar 2015 16:45:12 -0700 + address: P.O. Box 344, 4911 Semper Rd. + city: Independence + state: Missouri + postal_code: 46428 + phone: (569) 834-1872 From fd7504be35151a500e66cee693134c831eea00e8 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Fri, 8 Nov 2019 16:14:33 -0800 Subject: [PATCH 40/42] added test for sort but not enough customers --- app/controllers/customers_controller.rb | 5 ++++ test/controllers/customers_controller_test.rb | 23 +++++++++++++++++++ test/models/movie_test.rb | 1 - 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3825ba7dc..ae7776f92 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -17,6 +17,11 @@ def index customer_json = customer_json[starting..ending] end + if !customer_json + render json: {"errors": { "customer": ["Not enough customers"] } }, status: :bad_request + return + end + render json: customer_json, status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 6686fb448..fc7c21640 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -41,5 +41,28 @@ expect(customer.keys.sort).must_equal ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"] end end + + it "responds with JSON and success for sorting by name with number of responses and pages even if there aren't enough records" do + expect(Customer.all.count).must_equal 16 + + get customers_path, params: {sort: "name", n: 10, p: 2} + + body = check_response(expected_type: Array) + + expect(body.count).must_equal 6 + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal ["id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at"] + end + end + + it "responds with JSON and success for sorting by name with number of responses and pages even if there aren't enough records" do + expect(Customer.all.count).must_equal 16 + + get customers_path, params: {sort: "name", n: 10, p: 3} + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors']["customer"]).must_equal ["Not enough customers"] + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 170c21bb8..d473981b1 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -59,7 +59,6 @@ let(:movie) { movies(:matrix) } let(:movie2) { movies(:twilight) } it "sets the available inventory equal to the movie's inventory minus rented movies" do - inventory = movie.inventory new_rental = Rental.create(customer_id: customer.id, movie_id: movie.id) From c0de91ce74c8903ee3a6b25239ca01d154aa3186 Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Fri, 8 Nov 2019 16:19:15 -0800 Subject: [PATCH 41/42] added one more assertion to customers sort test --- test/controllers/customers_controller_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index fc7c21640..fa5118d16 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -31,6 +31,8 @@ end it "responds with JSON and success for sorting by name with number of responses and pages" do + expect(Customer.all.count).must_equal 16 + get customers_path, params: {sort: "name", n: 5, p: 2} body = check_response(expected_type: Array) From 6ed1ddded340cbca96c3d269fd8c3c9a3f58686d Mon Sep 17 00:00:00 2001 From: Dianna Tingg Date: Fri, 8 Nov 2019 16:43:52 -0800 Subject: [PATCH 42/42] Added query parameters to customers#index to sort and paginate --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ae7776f92..229e92b07 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -18,7 +18,7 @@ def index end if !customer_json - render json: {"errors": { "customer": ["Not enough customers"] } }, status: :bad_request + render json: {"errors": { "customer": ["Not enough customers to reach this page"] } }, status: :bad_request return end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index fa5118d16..db3a3f0c9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -44,7 +44,7 @@ end end - it "responds with JSON and success for sorting by name with number of responses and pages even if there aren't enough records" do + it "responds with JSON and success for sorting by name with number of responses and pages even if there aren't enough records to fill the page" do expect(Customer.all.count).must_equal 16 get customers_path, params: {sort: "name", n: 10, p: 2} @@ -64,7 +64,7 @@ get customers_path, params: {sort: "name", n: 10, p: 3} body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body['errors']["customer"]).must_equal ["Not enough customers"] + expect(body['errors']["customer"]).must_equal ["Not enough customers to reach this page"] end end end