From 7c408f63fb1739f6aa4a5efd93da85ea7144b4c9 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Mon, 5 Nov 2018 11:31:48 -0800 Subject: [PATCH 01/42] set up new rails api project --- .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 +++++ .../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 57 files changed, 934 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/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..e54d447e8 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.4.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..1d10e5eb5 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.4.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..e810c083c --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.4.1p111 + +BUNDLED WITH + 1.17.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..43bce1990 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +N5S6iuPe3kCH4Vc71s5bmDYiJh2Epefm2wlakO5soQbke1l7jF3Dh/RpvHgZIBslqYqaiX86TNDwRQoskDUEkMGbbwBU+OdTraTrUlk93Qh2FuOEDZ9fDGvvgtN4ciNiw6I9pfBSj1BEFNaswA08l48R9waov+TuWAl6+BDX/vh3+VmTvqH5zHWbeR9bRQa1rRfjcJPMqv1AOtHktkwecgoCsSR767ZgDQUdZWz4bg2qgoCnjFOFhNSE9ufWGMATu+YCH8f6U2P6l3RrtBL+oGuF0ZFo/MZXj9EzXLihHLXillhoESAuedwplr+3eaBQpGxW3UzvIOEwHktiigYlKo24sk7rvPmyf5ykWRSgUj9/vVWsGjPnTiKYk0uiR9pvf4Itxr1qOe3Grjei1wwSQPe4tK8so4wbCkWq--Iap78QuIBEXZuN6O--GNWmBAvCbwynanIKwWAFOw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..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 3f506eba1f8bd81a6f37fac792df202c88711755 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Mon, 5 Nov 2018 12:32:32 -0800 Subject: [PATCH 02/42] Set up controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 6 files changed, 27 insertions(+) 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..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 1bd5efc81650d8da8f4e7137a20acdc733b12aa4 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Mon, 5 Nov 2018 13:44:46 -0800 Subject: [PATCH 03/42] Generate models --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20181105214012_create_movies.rb | 12 ++++++++++++ db/migrate/20181105214155_create_customers.rb | 15 +++++++++++++++ db/migrate/20181105214357_create_rentals.rb | 10 ++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/fixtures/rentals.yml | 9 +++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 12 files changed, 111 insertions(+) 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/20181105214012_create_movies.rb create mode 100644 db/migrate/20181105214155_create_customers.rb create mode 100644 db/migrate/20181105214357_create_rentals.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/db/migrate/20181105214012_create_movies.rb b/db/migrate/20181105214012_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105214012_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20181105214155_create_customers.rb b/db/migrate/20181105214155_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105214155_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20181105214357_create_rentals.rb b/db/migrate/20181105214357_create_rentals.rb new file mode 100644 index 000000000..bbb9344ed --- /dev/null +++ b/db/migrate/20181105214357_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :check_in + t.date :check_out + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..3cf54b94e --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-11-05 13:41:55 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-11-05 13:41:55 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..f05dd0894 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..a7485b24f --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + check_in: 2018-11-05 + check_out: 2018-11-05 + +two: + check_in: 2018-11-05 + check_out: 2018-11-05 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 3717b4204d16bd05ceb866ded2650daabb32e38f Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Mon, 5 Nov 2018 13:48:22 -0800 Subject: [PATCH 04/42] Schema created --- db/schema.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..adf0ae6a1 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_11_05_214357) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_in" + t.date "check_out" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 33c7dfa8e4bebb4ca0400a566512d24765467898 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Mon, 5 Nov 2018 14:18:36 -0800 Subject: [PATCH 05/42] Add models, foreign key migration, validations to movies --- app/models/customer.rb | 1 + app/models/movie.rb | 3 +++ app/models/rental.rb | 2 ++ db/migrate/20181105215003_inventory_default.rb | 5 +++++ db/migrate/20181105220531_addrentalreferences.rb | 6 ++++++ db/schema.rb | 10 ++++++++-- 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181105215003_inventory_default.rb create mode 100644 db/migrate/20181105220531_addrentalreferences.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..54e92a632 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,5 @@ class Movie < ApplicationRecord + has_many :rentals + + validate :name, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e5db47630 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movies + belongs_to :customers end diff --git a/db/migrate/20181105215003_inventory_default.rb b/db/migrate/20181105215003_inventory_default.rb new file mode 100644 index 000000000..07d66029f --- /dev/null +++ b/db/migrate/20181105215003_inventory_default.rb @@ -0,0 +1,5 @@ +class InventoryDefault < ActiveRecord::Migration[5.2] + def change + change_column :movies, :inventory, :integer, default: 0 + end +end diff --git a/db/migrate/20181105220531_addrentalreferences.rb b/db/migrate/20181105220531_addrentalreferences.rb new file mode 100644 index 000000000..5663dc76f --- /dev/null +++ b/db/migrate/20181105220531_addrentalreferences.rb @@ -0,0 +1,6 @@ +class Addrentalreferences < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index adf0ae6a1..9c4c51d26 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_05_214357) do +ActiveRecord::Schema.define(version: 2018_11_05_220531) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -31,7 +31,7 @@ t.string "title" t.string "overview" t.date "release_date" - t.integer "inventory" + t.integer "inventory", default: 0 t.datetime "created_at", null: false t.datetime "updated_at", null: false end @@ -41,6 +41,12 @@ t.date "check_out" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 694de939effeaee595d12ecbdbd101da437e8120 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Mon, 5 Nov 2018 14:22:39 -0800 Subject: [PATCH 06/42] Correct validation, add scope to uniqueness --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 54e92a632..fa5750134 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord has_many :rentals - validate :name, presence: true + validates :title, presence: true, uniqueness: { scope: :release_date } end From 33b76bd720d6349fd94dc5c609817bc2e11bca42 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Mon, 5 Nov 2018 15:59:02 -0800 Subject: [PATCH 07/42] Add test for customer relation to rentals. Fix line in test_helper --- test/fixtures/rentals.yml | 4 ++++ test/models/customer_test.rb | 10 ++++++++++ test/test_helper.rb | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a7485b24f..d7f92c7a5 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,7 +3,11 @@ one: check_in: 2018-11-05 check_out: 2018-11-05 + movie_id: one + customer_id: one two: check_in: 2018-11-05 check_out: 2018-11-05 + movie_id: two + customer_id: two diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..dabe00740 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,4 +6,14 @@ it "must be valid" do value(customer).must_be :valid? end + + describe "relations" do + it "has a list of rentals" do + customer = customers(:one) + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 4f0fb9868468b0ea1d95244fb3fb08f6e39e6620 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Mon, 5 Nov 2018 16:25:07 -0800 Subject: [PATCH 08/42] Add tests, methods, routes for customer controller. --- app/controllers/customers_controller.rb | 4 ++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 14 ++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..5a81cc179 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + + def index + customer = Customer.all + end end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..b6bd322d8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + resources :customers, only: [:index] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..eaa6b176f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,4 +4,18 @@ # it "must be a real test" do # flunk "Need real tests" # end + describe "index" do + it "succeeds for existing users" do + get customers_path + must_respond_with :success + end + + it "succeeds when there are no customers" do + Customer.all.each do |customer| + customer.destroy + end + get customers_path + must_respond_with :success + end + end end From 0a0326c5b0c36f78fd83b4cc2b37725c61fb52ad Mon Sep 17 00:00:00 2001 From: kangazoom Date: Tue, 6 Nov 2018 06:03:54 -0800 Subject: [PATCH 09/42] prelim model (validations+relations) + controller tests for movie --- test/controllers/movies_controller_test.rb | 15 +++++++ test/models/movie_test.rb | 50 ++++++++++++++++++++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..50ca8d7ee 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,4 +4,19 @@ # it "must be a real test" do # flunk "Need real tests" # end + describe "index" do + it "succeeds for existing users" do + get movies_path + must_respond_with :success + end + + it "succeeds when there are no movies" do + Movie.all.each do |movie| + movie.destroy + end + + get movies_path + must_respond_with :success + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..1bf1dc62f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,53 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) (movies(:movie1)) #TODO: need to set up yaml - it "must be valid" do - value(movie).must_be :valid? + describe "relations" do + it "has a list of rentals" do + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + + it "has a list of renting customers" do + movie.must_respond_to :customers + movie.customers.each do |customer| + customer.must_be_kind_of Customer + end + end + end + + describe "validations" do + it "requires a title" do + movie.valid?.must_equal true + + movie.title = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :title + end + + it "requires unique titles within release dates" do + category = 'album' + movie.valid?.must_equal true + + title = movie.title + release_date = movie.release_date + + movie2 = Movie.new(title: title, release_date: release_date) + movie2.save + + movie2.valid?.must_equal false + movie2.errors.messages.must_include :title + end + + it "does not require a unique title if the release date is different" do + title = movie.title + + movie2 = Movie.new(title: title, release_date: 1977-11-08) + movie2.save + movie2.valid?.must_equal true + end end end From 2dd5c77a0845014f9603469c60c38b351b8ebd09 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Tue, 6 Nov 2018 11:51:23 -0800 Subject: [PATCH 10/42] Add new movies_checked_out column for customers. Add json formatting for returned customer data. Complete customer controller testing. --- app/controllers/customers_controller.rb | 7 ++++ ...d_movies_checked_out_column_to_customer.rb | 5 +++ db/schema.rb | 3 +- test/controllers/customers_controller_test.rb | 34 +++++++++++++------ 4 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20181106193433_add_movies_checked_out_column_to_customer.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5a81cc179..93da6f437 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,5 +2,12 @@ class CustomersController < ApplicationController def index customer = Customer.all + render json: jsonify(customer) + end + + private + + def jsonify(customer_data) + return customer_data.as_json( only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/db/migrate/20181106193433_add_movies_checked_out_column_to_customer.rb b/db/migrate/20181106193433_add_movies_checked_out_column_to_customer.rb new file mode 100644 index 000000000..a2f46d8d4 --- /dev/null +++ b/db/migrate/20181106193433_add_movies_checked_out_column_to_customer.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutColumnToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 9c4c51d26..378bf956f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_05_220531) do +ActiveRecord::Schema.define(version: 2018_11_06_193433) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index eaa6b176f..2165d8109 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,21 +1,35 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + CUSTOMER_FIELDS = %w(id name registered_at address city state postal_code phone movies_checked_out_count).sort + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + describe "index" do - it "succeeds for existing users" do + it "successfully returns a list of existing customers" do get customers_path - must_respond_with :success - end - it "succeeds when there are no customers" do - Customer.all.each do |customer| - customer.destroy + body = check_response(expected_type: Array) + + expect(body.length).must_equal Customer.count + + body.each do |customer| + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS end + end + + it "returns an empty array when there are no customers" do + Customer.destroy_all get customers_path - must_respond_with :success + body = check_response(expected_type: Array) + expect(body).must_equal [] end end end From edbf03cb9da9ba39037d53635d98a9b6dc41aa39 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Tue, 6 Nov 2018 12:13:17 -0800 Subject: [PATCH 11/42] set up movies routes + controller for index and show; create still underway --- app/controllers/application_controller.rb | 3 ++ app/controllers/movies_controller.rb | 37 +++++++++++++++++++++++ config/routes.rb | 2 ++ 3 files changed, 42 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..3fd53645c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,5 @@ class ApplicationController < ActionController::API + def render_error(status, errors) + render json: { errors: errors}, status: status + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..7744962a0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,39 @@ class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: jsonify(movies), status: :ok + end + + def show + movie_id = params[:id] + movie = Movie.find_by(id: movie_id) + + if movie + render json: jsonify(movie), status: :ok + else + + #render json: { errors: { movie_id: ["No such movie"]}}, status: :not_found + render_error(:not_found, {movie_id: ["no such movie"]}) + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: { id: movie.id } + else + render_error(:bad_request, movie.errors.messages) + end + end + + private + def movie_params + params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) + end + + def jsonify(movie_data) + return movie_data.as_json(except: [:created_at, :updated_at]) + end end diff --git a/config/routes.rb b/config/routes.rb index b6bd322d8..5caf8daa8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + # TODO: rentals routes end From 57ad4cf3396273459bb9293279b28a9534f509b5 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Tue, 6 Nov 2018 12:29:15 -0800 Subject: [PATCH 12/42] updated movies index and show actions to show proper json entries + added available_inventory column to movies --- app/controllers/movies_controller.rb | 9 ++------- db/migrate/20181106202745_add_avail_inv_to_movies.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20181106202745_add_avail_inv_to_movies.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7744962a0..90addfcb6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify(movies), status: :ok + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show @@ -10,10 +10,8 @@ def show movie = Movie.find_by(id: movie_id) if movie - render json: jsonify(movie), status: :ok + render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok, status: :ok else - - #render json: { errors: { movie_id: ["No such movie"]}}, status: :not_found render_error(:not_found, {movie_id: ["no such movie"]}) end end @@ -33,7 +31,4 @@ def movie_params params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) end - def jsonify(movie_data) - return movie_data.as_json(except: [:created_at, :updated_at]) - end end diff --git a/db/migrate/20181106202745_add_avail_inv_to_movies.rb b/db/migrate/20181106202745_add_avail_inv_to_movies.rb new file mode 100644 index 000000000..6956d73a5 --- /dev/null +++ b/db/migrate/20181106202745_add_avail_inv_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailInvToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 378bf956f..ef019967c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_06_193433) do +ActiveRecord::Schema.define(version: 2018_11_06_202745) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory", default: 0 t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From 6e81c21bdbdae4eed5c7e71f5f8ac5023889bcd2 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Tue, 6 Nov 2018 12:33:13 -0800 Subject: [PATCH 13/42] added methods to calculate available_inventory for movies --- app/controllers/movies_controller.rb | 3 +++ app/models/movie.rb | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 90addfcb6..2669eac40 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,6 +9,9 @@ def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) + # TODO: uncomment below once we know more about rentals + # movie.available_inventory = movie.calculate_available_inventory + if movie render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok, status: :ok else diff --git a/app/models/movie.rb b/app/models/movie.rb index fa5750134..9fb975bd9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,4 +2,14 @@ class Movie < ApplicationRecord has_many :rentals validates :title, presence: true, uniqueness: { scope: :release_date } + + # TODO: uncomment below once we know more about rentals + + # def calculate_available_inventory() + # total_inventory = self.inventory + # # QUESTION: will we be doing counter_cache? + # rented_inventory = self.rentals.length + # + # return total_inventory - rented_inventory + # end end From eba15f84a76466ccc637bd762b15b76ffaf234e9 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Tue, 6 Nov 2018 14:07:39 -0800 Subject: [PATCH 14/42] Add controller tests and controller route. --- config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 61 ++++++++++++++++++++- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 5caf8daa8..c36b214f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,5 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] # TODO: rentals routes + resources :rentals, only: [:create, :update] end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..4aeadf34f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,62 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:rental_data) { + { + check_in: 2018-11-10, + check_out: 2018-11-17, + movie_id: 7, + customer_id: 1 + } + } + + describe "rentals checkout" do + it "must successfully add a new rental when given valid data" do + expect { + post rentals_path, params: { rental: rental_data } + }.must_change "Rental.count", 1 + + 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.movie_id).must_equal rental_data[:movie_id] + expect(rental.check_out).must_equal Today + must_respond_with :success + end + + it "returns an error for invalid rental data" do + rental_data["movie_id"] = nil + + expect { + post rentals_path, params: { rental: rental_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_id" + must_respond_with :bad_request + end + end + + describe "rentals check_in" do + it "successfully changes checked_out status to false" do + expect { + patch rental_path(rentals.first) + }.wont_change "Rental.count", 1 + + 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.checkout_status).must_equal false + must_respond_with :success + end + end end From 264444cbb04462e86ad0a6db808380ffa5aca6a2 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Tue, 6 Nov 2018 14:14:55 -0800 Subject: [PATCH 15/42] Change rentals check_in column name to due_date. --- ...220933_change_rentals_column_name_check_in_to_due_date.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181106220933_change_rentals_column_name_check_in_to_due_date.rb diff --git a/db/migrate/20181106220933_change_rentals_column_name_check_in_to_due_date.rb b/db/migrate/20181106220933_change_rentals_column_name_check_in_to_due_date.rb new file mode 100644 index 000000000..fd56389ee --- /dev/null +++ b/db/migrate/20181106220933_change_rentals_column_name_check_in_to_due_date.rb @@ -0,0 +1,5 @@ +class ChangeRentalsColumnNameCheckInToDueDate < ActiveRecord::Migration[5.2] + def change + rename_column :rentals, :check_in, :due_date + end +end diff --git a/db/schema.rb b/db/schema.rb index ef019967c..837976c2a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_06_202745) do +ActiveRecord::Schema.define(version: 2018_11_06_220933) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -39,7 +39,7 @@ end create_table "rentals", force: :cascade do |t| - t.date "check_in" + t.date "due_date" t.date "check_out" t.datetime "created_at", null: false t.datetime "updated_at", null: false From 9ad40f5506cc50042d53162781ceb41473683cae Mon Sep 17 00:00:00 2001 From: kangazoom Date: Tue, 6 Nov 2018 14:22:44 -0800 Subject: [PATCH 16/42] got Movies#create working --- app/controllers/movies_controller.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2669eac40..7543047e6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,25 +13,27 @@ def show # movie.available_inventory = movie.calculate_available_inventory if movie - render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok, status: :ok + render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok else render_error(:not_found, {movie_id: ["no such movie"]}) end end def create - movie = Movie.new(movie_params) + movie = Movie.new(title: params[:title], release_date: params[:release_date], overview: params[:overview], inventory: params[:inventory]) if movie.save - render json: { id: movie.id } + movie_id = movie.id + render json: movie.as_json(only: :id), status: :ok else + # QUESTION: is this ok as an error message? render_error(:bad_request, movie.errors.messages) end end private - def movie_params - params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) - end + # def movie_params + # params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) + # end end From e35ef3f96be3f85a9e6f70473b7caece053a2546 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Tue, 6 Nov 2018 14:49:55 -0800 Subject: [PATCH 17/42] updated movie available_inventory method --- app/controllers/movies_controller.rb | 10 +++++++--- app/models/movie.rb | 27 ++++++++++++++++++++------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7543047e6..0bc638256 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,10 +9,10 @@ def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) - # TODO: uncomment below once we know more about rentals - # movie.available_inventory = movie.calculate_available_inventory - if movie + # NOTE: might need to tweak the code a little to get it working + movie.available_inventory + render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok else render_error(:not_found, {movie_id: ["no such movie"]}) @@ -20,8 +20,12 @@ def show end def create + # TODO: validations for non-string entries movie = Movie.new(title: params[:title], release_date: params[:release_date], overview: params[:overview], inventory: params[:inventory]) + # TODO: uncomment below once we know more about rentals + # movie.available_inventory = movie.calculate_available_inventory + if movie.save movie_id = movie.id render json: movie.as_json(only: :id), status: :ok diff --git a/app/models/movie.rb b/app/models/movie.rb index 9fb975bd9..65ddd719f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,11 +5,24 @@ class Movie < ApplicationRecord # TODO: uncomment below once we know more about rentals - # def calculate_available_inventory() - # total_inventory = self.inventory - # # QUESTION: will we be doing counter_cache? - # rented_inventory = self.rentals.length - # - # return total_inventory - rented_inventory - # end + def calculate_available_inventory() + total_inventory = self.inventory + # QUESTION: will we be doing counter_cache? + rented_inventory = self.rentals.length + + available_inventory = total_inventory - rented_inventory + + if available_inventory < 0 + # TODO: improve error handling here? + raise StandardError, "AVAILABLE INVENTORY CANNOT BE LESS THAN ZERO" + end + + self.available_inventory = available_inventory + # QUESTION: error handling for successful or failed save? + self.save + + # necessary? or do this outside of function? + + return self.available_inventory + end end From b4e5b3e8ed7d58eb970fbd6abcb656c87b1a0fee Mon Sep 17 00:00:00 2001 From: kangazoom Date: Tue, 6 Nov 2018 14:58:08 -0800 Subject: [PATCH 18/42] yay movies available_inventory method works yay --- app/controllers/movies_controller.rb | 2 +- app/models/movie.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0bc638256..d94908c95 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,7 +11,7 @@ def show if movie # NOTE: might need to tweak the code a little to get it working - movie.available_inventory + movie.calculate_available_inventory render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok else diff --git a/app/models/movie.rb b/app/models/movie.rb index 65ddd719f..9e859bff0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -21,8 +21,5 @@ def calculate_available_inventory() # QUESTION: error handling for successful or failed save? self.save - # necessary? or do this outside of function? - - return self.available_inventory end end From 561b9664013fe05545f47542427533edc5f80bd1 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Tue, 6 Nov 2018 21:51:25 -0800 Subject: [PATCH 19/42] Working on rental controller checkout method and testing. --- app/controllers/rentals_controller.rb | 25 ++++++++ app/models/rental.rb | 3 + config/routes.rb | 6 +- test/controllers/rentals_controller_test.rb | 66 ++++++++------------- test/fixtures/movies.yml | 10 ++-- test/fixtures/rentals.yml | 16 ++--- test/models/rental_test.rb | 4 +- 7 files changed, 73 insertions(+), 57 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..f9aaa545d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,27 @@ +require 'pry' class RentalsController < ApplicationController + + def index + rentals = Rental.all + render json: rentals.as_json(only: [:id, :customer_id, :movie_id]), status: :ok + end + + def checkout + rental = Rental.new(rental_params) + if rental.save + render json: { customer_id: rental.customer_id, movie_id: rental.movie_id } + # decrement movie available inventory here + else + render_error(:bad_request, rental.errors.messages) + end + end + + def checkin + + end + + + def rental_params + {movie_id: params[:movie_id], customer_id: params[:customer_id], check_out: Date.today, due_date: Date.today + 7} + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index e5db47630..edca5ec3e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord belongs_to :movies belongs_to :customers + + validates :customer_id, presence: true + validates :movie_id, presence: true end diff --git a/config/routes.rb b/config/routes.rb index c36b214f8..ae8b05d46 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,8 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - # TODO: rentals routes - resources :rentals, only: [:create, :update] + + post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' + patch 'rentals/:id/checkin', to: 'rentals#checkin', as: 'checkin' + resources :rentals, only: [:index, :create] end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4aeadf34f..c736ce779 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,62 +1,48 @@ require "test_helper" +require 'pry' describe RentalsController do - let(:rental_data) { - { - check_in: 2018-11-10, - check_out: 2018-11-17, - movie_id: 7, - customer_id: 1 - } - } - describe "rentals checkout" do + let(:rental_data) { + { + movie_id: 1, + customer_id: 1, + } + } it "must successfully add a new rental when given valid data" do - expect { - post rentals_path, params: { rental: rental_data } - }.must_change "Rental.count", 1 - - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "id" + expect { post checkout_path, params: rental_data }.must_change "Rental.count" - rental = Rental.find(body["id"].to_i) - - expect(rental.movie_id).must_equal rental_data[:movie_id] - expect(rental.check_out).must_equal Today must_respond_with :success end - it "returns an error for invalid rental data" do - rental_data["movie_id"] = nil + it "returns an error for invalid rental data" do expect { - post rentals_path, params: { rental: rental_data } + post checkout_path, params: { movie_id: nil, customer_id: Customer.first.id } }.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_id" + must_respond_with :bad_request end end - describe "rentals check_in" do - it "successfully changes checked_out status to false" do - expect { - patch rental_path(rentals.first) - }.wont_change "Rental.count", 1 - - 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.checkout_status).must_equal false - must_respond_with :success - end - end + # describe "rentals check_in" do + # it "successfully changes checked_out status to false" do + # expect { + # post check_out_path, params: { movie_id: nil, customer_id: customers.first.id } + # + # 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.checkout_status).must_equal false + # must_respond_with :success + # end + # end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..069749def 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString + title: GreatMovie + overview: A really great movie release_date: 2018-11-05 inventory: 1 two: - title: MyString - overview: MyString - release_date: 2018-11-05 + title: Second Movie + overview: Better Movie + release_date: 2018-11-15 inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index d7f92c7a5..b8ba7f3be 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - check_in: 2018-11-05 - check_out: 2018-11-05 - movie_id: one - customer_id: one + check_out: 2018-11-10 + due_date: 2018-11-17 + movie_id: 1 + customer_id: 1 two: - check_in: 2018-11-05 - check_out: 2018-11-05 - movie_id: two - customer_id: two + check_out: 2018-11-12 + due_date: 2018-11-19 + movie_id: 2 + customer_id: 2 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..34574bc0c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) {Movie.first} it "must be valid" do - value(rental).must_be :valid? + expect(rental.valid?).must_equal true end end From f8a6c4587fdc2da04df6ef3bc7cbe2b92bf53bb4 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 06:16:53 -0800 Subject: [PATCH 20/42] tried to get checkout working - see notes in pr --- app/controllers/movies_controller.rb | 1 + app/controllers/rentals_controller.rb | 17 +++++++++++++++-- app/models/customer.rb | 4 +++- app/models/movie.rb | 3 ++- app/models/rental.rb | 1 + config/routes.rb | 3 ++- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d94908c95..ea4d7a948 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -21,6 +21,7 @@ def show def create # TODO: validations for non-string entries + # TODO: move params to private for now movie = Movie.new(title: params[:title], release_date: params[:release_date], overview: params[:overview], inventory: params[:inventory]) # TODO: uncomment below once we know more about rentals diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f9aaa545d..f77f6b13e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,9 +7,22 @@ def index end def checkout - rental = Rental.new(rental_params) + + check_out = Date.today.to_s + due_date = (Date.today+7).to_s + + movie_id = params[:movie_id].to_i + movie = Movie.find_by(id: movie_id) + customer_id = params[:customer_id].to_i + customer = Customer.find_by(id: customer_id) + # rental = Rental.new(rental_params) + + rental = Rental.new(movie_id: movie.id, customer_id: customer.id, check_out: check_out, due_date: due_date) + + if rental.save - render json: { customer_id: rental.customer_id, movie_id: rental.movie_id } + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + # render json: { customer_id: rental.customer_id, movie_id: rental.movie_id } # decrement movie available inventory here else render_error(:bad_request, rental.errors.messages) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..8ba5a89c7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord - has_many :rentals + has_many :rentals, dependent: :delete_all + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 9e859bff0..d1c5b671f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - has_many :rentals + has_many :rentals, dependent: :delete_all validates :title, presence: true, uniqueness: { scope: :release_date } @@ -22,4 +22,5 @@ def calculate_available_inventory() self.save end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index edca5ec3e..e5f591df2 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,4 +4,5 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :movie_id, presence: true + end diff --git a/config/routes.rb b/config/routes.rb index ae8b05d46..e47a34eca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,9 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + resources :rentals, only: [:index] + post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' patch 'rentals/:id/checkin', to: 'rentals#checkin', as: 'checkin' - resources :rentals, only: [:index, :create] end From af34d5b24d2d3f7c5ab56547fdeca1edcd14fa45 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 06:30:12 -0800 Subject: [PATCH 21/42] spacing --- app/controllers/rentals_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f77f6b13e..8a4d02105 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,6 +8,7 @@ def index def checkout + check_out = Date.today.to_s due_date = (Date.today+7).to_s From dc00864d56ff659333e3f82d5f17170116a06ebd Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 09:53:35 -0800 Subject: [PATCH 22/42] controller tests for movie: #index + #show --- test/controllers/movies_controller_test.rb | 57 ++++++++++++++++++---- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 50ca8d7ee..82b18efbc 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,22 +1,59 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + describe "index" do - it "succeeds for existing users" do + MOVIE_FIELDS_INDEX = %w(id title release_date).sort + + it "successfully returns a list of existing movies" do get movies_path - must_respond_with :success - end - it "succeeds when there are no movies" do - Movie.all.each do |movie| - movie.destroy + body = check_response(expected_type: Array) + + expect(body.length).must_equal Movie.count + + body.each do |movie| + expect(movie.keys.sort).must_equal MOVIE_FIELDS_INDEX end + end + it "returns an empty array when there are no movies" do + Movie.destroy_all get movies_path - must_respond_with :success + body = check_response(expected_type: Array) + expect(body).must_equal [] end end + + describe 'show' do + MOVIE_FIELDS_SHOW = %w(id title overview release_date inventory available_inventory).sort + it 'retrieves info on one movie' do + movie = Movie.first + get movie_path(movie) + + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal MOVIE_FIELDS_SHOW + end + + it 'returns a 404 error if requesting a movie that does not exist' do + movie = Movie.first + movie.destroy + + get movie_path(movie) + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body).must_include 'errors' + end + end + +# describe 'create' do +# TODO +# end end From bcba2c6e8bcbbda1da8c2bd429ef7bb4aa41f9c2 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Wed, 7 Nov 2018 10:30:51 -0800 Subject: [PATCH 23/42] Rentals controller is now working for checkin method and tests are passing. --- app/controllers/rentals_controller.rb | 30 ++++++++++----------- app/models/rental.rb | 8 ++---- config/routes.rb | 4 +-- test/controllers/rentals_controller_test.rb | 9 ++++--- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8a4d02105..abda49714 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,34 +8,32 @@ def index def checkout - - check_out = Date.today.to_s - due_date = (Date.today+7).to_s - - movie_id = params[:movie_id].to_i - movie = Movie.find_by(id: movie_id) - customer_id = params[:customer_id].to_i - customer = Customer.find_by(id: customer_id) - # rental = Rental.new(rental_params) - - rental = Rental.new(movie_id: movie.id, customer_id: customer.id, check_out: check_out, due_date: due_date) - + # check_out = Date.today.to_s + # due_date = (Date.today+7).to_s + # + # movie_id = params[:movie_id].to_i + # movie = Movie.find_by(id: movie_id) + movie = Movie.find_by(id: rental_params[:movie_id]) + # customer_id = params[:customer_id].to_i + # customer = Customer.find_by(id: customer_id) + rental = Rental.new(rental_params) + # rental = Rental.new(movie_id: movie_id, customer_id: customer_id, check_out: check_out, due_date: due_date) if rental.save + movie.calculate_available_inventory render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok - # render json: { customer_id: rental.customer_id, movie_id: rental.movie_id } - # decrement movie available inventory here + else render_error(:bad_request, rental.errors.messages) end end def checkin - + end def rental_params - {movie_id: params[:movie_id], customer_id: params[:customer_id], check_out: Date.today, due_date: Date.today + 7} + {movie_id: params[:movie_id], customer_id: params[:customer_id], check_out: Date.today.to_s, due_date: (Date.today + 7).to_s} end end diff --git a/app/models/rental.rb b/app/models/rental.rb index e5f591df2..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,8 +1,4 @@ class Rental < ApplicationRecord - belongs_to :movies - belongs_to :customers - - validates :customer_id, presence: true - validates :movie_id, presence: true - + belongs_to :movie + belongs_to :customer end diff --git a/config/routes.rb b/config/routes.rb index e47a34eca..41da2f87a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,6 @@ resources :rentals, only: [:index] - post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' - patch 'rentals/:id/checkin', to: 'rentals#checkin', as: 'checkin' + post 'rentals/check-out', to: 'rentals#checkout', as: 'checkout' + patch 'rentals/:id/check-in', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c736ce779..1a388f80a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,14 +5,15 @@ describe "rentals checkout" do let(:rental_data) { { - movie_id: 1, - customer_id: 1, + movie_id: Movie.first.id, + customer_id: Customer.first.id, } } it "must successfully add a new rental when given valid data" do - expect { post checkout_path, params: rental_data }.must_change "Rental.count" - + post checkout_path, params: rental_data + expect(Rental.count).must_equal 3 must_respond_with :success + expect(Movie.first.available_inventory).must_equal 0 end From ad95cda0c18073e22f02ef7b9450da50749ae7b5 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Wed, 7 Nov 2018 10:41:11 -0800 Subject: [PATCH 24/42] Add checked out column to rentals table --- .../20181107183617_add_checked_out_column_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181107183617_add_checked_out_column_to_rentals.rb diff --git a/db/migrate/20181107183617_add_checked_out_column_to_rentals.rb b/db/migrate/20181107183617_add_checked_out_column_to_rentals.rb new file mode 100644 index 000000000..a37cbe58a --- /dev/null +++ b/db/migrate/20181107183617_add_checked_out_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCheckedOutColumnToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkedout, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 837976c2a..4da1f6c5e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_06_220933) do +ActiveRecord::Schema.define(version: 2018_11_07_183617) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.boolean "checkedout", default: true t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 936d78ed7463664165165347ba3881c54a621f39 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 10:41:32 -0800 Subject: [PATCH 25/42] wrote tests for custom model movie methods --- app/models/movie.rb | 16 +++++++-- test/models/movie_test.rb | 69 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index d1c5b671f..13592e448 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,6 +5,7 @@ class Movie < ApplicationRecord # TODO: uncomment below once we know more about rentals + def calculate_available_inventory() total_inventory = self.inventory # QUESTION: will we be doing counter_cache? @@ -12,15 +13,26 @@ def calculate_available_inventory() available_inventory = total_inventory - rented_inventory - if available_inventory < 0 + if available_inventory < 0 || available_inventory.nil? # TODO: improve error handling here? raise StandardError, "AVAILABLE INVENTORY CANNOT BE LESS THAN ZERO" end + return available_inventory + end + + def save_available_inventory(calculate_available_inventory()) + available_inventory = calculate_available_inventory() + self.available_inventory = available_inventory # QUESTION: error handling for successful or failed save? - self.save + result = self.save + + if !result + raise StandardError, "COULD NOT SAVE AVAILABLE INVENTORY" + end + return result end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 1bf1dc62f..2f0a567da 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -50,4 +50,73 @@ movie2.valid?.must_equal true end end + + # -- custom model methods -- # + + describe 'calculate_available_inventory' do + + it 'correctly calculates available inventory when value is positive' do + total_inventory = movie.inventory + rented_inventory = movie.rentals.length + + available_inventory = movie.calculate_available_inventory + + expect(available_inventory).must_equal 2 + end + + it 'correctly calculates available inventory when value is zero' do + rented_inventory = movie.rentals.length + movie.inventory = rented_inventory + + available_inventory = movie.calculate_available_inventory + + expect(available_inventory).must_equal 0 + end + + it 'correctly calculates available inventory when total inventory is zero' do + movie.inventory = 0 + + available_inventory = movie.calculate_available_inventory + + expect(available_inventory).must_equal 0 + end + + # it 'correctly calculates available inventory when rented inventory is zero' do + # total_inventory = movie.inventory + # rented_inventory = 0 + # + # available_inventory = total_inventory - rented_inventory + # + # expect(available_inventory).must_equal total_inventory + # end + + # QUESION: improve error handling here? + it 'throws an error if available_inventory falls below zero' do + movie.inventory = -100 + + available_inventory = movie.calculate_available_inventory + + expect { available_inventory }.must_raise StandardError + end + + describe 'save_available_inventory' do + # QUESION: improve error handling here? + it 'can successfully save newly-assigned inventory value' do + result = movie.save_available_inventory(0) + expect(result).must_equal true + + result = movie.save_available_inventory(10) + expect(result).must_equal true + end + + it 'throws an error if save is unsuccessful' do + result = movie.save_available_inventory('a') + expect { result }.must_raise StandardError + + result = movie.save_available_inventory(-1) + expect { result }.must_raise StandardError + end + + + end end From 7f5950d08bc1fb705efce9e6faa82c8ace13ba1d Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Wed, 7 Nov 2018 10:57:29 -0800 Subject: [PATCH 26/42] Added default value to movies available inventory column --- ...add_default_value_to_movies_available_inventory_column.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181107185036_add_default_value_to_movies_available_inventory_column.rb diff --git a/db/migrate/20181107185036_add_default_value_to_movies_available_inventory_column.rb b/db/migrate/20181107185036_add_default_value_to_movies_available_inventory_column.rb new file mode 100644 index 000000000..fcf35a879 --- /dev/null +++ b/db/migrate/20181107185036_add_default_value_to_movies_available_inventory_column.rb @@ -0,0 +1,5 @@ +class AddDefaultValueToMoviesAvailableInventoryColumn < ActiveRecord::Migration[5.2] + def change + change_column_default :movies, :available_inventory, 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 4da1f6c5e..07e93289d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_183617) do +ActiveRecord::Schema.define(version: 2018_11_07_185036) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,7 +35,7 @@ t.integer "inventory", default: 0 t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "available_inventory" + t.integer "available_inventory", default: 0 end create_table "rentals", force: :cascade do |t| From 953baa06d62ae1dffe9367675080c42ce44aba75 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 11:08:00 -0800 Subject: [PATCH 27/42] broke movies model methods into smaller pieces, including one to calculate checked_out rentals --- app/models/movie.rb | 13 ++- test/fixtures/movies.yml | 6 ++ test/models/movie_test.rb | 166 +++++++++++++++++++++++++------------- 3 files changed, 126 insertions(+), 59 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 13592e448..311f34847 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,18 +2,27 @@ class Movie < ApplicationRecord has_many :rentals, dependent: :delete_all validates :title, presence: true, uniqueness: { scope: :release_date } + validates :inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } + validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } # TODO: uncomment below once we know more about rentals + def calculate_checked_out_rentals() + rentals = self.rentals + + rented_inventory = rentals.sum { |rental| rental.checkout==true } + + return rented_inventory + end def calculate_available_inventory() total_inventory = self.inventory # QUESTION: will we be doing counter_cache? - rented_inventory = self.rentals.length + rented_inventory = calculate_checked_out_rentals() available_inventory = total_inventory - rented_inventory - if available_inventory < 0 || available_inventory.nil? + if !(available_inventory >= 0) # TODO: improve error handling here? raise StandardError, "AVAILABLE INVENTORY CANNOT BE LESS THAN ZERO" end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 069749def..d5102836d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,3 +11,9 @@ two: overview: Better Movie release_date: 2018-11-15 inventory: 1 + +movie1: + title: Something Scary + overview: Cool for Halloween + release_date: 1962-10-13 + inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2f0a567da..7844ac877 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Movie do - let(:movie) (movies(:movie1)) #TODO: need to set up yaml + let(:movie) {movies(:movie1)} describe "relations" do it "has a list of rentals" do @@ -49,74 +49,126 @@ movie2.save movie2.valid?.must_equal true end - end - - # -- custom model methods -- # - - describe 'calculate_available_inventory' do - - it 'correctly calculates available inventory when value is positive' do - total_inventory = movie.inventory - rented_inventory = movie.rentals.length - - available_inventory = movie.calculate_available_inventory - - expect(available_inventory).must_equal 2 - end - it 'correctly calculates available inventory when value is zero' do - rented_inventory = movie.rentals.length - movie.inventory = rented_inventory - - available_inventory = movie.calculate_available_inventory - - expect(available_inventory).must_equal 0 - end + it 'requires a non-negative inventory int value' do + movie.inventory = 1 + movie.save + movie.valid?.must_equal true - it 'correctly calculates available inventory when total inventory is zero' do movie.inventory = 0 + movie.save + movie.valid?.must_equal true - available_inventory = movie.calculate_available_inventory - - expect(available_inventory).must_equal 0 - end - - # it 'correctly calculates available inventory when rented inventory is zero' do - # total_inventory = movie.inventory - # rented_inventory = 0 - # - # available_inventory = total_inventory - rented_inventory - # - # expect(available_inventory).must_equal total_inventory - # end - # QUESION: improve error handling here? - it 'throws an error if available_inventory falls below zero' do - movie.inventory = -100 + movie.inventory = -1 + movie.save + movie.valid?.must_equal false - available_inventory = movie.calculate_available_inventory + movie.inventory = 1.5 + movie.save + movie.valid?.must_equal false - expect { available_inventory }.must_raise StandardError + movie.inventory = 'a' + movie.save + movie.valid?.must_equal false end - describe 'save_available_inventory' do - # QUESION: improve error handling here? - it 'can successfully save newly-assigned inventory value' do - result = movie.save_available_inventory(0) - expect(result).must_equal true - - result = movie.save_available_inventory(10) - expect(result).must_equal true - end + it 'requires a non-negative available_inventory int value' do + movie.available_inventory = 1 + movie.save + movie.valid?.must_equal true - it 'throws an error if save is unsuccessful' do - result = movie.save_available_inventory('a') - expect { result }.must_raise StandardError + movie.available_inventory = 0 + movie.save + movie.valid?.must_equal true - result = movie.save_available_inventory(-1) - expect { result }.must_raise StandardError - end + movie.available_inventory = -1 + movie.save + movie.valid?.must_equal false + movie.available_inventory = 1.5 + movie.save + movie.valid?.must_equal false + movie.available_inventory = 'a' + movie.save + movie.valid?.must_equal false + end end + + # -- custom model methods -- # + # describe 'calculate_checked_out_rentals' do + # it 'correctly calculates checked out rentals' do + # end + # + # it 'ignores checked in rental entries' do + # end + # end + + # describe 'calculate_available_inventory' do + # + # it 'correctly calculates available inventory when value is positive' do + # total_inventory = movie.inventory + # rented_inventory = movie.rentals.length + # + # available_inventory = movie.calculate_available_inventory + # + # expect(available_inventory).must_equal 2 + # end + # + # it 'correctly calculates available inventory when value is zero' do + # rented_inventory = movie.rentals.length + # movie.inventory = rented_inventory + # + # available_inventory = movie.calculate_available_inventory + # + # expect(available_inventory).must_equal 0 + # end + # + # it 'correctly calculates available inventory when total inventory is zero' do + # movie.inventory = 0 + # + # available_inventory = movie.calculate_available_inventory + # + # expect(available_inventory).must_equal 0 + # end + # + # # it 'correctly calculates available inventory when rented inventory is zero' do + # # total_inventory = movie.inventory + # # rented_inventory = 0 + # # + # # available_inventory = total_inventory - rented_inventory + # # + # # expect(available_inventory).must_equal total_inventory + # # end + # + # # QUESION: improve error handling here? + # it 'throws an error if available_inventory falls below zero' do + # movie.inventory = -100 + # + # available_inventory = movie.calculate_available_inventory + # + # expect { available_inventory }.must_raise StandardError + # end + # + # describe 'save_available_inventory' do + # # QUESION: improve error handling here? + # it 'can successfully save newly-assigned inventory value' do + # result = movie.save_available_inventory(0) + # expect(result).must_equal true + # + # result = movie.save_available_inventory(10) + # expect(result).must_equal true + # end + # + # it 'throws an error if save is unsuccessful' do + # result = movie.save_available_inventory('a') + # expect { result }.must_raise StandardError + # + # result = movie.save_available_inventory(-1) + # expect { result }.must_raise StandardError + # end + # + # + # end end From 6b79f253f18f5e43e65178dd962a2e681abe2366 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 11:22:51 -0800 Subject: [PATCH 28/42] tests passing - but not for pos cases? --- app/models/movie.rb | 2 +- test/models/movie_test.rb | 68 +++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 311f34847..c554142f5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -30,7 +30,7 @@ def calculate_available_inventory() return available_inventory end - def save_available_inventory(calculate_available_inventory()) + def save_available_inventory(calculate_available_inventory) available_inventory = calculate_available_inventory() self.available_inventory = available_inventory diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 7844ac877..e32475318 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -11,17 +11,17 @@ end end - it "has a list of renting customers" do - movie.must_respond_to :customers - movie.customers.each do |customer| - customer.must_be_kind_of Customer - end - end + # it "has a list of renting customers" do + # movie.rentals.must_respond_to :customers + # movie.rentals.customers.each do |customer| + # customer.must_be_kind_of Customer + # end + # end end describe "validations" do it "requires a title" do - movie.valid?.must_equal true + # movie.valid?.must_equal true movie.title = nil movie.valid?.must_equal false @@ -30,7 +30,7 @@ it "requires unique titles within release dates" do category = 'album' - movie.valid?.must_equal true + # movie.valid?.must_equal true title = movie.title release_date = movie.release_date @@ -42,56 +42,54 @@ movie2.errors.messages.must_include :title end - it "does not require a unique title if the release date is different" do - title = movie.title + # it "does not require a unique title if the release date is different" do + # title = movie.title + # + # movie2 = Movie.new(title: title, release_date: '1977-11-08') + # movie2.save + # movie2.valid?.must_equal true + # end - movie2 = Movie.new(title: title, release_date: 1977-11-08) - movie2.save - movie2.valid?.must_equal true - end - - it 'requires a non-negative inventory int value' do - movie.inventory = 1 - movie.save - movie.valid?.must_equal true - - movie.inventory = 0 - movie.save - movie.valid?.must_equal true + # it 'requires a non-negative inventory int value' do + # movie.inventory = 1 + # movie.valid?.must_equal true + # + # movie.inventory = 0 + # movie.valid?.must_equal true + # end + it 'will not save a non-negative inventory int value' do movie.inventory = -1 - movie.save movie.valid?.must_equal false movie.inventory = 1.5 - movie.save movie.valid?.must_equal false movie.inventory = 'a' - movie.save movie.valid?.must_equal false end + # it 'requires a non-negative available_inventory int value' do + # movie.available_inventory = 1 + # movie.valid?.must_equal true + # + # movie.available_inventory = 0 + # movie.valid?.must_equal true + # + # end + + it 'requires a non-negative available_inventory int value' do - movie.available_inventory = 1 - movie.save - movie.valid?.must_equal true - movie.available_inventory = 0 - movie.save - movie.valid?.must_equal true movie.available_inventory = -1 - movie.save movie.valid?.must_equal false movie.available_inventory = 1.5 - movie.save movie.valid?.must_equal false movie.available_inventory = 'a' - movie.save movie.valid?.must_equal false end end From 15594269215bb9d8be115834b3517cdf944ec37c Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 11:49:57 -0800 Subject: [PATCH 29/42] model tests for calculating a movies checked out rentals --- app/models/movie.rb | 2 +- app/models/rental.rb | 14 ++++++++++++++ test/fixtures/customers.yml | 8 ++++---- test/fixtures/rentals.yml | 14 ++++++++------ test/models/movie_test.rb | 27 ++++++++++++++++++++------- test/models/rental_test.rb | 14 +++++++++++++- 6 files changed, 60 insertions(+), 19 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index c554142f5..67abc8e03 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,7 +10,7 @@ class Movie < ApplicationRecord def calculate_checked_out_rentals() rentals = self.rentals - rented_inventory = rentals.sum { |rental| rental.checkout==true } + rented_inventory = rentals.sum { |rental| rental.checked_out==true } return rented_inventory end diff --git a/app/models/rental.rb b/app/models/rental.rb index e5f591df2..d82711921 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,4 +5,18 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :movie_id, presence: true + + + def checked_out?() + return self.checkedout == true + end + + + # def calculate_checked_out_rentals() + # rentals = self.rentals + # + # rented_inventory = rentals.sum { |rental| rental.checkout==true } + # + # return rented_inventory + # end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 3cf54b94e..16fe769f9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +customer1: + name: Amy Smith registered_at: 2018-11-05 13:41:55 address: MyString city: MyString @@ -9,8 +9,8 @@ one: postal_code: MyString phone: MyString -two: - name: MyString +customer2: + name: Michael Maestro registered_at: 2018-11-05 13:41:55 address: MyString city: MyString diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index b8ba7f3be..f90f63a7b 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +rental1: check_out: 2018-11-10 due_date: 2018-11-17 - movie_id: 1 - customer_id: 1 + movie: movie1 + customer: customer1 + checkedout: true -two: +rental2: check_out: 2018-11-12 due_date: 2018-11-19 - movie_id: 2 - customer_id: 2 + movie: movie2 + customer: customer2 + checkedout: true diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e32475318..8b4afba96 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -95,13 +95,26 @@ end # -- custom model methods -- # - # describe 'calculate_checked_out_rentals' do - # it 'correctly calculates checked out rentals' do - # end - # - # it 'ignores checked in rental entries' do - # end - # end + describe 'calculate_checked_out_rentals' do + it 'correctly calculates checked out rentals' do + rented_inventory = rentals.sum { |rental| rental.checked_out==true } + + calculation = movie.calculate_checked_out_rentals + + expect(calculation).must_equal rented_inventory + end + + it 'ignores checked in rental entries' do + all_rentals = movie.rentals.length + checked_in_rentals = rented_inventory = rentals.sum { |rental| rental.checked_out==false } + checked_out_rentals = all_rentals - checked_in_rentals + + calculation = movie.calculate_checked_out_rentals + + expect(calculation).must_equal checked_in_rentals + + end + end # describe 'calculate_available_inventory' do # diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 34574bc0c..964aafeee 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,21 @@ require "test_helper" describe Rental do - let(:rental) {Movie.first} + let(:rental) {rentals(:rental1)} it "must be valid" do expect(rental.valid?).must_equal true end end + +# -- custom model methods -- # +describe 'checked_out?' do + it 'correctly returns whether rental is currently checked out' do + rental.checkout = true + rental.verify?.must_equal true + + rental.checkout = false + rental.verify?.must_equal false + end + +end From ea90e6f9f13bf6dca9a8c51416e1c99c4631ea08 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 12:08:07 -0800 Subject: [PATCH 30/42] got checked_out? method tests passing for rental model --- app/models/movie.rb | 2 +- test/models/movie_test.rb | 4 ++-- test/models/rental_test.rb | 21 ++++++++++++--------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 67abc8e03..fb7d727bf 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,7 +10,7 @@ class Movie < ApplicationRecord def calculate_checked_out_rentals() rentals = self.rentals - rented_inventory = rentals.sum { |rental| rental.checked_out==true } + rented_inventory = rentals.count { |rental| rental.checked_out? } return rented_inventory end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8b4afba96..f98061ead 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -97,7 +97,7 @@ # -- custom model methods -- # describe 'calculate_checked_out_rentals' do it 'correctly calculates checked out rentals' do - rented_inventory = rentals.sum { |rental| rental.checked_out==true } + rented_inventory = rentals.count { |rental| rental.checked_out? } calculation = movie.calculate_checked_out_rentals @@ -106,7 +106,7 @@ it 'ignores checked in rental entries' do all_rentals = movie.rentals.length - checked_in_rentals = rented_inventory = rentals.sum { |rental| rental.checked_out==false } + checked_in_rentals = rented_inventory = rentals.count { |rental| !rental.checked_out? } checked_out_rentals = all_rentals - checked_in_rentals calculation = movie.calculate_checked_out_rentals diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 964aafeee..f562c566d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,16 +6,19 @@ it "must be valid" do expect(rental.valid?).must_equal true end -end -# -- custom model methods -- # -describe 'checked_out?' do - it 'correctly returns whether rental is currently checked out' do - rental.checkout = true - rental.verify?.must_equal true - rental.checkout = false - rental.verify?.must_equal false - end + # -- custom model methods -- # + describe 'checked_out?' do + it 'correctly returns whether rental is currently checked out' do + rental.checkedout = true + result = rental.checked_out? + expect(result).must_equal true + rental.checkedout = false + result = rental.checked_out? + expect(result).must_equal false + end + + end end From 2625167cad978d49240f8d604527cac061eda588 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 12:21:45 -0800 Subject: [PATCH 31/42] can correctly calculate number of checked out rentals for movies --- test/fixtures/movies.yml | 2 +- test/models/movie_test.rb | 173 +++++++++++++++++++++----------------- 2 files changed, 95 insertions(+), 80 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d5102836d..4ec7cf503 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -16,4 +16,4 @@ movie1: title: Something Scary overview: Cool for Halloween release_date: 1962-10-13 - inventory: 1 + inventory: 3 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f98061ead..6ab3a587e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -96,90 +96,105 @@ # -- custom model methods -- # describe 'calculate_checked_out_rentals' do - it 'correctly calculates checked out rentals' do - rented_inventory = rentals.count { |rental| rental.checked_out? } + let(:rental_checked_out) {Rental.new({ + checkedout: true, + movie: movie, + customer: customers(:customer1) + } + ) +} - calculation = movie.calculate_checked_out_rentals +it 'correctly calculates checked out rentals' do + rented_inventory = movie.rentals.count { |rental| rental.checked_out? } - expect(calculation).must_equal rented_inventory - end + calculation = movie.calculate_checked_out_rentals - it 'ignores checked in rental entries' do - all_rentals = movie.rentals.length - checked_in_rentals = rented_inventory = rentals.count { |rental| !rental.checked_out? } - checked_out_rentals = all_rentals - checked_in_rentals + expect(calculation).must_equal rented_inventory +end - calculation = movie.calculate_checked_out_rentals +it 'ignores checked in rental entries' do + rental_checked_in = Rental.new({ + checkedout: false, + movie: movie, + customer: customers(:customer2) + } +) - expect(calculation).must_equal checked_in_rentals +all_rentals = movie.rentals.length +checked_in_rentals = movie.rentals.count { |rental| !rental.checked_out? } +checked_out_rentals = all_rentals - checked_in_rentals - end - end +calculation = movie.calculate_checked_out_rentals + +expect(calculation).must_equal checked_out_rentals + +end +end - # describe 'calculate_available_inventory' do - # - # it 'correctly calculates available inventory when value is positive' do - # total_inventory = movie.inventory - # rented_inventory = movie.rentals.length - # - # available_inventory = movie.calculate_available_inventory - # - # expect(available_inventory).must_equal 2 - # end - # - # it 'correctly calculates available inventory when value is zero' do - # rented_inventory = movie.rentals.length - # movie.inventory = rented_inventory - # - # available_inventory = movie.calculate_available_inventory - # - # expect(available_inventory).must_equal 0 - # end - # - # it 'correctly calculates available inventory when total inventory is zero' do - # movie.inventory = 0 - # - # available_inventory = movie.calculate_available_inventory - # - # expect(available_inventory).must_equal 0 - # end - # - # # it 'correctly calculates available inventory when rented inventory is zero' do - # # total_inventory = movie.inventory - # # rented_inventory = 0 - # # - # # available_inventory = total_inventory - rented_inventory - # # - # # expect(available_inventory).must_equal total_inventory - # # end - # - # # QUESION: improve error handling here? - # it 'throws an error if available_inventory falls below zero' do - # movie.inventory = -100 - # - # available_inventory = movie.calculate_available_inventory - # - # expect { available_inventory }.must_raise StandardError - # end - # - # describe 'save_available_inventory' do - # # QUESION: improve error handling here? - # it 'can successfully save newly-assigned inventory value' do - # result = movie.save_available_inventory(0) - # expect(result).must_equal true - # - # result = movie.save_available_inventory(10) - # expect(result).must_equal true - # end - # - # it 'throws an error if save is unsuccessful' do - # result = movie.save_available_inventory('a') - # expect { result }.must_raise StandardError - # - # result = movie.save_available_inventory(-1) - # expect { result }.must_raise StandardError - # end - # - # - # end +# describe 'calculate_available_inventory' do +# +# it 'correctly calculates available inventory when value is positive' do +# total_inventory = movie.inventory +# rented_inventory = movie.rentals.length +# +# available_inventory = movie.calculate_available_inventory +# +# expect(available_inventory).must_equal 2 +# end +# +# it 'correctly calculates available inventory when value is zero' do +# rented_inventory = movie.rentals.length +# movie.inventory = rented_inventory +# +# available_inventory = movie.calculate_available_inventory +# +# expect(available_inventory).must_equal 0 +# end +# +# it 'correctly calculates available inventory when total inventory is zero' do +# movie.inventory = 0 +# +# available_inventory = movie.calculate_available_inventory +# +# expect(available_inventory).must_equal 0 +# end +# +# # it 'correctly calculates available inventory when rented inventory is zero' do +# # total_inventory = movie.inventory +# # rented_inventory = 0 +# # +# # available_inventory = total_inventory - rented_inventory +# # +# # expect(available_inventory).must_equal total_inventory +# # end +# +# # QUESION: improve error handling here? +# it 'throws an error if available_inventory falls below zero' do +# movie.inventory = -100 +# +# available_inventory = movie.calculate_available_inventory +# +# expect { available_inventory }.must_raise StandardError +# end +# +# describe 'save_available_inventory' do +# # QUESION: improve error handling here? +# it 'can successfully save newly-assigned inventory value' do +# result = movie.save_available_inventory(0) +# expect(result).must_equal true +# +# result = movie.save_available_inventory(10) +# expect(result).must_equal true +# end +# +# it 'throws an error if save is unsuccessful' do +# result = movie.save_available_inventory('a') +# expect { result }.must_raise StandardError +# +# result = movie.save_available_inventory(-1) +# expect { result }.must_raise StandardError +# end +# +# +# end end From 4afb6af793b2a07e6f252d03c5a4bd3d1ce6ec34 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 14:34:40 -0800 Subject: [PATCH 32/42] fixed model methods for caclcuate+s available inventory in movies --- app/models/movie.rb | 15 ++--- test/models/movie_test.rb | 129 +++++++++++++++++--------------------- 2 files changed, 65 insertions(+), 79 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index fb7d727bf..d4b73c8e4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -23,22 +23,23 @@ def calculate_available_inventory() available_inventory = total_inventory - rented_inventory if !(available_inventory >= 0) - # TODO: improve error handling here? - raise StandardError, "AVAILABLE INVENTORY CANNOT BE LESS THAN ZERO" - end + # We decided to return 0 in this case since if the value somehow dips below 0, then user shouldn't be able to rent this particular movie + return 0 + else - return available_inventory + return available_inventory + end end def save_available_inventory(calculate_available_inventory) - available_inventory = calculate_available_inventory() + available_inventory = calculate_available_inventory self.available_inventory = available_inventory - # QUESTION: error handling for successful or failed save? result = self.save if !result - raise StandardError, "COULD NOT SAVE AVAILABLE INVENTORY" + # NOTE: this is for our benefit; not the user's - it is unlikely they will reach this point given safeguards in calculate_available_inventory. + raise StandardError, "Unable to save available inventory: must be a non-negative integer" end return result diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 6ab3a587e..c26a757bf 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -29,7 +29,6 @@ end it "requires unique titles within release dates" do - category = 'album' # movie.valid?.must_equal true title = movie.title @@ -120,81 +119,67 @@ } ) -all_rentals = movie.rentals.length -checked_in_rentals = movie.rentals.count { |rental| !rental.checked_out? } -checked_out_rentals = all_rentals - checked_in_rentals + all_rentals = movie.rentals.length + checked_in_rentals = movie.rentals.count { |rental| !rental.checked_out? } + checked_out_rentals = all_rentals - checked_in_rentals -calculation = movie.calculate_checked_out_rentals + calculation = movie.calculate_checked_out_rentals -expect(calculation).must_equal checked_out_rentals + expect(calculation).must_equal checked_out_rentals -end + end end -# describe 'calculate_available_inventory' do -# -# it 'correctly calculates available inventory when value is positive' do -# total_inventory = movie.inventory -# rented_inventory = movie.rentals.length -# -# available_inventory = movie.calculate_available_inventory -# -# expect(available_inventory).must_equal 2 -# end -# -# it 'correctly calculates available inventory when value is zero' do -# rented_inventory = movie.rentals.length -# movie.inventory = rented_inventory -# -# available_inventory = movie.calculate_available_inventory -# -# expect(available_inventory).must_equal 0 -# end -# -# it 'correctly calculates available inventory when total inventory is zero' do -# movie.inventory = 0 -# -# available_inventory = movie.calculate_available_inventory -# -# expect(available_inventory).must_equal 0 -# end -# -# # it 'correctly calculates available inventory when rented inventory is zero' do -# # total_inventory = movie.inventory -# # rented_inventory = 0 -# # -# # available_inventory = total_inventory - rented_inventory -# # -# # expect(available_inventory).must_equal total_inventory -# # end -# -# # QUESION: improve error handling here? -# it 'throws an error if available_inventory falls below zero' do -# movie.inventory = -100 -# -# available_inventory = movie.calculate_available_inventory -# -# expect { available_inventory }.must_raise StandardError -# end -# -# describe 'save_available_inventory' do -# # QUESION: improve error handling here? -# it 'can successfully save newly-assigned inventory value' do -# result = movie.save_available_inventory(0) -# expect(result).must_equal true -# -# result = movie.save_available_inventory(10) -# expect(result).must_equal true -# end -# -# it 'throws an error if save is unsuccessful' do -# result = movie.save_available_inventory('a') -# expect { result }.must_raise StandardError -# -# result = movie.save_available_inventory(-1) -# expect { result }.must_raise StandardError -# end -# +describe 'calculate_available_inventory' do + + it 'correctly calculates available inventory with valid value' do + total_inventory = movie.inventory + rented_inventory = movie.calculate_checked_out_rentals() + + available_inventory = total_inventory - rented_inventory + + calculation = movie.calculate_available_inventory + + expect(calculation).must_equal available_inventory + end # -# end + it 'correctly calculates available inventory when value is zero' do + rented_inventory = movie.calculate_checked_out_rentals() + + movie.inventory = rented_inventory + total_inventory = movie.inventory + + available_inventory = total_inventory - rented_inventory + + calculation = movie.calculate_available_inventory + + expect(calculation).must_equal 0 + expect(calculation).must_equal available_inventory + end + + # QUESION: improve error handling here? + it 'throws an error if available_inventory falls below zero' do + movie.inventory = 0 + calculation = movie.calculate_available_inventory + + expect(calculation).must_equal 0 + end +end + + describe 'save_available_inventory' do + # QUESION: improve error handling here? + it 'can successfully save newly-assigned inventory value' do + result = movie.save_available_inventory(0) + expect(result).must_equal true + + result = movie.save_available_inventory(10) + expect(result).must_equal true + end + + it 'throws an error if save is unsuccessful' do + expect { movie.save_available_inventory(-1) }.must_raise StandardError + end + + +end end From 8c052b60b728b4bf88bebbb1be162177f5c2af8b Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Wed, 7 Nov 2018 14:49:55 -0800 Subject: [PATCH 33/42] Rework checkin method to use post. Tests passing for all but inventory under checkin. --- app/controllers/rentals_controller.rb | 36 +++++++++--- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 65 ++++++++++++++++----- test/fixtures/movies.yml | 4 +- 4 files changed, 80 insertions(+), 27 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index abda49714..4f10a4ce9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,22 +14,40 @@ def checkout # movie_id = params[:movie_id].to_i # movie = Movie.find_by(id: movie_id) movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) # customer_id = params[:customer_id].to_i # customer = Customer.find_by(id: customer_id) - rental = Rental.new(rental_params) - # rental = Rental.new(movie_id: movie_id, customer_id: customer_id, check_out: check_out, due_date: due_date) - - if rental.save - movie.calculate_available_inventory - render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok - + if movie == nil || customer == nil + render json: {errors: "No movie checked out, missing movie or customer"}, status: :bad_request else - render_error(:bad_request, rental.errors.messages) + if movie.available_inventory > 0 + rental = Rental.new(rental_params) + if rental.save + movie.calculate_available_inventory + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + else + render_error(:bad_request, rental.errors.messages) + end + else + render json: {errors: "No available movies in inventory"}, status: :ok + end end end def checkin - + movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) + if movie == nil || customer == nil + render json: {errors: "Not checked in. Customer or Movie id is invalid"}, status: :not_found + else + rental = Rental.find_by(movie_id: movie.id, customer_id: rental_params[:customer_id], checkedout: true) + if rental.update(checkedout: false) + movie.calculate_available_inventory + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + else + render_error(:not_found, rental.errors.messages) + end + end end diff --git a/config/routes.rb b/config/routes.rb index 41da2f87a..8e581b02c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,5 +7,5 @@ post 'rentals/check-out', to: 'rentals#checkout', as: 'checkout' - patch 'rentals/:id/check-in', to: 'rentals#checkin', as: 'checkin' + post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1a388f80a..512f39006 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,11 +14,12 @@ expect(Rental.count).must_equal 3 must_respond_with :success expect(Movie.first.available_inventory).must_equal 0 + expect(Rental.last.checkedout).must_equal true end it "returns an error for invalid rental data" do - expect { + expect{ post checkout_path, params: { movie_id: nil, customer_id: Customer.first.id } }.wont_change "Rental.count" @@ -29,21 +30,53 @@ must_respond_with :bad_request end + + it "returns an unavailable error message if available inventory is 0" do + movie = Movie.first + movie.update(available_inventory: 0) + expect{ + post checkout_path, params: { movie_id: Movie.first.id, customer_id: Customer.first.id } + }.wont_change "Rental.count" + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + + must_respond_with :success + + end end - # describe "rentals check_in" do - # it "successfully changes checked_out status to false" do - # expect { - # post check_out_path, params: { movie_id: nil, customer_id: customers.first.id } - # - # 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.checkout_status).must_equal false - # must_respond_with :success - # end - # end + describe "rentals check_in" do + let(:rental_data) { + { + movie_id: Movie.first.id, + customer_id: Customer.first.id, + } + } + it "successfully changes checked_out status to false" do + post checkout_path, params: rental_data + expect { + post checkin_path, params: rental_data }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + expect(Rental.last.checkedout).must_equal false + must_respond_with :success + end + + it "successfully adds movie back to available inventory" do + post checkout_path, params: rental_data + expect{post checkin_path, params: rental_data}.must_change "Movie.first.available_inventory", 1 + end + + it "returns not found if trying to check in a movie without a valid customer or movie id" do + + post checkin_path, params: { movie_id: nil, customer_id: Customer.first.id } + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 069749def..17bf4b1a4 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,10 +4,12 @@ one: title: GreatMovie overview: A really great movie release_date: 2018-11-05 - inventory: 1 + inventory: 10 + available_inventory: 10 two: title: Second Movie overview: Better Movie release_date: 2018-11-15 inventory: 1 + available_inventory: 1 From 4a185287c9ab5d30aafff8c252d91c8a7697d8f7 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Wed, 7 Nov 2018 15:50:04 -0800 Subject: [PATCH 34/42] began controller testing for Movies#create, but still a work in progress --- app/controllers/movies_controller.rb | 19 +++++-- test/controllers/movies_controller_test.rb | 66 +++++++++++++++++++++- test/models/movie_test.rb | 56 ++++++++---------- 3 files changed, 100 insertions(+), 41 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ea4d7a948..1103717b0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,8 +10,8 @@ def show movie = Movie.find_by(id: movie_id) if movie - # NOTE: might need to tweak the code a little to get it working - movie.calculate_available_inventory + avail = movie.calculate_available_inventory + result = movie.save_available_inventory(avail) render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok else @@ -22,16 +22,23 @@ def show def create # TODO: validations for non-string entries # TODO: move params to private for now + + # TODO: this is a band-aid... should find a better solution... + if params[:inventory].blank? || params[:inventory].nil? + params[:inventory] = 0 + end + movie = Movie.new(title: params[:title], release_date: params[:release_date], overview: params[:overview], inventory: params[:inventory]) - # TODO: uncomment below once we know more about rentals - # movie.available_inventory = movie.calculate_available_inventory + # new movies have inventory and available_inventory of 0 + # avail = movie.calculate_available_inventory + # result = movie.save_available_inventory(avail) - if movie.save + result = movie.save + if result movie_id = movie.id render json: movie.as_json(only: :id), status: :ok else - # QUESTION: is this ok as an error message? render_error(:bad_request, movie.errors.messages) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 82b18efbc..486f50792 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -53,7 +53,67 @@ def check_response(expected_type:, expected_status: :success) end end -# describe 'create' do -# TODO -# end + describe "create" do + let(:movie_data) { + { + title: 'good new movie' + } + } + + it "creates a movie with valid data" do + # new_movie_params = { + # title: 'good new movie', + # release_date: '1978-01-2' + # } + + before_count = Movie.count + + + post movies_path, params: movie_data + must_respond_with :success + expect(Movie.count).must_equal (before_count+1) + + expect(Movie.last.title).must_equal 'good new movie' + + + # new_movie_params = new_movie_params.to_json + + # expect { + # post movies_path, params: new_movie_params + # }.must_change 'Movie.count', 1 + # + # new_movie = Movie.find_by(title: 'good new movie') + # + # # get movie_path(movie) + # body = check_response(expected_type: Hash, expected_status: :ok) + # expect(body).must_include 'errors' + end + # # + # it "renders bad_request and does not update the DB for bogus data" do + # new_work_params[:work][:title] = nil + # + # expect { + # post works_path, params: new_work_params + # }.wont_change 'Work.count' + # + # expect(flash[:status]).must_equal :failure + # + # must_respond_with :bad_request + # end + # + # it "renders 400 bad_request for bogus categories" do + # INVALID_CATEGORIES.each do |category| + # new_work_params[:work][:category] = category + # + # expect { + # post works_path, params: new_work_params + # }.wont_change 'Work.count' + # + # expect(flash[:status]).must_equal :failure + # + # must_respond_with :bad_request + # end + # end + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index c26a757bf..3ca130cd2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -10,13 +10,6 @@ rental.must_be_kind_of Rental end end - - # it "has a list of renting customers" do - # movie.rentals.must_respond_to :customers - # movie.rentals.customers.each do |customer| - # customer.must_be_kind_of Customer - # end - # end end describe "validations" do @@ -29,7 +22,7 @@ end it "requires unique titles within release dates" do - # movie.valid?.must_equal true + movie.valid?.must_equal true title = movie.title release_date = movie.release_date @@ -41,21 +34,21 @@ movie2.errors.messages.must_include :title end - # it "does not require a unique title if the release date is different" do - # title = movie.title - # - # movie2 = Movie.new(title: title, release_date: '1977-11-08') - # movie2.save - # movie2.valid?.must_equal true - # end - - # it 'requires a non-negative inventory int value' do - # movie.inventory = 1 - # movie.valid?.must_equal true - # - # movie.inventory = 0 - # movie.valid?.must_equal true - # end + it "does not require a unique title if the release date is different" do + title = movie.title + + movie2 = Movie.new(title: title, release_date: '1977-11-08') + movie2.save + movie2.valid?.must_equal true + end + + it 'approves a non-negative inventory int value' do + movie.inventory = 1 + movie.valid?.must_equal true + + movie.inventory = 0 + movie.valid?.must_equal true + end it 'will not save a non-negative inventory int value' do @@ -69,14 +62,14 @@ movie.valid?.must_equal false end - # it 'requires a non-negative available_inventory int value' do - # movie.available_inventory = 1 - # movie.valid?.must_equal true - # - # movie.available_inventory = 0 - # movie.valid?.must_equal true - # - # end + it 'approves a non-negative available_inventory int value' do + movie.available_inventory = 1 + movie.valid?.must_equal true + + movie.available_inventory = 0 + movie.valid?.must_equal true + + end it 'requires a non-negative available_inventory int value' do @@ -167,7 +160,6 @@ end describe 'save_available_inventory' do - # QUESION: improve error handling here? it 'can successfully save newly-assigned inventory value' do result = movie.save_available_inventory(0) expect(result).must_equal true From e6269c4c529e46609bb0529cbd125feb629c1773 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Wed, 7 Nov 2018 20:50:58 -0800 Subject: [PATCH 35/42] Rework rentals controller and test to account for changed movie inventory methods. Fix reference to customer in customer test file. --- app/controllers/rentals_controller.rb | 6 ++++-- test/controllers/rentals_controller_test.rb | 6 +++--- test/models/customer_test.rb | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4f10a4ce9..4bbdc8ba1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,7 +23,8 @@ def checkout if movie.available_inventory > 0 rental = Rental.new(rental_params) if rental.save - movie.calculate_available_inventory + inventory = movie.calculate_available_inventory() + movie.save_available_inventory(inventory) render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok else render_error(:bad_request, rental.errors.messages) @@ -42,7 +43,8 @@ def checkin else rental = Rental.find_by(movie_id: movie.id, customer_id: rental_params[:customer_id], checkedout: true) if rental.update(checkedout: false) - movie.calculate_available_inventory + inventory = movie.calculate_available_inventory() + movie.save_available_inventory(inventory) render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok else render_error(:not_found, rental.errors.messages) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 512f39006..4a92fb460 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,7 +5,7 @@ describe "rentals checkout" do let(:rental_data) { { - movie_id: Movie.first.id, + movie_id: Movie.last.id, customer_id: Customer.first.id, } } @@ -50,7 +50,7 @@ describe "rentals check_in" do let(:rental_data) { { - movie_id: Movie.first.id, + movie_id: Movie.last.id, customer_id: Customer.first.id, } } @@ -68,7 +68,7 @@ it "successfully adds movie back to available inventory" do post checkout_path, params: rental_data - expect{post checkin_path, params: rental_data}.must_change "Movie.first.available_inventory", 1 + expect{post checkin_path, params: rental_data}.must_change "Movie.last.available_inventory", +1 end it "returns not found if trying to check in a movie without a valid customer or movie id" do diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index dabe00740..9a2dbb5ef 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,7 +9,7 @@ describe "relations" do it "has a list of rentals" do - customer = customers(:one) + customer = customers(:customer1) customer.must_respond_to :rentals customer.rentals.each do |rental| rental.must_be_kind_of Rental From 4a4fd0f1177f0dbbf32a1a201c707d37308850ea Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Wed, 7 Nov 2018 21:25:01 -0800 Subject: [PATCH 36/42] Add change to customer movies checked out total in rental checkout and checkin methods. --- app/controllers/rentals_controller.rb | 4 ++++ test/controllers/rentals_controller_test.rb | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4bbdc8ba1..18f8cba5c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -25,6 +25,8 @@ def checkout if rental.save inventory = movie.calculate_available_inventory() movie.save_available_inventory(inventory) + customer[:movies_checked_out_count] += 1 + customer.save render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok else render_error(:bad_request, rental.errors.messages) @@ -45,6 +47,8 @@ def checkin if rental.update(checkedout: false) inventory = movie.calculate_available_inventory() movie.save_available_inventory(inventory) + customer[:movies_checked_out_count] -= 1 + customer.save render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok else render_error(:not_found, rental.errors.messages) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4a92fb460..afacbf382 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -15,6 +15,7 @@ must_respond_with :success expect(Movie.first.available_inventory).must_equal 0 expect(Rental.last.checkedout).must_equal true + expect(Customer.first.movies_checked_out_count).must_equal 1 end @@ -43,7 +44,6 @@ expect(body).must_include "errors" must_respond_with :success - end end @@ -63,6 +63,7 @@ expect(body).must_be_kind_of Hash expect(body).must_include "id" expect(Rental.last.checkedout).must_equal false + expect(Customer.first.movies_checked_out_count).must_equal 0 must_respond_with :success end From 9797f86086859a961a6e7611aeaa542b9c8cf68c Mon Sep 17 00:00:00 2001 From: kangazoom Date: Thu, 8 Nov 2018 09:24:29 -0800 Subject: [PATCH 37/42] added null:false to movies inventory column --- .../20181108171823_add_no_false_to_inventory_column.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181108171823_add_no_false_to_inventory_column.rb diff --git a/db/migrate/20181108171823_add_no_false_to_inventory_column.rb b/db/migrate/20181108171823_add_no_false_to_inventory_column.rb new file mode 100644 index 000000000..20786efc9 --- /dev/null +++ b/db/migrate/20181108171823_add_no_false_to_inventory_column.rb @@ -0,0 +1,5 @@ +class AddNoFalseToInventoryColumn < ActiveRecord::Migration[5.2] + def change + change_column_null(:movies, :inventory, false) + end +end diff --git a/db/schema.rb b/db/schema.rb index 07e93289d..8fe31936c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_185036) do +ActiveRecord::Schema.define(version: 2018_11_08_171823) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,7 +32,7 @@ t.string "title" t.string "overview" t.date "release_date" - t.integer "inventory", default: 0 + t.integer "inventory", default: 0, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "available_inventory", default: 0 From 6abbd7081817293862bfbed3489611d90becea46 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Fri, 9 Nov 2018 05:47:27 -0800 Subject: [PATCH 38/42] changed inventory presence to true (allow nil didn't work); wrote model test --- app/controllers/movies_controller.rb | 6 +++--- app/models/movie.rb | 2 +- test/controllers/movies_controller_test.rb | 3 ++- test/models/movie_test.rb | 6 ++++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1103717b0..b486f7aef 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -24,9 +24,9 @@ def create # TODO: move params to private for now # TODO: this is a band-aid... should find a better solution... - if params[:inventory].blank? || params[:inventory].nil? - params[:inventory] = 0 - end + # if params[:inventory].blank? || params[:inventory].nil? + # params[:inventory] = 0 + # end movie = Movie.new(title: params[:title], release_date: params[:release_date], overview: params[:overview], inventory: params[:inventory]) diff --git a/app/models/movie.rb b/app/models/movie.rb index d4b73c8e4..699d7707e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,7 +2,7 @@ class Movie < ApplicationRecord has_many :rentals, dependent: :delete_all validates :title, presence: true, uniqueness: { scope: :release_date } - validates :inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } + validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0, only_integer: true } validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } # TODO: uncomment below once we know more about rentals diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 486f50792..4628c253c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,7 +56,8 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:movie_data) { { - title: 'good new movie' + title: 'good new movie', + inventory: 3 } } diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3ca130cd2..8c67f4d0b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -50,6 +50,12 @@ movie.valid?.must_equal true end + it "requires an inventory" do + movie.inventory = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + it 'will not save a non-negative inventory int value' do movie.inventory = -1 From d429ff6f604da07b96b01162e6b55d9d1c36c93f Mon Sep 17 00:00:00 2001 From: kangazoom Date: Fri, 9 Nov 2018 05:52:25 -0800 Subject: [PATCH 39/42] finished controller tests for Movies#creates; all passing --- test/controllers/movies_controller_test.rb | 58 ++++++---------------- 1 file changed, 15 insertions(+), 43 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 4628c253c..663206250 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -62,59 +62,31 @@ def check_response(expected_type:, expected_status: :success) } it "creates a movie with valid data" do - # new_movie_params = { - # title: 'good new movie', - # release_date: '1978-01-2' - # } before_count = Movie.count post movies_path, params: movie_data - must_respond_with :success - expect(Movie.count).must_equal (before_count+1) + body = check_response(expected_type: Hash, expected_status: :ok) + expect(Movie.count).must_equal (before_count+1) expect(Movie.last.title).must_equal 'good new movie' + end - # new_movie_params = new_movie_params.to_json + it "returns an error for invalid movie data" do + # arrange + movie_data[:title] = nil - # expect { - # post movies_path, params: new_movie_params - # }.must_change 'Movie.count', 1 - # - # new_movie = Movie.find_by(title: 'good new movie') - # - # # get movie_path(movie) - # body = check_response(expected_type: Hash, expected_status: :ok) - # expect(body).must_include 'errors' - end - # # - # it "renders bad_request and does not update the DB for bogus data" do - # new_work_params[:work][:title] = nil - # - # expect { - # post works_path, params: new_work_params - # }.wont_change 'Work.count' - # - # expect(flash[:status]).must_equal :failure - # - # must_respond_with :bad_request - # end - # - # it "renders 400 bad_request for bogus categories" do - # INVALID_CATEGORIES.each do |category| - # new_work_params[:work][:category] = category - # - # expect { - # post works_path, params: new_work_params - # }.wont_change 'Work.count' - # - # expect(flash[:status]).must_equal :failure - # - # must_respond_with :bad_request - # end - # end + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body).must_include 'errors' + end end end From 74064d7f59750071efb16aeb8ad21f6186c2c040 Mon Sep 17 00:00:00 2001 From: kangazoom Date: Fri, 9 Nov 2018 05:56:29 -0800 Subject: [PATCH 40/42] added presence validation + testing for Movies release_date column --- app/models/movie.rb | 2 +- test/models/movie_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 699d7707e..a973cc517 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,10 +2,10 @@ class Movie < ApplicationRecord has_many :rentals, dependent: :delete_all validates :title, presence: true, uniqueness: { scope: :release_date } + validates :release_date, presence: true validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0, only_integer: true } validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } - # TODO: uncomment below once we know more about rentals def calculate_checked_out_rentals() rentals = self.rentals diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8c67f4d0b..b5dfaabec 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -56,6 +56,12 @@ movie.errors.messages.must_include :inventory end + it "requires an inventory" do + movie.release_date = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end + it 'will not save a non-negative inventory int value' do movie.inventory = -1 From b4b2e1c0fc82d064dae03ed669af266055ceb91b Mon Sep 17 00:00:00 2001 From: kangazoom Date: Fri, 9 Nov 2018 06:25:43 -0800 Subject: [PATCH 41/42] added some validations for release_date + testing --- app/models/movie.rb | 8 +++++++ test/models/movie_test.rb | 48 +++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index a973cc517..a5708aa66 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,6 +5,7 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0, only_integer: true } validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } + validate :checks_valid_release_date def calculate_checked_out_rentals() @@ -45,4 +46,11 @@ def save_available_inventory(calculate_available_inventory) return result end + def checks_valid_release_date + if !release_date.nil? + if !release_date.is_a?(Date) + errors.add(:release_date, "Invalid release date. Must be in the format: YYYY-MM-DD") + end + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index b5dfaabec..615b97417 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -13,8 +13,10 @@ end describe "validations" do + + # -- title -- # it "requires a title" do - # movie.valid?.must_equal true + movie.valid?.must_equal true movie.title = nil movie.valid?.must_equal false @@ -42,6 +44,8 @@ movie2.valid?.must_equal true end + # -- inventory -- # + it 'approves a non-negative inventory int value' do movie.inventory = 1 movie.valid?.must_equal true @@ -50,12 +54,6 @@ movie.valid?.must_equal true end - it "requires an inventory" do - movie.inventory = nil - movie.valid?.must_equal false - movie.errors.messages.must_include :inventory - end - it "requires an inventory" do movie.release_date = nil movie.valid?.must_equal false @@ -74,19 +72,17 @@ movie.valid?.must_equal false end + # -- available_inventory -- # + it 'approves a non-negative available_inventory int value' do movie.available_inventory = 1 movie.valid?.must_equal true movie.available_inventory = 0 movie.valid?.must_equal true - end - it 'requires a non-negative available_inventory int value' do - - movie.available_inventory = -1 movie.valid?.must_equal false @@ -96,6 +92,20 @@ movie.available_inventory = 'a' movie.valid?.must_equal false end + + # -- release_date -- # + + it "requires a release date" do + movie.release_date = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end + + it "will not accept invalid release dates" do + movie.release_date = '2003' + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end end # -- custom model methods -- # @@ -124,15 +134,15 @@ } ) - all_rentals = movie.rentals.length - checked_in_rentals = movie.rentals.count { |rental| !rental.checked_out? } - checked_out_rentals = all_rentals - checked_in_rentals +all_rentals = movie.rentals.length +checked_in_rentals = movie.rentals.count { |rental| !rental.checked_out? } +checked_out_rentals = all_rentals - checked_in_rentals - calculation = movie.calculate_checked_out_rentals +calculation = movie.calculate_checked_out_rentals - expect(calculation).must_equal checked_out_rentals +expect(calculation).must_equal checked_out_rentals - end +end end describe 'calculate_available_inventory' do @@ -147,7 +157,7 @@ expect(calculation).must_equal available_inventory end -# + # it 'correctly calculates available inventory when value is zero' do rented_inventory = movie.calculate_checked_out_rentals() @@ -171,7 +181,7 @@ end end - describe 'save_available_inventory' do +describe 'save_available_inventory' do it 'can successfully save newly-assigned inventory value' do result = movie.save_available_inventory(0) expect(result).must_equal true From ef3216a294dbb871007a6715992d72cf845a742d Mon Sep 17 00:00:00 2001 From: kangazoom Date: Fri, 9 Nov 2018 06:33:14 -0800 Subject: [PATCH 42/42] added strong params to movies controller + adjusted a test for movie creation --- app/controllers/movies_controller.rb | 20 ++++---------------- app/models/movie.rb | 3 ++- test/controllers/movies_controller_test.rb | 3 ++- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b486f7aef..cc88cc9ca 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,19 +20,7 @@ def show end def create - # TODO: validations for non-string entries - # TODO: move params to private for now - - # TODO: this is a band-aid... should find a better solution... - # if params[:inventory].blank? || params[:inventory].nil? - # params[:inventory] = 0 - # end - - movie = Movie.new(title: params[:title], release_date: params[:release_date], overview: params[:overview], inventory: params[:inventory]) - - # new movies have inventory and available_inventory of 0 - # avail = movie.calculate_available_inventory - # result = movie.save_available_inventory(avail) + movie = Movie.new(movie_params) result = movie.save if result @@ -44,8 +32,8 @@ def create end private - # def movie_params - # params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) - # end + def movie_params + params.permit(:id, :title, :overview, :release_date, :inventory) + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index a5708aa66..972aec577 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,9 +3,10 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: { scope: :release_date } validates :release_date, presence: true + validate :checks_valid_release_date validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0, only_integer: true } validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } - validate :checks_valid_release_date + def calculate_checked_out_rentals() diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 663206250..75e51a827 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -57,7 +57,8 @@ def check_response(expected_type:, expected_status: :success) let(:movie_data) { { title: 'good new movie', - inventory: 3 + inventory: 3, + release_date: '1983-09-09' } }