From 7cbbeaa28c2d5d2008683419a248f437054c80ce Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 5 Nov 2018 12:16:21 -0800 Subject: [PATCH 01/36] start new rails api project, generate controller, model, routes --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ 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/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 7 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 3 + app/models/movie.rb | 3 + 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 +++++ .../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 | 8 + config/spring.rb | 6 + config/storage.yml | 34 ++++ db/migrate/20181105200011_create_movies.rb | 12 ++ db/migrate/20181105200217_create_customers.rb | 15 ++ db/schema.rb | 39 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 7 + test/controllers/movies_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 70 files changed, 1084 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/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/models/customer.rb create mode 100644 app/models/movie.rb 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/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 db/migrate/20181105200011_create_movies.rb create mode 100644 db/migrate/20181105200217_create_customers.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb 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..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..a9f49bedc --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# 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 :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..731ec7c93 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + 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.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + 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.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.6 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/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..289a2c1d6 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,7 @@ +class MoviesController < ApplicationController + + def index + render json: "It works!" + end + +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..1870a7613 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..6cc5b2420 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + validates :title, :overview, :release_date, :inventory, presence: true +end 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..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..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..641b5d08c --- /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..0d86702e8 --- /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: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..80ebfb356 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +PBmWdpoT2nz6sqBGvWe5PQ92o+jDF04Ft34ru3c7YcpBjcMalgKzKeUPKDlEMQISI/T93A7w+aNj5FLudEcc26dHxIF5F4o/+hwo9gtivDesRNAzWCBxpF+wX/9949i7oN9lXg9uIONd67WNYHBt1X0GQcBTyORxAAo+9FaRUJO6DN5HWwf0EdlYwugO60XULc2g5NMvCE+9cEMv9ztEZlMQ5MkpYeWMwWEqHvzAeHucBAwJY61gRt2yF4vcsBEbvUNwAyKbeswWdIj1oT4NRAXKTrQJKHM8rSc3iOC6N1jc8fe/zh2oCvkKcF0Peje4jvrgbjzh4lXSV3fB5kGxW4/g5vaMyVJRY6/LRx8ez+dcv3CVZyct6E+8lOwCkZetqRVGrRKajpGbYh13el3UgeJRX4YOHKvENAde--6fhHDxWqNVTJjSgG--lWjheuWgnGJwuZbgGzFm3w== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..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..5f44b9bda --- /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 = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..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/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..1b8b575b1 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,8 @@ +Rails.application.routes.draw do + resources :customers + resources :movies + + get '/zomg', to: 'movies#index' + + # 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/db/migrate/20181105200011_create_movies.rb b/db/migrate/20181105200011_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105200011_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/20181105200217_create_customers.rb b/db/migrate/20181105200217_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105200217_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..e9926f1ac --- /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: 2018_11_05_200217) 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/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..3911ad469 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-11-05 12:02:17 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-11-05 12:02:17 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..f05dd0894 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 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/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 5e2a85ce2f0b5adda9288245a2196f122ff45d59 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 5 Nov 2018 12:28:03 -0800 Subject: [PATCH 02/36] add customers movies join table --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + .../20181105202306_create_customers_movies_join.rb | 8 ++++++++ db/schema.rb | 9 ++++++++- 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181105202306_create_customers_movies_join.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 1870a7613..7bc86be46 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true + has_and_belongs_to_many :movies end diff --git a/app/models/movie.rb b/app/models/movie.rb index 6cc5b2420..6bfd42e49 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,4 @@ class Movie < ApplicationRecord validates :title, :overview, :release_date, :inventory, presence: true + has_and_belongs_to_many :customers end diff --git a/db/migrate/20181105202306_create_customers_movies_join.rb b/db/migrate/20181105202306_create_customers_movies_join.rb new file mode 100644 index 000000000..3913bd91f --- /dev/null +++ b/db/migrate/20181105202306_create_customers_movies_join.rb @@ -0,0 +1,8 @@ +class CreateCustomersMoviesJoin < ActiveRecord::Migration[5.2] + def change + create_table :customers_movies do |t| + t.belongs_to :customer, index: true + t.belongs_to :movie, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb index e9926f1ac..e3b5214d0 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: 2018_11_05_200217) do +ActiveRecord::Schema.define(version: 2018_11_05_202306) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,6 +27,13 @@ t.datetime "updated_at", null: false end + create_table "customers_movies", force: :cascade do |t| + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_customers_movies_on_customer_id" + t.index ["movie_id"], name: "index_customers_movies_on_movie_id" + end + create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" From 2efc3a80c0638b6b1be1e4c3a71613f996be010e Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 5 Nov 2018 14:37:40 -0800 Subject: [PATCH 03/36] add model tests for movie validations and relations --- test/models/movie_test.rb | 94 +++++++++++++++++++++++++++++++++++++-- test/test_helper.rb | 3 +- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..4724a0a64 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,97 @@ require "test_helper" + describe Movie do - let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? + # VALIDATIONS + describe 'validations' do + let(:movie) { Movie.create( + title: 'Rails on Rails on Rails', + overview: 'Railly railly great movie about rails', + release_date: Date.parse('2020-11-01'), + inventory: 2) + } + + it 'is invalid without a title' do + movie.title = nil + + movie.title.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is invalid without an overview' do + movie.overview = nil + + movie.overview.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is invalid without a release date' do + movie.release_date = nil + + movie.release_date.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is invalid without an inventory' do + movie.inventory = nil + + movie.inventory.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is valid with all fields present' do + expect(movie).must_be :valid? + end + + end + + + # RELATIONS + describe 'Relations' do + let(:movie) { Movie.create( + title: 'Rails on Rails on Rails', + overview: 'Railly railly great movie about rails', + release_date: Date.parse('2020-11-01'), + inventory: 2) + } + + let(:customer_1) { Customer.create( + name: 'Freddy', + registered_at: Date.parse('1994-07-12'), + address: '1234 W 5th St', + city: 'Seattle', + state: 'Washington', + postal_code: '90210', + phone: '111-222-3455' + ) + } + + let(:customer_2) { Customer.create( + name: 'Mercury', + registered_at: Date.parse('1994-11-12'), + address: '11111 W 5th St', + city: 'Seattle', + state: 'Washington', + postal_code: '21090', + phone: '555-867-5309' + ) + } + + it 'must relate to a customer' do + movie.customers << customer_1 + movie.customers << customer_2 + + expect(movie).must_respond_to :customers + expect(movie.customers.count).must_equal 2 + expect(movie.customers.first).must_equal customer_1 + end + + # it 'can set the customers' do + # end + + end + + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From a6977521b213c81fe1bf4412f6970352f1c4de35 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Mon, 5 Nov 2018 14:57:33 -0800 Subject: [PATCH 04/36] customer model testing --- test/controllers/customers_controller_test.rb | 108 +++++++++++++++++- test/models/customer_test.rb | 103 ++++++++++++++++- 2 files changed, 206 insertions(+), 5 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..653efd807 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,111 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" + # describe "index" do + # it "should get index" do + # # Act + # get customers_path + # + # # Assert + # must_respond_with :success + # end + ############################ + # describe "create" do + # it "can create a customer with valid data" do + # # Arrange + # customer_data = { + # customer: { + # name: "new test customer", + # author_id: Author.first.id + # } + # } + # + # # Assumptions + # test_customer = Customer.new(customer_data[:customer]) + # test_customer.must_be :valid?, "Customer data was invalid. Please come fix this test" + # + # # Act + # expect { + # post customers_path, params: customer_data + # }.must_change('Customer.count', +1) + # + # # Assert + # must_redirect_to customer_path(Customer.last) + # end + # + # it "does not create a new customer w/ invalid data" do + # # Arrange + # customer_data = { + # customer: { + # title: Customer.first.title, + # author_id: Author.first.id + # } + # } + # + # # Assumptions + # Customer.new(customer_data[:customer]).wont_be :valid?, "Customer data wasn't invalid. Please come fix this test" + # + # # Act + # expect { + # post customers_path, params: customer_data + # }.wont_change('Customer.count') + # + # # Assert + # must_respond_with :bad_request + # end + # end + ############################### + # describe "show" do + # + # it "should respond with success for showing an existing customer" do + # # Arrange + # existing_customer = customers(:poodr) + # + # # Act + # get customer_path(existing_customer.id) + # + # # Assert + # must_respond_with :success + # end + # + # it "should respond with not found for showing a non-existing customer" do + # # Arrange + # customer = customers(:poodr) + # id = customer.id + # + # get customer_path(id) + # must_respond_with :success + # + # customer.destroy + # + # # Act + # get customer_path(id) + # + # # Assert + # must_respond_with :missing + # end + # + # end + ###################################### + # describe "destroy" do + # it "can destroy an existing customer" do + # # Arrange + # customer = customers(:poodr) + # # before_customer_count = Customer.count + # + # # Act + # expect { + # delete customer_path(customer) + # }.must_change('Book.count', -1) + # + # # Assert + # must_respond_with :redirect + # must_redirect_to customers_path + # + # # expect(Customer.count).must_equal( + # # before_customer_count - 1, + # # "customer count did not decrease" + # # ) + # end # end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..16da38dad 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,106 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + # VALIDATIONS + describe 'validations' do + let(:customer) { Customer.create( + name: "Mickey" + registered_at: Date.parse('2020-11-01'), + address: '1234 W. 5th Street', + city: "Avondale", + state: "Arizona", + postal_code: "90210", + phone: "555-867-5309" + ) + } + + it 'is invalid without a name' do + customer.name = nil + + customer.name.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a registration date' do + customer.registered_at = nil + + customer.registered_at.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without an address' do + customer.address = nil + + customer.address.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a city' do + customer.city = nil + + customer.city.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a state' do + customer.state = nil + + customer.state.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a postal_code' do + customer.postal_code = nil + + customer.postal_code.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a phone number' do + customer.phone = nil + + customer.phone.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is valid with all fields present' do + expect(customer).must_be :valid? + end + + + end + + + # RELATIONS + describe 'Relations' do + let(:customer) { Customer.create( + name: "Mickey" + registered_at: Date.parse('2020-11-01'), + address: '1234 W. 5th Street', + city: "Avondale", + state: "Arizona", + postal_code: "90210", + phone: "555-867-5309" + ) + } + + let(:movie_1) { Movie.create( + title: 'Five Nights at Freddys', + release_date: Date.parse('1994-07-12'), + overview: 'Scariness on film reel', + inventory: 5 + ) + } + + it 'must relate to a customer' do + customer.movies << movie_1 + + expect(customer).must_respond_to :movies + expect(customer.movies.first).must_equal movie_1 + end + + # it 'can set the customers' do + # end - it "must be valid" do - value(customer).must_be :valid? end end From af1919a8a79ed553aa96f6b82b5bd2505013d3d2 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Mon, 5 Nov 2018 14:59:56 -0800 Subject: [PATCH 05/36] ran red green test --- test/models/customer_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 16da38dad..11ac46924 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,7 +4,7 @@ # VALIDATIONS describe 'validations' do let(:customer) { Customer.create( - name: "Mickey" + name: "Mickey", registered_at: Date.parse('2020-11-01'), address: '1234 W. 5th Street', city: "Avondale", @@ -74,7 +74,7 @@ # RELATIONS describe 'Relations' do let(:customer) { Customer.create( - name: "Mickey" + name: "Mickey", registered_at: Date.parse('2020-11-01'), address: '1234 W. 5th Street', city: "Avondale", From d3bd619d952abfcdd7fa91ef6eb9e00c809b43f7 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 5 Nov 2018 15:07:45 -0800 Subject: [PATCH 06/36] update model test for movies --- test/models/movie_test.rb | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 4724a0a64..b3e51a094 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -68,29 +68,13 @@ ) } - let(:customer_2) { Customer.create( - name: 'Mercury', - registered_at: Date.parse('1994-11-12'), - address: '11111 W 5th St', - city: 'Seattle', - state: 'Washington', - postal_code: '21090', - phone: '555-867-5309' - ) - } - it 'must relate to a customer' do movie.customers << customer_1 - movie.customers << customer_2 expect(movie).must_respond_to :customers - expect(movie.customers.count).must_equal 2 expect(movie.customers.first).must_equal customer_1 end - # it 'can set the customers' do - # end - end From 9fce65ba9b6f450e78cbd731eeba3e011b7904f7 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 5 Nov 2018 15:47:07 -0800 Subject: [PATCH 07/36] update customers controller actions --- app/controllers/application_controller.rb | 3 ++ app/controllers/customers_controller.rb | 40 +++++++++++++++++++++++ config/routes.rb | 5 ++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..1ad1172bf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,5 @@ class ApplicationController < ActionController::API + def render_error(status, errors) + render json: { errors: errors }, status: status +end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..e8360094b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,42 @@ class CustomersController < ApplicationController + + def index + customers = Customer.all + + render json: get_json(customers), status: :ok + end + + def show + customer = Customer.find_by(id: params[:id]) + + if customer + render json: get_json(customer) + else + render_error(:not_found, {customer_id: ["Customer does not exist"] } ) + end + end + + def create + customer = Customer.new(customer_params) + + if customer.save + render json: { id: customer.id } + else + render_error(:bad_request, customer.errors.messages) + end + end + + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + end + + def get_json(customer_data) + return customer_data.as_json(except: [:created_at, :updated_at]) + end + + + end diff --git a/config/routes.rb b/config/routes.rb index 1b8b575b1..5258d389a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,7 @@ Rails.application.routes.draw do - resources :customers - resources :movies + resources :customers, only: [:index, :show, :create] + resources :movies, only: [:index, :show, :create] - get '/zomg', to: 'movies#index' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 975091629ea363174e9afc3835deff30925feff2 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Mon, 5 Nov 2018 15:47:55 -0800 Subject: [PATCH 08/36] update movies controller with methods --- app/controllers/application_controller.rb | 3 ++ app/controllers/movies_controller.rb | 36 +++++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..22eb79f30 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,5 @@ class ApplicationController < ActionController::API + def render_error(status, errors) + render json: { errors: errors }, status: status + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 289a2c1d6..ae513127d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,39 @@ class MoviesController < ApplicationController def index - render json: "It works!" + movies = Movie.all + + render json: get_json(movies), status: :ok + end + + def show + movie = Movie.find_by(id: params[:id] ) + if movie + render json: get_json(movie), status: :ok + else + render_error(:not_found, { movie_id: ["no such movie exists"] }) + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: { id: movie.id }, status: :ok + else + render_error(:bad_request, movie.errors.messages) + end + end + + private + + def movie_params + # How do I test this? + params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) + end + + def get_json(movie_data) + # How do I test this? + return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory] ) end - end From f0b25e856daf1ca20230b0b07901efd1782b36e3 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 5 Nov 2018 16:00:21 -0800 Subject: [PATCH 09/36] update the yml files --- test/fixtures/customers.yml | 32 ++++++++++++++++---------------- test/fixtures/movies.yml | 18 +++++++++--------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 3911ad469..b79522aac 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - registered_at: 2018-11-05 12:02:17 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +customer_1: + name: Jackson + registered_at: 2015-10-11 12:02:17 + address: 1234 East Street + city: New York + state: NY + postal_code: 10201 + phone: 206-111-2342 -two: - name: MyString - registered_at: 2018-11-05 12:02:17 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +customer_2: + name: Izzie + registered_at: 2012-10-22 12:02:17 + address: 4321 West Street + city: Boston + state: MA + postal_code: 90821 + phone: 123-421-4122 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..ec08aad0d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2018-11-05 - inventory: 1 +movie_1: + title: Rails on Rails + overview: This is a movie all about rails. It's railly railly awesome. + release_date: 2020-09-02 + inventory: 3 -two: - title: MyString - overview: MyString - release_date: 2018-11-05 +movie_2: + title: Ruby is The Best + overview: The most amazing movie you will ever see. + release_date: 2011-01-20 inventory: 1 From cad5ff36abfd3b9e54734512ceb9d25ddcd15c85 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 5 Nov 2018 16:07:43 -0800 Subject: [PATCH 10/36] update tests for customers --- test/models/customer_test.rb | 39 ++++++------------------------------ 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 11ac46924..105dbe527 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,16 +3,7 @@ describe Customer do # VALIDATIONS describe 'validations' do - let(:customer) { Customer.create( - name: "Mickey", - registered_at: Date.parse('2020-11-01'), - address: '1234 W. 5th Street', - city: "Avondale", - state: "Arizona", - postal_code: "90210", - phone: "555-867-5309" - ) - } + let(:customer) { customers(:customer_1) } it 'is invalid without a name' do customer.name = nil @@ -73,34 +64,16 @@ # RELATIONS describe 'Relations' do - let(:customer) { Customer.create( - name: "Mickey", - registered_at: Date.parse('2020-11-01'), - address: '1234 W. 5th Street', - city: "Avondale", - state: "Arizona", - postal_code: "90210", - phone: "555-867-5309" - ) - } - - let(:movie_1) { Movie.create( - title: 'Five Nights at Freddys', - release_date: Date.parse('1994-07-12'), - overview: 'Scariness on film reel', - inventory: 5 - ) - } + let(:customer) { customers(:customer_1) } + + let(:movie) { movies(:movie_1) } it 'must relate to a customer' do - customer.movies << movie_1 + customer.movies << movie expect(customer).must_respond_to :movies - expect(customer.movies.first).must_equal movie_1 + expect(customer.movies.first).must_equal movie end - # it 'can set the customers' do - # end - end end From 1c0ae721c19fa5efd07a320b739c115ad55ae766 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Mon, 5 Nov 2018 16:08:40 -0800 Subject: [PATCH 11/36] updated model test movies --- test/controllers/movies_controller_test.rb | 57 ++++++++++++++++++++++ test/models/movie_test.rb | 31 +++--------- 2 files changed, 63 insertions(+), 25 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..b9dd53197 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,4 +4,61 @@ # it "must be a real test" do # flunk "Need real tests" # end + describe "index" do + it "should get index" do + # Act + get movies_path + + # Assert + must_respond_with :success + end + end + + describe "create" do + let(:movie) { Movie.create( + title: 'Rails on Rails on Rails', + overview: 'Railly railly great movie about rails', + release_date: Date.parse('2020-11-01'), + inventory: 2) + } + + it "can create a movie with valid data" do + # Arrange + + # Assumptions + test_movie = Movie.new(movie_data[:movie]) + test_movie.must_be :valid?, "Movie data was invalid. Please come fix this test" + + # Act + expect { + post movies_path, params: movie_data + }.must_change('Movie.count', +1) + + # Assert + must_redirect_to movie_path(Movie.last) + end + + it "does not create a new movie w/ invalid data" do + # Arrange + movie_data = { + movie: { + title: Movie.first.title, + author_id: Author.first.id + } + } + + # Assumptions + Movie.new(movie_data[:movie]).wont_be :valid?, "Movie data wasn't invalid. Please come fix this test" + + # Act + expect { + post movies_path, params: movie_data + }.wont_change('Movie.count') + + # Assert + must_respond_with :bad_request + end + end + + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index b3e51a094..c338deea4 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -5,12 +5,7 @@ # VALIDATIONS describe 'validations' do - let(:movie) { Movie.create( - title: 'Rails on Rails on Rails', - overview: 'Railly railly great movie about rails', - release_date: Date.parse('2020-11-01'), - inventory: 2) - } + let(:movie) { movies(:movie_1) } it 'is invalid without a title' do movie.title = nil @@ -50,29 +45,15 @@ # RELATIONS describe 'Relations' do - let(:movie) { Movie.create( - title: 'Rails on Rails on Rails', - overview: 'Railly railly great movie about rails', - release_date: Date.parse('2020-11-01'), - inventory: 2) - } - - let(:customer_1) { Customer.create( - name: 'Freddy', - registered_at: Date.parse('1994-07-12'), - address: '1234 W 5th St', - city: 'Seattle', - state: 'Washington', - postal_code: '90210', - phone: '111-222-3455' - ) - } + let(:movie) { movies(:movie_1) } + + let(:becky) { customers(:customer_1) } it 'must relate to a customer' do - movie.customers << customer_1 + movie.customers << becky expect(movie).must_respond_to :customers - expect(movie.customers.first).must_equal customer_1 + expect(movie.customers.first).must_equal becky end end From d1064b9bec9231c36f92c326cd52c6deb6a236af Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Tue, 6 Nov 2018 11:35:38 -0800 Subject: [PATCH 12/36] update movie controller --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- config/routes.rb | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e8360094b..0b41a7e69 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -34,7 +34,7 @@ def customer_params end def get_json(customer_data) - return customer_data.as_json(except: [:created_at, :updated_at]) + return customer_data.as_json(except: [:address, :city, :state, :created_at, :updated_at]) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ae513127d..065d9387f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -29,7 +29,7 @@ def create def movie_params # How do I test this? - params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end def get_json(movie_data) diff --git a/config/routes.rb b/config/routes.rb index 5258d389a..d173825b5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,6 @@ Rails.application.routes.draw do resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] - - + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From a1017ff3605ff505ca857d63679204ab51737b02 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Tue, 6 Nov 2018 11:37:15 -0800 Subject: [PATCH 13/36] wrote preliminary controller test for movies, updated test_helper --- app/controllers/movies_controller.rb | 11 ++++++-- test/controllers/movies_controller_test.rb | 33 +++++++++++----------- test/test_helper.rb | 1 + 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ae513127d..b64256033 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,13 +3,13 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: get_json(movies), status: :ok + render json: movies_json(movies), status: :ok end def show movie = Movie.find_by(id: params[:id] ) if movie - render json: get_json(movie), status: :ok + render json: movie_json(movie), status: :ok else render_error(:not_found, { movie_id: ["no such movie exists"] }) end @@ -32,7 +32,12 @@ def movie_params params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) end - def get_json(movie_data) + def movies_json(movie_data) + # How do I test this? + return movie_data.as_json(only: [:id, :title, :release_date] ) + end + + def movie_json(movie_data) # How do I test this? return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory] ) end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b9dd53197..c29b299e9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'pry' describe MoviesController do # it "must be a real test" do @@ -15,40 +16,39 @@ end describe "create" do - let(:movie) { Movie.create( - title: 'Rails on Rails on Rails', - overview: 'Railly railly great movie about rails', - release_date: Date.parse('2020-11-01'), - inventory: 2) - } - it "can create a movie with valid data" do - # Arrange + movie_data = { + movie: { + title: "test title", + overview: "test overview", + release_date: Date.parse("2018-04-12"), + inventory: 10 + } + } # Assumptions - test_movie = Movie.new(movie_data[:movie]) - test_movie.must_be :valid?, "Movie data was invalid. Please come fix this test" + Movie.create(movie_data[:movie]).must_be :valid?, "Movie data wasn't invalid. Please come fix this test" # Act expect { post movies_path, params: movie_data }.must_change('Movie.count', +1) - # Assert - must_redirect_to movie_path(Movie.last) + must_respond_with :success end it "does not create a new movie w/ invalid data" do - # Arrange movie_data = { movie: { - title: Movie.first.title, - author_id: Author.first.id + title: "", + overview: "test overview", + release_date: Date.parse("2018-04-12"), + inventory: 10 } } # Assumptions - Movie.new(movie_data[:movie]).wont_be :valid?, "Movie data wasn't invalid. Please come fix this test" + film = Movie.create(movie_data[:movie]).wont_be :valid?, "Movie data wasn't invalid. Please come fix this test" # Act expect { @@ -57,6 +57,7 @@ # Assert must_respond_with :bad_request + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index fb7dd505e..18c030afc 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,6 +4,7 @@ require "minitest/rails" require "minitest/reporters" # for Colorized output # For colorful output! +require 'pry' Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, ENV, From 21d2cee508b4c9326414546f848afce8ff0506bc Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Tue, 6 Nov 2018 14:25:26 -0800 Subject: [PATCH 14/36] add model for rentals --- app/controllers/rentals_controller.rb | 20 +++++++++++++++++++ app/models/rental.rb | 2 ++ db/migrate/20181106221452_create_rentals.rb | 8 ++++++++ ...181106222159_add_customer_id_to_rentals.rb | 5 +++++ .../20181106222349_add_movie_i_dto_rentals.rb | 5 +++++ db/schema.rb | 13 +++++++++++- test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 11 ++++++++++ test/models/rental_test.rb | 9 +++++++++ 9 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181106221452_create_rentals.rb create mode 100644 db/migrate/20181106222159_add_customer_id_to_rentals.rb create mode 100644 db/migrate/20181106222349_add_movie_i_dto_rentals.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..c6bf102d6 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,20 @@ +class RentalsController < ApplicationController + + # This is a POST verb + def checkout + rental = Rental.new(rental_params) + + + + end + + # This is a POST verb + def checkin + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20181106221452_create_rentals.rb b/db/migrate/20181106221452_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20181106221452_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181106222159_add_customer_id_to_rentals.rb b/db/migrate/20181106222159_add_customer_id_to_rentals.rb new file mode 100644 index 000000000..0c5d8d5d6 --- /dev/null +++ b/db/migrate/20181106222159_add_customer_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20181106222349_add_movie_i_dto_rentals.rb b/db/migrate/20181106222349_add_movie_i_dto_rentals.rb new file mode 100644 index 000000000..9d4481177 --- /dev/null +++ b/db/migrate/20181106222349_add_movie_i_dto_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIDtoRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index e3b5214d0..ea87897cd 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: 2018_11_05_202306) do +ActiveRecord::Schema.define(version: 2018_11_06_222349) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,4 +43,15 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 205c389cc63f78438b2d5d721868257ced78218b Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Tue, 6 Nov 2018 14:37:59 -0800 Subject: [PATCH 15/36] updated movie controller tests for api testing --- app/controllers/movies_controller.rb | 9 +++ test/controllers/movies_controller_test.rb | 84 ++++++++++++---------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 113870643..7b181f78e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -25,6 +25,15 @@ def create end end + def checkout + movie = Movie.find_by(id: params[:id] ) + + + end + + def checkin + end + private def movie_params diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c29b299e9..07245ad62 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,64 +2,74 @@ require 'pry' describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + MOVIE_FIELDS = %w(id title release_date).sort + + #helper method used to DRY up code + 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 + describe "index" do it "should get index" do # Act get movies_path # Assert - must_respond_with :success + body = check_response(expected_type: Array) + + expect(body.length).must_equal Movie.count + + #test what is rendered in JSON => returned + body.each do |movie| + expect(movie.keys.sort).must_equal MOVIE_FIELDS + end + end + + it "returns an empty array when there are no movies" do + #arrange + Movie.destroy_all + + #act - invoke controller action by calling path + get movies_path + + #assert + body = check_response(expected_type: Array) + expect(body).must_equal [] end end describe "create" do - it "can create a movie with valid data" do - movie_data = { - movie: { - title: "test title", - overview: "test overview", - release_date: Date.parse("2018-04-12"), - inventory: 10 - } + let(:movie_data) { + { + title: "test title", + overview: "test overview", + release_date: Date.parse("2018-04-12"), + inventory: 10 } + } - # Assumptions - Movie.create(movie_data[:movie]).must_be :valid?, "Movie data wasn't invalid. Please come fix this test" + it "creates a new movie given valid data" do - # Act expect { post movies_path, params: movie_data }.must_change('Movie.count', +1) - # Assert - must_respond_with :success - end - - it "does not create a new movie w/ invalid data" do - movie_data = { - movie: { - title: "", - overview: "test overview", - release_date: Date.parse("2018-04-12"), - inventory: 10 - } - } - # Assumptions - film = Movie.create(movie_data[:movie]).wont_be :valid?, "Movie data wasn't invalid. Please come fix this test" - # Act - expect { - post movies_path, params: movie_data - }.wont_change('Movie.count') + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" - # Assert - must_respond_with :bad_request + movie = Movie.find(body["id"].to_i) + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success end end - end From 5ef4e32a092897b3484361a52e2cf222742611c5 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Tue, 6 Nov 2018 14:42:48 -0800 Subject: [PATCH 16/36] updated controller test with api testing edge case --- test/controllers/movies_controller_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 07245ad62..710d20212 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -70,6 +70,22 @@ def check_response(expected_type:, expected_status: :success) expect(movie.title).must_equal movie_data[:title] must_respond_with :success end + + it "returns an error for invalid movie data" do + # arrange + movie_data["title"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end end end From e080dff49d0630425f224393f4259556d208f235 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Tue, 6 Nov 2018 15:07:27 -0800 Subject: [PATCH 17/36] add customers controller tests --- app/controllers/customers_controller.rb | 14 -- config/routes.rb | 4 +- test/controllers/customers_controller_test.rb | 177 +++++++----------- 3 files changed, 72 insertions(+), 123 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0b41a7e69..dba21000e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -16,23 +16,9 @@ def show end end - def create - customer = Customer.new(customer_params) - - if customer.save - render json: { id: customer.id } - else - render_error(:bad_request, customer.errors.messages) - end - end - private - def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) - end - def get_json(customer_data) return customer_data.as_json(except: [:address, :city, :state, :created_at, :updated_at]) end diff --git a/config/routes.rb b/config/routes.rb index d173825b5..40e16e23e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do - resources :customers, only: [:index, :show, :create] + resources :customers, only: [:index, :show] resources :movies, only: [:index, :show, :create] - + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 653efd807..7e4ecdff4 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,111 +1,74 @@ require "test_helper" describe CustomersController do - # describe "index" do - # it "should get index" do - # # Act - # get customers_path - # - # # Assert - # must_respond_with :success - # end - ############################ - # describe "create" do - # it "can create a customer with valid data" do - # # Arrange - # customer_data = { - # customer: { - # name: "new test customer", - # author_id: Author.first.id - # } - # } - # - # # Assumptions - # test_customer = Customer.new(customer_data[:customer]) - # test_customer.must_be :valid?, "Customer data was invalid. Please come fix this test" - # - # # Act - # expect { - # post customers_path, params: customer_data - # }.must_change('Customer.count', +1) - # - # # Assert - # must_redirect_to customer_path(Customer.last) - # end - # - # it "does not create a new customer w/ invalid data" do - # # Arrange - # customer_data = { - # customer: { - # title: Customer.first.title, - # author_id: Author.first.id - # } - # } - # - # # Assumptions - # Customer.new(customer_data[:customer]).wont_be :valid?, "Customer data wasn't invalid. Please come fix this test" - # - # # Act - # expect { - # post customers_path, params: customer_data - # }.wont_change('Customer.count') - # - # # Assert - # must_respond_with :bad_request - # end - # end - ############################### - # describe "show" do - # - # it "should respond with success for showing an existing customer" do - # # Arrange - # existing_customer = customers(:poodr) - # - # # Act - # get customer_path(existing_customer.id) - # - # # Assert - # must_respond_with :success - # end - # - # it "should respond with not found for showing a non-existing customer" do - # # Arrange - # customer = customers(:poodr) - # id = customer.id - # - # get customer_path(id) - # must_respond_with :success - # - # customer.destroy - # - # # Act - # get customer_path(id) - # - # # Assert - # must_respond_with :missing - # end - # - # end - ###################################### - # describe "destroy" do - # it "can destroy an existing customer" do - # # Arrange - # customer = customers(:poodr) - # # before_customer_count = Customer.count - # - # # Act - # expect { - # delete customer_path(customer) - # }.must_change('Book.count', -1) - # - # # Assert - # must_respond_with :redirect - # must_redirect_to customers_path - # - # # expect(Customer.count).must_equal( - # # before_customer_count - 1, - # # "customer count did not decrease" - # # ) - # end - # end + + CUSTOMER_FIELDS = %w(id name registered_at postal_code phone).sort + + def parse_json(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 + + describe "index" do + it "is a real working route" do + get customers_path + + body = parse_json(expected_type: Array) + + expect(body.length).must_equal Customer.count + + body.each do |customer| + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "returns an empty array when there are no pets" do + Customer.destroy_all + + get customers_path + + body = parse_json(expected_type: Array) + + expect(body).must_equal [] + end + end + + + describe 'show' do + + it 'is a real working route and returns JSON for an existing customer' do + customer = Customer.first + + get customer_path(customer.id) + + body = parse_json(expected_type: Hash) + + CUSTOMER_FIELDS.each do |key| + expect(body[key]).must_equal customer[key] + end + + + end + + + it 'returns JSON with an error message and status code for a customer that DNE' do + customer_id = Customer.last.id + 1 + + get customer_path(customer_id) + + body = parse_json(expected_type: Hash, expected_status: :not_found) + + expect(body["errors"]).must_include "customer_id" + end + + end + + + + end From 76ae8345bfedf09ecc6a353b1395650a2e6aa6eb Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Tue, 6 Nov 2018 16:36:58 -0800 Subject: [PATCH 18/36] created migrations to add dates to rental model and updated rental controller --- app/controllers/movies_controller.rb | 9 --------- app/controllers/rentals_controller.rb | 9 ++++++++- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- app/models/rental.rb | 9 +++++++++ db/migrate/20181106232259_add_checkout_date_to_rental.rb | 5 +++++ db/migrate/20181106232538_add_duedate_to_rental.rb | 5 +++++ db/migrate/20181106232642_add_checkin_date_to_rental.rb | 5 +++++ .../20181106233709_add_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 6 +++++- 10 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20181106232259_add_checkout_date_to_rental.rb create mode 100644 db/migrate/20181106232538_add_duedate_to_rental.rb create mode 100644 db/migrate/20181106232642_add_checkin_date_to_rental.rb create mode 100644 db/migrate/20181106233709_add_available_inventory_to_movies.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7b181f78e..113870643 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -25,15 +25,6 @@ def create end end - def checkout - movie = Movie.find_by(id: params[:id] ) - - - end - - def checkin - end - private def movie_params diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c6bf102d6..688fcc6ff 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,9 +3,16 @@ class RentalsController < ApplicationController # This is a POST verb def checkout rental = Rental.new(rental_params) + if rental.save + date = Date.today + rental.checkout_date = date + rental.due_date = (date + 7) + movie = Movie.find_by(id: rental.movie_id) + rental.movie_inventory(movie) + render json: { customer_id: :customer_id} - + end end # This is a POST verb diff --git a/app/models/customer.rb b/app/models/customer.rb index 7bc86be46..ad200c3de 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,4 @@ class Customer < ApplicationRecord validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true - has_and_belongs_to_many :movies + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 6bfd42e49..5010b4ad1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,4 @@ class Movie < ApplicationRecord validates :title, :overview, :release_date, :inventory, presence: true - has_and_belongs_to_many :customers + has_many :customers end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..66a1d0d46 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,11 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :customer_id, :movie_id, presence: true + + def movie_inventory(movie) + movie = self.movie.find_by(movie_id: movie.id) + return movie.inventory -= 1 + end end diff --git a/db/migrate/20181106232259_add_checkout_date_to_rental.rb b/db/migrate/20181106232259_add_checkout_date_to_rental.rb new file mode 100644 index 000000000..596d86f11 --- /dev/null +++ b/db/migrate/20181106232259_add_checkout_date_to_rental.rb @@ -0,0 +1,5 @@ +class AddCheckoutDateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkout_date, :date + end +end diff --git a/db/migrate/20181106232538_add_duedate_to_rental.rb b/db/migrate/20181106232538_add_duedate_to_rental.rb new file mode 100644 index 000000000..722aa9cc5 --- /dev/null +++ b/db/migrate/20181106232538_add_duedate_to_rental.rb @@ -0,0 +1,5 @@ +class AddDuedateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :date + end +end diff --git a/db/migrate/20181106232642_add_checkin_date_to_rental.rb b/db/migrate/20181106232642_add_checkin_date_to_rental.rb new file mode 100644 index 000000000..aac5b1ba3 --- /dev/null +++ b/db/migrate/20181106232642_add_checkin_date_to_rental.rb @@ -0,0 +1,5 @@ +class AddCheckinDateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkin_date, :date + end +end diff --git a/db/migrate/20181106233709_add_available_inventory_to_movies.rb b/db/migrate/20181106233709_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..9bcb714a6 --- /dev/null +++ b/db/migrate/20181106233709_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index ea87897cd..4f41ce219 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: 2018_11_06_222349) do +ActiveRecord::Schema.define(version: 2018_11_06_233709) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,6 +41,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| @@ -48,6 +49,9 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.date "checkout_date" + t.date "due_date" + t.date "checkin_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 106b92bb44a5974648021333840bfc184061e44d Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Tue, 6 Nov 2018 16:47:14 -0800 Subject: [PATCH 19/36] add rental controller --- app/controllers/rentals_controller.rb | 14 ++++++++++++++ app/models/rental.rb | 4 ++++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 4 +--- test/models/customer_test.rb | 12 ------------ test/models/movie_test.rb | 12 ------------ 6 files changed, 21 insertions(+), 27 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c6bf102d6..f7438852f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,7 +4,19 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) + # check inventory before save + movie = Movie.find_by(id: :movie_id) + if movie.available_inventory > 0 + + if rental.save + movie.available_inventory - 1 + else + render_error(:not_found, rental.errors.messages) + end + else + render_error(:bad_request) + end end @@ -17,4 +29,6 @@ def checkin def rental_params params.permit(:customer_id, :movie_id) end + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..dc1c4a720 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,6 @@ class Rental < ApplicationRecord + + def movie_inventory(movie) + + end end diff --git a/config/routes.rb b/config/routes.rb index 40e16e23e..f1311a9a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,5 +2,7 @@ resources :customers, only: [:index, :show] resources :movies, only: [:index, :show, :create] + post '/rentals/check-out', to: 'rentals#checkout' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..50513de13 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,5 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 105dbe527..941c0bd0d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -63,17 +63,5 @@ # RELATIONS - describe 'Relations' do - let(:customer) { customers(:customer_1) } - - let(:movie) { movies(:movie_1) } - - it 'must relate to a customer' do - customer.movies << movie - expect(customer).must_respond_to :movies - expect(customer.movies.first).must_equal movie - end - - end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index c338deea4..d9a26d572 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,19 +44,7 @@ # RELATIONS - describe 'Relations' do - let(:movie) { movies(:movie_1) } - - let(:becky) { customers(:customer_1) } - - it 'must relate to a customer' do - movie.customers << becky - expect(movie).must_respond_to :customers - expect(movie.customers.first).must_equal becky - end - - end end From 2c420616ba8703a9a9685bab9e363eb460a3fae4 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 7 Nov 2018 10:04:55 -0800 Subject: [PATCH 20/36] update rentals controller for checkout and checkin method --- app/controllers/movies_controller.rb | 4 +- app/controllers/rentals_controller.rb | 62 ++++++++++++++----- app/models/movie.rb | 2 +- config/routes.rb | 2 + ...05122_change_available_inventory_movies.rb | 7 +++ ...d_movies_checked_out_count_to_customers.rb | 5 ++ db/schema.rb | 3 +- 7 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 db/migrate/20181107005122_change_available_inventory_movies.rb create mode 100644 db/migrate/20181107171739_add_movies_checked_out_count_to_customers.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 113870643..4035f641e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -29,7 +29,7 @@ def create def movie_params # How do I test this? - params.permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end def movies_json(movie_data) @@ -39,6 +39,6 @@ def movies_json(movie_data) def movie_json(movie_data) # How do I test this? - return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory] ) + return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory] ) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a1f2775c9..e992c1cf2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,43 +1,73 @@ class RentalsController < ApplicationController - # This is a POST verb + def index + rentals = Rental.all + + render json: jsonify(rentals) + end + def checkout rental = Rental.new(rental_params) - if rental.save - date = Date.today - rental.checkout_date = date - rental.due_date = (date + 7) - movie = Movie.find_by(id: rental.movie_id) - rental.movie_inventory(movie) - # check inventory before save - movie = Movie.find_by(id: :movie_id) + movie = rental.movie + customer = rental.customer + date = Date.today if movie.available_inventory > 0 - if rental.save - movie.available_inventory - 1 + movie.available_inventory -= 1 + customer.movies_checked_out_count += 1 + rental.checkout_date = date + rental.due_date = (date + 7) + + if rental.save && movie.save && customer.save + render json: { rental_id: rental.id } else render_error(:not_found, rental.errors.messages) end + else - render_error(:bad_request) + # this movie is not available to rent + render_error(:bad_request ["No rental inventory available for #{movie.title}"]) end - render json: { customer_id: :customer_id} + end + def checkin + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + rental = nil + date = Date.today + + customer.rentals.each do |r| + if r.movie == movie + rental = r + end end - end + rental.checkin_date = date + rental.checkout_date = nil + rental.due_date = nil + + movie.available_inventory += 1 + customer.movies_checked_out_count -= 1 + + if rental.save && movie.save && customer.save + render json: { rental_id: rental.id } + else + render_error(:not_found, rental.errors.messages) + end - # This is a POST verb - def checkin end + private def rental_params params.permit(:customer_id, :movie_id) end + def jsonify(rental_data) + return rental_data.as_json() + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 5010b4ad1..0b495eb3a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,4 @@ class Movie < ApplicationRecord validates :title, :overview, :release_date, :inventory, presence: true - has_many :customers + has_many :rentals end diff --git a/config/routes.rb b/config/routes.rb index f1311a9a3..65ec2590e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,8 @@ resources :movies, only: [:index, :show, :create] post '/rentals/check-out', to: 'rentals#checkout' + post '/rentals/check-in', to: 'rentals#checkin' + resources :rentals # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20181107005122_change_available_inventory_movies.rb b/db/migrate/20181107005122_change_available_inventory_movies.rb new file mode 100644 index 000000000..229033e59 --- /dev/null +++ b/db/migrate/20181107005122_change_available_inventory_movies.rb @@ -0,0 +1,7 @@ +class ChangeAvailableInventoryMovies < ActiveRecord::Migration[5.2] + def change + reversible do |dir| + dir.up{ Movie.update_all('available_inventory = inventory')} + end + end +end diff --git a/db/migrate/20181107171739_add_movies_checked_out_count_to_customers.rb b/db/migrate/20181107171739_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..9aca60313 --- /dev/null +++ b/db/migrate/20181107171739_add_movies_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 4f41ce219..19219b3e7 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: 2018_11_06_233709) do +ActiveRecord::Schema.define(version: 2018_11_07_171739) 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 "customers_movies", force: :cascade do |t| From c0baaa317fb2e934f4a0438ab66da248043632b3 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 7 Nov 2018 10:08:11 -0800 Subject: [PATCH 21/36] add checkin method for rentals controller --- app/controllers/rentals_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e992c1cf2..6c07af490 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -27,7 +27,6 @@ def checkout end else - # this movie is not available to rent render_error(:bad_request ["No rental inventory available for #{movie.title}"]) end end From 36b106693d70073a832b7c24b0245a2ee2616c37 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Wed, 7 Nov 2018 10:10:37 -0800 Subject: [PATCH 22/36] made additions to checkin and checkout rental methods --- app/controllers/rentals_controller.rb | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a1f2775c9..425321bf8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,26 +7,12 @@ def checkout date = Date.today rental.checkout_date = date rental.due_date = (date + 7) - movie = Movie.find_by(id: rental.movie_id) - rental.movie_inventory(movie) + movie = rental.movie + movie.available_inventory - 1 - # check inventory before save - movie = Movie.find_by(id: :movie_id) - - if movie.available_inventory > 0 - - if rental.save - movie.available_inventory - 1 - else - render_error(:not_found, rental.errors.messages) - end - else - render_error(:bad_request) - end - render json: { customer_id: :customer_id} + render json: { customer_id: :customer_id } end - end # This is a POST verb @@ -38,6 +24,4 @@ def checkin def rental_params params.permit(:customer_id, :movie_id) end - - end From d9d04fac53653026e85f37ff43c62e0f798c8d29 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Wed, 7 Nov 2018 10:19:03 -0800 Subject: [PATCH 23/36] updated customer test for data returned on index --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7e4ecdff4..11a616b06 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,7 @@ describe CustomersController do - CUSTOMER_FIELDS = %w(id name registered_at postal_code phone).sort + CUSTOMER_FIELDS = %w(id name movies_checked_out_count registered_at postal_code phone).sort def parse_json(expected_type:, expected_status: :success) must_respond_with expected_status From e9867cfeb7d51fa0548292220a76829d0b43de3b Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Wed, 7 Nov 2018 11:12:36 -0800 Subject: [PATCH 24/36] updated customer/movie model dependent destroy and rental model tests --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- app/models/rental.rb | 5 --- test/controllers/customers_controller_test.rb | 2 +- test/fixtures/customers.yml | 2 + test/fixtures/movies.yml | 9 ++++ test/fixtures/rentals.yml | 14 ++++-- test/models/rental_test.rb | 44 +++++++++++++++++-- 8 files changed, 65 insertions(+), 15 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index ad200c3de..e41981f04 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,4 @@ class Customer < ApplicationRecord validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true - has_many :rentals + has_many :rentals, dependent: :destroy end diff --git a/app/models/movie.rb b/app/models/movie.rb index 0b495eb3a..b0b77193d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,4 @@ class Movie < ApplicationRecord validates :title, :overview, :release_date, :inventory, presence: true - has_many :rentals + has_many :rentals, dependent: :destroy end diff --git a/app/models/rental.rb b/app/models/rental.rb index 66a1d0d46..58f0f8234 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,9 +3,4 @@ class Rental < ApplicationRecord belongs_to :movie validates :customer_id, :movie_id, presence: true - - def movie_inventory(movie) - movie = self.movie.find_by(movie_id: movie.id) - return movie.inventory -= 1 - end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 11a616b06..5b599e574 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ def parse_json(expected_type:, expected_status: :success) end end - it "returns an empty array when there are no pets" do + it "returns an empty array when there are no customers" do Customer.destroy_all get customers_path diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index b79522aac..b6b31f71c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html customer_1: + id: 1 name: Jackson registered_at: 2015-10-11 12:02:17 address: 1234 East Street @@ -10,6 +11,7 @@ customer_1: phone: 206-111-2342 customer_2: + id: 2 name: Izzie registered_at: 2012-10-22 12:02:17 address: 4321 West Street diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ec08aad0d..2c947d659 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html movie_1: + id: 1 title: Rails on Rails overview: This is a movie all about rails. It's railly railly awesome. release_date: 2020-09-02 inventory: 3 movie_2: + id: 2 title: Ruby is The Best overview: The most amazing movie you will ever see. release_date: 2011-01-20 inventory: 1 + +movie_inventory_0: + id: 3 + title: Rubyist are the best + overview: The most amazing ruby film you've ever dreamt of. + release_date: 2012-01-20 + inventory: 0 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..8f11aa04c 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,14 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value +rental_1: + customer_id: 1 + movie_id: 1 # -two: {} -# column: value +rental_2: + customer_id: 2 + movie_id: 1 + +rental_3: + customer_id: 1 + movie_id: 2 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..a757baa97 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,47 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? + describe 'validations' do + let(:rental) { rentals(:rental_1) } + + it 'is invalid without customer_id' do + rental.customer_id = nil + + rental.customer.must_be_nil + expect(rental.valid?).wont_equal true + end + + it 'is invalid without movie_id' do + rental.movie_id = nil + + rental.movie.must_be_nil + expect(rental.valid?).wont_equal true + end end + + describe 'relations' do + let(:rental) { rentals(:rental_2) } + + it 'can set a customer and movie' do + leo = Customer.first + titanic = Movie.first + rental = Rental.create(customer: leo, movie: titanic) + + expect( rental.valid? ).must_equal true + expect( rental.customer ).must_equal leo + expect( rental.movie ).must_equal titanic + end + + it "must relate to a movie" do + expect( rental ).must_respond_to :movie + expect( rental.movie ).must_equal movies(:movie_1) + end + + it "must relate to a customer" do + expect( rental ).must_respond_to :customer + expect( rental.customer ).must_equal customers(:customer_2) + end + end + end From b7f6c85df00f9c86771bb34ed21aee3ba884d4ad Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Wed, 7 Nov 2018 11:59:44 -0800 Subject: [PATCH 25/36] creating rentals controller tests --- test/controllers/customers_controller_test.rb | 4 -- test/controllers/movies_controller_test.rb | 25 ++++++++ test/controllers/rentals_controller_test.rb | 64 ++++++++++++++++++- 3 files changed, 88 insertions(+), 5 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5b599e574..467ed383e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -65,10 +65,6 @@ def parse_json(expected_type:, expected_status: :success) expect(body["errors"]).must_include "customer_id" end - end - - - end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 710d20212..7784e995e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -44,6 +44,31 @@ def check_response(expected_type:, expected_status: :success) end end + describe 'show' do + it 'is a real working route and returns JSON for an existing movie' do + movie = Movie.first + + get movie_path(movie.id) + + body = parse_json(expected_type: Hash) + + MOVIE_FIELDS.each do |key| + expect(body[key]).must_equal movie[key] + end + end + + + it 'returns JSON with an error message and status code for a movie that DNE' do + movie_id = Movie.last.id + 1 + + get movie_path(movie_id) + + body = parse_json(expected_type: Hash, expected_status: :not_found) + + expect(body["errors"]).must_include "movie_id" + end + end + describe "create" do let(:movie_data) { { diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 50513de13..c9066a635 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,5 +1,67 @@ require "test_helper" describe RentalsController do - + + RENTAL_FIELDS = %w(checkin_date checkout_date created_at customer_id due_date id movie_id updated_at).sort + + 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 + + describe "index" do + it "is a real working route" do + get rentals_path + + body = check_response(expected_type: Array) + + expect(body.length).must_equal Rental.count + + body.each do |rental| + expect(rental.keys.sort).must_equal RENTAL_FIELDS + end + end + + it "returns an empty array when there are no customers" do + Rental.destroy_all + + get rentals_path + + body = check_response(expected_type: Array) + + expect(body).must_equal [] + end + end + + describe 'checkout' do + # It creates a new instance of Rental + # it doesn't not create new instance if customer = bogus data + # it does not create new instance if movie = bogus data + # it does not create a new instance if movie.available_inventory < 1 && includes error message line:30 + # it can create with valid data + # changes customer.movie.count + # changes movie.available_inventory.count + # it sets checkout date + # it sets due date + # it renders json + # it renders error for all, :not_found if invalid + end + + describe 'checkin' do + # it finds a customer based on params + # it finds a movie based on params + # its sets date + # it finds assigns rental from customer movies + # it assigns checkin date + # it changes checkout date + # it changes movie.available_inventory.count + # it changes customer.movie.count + # it renders json + # it renders errors, :not_found if invalid + end + end From a9eb18d9d85ab8391b6e11595e0022a6d31a0680 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 7 Nov 2018 15:14:26 -0800 Subject: [PATCH 26/36] update rental controller and model helper methods --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 14 +++--- app/controllers/rentals_controller.rb | 45 +++++++------------ app/models/customer.rb | 18 +++++++- app/models/movie.rb | 6 +++ app/models/rental.rb | 23 ++++++++-- ...25754_remove_available_inventory_column.rb | 5 +++ ...181107230115_remove_movies_count_column.rb | 5 +++ db/migrate/20181107230339_drop_join_table.rb | 5 +++ db/schema.rb | 11 +---- 10 files changed, 80 insertions(+), 54 deletions(-) create mode 100644 db/migrate/20181107225754_remove_available_inventory_column.rb create mode 100644 db/migrate/20181107230115_remove_movies_count_column.rb create mode 100644 db/migrate/20181107230339_drop_join_table.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dba21000e..41743c1d6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -20,7 +20,7 @@ def show private def get_json(customer_data) - return customer_data.as_json(except: [:address, :city, :state, :created_at, :updated_at]) + return customer_data.as_json(except: [:address, :city, :state, :created_at, :updated_at], methods: :movies_checked_out_count) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4035f641e..3829916d3 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,15 +3,15 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies_json(movies), status: :ok + render json: get_json(movies), status: :ok end def show movie = Movie.find_by(id: params[:id] ) if movie - render json: movie_json(movie), status: :ok + render json: get_json(movie), status: :ok else - render_error(:not_found, { movie_id: ["no such movie exists"] }) + render_error(:not_found, { movie_id: ["No such movie exists"] }) end end @@ -32,13 +32,9 @@ def movie_params params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end - def movies_json(movie_data) - # How do I test this? - return movie_data.as_json(only: [:id, :title, :release_date] ) - end - def movie_json(movie_data) + def get_json(movie_data) # How do I test this? - return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory] ) + return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory], methods: :available_inventory ) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6c07af490..53359cf0e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,6 @@ class RentalsController < ApplicationController + # JUST FOR DEBUGGING def index rentals = Rental.all @@ -9,53 +10,39 @@ def index def checkout rental = Rental.new(rental_params) - movie = rental.movie - customer = rental.customer - date = Date.today + if rental.is_available? - if movie.available_inventory > 0 + rental.update_check_out_date + rental.update_due_date - movie.available_inventory -= 1 - customer.movies_checked_out_count += 1 - rental.checkout_date = date - rental.due_date = (date + 7) - - if rental.save && movie.save && customer.save + if rental.save render json: { rental_id: rental.id } else render_error(:not_found, rental.errors.messages) end else - render_error(:bad_request ["No rental inventory available for #{movie.title}"]) + render_error(:bad_request, ["No rental inventory available for #{rental.movie.title}"]) end end def checkin customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - rental = nil - date = Date.today - customer.rentals.each do |r| - if r.movie == movie - rental = r - end - end + rental = customer.find_rental(movie) - rental.checkin_date = date - rental.checkout_date = nil - rental.due_date = nil + if rental + rental.update_checkin_date - movie.available_inventory += 1 - customer.movies_checked_out_count -= 1 - - if rental.save && movie.save && customer.save - render json: { rental_id: rental.id } + if rental.save + render json: { rental_id: rental.id } + else + render_error(:not_found, rental.errors.messages) + end else - render_error(:not_found, rental.errors.messages) + render_error(:bad_request, "No rental associated with #{customer.name} and #{movie.title}") end - end @@ -66,7 +53,7 @@ def rental_params end def jsonify(rental_data) - return rental_data.as_json() + return rental_data.as_json(except: [:created_at, :updated_at]) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index ad200c3de..02c90e3f6 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,18 @@ class Customer < ApplicationRecord - validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true - has_many :rentals + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count, presence: true + has_many :rentals + + def find_rental(movie) + + self.rentals.each do |rental| + return rental if rental.movie == movie + end + + end + + def movies_checked_out_count + return self.rentals.all.where.not(checkout_date: nil).count + end + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 0b495eb3a..3c0f56262 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,10 @@ class Movie < ApplicationRecord validates :title, :overview, :release_date, :inventory, presence: true has_many :rentals + + def available_inventory + checked_out = self.rentals.where.not(checkout_date: nil).count + return self.inventory - checked_out + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 66a1d0d46..40a37c644 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,8 +4,25 @@ class Rental < ApplicationRecord validates :customer_id, :movie_id, presence: true - def movie_inventory(movie) - movie = self.movie.find_by(movie_id: movie.id) - return movie.inventory -= 1 + DATE = Date.today + + def is_available? + return self.movie.available_inventory > 0 + end + + def update_check_out_date + return self.checkout_date = DATE end + + def update_due_date + return self.due_date = (DATE + 7) + end + + def update_checkin_date + return self.checkin_date = DATE + end + + + + end diff --git a/db/migrate/20181107225754_remove_available_inventory_column.rb b/db/migrate/20181107225754_remove_available_inventory_column.rb new file mode 100644 index 000000000..5516ace5c --- /dev/null +++ b/db/migrate/20181107225754_remove_available_inventory_column.rb @@ -0,0 +1,5 @@ +class RemoveAvailableInventoryColumn < ActiveRecord::Migration[5.2] + def change + remove_column(:movies, :available_inventory) + end +end diff --git a/db/migrate/20181107230115_remove_movies_count_column.rb b/db/migrate/20181107230115_remove_movies_count_column.rb new file mode 100644 index 000000000..4609a2a32 --- /dev/null +++ b/db/migrate/20181107230115_remove_movies_count_column.rb @@ -0,0 +1,5 @@ +class RemoveMoviesCountColumn < ActiveRecord::Migration[5.2] + def change + remove_column(:customers, :movies_checked_out_count) + end +end diff --git a/db/migrate/20181107230339_drop_join_table.rb b/db/migrate/20181107230339_drop_join_table.rb new file mode 100644 index 000000000..61cf797d1 --- /dev/null +++ b/db/migrate/20181107230339_drop_join_table.rb @@ -0,0 +1,5 @@ +class DropJoinTable < ActiveRecord::Migration[5.2] + def change + drop_table :customers_movies + end +end diff --git a/db/schema.rb b/db/schema.rb index 19219b3e7..a34e10b36 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: 2018_11_07_171739) do +ActiveRecord::Schema.define(version: 2018_11_07_230339) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,14 +25,6 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "movies_checked_out_count", default: 0 - end - - create_table "customers_movies", force: :cascade do |t| - t.bigint "customer_id" - t.bigint "movie_id" - t.index ["customer_id"], name: "index_customers_movies_on_customer_id" - t.index ["movie_id"], name: "index_customers_movies_on_movie_id" end create_table "movies", force: :cascade do |t| @@ -42,7 +34,6 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From 04914cfac7d2c42b18f1e095bf762fb28aa7f563 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Thu, 8 Nov 2018 09:09:20 -0800 Subject: [PATCH 27/36] update controller tests, yml; wrote method helper tests --- app/models/customer.rb | 19 ++++-- app/models/movie.rb | 3 +- test/controllers/customers_controller_test.rb | 1 - test/controllers/movies_controller_test.rb | 9 ++- test/controllers/rentals_controller_test.rb | 4 +- test/fixtures/movies.yml | 9 +-- test/fixtures/rentals.yml | 11 +++- test/models/customer_test.rb | 52 ++++++++++++++- test/models/movie_test.rb | 25 +++++++ test/models/rental_test.rb | 66 +++++++++++++++++++ test/test_helper.rb | 1 + 11 files changed, 176 insertions(+), 24 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 02c90e3f6..5a469e39d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,17 +1,24 @@ class Customer < ApplicationRecord - validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count, presence: true - has_many :rentals + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true + has_many :rentals, dependent: :destroy def find_rental(movie) - - self.rentals.each do |rental| - return rental if rental.movie == movie + if self.rentals + self.rentals.each do |rental| + return rental if rental.movie == movie + else return ArgumentError + end end end def movies_checked_out_count - return self.rentals.all.where.not(checkout_date: nil).count + checked_out = + self.rentals.empty? ? 0 : self.rentals.where.not(checkout_date: nil).count + + checked_in = self.rentals.empty? ? 0 : self.rentals.where.not(checkin_date: nil).count + + return checked_out - checked_in end diff --git a/app/models/movie.rb b/app/models/movie.rb index 3c0f56262..442af55bc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,10 +1,9 @@ class Movie < ApplicationRecord validates :title, :overview, :release_date, :inventory, presence: true - has_many :rentals + has_many :rentals, dependent: :destroy def available_inventory checked_out = self.rentals.where.not(checkout_date: nil).count return self.inventory - checked_out end - end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 467ed383e..5c9bffadf 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -52,7 +52,6 @@ def parse_json(expected_type:, expected_status: :success) expect(body[key]).must_equal customer[key] end - end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a067aa636..27c01589c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,7 +4,7 @@ describe MoviesController do - MOVIE_FIELDS = %w(id title release_date).sort + MOVIE_FIELDS = %w(id title release_date available_inventory inventory overview).sort #helper method used to DRY up code def check_response(expected_type:, expected_status: :success) @@ -56,10 +56,9 @@ def check_response(expected_type:, expected_status: :success) movie.release_date = movie.release_date.to_s movie.save - MOVIE_FIELDS.each do |key| - expect(body[key]).must_equal movie[key] - end - + MOVIE_FIELDS.each do |key| + expect(body[key]).must_equal movie[key] + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 548bb2186..d378f0cb4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,7 +3,7 @@ describe RentalsController do - RENTAL_FIELDS = %w(checkin_date checkout_date created_at customer_id due_date id movie_id updated_at).sort + RENTAL_FIELDS = %w(checkin_date checkout_date customer_id due_date id movie_id).sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status @@ -49,7 +49,7 @@ def check_response(expected_type:, expected_status: :success) expect { post checkout_path, params: rental_data }.must_change('Rental.count', +1) - + #assert # It creates a new instance of Rental # it doesn't not create new instance if customer = bogus data diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index b52af96c3..91eeb771d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -6,20 +6,17 @@ movie_1: overview: This is a movie all about rails. It's railly railly awesome. release_date: 2020-09-02 inventory: 3 - available_inventory: 1 movie_2: id: 2 title: Ruby is The Best overview: The most amazing movie you will ever see. release_date: 2011-01-20 - inventory: 1 - available_inventory: 0 + inventory: 3 -movie_inventory_0: +movie_3: id: 3 title: Rubyist are the best overview: The most amazing ruby film you've ever dreamt of. release_date: 2012-01-20 - inventory: 0 - available_inventory: 0 + inventory: 5 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 8f11aa04c..5c8093b99 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,11 +7,20 @@ rental_1: customer_id: 1 movie_id: 1 -# + checkout_date: 2012-11-12 + checkin_date: 2012-11-16 + due_date: 2012-11-17 + rental_2: customer_id: 2 movie_id: 1 + checkout_date: 2012-11-12 + checkin_date: null + due_date: 2012-11-19 rental_3: customer_id: 1 movie_id: 2 + checkout_date: 2012-12-12 + checkin_date: 2012-12-14 + due_date: 2012-12-19 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 941c0bd0d..f9e70266f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -58,10 +58,60 @@ expect(customer).must_be :valid? end - end # RELATIONS + describe 'relations' do + let(:jackson) { customers(:customer_2) } + let(:rental) { rentals(:rental_2) } + + it 'can set a rental' do + titanic = Movie.first + blockbuster = Rental.create(customer: jackson, movie: titanic) + + expect( blockbuster.valid? ).must_equal true + expect( blockbuster.customer ).must_equal jackson + expect( blockbuster.customer ).must_be_kind_of Customer + + end + # it 'destroys all rentals when customer is destroyed' do + # jackson.destroy + # + # expect{ rental }.must_raise ArgumentError + # end + end + + # HELPER METHODS + describe 'find_rental' do + let(:molly) { customers(:customer_1) } + let(:movie) { movies(:movie_1) } + let(:rental) { rentals(:rental_1) } + + it 'returns a rental if belongs to customer' do + expect( molly.find_rental(movie) ).must_equal rental + end + + # it 'raises ArgumentError if there are no rentals' do + # rental.destroy + # + # expect{ molly.find_rental(movie) }.must_raise ArgumentError + # end + end + + describe 'movies_checked_out_count' do + let(:molly) { customers(:customer_1) } + let(:movie) { movies(:movie_1) } + let(:rental) { rentals(:rental_1) } + + it "returns zero if checkout.count or checkin.count == zero" do + + molly.rentals.destroy_all + + expect( molly.movies_checked_out_count ).must_equal 0 + expect( molly.rentals.count ).must_equal 0 + end + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index d9a26d572..fa9c76dd6 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,7 +44,32 @@ # RELATIONS + describe 'relations' do + let(:titanic) { movies(:movie_2) } + it 'can set a rental' do + jackson = Customer.first + blockbuster = Rental.create(customer: jackson, movie: titanic) + + expect( blockbuster.valid? ).must_equal true + expect( blockbuster.movie ).must_equal titanic + expect( blockbuster.movie ).must_be_kind_of Movie + end + end + + # HELPER METHODS + describe 'available_inventory' do + let(:titanic) { movies(:movie_1) } + + it 'returns number of movies not checked out' do + expect( titanic.available_inventory ).must_equal 1 + end + + # it 'returns ArgumentError if checked_out equals -4' do + # end + # it 'returns self.inventory if checked_out equals 0' do + # end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a757baa97..971ea66ed 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -44,4 +44,70 @@ end end + describe 'is_available?' do + let(:rental) { rentals(:rental_1) } + + it 'returns false if rental.avalable_inventory is equal to zero' do + movie = rental.movie + movie.inventory = 0 + + expect( rental.is_available? ).must_equal false + end + + it 'returns false if rental.available_inventory is less than 0' do + movie = rental.movie + movie.inventory = -1 + + + expect( rental.is_available? ).must_equal false + end + + it 'returns true if rental.available_inventory is greater than 0' do + expect( rental.is_available? ).must_equal true + end + + # it 'returns as not true if rental is invalid/DNE' do + # rental.movie = nil + # rental.customer = nil + # + # result = rental.valid? + # + # expect( result ).wont_equal true + # end + end + + DATE = Date.today + + describe 'update_check_out_date' do + let(:movie) { movies(:movie_3) } + let(:jackson) { customers(:customer_1) } + + it 'returns current date when rental is valid' do + new_rental = Rental.create(customer: jackson, movie: movie) + + expect( new_rental.update_check_out_date ).must_equal DATE + end + end + + describe 'update_due_date' do + let(:movie) { movies(:movie_3) } + let(:jackson) { customers(:customer_1) } + + it 'returns due date when rental is valid' do + new_rental = Rental.create(customer: jackson, movie: movie) + + expect( new_rental.update_due_date ).must_equal (DATE + 7) + end + end + + describe 'update_checkin_date' do + let(:rental) { rentals(:rental_2) } + + it 'returns due date when rental is valid' do + rental.checkin_date = Date.today + + expect( rental.update_checkin_date ).must_equal DATE + end + end + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 18c030afc..01cbd4fc1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -5,6 +5,7 @@ require "minitest/reporters" # for Colorized output # For colorful output! require 'pry' +require 'date' Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, ENV, From d372e666402c72348deaa2c7093206ec04004c81 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Thu, 8 Nov 2018 09:19:11 -0800 Subject: [PATCH 28/36] update movie and customer model methods --- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 4 ++-- app/models/movie.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3829916d3..e02cea3ce 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -35,6 +35,6 @@ def movie_params def get_json(movie_data) # How do I test this? - return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory], methods: :available_inventory ) + return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory], methods: :available_inventory) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 02c90e3f6..6a11e7949 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count, presence: true + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true has_many :rentals def find_rental(movie) @@ -11,7 +11,7 @@ def find_rental(movie) end def movies_checked_out_count - return self.rentals.all.where.not(checkout_date: nil).count + return self.rentals.where(checkin_date: nil).count end diff --git a/app/models/movie.rb b/app/models/movie.rb index 3c0f56262..6b4e48b9b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,7 +3,7 @@ class Movie < ApplicationRecord has_many :rentals def available_inventory - checked_out = self.rentals.where.not(checkout_date: nil).count + checked_out = self.rentals.where(checkin_date: nil).count return self.inventory - checked_out end From 7f439a4923aff5c308ed716b5ffa30f17aa1516b Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Thu, 8 Nov 2018 09:40:01 -0800 Subject: [PATCH 29/36] update customer find_movie method --- app/models/customer.rb | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 6ae1c2492..65359a2a8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,28 +1,15 @@ class Customer < ApplicationRecord validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true - has_many :rentals + has_many :rentals, dependent: :destroy def find_rental(movie) - if self.rentals - self.rentals.each do |rental| - return rental if rental.movie == movie - else return ArgumentError - end + self.rentals.each do |rental| + return rental if rental.movie == movie end - end def movies_checked_out_count -<<<<<<< HEAD return self.rentals.where(checkin_date: nil).count -======= - checked_out = - self.rentals.empty? ? 0 : self.rentals.where.not(checkout_date: nil).count - - checked_in = self.rentals.empty? ? 0 : self.rentals.where.not(checkin_date: nil).count - - return checked_out - checked_in ->>>>>>> 04914cfac7d2c42b18f1e095bf762fb28aa7f563 end From df91b2b0a720d5e913d472d8cdae237c529c39bd Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Fri, 9 Nov 2018 10:54:59 -0800 Subject: [PATCH 30/36] updated movie and customer controllers --- test/controllers/customers_controller_test.rb | 10 +++------- test/controllers/movies_controller_test.rb | 5 ++--- test/models/customer_test.rb | 8 +------- test/models/movie_test.rb | 4 ++-- test/models/rental_test.rb | 9 --------- 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5c9bffadf..42f902083 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -38,20 +38,16 @@ def parse_json(expected_type:, expected_status: :success) end end - describe 'show' do - + let(:customer) { customers(:customer_1) } it 'is a real working route and returns JSON for an existing customer' do - customer = Customer.first get customer_path(customer.id) body = parse_json(expected_type: Hash) - CUSTOMER_FIELDS.each do |key| - expect(body[key]).must_equal customer[key] - end - + expect( body["id"] ).must_equal customer["id"] + expect( body["name"] ).must_equal customer["name"] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 27c01589c..bae6a200a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,9 +56,8 @@ def check_response(expected_type:, expected_status: :success) movie.release_date = movie.release_date.to_s movie.save - MOVIE_FIELDS.each do |key| - expect(body[key]).must_equal movie[key] - end + expect(body["id"]).must_equal movie["id"] + expect(body["title"]).must_equal movie["title"] end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index f9e70266f..0b7fb0cce 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -92,12 +92,6 @@ it 'returns a rental if belongs to customer' do expect( molly.find_rental(movie) ).must_equal rental end - - # it 'raises ArgumentError if there are no rentals' do - # rental.destroy - # - # expect{ molly.find_rental(movie) }.must_raise ArgumentError - # end end describe 'movies_checked_out_count' do @@ -113,5 +107,5 @@ expect( molly.rentals.count ).must_equal 0 end end - + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index fa9c76dd6..8527357c2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -61,8 +61,8 @@ describe 'available_inventory' do let(:titanic) { movies(:movie_1) } - it 'returns number of movies not checked out' do - expect( titanic.available_inventory ).must_equal 1 + it 'returns number of movies checked out' do + expect( titanic.available_inventory ).must_equal 2 end # it 'returns ArgumentError if checked_out equals -4' do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 971ea66ed..0e7aed799 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -65,15 +65,6 @@ it 'returns true if rental.available_inventory is greater than 0' do expect( rental.is_available? ).must_equal true end - - # it 'returns as not true if rental is invalid/DNE' do - # rental.movie = nil - # rental.customer = nil - # - # result = rental.valid? - # - # expect( result ).wont_equal true - # end end DATE = Date.today From f4d5bdbdcd93133365524cc653c3e0eaf75fe364 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Fri, 9 Nov 2018 14:51:32 -0800 Subject: [PATCH 31/36] update checkout controller tests --- app/controllers/rentals_controller.rb | 8 +- app/models/rental.rb | 3 +- test/controllers/rentals_controller_test.rb | 93 ++++++++++++++------- test/models/customer_test.rb | 16 +--- test/models/movie_test.rb | 2 +- test/models/rental_test.rb | 3 + 6 files changed, 75 insertions(+), 50 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index efe082f75..193930989 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -18,11 +18,11 @@ def checkout if rental.save render json: { rental_id: rental.id } else - render_error(:not_found, rental.errors.messages) + render_error(:bad_request, rental.errors.messages) end else - render_error(:bad_request, ["No rental inventory available for #{rental.movie.title}"]) + render_error(:not_found, rental.errors.messages) end end @@ -39,10 +39,10 @@ def checkin if rental.save render json: { rental_id: rental.id } else - render_error(:not_found, rental.errors.messages) + render_error(:bad_request, rental.errors.messages) end else - render_error(:bad_request, "No rental associated with #{customer.name} and #{movie.title}") + render_error(:not_found, rental.errors.messages) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 005bc426b..996579f0f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,8 @@ class Rental < ApplicationRecord DATE = Date.today def is_available? - return self.movie.available_inventory > 0 + + return self.movie.available_inventory > 0 if self.movie end def update_check_out_date diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d378f0cb4..389f8c27a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,9 +3,9 @@ describe RentalsController do - RENTAL_FIELDS = %w(checkin_date checkout_date customer_id due_date id movie_id).sort + RENTAL_FIELDS = %w(id customer_id movie_id checkout_date due_date checkin_date).sort - def check_response(expected_type:, expected_status: :success) + def parse_json(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' @@ -14,11 +14,12 @@ def check_response(expected_type:, expected_status: :success) return body end + # delete this describe "index" do it "is a real working route" do get rentals_path - body = check_response(expected_type: Array) + body = parse_json(expected_type: Array) expect(body.length).must_equal Rental.count @@ -32,50 +33,80 @@ def check_response(expected_type:, expected_status: :success) get rentals_path - body = check_response(expected_type: Array) + body = parse_json(expected_type: Array) expect(body).must_equal [] end end + describe 'checkout' do - it "creates a new rental with valid data" do - rental_data = - { - customer_id: Customer.first.id, + let(:rental_params) { + { customer_id: Customer.first.id, movie_id: Movie.first.id } + } + it "creates a new rental and returns JSON with an id when give valid input" do expect { - post checkout_path, params: rental_data + post checkout_path, params: rental_params }.must_change('Rental.count', +1) - #assert - # It creates a new instance of Rental - # it doesn't not create new instance if customer = bogus data - # it does not create new instance if movie = bogus data - # it does not create a new instance if movie.available_inventory < 1 && includes error message line:30 - # it can create with valid data - # changes customer.movie.count - # changes movie.available_inventory.count - # it sets checkout date - # it sets due date - # it renders json - # it renders error for all, :not_found if invalid + body = parse_json(expected_type: Hash) + + expect(body.keys).must_include "rental_id" + + rental = Rental.last + expect(rental.customer_id).must_equal rental_params[:customer_id] + expect(rental.movie_id).must_equal rental_params[:movie_id] + expect(rental.checkout_date).must_equal Date.today + expect(rental.due_date).must_equal (Date.today + 7) + + end + + it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do + + original_last_rental = Rental.last + rental_params[:customer_id] = 0 + + expect { + post checkout_path, params: rental_params + }.wont_change('Rental.count') + + rental = Rental.last + body = parse_json(expected_type: Hash, expected_status: :bad_request) + expect(rental).must_equal original_last_rental + expect(body.keys).must_include "errors" + + end + + it 'renders not_found and does not save rental if no rental information matches params' do + + original_last_rental = Rental.last + rental_params[:movie_id] = nil + + expect { + post checkout_path, params: rental_params + }.wont_change('Rental.count') + + rental = Rental.last + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(rental).must_equal original_last_rental + expect(body.keys).must_include "errors" + end end describe 'checkin' do - # it finds a customer based on params - # it finds a movie based on params - # its sets date - # it finds assigns rental from customer movies - # it assigns checkin date - # it changes checkout date - # it changes movie.available_inventory.count - # it changes customer.movie.count - # it renders json - # it renders errors, :not_found if invalid + it 'updates the correct rental that matches valid input params' do + + end + + + + + end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index f9e70266f..aa65bb80b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,6 +1,7 @@ require "test_helper" describe Customer do + # VALIDATIONS describe 'validations' do let(:customer) { customers(:customer_1) } @@ -75,15 +76,9 @@ expect( blockbuster.customer ).must_be_kind_of Customer end - - # it 'destroys all rentals when customer is destroyed' do - # jackson.destroy - # - # expect{ rental }.must_raise ArgumentError - # end end - # HELPER METHODS + # CUSTOM METHODS describe 'find_rental' do let(:molly) { customers(:customer_1) } let(:movie) { movies(:movie_1) } @@ -93,11 +88,6 @@ expect( molly.find_rental(movie) ).must_equal rental end - # it 'raises ArgumentError if there are no rentals' do - # rental.destroy - # - # expect{ molly.find_rental(movie) }.must_raise ArgumentError - # end end describe 'movies_checked_out_count' do @@ -113,5 +103,5 @@ expect( molly.rentals.count ).must_equal 0 end end - + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index fa9c76dd6..4feca4019 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -57,7 +57,7 @@ end end - # HELPER METHODS + # CUSTOM METHODS describe 'available_inventory' do let(:titanic) { movies(:movie_1) } diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 971ea66ed..beddeabce 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,6 +2,7 @@ describe Rental do + # VALIDATIONS describe 'validations' do let(:rental) { rentals(:rental_1) } @@ -20,6 +21,7 @@ end end + # RELATIONS describe 'relations' do let(:rental) { rentals(:rental_2) } @@ -44,6 +46,7 @@ end end + # CUSTOM METHODS describe 'is_available?' do let(:rental) { rentals(:rental_1) } From e58a2e6d4b6b9e02f32e89397c98f0a0e88e02d5 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Fri, 9 Nov 2018 15:17:01 -0800 Subject: [PATCH 32/36] update checkin controller tests --- test/controllers/rentals_controller_test.rb | 27 ++++++++++++++++++--- test/fixtures/rentals.yml | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 389f8c27a..a6570ec6b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -98,12 +98,33 @@ def parse_json(expected_type:, expected_status: :success) end describe 'checkin' do - it 'updates the correct rental that matches valid input params' do - - end + let(:rental) { rentals(:rental_1) } + + let(:rental_params) { + { customer_id: Customer.first.id, + movie_id: Movie.first.id + } + } + + it 'updates the correct rental with valid input params' do + checked_out_rental = rental + checked_out_rental.checkin_date.must_be_nil + post checkin_path, params: rental_params + + body = parse_json(expected_type: Hash) + expect(body.keys).must_include "rental_id" + expect(checked_out_rental.checkin_date).must_equal Date.today + + end + + it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do + end + + it 'renders not_found and does not save rental if no rental information matches params' do + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 5c8093b99..4f3f6193d 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -8,7 +8,7 @@ rental_1: customer_id: 1 movie_id: 1 checkout_date: 2012-11-12 - checkin_date: 2012-11-16 + checkin_date: nil due_date: 2012-11-17 rental_2: From a52809ebbe8d1a63cd33274c1c2884662cea438d Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Fri, 9 Nov 2018 15:20:23 -0800 Subject: [PATCH 33/36] update rentals controller tests --- test/controllers/rentals_controller_test.rb | 62 ++++++++++----------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a6570ec6b..3fc814f16 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -97,37 +97,37 @@ def parse_json(expected_type:, expected_status: :success) end end - describe 'checkin' do - let(:rental) { rentals(:rental_1) } - - let(:rental_params) { - { customer_id: Customer.first.id, - movie_id: Movie.first.id - } - } - - it 'updates the correct rental with valid input params' do - checked_out_rental = rental - - checked_out_rental.checkin_date.must_be_nil - - post checkin_path, params: rental_params - - body = parse_json(expected_type: Hash) - - expect(body.keys).must_include "rental_id" - expect(checked_out_rental.checkin_date).must_equal Date.today - - end - - it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do - end - - it 'renders not_found and does not save rental if no rental information matches params' do - end - - - end + # describe 'checkin' do + # let(:rental) { rentals(:rental_1) } + # + # let(:rental_params) { + # { customer_id: Customer.first.id, + # movie_id: Movie.first.id + # } + # } + # + # it 'updates the correct rental with valid input params' do + # checked_out_rental = rental + # + # checked_out_rental.checkin_date.must_be_nil + # + # post checkin_path, params: rental_params + # + # body = parse_json(expected_type: Hash) + # + # expect(body.keys).must_include "rental_id" + # expect(checked_out_rental.checkin_date).must_equal Date.today + # + # end + # + # it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do + # end + # + # it 'renders not_found and does not save rental if no rental information matches params' do + # end + # + # + # end end From 09e4086816eeed064479ed94207b7d79bdce8fd3 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Sun, 11 Nov 2018 10:37:54 -0800 Subject: [PATCH 34/36] update fixture and tests --- app/controllers/rentals_controller.rb | 9 ++--- app/models/rental.rb | 1 - test/controllers/rentals_controller_test.rb | 42 +++++++++++++++++++++ test/fixtures/rentals.yml | 8 ++-- 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 193930989..441d0ef6d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -22,7 +22,7 @@ def checkout end else - render_error(:not_found, rental.errors.messages) + render_error(:not_found, { rental_id: ["Cannot checkout movie: no inventory available"] }) end end @@ -31,9 +31,8 @@ def checkin customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - rental = customer.find_rental(movie) - - if rental + if customer && movie + rental = customer.find_rental(movie) rental.update_checkin_date if rental.save @@ -42,7 +41,7 @@ def checkin render_error(:bad_request, rental.errors.messages) end else - render_error(:not_found, rental.errors.messages) + render_error(:not_found, ["No matching rental found for this customer and movie"]) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 996579f0f..64d513be1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,6 @@ class Rental < ApplicationRecord DATE = Date.today def is_available? - return self.movie.available_inventory > 0 if self.movie end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a6570ec6b..7d5501122 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -111,10 +111,24 @@ def parse_json(expected_type:, expected_status: :success) checked_out_rental.checkin_date.must_be_nil + let(:rental) { rentals(:rental_3) } + + let(:rental_params) { + { customer_id: rental.customer.id, + movie_id: rental.movie.id + } + } + + it 'checks-in the correct rental with valid input params and updates the checkin date to today' do + + rental.checkin_date.must_be_nil +>>>>>>> Stashed changes + post checkin_path, params: rental_params body = parse_json(expected_type: Hash) +<<<<<<< Updated upstream expect(body.keys).must_include "rental_id" expect(checked_out_rental.checkin_date).must_equal Date.today @@ -124,6 +138,34 @@ def parse_json(expected_type:, expected_status: :success) end it 'renders not_found and does not save rental if no rental information matches params' do +======= + checked_in_rental = rentals(:rental_3) + expect(body.keys).must_include "rental_id" + expect(body["checkin_date"]).must_equal Date.today + end + + it "renders not found status code and returns JSON with error messages if no rental matches were found" do + + expect(rental.checkin_date).must_be_nil + rental_params[:movie_id] = 0 + + post checkin_path, params: rental_params + + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(rental.checkin_date).must_equal nil + expect(body.keys).must_include "errors" + + end + + it 'renders not_found and does not save rental if no rental information matches params' do + expect(rental.checkin_date).must_be_nil + + rental_params[:customer_id] = nil + post checkin_path, params: rental_params + + body = parse_json(expected_type: Hash, expected_status: :bad_request) + expect(body.keys).must_include "errors" +>>>>>>> Stashed changes end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 4f3f6193d..243dddc5f 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -9,7 +9,7 @@ rental_1: movie_id: 1 checkout_date: 2012-11-12 checkin_date: nil - due_date: 2012-11-17 + due_date: 2012-11-19 rental_2: customer_id: 2 @@ -21,6 +21,6 @@ rental_2: rental_3: customer_id: 1 movie_id: 2 - checkout_date: 2012-12-12 - checkin_date: 2012-12-14 - due_date: 2012-12-19 + checkout_date: 2012-12-13 + checkin_date: nil + due_date: 2012-12-20 From a90b48933c6819cf9fd09aa1b171fa71c2859f53 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Mon, 12 Nov 2018 19:21:12 -0800 Subject: [PATCH 35/36] updated customer --- test/models/customer_test.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 4fdcff721..07bbdcc71 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -94,13 +94,21 @@ let(:movie) { movies(:movie_1) } let(:rental) { rentals(:rental_1) } - it "returns zero if checkout.count or checkin.count == zero" do + it "accurately returns checkout.count for valid customer" do - molly.rentals.destroy_all + # molly.rentals.destroy_all - expect( molly.movies_checked_out_count ).must_equal 0 - expect( molly.rentals.count ).must_equal 0 + expect( molly.movies_checked_out_count ).must_equal 3 + expect( molly.rentals.count ).must_equal 3 end + # + # it "returns " do + # + # molly.rentals.destroy_all + # + # expect( molly.movies_checked_out_count ).must_equal 0 + # expect( molly.rentals.count ).must_equal 0 + # end end end From d5a656cd54dbf7ad0995268224e582908cf1a31f Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Mon, 12 Nov 2018 20:46:37 -0800 Subject: [PATCH 36/36] update controller and model tests with more cases --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 - app/controllers/rentals_controller.rb | 19 +---- app/models/customer.rb | 1 + test/controllers/customers_controller_test.rb | 9 +- test/controllers/movies_controller_test.rb | 61 ++++++++++++-- test/controllers/rentals_controller_test.rb | 82 ++++++------------- test/models/customer_test.rb | 2 + test/models/movie_test.rb | 2 + test/models/rental_test.rb | 18 +++- 10 files changed, 112 insertions(+), 86 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 41743c1d6..78d28875a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -10,7 +10,7 @@ def show customer = Customer.find_by(id: params[:id]) if customer - render json: get_json(customer) + render json: get_json(customer), status: :ok else render_error(:not_found, {customer_id: ["Customer does not exist"] } ) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e02cea3ce..41b740d97 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -28,13 +28,11 @@ def create private def movie_params - # How do I test this? params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end def get_json(movie_data) - # How do I test this? return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory], methods: :available_inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index bd3cc7988..58935fe8a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,12 +1,5 @@ class RentalsController < ApplicationController - # JUST FOR DEBUGGING - def index - rentals = Rental.all - - render json: jsonify(rentals) - end - def checkout rental = Rental.new(rental_params) @@ -22,7 +15,7 @@ def checkout end else - render_error(:not_found, { rental_id: ["Cannot checkout movie: no movie available for checkout "] }) + render_error(:not_found, { rental_id: ["Cannot checkout movie: no available inventory for checkout"] }) end end @@ -31,9 +24,9 @@ def checkin customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - rental = customer.find_rental(movie) + if customer && movie - if rental + rental = customer.find_rental(movie) rental.update_checkin_date if rental.save @@ -43,7 +36,7 @@ def checkin end else - render_error(:not_found, ["No matching rental found for this customer and movie"]) + render_error(:not_found, { rental_id: ["No matching rental found for this customer and movie"] }) end end @@ -53,8 +46,4 @@ def checkin def rental_params params.permit(:customer_id, :movie_id) end - - def jsonify(rental_data) - return rental_data.as_json(except: [:created_at, :updated_at]) - end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 7e5b1ce27..f4c327ea4 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true + has_many :rentals, dependent: :destroy def find_rental(movie) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 42f902083..66f2e827c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -39,7 +39,8 @@ def parse_json(expected_type:, expected_status: :success) end describe 'show' do - let(:customer) { customers(:customer_1) } + let(:customer) { customers(:customer_1) } # has 3 movies checked out in yml + it 'is a real working route and returns JSON for an existing customer' do get customer_path(customer.id) @@ -48,6 +49,11 @@ def parse_json(expected_type:, expected_status: :success) expect( body["id"] ).must_equal customer["id"] expect( body["name"] ).must_equal customer["name"] + expect( body["registered_at"]).must_equal customer["registered_at"] + expect( body["postal_code"] ).must_equal customer["postal_code"] + expect( body["phone"] ).must_equal customer["phone"] + + expect( body["movies_checked_out_count"] ).must_equal 3 end @@ -59,6 +65,7 @@ def parse_json(expected_type:, expected_status: :success) body = parse_json(expected_type: Hash, expected_status: :not_found) expect(body["errors"]).must_include "customer_id" + expect(body.values.first["customer_id"]).must_equal ["Customer does not exist"] end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index bae6a200a..8d5b0a623 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -47,7 +47,7 @@ def check_response(expected_type:, expected_status: :success) describe 'show' do it 'is a real working route and returns JSON for an existing movie' do - movie = Movie.first + movie = Movie.first # 0 available inventory, per yml get movie_path(movie.id) @@ -56,8 +56,12 @@ def check_response(expected_type:, expected_status: :success) movie.release_date = movie.release_date.to_s movie.save - expect(body["id"]).must_equal movie["id"] - expect(body["title"]).must_equal movie["title"] + expect(body["id"]).must_equal movie["id"] + expect(body["title"]).must_equal movie["title"] + expect(body["release_date"].to_s).must_equal movie["release_date"].to_s + expect(body["overview"]).must_equal movie["overview"] + + expect( body["available_inventory"] ).must_equal 0 end @@ -69,6 +73,7 @@ def check_response(expected_type:, expected_status: :success) body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"]).must_include "movie_id" + expect(body.values.first["movie_id"]).must_equal ["No such movie exists"] end end @@ -99,13 +104,12 @@ def check_response(expected_type:, expected_status: :success) must_respond_with :success end - it "returns an error for invalid movie data" do - # arrange + it "returns an error for invalid movie title" do movie_data["title"] = nil expect { post movies_path, params: movie_data - }.wont_change "Movie.count" + }.wont_change("Movie.count") body = JSON.parse(response.body) @@ -114,6 +118,51 @@ def check_response(expected_type:, expected_status: :success) expect(body["errors"]).must_include "title" must_respond_with :bad_request end + + it "returns an error for invalid movie overview" do + movie_data["overview"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change("Movie.count") + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "overview" + must_respond_with :bad_request + end + + it "returns an error for invalid movie release_date" do + movie_data["release_date"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change("Movie.count") + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "release_date" + must_respond_with :bad_request + end + + it "returns an error for invalid movie inventory" do + movie_data["inventory"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change("Movie.count") + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "inventory" + must_respond_with :bad_request + end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f58d524fa..0f71c7e10 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,36 +14,13 @@ def parse_json(expected_type:, expected_status: :success) return body end - # delete this - describe "index" do - it "is a real working route" do - get rentals_path - - body = parse_json(expected_type: Array) - - expect(body.length).must_equal Rental.count - - body.each do |rental| - expect(rental.keys.sort).must_equal RENTAL_FIELDS - end - end - - it "returns an empty array when there are no customers" do - Rental.destroy_all - - get rentals_path - - body = parse_json(expected_type: Array) - - expect(body).must_equal [] - end - end - - describe 'checkout' do + let(:mimi) { customers(:customer_4) } + let(:jaws) { movies(:movie_2) } + let(:rental_params) { - { customer_id: Customer.first.id, - movie_id: Movie.first.id + { customer_id: mimi.id, + movie_id: jaws.id } } it "creates a new rental and returns JSON with an id when give valid input" do @@ -66,18 +43,7 @@ def parse_json(expected_type:, expected_status: :success) it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do - original_last_rental = Rental.last - rental_params[:customer_id] = 0 - - expect { - post checkout_path, params: rental_params - }.wont_change('Rental.count') - - rental = Rental.last - body = parse_json(expected_type: Hash, expected_status: :bad_request) - expect(rental).must_equal original_last_rental - expect(body.keys).must_include "errors" - + # QUESTION: not sure how to setup the controller test and make saving the rental fail. Checkout date and due date is not a required validation until trying to save upon checkout. The rental.save method would fail if checkout_date and due_date somehow returns nil or false upon checkout, and therefore return the error messages...but this is difficult to test in the controller tests using the post checkout_path bc valid params would always save the rental. end it 'renders not_found and does not save rental if no rental information matches params' do @@ -93,6 +59,7 @@ def parse_json(expected_type:, expected_status: :success) body = parse_json(expected_type: Hash, expected_status: :not_found) expect(rental).must_equal original_last_rental expect(body.keys).must_include "errors" + expect(body.values.first["rental_id"]).must_equal ["Cannot checkout movie: no available inventory for checkout"] end end @@ -102,35 +69,33 @@ def parse_json(expected_type:, expected_status: :success) let(:rental) { rentals(:rental_3) } let(:rental_params) { - { customer_id: rental.customer.id, - movie_id: rental.movie.id + { customer_id: rental.customer.id, # id: 1 + movie_id: rental.movie.id # id: 2 } } it 'checks-in the correct rental with valid input params and updates the checkin date to today' do - rental.checkin_date.must_be_nil + to_check_in_rental = Rental.find_by(customer_id: 1, movie_id: 2) + + to_check_in_rental.checkin_date.must_be_nil post checkin_path, params: rental_params body = parse_json(expected_type: Hash) + checked_in_rental = Rental.find_by(customer_id: 1, movie_id: 2) + expect(body.keys).must_include "rental_id" - expect(checked_out_rental.checkin_date).must_equal Date.today + expect(checked_in_rental.checkin_date).must_equal Date.today end it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do + # same question as above end - it 'renders not_found and does not save rental if no rental information matches params' do - - checked_in_rental = rentals(:rental_3) - expect(body.keys).must_include "rental_id" - expect(body["checkin_date"]).must_equal Date.today - end - - it "renders not found status code and returns JSON with error messages if no rental matches were found" do + it "renders not found status code and returns JSON with error message if no movie matches movie params" do expect(rental.checkin_date).must_be_nil rental_params[:movie_id] = 0 @@ -138,22 +103,25 @@ def parse_json(expected_type:, expected_status: :success) post checkin_path, params: rental_params body = parse_json(expected_type: Hash, expected_status: :not_found) - expect(rental.checkin_date).must_equal nil + expect(rental.checkin_date).must_be_nil expect(body.keys).must_include "errors" + expect(body.values.first["rental_id"]).must_equal ["No matching rental found for this customer and movie"] end - it 'renders not_found and does not save rental if no rental information matches params' do + it 'renders not found status code and returns JSON with error message if no customer matches customer params' do expect(rental.checkin_date).must_be_nil rental_params[:customer_id] = nil - post checkin_path, params: rental_params - body = parse_json(expected_type: Hash, expected_status: :bad_request) + post checkin_path, params: rental_params + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(rental.checkin_date).must_be_nil + expect(body.keys).must_include "errors" + expect(body.values.first["rental_id"]).must_equal ["No matching rental found for this customer and movie"] end - end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index bf325751e..979d807b4 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -77,6 +77,8 @@ rental.must_be_kind_of Rental end + expect( jackson.rentals.count ).must_equal 3 + # the newly created rentals + 1 rental in yml file end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index b074810ad..9c0898b64 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -54,6 +54,8 @@ titanic.rentals.each do |rental| rental.must_be_kind_of Rental end + expect( titanic.rentals.count ).must_equal 5 + # the 2 new rentals + 3 rentals in the yml file end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1c6b45a64..eabbfe00f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -20,7 +20,10 @@ expect(rental.valid?).wont_equal true end - it 'is valid with customer and movie ids present' do + it 'is valid with only customer and movie ids present' do + rental.checkout_date = nil + rental.due_date = nil + expect(rental).must_be :valid? end end @@ -29,6 +32,7 @@ describe 'relations' do let(:movie) { movies(:movie_2) } let(:customer) { customers(:customer_3) } + let(:rental) { rentals(:rental_2)} it 'can set a customer and movie' do @@ -94,7 +98,9 @@ it "updates checkout date to today's date" do new_rental = Rental.create(customer: jackson, movie: movie) - expect( new_rental.update_check_out_date ).must_equal DATE + new_rental.update_check_out_date + + expect( new_rental.checkout_date ).must_equal DATE end end @@ -105,7 +111,9 @@ it "updates the due date to 7 days from today's date" do new_rental = Rental.create(customer: jackson, movie: movie) - expect( new_rental.update_due_date ).must_equal (DATE + 7) + new_rental.update_due_date + + expect( new_rental.due_date ).must_equal (DATE + 7) end end @@ -116,7 +124,9 @@ it "updates checkin date to today's date" do rental = Rental.create(customer: jackson, movie: movie) - expect( rental.update_checkin_date ).must_equal DATE + rental.update_checkin_date + + expect( rental.checkin_date ).must_equal DATE end end