From 4e6c4e9b2544ce1ed116fabf605909005cdd8888 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 12:17:25 -0700 Subject: [PATCH 01/34] initial commit --- .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/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..fb9240709 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.3.7 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..827dc27af --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.3.7' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..c22d742fe --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.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.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + 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.3) + 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.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.3.7p456 + +BUNDLED WITH + 2.0.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..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..b73d802ed --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Z2KmhhXYYeU7ZbLoCWt8WYUYbF5sAfiZDoHpNPd59s8VIMksaa+/Yzeh/hSpG3L6kgx1xD0xrdaHwGAJanGTCVJEI4/NXDxJghSX8ZOUIsvMZYK4IqRhjH9igqIM7J5WRlsY4t9Gs21dD4RklS3COvpNqSGojHGaS3duYyTAf6s/k0Iu1EaCKRojWS1BG/H759XUTQfGJ5tjUYJawawUSaFmjgujQN4aIEfU8M2nbo0To7DvWRHl2rcslzPZ9UBnb3ry3pAH5pitimBtr6hFP2na9ELLi/4cxuCAej1uDAg8tNYLFuUKwDIUlUJi2IObW3B73TSrnhiFKxFIkJHxG7HVET7yUnhV7kgiyI4hWelkbQbN1/GQ9dYYMe5iXra8OVQUiZOL3F4yilUR0HBfA5BRjx3WYziIL3Eh--aOnfkI+Vnu/XhqHA--oSChyqr3a4sghvIeCS8xNQ== \ 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..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 1cbf9713681a3d571b3854ec3a3d4492d8754af1 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 12:25:31 -0700 Subject: [PATCH 02/34] generate customers, movies, rentals model --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ config/routes.rb | 3 +- db/migrate/20190514192120_create_movies.rb | 13 +++++++ db/migrate/20190514192232_create_customers.rb | 15 ++++++++ db/migrate/20190514192439_create_rentals.rb | 9 +++++ db/schema.rb | 35 +++++++++++++++++++ test/fixtures/customers.yml | 19 ++++++++++ test/fixtures/movies.yml | 15 ++++++++ test/fixtures/rentals.yml | 7 ++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ test/models/rental_test.rb | 9 +++++ 14 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514192120_create_movies.rb create mode 100644 db/migrate/20190514192232_create_customers.rb create mode 100644 db/migrate/20190514192439_create_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/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/config/routes.rb b/config/routes.rb index 787824f88..4fcf1a5e4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/zomg", to: "movies#zomg" + end diff --git a/db/migrate/20190514192120_create_movies.rb b/db/migrate/20190514192120_create_movies.rb new file mode 100644 index 000000000..701b5b545 --- /dev/null +++ b/db/migrate/20190514192120_create_movies.rb @@ -0,0 +1,13 @@ +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.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514192232_create_customers.rb b/db/migrate/20190514192232_create_customers.rb new file mode 100644 index 000000000..470d85e99 --- /dev/null +++ b/db/migrate/20190514192232_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.integer :movies_checked_out_count + + t.timestamps + end + end +end diff --git a/db/migrate/20190514192439_create_rentals.rb b/db/migrate/20190514192439_create_rentals.rb new file mode 100644 index 000000000..949422ac0 --- /dev/null +++ b/db/migrate/20190514192439_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.datetime :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..25fb40804 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,35 @@ + +ActiveRecord::Schema.define(version: 2019_05_14_192439) 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.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.integer "movies_checked_out_count" + 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.integer "available_inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.datetime "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..73d1b3bd8 --- /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 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + movies_checked_out_count: 1 + +two: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + movies_checked_out_count: 1 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..796262d1b --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + available_inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + available_inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..f06989908 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + due_date: 2019-05-14 12:24:39 + +two: + due_date: 2019-05-14 12:24:39 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/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 a369822f3833adee0547eb01c9b8606b77781c0d Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 12:39:56 -0700 Subject: [PATCH 03/34] seed db --- Gemfile | 2 +- Gemfile.lock | 3 --- .../20190514192709_add_registered_at_column.rb | 5 +++++ db/schema.rb | 14 +++++++++++++- 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20190514192709_add_registered_at_column.rb diff --git a/Gemfile b/Gemfile index 827dc27af..687a6f632 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.3.7' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.3' diff --git a/Gemfile.lock b/Gemfile.lock index c22d742fe..707c96070 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,8 +162,5 @@ DEPENDENCIES spring-watcher-listen (~> 2.0.0) tzinfo-data -RUBY VERSION - ruby 2.3.7p456 - BUNDLED WITH 2.0.1 diff --git a/db/migrate/20190514192709_add_registered_at_column.rb b/db/migrate/20190514192709_add_registered_at_column.rb new file mode 100644 index 000000000..e10ec08f3 --- /dev/null +++ b/db/migrate/20190514192709_add_registered_at_column.rb @@ -0,0 +1,5 @@ +class AddRegisteredAtColumn < ActiveRecord::Migration[5.2] + def change + add_column :customers, :registered_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 25fb40804..585e73b31 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,5 +1,16 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_192439) do +ActiveRecord::Schema.define(version: 2019_05_14_192709) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -14,6 +25,7 @@ t.integer "movies_checked_out_count" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "registered_at" end create_table "movies", force: :cascade do |t| From 72b4a0de904efa3db0c39741902e437b4388aae2 Mon Sep 17 00:00:00 2001 From: amyesh Date: Tue, 14 May 2019 14:40:01 -0700 Subject: [PATCH 04/34] added controllers and validations --- app/controllers/customers_controller.rb | 10 ++++++++ app/controllers/movies_controller.rb | 15 ++++++++++++ app/controllers/rentals_controller.rb | 10 ++++++++ app/models/customer.rb | 5 ++++ app/models/movie.rb | 4 ++++ app/models/rental.rb | 4 ++++ config/routes.rb | 11 ++++++++- test/controllers/customers_controller_test.rb | 19 +++++++++++++++ test/controllers/movies_controller_test.rb | 24 +++++++++++++++++++ test/controllers/rentals_controller_test.rb | 19 +++++++++++++++ test/models/customer_test.rb | 21 +++++++++++++--- test/test_helper.rb | 4 ++-- 12 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..4c82928ac --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,10 @@ +class CustomersController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..4a4e26f35 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,15 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end + + def zomg + cool = "It works!" + render json: cool + end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..86716f2af --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,10 @@ +class RentalsController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..c7ac7ff76 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,7 @@ class Customer < ApplicationRecord + has_many :rentals + + validates :name, presence: true + validates :registered_at, presence: true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..d3ac7241c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + + validates :title, presence: true + validates :inventory, numericality: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..74e919fe4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,6 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer + + validates :due_date, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 4fcf1a5e4..f7a200c07 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,13 @@ Rails.application.routes.draw do + get 'rentals/index' + get 'rentals/show' + get 'rentals/create' + get 'customers/index' + get 'customers/show' + get 'customers/create' + get 'movies/index' + get 'movies/show' + get 'movies/create' + get 'movies/zomg' get "/zomg", to: "movies#zomg" - end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..fbf09c9a7 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + + it "should get show" do + get customers_show_url + value(response).must_be :success? + end + + it "should get create" do + get customers_create_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..63c1edb93 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,24 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + + it "should get zomg" do + get movies_zomg_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..a536c9deb --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe RentalsController do + it "should get index" do + get rentals_index_url + value(response).must_be :success? + end + + it "should get show" do + get rentals_show_url + value(response).must_be :success? + end + + it "should get create" do + get rentals_create_url + value(response).must_be :success? + end + +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..867a79c7f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,24 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + before do + @customer = Customer.new( + name: "test_name", + phone: "132-456-7890", + registered_at: DateTime.now, + ) + @invalid_customer = Customer.new( + name: "", + phone: "132-456-7890", + registered_at: DateTime.now, + ) + end - it "must be valid" do - value(customer).must_be :valid? + it "must be valid given good data" do + expect(@customer).must_be :valid? + end + it "will throw an error if given invalid data" do + result = @invalid_customer.valid? + expect(result).must_equal false end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..3f7dc7d3e 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, @@ -9,7 +10,6 @@ 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" From da5ac64b0921bd850e7fbccf701d3dd345c8b836 Mon Sep 17 00:00:00 2001 From: amyesh Date: Tue, 14 May 2019 15:00:52 -0700 Subject: [PATCH 05/34] added validation tests for all models --- app/models/rental.rb | 4 ++-- test/fixtures/customers.yml | 2 ++ test/models/customer_test.rb | 18 ++++++++++-------- test/models/movie_test.rb | 16 +++++++++++++--- test/models/rental_test.rb | 14 +++++++++++--- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 74e919fe4..ec46971b7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,6 @@ class Rental < ApplicationRecord - belongs_to :movie - belongs_to :customer + # belongs_to :movie + # belongs_to :customer validates :due_date, presence: true end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 73d1b3bd8..d1a22fd25 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -7,6 +7,7 @@ one: state: MyString postal_code: MyString phone: MyString + registered_at: DateTime.new(2019,2,3,4,5,6) movies_checked_out_count: 1 two: @@ -16,4 +17,5 @@ two: state: MyString postal_code: MyString phone: MyString + registered_at: DateTime.now movies_checked_out_count: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 867a79c7f..a1e961a17 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,24 +1,26 @@ require "test_helper" describe Customer do + let (:customer) { customers(:one) } before do @customer = Customer.new( name: "test_name", phone: "132-456-7890", registered_at: DateTime.now, ) - @invalid_customer = Customer.new( - name: "", - phone: "132-456-7890", - registered_at: DateTime.now, - ) end it "must be valid given good data" do expect(@customer).must_be :valid? end - it "will throw an error if given invalid data" do - result = @invalid_customer.valid? - expect(result).must_equal false + + it "requires name, phone, registered_at" do + required_fields = [:name, :phone, :registered_at] + + required_fields.each do |field| + customer[field] = nil + expect(customer.valid?).must_equal false + customer.reload + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..8d9a40edb 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,19 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let (:movie) { movies(:one) } - it "must be valid" do - value(movie).must_be :valid? + it "must be valid given good data" do + expect(movie.valid?).must_equal true + end + + it "requires title, inventory" do + required_fields = [:title, :inventory] + + required_fields.each do |field| + movie[field] = nil + expect(movie.valid?).must_equal false + movie.reload + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..ef96ce8c3 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,17 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let (:rental) { rentals(:one) } - it "must be valid" do - value(rental).must_be :valid? + it "must be valid given good data" do + expect(rental.valid?).must_equal true + end + + it "requires due_date" do + required_fields = [:due_date] + + rental.due_date = nil + expect(rental.valid?).must_equal false + rental.reload end end From 0e7087f6cd35a1fb815b1f5761c9cb7907ab6ab0 Mon Sep 17 00:00:00 2001 From: amyesh Date: Tue, 14 May 2019 15:12:16 -0700 Subject: [PATCH 06/34] added foreign keys to rental --- app/models/rental.rb | 4 ++-- db/migrate/20190514220251_add_foreign_key_to_rental.rb | 6 ++++++ db/schema.rb | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190514220251_add_foreign_key_to_rental.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index ec46971b7..74e919fe4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,6 @@ class Rental < ApplicationRecord - # belongs_to :movie - # belongs_to :customer + belongs_to :movie + belongs_to :customer validates :due_date, presence: true end diff --git a/db/migrate/20190514220251_add_foreign_key_to_rental.rb b/db/migrate/20190514220251_add_foreign_key_to_rental.rb new file mode 100644 index 000000000..3a1c0c00b --- /dev/null +++ b/db/migrate/20190514220251_add_foreign_key_to_rental.rb @@ -0,0 +1,6 @@ +class AddForeignKeyToRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customers, foreign_key: true + add_reference :rentals, :movies, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 585e73b31..21715465c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_192709) do +ActiveRecord::Schema.define(version: 2019_05_14_220251) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,12 @@ t.datetime "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "customers_id" + t.bigint "movies_id" + t.index ["customers_id"], name: "index_rentals_on_customers_id" + t.index ["movies_id"], name: "index_rentals_on_movies_id" end + add_foreign_key "rentals", "customers", column: "customers_id" + add_foreign_key "rentals", "movies", column: "movies_id" end From 6327dcdb568cac43baecec827bfa07f20158e497 Mon Sep 17 00:00:00 2001 From: amyesh Date: Tue, 14 May 2019 15:40:59 -0700 Subject: [PATCH 07/34] added foreign keys again --- .../20190514223134_change_foreign_key_name.rb | 6 ++++++ .../20190514223837_add_foreign_keys_again.rb | 6 ++++++ db/schema.rb | 14 ++++++------- test/fixtures/customers.yml | 4 ++-- test/models/movie_test.rb | 20 +++++++++++++++++++ 5 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20190514223134_change_foreign_key_name.rb create mode 100644 db/migrate/20190514223837_add_foreign_keys_again.rb diff --git a/db/migrate/20190514223134_change_foreign_key_name.rb b/db/migrate/20190514223134_change_foreign_key_name.rb new file mode 100644 index 000000000..fc6a429b8 --- /dev/null +++ b/db/migrate/20190514223134_change_foreign_key_name.rb @@ -0,0 +1,6 @@ +class ChangeForeignKeyName < ActiveRecord::Migration[5.2] + def change + remove_reference :rentals, :customers, foreign_key: true + remove_reference :rentals, :movies, foreign_key: true + end +end diff --git a/db/migrate/20190514223837_add_foreign_keys_again.rb b/db/migrate/20190514223837_add_foreign_keys_again.rb new file mode 100644 index 000000000..27d04e99a --- /dev/null +++ b/db/migrate/20190514223837_add_foreign_keys_again.rb @@ -0,0 +1,6 @@ +class AddForeignKeysAgain < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 21715465c..f276b5a8f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_220251) do +ActiveRecord::Schema.define(version: 2019_05_14_223837) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,12 +42,12 @@ t.datetime "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.bigint "customers_id" - t.bigint "movies_id" - t.index ["customers_id"], name: "index_rentals_on_customers_id" - t.index ["movies_id"], name: "index_rentals_on_movies_id" + 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", column: "customers_id" - add_foreign_key "rentals", "movies", column: "movies_id" + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index d1a22fd25..92eb0bc27 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -7,7 +7,7 @@ one: state: MyString postal_code: MyString phone: MyString - registered_at: DateTime.new(2019,2,3,4,5,6) + registered_at: 2019-05-14 12:24:39 movies_checked_out_count: 1 two: @@ -17,5 +17,5 @@ two: state: MyString postal_code: MyString phone: MyString - registered_at: DateTime.now + registered_at: 2019-05-14 12:24:39 movies_checked_out_count: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8d9a40edb..0e044699c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,6 +2,14 @@ describe Movie do let (:movie) { movies(:one) } + let (:customer) { customers(:one) } + let (:rental) { + Rental.new( + customers_id: customer.id, + movies_id: movie.id, + due_date: DateTime.now, + ) + } it "must be valid given good data" do expect(movie.valid?).must_equal true @@ -16,4 +24,16 @@ movie.reload end end + + it "can have a rental" do + movie = Movie.first + customer = Customer.first + rental = Rental.create!( + customer_id: customer.id, + movie_id: movie.id, + due_date: DateTime.now, + ) + expect(rental.valid?).must_equal true + expect(movie.rentals.first.id).must_equal rental.id + end end From 9f3d9bb2e8566e0ee891483e5fa1d753fa1b2420 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 15:55:47 -0700 Subject: [PATCH 08/34] fix relationship tests --- test/fixtures/rentals.yml | 5 ++++- test/models/customer_test.rb | 22 ++++++++++++++-------- test/models/movie_test.rb | 3 ++- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f06989908..1dfc0e5c6 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,7 +1,10 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: due_date: 2019-05-14 12:24:39 + customer: one + movie: one two: due_date: 2019-05-14 12:24:39 + customer: two + movie: one \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a1e961a17..04d6a34a2 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,16 +2,10 @@ describe Customer do let (:customer) { customers(:one) } - before do - @customer = Customer.new( - name: "test_name", - phone: "132-456-7890", - registered_at: DateTime.now, - ) - end + let (:movie) { movies(:one) } it "must be valid given good data" do - expect(@customer).must_be :valid? + expect(customer).must_be :valid? end it "requires name, phone, registered_at" do @@ -23,4 +17,16 @@ customer.reload end end + + it "can have a rental" do + rental_count = customer.rentals.count + rental = Rental.create!( + customer_id: customer.id, + movie_id: movie.id, + due_date: DateTime.now, + ) + expect(rental.customer).must_be_kind_of Customer + expect(rental.customer.id).must_equal customer.id + expect(customer.rentals.count).must_equal (rental_count + 1) + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0e044699c..44be1b2e3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -33,7 +33,8 @@ movie_id: movie.id, due_date: DateTime.now, ) - expect(rental.valid?).must_equal true + expect(rental.movie).must_be_kind_of Movie + expect(rental.movie.id).must_equal movie.id expect(movie.rentals.first.id).must_equal rental.id end end From 8d697babcc0b0cd9288d743df8ac6e042a4b7a33 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 16:02:27 -0700 Subject: [PATCH 09/34] finish wave 1 --- test/models/customer_test.rb | 1 + test/models/rental_test.rb | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 04d6a34a2..789d69b62 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -25,6 +25,7 @@ movie_id: movie.id, due_date: DateTime.now, ) + expect(rental.customer).must_be_kind_of Customer expect(rental.customer.id).must_equal customer.id expect(customer.rentals.count).must_equal (rental_count + 1) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index ef96ce8c3..174795dd7 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -14,4 +14,14 @@ expect(rental.valid?).must_equal false rental.reload end + + it "cannot be created with an invalid customer" do + params = { + due_date: DateTime.now, + movie_id: movies(:one).id, + customer_id: -1, + } + + expect { Rental.new(params) }.wont_change "Rental.count" + end end From 0855cfbb230b8b16d35d151ee04a3f4533888adb Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 16:07:39 -0700 Subject: [PATCH 10/34] add movies and customer routes --- app/controllers/movies_controller.rb | 1 + config/routes.rb | 13 ++----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4a4e26f35..425668c59 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,6 @@ class MoviesController < ApplicationController def index + end def show diff --git a/config/routes.rb b/config/routes.rb index f7a200c07..685b3d2e7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,13 +1,4 @@ Rails.application.routes.draw do - get 'rentals/index' - get 'rentals/show' - get 'rentals/create' - get 'customers/index' - get 'customers/show' - get 'customers/create' - get 'movies/index' - get 'movies/show' - get 'movies/create' - get 'movies/zomg' - get "/zomg", to: "movies#zomg" + resources :movies, only: [:index, :show, :create] + resources :customers, only: [:index, :show, :create] end From 3e3aab07ac10beeaab569f8ca03ec0c104883c7b Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 18:05:31 -0700 Subject: [PATCH 11/34] movies CRUD tests --- .rvmc | 1 + app/controllers/movies_controller.rb | 25 ++++++-- test/controllers/movies_controller_test.rb | 69 ++++++++++++++++------ 3 files changed, 74 insertions(+), 21 deletions(-) create mode 100644 .rvmc diff --git a/.rvmc b/.rvmc new file mode 100644 index 000000000..b42575b8d --- /dev/null +++ b/.rvmc @@ -0,0 +1 @@ +rvm_silence_path_mismatch_check_flag=1 \ No newline at end of file diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 425668c59..9fdb4457b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,16 +1,33 @@ class MoviesController < ApplicationController def index - + movies = Movie.all + render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) end def show + movie = Movie.find_by(id: params[:id]) + + if movie + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + else + render status: :bad_request, json: { error: "Unable to find movie" } + end end def create + movie = Movie.new(movie_params) + + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { errors: [movie.errors.messages] }, + status: :bad_request + end end - def zomg - cool = "It works!" - render json: cool + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 63c1edb93..57df228bf 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,24 +1,59 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? + describe "Index" do + it "can show all movies" do + get movies_path + must_respond_with :ok + end + + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns movies with exactly the required fields" do + keys = %w(inventory overview release_date title ) + get movies_path + + body = JSON.parse(response.body) + + body.each do |movie| + movie.keys.sort.must_equal keys + end + end end - - it "should get show" do - get movies_show_url - value(response).must_be :success? + + describe "Show" do + it "can get a movie" do + get movie_path(movies(:two)) + must_respond_with :ok + end + + it "throws an error if a movie can't be found" do + get movie_path(-1) + + must_respond_with :bad_request + end end - - it "should get create" do - get movies_create_url - value(response).must_be :success? + + describe "Create" do + it "can create a new movie" do + movie_data = { + movie: { + title: "Rush Hour 2", + overview: "best movie ever", + release_date: Date.new(2001, 11, 2), + inventory: 5, + } + } + + expect { + post movies_path, params: movie_data + }.must_change "Movie.count", + 1 + + must_respond_with :success + end end - - it "should get zomg" do - get movies_zomg_url - value(response).must_be :success? - end - + end From 80a8be0a999616b8a6a9c31a4d2b97a11217ed22 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 21:54:31 -0700 Subject: [PATCH 12/34] complete Movies controller tests --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 30 ++++++++++++++++----- 3 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c3ac046f6c51a2cd4bc2df32c603e493458c382e GIT binary patch literal 6148 zcmeH~F^{dt=u>Bl;zddfqZjB=JE!l7EiIwCR znHYd=e=Zwf1hAw#vGy=AV?N-4FWm9?zTD5J+wJN_+D8XGrH`2G=e8gPq<|EV0#ZN< z%t(Pe#+RQndL})J6p#Y*P{6+rh3>4$))}7;h8O|Jf#oo+W0oL`7s#4yovhF-rw7Yc zi!sFO(N31Ut|nV&Z-?dZVR>isDTZdf9afmotOgXMfE1W0u;}^d=l`Dm-~2ymQ7Q$b zz?&&x!|t%#@}=@@{quTWKW5d}jZVhp3{O7+O#CQb(Zjf3d_mS^>tuzdAAyiTK?=N7 FfnTX=61e~X literal 0 HcmV?d00001 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9fdb4457b..6195a76c8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,7 +20,7 @@ def create if movie.save render json: { id: movie.id }, status: :ok else - render json: { errors: [movie.errors.messages] }, + render json: { errors: movie.errors.messages }, status: :bad_request end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 57df228bf..72364d2c2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -13,7 +13,7 @@ end it "returns movies with exactly the required fields" do - keys = %w(inventory overview release_date title ) + keys = %w( inventory overview release_date title ) get movies_path body = JSON.parse(response.body) @@ -25,8 +25,10 @@ end describe "Show" do + it "can get a movie" do get movie_path(movies(:two)) + must_respond_with :ok end @@ -34,13 +36,16 @@ get movie_path(-1) must_respond_with :bad_request + + body = JSON.parse(response.body) + + expect(body["error"]).must_equal "Unable to find movie" end end describe "Create" do - it "can create a new movie" do - movie_data = { - movie: { + let(:movie_data) { + { title: "Rush Hour 2", overview: "best movie ever", release_date: Date.new(2001, 11, 2), @@ -48,12 +53,25 @@ } } + it "can create a new movie using good data" do expect { - post movies_path, params: movie_data + post movies_path, params: { movie: movie_data } }.must_change "Movie.count", + 1 must_respond_with :success end - end + it "does not create a new movie, and throws an error if given bad data" do + movie_data["title"] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end From b308f67022c226954de002674420716bd95fce73 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 22:02:48 -0700 Subject: [PATCH 13/34] add a lil' more to Movies index test --- test/controllers/movies_controller_test.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 72364d2c2..16a88e031 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -12,6 +12,20 @@ expect(response.header["Content-Type"]).must_include "json" end + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + it "returns movies with exactly the required fields" do keys = %w( inventory overview release_date title ) get movies_path From f558664bc08ca71a885251a4be29250814a3f4be Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 22:04:05 -0700 Subject: [PATCH 14/34] add whitespace --- test/controllers/movies_controller_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 16a88e031..7e6834c07 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,13 +2,16 @@ describe MoviesController do describe "Index" do + it "can show all movies" do get movies_path + must_respond_with :ok end it "returns json" do get movies_path + expect(response.header["Content-Type"]).must_include "json" end @@ -16,6 +19,7 @@ get movies_path body = JSON.parse(response.body) + body.must_be_kind_of Array end @@ -23,11 +27,13 @@ get movies_path body = JSON.parse(response.body) + body.length.must_equal Movie.count end it "returns movies with exactly the required fields" do keys = %w( inventory overview release_date title ) + get movies_path body = JSON.parse(response.body) From be716b999fa3fc8369f4bf601cade76c2c9e34d9 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 22:12:56 -0700 Subject: [PATCH 15/34] update movie index return fields to match project requirements --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6195a76c8..f619f42b5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) + render status: :ok, json: movies.as_json(only: [:id, :title, :release_date]) end def show From 66fad3ecdf9e7dfd50081bdda8cbc4511cc53476 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 22:17:33 -0700 Subject: [PATCH 16/34] update test to reflect returned fields requirement --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f619f42b5..62b156076 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def create movie = Movie.new(movie_params) if movie.save - render json: { id: movie.id }, status: :ok + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) else render json: { errors: movie.errors.messages }, status: :bad_request diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 7e6834c07..832789110 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,7 +32,7 @@ end it "returns movies with exactly the required fields" do - keys = %w( inventory overview release_date title ) + keys = %w( id release_date title ) get movies_path From a776f56f95b29fa08cfeb3ca24afa490ef965ecb Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Tue, 14 May 2019 22:27:07 -0700 Subject: [PATCH 17/34] renders Movie ID when a new movie is created --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 62b156076..f619f42b5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def create movie = Movie.new(movie_params) if movie.save - render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + render json: { id: movie.id }, status: :ok else render json: { errors: movie.errors.messages }, status: :bad_request From 19608e6babe279f9c14c5dc168d74e2df4094eac Mon Sep 17 00:00:00 2001 From: amyesh Date: Wed, 15 May 2019 09:53:17 -0700 Subject: [PATCH 18/34] finished tests and methods to customer controller --- app/controllers/customers_controller.rb | 27 +++++ test/controllers/customers_controller_test.rb | 101 ++++++++++++++++-- 2 files changed, 118 insertions(+), 10 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4c82928ac..2d6c2b802 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,37 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), + status: :ok end def show + customer = Customer.find_by(id: params[:id]) + + if !customer.nil? + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), + status: :ok + else + render json: {ok: false, errors: {customer: ["customer not found"]}}, + status: :not_found + end end def create + customer = Customer.new(customer_params) + + if customer.save + render json: customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count, :id]), + status: :ok + else + render json: {ok: false, errors: customer.errors.messages}, + status: :bad_request + end + end + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index fbf09c9a7..865676ddf 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,19 +1,100 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? - end + describe "index" do + it "can get customers" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end - it "should get show" do - get customers_show_url - value(response).must_be :success? + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id name postal_code phone movies_checked_out_count registered_at) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.must_equal keys + end + end end - it "should get create" do - get customers_create_url - value(response).must_be :success? + describe "show" do + it "can get a customer with valid info" do + get customer_path(customers(:two).id) + must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" + end + it "raises an error and return not found if given invalid params" do + get customer_path(100) + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer" + end end + describe "create" do + let(:customer_data) { + { + name: "Chris Tucker", + address: "555 Scammer Drive", + city: "Seattle", + state: "WA", + postal_code: "11111", + phone: "123-867-5309", + movies_checked_out_count: 2, + registered_at: DateTime.now, + } + } + + it "creates a new customer given valid data" do + expect { + post customers_path, params: {customer: customer_data} + }.must_change "Customer.count", 1 + + body = JSON.parse(response.body) + expect(response.header["Content-Type"]).must_include "json" + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + customer = Customer.find(body["id"].to_i) + + expect(customer.name).must_equal customer_data[:name] + must_respond_with :success + end + + it "returns an error for invalid customer data" do + customer_data["name"] = nil + + expect { + post customers_path, params: {customer: customer_data} + }.wont_change "Customer.count" + + body = JSON.parse(response.body) + expect(response.header["Content-Type"]).must_include "json" + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "name" + must_respond_with :bad_request + end + end end From 8bf2d98e0509ef1eea334ac11c8d2e7d693230be Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Wed, 15 May 2019 10:08:48 -0700 Subject: [PATCH 19/34] test that a BAD REQUEST is still returned as JSON --- test/controllers/movies_controller_test.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 832789110..b2c91dceb 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -40,6 +40,7 @@ body.each do |movie| movie.keys.sort.must_equal keys + movie.keys.length.must_equal keys.length end end end @@ -52,11 +53,13 @@ must_respond_with :ok end - it "throws an error if a movie can't be found" do + it "returns a BAD REQUEST and is returned as JSON if a movie can't be found" do get movie_path(-1) must_respond_with :bad_request + expect(response.header["Content-Type"]).must_include "json" + body = JSON.parse(response.body) expect(body["error"]).must_equal "Unable to find movie" @@ -78,10 +81,17 @@ post movies_path, params: { movie: movie_data } }.must_change "Movie.count", + 1 + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] must_respond_with :success end - it "does not create a new movie, and throws an error if given bad data" do + it "does not create a new movie, and returns BAD REQUEST if given bad data" do movie_data["title"] = nil expect { @@ -90,6 +100,8 @@ 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 From 208d9b19d9e5773b057745dbbf3120bb72ddd637 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Wed, 15 May 2019 10:31:08 -0700 Subject: [PATCH 20/34] putzin' around in show tests --- test/controllers/movies_controller_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b2c91dceb..735d08654 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -57,7 +57,6 @@ get movie_path(-1) must_respond_with :bad_request - expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) From a910a607c30e31dacac8252b0265bee14d114952 Mon Sep 17 00:00:00 2001 From: amyesh Date: Wed, 15 May 2019 11:37:46 -0700 Subject: [PATCH 21/34] removed show and create methods from customers controller --- app/controllers/customers_controller.rb | 30 --------- test/controllers/customers_controller_test.rb | 62 ------------------- 2 files changed, 92 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 2d6c2b802..9168cc00f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,34 +4,4 @@ def index render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end - - def show - customer = Customer.find_by(id: params[:id]) - - if !customer.nil? - render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), - status: :ok - else - render json: {ok: false, errors: {customer: ["customer not found"]}}, - status: :not_found - end - end - - def create - customer = Customer.new(customer_params) - - if customer.save - render json: customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count, :id]), - status: :ok - else - render json: {ok: false, errors: customer.errors.messages}, - status: :bad_request - end - end - - private - - def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) - end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 865676ddf..b37ba551c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -35,66 +35,4 @@ end end end - - describe "show" do - it "can get a customer with valid info" do - get customer_path(customers(:two).id) - must_respond_with :success - expect(response.header["Content-Type"]).must_include "json" - end - it "raises an error and return not found if given invalid params" do - get customer_path(100) - must_respond_with :not_found - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "customer" - end - end - - describe "create" do - let(:customer_data) { - { - name: "Chris Tucker", - address: "555 Scammer Drive", - city: "Seattle", - state: "WA", - postal_code: "11111", - phone: "123-867-5309", - movies_checked_out_count: 2, - registered_at: DateTime.now, - } - } - - it "creates a new customer given valid data" do - expect { - post customers_path, params: {customer: customer_data} - }.must_change "Customer.count", 1 - - body = JSON.parse(response.body) - expect(response.header["Content-Type"]).must_include "json" - expect(body).must_be_kind_of Hash - expect(body).must_include "id" - - customer = Customer.find(body["id"].to_i) - - expect(customer.name).must_equal customer_data[:name] - must_respond_with :success - end - - it "returns an error for invalid customer data" do - customer_data["name"] = nil - - expect { - post customers_path, params: {customer: customer_data} - }.wont_change "Customer.count" - - body = JSON.parse(response.body) - expect(response.header["Content-Type"]).must_include "json" - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "name" - must_respond_with :bad_request - end - end end From 9a6992becaf5ddcdfa89299d5f7cac325e9a5311 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Wed, 15 May 2019 13:46:46 -0700 Subject: [PATCH 22/34] add rental relationship test --- app/models/rental.rb | 1 + test/controllers/movies_controller_test.rb | 3 ++ test/models/rental_test.rb | 46 ++++++++++++++-------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 74e919fe4..f16ddd4d1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,5 +2,6 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + validates_associated :customer, :movie validates :due_date, presence: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 735d08654..3630fa5d5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -89,6 +89,9 @@ expect(movie.title).must_equal movie_data[:title] must_respond_with :success end + + it "returns the movie's ID after it's created" do + end it "does not create a new movie, and returns BAD REQUEST if given bad data" do movie_data["title"] = nil diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 174795dd7..46ec429fd 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,26 +2,38 @@ describe Rental do let (:rental) { rentals(:one) } + + describe "Validations" do + it "must be valid given good data" do + expect(rental.valid?).must_equal true + end - it "must be valid given good data" do - expect(rental.valid?).must_equal true - end - - it "requires due_date" do - required_fields = [:due_date] + it "requires due_date" do + required_fields = [:due_date] - rental.due_date = nil - expect(rental.valid?).must_equal false - rental.reload + rental.due_date = nil + expect(rental.valid?).must_equal false + rental.reload + end + + it "cannot be created with an invalid customer" do + params = { + due_date: DateTime.now, + movie_id: movies(:one).id, + customer_id: -1, + } + + expect { Rental.new(params) }.wont_change "Rental.count" + end end - it "cannot be created with an invalid customer" do - params = { - due_date: DateTime.now, - movie_id: movies(:one).id, - customer_id: -1, - } - - expect { Rental.new(params) }.wont_change "Rental.count" + describe "Relationships" do + it "is associated with a customer and a movie" do + expect(rental.customer).wont_be_nil + expect(rental.customer).must_be_kind_of Customer + + expect(rental.movie).wont_be_nil + expect(rental.movie).must_be_kind_of Movie + end end end From 502da999f1654f2f07805c94e3151030a41bfc94 Mon Sep 17 00:00:00 2001 From: amyesh Date: Wed, 15 May 2019 14:16:53 -0700 Subject: [PATCH 23/34] added custom method and controller method and tests to set available inventory --- app/controllers/movies_controller.rb | 16 ++-- app/models/movie.rb | 4 + db/seeds.rb | 8 +- test/controllers/movies_controller_test.rb | 100 +++++++++++++-------- 4 files changed, 80 insertions(+), 48 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f619f42b5..83dc3774b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,28 +6,30 @@ def index def show movie = Movie.find_by(id: params[:id]) - + if movie render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) else - render status: :bad_request, json: { error: "Unable to find movie" } + render status: :bad_request, json: {error: "Unable to find movie"} end end def create movie = Movie.new(movie_params) - + if movie.available_inventory.nil? + movie.set_available_inventory + end if movie.save - render json: { id: movie.id }, status: :ok + render json: {id: movie.id}, status: :ok else - render json: { errors: movie.errors.messages }, + render json: {errors: movie.errors.messages}, status: :bad_request end end private - + def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index d3ac7241c..deb57fff7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,8 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, numericality: true + + def set_available_inventory + self.available_inventory = self.inventory + end end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..b4a5389f1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,9 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| + new_movie = Movie.create!(movie) + new_movie.available_inventory = new_movie.inventory + new_movie.save end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 735d08654..9da19ff08 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,103 +2,127 @@ describe MoviesController do describe "Index" do - it "can show all movies" do get movies_path - + must_respond_with :ok end - + it "returns json" do get movies_path - + expect(response.header["Content-Type"]).must_include "json" end - + it "returns an Array" do get movies_path body = JSON.parse(response.body) - + body.must_be_kind_of Array end - + it "returns all of the movies" do get movies_path body = JSON.parse(response.body) - + body.length.must_equal Movie.count end - + it "returns movies with exactly the required fields" do keys = %w( id release_date title ) - + get movies_path - + body = JSON.parse(response.body) - + body.each do |movie| movie.keys.sort.must_equal keys movie.keys.length.must_equal keys.length end end end - + describe "Show" do - it "can get a movie" do get movie_path(movies(:two)) - + must_respond_with :ok end - + it "returns a BAD REQUEST and is returned as JSON if a movie can't be found" do get movie_path(-1) - + must_respond_with :bad_request expect(response.header["Content-Type"]).must_include "json" - + body = JSON.parse(response.body) - + expect(body["error"]).must_equal "Unable to find movie" end end - + describe "Create" do let(:movie_data) { - { - title: "Rush Hour 2", - overview: "best movie ever", - release_date: Date.new(2001, 11, 2), - inventory: 5, - } + { + title: "Rush Hour 2", + overview: "best movie ever", + release_date: Date.new(2001, 11, 2), + inventory: 5, + } + } + + let(:avail_movie_data) { + { + title: "Rush Hour 2", + overview: "best movie ever", + release_date: Date.new(2001, 11, 2), + inventory: 5, + available_inventory: 3, } - + } it "can create a new movie using good data" do expect { - post movies_path, params: { movie: movie_data } - }.must_change "Movie.count", + 1 - + post movies_path, params: {movie: movie_data} + }.must_change "Movie.count", +1 + body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include "id" - + movie = Movie.find(body["id"].to_i) - - expect(movie.title).must_equal movie_data[:title] + + expect(movie.title).must_equal movie_data[:title] + expect(movie.available_inventory).must_equal movie.inventory must_respond_with :success end - + + it "can set specific available inventory" do + expect { + post movies_path, params: {movie: avail_movie_data} + }.must_change "Movie.count", +1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + expect(movie.available_inventory).must_equal avail_movie_data[:available_inventory] + must_respond_with :success + end + it "does not create a new movie, and returns BAD REQUEST if given bad data" do movie_data["title"] = nil - + expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: {movie: 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" From 7c454eac4ae41501632adf857b487e83888b59f6 Mon Sep 17 00:00:00 2001 From: amyesh Date: Wed, 15 May 2019 14:26:21 -0700 Subject: [PATCH 24/34] added tests to set available inventory --- test/fixtures/movies.yml | 2 -- test/models/movie_test.rb | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 796262d1b..e8afe187d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,11 +5,9 @@ one: overview: MyString release_date: 2019-05-14 inventory: 1 - available_inventory: 1 two: title: MyString overview: MyString release_date: 2019-05-14 inventory: 1 - available_inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 44be1b2e3..f65415e07 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -37,4 +37,12 @@ expect(rental.movie.id).must_equal movie.id expect(movie.rentals.first.id).must_equal rental.id end + + describe "set available inventory" do + it "sets available inventory to current inventory" do + movie.set_available_inventory + expect(movie.available_inventory).must_equal movie.inventory + expect(movie.available_inventory).must_be_kind_of Integer + end + end end From efcea08ea2b400484d37920d8675b0b3fc434d3b Mon Sep 17 00:00:00 2001 From: amyesh Date: Wed, 15 May 2019 15:58:55 -0700 Subject: [PATCH 25/34] added tests for rental checkin --- config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 47 +++++++++++++++------ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 685b3d2e7..394303959 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do resources :movies, only: [:index, :show, :create] - resources :customers, only: [:index, :show, :create] + resources :customers, only: [:index] + + post "/rentals/checkin", to: "rentals#checkin", as: "checkin" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a536c9deb..447187e42 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,19 +1,42 @@ require "test_helper" describe RentalsController do - it "should get index" do - get rentals_index_url - value(response).must_be :success? - end + describe "Checkin" do + let(:movie) { movies(:one) } + let(:customer) { customers(:one) } + let(:rental_data) { + { + movie_id: movie.id, + customer_id: customer.id, + } + } + it "should pass given valid data" do + post checkin_path, params: {rental: rental_data} - it "should get show" do - get rentals_show_url - value(response).must_be :success? - end + value(response).must_be :success? + expect(response.header["Content-Type"]).must_include "json" - it "should get create" do - get rentals_create_url - value(response).must_be :success? - end + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.customer_id).must_equal rental_data[:customer.id] + expect(rental.movie_id).must_equal rental_data[:movie.id] + end + it "throws an error and returns BAD REQUEST if given invalid data" do + rental_data["customer_id"] = -1 + + post checkin_path, params: {rental: rental_data} + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer_id" + must_respond_with :bad_request + end + end end From eb5a538d6a6796024796f2ca985856fdc89dafd7 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Wed, 15 May 2019 16:26:18 -0700 Subject: [PATCH 26/34] add rentals controller tests --- app/controllers/rentals_controller.rb | 23 ++++++-- app/models/rental.rb | 4 ++ config/routes.rb | 2 + test/controllers/rentals_controller_test.rb | 63 ++++++++++++++++----- test/models/rental_test.rb | 9 +++ 5 files changed, 81 insertions(+), 20 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 86716f2af..e5ae80cb9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,10 +1,21 @@ class RentalsController < ApplicationController - def index + + def checkout + rental = Rental.new(rentals_params) + rental.due_date + + if rental.save + render json: { id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id, due_date: rental.due_date }, status: :ok + else + render json: { errors: rental.errors.messages }, + status: :bad_request + end end - def show - end - - def create - end + + + private + def rentals_params + params.require(:rental).permit(:movie_id, :customer_id, :due_date) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index f16ddd4d1..8a5b8967f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,4 +4,8 @@ class Rental < ApplicationRecord validates_associated :customer, :movie validates :due_date, presence: true + + def due_date + DateTime.now + 7.days + end end diff --git a/config/routes.rb b/config/routes.rb index 685b3d2e7..4999f5268 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do resources :movies, only: [:index, :show, :create] resources :customers, only: [:index, :show, :create] + + post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a536c9deb..90f16d0b2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,19 +1,54 @@ require "test_helper" describe RentalsController do - it "should get index" do - get rentals_index_url - value(response).must_be :success? + + describe "Checkout" do + + let(:movie) {movies(:two)} + let(:customer) {customers(:two)} + let(:rental_data) { + { + movie_id: movie.id, + customer_id: customer.id, + } + } + + it "creates a Rental and sets a due date" do + expect { + post checkout_path, params: { rental: rental_data } + }.must_change "Rental.count", 1 + + must_respond_with :success + end + + it "creates a due date" do + post checkout_path, params: { rental: rental_data } + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.due_date).wont_be_nil + expect(rental.due_date).must_be_kind_of DateTime + + expect(rental.movie.id).must_equal rental_data[:movie_id] + end + + it "renders as JSON" do + post checkout_path, params: { rental: rental_data } + + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns a customer ID and movie ID" do + post checkout_path, params: { rental: rental_data } + + body = JSON.parse(response.body) + + expect(body).must_include "customer_id" + expect(body).must_include "movie_id" + end end - - it "should get show" do - get rentals_show_url - value(response).must_be :success? - end - - it "should get create" do - get rentals_create_url - value(response).must_be :success? - end - end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 46ec429fd..b4ce66ec1 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -36,4 +36,13 @@ expect(rental.movie).must_be_kind_of Movie end end + + describe "Due Date" do + it "sets a due date when a rental is created" do + params = { + movie_id: movies(:one).id, + customer_id: -1, + } + end + end end From f413c21a8c5f948565d06503a9c8a465c6d459f3 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Wed, 15 May 2019 17:24:19 -0700 Subject: [PATCH 27/34] complete checkout tests --- test/controllers/movies_controller_test.rb | 2 -- test/controllers/rentals_controller_test.rb | 21 +++++++++++++++++++++ test/models/rental_test.rb | 9 +++++---- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3630fa5d5..26ba624ce 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -90,8 +90,6 @@ must_respond_with :success end - it "returns the movie's ID after it's created" do - end it "does not create a new movie, and returns BAD REQUEST if given bad data" do movie_data["title"] = nil diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 90f16d0b2..a82fd83f2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -50,5 +50,26 @@ expect(body).must_include "customer_id" expect(body).must_include "movie_id" end + + it "displays errors if a rental can't be created" do + bad_data = { + rental: { + movie_id: -5, + customer_id: customer.id, + } + } + + expect { + post checkout_path, params: bad_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "movie" + + must_respond_with :bad_request + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index b4ce66ec1..c419024ce 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -39,10 +39,11 @@ describe "Due Date" do it "sets a due date when a rental is created" do - params = { - movie_id: movies(:one).id, - customer_id: -1, - } + skip + # params = { + # movie_id: movies(:one).id, + # customer_id: -1, + # } end end end From f89028361e8af2a5503435425b9a7cc49b638687 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Wed, 15 May 2019 17:36:50 -0700 Subject: [PATCH 28/34] Due date test in rental model --- app/models/rental.rb | 2 +- test/fixtures/rentals.yml | 5 +++++ test/models/rental_test.rb | 27 +++++++++++++-------------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 8a5b8967f..522281deb 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -6,6 +6,6 @@ class Rental < ApplicationRecord validates :due_date, presence: true def due_date - DateTime.now + 7.days + self.created_at + 7.days end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 1dfc0e5c6..f837210d2 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,4 +7,9 @@ one: two: due_date: 2019-05-14 12:24:39 customer: two + movie: one + +three: + created_at: 2019-05-14 12:24:39 + customer: two movie: one \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c419024ce..3575ada58 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -7,14 +7,6 @@ it "must be valid given good data" do expect(rental.valid?).must_equal true end - - it "requires due_date" do - required_fields = [:due_date] - - rental.due_date = nil - expect(rental.valid?).must_equal false - rental.reload - end it "cannot be created with an invalid customer" do params = { @@ -35,15 +27,22 @@ expect(rental.movie).wont_be_nil expect(rental.movie).must_be_kind_of Movie end + + it "throws an error if a movie is invalid" do + params = { + movie_id: 9999999999999999999999999999, + customer_id: 1, + } + end end describe "Due Date" do - it "sets a due date when a rental is created" do - skip - # params = { - # movie_id: movies(:one).id, - # customer_id: -1, - # } + it "is 7 days from the rental create date" do + rental = rentals(:three) + rental_date = rental.created_at + + expect(rental.due_date).must_equal rental_date + 7.days + expect(rental.due_date).must_be_kind_of ActiveSupport::TimeWithZone end end end From 7d88f98f138dd37491f0655a7b9c6bfa888ccf34 Mon Sep 17 00:00:00 2001 From: amyesh Date: Wed, 15 May 2019 22:05:59 -0700 Subject: [PATCH 29/34] wrote rental checkin method --- app/controllers/rentals_controller.rb | 15 ++++++++------- test/controllers/rentals_controller_test.rb | 21 +++++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 86716f2af..d741c8dd4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,10 +1,11 @@ class RentalsController < ApplicationController - def index - end - - def show - end - - def create + def checkin + rental = Rental.find_by(customer_id: rentals_params[:customer_id], movie_id: rentals_params[:movie_id]) + if rental + render json: {id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id}, status: :ok + else + render json: {errors: {rental: ["Rental not found for customer #{rental_params[:customer_id]}, and movie #{rental_params[:movie_id]}"]}}, + status: :not_found + end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 447187e42..56646ff20 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -21,22 +21,23 @@ expect(body).must_include "id" rental = Rental.find(body["id"].to_i) - - expect(rental.customer_id).must_equal rental_data[:customer.id] - expect(rental.movie_id).must_equal rental_data[:movie.id] + expect(rental.customer_id).must_equal rental_data[:customer_id] + expect(rental.movie_id).must_equal rental_data[:movie_id] end it "throws an error and returns BAD REQUEST if given invalid data" do - rental_data["customer_id"] = -1 - - post checkin_path, params: {rental: rental_data} - + bad_data = { + rental: { + movie_id: movie.id, + customer_id: -1, + }, + } + post checkin_path, params: {rental: bad_data} body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash expect(body).must_include "errors" - expect(body["errors"]).must_include "customer_id" - must_respond_with :bad_request + expect(body["errors"]).must_include "rental" + must_respond_with :not_found end end end From 2b7a69f953b7c89648256a283ee3b0bc2a31c049 Mon Sep 17 00:00:00 2001 From: amyesh Date: Thu, 16 May 2019 09:36:13 -0700 Subject: [PATCH 30/34] added end --- test/controllers/rentals_controller_test.rb | 139 ++++++++++---------- 1 file changed, 69 insertions(+), 70 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0b7756cd4..175c38545 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe RentalsController do - describe "Checkin" do let(:movie) { movies(:one) } let(:customer) { customers(:one) } @@ -39,76 +38,76 @@ expect(body).must_include "errors" expect(body["errors"]).must_include "rental" must_respond_with :not_found - - - describe "Checkout" do - - let(:movie) {movies(:two)} - let(:customer) {customers(:two)} - let(:rental_data) { - { - movie_id: movie.id, - customer_id: customer.id, - } - } - - it "creates a Rental and sets a due date" do - expect { - post checkout_path, params: { rental: rental_data } - }.must_change "Rental.count", 1 - - must_respond_with :success - end - - it "creates a due date" do - post checkout_path, params: { rental: rental_data } - - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "id" - - rental = Rental.find(body["id"].to_i) - - expect(rental.due_date).wont_be_nil - expect(rental.due_date).must_be_kind_of DateTime - - expect(rental.movie.id).must_equal rental_data[:movie_id] - end - - it "renders as JSON" do - post checkout_path, params: { rental: rental_data } - - expect(response.header["Content-Type"]).must_include "json" - end - - it "returns a customer ID and movie ID" do - post checkout_path, params: { rental: rental_data } - - body = JSON.parse(response.body) - - expect(body).must_include "customer_id" - expect(body).must_include "movie_id" - end - - it "displays errors if a rental can't be created" do - bad_data = { - rental: { - movie_id: -5, - customer_id: customer.id, + + describe "Checkout" do + let(:movie) { movies(:two) } + let(:customer) { customers(:two) } + let(:rental_data) { + { + movie_id: movie.id, + customer_id: customer.id, + } } - } - - expect { - post checkout_path, params: bad_data - }.wont_change "Rental.count" - - body = JSON.parse(response.body) - - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "movie" - - must_respond_with :bad_request + + it "creates a Rental and sets a due date" do + expect { + post checkout_path, params: {rental: rental_data} + }.must_change "Rental.count", 1 + + must_respond_with :success + end + + it "creates a due date" do + post checkout_path, params: {rental: rental_data} + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.due_date).wont_be_nil + expect(rental.due_date).must_be_kind_of DateTime + + expect(rental.movie.id).must_equal rental_data[:movie_id] + end + + it "renders as JSON" do + post checkout_path, params: {rental: rental_data} + + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns a customer ID and movie ID" do + post checkout_path, params: {rental: rental_data} + + body = JSON.parse(response.body) + + expect(body).must_include "customer_id" + expect(body).must_include "movie_id" + end + + it "displays errors if a rental can't be created" do + bad_data = { + rental: { + movie_id: -5, + customer_id: customer.id, + }, + } + + expect { + post checkout_path, params: bad_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "movie" + + must_respond_with :bad_request + end + end end end end From 1a98370c89a34a8afc0c40e7fe199d8ffa12d653 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Thu, 16 May 2019 09:46:13 -0700 Subject: [PATCH 31/34] remove due date validation on rental model --- app/controllers/rentals_controller.rb | 2 +- app/models/rental.rb | 5 ++--- test/fixtures/rentals.yml | 2 +- test/models/customer_test.rb | 3 +-- test/models/movie_test.rb | 1 - test/models/rental_test.rb | 4 ++-- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 323104b6c..36e3206a7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -12,7 +12,7 @@ def checkin def checkout rental = Rental.new(rental_params) - rental.due_date + rental.set_due_date if rental.save render json: { id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id, due_date: rental.due_date }, status: :ok diff --git a/app/models/rental.rb b/app/models/rental.rb index 522281deb..4ab6a8108 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,9 +3,8 @@ class Rental < ApplicationRecord belongs_to :customer validates_associated :customer, :movie - validates :due_date, presence: true - def due_date - self.created_at + 7.days + def set_due_date + self.created_at + 7.days end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f837210d2..3c13ad600 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -10,6 +10,6 @@ two: movie: one three: - created_at: 2019-05-14 12:24:39 + due_date: 2019-05-14 12:24:39 customer: two movie: one \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 789d69b62..36c2d4138 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -23,9 +23,8 @@ rental = Rental.create!( customer_id: customer.id, movie_id: movie.id, - due_date: DateTime.now, ) - + expect(rental.customer).must_be_kind_of Customer expect(rental.customer.id).must_equal customer.id expect(customer.rentals.count).must_equal (rental_count + 1) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f65415e07..2916fb41c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -31,7 +31,6 @@ rental = Rental.create!( customer_id: customer.id, movie_id: movie.id, - due_date: DateTime.now, ) expect(rental.movie).must_be_kind_of Movie expect(rental.movie.id).must_equal movie.id diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3575ada58..b6357ce1d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -41,8 +41,8 @@ rental = rentals(:three) rental_date = rental.created_at - expect(rental.due_date).must_equal rental_date + 7.days - expect(rental.due_date).must_be_kind_of ActiveSupport::TimeWithZone + expect(rental.set_due_date).must_equal rental_date + 7.days + expect(rental.set_due_date).must_be_kind_of ActiveSupport::TimeWithZone end end end From 9b012313df2637a0850af559f102f462811825f8 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Thu, 16 May 2019 10:26:09 -0700 Subject: [PATCH 32/34] mollified postMAN --- app/controllers/movies_controller.rb | 10 ++++---- app/controllers/rentals_controller.rb | 6 ++--- app/models/movie.rb | 2 ++ config/routes.rb | 4 ++-- test/controllers/movies_controller_test.rb | 26 ++++++++++----------- test/controllers/rentals_controller_test.rb | 6 ++--- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 83dc3774b..cf9fc2c18 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,9 +8,9 @@ def show movie = Movie.find_by(id: params[:id]) if movie - render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + render status: :ok, json: movie.as_json(only: [ :title, :overview, :release_date, :inventory, :available_inventory ]) else - render status: :bad_request, json: {error: "Unable to find movie"} + render status: :bad_request, json: [{ error: "Unable to find movie" }] end end @@ -20,9 +20,9 @@ def create movie.set_available_inventory end if movie.save - render json: {id: movie.id}, status: :ok + render json: [{ id: movie.id }], status: :ok else - render json: {errors: movie.errors.messages}, + render json: [{ errors: movie.errors.messages }], status: :bad_request end end @@ -30,6 +30,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 36e3206a7..ab74559bc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,7 +5,7 @@ def checkin if rental render json: {id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id}, status: :ok else - render json: {errors: {rental: ["Rental not found for customer #{rental_params[:customer_id]}, and movie #{rental_params[:movie_id]}"]}}, + render json: [{errors: {rental: ["Rental not found for customer #{rental_params[:customer_id]}, and movie #{rental_params[:movie_id]}"]}}], status: :not_found end end @@ -15,9 +15,9 @@ def checkout rental.set_due_date if rental.save - render json: { id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id, due_date: rental.due_date }, status: :ok + render json: [{ id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id, due_date: rental.due_date }], status: :ok else - render json: { errors: rental.errors.messages }, + render json: [{ errors: rental.errors.messages }], status: :bad_request end end diff --git a/app/models/movie.rb b/app/models/movie.rb index deb57fff7..d9dfc001d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,6 +3,8 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, numericality: true + validates :overview, presence: true + validates :release_date, presence: true def set_available_inventory self.available_inventory = self.inventory diff --git a/config/routes.rb b/config/routes.rb index 461dd64eb..ce6abff1b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - post "/rentals/checkin", to: "rentals#checkin", as: "checkin" - post "/rentals/checkout", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 9da19ff08..68df9be6b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -59,7 +59,7 @@ body = JSON.parse(response.body) - expect(body["error"]).must_equal "Unable to find movie" + expect(body[0]["error"]).must_equal "Unable to find movie" end end @@ -84,14 +84,14 @@ } it "can create a new movie using good data" do expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change "Movie.count", +1 body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "id" + expect(body).must_be_kind_of Array + expect(body[0]).must_include "id" - movie = Movie.find(body["id"].to_i) + movie = Movie.find(body[0]["id"].to_i) expect(movie.title).must_equal movie_data[:title] expect(movie.available_inventory).must_equal movie.inventory @@ -100,14 +100,14 @@ it "can set specific available inventory" do expect { - post movies_path, params: {movie: avail_movie_data} + post movies_path, params: avail_movie_data }.must_change "Movie.count", +1 body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "id" + expect(body).must_be_kind_of Array + expect(body[0]).must_include "id" - movie = Movie.find(body["id"].to_i) + movie = Movie.find(body[0]["id"].to_i) expect(movie.title).must_equal movie_data[:title] expect(movie.available_inventory).must_equal avail_movie_data[:available_inventory] @@ -118,14 +118,14 @@ movie_data["title"] = nil expect { - post movies_path, params: {movie: movie_data} + 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" + expect(body).must_be_kind_of Array + expect(body[0]).must_include "errors" + expect(body[0]["errors"].keys).must_include "title" must_respond_with :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 175c38545..a6f62a4b6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -34,9 +34,9 @@ } post checkin_path, params: {rental: bad_data} body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "rental" + expect(body).must_be_kind_of Array + expect(body[0]).must_include "errors" + expect(body[0]["errors"]).must_include "rental" must_respond_with :not_found describe "Checkout" do From c3bf32d6d40e5add48e330ac55f49675a1405493 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Thu, 16 May 2019 11:54:15 -0700 Subject: [PATCH 33/34] refactor set_due_date method to pass smoke tests --- app/controllers/rentals_controller.rb | 6 +++--- app/models/rental.rb | 2 +- config/routes.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ab74559bc..379992cbf 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -12,9 +12,9 @@ def checkin def checkout rental = Rental.new(rental_params) - rental.set_due_date - + if rental.save + rental.set_due_date render json: [{ id: rental.id, movie_id: rental.movie.id, customer_id: rental.customer.id, due_date: rental.due_date }], status: :ok else render json: [{ errors: rental.errors.messages }], @@ -25,6 +25,6 @@ def checkout private def rental_params - params.require(:rental).permit(:movie_id, :customer_id, :due_date) + params.require(:rental).permit(:movie_id, :customer_id) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 4ab6a8108..0a846f735 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,6 +5,6 @@ class Rental < ApplicationRecord validates_associated :customer, :movie def set_due_date - self.created_at + 7.days + self.due_date = self.created_at + 7.days end end diff --git a/config/routes.rb b/config/routes.rb index ce6abff1b..6c2e080da 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - post "/rentals/check-in", to: "rentals#checkin", as: "checkin" - post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "rentals/check-in", to: "rentals#checkin", as: "checkin" + post "rentals/check-out", to: "rentals#checkout", as: "checkout" end From ce78c257c51170174e5a203d68f67d7363ee6525 Mon Sep 17 00:00:00 2001 From: Amy Phung Date: Thu, 16 May 2019 12:26:36 -0700 Subject: [PATCH 34/34] fix due date model test --- test/models/rental_test.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index b6357ce1d..2ba909957 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -27,13 +27,6 @@ expect(rental.movie).wont_be_nil expect(rental.movie).must_be_kind_of Movie end - - it "throws an error if a movie is invalid" do - params = { - movie_id: 9999999999999999999999999999, - customer_id: 1, - } - end end describe "Due Date" do @@ -44,5 +37,16 @@ expect(rental.set_due_date).must_equal rental_date + 7.days expect(rental.set_due_date).must_be_kind_of ActiveSupport::TimeWithZone end + + it "does not set a due date for an invalid rental" do + params = { + movie_id: 9999999999999999999999999999, + customer_id: 1, + } + + rental = Rental.create(params) + + expect(rental.due_date).must_be_nil + end end end