From b0297aea7cf8b928206f454e5c929382e5375738 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 11:40:21 -0800 Subject: [PATCH 01/43] First commit new rails app --- .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..6986a57b2 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +xIiQidOxMouH3RIEHYDQflMzJjNgQRcFo7SgWy31aJuxtBRgwVcdhXVdKoKd+lNrUcPRgClYfvz6+KpW5eRqlT4kcgLL3y34S7EOwOPP0XOtNSiXr3lg8io2uzcgVrZ2j9YhCefXR3wXDiqh0YBOxtISvJhLj3SVSSc41PdKUmaFJCnDwL7bhMRA6RK4Wp5ZMJLAHwioMjEnLyfR/HBLLC1SKc/Yrlm2ZVhuNeYR0OXsyZEphw770yGDFOZ7/AM7R3xZQU1zvpzxxoZTvMtnRgfUGy7ilPUlcQszNuK7ulkNZhCPX/w2ZYVj9R9eIAqQ45DOW3N28Ffi75itz33k8Ij0bPUES7ZbdyP1XOoWuA5xFkywu7gm4zOkTyhf+1WZNqkecSlmpDbM/JYNKhrEnlhlDgJ6BKPsYwxm--p3WW1ZxTzW8IDRfK--QBljyNNa9ABACbAAtaUgvQ== \ 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 e94f179016e6be6437acc7d8a8dac337ddbb64ba Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Tue, 5 Nov 2019 11:57:36 -0800 Subject: [PATCH 02/43] Added Customer & Movie models --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + db/migrate/20191105195417_create_movies.rb | 12 ++++++ db/migrate/20191105195554_create_customers.rb | 15 +++++++ db/schema.rb | 39 +++++++++++++++++++ test/models/customer_test.rb | 7 ++++ test/models/movie_test.rb | 7 ++++ 7 files changed, 84 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20191105195417_create_movies.rb create mode 100644 db/migrate/20191105195554_create_customers.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/20191105195417_create_movies.rb b/db/migrate/20191105195417_create_movies.rb new file mode 100644 index 000000000..1748c0def --- /dev/null +++ b/db/migrate/20191105195417_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20191105195554_create_customers.rb b/db/migrate/20191105195554_create_customers.rb new file mode 100644 index 000000000..b8ef49ec2 --- /dev/null +++ b/db/migrate/20191105195554_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..207c76621 --- /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_195554) 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 46602cbc362f84f7afa61de648db3ee0d6bcb76d Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 12:23:41 -0800 Subject: [PATCH 03/43] Movies#index controller action and tests --- app/controllers/movies_controller.rb | 15 ++++++++++ config/routes.rb | 2 ++ test/controllers/movies_controller_test.rb | 34 ++++++++++++++++++++++ test/test_helper.rb | 9 ++++++ 4 files changed, 60 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b1fc22f17 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,15 @@ +KEYS = [:id, :title, :release_date] + +class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: KEYS), status: :ok + return + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..32c1a26ff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + resources :movies, only: [:index, :show, :create] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..2ec47a03e --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +describe MoviesController do + 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 + body.each do |movie| + expect(movie).must_be_instance_of Hash + expect(movie.keys.sort).must_equal ["id", "title", "release_date"] + end + end + + it "will respond with an empty array when there are no movies" do + Movie.destroy_all + + get movies_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..4b342e76e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,15 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" +require 'minitest/autorun' + +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From c633d0d3eedeb4b0325bad7a2b0d9fbe702372b1 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Tue, 5 Nov 2019 13:19:20 -0800 Subject: [PATCH 04/43] Added Customers controller & tests --- app/controllers/customers_controller.rb | 6 ++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 35 +++++++++++++++++++ test/test_helper.rb | 6 +++- 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..6116c28ef --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,6 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..0201f398f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + get "/customers", to: "customers#index", as: "customers" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..e7585d4cc --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,35 @@ +require "test_helper" + +describe CustomersController do + + 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 customer data" do + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash + # expect(customer.keys.sort).must_equal + end + end + + it "will respond with an empty array when there are no customers" do + Customer.destroy_all + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..2e3adf308 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,10 +1,14 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require "minitest/rails" +require 'minitest/autorun' +require 'minitest/reporters' +Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new 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 25a7e5b75847a0d34be67ea8a08229dd576cdb66 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 13:40:30 -0800 Subject: [PATCH 05/43] Movies#show action controller method and tests --- app/controllers/movies_controller.rb | 11 +++++- ...213019_add_available_inventory_to_movie.rb | 5 +++ db/schema.rb | 3 +- test/controllers/movies_controller_test.rb | 37 +++++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20191105213019_add_available_inventory_to_movie.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b1fc22f17..42a75d3b9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,4 @@ -KEYS = [:id, :title, :release_date] +KEYS = [:id, :title, :overview, :release_date] class MoviesController < ApplicationController def index @@ -8,6 +8,15 @@ def index end def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok + return + else + render json: { "errors" => ["not found"] }, status: :not_found + return + end end def create diff --git a/db/migrate/20191105213019_add_available_inventory_to_movie.rb b/db/migrate/20191105213019_add_available_inventory_to_movie.rb new file mode 100644 index 000000000..8aa5f5b56 --- /dev/null +++ b/db/migrate/20191105213019_add_available_inventory_to_movie.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovie < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer, :default => :inventory + end +end diff --git a/db/schema.rb b/db/schema.rb index 207c76621..26bbb130d 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_195554) do +ActiveRecord::Schema.define(version: 2019_11_05_213019) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2ec47a03e..2208faa63 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -31,4 +31,41 @@ expect(body).must_equal [] end end + + describe "show" do + before do + Movie.create(title: "random") + end + let (:valid_movie_id) { Movie.all.first } + let (:invalid_movie_id) { -1 } + it "responds with JSON and success for valid movie" do + get movie_path(valid_movie_id.id) + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it "responds with a movie hash" do + get movie_path(valid_movie_id.id) + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal ["id", "title", "release_date", "overview", "inventory", "available_inventory"].sort + must_respond_with :ok + + end + + it "responds with JSON and not found error for invalid movie" do + get movie_path(invalid_movie_id) + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + + expect(body["errors"]).must_equal ["not found"] + + must_respond_with :not_found + end + end end From d35da4ccc44e8ac2acebe4f1b22c6fe923d911f3 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 14:01:55 -0800 Subject: [PATCH 06/43] Added Movies#create controller action and tests --- app/controllers/movies_controller.rb | 16 +++++++++ app/models/movie.rb | 1 + test/controllers/movies_controller_test.rb | 38 +++++++++++++++++++++- 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 42a75d3b9..42ceeed5c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,5 +20,21 @@ def show end def create + movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory + + if movie.save + render json: movie.as_json(only: [:id]), status: :ok + return + else + render json: { "errors" => ["unable to create movie"] }, status: :bad_request + return + end + end + + private + + def movie_params + return params.permit(:title, :release_date, :overview, :inventory, :available_inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..d34b59f22 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + validates :title, presence: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2208faa63..1e4b6464b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -53,7 +53,6 @@ expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal ["id", "title", "release_date", "overview", "inventory", "available_inventory"].sort must_respond_with :ok - end it "responds with JSON and not found error for invalid movie" do @@ -68,4 +67,41 @@ must_respond_with :not_found end end + + describe "create" do + it "creates new movie with valid parameters" do + new_movie_params = { + title: "new movie", + overview: "new movie description", + release_date: 2019, + inventory: 10 + } + + expect { + post movies_path, params: new_movie_params + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + + expect(body.keys.length).must_equal 1 + expect(body.keys).must_equal ["id"] + expect(body["id"]).must_be_instance_of Integer + expect(body["id"]).must_equal Movie.find_by(title: new_movie_params[:title]).id + must_respond_with :ok + end + + it "renders error if unable to save movie " do + new_movie_params = { + overview: "new movie description", + release_date: 2019, + inventory: 10 + } + + expect { + post movies_path, params: new_movie_params + }.wont_change "Movie.count" + + must_respond_with :bad_request + end + end end From 660fc8084b9b32b872f55abf1fdf3e7f64838e43 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 14:04:41 -0800 Subject: [PATCH 07/43] Updated Movie model tests --- test/models/movie_test.rb | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cd59ab14a..280ecfa14 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,21 @@ require "test_helper" describe Movie do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validation" do + it "will create movie if title is present" do + movie = Movie.new(title: "valid movie") + + is_valid = movie.valid? + + assert(is_valid) + end + + it "will not create movie if title is not present" do + movie = Movie.new() + + is_valid = movie.valid? + + refute(is_valid) + end + end end From ccc6990c04cbb39671112d3410a624c5ab11739a Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Tue, 5 Nov 2019 14:21:21 -0800 Subject: [PATCH 08/43] Added Rental model and tests for relationship with Customer & Movie --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 4 +++ db/migrate/20191105221030_create_rentals.rb | 10 ++++++++ ...vie_and_customer_foreign_keys_to_rental.rb | 6 +++++ db/schema.rb | 15 ++++++++++- test/models/customer_test.rb | 18 ++++++++++--- test/models/movie_test.rb | 25 +++++++++++++++---- test/models/rental_test.rb | 9 +++++++ 9 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20191105221030_create_rentals.rb create mode 100644 db/migrate/20191105221230_add_movie_and_customer_foreign_keys_to_rental.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index d34b59f22..f7fdb1b9c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,4 @@ class Movie < ApplicationRecord validates :title, presence: true + has_many :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/20191105221030_create_rentals.rb b/db/migrate/20191105221030_create_rentals.rb new file mode 100644 index 000000000..c98328095 --- /dev/null +++ b/db/migrate/20191105221030_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20191105221230_add_movie_and_customer_foreign_keys_to_rental.rb b/db/migrate/20191105221230_add_movie_and_customer_foreign_keys_to_rental.rb new file mode 100644 index 000000000..9cad41361 --- /dev/null +++ b/db/migrate/20191105221230_add_movie_and_customer_foreign_keys_to_rental.rb @@ -0,0 +1,6 @@ +class AddMovieAndCustomerForeignKeysToRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 26bbb130d..47bbb83e6 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_213019) do +ActiveRecord::Schema.define(version: 2019_11_05_221230) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,4 +37,17 @@ t.integer "available_inventory" end + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..630d472a0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,19 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + describe "relationships" do + it "can have many rentals" do + movie = Movie.create(title: "valid movie") + customer = Customer.create(name: "valid customer") + rental = Rental.create(movie_id: movie.id, customer_id: customer.id) + + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + expect(customer.rentals.length).must_equal 1 + end + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 280ecfa14..ba45490af 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -4,18 +4,33 @@ describe "validation" do it "will create movie if title is present" do movie = Movie.new(title: "valid movie") - + is_valid = movie.valid? - + assert(is_valid) end - + it "will not create movie if title is not present" do movie = Movie.new() - + is_valid = movie.valid? - + refute(is_valid) end end + + describe "relationships" do + it "can have many rentals" do + movie = Movie.create(title: "valid movie") + customer = Customer.create(name: "valid customer") + rental = Rental.create(movie_id: movie.id, customer_id: customer.id) + + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + expect(movie.rentals.length).must_equal 1 + end + end + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..43dffe54e --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + + describe "validation" do + it + end + +end From f9eb3aba9021990a158d9e5a684936daef0b2e48 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Tue, 5 Nov 2019 14:27:51 -0800 Subject: [PATCH 09/43] Added validation and relationship model tests to Rental --- test/models/rental_test.rb | 46 +++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 43dffe54e..5659877ff 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,49 @@ require "test_helper" describe Rental do - + describe "validation" do - it + it "must have a customer and movie" do + movie = Movie.create(title: "valid movie") + customer = Customer.create(name: "valid customer") + rental = Rental.create(movie_id: movie.id, customer_id: customer.id) + + is_valid = rental.valid? + + assert(is_valid) + end + it "returns invalid if no customer is present" do + movie = Movie.create(title: "valid movie") + rental = Rental.create(movie_id: movie.id) + + is_valid = rental.valid? + + refute(is_valid) + end + it "returns invalid if no movie is present" do + customer = Customer.create(name: "valid customer") + rental = Rental.create(customer_id: customer.id) + + is_valid = rental.valid? + + refute(is_valid) + end + + end + + describe "relationships" do + before do + @movie = Movie.create(title: "valid movie") + @customer = Customer.create(name: "valid customer") + @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id) + end + it "must belong to a customer" do + @rental.must_respond_to :customer + @rental.customer.must_be_kind_of Customer + end + it "must belong to a movie" do + @rental.must_respond_to :movie + @rental.movie.must_be_kind_of Movie + end end - end From ac0e0a0cca7f352e859339c383346d1d687ff301 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Tue, 5 Nov 2019 14:54:46 -0800 Subject: [PATCH 10/43] Added Rental controller and tests --- app/controllers/rentals_controller.rb | 16 ++++++++++++++++ config/routes.rb | 4 +++- test/controllers/rentals_controller_test.rb | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..2b3e2e430 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,16 @@ +class RentalsController < ApplicationController + + def create + rental = Rental.new(movie: Movie.first, customer: Customer.first) + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 + if rental.save + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { "errors" => ["unable to create rental"]}, status: :bad_request + return + end + end + +end diff --git a/config/routes.rb b/config/routes.rb index 6270a887f..246458a18 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - + resources :movies, only: [:index, :show, :create] + post "/rentals/check-out", to: "rentals#create", as: "checkout" + patch "/rentals/check-in", to: "rentals#update", as: "checkin" get "/customers", to: "customers#index", as: "customers" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..46f602633 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,17 @@ +require "test_helper" + +describe RentalsController do + describe "checkout" do + before do + movie = Movie.create(title: "valid movie") + customer = Customer.create(name: "valid customer") + end + + it "can checkout a movie by creating a new rental" do + expect{ post checkout_path }.must_change "Rental.count", 1 + + must_respond_with :ok + + end + end +end From f682d3fecf9002d3fff01cf2fc22b72fc8f54162 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 15:06:56 -0800 Subject: [PATCH 11/43] Updates to Customer model and Movie seed --- app/controllers/rentals_controller.rb | 4 +++- app/models/rental.rb | 5 +++++ .../20191105225728_add_movies_checked_out_to_customer.rb | 5 +++++ db/schema.rb | 3 ++- db/seeds.rb | 3 ++- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20191105225728_add_movies_checked_out_to_customer.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2b3e2e430..95d0448a0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,7 +4,9 @@ def create rental = Rental.new(movie: Movie.first, customer: Customer.first) rental.checkout_date = Date.today rental.due_date = Date.today + 7 - if rental.save + + if rental.save && rental.movie.available_inventory > 0 + rental.check_out_rental render json: rental.as_json(only: [:id]), status: :ok return else diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..33dce7177 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,9 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + def check_out_rental + self.movie.available_inventory -= 1 + self.customer.movies_checked_out_count += 1 + end end diff --git a/db/migrate/20191105225728_add_movies_checked_out_to_customer.rb b/db/migrate/20191105225728_add_movies_checked_out_to_customer.rb new file mode 100644 index 000000000..37574877e --- /dev/null +++ b/db/migrate/20191105225728_add_movies_checked_out_to_customer.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutToCustomer < 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 47bbb83e6..a2d4097f2 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_221230) do +ActiveRecord::Schema.define(version: 2019_11_05_225728) 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/db/seeds.rb b/db/seeds.rb index 5322340ba..e20b4e4cf 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,6 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + m = Movie.create!(movie) + m.update(available_inventory: m.inventory) end From f6a459051628e3fa324d06c4a9ed475842f59656 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 15:16:44 -0800 Subject: [PATCH 12/43] Custom method tests for check out rental method --- app/controllers/rentals_controller.rb | 3 ++- app/models/rental.rb | 2 ++ test/controllers/rentals_controller_test.rb | 2 +- test/models/rental_test.rb | 27 +++++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 95d0448a0..ed2a7b94b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,7 +5,8 @@ def create rental.checkout_date = Date.today rental.due_date = Date.today + 7 - if rental.save && rental.movie.available_inventory > 0 + + if rental.save && (rental.movie.available_inventory > 0 ) rental.check_out_rental render json: rental.as_json(only: [:id]), status: :ok return diff --git a/app/models/rental.rb b/app/models/rental.rb index 33dce7177..9c7d067c3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,6 +4,8 @@ class Rental < ApplicationRecord def check_out_rental self.movie.available_inventory -= 1 + self.movie.save self.customer.movies_checked_out_count += 1 + self.customer.save end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 46f602633..69886d3ff 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,7 +3,7 @@ describe RentalsController do describe "checkout" do before do - movie = Movie.create(title: "valid movie") + movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) customer = Customer.create(name: "valid customer") end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 5659877ff..dc50bb5b9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -46,4 +46,31 @@ @rental.movie.must_be_kind_of Movie end end + + describe "custom methods" do + before do + @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) + @customer = Customer.create(name: "valid customer") + @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id) + end + + describe "check out rental method" do + it "decrements available inventory" do + starting_inventory = @movie.available_inventory + + @rental.check_out_rental + + expect(@movie.available_inventory).must_equal starting_inventory - 1 + end + + it "increments movies checkout out count" do + starting_checked_out = @customer.movies_checked_out_count + + @rental.check_out_rental + + expect(@customer.movies_checked_out_count + ).must_equal starting_checked_out + 1 + end + end + end end From 7bd59a42057f51bba778043420c33c8a51b145cd Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 15:23:01 -0800 Subject: [PATCH 13/43] Updated rentals controller tests with updates to create method --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 15 ++++++++++++--- test/models/rental_test.rb | 4 ++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ed2a7b94b..68ed12b8b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,7 +6,7 @@ def create rental.due_date = Date.today + 7 - if rental.save && (rental.movie.available_inventory > 0 ) + if rental.movie.available_inventory > 0 && rental.save rental.check_out_rental render json: rental.as_json(only: [:id]), status: :ok return diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 69886d3ff..74dc6ccf2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,15 +3,24 @@ describe RentalsController do describe "checkout" do before do - movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) - customer = Customer.create(name: "valid customer") + end - it "can checkout a movie by creating a new rental" do + it "can checkout a movie by creating a new rental with valid input and available inventory" do + movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) + customer = Customer.create(name: "valid customer") expect{ post checkout_path }.must_change "Rental.count", 1 must_respond_with :ok + end + + it "will not create rental without available inventory" do + movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 0) + customer = Customer.create(name: "valid customer") + + expect{ post checkout_path }.wont_change "Rental.count" + must_respond_with :bad_request end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index dc50bb5b9..8446ace3a 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -59,6 +59,8 @@ starting_inventory = @movie.available_inventory @rental.check_out_rental + + @movie.reload expect(@movie.available_inventory).must_equal starting_inventory - 1 end @@ -68,6 +70,8 @@ @rental.check_out_rental + @customer.reload + expect(@customer.movies_checked_out_count ).must_equal starting_checked_out + 1 end From 4e29070841ba90d7963031d35855b2e437287d30 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Tue, 5 Nov 2019 15:32:21 -0800 Subject: [PATCH 14/43] Updated Rentals#create --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 68ed12b8b..67308d433 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,7 @@ class RentalsController < ApplicationController def create - rental = Rental.new(movie: Movie.first, customer: Customer.first) + rental = Rental.new(movie: Movie.all.sample, customer: Customer.all.sample) rental.checkout_date = Date.today rental.due_date = Date.today + 7 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 74dc6ccf2..85eb8d646 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,10 +2,6 @@ describe RentalsController do describe "checkout" do - before do - - end - it "can checkout a movie by creating a new rental with valid input and available inventory" do movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) customer = Customer.create(name: "valid customer") From b01994b8620762cd086060da88be3cd5ee5d270e Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Tue, 5 Nov 2019 16:18:57 -0800 Subject: [PATCH 15/43] Added Checkin method, tests passing --- app/controllers/rentals_controller.rb | 18 +++++++-- app/models/rental.rb | 9 ++++- test/controllers/rentals_controller_test.rb | 27 +++++++++++-- test/models/rental_test.rb | 42 ++++++++++++++++----- 4 files changed, 79 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 67308d433..7a57dc887 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,11 @@ class RentalsController < ApplicationController def create - rental = Rental.new(movie: Movie.all.sample, customer: Customer.all.sample) + rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id]) rental.checkout_date = Date.today rental.due_date = Date.today + 7 - - + + if rental.movie.available_inventory > 0 && rental.save rental.check_out_rental render json: rental.as_json(only: [:id]), status: :ok @@ -16,4 +16,16 @@ def create end end + def update + rental = Rental.find_by(id: params[:id]) + if rental + rental.check_in_rental + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { "errors" => ["rental not found"]}, status: :not_found + return + end + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 9c7d067c3..af333b32b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,11 +1,18 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer - + def check_out_rental self.movie.available_inventory -= 1 self.movie.save self.customer.movies_checked_out_count += 1 self.customer.save end + + def check_in_rental + self.movie.available_inventory += 1 + self.movie.save + self.customer.movies_checked_out_count -= 1 + self.customer.save + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 85eb8d646..d901bcead 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,18 +5,37 @@ it "can checkout a movie by creating a new rental with valid input and available inventory" do movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) customer = Customer.create(name: "valid customer") - expect{ post checkout_path }.must_change "Rental.count", 1 + expect{ post checkout_path, params: {movie_id: movie.id, customer_id: customer.id} }.must_change "Rental.count", 1 must_respond_with :ok end - + it "will not create rental without available inventory" do movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 0) customer = Customer.create(name: "valid customer") - - expect{ post checkout_path }.wont_change "Rental.count" + + expect{ post checkout_path, params: {movie_id: movie.id, customer_id: customer.id} }.wont_change "Rental.count" must_respond_with :bad_request end end + + describe "checkin" do + it "can checkin a valid rental and by creating a new rental with valid input and available inventory" do + movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) + customer = Customer.create(name: "valid customer") + + post checkout_path, params: {movie_id: movie.id, customer_id: customer.id} + + expect{ patch checkin_path, params: {id: Rental.first.id} }.wont_change "Rental.count" + + must_respond_with :ok + end + + it "will not checkin a rental that doesn't exist" do + expect{ patch checkin_path, params: {id: -1} }.wont_change "Rental.count" + + must_respond_with :not_found + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 8446ace3a..c8210d072 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -46,35 +46,59 @@ @rental.movie.must_be_kind_of Movie end end - + describe "custom methods" do before do @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) @customer = Customer.create(name: "valid customer") @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id) end - + describe "check out rental method" do it "decrements available inventory" do starting_inventory = @movie.available_inventory - + @rental.check_out_rental - + @movie.reload - + expect(@movie.available_inventory).must_equal starting_inventory - 1 end - + it "increments movies checkout out count" do starting_checked_out = @customer.movies_checked_out_count - + @rental.check_out_rental - + @customer.reload - + expect(@customer.movies_checked_out_count ).must_equal starting_checked_out + 1 end end + + describe "check in rental method" do + it "increments available inventory" do + starting_inventory = @movie.available_inventory + + @rental.check_in_rental + + @movie.reload + + expect(@movie.available_inventory).must_equal starting_inventory + 1 + end + + it "decrements movies checked out count" do + starting_checked_out = @customer.movies_checked_out_count + + @rental.check_in_rental + + @customer.reload + + expect(@customer.movies_checked_out_count + ).must_equal starting_checked_out - 1 + end + end + end end From 14b64fc11d9516e615bd579110c18dcdecc1b13e Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Tue, 5 Nov 2019 16:47:59 -0800 Subject: [PATCH 16/43] Corrected Rental controller update params --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7a57dc887..a6ca81800 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,7 +17,7 @@ def create end def update - rental = Rental.find_by(id: params[:id]) + rental = Rental.find_by(movie_id: params[:movie_id], customer_id: params[:customer_id]) if rental rental.check_in_rental render json: rental.as_json(only: [:id]), status: :ok From ede2c9db48038290e674ee4d0d8bd9e368c8b306 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Wed, 6 Nov 2019 12:32:28 -0800 Subject: [PATCH 17/43] Updates to Rentals controller tests with new params --- test/controllers/rentals_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d901bcead..6dca9a97d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -27,7 +27,7 @@ post checkout_path, params: {movie_id: movie.id, customer_id: customer.id} - expect{ patch checkin_path, params: {id: Rental.first.id} }.wont_change "Rental.count" + expect{ patch checkin_path, params: {movie_id: movie.id, customer_id: customer.id} }.wont_change "Rental.count" must_respond_with :ok end From bdfd359c58bb0d60eb41ddab0e28db13c0ede62a Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Wed, 6 Nov 2019 12:35:56 -0800 Subject: [PATCH 18/43] Refactored Rentals controller test code --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 26 ++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a6ca81800..8fbf80838 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,7 @@ def create if rental.movie.available_inventory > 0 && rental.save rental.check_out_rental - render json: rental.as_json(only: [:id]), status: :ok + render json: rental.as_json(only: [:id]), status: :created return else render json: { "errors" => ["unable to create rental"]}, status: :bad_request diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6dca9a97d..0be55cba6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,20 +1,22 @@ require "test_helper" describe RentalsController do + before do + @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) + @customer = Customer.create(name: "valid customer") + end + describe "checkout" do it "can checkout a movie by creating a new rental with valid input and available inventory" do - movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) - customer = Customer.create(name: "valid customer") - expect{ post checkout_path, params: {movie_id: movie.id, customer_id: customer.id} }.must_change "Rental.count", 1 + expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.must_change "Rental.count", 1 - must_respond_with :ok + must_respond_with :created end it "will not create rental without available inventory" do - movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 0) - customer = Customer.create(name: "valid customer") + @movie.update(available_inventory: 0) - expect{ post checkout_path, params: {movie_id: movie.id, customer_id: customer.id} }.wont_change "Rental.count" + expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.wont_change "Rental.count" must_respond_with :bad_request end @@ -22,17 +24,15 @@ describe "checkin" do it "can checkin a valid rental and by creating a new rental with valid input and available inventory" do - movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) - customer = Customer.create(name: "valid customer") - - post checkout_path, params: {movie_id: movie.id, customer_id: customer.id} + # check out rental so that it can be checked in + post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} - expect{ patch checkin_path, params: {movie_id: movie.id, customer_id: customer.id} }.wont_change "Rental.count" + expect{ patch checkin_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.wont_change "Rental.count" must_respond_with :ok end - it "will not checkin a rental that doesn't exist" do + it "will not checkin a rental that doesn't exist" do expect{ patch checkin_path, params: {id: -1} }.wont_change "Rental.count" must_respond_with :not_found From 1f0bc2ea59ba95ef147c649e13b6282dffd36e90 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Wed, 6 Nov 2019 12:44:19 -0800 Subject: [PATCH 19/43] Refactored rental model tests --- test/controllers/rentals_controller_test.rb | 17 ++++++++++++---- test/models/rental_test.rb | 22 ++++++++++----------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0be55cba6..25ba3b9c9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -8,7 +8,10 @@ describe "checkout" do it "can checkout a movie by creating a new rental with valid input and available inventory" do - expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.must_change "Rental.count", 1 + + expect{ + post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} + }.must_change "Rental.count", 1 must_respond_with :created end @@ -16,7 +19,9 @@ it "will not create rental without available inventory" do @movie.update(available_inventory: 0) - expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.wont_change "Rental.count" + expect{ + post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} + }.wont_change "Rental.count" must_respond_with :bad_request end @@ -27,13 +32,17 @@ # check out rental so that it can be checked in post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} - expect{ patch checkin_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.wont_change "Rental.count" + expect{ + patch checkin_path, params: {movie_id: @movie.id, customer_id: @customer.id} + }.wont_change "Rental.count" must_respond_with :ok end it "will not checkin a rental that doesn't exist" do - expect{ patch checkin_path, params: {id: -1} }.wont_change "Rental.count" + expect{ + patch checkin_path, params: {id: -1} + }.wont_change "Rental.count" must_respond_with :not_found end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c8210d072..ce09895c6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,11 +1,11 @@ require "test_helper" describe Rental do + let (:movie) {movie = Movie.create(title: "valid movie")} + let (:customer) {customer = Customer.create(name: "valid customer")} describe "validation" do it "must have a customer and movie" do - movie = Movie.create(title: "valid movie") - customer = Customer.create(name: "valid customer") rental = Rental.create(movie_id: movie.id, customer_id: customer.id) is_valid = rental.valid? @@ -13,7 +13,6 @@ assert(is_valid) end it "returns invalid if no customer is present" do - movie = Movie.create(title: "valid movie") rental = Rental.create(movie_id: movie.id) is_valid = rental.valid? @@ -21,7 +20,6 @@ refute(is_valid) end it "returns invalid if no movie is present" do - customer = Customer.create(name: "valid customer") rental = Rental.create(customer_id: customer.id) is_valid = rental.valid? @@ -33,21 +31,21 @@ describe "relationships" do before do - @movie = Movie.create(title: "valid movie") - @customer = Customer.create(name: "valid customer") - @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id) + @rental = Rental.create(movie_id: movie.id, customer_id: customer.id) end + it "must belong to a customer" do - @rental.must_respond_to :customer - @rental.customer.must_be_kind_of Customer + expect(@rental).must_respond_to :customer + expect(@rental.customer).must_be_kind_of Customer end + it "must belong to a movie" do - @rental.must_respond_to :movie - @rental.movie.must_be_kind_of Movie + expect(@rental).must_respond_to :movie + expect(@rental.movie).must_be_kind_of Movie end end - describe "custom methods" do + describe "custom methods" do before do @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) @customer = Customer.create(name: "valid customer") From 4d28a3398783e7a8a0efcaa01b772aa199bb7349 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Wed, 6 Nov 2019 12:52:52 -0800 Subject: [PATCH 20/43] Added validation for Movie inventory --- app/models/movie.rb | 2 ++ test/controllers/movies_controller_test.rb | 3 ++- test/models/customer_test.rb | 6 +++--- test/models/movie_test.rb | 22 +++++++++++++++------- test/models/rental_test.rb | 2 +- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index f7fdb1b9c..f86ed5c46 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord validates :title, presence: true + validates :inventory, presence: true + has_many :rentals end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1e4b6464b..248939d5e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -34,8 +34,9 @@ describe "show" do before do - Movie.create(title: "random") + Movie.create(title: "random", inventory: 10) end + let (:valid_movie_id) { Movie.all.first } let (:invalid_movie_id) { -1 } it "responds with JSON and success for valid movie" do diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 630d472a0..ee73732d7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,13 +4,13 @@ describe "relationships" do it "can have many rentals" do - movie = Movie.create(title: "valid movie") + movie = Movie.create(title: "valid movie", inventory: 10) customer = Customer.create(name: "valid customer") rental = Rental.create(movie_id: movie.id, customer_id: customer.id) - customer.must_respond_to :rentals + expect(customer).must_respond_to :rentals customer.rentals.each do |rental| - rental.must_be_kind_of Rental + expect(rental).must_be_kind_of Rental end expect(customer.rentals.length).must_equal 1 end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ba45490af..920047840 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,16 +2,24 @@ describe Movie do describe "validation" do - it "will create movie if title is present" do - movie = Movie.new(title: "valid movie") + it "will create movie if title and inventory are present" do + movie = Movie.new(title: "valid movie", inventory: 20) is_valid = movie.valid? - + assert(is_valid) end it "will not create movie if title is not present" do - movie = Movie.new() + movie = Movie.new(inventory: 10) + + is_valid = movie.valid? + + refute(is_valid) + end + + it "will not create movie if inventory is not present" do + movie = Movie.new(title: "invalid movie") is_valid = movie.valid? @@ -21,13 +29,13 @@ describe "relationships" do it "can have many rentals" do - movie = Movie.create(title: "valid movie") + movie = Movie.create(title: "valid movie", inventory: 10) customer = Customer.create(name: "valid customer") rental = Rental.create(movie_id: movie.id, customer_id: customer.id) - movie.must_respond_to :rentals + expect(movie).must_respond_to :rentals movie.rentals.each do |rental| - rental.must_be_kind_of Rental + expect(rental).must_be_kind_of Rental end expect(movie.rentals.length).must_equal 1 end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index ce09895c6..95344aff5 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - let (:movie) {movie = Movie.create(title: "valid movie")} + let (:movie) {movie = Movie.create(title: "valid movie", inventory: 10)} let (:customer) {customer = Customer.create(name: "valid customer")} describe "validation" do From e730af8dad2085604cee3caeb5fef74e786b2e30 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Wed, 6 Nov 2019 13:03:03 -0800 Subject: [PATCH 21/43] Status changes for postman --- app/controllers/rentals_controller.rb | 3 +-- test/controllers/rentals_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8fbf80838..de27e308b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,10 +5,9 @@ def create rental.checkout_date = Date.today rental.due_date = Date.today + 7 - if rental.movie.available_inventory > 0 && rental.save rental.check_out_rental - render json: rental.as_json(only: [:id]), status: :created + render json: rental.as_json(only: [:id]), status: :ok return else render json: { "errors" => ["unable to create rental"]}, status: :bad_request diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 25ba3b9c9..471cd6650 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -13,7 +13,7 @@ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.must_change "Rental.count", 1 - must_respond_with :created + must_respond_with :ok end it "will not create rental without available inventory" do From 70230342b6145c93a62fac9127a3c83ea298177c Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Wed, 6 Nov 2019 13:45:10 -0800 Subject: [PATCH 22/43] Added params to Customers Controller --- app/controllers/customers_controller.rb | 13 ++++++++++++- app/controllers/movies_controller.rb | 4 ++-- app/controllers/rentals_controller.rb | 4 ++-- app/models/customer.rb | 22 ++++++++++++++++++++++ 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6116c28ef..a26955d40 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,17 @@ class CustomersController < ApplicationController def index - customers = Customer.all + if params[:sort] == "name" + customers = Customer.sort_by_name + else + customers = Customer.all + end + + if params[:n] && params[:p] + new_array = Customer.group_by_n(params[:n], params[:sort]) + customers = new_array[params[:p].to_i - 1] + end + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + return end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 42ceeed5c..f62dfbc50 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,7 +14,7 @@ def show render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok return else - render json: { "errors" => ["not found"] }, status: :not_found + render json: { ok: false, "errors" => ["not found"] }, status: :not_found return end end @@ -27,7 +27,7 @@ def create render json: movie.as_json(only: [:id]), status: :ok return else - render json: { "errors" => ["unable to create movie"] }, status: :bad_request + render json: { ok: false, "errors" => ["unable to create movie"] }, status: :bad_request return end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index de27e308b..f5ad204be 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -10,7 +10,7 @@ def create render json: rental.as_json(only: [:id]), status: :ok return else - render json: { "errors" => ["unable to create rental"]}, status: :bad_request + render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request return end end @@ -22,7 +22,7 @@ def update render json: rental.as_json(only: [:id]), status: :ok return else - render json: { "errors" => ["rental not found"]}, status: :not_found + render json: { ok: false, "errors" => ["rental not found"]}, status: :not_found return end end diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..f4961a232 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,25 @@ class Customer < ApplicationRecord has_many :rentals + + def self.group_by_n(n, sort_type) + if sort_type == "name" + customers = Customer.sort_by_name.to_a + else + customers = Customer.all.to_a + end + + iterations = (customers.count)/n.to_i + result_array = [] + + iterations.times do + result_array << customers.shift(n.to_i) + end + + result_array << customers + return result_array + end + + def self.sort_by_name + return Customer.order(name: :asc) + end end From 201ba7cf29aed58b2da61bac17e3528f38824655 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Wed, 6 Nov 2019 14:36:35 -0800 Subject: [PATCH 23/43] Refactored Customer controller & model sort methods --- app/controllers/customers_controller.rb | 9 ++----- app/models/customer.rb | 34 ++++++++++++++++--------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a26955d40..1a0ae1c1e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,16 +1,11 @@ class CustomersController < ApplicationController def index - if params[:sort] == "name" - customers = Customer.sort_by_name + if params[:sort] || params[:n] + customers = Customer.group_by_n(params[:n], params[:sort], params[:p]) else customers = Customer.all end - if params[:n] && params[:p] - new_array = Customer.group_by_n(params[:n], params[:sort]) - customers = new_array[params[:p].to_i - 1] - end - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok return end diff --git a/app/models/customer.rb b/app/models/customer.rb index f4961a232..9493dba15 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,24 +1,34 @@ class Customer < ApplicationRecord has_many :rentals - - def self.group_by_n(n, sort_type) + + def self.group_by_n(n, sort_type, page) if sort_type == "name" customers = Customer.sort_by_name.to_a else customers = Customer.all.to_a end - - iterations = (customers.count)/n.to_i - result_array = [] - - iterations.times do - result_array << customers.shift(n.to_i) + + if n + iterations = (customers.count)/n.to_i + result_array = [] + + iterations.times do + result_array << customers.shift(n.to_i) + end + + result_array << customers + # returns only one "page" of customers if :p exists + if page + result_array = result_array[page.to_i - 1] + end + return result_array + + else + return customers end - - result_array << customers - return result_array + end - + def self.sort_by_name return Customer.order(name: :asc) end From 06bc8b8acb03310f086fb6339838f703d2dfd93e Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Wed, 6 Nov 2019 15:30:18 -0800 Subject: [PATCH 24/43] Added tests for custom Customer model methods --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 18 +++++++------- test/models/customer_test.rb | 33 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1a0ae1c1e..2c6a11025 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index if params[:sort] || params[:n] - customers = Customer.group_by_n(params[:n], params[:sort], params[:p]) + customers = Customer.group_by_n(params[:sort], params[:n], params[:p]) else customers = Customer.all end diff --git a/app/models/customer.rb b/app/models/customer.rb index 9493dba15..4a01a4560 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,7 @@ class Customer < ApplicationRecord has_many :rentals - def self.group_by_n(n, sort_type, page) + def self.group_by_n(sort_type, n, page) if sort_type == "name" customers = Customer.sort_by_name.to_a else @@ -10,23 +10,23 @@ def self.group_by_n(n, sort_type, page) if n iterations = (customers.count)/n.to_i - result_array = [] + groups_of_customers = [] iterations.times do - result_array << customers.shift(n.to_i) + groups_of_customers << customers.shift(n.to_i) end - result_array << customers - # returns only one "page" of customers if :p exists + groups_of_customers << customers + + #returns only one "page" of customers if page exists if page - result_array = result_array[page.to_i - 1] + groups_of_customers = groups_of_customers[page.to_i - 1] end - return result_array - + + return groups_of_customers else return customers end - end def self.sort_by_name diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ee73732d7..865823a15 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -15,5 +15,38 @@ expect(customer.rentals.length).must_equal 1 end end + + describe "custom methods" do + let(:customer_one) { Customer.create(name: "b") } + let(:customer_two) { Customer.create(name: "a") } + let(:customer_three) { Customer.create(name: "c") } + + describe "self.sort_by_group" do + it "returns an array of customers if n is defined but p is not defined" do + group = Customer.group_by_n(nil, nil, nil) + + expect(group.length).must_equal 3 + end + + it "returns an array of customers for that page if n and p are defined" do + group = Customer.group_by_n("name", 2, 2) + + expect(group.length).must_equal 1 + + group = Customer.group_by_n("name", 2, 1) + + expect(group.length).must_equal 2 + end + end + + describe "self.sort_by_name" do + it "sorts customers by name" do + customers = Customer.sort_by_name + + expect(customers[0].name < customers[1].name).must_equal true + expect(customers[1].name < customers[2].name).must_equal true + end + end + end end From 095f9e20596ca753b072cc7b2680543c46dd5ae6 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Wed, 6 Nov 2019 22:02:34 -0800 Subject: [PATCH 25/43] Added test helper method to check response for json --- test/controllers/rentals_controller_test.rb | 6 +++++- test/test_helper.rb | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 471cd6650..007391d9c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,7 +5,7 @@ @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) @customer = Customer.create(name: "valid customer") end - + describe "checkout" do it "can checkout a movie by creating a new rental with valid input and available inventory" do @@ -14,6 +14,7 @@ }.must_change "Rental.count", 1 must_respond_with :ok + check_response(expected_type: Hash) end it "will not create rental without available inventory" do @@ -24,6 +25,7 @@ }.wont_change "Rental.count" must_respond_with :bad_request + check_response(expected_type: Hash, expected_status: :bad_request) end end @@ -37,6 +39,7 @@ }.wont_change "Rental.count" must_respond_with :ok + check_response(expected_type: Hash) end it "will not checkin a rental that doesn't exist" do @@ -45,6 +48,7 @@ }.wont_change "Rental.count" must_respond_with :not_found + check_response(expected_type: Hash, expected_status: :not_found) end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 41a5ac33c..8e583c7f3 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -16,4 +16,13 @@ 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 28b0c83acd5473b3140bbe8ba332c522a5095de4 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Wed, 6 Nov 2019 22:22:40 -0800 Subject: [PATCH 26/43] Impletmented check_response helper in Movies, Customers, and Rentals Controllers --- test/controllers/customers_controller_test.rb | 12 ++-- test/controllers/movies_controller_test.rb | 66 ++++++++----------- test/controllers/rentals_controller_test.rb | 6 +- 3 files changed, 36 insertions(+), 48 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e7585d4cc..9e3d04f3f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -3,22 +3,22 @@ describe CustomersController do describe "index" do + let(:customer_keys) {[:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]} it "responds with JSON and success" do get customers_path - expect(response.header['Content-Type']).must_include 'json' + check_response(expected_type: Array) must_respond_with :ok end it "responds with customer data" do get customers_path - body = JSON.parse(response.body) + body = check_response(expected_type: Array) - expect(body).must_be_instance_of Array body.each do |customer| expect(customer).must_be_instance_of Hash - # expect(customer.keys.sort).must_equal + expect(customer.keys.sort).must_equal customer_keys.sort end end @@ -26,9 +26,7 @@ Customer.destroy_all get customers_path - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) expect(body).must_equal [] end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 248939d5e..7fe1e0310 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,34 +4,29 @@ 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 + + check_response(expected_type: Array) end - + it "responds with an array of movie hashes" do get movies_path - - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + + body = check_response(expected_type: Array) body.each do |movie| expect(movie).must_be_instance_of Hash expect(movie.keys.sort).must_equal ["id", "title", "release_date"] end end - + it "will respond with an empty array when there are no movies" do Movie.destroy_all - + get movies_path - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) expect(body).must_equal [] end end - + describe "show" do before do Movie.create(title: "random", inventory: 10) @@ -41,34 +36,27 @@ let (:invalid_movie_id) { -1 } it "responds with JSON and success for valid movie" do get movie_path(valid_movie_id.id) - - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + + check_response(expected_type: Hash) end - + it "responds with a movie hash" do get movie_path(valid_movie_id.id) - - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Hash + + body = check_response(expected_type: Hash) expect(body.keys.sort).must_equal ["id", "title", "release_date", "overview", "inventory", "available_inventory"].sort must_respond_with :ok end - + it "responds with JSON and not found error for invalid movie" do get movie_path(invalid_movie_id) - - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Hash + + body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"]).must_equal ["not found"] - - must_respond_with :not_found end end - + describe "create" do it "creates new movie with valid parameters" do new_movie_params = { @@ -77,32 +65,32 @@ release_date: 2019, inventory: 10 } - + expect { post movies_path, params: new_movie_params }.must_change "Movie.count", 1 - - body = JSON.parse(response.body) - + + body = check_response(expected_type: Hash) + expect(body.keys.length).must_equal 1 expect(body.keys).must_equal ["id"] expect(body["id"]).must_be_instance_of Integer expect(body["id"]).must_equal Movie.find_by(title: new_movie_params[:title]).id - must_respond_with :ok end - + it "renders error if unable to save movie " do new_movie_params = { overview: "new movie description", release_date: 2019, inventory: 10 } - + expect { post movies_path, params: new_movie_params }.wont_change "Movie.count" - - must_respond_with :bad_request + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_include "unable to create movie" end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 007391d9c..0ad56e0dc 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -25,7 +25,8 @@ }.wont_change "Rental.count" must_respond_with :bad_request - check_response(expected_type: Hash, expected_status: :bad_request) + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_include "unable to create rental" end end @@ -48,7 +49,8 @@ }.wont_change "Rental.count" must_respond_with :not_found - check_response(expected_type: Hash, expected_status: :not_found) + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_include "rental not found" end end end From 7ce2c2ab89407792ed3720a54b1df1286856d9f0 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Thu, 7 Nov 2019 09:55:17 -0800 Subject: [PATCH 27/43] Added tests for custom model methods for Customer model --- app/models/customer.rb | 12 +++++++++++ test/models/customer_test.rb | 39 +++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 4a01a4560..b2939b20e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,6 +4,10 @@ class Customer < ApplicationRecord def self.group_by_n(sort_type, n, page) if sort_type == "name" customers = Customer.sort_by_name.to_a + elsif sort_type == "registered_at" + customers = Customer.sort_by_registered_at.to_a + elsif sort_type == "postal_code" + customers = Customer.sort_by_postal_code.to_a else customers = Customer.all.to_a end @@ -32,4 +36,12 @@ def self.group_by_n(sort_type, n, page) def self.sort_by_name return Customer.order(name: :asc) end + + def self.sort_by_registered_at + return Customer.order(registered_at: :asc) + end + + def self.sort_by_postal_code + return Customer.order(postal_code: :asc) + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 865823a15..89d61959a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -17,9 +17,13 @@ end describe "custom methods" do - let(:customer_one) { Customer.create(name: "b") } - let(:customer_two) { Customer.create(name: "a") } - let(:customer_three) { Customer.create(name: "c") } + before do + Customer.destroy_all + + @customer_one = Customer.create(name: "b", postal_code: 00003) + @customer_two = Customer.create(name: "a", postal_code: 00002) + @customer_three = Customer.create(name: "c", postal_code: 00001) + end describe "self.sort_by_group" do it "returns an array of customers if n is defined but p is not defined" do @@ -37,6 +41,13 @@ expect(group.length).must_equal 2 end + + it "if no type of sort is specified, customers are sorted by ID" do + customers = Customer.group_by_n(nil, nil, nil) + + expect(customers[0].id < customers[1].id).must_equal true + expect(customers[1].id < customers[2].id).must_equal true + end end describe "self.sort_by_name" do @@ -47,6 +58,28 @@ expect(customers[1].name < customers[2].name).must_equal true end end + + describe "self.sort_by_registered_at" do + it "sorts customers by registration time" do + @customer_one.update(registered_at: @customer_one.created_at) + @customer_two.update(registered_at: @customer_two.created_at) + @customer_three.update(registered_at: @customer_three.created_at) + + customers = Customer.sort_by_registered_at + + expect(customers[0].registered_at < customers[1].registered_at).must_equal true + expect(customers[1].registered_at < customers[2].registered_at).must_equal true + end + end + + describe "self.sort_by_postal_code" do + it "sorts customers by postal code" do + customers = Customer.sort_by_postal_code + + expect(customers[0].postal_code < customers[1].postal_code).must_equal true + expect(customers[1].postal_code < customers[2].postal_code).must_equal true + end + end end end From 24f68ed850d800abb872ac91d931762dd3080565 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Thu, 7 Nov 2019 10:06:35 -0800 Subject: [PATCH 28/43] Specious Customer code added --- app/controllers/customers_controller.rb | 8 ++++++-- test/controllers/customers_controller_test.rb | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1a0ae1c1e..f3bc1d04a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,10 +2,14 @@ class CustomersController < ApplicationController def index if params[:sort] || params[:n] customers = Customer.group_by_n(params[:n], params[:sort], params[:p]) + if customers == nil + render json: {ok: false, "errors" => ["not found"]}, status: :not_found + return + end else customers = Customer.all - end - + end + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok return end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e7585d4cc..ae8577b28 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -17,6 +17,7 @@ expect(body).must_be_instance_of Array body.each do |customer| + p customer expect(customer).must_be_instance_of Hash # expect(customer.keys.sort).must_equal end @@ -32,4 +33,23 @@ expect(body).must_equal [] end end + + #test not passing + # describe "group_by_n" do + # before do + # 10.times do + # Customer.create!(name: "customer", registered_at: Date.today, postal_code: "98101", phone: "111-222-3333", movies_checked_out_count: 1) + # end + # end + # it "returns subarrays of 'n' customers" do + # get customers_path, params: {"sort" => "name", "n" => "2"} + + # body = check_response(expected_type: Array) + # body.each do |subarray| + # expect(subarray).must_be_instance_of Array + # expect(subarray.length).must_equal 2 + # end + + # end + # end end From 5d6a62fadc1d1cfa3b30bd341b40bb9a1b2b632b Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Thu, 7 Nov 2019 10:08:39 -0800 Subject: [PATCH 29/43] Added returned column to rentals model --- db/migrate/20191107180624_add_returned_to_rental.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191107180624_add_returned_to_rental.rb diff --git a/db/migrate/20191107180624_add_returned_to_rental.rb b/db/migrate/20191107180624_add_returned_to_rental.rb new file mode 100644 index 000000000..7af216b31 --- /dev/null +++ b/db/migrate/20191107180624_add_returned_to_rental.rb @@ -0,0 +1,5 @@ +class AddReturnedToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :returned, :boolean, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb index a2d4097f2..04bf4766d 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_225728) do +ActiveRecord::Schema.define(version: 2019_11_07_180624) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.boolean "returned", default: false t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 36a9ba8f7be29d7584af2f773e47844156173a9c Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Thu, 7 Nov 2019 13:32:10 -0800 Subject: [PATCH 30/43] Updated model methods for Rentals, Customer, Movie --- app/models/rental.rb | 2 ++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 16 +++++++++++++++- test/models/rental_test.rb | 28 +++++++++++++++++++++++++++- 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index af333b32b..dcbaeb505 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -14,5 +14,7 @@ def check_in_rental self.movie.save self.customer.movies_checked_out_count -= 1 self.customer.save + self.returned = true + self.save end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ee73732d7..e28deb7be 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,6 +1,15 @@ require "test_helper" describe Customer do + describe "initialize" do + before do + @new_customer = Customer.new + end + + it "can be instantiated" do + expect(@new_customer.valid?).must_equal true + end + end describe "relationships" do it "can have many rentals" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 920047840..788a8726c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,6 +1,21 @@ require "test_helper" describe Movie do + describe "initialize" do + before do + @new_movie = Movie.new(title: "new movie", inventory: 10) + end + + it "movie can be instantiated" do + expect(@new_movie.valid?).must_equal true + end + + it "will have the required fields" do + expect(@new_movie).must_respond_to :title + expect(@new_movie).must_respond_to :inventory + end + end + describe "validation" do it "will create movie if title and inventory are present" do movie = Movie.new(title: "valid movie", inventory: 20) @@ -40,5 +55,4 @@ expect(movie.rentals.length).must_equal 1 end end - end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 95344aff5..7d5b444b2 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -3,6 +3,25 @@ describe Rental do let (:movie) {movie = Movie.create(title: "valid movie", inventory: 10)} let (:customer) {customer = Customer.create(name: "valid customer")} + + describe "initialize" do + before do + @new_rental = Rental.new(movie_id: movie.id, customer_id: customer.id) + end + + it "rental can be instantiated" do + expect(@new_rental.valid?).must_equal true + end + + it "will have the required fields" do + expect(@new_rental).must_respond_to :movie_id + expect(@new_rental).must_respond_to :customer_id + end + + it "returned will be assigned false" do + expect(@new_rental.returned).must_equal false + end + end describe "validation" do it "must have a customer and movie" do @@ -26,7 +45,6 @@ refute(is_valid) end - end describe "relationships" do @@ -96,6 +114,14 @@ expect(@customer.movies_checked_out_count ).must_equal starting_checked_out - 1 end + + it "changes status of rental to returned: true" do + expect(@rental.returned).must_equal false + + @rental.check_in_rental + + expect(@rental.returned).must_equal true + end end end From 1706dcd3e8f4b2b13a6e9124392677ed51f7422c Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Thu, 7 Nov 2019 14:11:55 -0800 Subject: [PATCH 31/43] Working Customer code added, 'group by n' code refactored --- app/controllers/customers_controller.rb | 2 ++ app/models/customer.rb | 20 +++++------------ test/models/customer_test.rb | 30 ++++++++++++------------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a644b75e7..42df048a1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,9 @@ class CustomersController < ApplicationController def index if params[:sort] || params[:n] || params[:p] + p params[:sort] customers = Customer.group_by_n(params[:sort], params[:n], params[:p]) + if customers == nil render json: {ok: false, "errors" => ["not found"]}, status: :not_found return diff --git a/app/models/customer.rb b/app/models/customer.rb index 7565f5a2e..e1e59ba03 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,12 +2,8 @@ class Customer < ApplicationRecord has_many :rentals def self.group_by_n(sort_type, n, page) - if sort_type == "name" - customers = Customer.sort_by_name.to_a - elsif sort_type == "registered_at" - customers = Customer.sort_by_registered_at.to_a - elsif sort_type == "postal_code" - customers = Customer.sort_by_postal_code.to_a + if sort_type + customers = Customer.sort_by_type(sort_type).to_a else customers = Customer.all.to_a end @@ -30,15 +26,9 @@ def self.group_by_n(sort_type, n, page) end end - def self.sort_by_name - return Customer.order(name: :asc) + def self.sort_by_type(sort_type) + sort_type = sort_type.to_sym + return Customer.order(sort_type => :asc) end - def self.sort_by_registered_at - return Customer.order(registered_at: :asc) - end - - def self.sort_by_postal_code - return Customer.order(postal_code: :asc) - end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 89d61959a..c2d306e94 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -15,66 +15,66 @@ expect(customer.rentals.length).must_equal 1 end end - + describe "custom methods" do before do Customer.destroy_all - + @customer_one = Customer.create(name: "b", postal_code: 00003) @customer_two = Customer.create(name: "a", postal_code: 00002) @customer_three = Customer.create(name: "c", postal_code: 00001) end - + describe "self.sort_by_group" do it "returns an array of customers if n is defined but p is not defined" do group = Customer.group_by_n(nil, nil, nil) - + expect(group.length).must_equal 3 end - + it "returns an array of customers for that page if n and p are defined" do group = Customer.group_by_n("name", 2, 2) expect(group.length).must_equal 1 - + group = Customer.group_by_n("name", 2, 1) expect(group.length).must_equal 2 end - + it "if no type of sort is specified, customers are sorted by ID" do customers = Customer.group_by_n(nil, nil, nil) - + expect(customers[0].id < customers[1].id).must_equal true expect(customers[1].id < customers[2].id).must_equal true end end - + describe "self.sort_by_name" do it "sorts customers by name" do - customers = Customer.sort_by_name + customers = Customer.sort_by_type("name") expect(customers[0].name < customers[1].name).must_equal true expect(customers[1].name < customers[2].name).must_equal true end end - + describe "self.sort_by_registered_at" do it "sorts customers by registration time" do @customer_one.update(registered_at: @customer_one.created_at) @customer_two.update(registered_at: @customer_two.created_at) @customer_three.update(registered_at: @customer_three.created_at) - - customers = Customer.sort_by_registered_at + + customers = Customer.sort_by_type("registered_at") expect(customers[0].registered_at < customers[1].registered_at).must_equal true expect(customers[1].registered_at < customers[2].registered_at).must_equal true end end - + describe "self.sort_by_postal_code" do it "sorts customers by postal code" do - customers = Customer.sort_by_postal_code + customers = Customer.sort_by_type("postal_code") expect(customers[0].postal_code < customers[1].postal_code).must_equal true expect(customers[1].postal_code < customers[2].postal_code).must_equal true From 0f295cf3b4227813d0d33808ffba1228acd2e69f Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Thu, 7 Nov 2019 14:13:06 -0800 Subject: [PATCH 32/43] Added negative tests to Rentals controller --- app/controllers/rentals_controller.rb | 9 +++++++-- app/models/customer.rb | 2 +- test/controllers/rentals_controller_test.rb | 20 ++++++++++++++++++++ test/models/customer_test.rb | 1 - 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f5ad204be..59af4703d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,10 +1,15 @@ class RentalsController < ApplicationController def create + if params[:movie_id].nil? || params[:customer_id].nil? + render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request + return + end + rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id]) rental.checkout_date = Date.today - rental.due_date = Date.today + 7 - + rental.due_date = Date.today + 7 + if rental.movie.available_inventory > 0 && rental.save rental.check_out_rental render json: rental.as_json(only: [:id]), status: :ok diff --git a/app/models/customer.rb b/app/models/customer.rb index b2939b20e..9d9cdbb4d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -13,8 +13,8 @@ def self.group_by_n(sort_type, n, page) end if n - iterations = (customers.count)/n.to_i groups_of_customers = [] + iterations = (customers.count)/n.to_i iterations.times do groups_of_customers << customers.shift(n.to_i) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0ad56e0dc..458cacc48 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -28,6 +28,26 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "unable to create rental" end + + it "will not create rental without valid movie id" do + expect{ + post checkout_path, params: {movie_id: nil, customer_id: @customer.id} + }.wont_change "Rental.count" + + must_respond_with :bad_request + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_include "unable to create rental" + end + + it "will not create rental without valid cusotmer id" do + expect{ + post checkout_path, params: {movie_id: @movie.id, customer_id: nil} + }.wont_change "Rental.count" + + must_respond_with :bad_request + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_include "unable to create rental" + end end describe "checkin" do diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index bd7b2ded7..a1aefbe35 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -90,5 +90,4 @@ end end end - end From 0ee20e2dade9a4559f44cd1d85ec48b5f0e9b20f Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Thu, 7 Nov 2019 21:44:15 -0800 Subject: [PATCH 33/43] Made tests for overdue rentals --- app/controllers/rentals_controller.rb | 9 ++++-- app/models/rental.rb | 4 +++ config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 29 +++++++++++++++++-- test/models/rental_test.rb | 32 +++++++++++++++------ 5 files changed, 62 insertions(+), 13 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 59af4703d..62f7f1b1b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,11 +5,11 @@ def create render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request return end - + rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id]) rental.checkout_date = Date.today rental.due_date = Date.today + 7 - + if rental.movie.available_inventory > 0 && rental.save rental.check_out_rental render json: rental.as_json(only: [:id]), status: :ok @@ -32,4 +32,9 @@ def update end end + def overdue + render json: Rental.overdue.as_json(only: [:id]), status: :ok + return + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index dcbaeb505..dbf13fcaf 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -17,4 +17,8 @@ def check_in_rental self.returned = true self.save end + + def overdue + + end end diff --git a/config/routes.rb b/config/routes.rb index 246458a18..b0d9ae43d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ resources :movies, only: [:index, :show, :create] + get "/rentals/overdue", to: "rentals#overdue", as: "overdue" post "/rentals/check-out", to: "rentals#create", as: "checkout" patch "/rentals/check-in", to: "rentals#update", as: "checkin" get "/customers", to: "customers#index", as: "customers" diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 458cacc48..0dd99cfe1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -28,7 +28,7 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "unable to create rental" end - + it "will not create rental without valid movie id" do expect{ post checkout_path, params: {movie_id: nil, customer_id: @customer.id} @@ -38,7 +38,7 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "unable to create rental" end - + it "will not create rental without valid cusotmer id" do expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: nil} @@ -73,4 +73,29 @@ expect(body["errors"]).must_include "rental not found" end end + + describe "overdue" do + before do + @movie = Movie.first + @customer = Customer.first + @rental = Rental.create(customer_id: @customer.id, movie_id: @movie.id) + @rental.checkout_date = Date.today - 10 + @rental.due_date = Date.today - 3 + end + + it "returns all overdue rentals" do + get overdue_path + + body = check_response(expected_type: Hash) + end + + it "returns an empty array if there are no overdue rentals" do + Rental.destroy_all + + get overdue_path + + body = check_response(expected_type: Hash) + expect(body.length).must_equal 0 + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 7d5b444b2..7555faca9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -3,21 +3,21 @@ describe Rental do let (:movie) {movie = Movie.create(title: "valid movie", inventory: 10)} let (:customer) {customer = Customer.create(name: "valid customer")} - + describe "initialize" do before do @new_rental = Rental.new(movie_id: movie.id, customer_id: customer.id) end - + it "rental can be instantiated" do expect(@new_rental.valid?).must_equal true end - + it "will have the required fields" do expect(@new_rental).must_respond_to :movie_id expect(@new_rental).must_respond_to :customer_id end - + it "returned will be assigned false" do expect(@new_rental.returned).must_equal false end @@ -51,12 +51,12 @@ before do @rental = Rental.create(movie_id: movie.id, customer_id: customer.id) end - + it "must belong to a customer" do expect(@rental).must_respond_to :customer expect(@rental.customer).must_be_kind_of Customer end - + it "must belong to a movie" do expect(@rental).must_respond_to :movie expect(@rental.movie).must_be_kind_of Movie @@ -114,15 +114,29 @@ expect(@customer.movies_checked_out_count ).must_equal starting_checked_out - 1 end - + it "changes status of rental to returned: true" do expect(@rental.returned).must_equal false - + @rental.check_in_rental - + expect(@rental.returned).must_equal true end end + describe "overdue" do + it "returns all overdue rentals" do + expect(@rental.returned).must_equal false + expect(Rental.overdue).must_include @rental + end + + it "ignores rentals that have been returned" do + expect(@rental.returned).must_equal false + + @rental.check_in_rental + assert(Rental.overdue.empty?) + expect(Rental.overdue).must_equal [] + end + end end end From 7f3ad87916cc6770af22debcf8233cb6db794aeb Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Thu, 7 Nov 2019 22:23:39 -0800 Subject: [PATCH 34/43] Added code for overdue rentals, excluding customer- & movie-specific params --- app/controllers/customers_controller.rb | 1 - app/controllers/rentals_controller.rb | 8 ++++- app/models/rental.rb | 36 +++++++++++++++++++-- test/controllers/rentals_controller_test.rb | 5 +-- test/models/rental_test.rb | 30 +++++++++++++++++ 5 files changed, 73 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 42df048a1..52214bb45 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,6 @@ class CustomersController < ApplicationController def index if params[:sort] || params[:n] || params[:p] - p params[:sort] customers = Customer.group_by_n(params[:sort], params[:n], params[:p]) if customers == nil diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 62f7f1b1b..4dc33d90d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -33,7 +33,13 @@ def update end def overdue - render json: Rental.overdue.as_json(only: [:id]), status: :ok + if params[:sort] || params[:n] || params[:p] + rentals = Rental.overdue.group_by_n(params[:sort], params[:n], params[:p]) + else + rentals = Rental.overdue + end + + render json: rentals.as_json(only: [:id, :movie_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok return end diff --git a/app/models/rental.rb b/app/models/rental.rb index dbf13fcaf..506ef5fac 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -17,8 +17,38 @@ def check_in_rental self.returned = true self.save end - - def overdue - + + def self.overdue + return Rental.where("due_date < ? and returned = ?", Date.today, false) + end + + def self.group_by_n(sort_type, n, page) + if sort_type + rentals = Rental.sort_by_type(sort_type).to_a + else + rentals = Rental.all.to_a + end + + if n + groups_of_rentals = [] + iterations = (rentals.count)/n.to_i + + iterations.times do + groups_of_rentals << rentals.shift(n.to_i) + end + + groups_of_rentals << rentals unless rentals.empty? + + groups_of_rentals = groups_of_rentals[page.to_i - 1] if page + + return groups_of_rentals + else + return rentals + end + end + + def self.sort_by_type(sort_type) + sort_type = sort_type.to_sym + return Rental.order(sort_type => :asc) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0dd99cfe1..841091be5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -81,12 +81,13 @@ @rental = Rental.create(customer_id: @customer.id, movie_id: @movie.id) @rental.checkout_date = Date.today - 10 @rental.due_date = Date.today - 3 + @rental.save! end it "returns all overdue rentals" do get overdue_path - body = check_response(expected_type: Hash) + body = check_response(expected_type: Array) end it "returns an empty array if there are no overdue rentals" do @@ -94,7 +95,7 @@ get overdue_path - body = check_response(expected_type: Hash) + body = check_response(expected_type: Array) expect(body.length).must_equal 0 end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 7555faca9..03d0a9be3 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -125,18 +125,48 @@ end describe "overdue" do + before do + @rental.update(due_date: Date.today - 3) + end it "returns all overdue rentals" do expect(@rental.returned).must_equal false expect(Rental.overdue).must_include @rental + Rental.overdue.each do |rental| + assert(rental.due_date < Date.today) + end end it "ignores rentals that have been returned" do expect(@rental.returned).must_equal false @rental.check_in_rental + expect(@rental.returned).must_equal true assert(Rental.overdue.empty?) expect(Rental.overdue).must_equal [] end end + + describe "self.sort_by_type" do + + before do + @customer_two = Customer.create(name: "second customer") + @movie_two = Movie.create(title: "second movie", inventory: 5) + Rental.create(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Date.today - 10, due_date: Date.today - 3) + Rental.create(movie_id: @movie_two.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 2) + Rental.create(movie_id: @movie.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 3) + end + + it "sorts rentals by any possible type" do + # excluded params :title, :name, and :postal_code + # suitable for Sandi Metz-ing a template method + sort_types = [:movie_id, :customer_id, :checkout_date, :due_date] + sort_types.each do |type| + rentals = Rental.sort_by_type(type) + expect(rentals[0][type] <= rentals[1][type]).must_equal true + expect(rentals[1][type] <= rentals[2][type]).must_equal true + end + end + end + end end From bb4f728a1cdef1138353328dae9a2efcb3e95b4b Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Fri, 8 Nov 2019 08:59:09 -0800 Subject: [PATCH 35/43] Refactored all controller tests --- app/controllers/movies_controller.rb | 1 + app/controllers/rentals_controller.rb | 2 + test/controllers/customers_controller_test.rb | 60 ++++++++++--------- test/controllers/movies_controller_test.rb | 24 ++++---- test/controllers/rentals_controller_test.rb | 19 +++--- 5 files changed, 61 insertions(+), 45 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f62dfbc50..b9d7fa0ef 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,6 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.all + render json: movies.as_json(only: KEYS), status: :ok return end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 59af4703d..a5c2e4328 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -12,6 +12,7 @@ def create if rental.movie.available_inventory > 0 && rental.save rental.check_out_rental + render json: rental.as_json(only: [:id]), status: :ok return else @@ -22,6 +23,7 @@ def create def update rental = Rental.find_by(movie_id: params[:movie_id], customer_id: params[:customer_id]) + if rental rental.check_in_rental render json: rental.as_json(only: [:id]), status: :ok diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 50d8628aa..2a27de40a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -3,7 +3,8 @@ describe CustomersController do describe "index" do - let(:customer_keys) {[:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]} + CUSTOMER_KEYS = [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count] + it "responds with JSON and success" do get customers_path @@ -17,48 +18,53 @@ body = check_response(expected_type: Array) body.each do |customer| - p customer expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal customer_keys.sort + expect(customer.keys.sort).must_equal CUSTOMER_KEYS.sort end end it "will respond with an empty array when there are no customers" do Customer.destroy_all + get customers_path body = check_response(expected_type: Array) expect(body).must_equal [] end - end - - describe "group_by_n" do - before do - 10.times do - Customer.create!(name: "customer", registered_at: Date.today, postal_code: "98101", phone: "111-222-3333", movies_checked_out_count: 1) + + describe "index params" do + before do + 10.times do + Customer.create!(name: "customer", registered_at: Date.today, postal_code: "98101", phone: "111-222-3333", movies_checked_out_count: 1) + end end - end - it "returns subarrays of 'n' customers" do - get customers_path, params: { sort: "name", n: "2" } + + it "will respond with JSON and success if n param" do + get customers_path, params: { sort: "name", n: "2" } - body = check_response(expected_type: Array) - body.each do |subarray| - expect(subarray).must_be_instance_of Array - expect(subarray.length).must_equal 2 + body = check_response(expected_type: Array) + body.each do |subarray| + expect(subarray).must_be_instance_of Array + expect(subarray.length).must_equal 2 + end end - end - - it "will respond with an error if given invalid 'p' params" do - get customers_path, params: { sort: nil, n: "3", p: "40"} + + it "will respond with JSON and success if p param without n param" do + get customers_path, params: { sort: nil, n: "3", p: "40"} - body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"]).must_include "not found" - end - - it "will return all customers if given a 'p' param without an 'n' param" do - get customers_path, params: { sort: nil, n: nil, p: "4"} + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_include "not found" + end + + it "will respond with error if given invalid p param" do + get customers_path, params: { sort: nil, n: "3", p: "40"} - check_response(expected_type: Array) + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_include "not found" + end + end + end + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 7fe1e0310..654f78654 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,6 +1,7 @@ require "test_helper" describe MoviesController do + describe "index" do it "responds with JSON and success" do get movies_path @@ -22,6 +23,7 @@ Movie.destroy_all get movies_path + body = check_response(expected_type: Array) expect(body).must_equal [] end @@ -34,16 +36,13 @@ let (:valid_movie_id) { Movie.all.first } let (:invalid_movie_id) { -1 } + it "responds with JSON and success for valid movie" do get movie_path(valid_movie_id.id) check_response(expected_type: Hash) - end - - it "responds with a movie hash" do - get movie_path(valid_movie_id.id) - body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal ["id", "title", "release_date", "overview", "inventory", "available_inventory"].sort must_respond_with :ok end @@ -59,38 +58,41 @@ describe "create" do it "creates new movie with valid parameters" do - new_movie_params = { + valid_movie_params = { title: "new movie", overview: "new movie description", release_date: 2019, inventory: 10 } - + expect { - post movies_path, params: new_movie_params + post movies_path, params: valid_movie_params }.must_change "Movie.count", 1 + created_movie = Movie.find_by(title: valid_movie_params[:title]) body = check_response(expected_type: Hash) expect(body.keys.length).must_equal 1 expect(body.keys).must_equal ["id"] expect(body["id"]).must_be_instance_of Integer - expect(body["id"]).must_equal Movie.find_by(title: new_movie_params[:title]).id + expect(body["id"]).must_equal created_movie.id + expect(created_movie.available_inventory).must_equal created_movie.inventory end it "renders error if unable to save movie " do - new_movie_params = { + invalid_movie_params = { overview: "new movie description", release_date: 2019, inventory: 10 } expect { - post movies_path, params: new_movie_params + post movies_path, params: invalid_movie_params }.wont_change "Movie.count" body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "unable to create movie" end end + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 458cacc48..48140788d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,18 +6,23 @@ @customer = Customer.create(name: "valid customer") end - describe "checkout" do + describe "create (checkout)" do it "can checkout a movie by creating a new rental with valid input and available inventory" do - expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.must_change "Rental.count", 1 + + created_rental = Rental.find_by(movie_id: @movie.id) + expect(created_rental.checkout_date).must_be_kind_of Date + expect(created_rental.due_date).must_be_kind_of Date + + body = check_response(expected_type: Hash) + expect(body["id"]).must_equal created_rental.id must_respond_with :ok - check_response(expected_type: Hash) end - it "will not create rental without available inventory" do + it "will respond wtih error if invalid inventory" do @movie.update(available_inventory: 0) expect{ @@ -29,7 +34,7 @@ expect(body["errors"]).must_include "unable to create rental" end - it "will not create rental without valid movie id" do + it "will respond wtih error if invalid movie id" do expect{ post checkout_path, params: {movie_id: nil, customer_id: @customer.id} }.wont_change "Rental.count" @@ -39,7 +44,7 @@ expect(body["errors"]).must_include "unable to create rental" end - it "will not create rental without valid cusotmer id" do + it "will respond wtih error if invalidcusotmer id" do expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: nil} }.wont_change "Rental.count" @@ -50,7 +55,7 @@ end end - describe "checkin" do + describe "update (checkin)" do it "can checkin a valid rental and by creating a new rental with valid input and available inventory" do # check out rental so that it can be checked in post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} From 48d11e31d18216779e1a770f0b85e7c372c094c3 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Fri, 8 Nov 2019 11:12:26 -0800 Subject: [PATCH 36/43] Refactored all model tests --- app/models/customer.rb | 6 +++-- test/controllers/rentals_controller_test.rb | 16 ++++++------- test/models/customer_test.rb | 11 +++++++-- test/models/rental_test.rb | 25 ++++++++++++--------- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 89aeba8ce..5e39b0530 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -17,8 +17,10 @@ def self.group_by_n(sort_type, n, page) end groups_of_customers << customers unless customers.empty? - - groups_of_customers = groups_of_customers[page.to_i - 1] if page + + if page + groups_of_customers = groups_of_customers[page.to_i - 1] + end return groups_of_customers else diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 48140788d..fc4e61338 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,8 +6,8 @@ @customer = Customer.create(name: "valid customer") end - describe "create (checkout)" do - it "can checkout a movie by creating a new rental with valid input and available inventory" do + describe "create (check out)" do + it "can check out a movie by creating a new rental with valid input and available inventory" do expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.must_change "Rental.count", 1 @@ -22,7 +22,7 @@ must_respond_with :ok end - it "will respond wtih error if invalid inventory" do + it "will respond with error if invalid inventory" do @movie.update(available_inventory: 0) expect{ @@ -34,7 +34,7 @@ expect(body["errors"]).must_include "unable to create rental" end - it "will respond wtih error if invalid movie id" do + it "will respond with error if invalid movie id" do expect{ post checkout_path, params: {movie_id: nil, customer_id: @customer.id} }.wont_change "Rental.count" @@ -44,7 +44,7 @@ expect(body["errors"]).must_include "unable to create rental" end - it "will respond wtih error if invalidcusotmer id" do + it "will respond with error if invalid cusotmer id" do expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: nil} }.wont_change "Rental.count" @@ -55,8 +55,8 @@ end end - describe "update (checkin)" do - it "can checkin a valid rental and by creating a new rental with valid input and available inventory" do + describe "update (check in)" do + it "can check in a valid rental and by creating a new rental with valid input and available inventory" do # check out rental so that it can be checked in post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} @@ -68,7 +68,7 @@ check_response(expected_type: Hash) end - it "will not checkin a rental that doesn't exist" do + it "will not check in a rental that doesn't exist" do expect{ patch checkin_path, params: {id: -1} }.wont_change "Rental.count" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index dd5029143..484404806 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -35,8 +35,14 @@ end describe "self.sort_by_group" do - it "returns an array of customers if n is defined but p is not defined" do - group = Customer.group_by_n(nil, nil, nil) + it "returns an array of one group of customers if n is defined but p is not defined" do + group = Customer.group_by_n(nil, 10, nil) + + expect(group[0].length).must_equal 3 + end + + it "returns nil if n is not defined but p is defined" do + group = Customer.group_by_n(nil, nil, 10) expect(group.length).must_equal 3 end @@ -90,4 +96,5 @@ end end end + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 7d5b444b2..96ac186cc 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,8 +1,8 @@ require "test_helper" describe Rental do - let (:movie) {movie = Movie.create(title: "valid movie", inventory: 10)} - let (:customer) {customer = Customer.create(name: "valid customer")} + let (:movie) { movie = Movie.create(title: "valid movie", inventory: 10) } + let (:customer) { customer = Customer.create(name: "valid customer") } describe "initialize" do before do @@ -24,24 +24,27 @@ end describe "validation" do + before do + @rental = Rental.create(movie_id: movie.id, customer_id: customer.id) + end + it "must have a customer and movie" do - rental = Rental.create(movie_id: movie.id, customer_id: customer.id) - is_valid = rental.valid? + is_valid = @rental.valid? assert(is_valid) end it "returns invalid if no customer is present" do - rental = Rental.create(movie_id: movie.id) - - is_valid = rental.valid? + @rental.update(customer_id: nil) + + is_valid = @rental.valid? refute(is_valid) end it "returns invalid if no movie is present" do - rental = Rental.create(customer_id: customer.id) - - is_valid = rental.valid? + @rental.update(movie_id: nil) + + is_valid = @rental.valid? refute(is_valid) end @@ -123,6 +126,6 @@ expect(@rental.returned).must_equal true end end - end + end From 3af909baaa4f3c4f1e6ddea82b94de2802a1f631 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Fri, 8 Nov 2019 11:26:08 -0800 Subject: [PATCH 37/43] Small refactors to customers model method --- app/controllers/customers_controller.rb | 1 - app/models/customer.rb | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 42df048a1..52214bb45 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,6 @@ class CustomersController < ApplicationController def index if params[:sort] || params[:n] || params[:p] - p params[:sort] customers = Customer.group_by_n(params[:sort], params[:n], params[:p]) if customers == nil diff --git a/app/models/customer.rb b/app/models/customer.rb index 5e39b0530..6c3e0572f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,15 +9,18 @@ def self.group_by_n(sort_type, n, page) end if n - groups_of_customers = [] iterations = (customers.count)/n.to_i + groups_of_customers = [] + + # separates customers into page groups based on n iterations.times do groups_of_customers << customers.shift(n.to_i) end - groups_of_customers << customers unless customers.empty? + groups_of_customers << customers unless customers.empty? + # selects array to be displayed to user if page groups_of_customers = groups_of_customers[page.to_i - 1] end @@ -32,5 +35,4 @@ def self.sort_by_type(sort_type) sort_type = sort_type.to_sym return Customer.order(sort_type => :asc) end - end From 97be81b36dfac313386f2102ca9e16bc13b0681e Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Fri, 8 Nov 2019 13:31:16 -0800 Subject: [PATCH 38/43] Working code for overdue methods implemented --- app/models/rental.rb | 9 +++++++-- test/models/rental_test.rb | 22 +++++++++++++--------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 506ef5fac..74b2527dc 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -48,7 +48,12 @@ def self.group_by_n(sort_type, n, page) end def self.sort_by_type(sort_type) - sort_type = sort_type.to_sym - return Rental.order(sort_type => :asc) + if [:name, :postal_code].include? sort_type + return Rental.all.sort_by{|rental| rental.customer[sort_type]} + elsif [:title].include? sort_type + return Rental.all.sort_by{|rental| rental.movie[sort_type]} + else + return Rental.order(sort_type => :asc) + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 03d0a9be3..14379f04d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -149,24 +149,28 @@ describe "self.sort_by_type" do before do - @customer_two = Customer.create(name: "second customer") + @customer_two = Customer.create(name: "second customer", postal_code: "11111") + @customer.update(postal_code: "22222") @movie_two = Movie.create(title: "second movie", inventory: 5) Rental.create(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Date.today - 10, due_date: Date.today - 3) Rental.create(movie_id: @movie_two.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 2) Rental.create(movie_id: @movie.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 3) end - + it "sorts rentals by any possible type" do - # excluded params :title, :name, and :postal_code - # suitable for Sandi Metz-ing a template method - sort_types = [:movie_id, :customer_id, :checkout_date, :due_date] + sort_types = [:movie_id, :customer_id, :name, :postal_code, :title, :checkout_date, :due_date] sort_types.each do |type| rentals = Rental.sort_by_type(type) - expect(rentals[0][type] <= rentals[1][type]).must_equal true - expect(rentals[1][type] <= rentals[2][type]).must_equal true + if [:name, :postal_code].include? type + expect(rentals[0].customer[type] <= rentals[1].customer[type]).must_equal true + elsif [:title].include? type + expect(rentals[0].movie[type] <= rentals[1].movie[type]).must_equal true + else + expect(rentals[0][type] <= rentals[1][type]).must_equal true + expect(rentals[1][type] <= rentals[2][type]).must_equal true + end end end - end - + end end end From ba4a257a60ddbad62fdea6be7936c81793c428f7 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Fri, 8 Nov 2019 13:39:34 -0800 Subject: [PATCH 39/43] Updated rentals controller tests --- test/controllers/rentals_controller_test.rb | 10 ++++------ test/models/rental_test.rb | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f9465e565..98e74c70a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -33,13 +33,8 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "unable to create rental" end -<<<<<<< HEAD - - it "will not create rental without valid movie id" do -======= it "will respond with error if invalid movie id" do ->>>>>>> master expect{ post checkout_path, params: {movie_id: nil, customer_id: @customer.id} }.wont_change "Rental.count" @@ -98,6 +93,8 @@ get overdue_path body = check_response(expected_type: Array) + expect(body.length).must_equal Rental.count + must_respond_with :ok end it "returns an empty array if there are no overdue rentals" do @@ -106,7 +103,8 @@ get overdue_path body = check_response(expected_type: Array) - expect(body.length).must_equal 0 + expect(body.length).must_equal 0 + must_respond_with :ok end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d45ecbd7b..22b17a112 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,15 +1,12 @@ require "test_helper" describe Rental do - <<<<<<< HEAD let (:movie) {movie = Movie.create(title: "valid movie", inventory: 10)} let (:customer) {customer = Customer.create(name: "valid customer")} - ======= let (:movie) { movie = Movie.create(title: "valid movie", inventory: 10) } let (:customer) { customer = Customer.create(name: "valid customer") } - >>>>>>> master describe "initialize" do before do @new_rental = Rental.new(movie_id: movie.id, customer_id: customer.id) From b6da1637d29fa6bbd9841a4570334dcbc0dd5487 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Fri, 8 Nov 2019 13:52:43 -0800 Subject: [PATCH 40/43] Added sort categories to customers controller --- app/controllers/customers_controller.rb | 8 +++++++ test/controllers/customers_controller_test.rb | 6 ++++++ test/models/rental_test.rb | 21 +++++++++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 52214bb45..cfe8c790f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,13 @@ + class CustomersController < ApplicationController + SORT_CATEGORIES = ["name", "registered_at", "postal_code"] + def index + if params[:sort] && SORT_CATEGORIES.include?(params[:sort]) == false + render json: {ok: false, "errors" => ["invalid sort category"]}, status: :bad_request + return + end + if params[:sort] || params[:n] || params[:p] customers = Customer.group_by_n(params[:sort], params[:n], params[:p]) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2a27de40a..4aab529e9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -63,6 +63,12 @@ expect(body["errors"]).must_include "not found" end + it "will respond with error if given invalid sort_type" do + get customers_path, params: { sort: "banana", n: "3", p: "10"} + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_include "invalid sort category" + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 22b17a112..a7e2e856d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,6 @@ require "test_helper" describe Rental do - let (:movie) {movie = Movie.create(title: "valid movie", inventory: 10)} - let (:customer) {customer = Customer.create(name: "valid customer")} - let (:movie) { movie = Movie.create(title: "valid movie", inventory: 10) } let (:customer) { customer = Customer.create(name: "valid customer") } @@ -134,6 +131,7 @@ before do @rental.update(due_date: Date.today - 3) end + it "returns all overdue rentals" do expect(@rental.returned).must_equal false expect(Rental.overdue).must_include @rental @@ -146,26 +144,34 @@ expect(@rental.returned).must_equal false @rental.check_in_rental + expect(@rental.returned).must_equal true assert(Rental.overdue.empty?) expect(Rental.overdue).must_equal [] end end + + describe "self.group_by_n" do + before do + ends + end describe "self.sort_by_type" do - before do @customer_two = Customer.create(name: "second customer", postal_code: "11111") @customer.update(postal_code: "22222") + @movie_two = Movie.create(title: "second movie", inventory: 5) + Rental.create(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Date.today - 10, due_date: Date.today - 3) Rental.create(movie_id: @movie_two.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 2) Rental.create(movie_id: @movie.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 3) end it "sorts rentals by any possible type" do - sort_types = [:movie_id, :customer_id, :name, :postal_code, :title, :checkout_date, :due_date] - sort_types.each do |type| + SORT_TYPES = [:movie_id, :customer_id, :name, :postal_code, :title, :checkout_date, :due_date] + + SORT_TYPES.each do |type| rentals = Rental.sort_by_type(type) if [:name, :postal_code].include? type expect(rentals[0].customer[type] <= rentals[1].customer[type]).must_equal true @@ -177,6 +183,9 @@ end end end + + it "if sort type is invalid, returns error" do + end end end From 5ec50abb7de9504a76e2726862649061fdf85e96 Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Fri, 8 Nov 2019 14:10:37 -0800 Subject: [PATCH 41/43] Updated rentals controller tests --- app/controllers/customers_controller.rb | 1 - app/controllers/rentals_controller.rb | 13 +++++++- test/controllers/rentals_controller_test.rb | 37 +++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index cfe8c790f..3827df51c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,3 @@ - class CustomersController < ApplicationController SORT_CATEGORIES = ["name", "registered_at", "postal_code"] diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e57170345..93258cabd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,6 @@ class RentalsController < ApplicationController - + SORT_CATEGORIES = ["movie_id", "title", "customer_id", "name", "postal_code", "checkout_date", "due_date"] + def create if params[:movie_id].nil? || params[:customer_id].nil? render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request @@ -35,8 +36,18 @@ def update end def overdue + if params[:sort] && SORT_CATEGORIES.include?(params[:sort]) == false + render json: {ok: false, "errors" => ["invalid sort category"]}, status: :bad_request + return + end + if params[:sort] || params[:n] || params[:p] rentals = Rental.overdue.group_by_n(params[:sort], params[:n], params[:p]) + + if rentals == nil + render json: {ok: false, "errors" => ["not found"]}, status: :not_found + return + end else rentals = Rental.overdue end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 98e74c70a..9476c710d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -106,5 +106,42 @@ expect(body.length).must_equal 0 must_respond_with :ok end + + describe "overdue params" do + before do + 5.times do + Rental.create!(customer_id: @customer.id, movie_id: @movie.id) + end + end + + it "will respond with JSON and success if n param" do + get overdue_path, params: { sort: "movie_id", n: "2" } + + body = check_response(expected_type: Array) + body.each do |subarray| + expect(subarray).must_be_instance_of Array + end + end + + it "will respond with JSON and success if p param without n param" do + get overdue_path, params: { sort: nil, n: nil, p: "40"} + + body = check_response(expected_type: Array, expected_status: :ok) + end + + it "will respond with error if given invalid p param" do + get overdue_path, params: { sort: nil, n: "3", p: -10} + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_include "not found" + end + + it "will respond with error if given invalid sort_type" do + get overdue_path, params: { sort: "banana", n: "3", p: "10"} + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_include "invalid sort category" + end + end end end From 77ecb69b6839cb10364ebd557a85a0ce96896e0b Mon Sep 17 00:00:00 2001 From: Raisah Vesteinsdottir Date: Fri, 8 Nov 2019 14:25:52 -0800 Subject: [PATCH 42/43] Updated rental model tests --- app/models/rental.rb | 4 +-- test/models/rental_test.rb | 52 +++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 74b2527dc..1a16e22e9 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -48,9 +48,9 @@ def self.group_by_n(sort_type, n, page) end def self.sort_by_type(sort_type) - if [:name, :postal_code].include? sort_type + if ["name", "postal_code"].include? sort_type return Rental.all.sort_by{|rental| rental.customer[sort_type]} - elsif [:title].include? sort_type + elsif ["title"].include? sort_type return Rental.all.sort_by{|rental| rental.movie[sort_type]} else return Rental.order(sort_type => :asc) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a7e2e856d..146b5e2c2 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -153,7 +153,44 @@ describe "self.group_by_n" do before do - ends + Rental.destroy_all + + @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10) + @customer = Customer.create(name: "valid customer") + + 3.times do + Rental.create(movie_id: @movie.id, customer_id: @customer.id) + end + end + + it "returns an array of one group of customers if n is defined but p is not defined" do + group = Rental.group_by_n(nil, 10, nil) + + expect(group[0].length).must_equal Rental.count + end + + it "returns nil if n is not defined but p is defined" do + group = Rental.group_by_n(nil, nil, 10) + + expect(group.length).must_equal Rental.count + end + + it "returns an array of customers for that page if n and p are defined" do + group = Rental.group_by_n("title", 2, 2) + + expect(group.length).must_equal 1 + + group = Rental.group_by_n("title", 2, 1) + + expect(group.length).must_equal 2 + end + + it "if no type of sort is specified, customers are sorted by ID" do + rentals = Rental.group_by_n(nil, nil, nil) + + expect(rentals[0].id < rentals[1].id).must_equal true + expect(rentals[1].id < rentals[2].id).must_equal true + end end describe "self.sort_by_type" do @@ -169,13 +206,14 @@ end it "sorts rentals by any possible type" do - SORT_TYPES = [:movie_id, :customer_id, :name, :postal_code, :title, :checkout_date, :due_date] + SORT_TYPES = ["movie_id", "title", "customer_id", "name", "postal_code", "checkout_date", "due_date"] SORT_TYPES.each do |type| rentals = Rental.sort_by_type(type) - if [:name, :postal_code].include? type + + if ["name", "postal_code"].include? type expect(rentals[0].customer[type] <= rentals[1].customer[type]).must_equal true - elsif [:title].include? type + elsif ["title"].include? type expect(rentals[0].movie[type] <= rentals[1].movie[type]).must_equal true else expect(rentals[0][type] <= rentals[1][type]).must_equal true @@ -183,10 +221,6 @@ end end end - - it "if sort type is invalid, returns error" do - end - end + end end - end From 455457e6e7a9560af06d37e96c08fa410e2263f0 Mon Sep 17 00:00:00 2001 From: Kelsey Krippaehne Date: Fri, 8 Nov 2019 14:34:12 -0800 Subject: [PATCH 43/43] Updated Controller to include error responses for bad requests --- app/controllers/customers_controller.rb | 14 ++++++- app/controllers/rentals_controller.rb | 27 +++++++------ test/controllers/customers_controller_test.rb | 39 +++++++++++-------- test/controllers/rentals_controller_test.rb | 11 ++---- test/models/rental_test.rb | 6 --- 5 files changed, 54 insertions(+), 43 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 52214bb45..560e12578 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,18 @@ class CustomersController < ApplicationController def index if params[:sort] || params[:n] || params[:p] - customers = Customer.group_by_n(params[:sort], params[:n], params[:p]) - + if !params[:n].nil? && params[:n].to_i <= 0 + render json: {ok: false, "errors" => ["unable to group customers"]}, status: :bad_request + return + elsif !params[:p].nil? && params[:p].to_i <= 0 + render json: {ok: false, "errors" => ["unable to group customers"]}, status: :bad_request + return + elsif !params[:sort].nil? && !["name", "registered_at", "postal_code"].include?(params[:sort]) + render json: {ok: false, "errors" => ["unable to group customers"]}, status: :bad_request + return + else + customers = Customer.group_by_n(params[:sort], params[:n], params[:p]) + end if customers == nil render json: {ok: false, "errors" => ["not found"]}, status: :not_found return diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e57170345..a6f741aa2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,20 +5,25 @@ def create render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request return end - - rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id]) - rental.checkout_date = Date.today - rental.due_date = Date.today + 7 - - if rental.movie.available_inventory > 0 && rental.save - rental.check_out_rental - - render json: rental.as_json(only: [:id]), status: :ok - return + if Movie.find(params[:movie_id]) && Customer.find(params[:customer_id]) + rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id]) + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 + + if rental.movie.available_inventory > 0 && rental.save + rental.check_out_rental + + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request + return + end else render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request return end + end def update @@ -40,7 +45,7 @@ def overdue else rentals = Rental.overdue end - + render json: rentals.as_json(only: [:id, :movie_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok return end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2a27de40a..a6c543589 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,7 +4,7 @@ describe "index" do CUSTOMER_KEYS = [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count] - + it "responds with JSON and success" do get customers_path @@ -25,46 +25,53 @@ it "will respond with an empty array when there are no customers" do Customer.destroy_all - + get customers_path body = check_response(expected_type: Array) expect(body).must_equal [] end - + describe "index params" do before do 10.times do Customer.create!(name: "customer", registered_at: Date.today, postal_code: "98101", phone: "111-222-3333", movies_checked_out_count: 1) end end - - it "will respond with JSON and success if n param" do - get customers_path, params: { sort: "name", n: "2" } + it "will respond with JSON and success if request contains a valid n param" do + get customers_path, params: { sort: "name", n: "2" } + body = check_response(expected_type: Array) body.each do |subarray| expect(subarray).must_be_instance_of Array expect(subarray.length).must_equal 2 end end - - it "will respond with JSON and success if p param without n param" do - get customers_path, params: { sort: nil, n: "3", p: "40"} - body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"]).must_include "not found" + it "will respond with error if given an invalid n param" do + get customers_path, params: { sort: "name", n: "name" } + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_include "unable to group customers" + end + + it "will respond with JSON and success if request contains a valid p param, regardless of value" do + get customers_path, params: { sort: nil, n: nil, p: "40"} + + body = check_response(expected_type: Array) + expect(body.length).must_equal Customer.all.length end - - it "will respond with error if given invalid p param" do - get customers_path, params: { sort: nil, n: "3", p: "40"} + it "will respond with error if given an invalid p param" do + get customers_path, params: { sort: nil, n: "3", p: "40"} + body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"]).must_include "not found" end - + end end - + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f9465e565..f24aa6cc4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -11,12 +11,12 @@ expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} }.must_change "Rental.count", 1 - + created_rental = Rental.find_by(movie_id: @movie.id) expect(created_rental.checkout_date).must_be_kind_of Date expect(created_rental.due_date).must_be_kind_of Date - + body = check_response(expected_type: Hash) expect(body["id"]).must_equal created_rental.id must_respond_with :ok @@ -33,13 +33,8 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "unable to create rental" end -<<<<<<< HEAD - it "will not create rental without valid movie id" do -======= - it "will respond with error if invalid movie id" do ->>>>>>> master expect{ post checkout_path, params: {movie_id: nil, customer_id: @customer.id} }.wont_change "Rental.count" @@ -48,7 +43,7 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "unable to create rental" end - + it "will respond with error if invalid cusotmer id" do expect{ post checkout_path, params: {movie_id: @movie.id, customer_id: nil} diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d45ecbd7b..82dc6b331 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,15 +1,9 @@ require "test_helper" describe Rental do - <<<<<<< HEAD let (:movie) {movie = Movie.create(title: "valid movie", inventory: 10)} let (:customer) {customer = Customer.create(name: "valid customer")} - ======= - let (:movie) { movie = Movie.create(title: "valid movie", inventory: 10) } - let (:customer) { customer = Customer.create(name: "valid customer") } - - >>>>>>> master describe "initialize" do before do @new_rental = Rental.new(movie_id: movie.id, customer_id: customer.id)