From 4eda0b673ade39abc9cb33b16a5f41910b35fc76 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Mon, 5 Nov 2018 12:49:50 -0800 Subject: [PATCH 01/56] Created API --- .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 | 10 ++ tmp/.keep | 0 vendor/.keep | 0 57 files changed, 920 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..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..a9f49bedc --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..bd96723f5 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.3 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..9abe319f3 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +ivcPqyHs4lkb1dkC5Bj/vLsi2+fsVYafEBeec68i03ioxSHRnkEaKasBZjBIWSl//sZkfOSDZsldn0ITwx9MJGvPUz5syvEIUo7jmntXJxbnGb9wcqRQ5WnZHpFe4R+Qq3xAcO224wwhyuV5bd1MRTwdjMD/ffSc2jABCIMNScGiHzbzakWSH4+GyjBLNrQUv2EGOH0OG5KqVwEhKsSTxBYSotvU9USf1Ndv5jL7NfbJ4N5SGZkSPPlAfNAAhFalUfETR3jYBIRVc7Sr4U/fkxA5rkYqlm/56qUuWl2ns/QvwEG1corXJOLySbXK8qSpsKM+jUiC65t/IKBP4WXJg+7npuqJtLCl6vehOIvXFrOLgmVS4AbE/mPtkFDu2woHl8RsG79nvoPJSS/CmywGNBaP0Qj+qPbVbpmn--OZy7AIgwKgxYqQfa--K2cNFQ0VeBsKhTGdMAP8KQ== \ 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..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 9bc0e50cf08d37dea269fdb442fca7eee619da86 Mon Sep 17 00:00:00 2001 From: Shelan Date: Mon, 5 Nov 2018 13:26:43 -0800 Subject: [PATCH 02/56] created models, associations and migrations --- app/models/customer.rb | 3 ++ app/models/movie.rb | 3 ++ app/models/rental.rb | 4 ++ db/migrate/20181105205608_create_movies.rb | 12 +++++ db/migrate/20181105205749_create_customers.rb | 16 ++++++ db/migrate/20181105210009_create_rentals.rb | 13 +++++ ...20181105211701_changeinventorytointeger.rb | 5 ++ db/migrate/20181105211951_addinventory.rb | 5 ++ db/schema.rb | 53 +++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++ test/fixtures/movies.yml | 13 +++++ test/fixtures/rentals.yml | 11 ++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 15 files changed, 184 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/20181105205608_create_movies.rb create mode 100644 db/migrate/20181105205749_create_customers.rb create mode 100644 db/migrate/20181105210009_create_rentals.rb create mode 100644 db/migrate/20181105211701_changeinventorytointeger.rb create mode 100644 db/migrate/20181105211951_addinventory.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..666f87ef6 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_many :movies, through: :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..7f51a6afd --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_many :customers, through: :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..e5db47630 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movies + belongs_to :customers +end diff --git a/db/migrate/20181105205608_create_movies.rb b/db/migrate/20181105205608_create_movies.rb new file mode 100644 index 000000000..e218e8559 --- /dev/null +++ b/db/migrate/20181105205608_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.string :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20181105205749_create_customers.rb b/db/migrate/20181105205749_create_customers.rb new file mode 100644 index 000000000..1628eec17 --- /dev/null +++ b/db/migrate/20181105205749_create_customers.rb @@ -0,0 +1,16 @@ +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/20181105210009_create_rentals.rb b/db/migrate/20181105210009_create_rentals.rb new file mode 100644 index 000000000..e2fb8611c --- /dev/null +++ b/db/migrate/20181105210009_create_rentals.rb @@ -0,0 +1,13 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :checkin_date + t.date :due_date + t.belongs_to :movies, index: true, foreign_key: true + t.belongs_to :customers, index: true, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20181105211701_changeinventorytointeger.rb b/db/migrate/20181105211701_changeinventorytointeger.rb new file mode 100644 index 000000000..26f7833f7 --- /dev/null +++ b/db/migrate/20181105211701_changeinventorytointeger.rb @@ -0,0 +1,5 @@ +class Changeinventorytointeger < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :inventory + end +end diff --git a/db/migrate/20181105211951_addinventory.rb b/db/migrate/20181105211951_addinventory.rb new file mode 100644 index 000000000..e4d597145 --- /dev/null +++ b/db/migrate/20181105211951_addinventory.rb @@ -0,0 +1,5 @@ +class Addinventory < ActiveRecord::Migration[5.2] + def change + add_column :movies, :inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2fbce053a --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,53 @@ +# 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_211951) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "inventory" + end + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "checkin_date" + t.date "due_date" + t.bigint "movies_id" + t.bigint "customers_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customers_id"], name: "index_rentals_on_customers_id" + t.index ["movies_id"], name: "index_rentals_on_movies_id" + end + + add_foreign_key "rentals", "customers", column: "customers_id" + add_foreign_key "rentals", "movies", column: "movies_id" +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..cd2772d50 --- /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: + registered_at: + address: + city: + state: + postal_code: + phone: MyString + +two: + name: + registered_at: + address: + city: + state: + postal_code: + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..eaccd9d13 --- /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: + overview: + release_date: + inventory: MyString + +two: + title: + overview: + release_date: + inventory: MyString diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..4505f9e13 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: + checkin_date: + due_date: 2018-11-05 + +two: + checkout_date: + checkin_date: + due_date: 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 c6ea7062daefd1bbf34b30afd6bb0694e62d8697 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Mon, 5 Nov 2018 14:01:45 -0800 Subject: [PATCH 03/56] Continued work on models --- app/models/customer.rb | 2 ++ test/models/customer_test.rb | 59 ++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 666f87ef6..9c1b441e0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals + validates_presence_of :name, :registered_at, :address, :city, :state, :postal_code, :phone + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..e237282d2 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,62 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + describe "validations" do + let(:complete_customer) { + Customer.new name: "Cassy", + registered_at: DateTime.new(2018,11,3), + address: "123 Sunny Lane", + city: "Seattle", + state: "Washington", + postal_code: "98133", + phone: "999-999-9999" + } - it "must be valid" do - value(customer).must_be :valid? + + it "must be valid" do + value(complete_customer).must_be :valid? + end + + it "is invalid if name is missing" do + complete_customer.name = nil + result = complete_customer.valid? + result.must_equal false + end + + it "is invalid if registered_at is missing" do + + end + + it "is invalid if address is missing" do + + end + + it "is invalid if city is missing" do + + end + + it "is invalid if state is missing" do + + end + + it "is invalid if postal code is missing" do + + end + + it "is invalid if phone is missing" do + + end + + + it "is invalid if missing a field" do + + end + end + + describe "relationships" do + + it "has many movies through rentals" do + + end end end From f54994ef24fd64d95dcf8d6adc1c02452a882e42 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Mon, 5 Nov 2018 14:03:26 -0800 Subject: [PATCH 04/56] Added minitest to test helper --- test/test_helper.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..e71d34afc 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,18 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +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 +) + class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From dd12d3073106574c6fbae6774554d413d3aafa7a Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Mon, 5 Nov 2018 14:09:37 -0800 Subject: [PATCH 05/56] Added presence validations --- test/models/customer_test.rb | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index e237282d2..830030649 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -21,36 +21,51 @@ complete_customer.name = nil result = complete_customer.valid? result.must_equal false + expect(complete_customer.errors).must_include "name" end it "is invalid if registered_at is missing" do - + complete_customer.registered_at = nil + result = complete_customer.valid? + result.must_equal false + expect(complete_customer.errors).must_include "registered_at" end it "is invalid if address is missing" do - + complete_customer.address = nil + result = complete_customer.valid? + result.must_equal false + expect(complete_customer.errors).must_include "address" end it "is invalid if city is missing" do - + complete_customer.city = nil + result = complete_customer.valid? + result.must_equal false + expect(complete_customer.errors).must_include "city" end it "is invalid if state is missing" do - + complete_customer.state = nil + result = complete_customer.valid? + result.must_equal false + expect(complete_customer.errors).must_include "state" end it "is invalid if postal code is missing" do - + complete_customer.postal_code = nil + result = complete_customer.valid? + result.must_equal false + expect(complete_customer.errors).must_include "postal_code" end it "is invalid if phone is missing" do - + complete_customer.phone = nil + result = complete_customer.valid? + result.must_equal false + expect(complete_customer.errors).must_include "phone" end - - it "is invalid if missing a field" do - - end end describe "relationships" do From 5b2e46814796b6abc678b61f47dd9af5b2b4136a Mon Sep 17 00:00:00 2001 From: Shelan Date: Mon, 5 Nov 2018 14:15:03 -0800 Subject: [PATCH 06/56] added fixtures --- test/fixtures/movies.yml | 26 +++++++++++++++---------- test/models/movie_test.rb | 41 ++++++++++++++++++++++++++++++++++----- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index eaccd9d13..5d76a163e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: - overview: - release_date: - inventory: MyString +scary: + title: The Blue Door + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life + release_date: 1979-01-18 + inventory: 10 -two: - title: - overview: - release_date: - inventory: MyString +romantic: + title: Women Of Destruction + overview: But what if this strange woman is a con artist. Or what if everything told is completely true. + release_date: 2006-10-01 + inventory: 1 + +funny: + title: Robots Of Eternity + overview: But what if this childhood friend is just a crazy person. + release_date: 1948-03-31 + inventory: 9 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..1a2d69f0d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,40 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:scary) { movies(:scary) } + let(:romantic) { movies(:romantic) } + let(:funny) { movies(:funny) } - it "must be valid" do - value(movie).must_be :valid? - end -end + describe "relations" do + it "has customers through rentals" do + end + + decribe "validations" do + it "must be valid" do + expect(scary).must_be :valid? + end + + it "requires a title" do + end + + it "require" + +has_many :customers, through: :rentals + +scary: + title: The Blue Door + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life + release_date: 1979-01-18 + inventory: 10 + +romantic: + title: Women Of Destruction + overview: But what if this strange woman is a con artist. Or what if everything told is completely true. + release_date: 2006-10-01 + inventory: 1 + +funny: + title: Robots Of Eternity + overview: But what if this childhood friend is just a crazy person. + release_date: 1948-03-31 + inventory: 9 From 9812458f67b898b33e3a2c6527a869de65772a64 Mon Sep 17 00:00:00 2001 From: Shelan Date: Mon, 5 Nov 2018 16:01:00 -0800 Subject: [PATCH 07/56] model-movie validations --- app/models/movie.rb | 5 +++ test/fixtures/movies.yml | 6 ++++ test/models/movie_test.rb | 65 ++++++++++++++++++++++----------------- 3 files changed, 48 insertions(+), 28 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 7f51a6afd..9e50d55c9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,8 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 5d76a163e..938d91b98 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -17,3 +17,9 @@ funny: overview: But what if this childhood friend is just a crazy person. release_date: 1948-03-31 inventory: 9 + +fake: + title: nil + overview: nil + release_date: nil + inventory: nil diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 1a2d69f0d..2d6b0db09 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,40 +1,49 @@ require "test_helper" describe Movie do - let(:scary) { movies(:scary) } - let(:romantic) { movies(:romantic) } - let(:funny) { movies(:funny) } + describe "validations" do + let(:complete_movie) { + Movie.new title: "Cher", + overview: "The Best Movie", + release_date: DateTime.new(2018,11,3), + inventory: 2 + } - describe "relations" do - it "has customers through rentals" do - end - - decribe "validations" do it "must be valid" do - expect(scary).must_be :valid? + value(complete_movie).must_be :valid? end - it "requires a title" do - end + it "is invalid if title is missing" do + complete_movie.title = nil + result = complete_movie.valid? + result.must_equal false + expect(complete_movie.errors).must_include "title" + end - it "require" + it "is invalid if overview is missing" do + complete_movie.overview = nil + result = complete_movie.valid? + result.must_equal false + expect(complete_movie.errors).must_include "overview" + end -has_many :customers, through: :rentals + it "is invalid if release_date is missing" do + complete_movie.release_date = nil + result = complete_movie.valid? + result.must_equal false + expect(complete_movie.errors).must_include "release_date" + end -scary: - title: The Blue Door - overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life - release_date: 1979-01-18 - inventory: 10 + it "is invalid if inventory is missing" do + complete_movie.inventory = nil + result = complete_movie.valid? + result.must_equal false + expect(complete_movie.errors).must_include "inventory" + end + end -romantic: - title: Women Of Destruction - overview: But what if this strange woman is a con artist. Or what if everything told is completely true. - release_date: 2006-10-01 - inventory: 1 + describe "relations" do + it "has many customers through rental" do + end -funny: - title: Robots Of Eternity - overview: But what if this childhood friend is just a crazy person. - release_date: 1948-03-31 - inventory: 9 +end From 91628d8859def6d99170ba939707e9256ff845c7 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Mon, 5 Nov 2018 16:12:36 -0800 Subject: [PATCH 08/56] Updated schema and relationships --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 4 +-- ...235159_update_ids_in_rentalsto_singular.rb | 6 ++++ db/schema.rb | 14 ++++---- test/fixtures/customers.yml | 32 +++++++++---------- test/fixtures/movies.yml | 20 ++++++------ test/fixtures/rentals.yml | 23 +++++++++---- test/models/customer_test.rb | 9 ++++-- 9 files changed, 67 insertions(+), 43 deletions(-) create mode 100644 db/migrate/20181105235159_update_ids_in_rentalsto_singular.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 9c1b441e0..c3e44bb2b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord + has_many :rentals has_many :movies, through: :rentals validates_presence_of :name, :registered_at, :address, :city, :state, :postal_code, :phone diff --git a/app/models/movie.rb b/app/models/movie.rb index 7f51a6afd..6237ce84b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,4 @@ class Movie < ApplicationRecord + has_many :rentals has_many :customers, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index e5db47630..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord - belongs_to :movies - belongs_to :customers + belongs_to :movie + belongs_to :customer end diff --git a/db/migrate/20181105235159_update_ids_in_rentalsto_singular.rb b/db/migrate/20181105235159_update_ids_in_rentalsto_singular.rb new file mode 100644 index 000000000..d874b17d7 --- /dev/null +++ b/db/migrate/20181105235159_update_ids_in_rentalsto_singular.rb @@ -0,0 +1,6 @@ +class UpdateIdsInRentalstoSingular < ActiveRecord::Migration[5.2] + def change + rename_column :rentals, :movies_id, :movie_id + rename_column :rentals, :customers_id, :customer_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 2fbce053a..cfb89fd88 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_211951) do +ActiveRecord::Schema.define(version: 2018_11_05_235159) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -40,14 +40,14 @@ t.date "checkout_date" t.date "checkin_date" t.date "due_date" - t.bigint "movies_id" - t.bigint "customers_id" + t.bigint "movie_id" + t.bigint "customer_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["customers_id"], name: "index_rentals_on_customers_id" - t.index ["movies_id"], name: "index_rentals_on_movies_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end - add_foreign_key "rentals", "customers", column: "customers_id" - add_foreign_key "rentals", "movies", column: "movies_id" + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index cd2772d50..e3296cedd 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: - registered_at: - address: - city: - state: - postal_code: - phone: MyString +cassy: + name: "Cassy" + registered_at: Date.today - 30 + address: "123 Sunny Lane" + city: "Seattle" + state: "Washington" + postal_code: "98133" + phone: "999-999-9999" -two: - name: - registered_at: - address: - city: - state: - postal_code: - phone: MyString +shelan: + name: "Shelan" + registered_at: Date.today - 25 + address: "111 Breezy Lane" + city: "Seattle" + state: "Washington" + postal_code: "98133" + phone: "999-999-9999" diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index eaccd9d13..c3f06401e 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: - overview: - release_date: - inventory: MyString +scary: + title: "The Meg" + overview: "Scary movie about a giant shark" + release_date: Date.today - 30 + inventory: 3 -two: - title: - overview: - release_date: - inventory: MyString +romantic: + title: "Gone with the wind" + overview: "Romantic movie of some sort" + release_date: Date.today - 900 + inventory: 4 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 4505f9e13..f058e88aa 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - checkout_date: - checkin_date: - due_date: 2018-11-05 + checkout_date: Date.today - 2 + checkin_date: Date.today + due_date: checkout_date + 7 + movie: scary + customer: shelan two: - checkout_date: - checkin_date: - due_date: 2018-11-05 + checkout_date: Date.today - 3 + checkin_date: Date.today + due_date: checkout_date + 7 + movie: romantic + customer: cassy + +three: + checkout_date: Date.today - 3 + checkin_date: Date.today + due_date: checkout_date + 7 + movie: scary + customer: cassy diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 830030649..47423c5b0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,6 +1,9 @@ require "test_helper" describe Customer do + # Add fixture let blocks here + + describe "validations" do let(:complete_customer) { Customer.new name: "Cassy", @@ -12,7 +15,6 @@ phone: "999-999-9999" } - it "must be valid" do value(complete_customer).must_be :valid? end @@ -70,8 +72,11 @@ describe "relationships" do - it "has many movies through rentals" do + it "can have many movies" do + # Act = Add a movie? + end + end end From 12aa54e5cef9cf9954a96d52bcac2af25213dd90 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Mon, 5 Nov 2018 20:24:54 -0800 Subject: [PATCH 09/56] Continued work on customer model tests --- Gemfile | 2 ++ Gemfile.lock | 3 +++ test/fixtures/rentals.yml | 4 ++-- test/models/customer_test.rb | 27 ++++++++++++++++++++------- test/models/movie_test.rb | 5 +++-- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index a9f49bedc..168bfb14d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.5.1' +gem 'rabl', '~> 0.14.0' + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index bd96723f5..61f75d333 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,6 +92,8 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) puma (3.12.0) + rabl (0.14.0) + activesupport (>= 2.3.14) rack (2.0.5) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -157,6 +159,7 @@ DEPENDENCIES pg (>= 0.18, < 2.0) pry-rails puma (~> 3.11) + rabl (~> 0.14.0) rails (~> 5.2.1) spring spring-watcher-listen (~> 2.0.0) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f058e88aa..746e44ad5 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -8,8 +8,8 @@ one: customer: shelan two: - checkout_date: Date.today - 3 - checkin_date: Date.today + checkout_date: <% Date.today - 3 %> + checkin_date: <% Date.today %> due_date: checkout_date + 7 movie: romantic customer: cassy diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 47423c5b0..a82262fbc 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,10 +1,11 @@ require "test_helper" +require 'pry' describe Customer do # Add fixture let blocks here - describe "validations" do + let(:complete_customer) { Customer.new name: "Cassy", registered_at: DateTime.new(2018,11,3), @@ -67,16 +68,28 @@ result.must_equal false expect(complete_customer.errors).must_include "phone" end - end describe "relationships" do - - it "can have many movies" do - # Act = Add a movie? - - + # let( :customer ) { Customer.find_by( name: "Cassy" ) } + # let( :movie ){ Movie.find_by( title: "Robots Of Eternity" ) } + + it "has a list of movies" do + customer = customers[:cassy] + customer.must_respond_to :movies + customer.movies.each do |movie| + movie.must_be_kind_of Movie + end end + # Does customer respond to movies + # Is each item in .movies an array + it "has a list of rentals" do + customer = customers[:cassy] + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2d6b0db09..a05218b92 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -43,7 +43,8 @@ end describe "relations" do - it "has many customers through rental" do - end + it "has many customers through rental" do + end + end end From 7891c68f1114c541b4ad2a636e599b8312743aab Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Mon, 5 Nov 2018 20:27:48 -0800 Subject: [PATCH 10/56] Generated empty controllers for movies, rentals, and customers --- 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 561b08e7a8d0059428c4026f861949d7aeda974f Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 08:37:35 -0800 Subject: [PATCH 11/56] Added customer relationship tests --- test/models/customer_test.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 47423c5b0..f7fc276bf 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -71,12 +71,22 @@ end describe "relationships" do + let(:movie) { movies(:funny) } + let(:customer) { customers(:shelan) } - it "can have many movies" do + it "has a list of movies" do # Act = Add a movie? - - + customer.must_respond_to :movies + customer.movies.each do |movie| + movie.must_be_kind_of Movie + end end + it "has a list of rentals" do + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end end -end +end From c7f17ef979824e394c65f8cc08d9e86cd92591a8 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 08:47:10 -0800 Subject: [PATCH 12/56] Added relationship tests to rental --- test/models/rental_test.rb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..cb2540f66 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,24 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + describe 'validations' do - it "must be valid" do - value(rental).must_be :valid? end + + describe 'relationships' do + let(:rental) { rentals(:one) } + + it "has a movie" do + rental.must_respond_to :movie + rental.movie.must_be_kind_of Movie + end + + it "has a customer" do + rental.must_respond_to :customer + rental.customer.must_be_kind_of Customer + end + + end + + end From 76241c65cea1a54dd73a89798fb2cca5a641985b Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 08:59:57 -0800 Subject: [PATCH 13/56] Continued work on rental model validation tests --- app/models/rental.rb | 1 + test/models/rental_test.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..aadde2a48 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,5 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + validates_presence_of :checkout_date, :due_date, :movie_id, :customer_id end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index cb2540f66..f1f8ee84c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,6 +2,19 @@ describe Rental do describe 'validations' do + let(:complete_rental){ + Rental.new( + checkout_date: (Date.today - 1), + checkin_date: Date.today, + due_date: Date.today + 6, + movie: scary, + customer: cassy + ) + } + + it "must be valid with all fields" do + value(complete_rental).must_be :valid + end end From 6594390010ac921b870a11ce5ef66d593e0cb6de Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 10:51:17 -0800 Subject: [PATCH 14/56] Added presence validation to rental --- app/models/rental.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..aadde2a48 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,5 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + validates_presence_of :checkout_date, :due_date, :movie_id, :customer_id end From dbd115f8627a8095da84ab64790ae9ca817cbb35 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 11:13:30 -0800 Subject: [PATCH 15/56] Finished valid tests for rental model --- test/models/rental_test.rb | 43 ++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index f1f8ee84c..1eefb8e00 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,21 +1,52 @@ require "test_helper" describe Rental do + # Does not know what scary or customer is + # let(:customer){customers[:cassy]} + # let(:movie){movies[:funny]} describe 'validations' do let(:complete_rental){ - Rental.new( - checkout_date: (Date.today - 1), + Rental.new checkout_date: (Date.today - 1), checkin_date: Date.today, due_date: Date.today + 6, - movie: scary, - customer: cassy - ) + movie: Movie.first, + customer: Customer.first + # movie: scary, + # customer: cassy } it "must be valid with all fields" do - value(complete_rental).must_be :valid + value(complete_rental).must_be :valid? end + it "is invalid if checkout date is missing" do + # binding.pry + complete_rental.checkout_date = nil + result = complete_rental.valid? + result.must_equal false + expect(complete_rental.errors).must_include "checkout_date" + end + + it "is invalid if due_date is missing" do + complete_rental.due_date = nil + result = complete_rental.valid? + result.must_equal false + expect(complete_rental.errors).must_include "due_date" + end + + it "is invalid if movie is missing" do + complete_rental.movie_id = nil + result = complete_rental.valid? + result.must_equal false + expect(complete_rental.errors).must_include "movie_id" + end + + it "is invalid if customer is missing" do + complete_rental.customer_id = nil + result = complete_rental.valid? + result.must_equal false + expect(complete_rental.errors).must_include "customer_id" + end end describe 'relationships' do From 7b02ddf5b86a852bd407ea28dcd912740b80efc7 Mon Sep 17 00:00:00 2001 From: Shelan Date: Tue, 6 Nov 2018 11:17:37 -0800 Subject: [PATCH 16/56] movie model testing complete --- test/models/movie_test.rb | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2d6b0db09..8298be37f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,14 +1,14 @@ require "test_helper" describe Movie do - describe "validations" do - let(:complete_movie) { - Movie.new title: "Cher", - overview: "The Best Movie", - release_date: DateTime.new(2018,11,3), - inventory: 2 - } + let(:complete_movie) { + Movie.new title: "Cher", + overview: "The Best Movie", + release_date: DateTime.new(2018,11,3), + inventory: 2 + } + describe "validations" do it "must be valid" do value(complete_movie).must_be :valid? end @@ -43,7 +43,27 @@ end describe "relations" do - it "has many customers through rental" do - end + let(:romantic_movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } + let(:customer) {customers(:cassy) } + + it "has many customers through rental" do + #Act + romantic_movie.customers << Customer.first #add 1st customer to a movie's customer + customers = romantic_movie.customers #customers = movie's customers + #assert + expect(customers.length).must_be :>=, 1 #customers length should change by 1 + customers.each do |customer| + expect(customer).must_be_instance_of Customer + end + end + + it "has many rentals" do + romantic = movies(:romantic) + romantic.must_respond_to :rentals + romantic.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end end From 24d975e30cd362450a8114d0153ebe4009f9b4f5 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 11:24:26 -0800 Subject: [PATCH 17/56] began working on customer index --- app/controllers/customers_controller.rb | 1 + config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 27 ++++++++++++++++--- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..b598c6e33 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,3 @@ class CustomersController < ApplicationController + end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..ebc12d521 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +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/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..e05bc183f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,28 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + + it "is a real working route and returns JSON" do + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + + end + + it "returns an array" do + + end + + it "returns all customers" do + + end + + it "returns customres with exactly the required fields" do + + end + + end end From 2998c54017314a0bf2d661d7f63e535e838d471b Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 11:30:07 -0800 Subject: [PATCH 18/56] Created rabl view for customers --- app/controllers/customers_controller.rb | 4 +++- app/views/customers/index.json.rabl | 2 ++ config/routes.rb | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 app/views/customers/index.json.rabl diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index b598c6e33..d69c4f856 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,3 +1,5 @@ class CustomersController < ApplicationController - + def index + customers = Customer.all + end end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl new file mode 100644 index 000000000..f7bc1c257 --- /dev/null +++ b/app/views/customers/index.json.rabl @@ -0,0 +1,2 @@ +object customers +atrributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count diff --git a/config/routes.rb b/config/routes.rb index ebc12d521..4f4172c95 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do - + # Customer + get '/customers', to: 'customers#index', as: 'customers' end From 51925b33aca25ecc8fca6a8590389c7de449011a Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 11:37:38 -0800 Subject: [PATCH 19/56] Added movie count to customer --- app/views/customers/index.json.rabl | 2 ++ .../20181106193249_addmoviescheckedoutcounttocustomer.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 app/views/customers/index.json.rabl create mode 100644 db/migrate/20181106193249_addmoviescheckedoutcounttocustomer.rb diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl new file mode 100644 index 000000000..f7bc1c257 --- /dev/null +++ b/app/views/customers/index.json.rabl @@ -0,0 +1,2 @@ +object customers +atrributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count diff --git a/db/migrate/20181106193249_addmoviescheckedoutcounttocustomer.rb b/db/migrate/20181106193249_addmoviescheckedoutcounttocustomer.rb new file mode 100644 index 000000000..7ae59cf2f --- /dev/null +++ b/db/migrate/20181106193249_addmoviescheckedoutcounttocustomer.rb @@ -0,0 +1,5 @@ +class Addmoviescheckedoutcounttocustomer < 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 cfb89fd88..cd0a9e4c9 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_235159) do +ActiveRecord::Schema.define(version: 2018_11_06_193249) 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| From ffecf9cddeca53095694bf14dcc3be2cb65bbb08 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 13:38:42 -0800 Subject: [PATCH 20/56] Completed test for customer index/ran smokescreen --- .DS_Store | Bin 0 -> 8196 bytes app/controllers/customers_controller.rb | 3 +- app/views/customers/index.json.rabl | 2 -- test/controllers/customers_controller_test.rb | 30 +++++++++++------- test/fixtures/customers.yml | 4 +-- test/fixtures/movies.yml | 6 ---- test/fixtures/rentals.yml | 16 +++++----- test/models/movie_test.rb | 1 + 8 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 .DS_Store delete mode 100644 app/views/customers/index.json.rabl diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6e5fcc0491f4868f86680917d89ee7894edaa5ec GIT binary patch literal 8196 zcmeHM!EW0&82%Y&j+C^E(k4xU?O-ezP@vh6ECp6zDC)T>I-@A!#X*)J?Oe%LTp==P zNOIC7%izl%V7KnD2iSSXy+Ge!r(ut<0XyxqeI#X9l9TH&z+xc&6#4xmzmF2>Um+q^ z>9y90mWar}C9O4s?2;tgZjuO&(L!FAC;6_fgJLPXHY+7P(^BzAWnzCw$oU)n8BJ!EPYG?^)epcWjrRR zMNS6uR|YeKv0eND30_S)LeCv)rM*b9d!1l6MUUarQSGw!jS+mX##m`T z#W?9_!mo!}1(=;wXk;WN87Do8Ky~2J#_YmO?~-{ETR?waRv*cf840EmC9-QnV3P2eBV=d?*rVJ}%724*RbDGDjVtOKn?dOnKb zs|3SIV4)U88Jy&JDb6_wyYZK+H%{00!f0*nS2j_Ye5W{N7}Lh|_37vJm*S)z*-@Cob;@;SbBUv+KDh4Qu|P;F0ZdH&D)A%LU}wR~~PPlZxo^R;c=^>juLx z4YOe_o}b^{SS@|DcClJIU;kv|)78?(y?YlIrm^_p`u*yQ>3tHy7W&#@ZvX_&B6l zeLu{9KxwFh*F28-v7ZP0ez&XvLvwoO+Vyv5t+^XF=jP`Y78Y(TE-WoCzt^yCI(GA@ z9mu&p6ut;5e$PE<2VSe*wVNJq??vvbsP3J)4eLe*y6v{Uep|J3+689*ZH4OYap1aK z^|y6+7`oA3qP*X*X2WJ6e7`0_FY*N6e-=XZYUFmR{7_)TW2n5@K^{9QJnEh7)-AW4)Pr86W4sU?n+{%~^h+T( zoD^0Mn&)GnKtXd{lJWnetH1w`ff6~zT!HabfK6`JH!I*jIDxWK$XL6C>jf^EB(ATm tazUoTaaa|O!w&yph;j)~=~IqvUt825{pTM7^7B6#=H=(VdJ4xc`xn!`@z4MO literal 0 HcmV?d00001 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d69c4f856..5d501573b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all + customers = Customer.all.order(:name) + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl deleted file mode 100644 index f7bc1c257..000000000 --- a/app/views/customers/index.json.rabl +++ /dev/null @@ -1,2 +0,0 @@ -object customers -atrributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e05bc183f..3a8cf17bc 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,28 +1,34 @@ require "test_helper" describe CustomersController do - describe "index" do - it "is a real working route and returns JSON" do + describe "index" do + before do get customers_path - - body = JSON.parse(response.body) - - expect(body).must_be_kind_of Array - end - it "returns an array" do - + it "should get index as a real working route and returns JSON" do + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success end - it "returns all customers" do + it "returns an array of all customers" do + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_kind_of Array + expect(body.length).must_equal Customer.count end - it "returns customres with exactly the required fields" do + it "returns customers with exactly the required fields" do + keys = %w(id name registered_at postal_code phone movies_checked_out_count).sort + body = JSON.parse(response.body) + body.each do |customer| + expect(customer.keys.sort).must_equal keys + expect(customer.keys.length).must_equal keys.length + end end - end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index e3296cedd..96e629de9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -2,7 +2,7 @@ cassy: name: "Cassy" - registered_at: Date.today - 30 + registered_at: <% Date.today - 30 %> address: "123 Sunny Lane" city: "Seattle" state: "Washington" @@ -11,7 +11,7 @@ cassy: shelan: name: "Shelan" - registered_at: Date.today - 25 + registered_at: <% Date.today - 25 %> address: "111 Breezy Lane" city: "Seattle" state: "Washington" diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 938d91b98..5d76a163e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -17,9 +17,3 @@ funny: overview: But what if this childhood friend is just a crazy person. release_date: 1948-03-31 inventory: 9 - -fake: - title: nil - overview: nil - release_date: nil - inventory: nil diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 746e44ad5..7b1a50499 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,22 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - checkout_date: Date.today - 2 - checkin_date: Date.today - due_date: checkout_date + 7 + checkout_date: <% Date.today - 2 %> + checkin_date: <% Date.today %> + due_date: <% Date.today + 7 %> movie: scary customer: shelan two: checkout_date: <% Date.today - 3 %> - checkin_date: <% Date.today %> - due_date: checkout_date + 7 + checkin_date: <% Date.today %> + due_date: <% Date.today + 7 %> movie: romantic customer: cassy three: - checkout_date: Date.today - 3 - checkin_date: Date.today - due_date: checkout_date + 7 + checkout_date: <% Date.today - 3 %> + checkin_date: <% Date.today %> + due_date: <% Date.today + 7 %> movie: scary customer: cassy diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8298be37f..28f41b9c3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -48,6 +48,7 @@ it "has many customers through rental" do #Act + binding.pry romantic_movie.customers << Customer.first #add 1st customer to a movie's customer customers = romantic_movie.customers #customers = movie's customers From 96a762679a88d2c8ac2e3318ef59e37e5124a1f1 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 14:46:54 -0800 Subject: [PATCH 21/56] completed movie show --- app/controllers/movies_controller.rb | 27 ++++++++++++++++ app/models/movie.rb | 10 ++++++ config/routes.rb | 3 ++ .../20181106220858_addavailableinventory.rb | 5 +++ db/schema.rb | 3 +- test/controllers/movies_controller_test.rb | 31 +++++++++++++++++-- 6 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20181106220858_addavailableinventory.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..33383464d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,29 @@ class MoviesController < ApplicationController + + + + + + + + + + + + + def show + movie = Movie.find_by(id: params[:id]) + + if movie.nil? + render json: { + ok: false, + message: 'not found' }, + status: :not_found + else + render json: { + ok: true, + movie: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok + } + end + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 0533a1b45..adcd431cb 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,8 @@ class Movie < ApplicationRecord + + # Sets default value of available inventory to inventory + before_save :set_available_inventory_default + has_many :rentals has_many :customers, through: :rentals @@ -6,4 +10,10 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true + + private + + def set_available_inventory_default + self.available_inventory = self.inventory + end end diff --git a/config/routes.rb b/config/routes.rb index 4f4172c95..b4a144789 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do # Customer get '/customers', to: 'customers#index', as: 'customers' + + # Movie + resources :movies, only: [:index, :show, :create] end diff --git a/db/migrate/20181106220858_addavailableinventory.rb b/db/migrate/20181106220858_addavailableinventory.rb new file mode 100644 index 000000000..3718bd5f2 --- /dev/null +++ b/db/migrate/20181106220858_addavailableinventory.rb @@ -0,0 +1,5 @@ +class Addavailableinventory < 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 cd0a9e4c9..65721f18d 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_193249) do +ActiveRecord::Schema.define(version: 2018_11_06_220858) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "inventory" + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..716ac1e21 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,32 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + describe "show" do + + it "can retrieve a valid movie and returns JSON" do + get movie_path(Movie.first.id) + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "returns a movie with valid keys" do + get movie_path(Movie.first.id) + body = JSON.parse(response.body) + keys = %w(title overview release_date inventory available_inventory).sort + expect(body["movie"].keys.sort).must_equal keys + end + + it "returns status not found ok false for invalid ids" do + id = -1 + get movie_path(id) + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body["ok"]).must_equal false + expect(body["message"]).must_equal "not found" + end + + end + + end From e9cfee3de5b42285aea5f71249e6a9fb213de5eb Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 15:25:23 -0800 Subject: [PATCH 22/56] Added methods from Shelan to prevent large conflicts --- app/controllers/movies_controller.rb | 40 +++++++++++++--------- test/controllers/movies_controller_test.rb | 9 +++-- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 33383464d..dc9356479 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,29 +1,37 @@ class MoviesController < ApplicationController - - - - - - - - - - - + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end def show movie = Movie.find_by(id: params[:id]) if movie.nil? - render json: { - ok: false, - message: 'not found' }, + render json: {ok: false, message: 'not found'}, status: :not_found else render json: { ok: true, - movie: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok - } + movie: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) + }, status: :ok + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: { + ok: true, + movie: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + }, status: :ok + + else + render json: { + ok: false, + message: movie.errors.messages + }, status: :bad_request end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 716ac1e21..3c3353599 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,6 +1,12 @@ require "test_helper" describe MoviesController do + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + end describe "show" do @@ -25,8 +31,5 @@ expect(body["ok"]).must_equal false expect(body["message"]).must_equal "not found" end - end - - end From d91fc6ce6425de669090ddefecf2e433cbfc0a0e Mon Sep 17 00:00:00 2001 From: Shelan Date: Tue, 6 Nov 2018 15:29:51 -0800 Subject: [PATCH 23/56] controller movies --- Gemfile | 2 +- Gemfile.lock | 4 +-- app/controllers/movies_controller.rb | 35 ++++++++++++++++++++++ app/views/movies/index.json.rabl | 3 ++ app/views/movies/show.json.rabl | 2 ++ config/initializers/rabl_config.rb | 3 ++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 6 ---- 8 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 app/views/movies/index.json.rabl create mode 100644 app/views/movies/show.json.rabl create mode 100644 config/initializers/rabl_config.rb diff --git a/Gemfile b/Gemfile index 168bfb14d..d76d67e5c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.5.1' -gem 'rabl', '~> 0.14.0' +gem 'rabl' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 61f75d333..45a676e85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,7 +159,7 @@ DEPENDENCIES pg (>= 0.18, < 2.0) pry-rails puma (~> 3.11) - rabl (~> 0.14.0) + rabl rails (~> 5.2.1) spring spring-watcher-listen (~> 2.0.0) @@ -169,4 +169,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.16.3 + 1.16.4 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..e1cdcb00c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,37 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie.nil? + render json: {ok: false, message: 'not found'}, + status: :not_found + else + render json: { + ok: true, + movie: movie.as_json(only: [:id, :title, :release_date]) + }, status: :ok + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: { + ok: true, + movie: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + }, status: :ok + + else + render json: { + ok: false, + message: movie.errors.messages + }, status: :bad_request + end + end end diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl new file mode 100644 index 000000000..384d1c219 --- /dev/null +++ b/app/views/movies/index.json.rabl @@ -0,0 +1,3 @@ +collection @movies + +attributes :id, :title, :release_date diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl new file mode 100644 index 000000000..d587e42c6 --- /dev/null +++ b/app/views/movies/show.json.rabl @@ -0,0 +1,2 @@ +object @movies +attributes :title, :overview, :release_date, :inventory diff --git a/config/initializers/rabl_config.rb b/config/initializers/rabl_config.rb new file mode 100644 index 000000000..f11eb190d --- /dev/null +++ b/config/initializers/rabl_config.rb @@ -0,0 +1,3 @@ +Rabl.configure do |config| + config.include_json_root = false +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..774ed6d47 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :movies end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..0ad635fec 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1 @@ require "test_helper" - -describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end -end From 5454c660ea1bd4b46d5303e035cece5576ab77ef Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 16:02:54 -0800 Subject: [PATCH 24/56] Added movie params, added available inventory to json for create --- app/controllers/movies_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dc9356479..8ad37a756 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -24,7 +24,7 @@ def create if movie.save render json: { ok: true, - movie: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + movie: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) }, status: :ok else @@ -34,4 +34,10 @@ def create }, status: :bad_request end end + + private + + def movie_params + params.require(:movie).permite(:id, :title, :overview, :release_date, :inventory, :available_inventory) + end end From 202c86feb2dd93b6ef2f67beea12297f1fa23aaf Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Tue, 6 Nov 2018 17:42:42 -0800 Subject: [PATCH 25/56] Continued work on checkout --- app/controllers/rentals_controller.rb | 25 +++++++ config/routes.rb | 3 + test/controllers/movies_controller_test.rb | 1 + test/controllers/rentals_controller_test.rb | 73 ++++++++++++++++++++- 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..a916201a4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,27 @@ class RentalsController < ApplicationController + + def checkout + rental = Rental.new(rental_params) + + if rental.save + render json: { + ok: true, + # Only returning the customer and movie ids + rental: rental.as_json(only: [ :customer_id, :movie_id ] ) + }, status: :ok + else + render json: { + ok: false, + message: rental.errors.messages + }, status: :bad_request + end + end + + + private + + def rental_params + params.require(:rental).permit(:checkout_date, :due_date, :checkin_date, :movie_id, :customer_id) + end + end diff --git a/config/routes.rb b/config/routes.rb index 2ab98a0dc..98b136652 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,7 @@ # Movie resources :movies, only: [:index, :show, :create] + + #Rental + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3c3353599..311051e14 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -5,6 +5,7 @@ it "is a real working route" do get movies_path must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..e635ba4d8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,74 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'check-out' do + # Create for rental + let(:movie) { movies(:funny) } #romantic_movie is being initialized as --> { movies(:romantic) } + let(:customer) {customers(:shelan) } + binding.pry + + let (:rental_hash) do + { + rental: { + checkout_date: Date.today, + due_date: Date.today + 7, + movie_id: Movie.last, + customer_id: Customer.first + } + } + end + + + it "should have a working route and returns JSON" do + post checkout_path, params: rental_hash + + expect(response.header['Content-Type']).must_include 'json' + + must_respond_with :success + + end + + it "responds with an error for invalid params" do + + end + + it "can create a new rental if given valid params" do + expect { + post checkout_path, params: rental_hash + }.must_change 'Rental.count', 1 + + expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] + expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] + expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] + expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] + + end + + it "Removes one from the movies inventory" do + # post check_out_path, params: rental_hash + + + end + + it "Does not allow removal from an empty inventory" do + # post check_out_path, params: rental_hash + + + end + + it "has a check-out date set to today" do + # post check_out_path, params: rental_hash + + + end + + it "has a due date set to a week from today" do + # post check_out_path, params: rental_hash + + end +end + + describe 'check-in' do + + end end From 54477d1662cbd45adc2c35ecae943d74b347ca18 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 09:17:21 -0800 Subject: [PATCH 26/56] Added set_registerd_at method to customer.rb --- app/models/customer.rb | 11 +++++++++-- test/controllers/rentals_controller_test.rb | 4 ++-- test/models/movie_test.rb | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index c3e44bb2b..9ffeea0ac 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,13 @@ class Customer < ApplicationRecord - has_many :rentals + before_create :set_registered_at + + has_many :rentals has_many :movies, through: :rentals - validates_presence_of :name, :registered_at, :address, :city, :state, :postal_code, :phone + validates_presence_of :name, :address, :city, :state, :postal_code, :phone + + private + def set_registered_at + self.registered_at = self.created_at + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e635ba4d8..7ee669ff9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -12,8 +12,8 @@ rental: { checkout_date: Date.today, due_date: Date.today + 7, - movie_id: Movie.last, - customer_id: Customer.first + movie_id: movies(:scary), + customer_id: customers(:cassy) } } end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 28f41b9c3..63c6bfd2b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -48,8 +48,7 @@ it "has many customers through rental" do #Act - binding.pry - romantic_movie.customers << Customer.first #add 1st customer to a movie's customer + romantic_movie.customers << customer #add 1st customer to a movie's customer customers = romantic_movie.customers #customers = movie's customers #assert From d670e2e9df7c5c88af201f594d7378202199583c Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 09:19:55 -0800 Subject: [PATCH 27/56] Updated customer test for registered_at --- test/models/customer_test.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 1a7a35d5e..47a06f957 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,7 +4,7 @@ describe Customer do describe "validations" do let(:complete_customer) { - Customer.new name: "Cassy", + Customer.create name: "Cassy", registered_at: DateTime.new(2018,11,3), address: "123 Sunny Lane", city: "Seattle", @@ -24,11 +24,8 @@ expect(complete_customer.errors).must_include "name" end - it "is invalid if registered_at is missing" do - complete_customer.registered_at = nil - result = complete_customer.valid? - result.must_equal false - expect(complete_customer.errors).must_include "registered_at" + it "has registered_at set to the same as created_at" do + expect(complete_customer.registered_at).must_equal complete_customer.created_at end it "is invalid if address is missing" do From 74473c6f91b81218d56341534e8a6b3038bfd50f Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 09:44:08 -0800 Subject: [PATCH 28/56] Debugged tests that used fixtures --- test/controllers/movies_controller_test.rb | 3 +- test/controllers/rentals_controller_test.rb | 89 ++++++++++----------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 311051e14..e026163c3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -10,9 +10,10 @@ end describe "show" do + let(:id){movies(:funny).id} it "can retrieve a valid movie and returns JSON" do - get movie_path(Movie.first.id) + get movie_path(id) expect(response.header['Content-Type']).must_include 'json' must_respond_with :success end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7ee669ff9..b27170ed0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,15 +5,14 @@ # Create for rental let(:movie) { movies(:funny) } #romantic_movie is being initialized as --> { movies(:romantic) } let(:customer) {customers(:shelan) } - binding.pry let (:rental_hash) do { rental: { checkout_date: Date.today, due_date: Date.today + 7, - movie_id: movies(:scary), - customer_id: customers(:cassy) + movie_id: movies(:scary).id, + customer_id: customers(:cassy).id } } end @@ -28,47 +27,47 @@ end - it "responds with an error for invalid params" do - - end - - it "can create a new rental if given valid params" do - expect { - post checkout_path, params: rental_hash - }.must_change 'Rental.count', 1 - - expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] - expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] - expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] - expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] - - end - - it "Removes one from the movies inventory" do - # post check_out_path, params: rental_hash - - - end - - it "Does not allow removal from an empty inventory" do - # post check_out_path, params: rental_hash - - - end - - it "has a check-out date set to today" do - # post check_out_path, params: rental_hash - - - end - - it "has a due date set to a week from today" do - # post check_out_path, params: rental_hash - - end +# it "can create a new rental if given valid params" do +# expect { +# post checkout_path, params: rental_hash +# }.must_change 'Rental.count', 1 +# +# expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] +# expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] +# expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] +# expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] +# +# end +# +# it "responds with an error for invalid params" do +# +# end +# +# it "Removes one from the movies inventory" do +# # post check_out_path, params: rental_hash +# +# +# end +# +# it "Does not allow removal from an empty inventory" do +# # post check_out_path, params: rental_hash +# +# +# end +# +# it "has a check-out date set to today" do +# # post check_out_path, params: rental_hash +# +# +# end +# +# it "has a due date set to a week from today" do +# # post check_out_path, params: rental_hash +# +# end end - - describe 'check-in' do - - end +# +# describe 'check-in' do +# +# end end From ddaeabe7c51d3bc3db8cc6c2f7ce717b50789691 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 09:56:05 -0800 Subject: [PATCH 29/56] Worked on test fixtures --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 6 +++--- test/models/movie_test.rb | 2 +- test/models/rental_test.rb | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 8ad37a756..51f92f44b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -38,6 +38,6 @@ def create private def movie_params - params.require(:movie).permite(:id, :title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:id, :title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e026163c3..64d2c2891 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -19,15 +19,15 @@ end it "returns a movie with valid keys" do - get movie_path(Movie.first.id) + get movie_path(id) body = JSON.parse(response.body) keys = %w(title overview release_date inventory available_inventory).sort expect(body["movie"].keys.sort).must_equal keys end it "returns status not found ok false for invalid ids" do - id = -1 - get movie_path(id) + invalid_id = -1 + get movie_path(invalid_id) must_respond_with :not_found body = JSON.parse(response.body) expect(body["ok"]).must_equal false diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 63c6bfd2b..9a50ce5e3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,7 +2,7 @@ describe Movie do let(:complete_movie) { - Movie.new title: "Cher", + Movie.create title: "Cher", overview: "The Best Movie", release_date: DateTime.new(2018,11,3), inventory: 2 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1eefb8e00..9b584763c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -9,10 +9,10 @@ Rental.new checkout_date: (Date.today - 1), checkin_date: Date.today, due_date: Date.today + 6, - movie: Movie.first, - customer: Customer.first - # movie: scary, - # customer: cassy + # movie: Movie.first, + # customer: Customer.first + movie_id: movies(:scary).id, + customer_id: customer(:cassy).id } it "must be valid with all fields" do From 0653f5cf80eedd289bf07f47eb4e2d33357f821d Mon Sep 17 00:00:00 2001 From: Shelan Date: Wed, 7 Nov 2018 09:56:12 -0800 Subject: [PATCH 30/56] controller testing movie --- app/controllers/movies_controller.rb | 27 ++++++++++------- app/views/movies/index.json.rabl | 3 -- app/views/movies/show.json.rabl | 2 -- test/controllers/movies_controller_test.rb | 34 ++++++++++++++++++++++ test/models/movie_test.rb | 1 - 5 files changed, 51 insertions(+), 16 deletions(-) delete mode 100644 app/views/movies/index.json.rabl delete mode 100644 app/views/movies/show.json.rabl diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dc9356479..85fb45f54 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,37 +1,44 @@ class MoviesController < ApplicationController def index - movies = Movie.all - render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + @movies = Movie.all + render json: @movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show - movie = Movie.find_by(id: params[:id]) + @movie = Movie.find_by(id: params[:id]) - if movie.nil? + if @movie.nil? render json: {ok: false, message: 'not found'}, status: :not_found else + render json: { ok: true, - movie: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) + movie: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) }, status: :ok end end def create - movie = Movie.new(movie_params) + @movie = Movie.new(movie_params) - if movie.save + if @movie.save render json: { ok: true, - movie: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + movie: @movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) }, status: :ok else render json: { ok: false, - message: movie.errors.messages + message: @movie.errors.messages }, status: :bad_request end end -end + + private + + def movie_params + params.permit(:id, :title, :overview, :release_date, :inventory) + end + end diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl deleted file mode 100644 index 384d1c219..000000000 --- a/app/views/movies/index.json.rabl +++ /dev/null @@ -1,3 +0,0 @@ -collection @movies - -attributes :id, :title, :release_date diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl deleted file mode 100644 index d587e42c6..000000000 --- a/app/views/movies/show.json.rabl +++ /dev/null @@ -1,2 +0,0 @@ -object @movies -attributes :title, :overview, :release_date, :inventory diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3c3353599..ae2982e34 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,4 +32,38 @@ expect(body["message"]).must_equal "not found" end end + + describe "create" do + let (:movie_params) do + { + movie: { + title: 'Blue Day', + overview: 'A great movie', + release_date: '1948-03-31', + inventory: 2 + } + } + end + + it "can creates a new movie given valid params" do + #Act + expect { + post movies_path, params: movie_params + }.must_change 'Movie.count', 1 + + expect(Movie.title).must_equal movie_params[:movie][:title] + expect(Movie.overview).must_equal movie_param[:movie][:overview] + expect(Movie.release_date).must_equal book_hash[:movie][:release_date] + end + + it "responds with an error for invalid movie params" do + movie_params[:movie][:title] = nil + + expect { + post movies_path, params: movie_params + }.wont_change 'Movie.count' + + must_respond_with :bad_request + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 28f41b9c3..8298be37f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -48,7 +48,6 @@ it "has many customers through rental" do #Act - binding.pry romantic_movie.customers << Customer.first #add 1st customer to a movie's customer customers = romantic_movie.customers #customers = movie's customers From 317ab04cdf6ea43a7be951a675f15469512432dd Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 10:00:28 -0800 Subject: [PATCH 31/56] Fixed merge issues --- test/models/movie_test.rb | 4 ---- test/models/rental_test.rb | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2e343d3bd..9a50ce5e3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -48,11 +48,7 @@ it "has many customers through rental" do #Act -<<<<<<< HEAD - romantic_movie.customers << Customer.first #add 1st customer to a movie's customer -======= romantic_movie.customers << customer #add 1st customer to a movie's customer ->>>>>>> ddaeabe7c51d3bc3db8cc6c2f7ce717b50789691 customers = romantic_movie.customers #customers = movie's customers #assert diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 9b584763c..bcd16e652 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -12,7 +12,7 @@ # movie: Movie.first, # customer: Customer.first movie_id: movies(:scary).id, - customer_id: customer(:cassy).id + customer_id: customers(:cassy).id } it "must be valid with all fields" do From 3605650e7f5c923e55c0a762a3983067c2dd29fc Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 10:02:03 -0800 Subject: [PATCH 32/56] Revised test to use fixtures --- test/models/movie_test.rb | 11 +++++------ test/models/rental_test.rb | 3 --- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9a50ce5e3..e64b980a1 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -43,13 +43,13 @@ end describe "relations" do - let(:romantic_movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } + let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } let(:customer) {customers(:cassy) } it "has many customers through rental" do #Act - romantic_movie.customers << customer #add 1st customer to a movie's customer - customers = romantic_movie.customers #customers = movie's customers + movie.customers << customer #add 1st customer to a movie's customer + customers = movie.customers #customers = movie's customers #assert expect(customers.length).must_be :>=, 1 #customers length should change by 1 @@ -59,9 +59,8 @@ end it "has many rentals" do - romantic = movies(:romantic) - romantic.must_respond_to :rentals - romantic.rentals.each do |rental| + movie.must_respond_to :rentals + movie.rentals.each do |rental| rental.must_be_kind_of Rental end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index bcd16e652..be1f1254f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -61,8 +61,5 @@ rental.must_respond_to :customer rental.customer.must_be_kind_of Customer end - end - - end From 32741e47e35d7a0dc4880101ef58590bf86c97c9 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 12:58:50 -0800 Subject: [PATCH 33/56] Added tests/logic for reducing movie inventory and checking inventory --- app/models/customer.rb | 8 +++++ app/models/movie.rb | 15 +++++++++ test/controllers/rentals_controller_test.rb | 37 ++++++++++++--------- test/models/customer_test.rb | 14 ++++++++ test/models/movie_test.rb | 37 +++++++++++++++++++++ test/models/rental_test.rb | 6 ++++ 6 files changed, 102 insertions(+), 15 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 9ffeea0ac..a4e88d9b3 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,9 +5,17 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals validates_presence_of :name, :address, :city, :state, :postal_code, :phone + + def add_movie_to_count + # How do I access the movies checked out count + # For this customer? + self.movies_checked_out_count += 1 + end + private def set_registered_at self.registered_at = self.created_at end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index adcd431cb..0f098dc4d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -11,9 +11,24 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true + def check_inventory + self.inventory > 0 ? true : false + end + + def reduce_inventory + if check_inventory + self.inventory -= 1 + else + return false + end + end + private def set_available_inventory_default self.available_inventory = self.inventory end + + + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b27170ed0..a33849eca 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -27,21 +27,28 @@ end -# it "can create a new rental if given valid params" do -# expect { -# post checkout_path, params: rental_hash -# }.must_change 'Rental.count', 1 -# -# expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] -# expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] -# expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] -# expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] -# -# end -# -# it "responds with an error for invalid params" do -# -# end + it "can create a new rental if given valid params" do + expect { + post checkout_path, params: rental_hash + }.must_change 'Rental.count', 1 + + expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] + expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] + expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] + expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] + + end + + it "responds with an error for invalid params" do + rental_hash[:rental][:customer_id] = nil + + expect { + post checkout_path, params: rental_hash + }.wont_change 'Rental.count' + + must_respond_with :bad_request + + end # # it "Removes one from the movies inventory" do # # post check_out_path, params: rental_hash diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 47a06f957..69e876b7b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -82,4 +82,18 @@ end end end + + describe "custom logic" do + let(:customer) { customers(:cassy) } + + it "adds one to movies_checked_out_count" do + # customer.add_movie_to_count + # expect that this adds one to count + start_movies_checked_out = customer.movies_checked_out_count + customer.add_movie_to_count + expect(customer.movies_checked_out_count).must_equal start_movies_checked_out + 1 + end + + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e64b980a1..ae0a4d9d4 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -65,4 +65,41 @@ end end end + + describe "custom logic" do + let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } + + describe "reduce inventory" do + it "Reduces inventory by one if there is at least one item in inventory" do + start_inventory_count = movie.inventory + movie.reduce_inventory + expect(movie.inventory).must_equal start_inventory_count - 1 + end + + it "Returns false if inventory is 0" do + movie.inventory = 0 + expect(movie.reduce_inventory).must_equal false + end + end + + + describe "check inventory" do + + it "returns true if inventory is greater than 1" do + movie = movies(:funny) + expect(movie.check_inventory).must_equal true + end + + it "returns false if inventory is less than one" do + movie.inventory = 0 + expect(movie.check_inventory).must_equal false + end + + end + + it "calculates available inventory" do + + end + + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index be1f1254f..d70447650 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -62,4 +62,10 @@ rental.customer.must_be_kind_of Customer end end + + describe "custom logic" do + + # TODO Test that self.due_date is working + + end end From 11cbd98f4172ee800e3e6addd1689ca5133de9c2 Mon Sep 17 00:00:00 2001 From: Shelan Date: Wed, 7 Nov 2018 13:06:20 -0800 Subject: [PATCH 34/56] controller testing movie --- app/controllers/movies_controller.rb | 20 ++++++------- test/controllers/movies_controller_test.rb | 34 ++++++++++------------ 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d5a5099ac..f3389f55b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,37 +1,37 @@ class MoviesController < ApplicationController def index - @movies = Movie.all - render json: @movies.as_json(only: [:id, :title, :release_date]), status: :ok + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show - @movie = Movie.find_by(id: params[:id]) + movie = Movie.find_by(id: params[:id]) - if @movie.nil? + if movie.nil? render json: {ok: false, message: 'not found'}, status: :not_found else render json: { ok: true, - movie: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) + movie: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) }, status: :ok end end def create - @movie = Movie.new(movie_params) + movie = Movie.new(movie_params) - if @movie.save + if movie.save render json: { ok: true, - movie: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) + movie: movie.as_json(only: [:id]) }, status: :ok else render json: { ok: false, - message: @movie.errors.messages + message: movie.errors.messages }, status: :bad_request end end @@ -39,6 +39,6 @@ def create private def movie_params - params.permit(:id, :title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5448d0cd5..c0b487950 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -36,36 +36,34 @@ end describe "create" do - let (:movie_params) do + let(:movie_hash) do { - movie: { - title: 'Blue Day', - overview: 'A great movie', - release_date: '1948-03-31', + title: "A great movie", + overview: "The world ends", + release_date: "2010-11-05", inventory: 2 } - } end - it "can creates a new movie given valid params" do - #Act + expect { - post movies_path, params: movie_params + post movies_path, params: movie_hash }.must_change 'Movie.count', 1 - expect(Movie.title).must_equal movie_params[:movie][:title] - expect(Movie.overview).must_equal movie_param[:movie][:overview] - expect(Movie.release_date).must_equal book_hash[:movie][:release_date] + expect(Movie.last.title).must_equal movie_hash[:title] + expect(Movie.last.overview).must_equal movie_hash[:overview] + expect(Movie.last.release_date).must_equal Date.parse(movie_hash[:release_date]) + expect(Movie.last.inventory).must_equal movie_hash[:inventory] end it "responds with an error for invalid movie params" do - movie_params[:movie][:title] = nil + movie_hash[:title] = nil - expect { - post movies_path, params: movie_params - }.wont_change 'Movie.count' + expect { + post movies_path, params: movie_hash + }.wont_change 'Movie.count' - must_respond_with :bad_request + must_respond_with :bad_request + end end end -end From 333bc30d41f94c2f50914db21a49c50e27b84223 Mon Sep 17 00:00:00 2001 From: Shelan Date: Wed, 7 Nov 2018 13:32:17 -0800 Subject: [PATCH 35/56] passed postman tests for movie controller --- app/controllers/movies_controller.rb | 10 +++++++--- test/controllers/movies_controller_test.rb | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f3389f55b..7dedf306a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,7 +14,11 @@ def show render json: { ok: true, - movie: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) + title: movie.as_json(only: [:title])["title"], + overview: movie.as_json(only: [:overview])["overview"], + release_date: movie.as_json(only: [:release_date])["release_date"], + inventory: movie.as_json(only: [:inventory])["inventory"], + available_inventory: movie.as_json(only: [:available_inventory])["available_inventory"] }, status: :ok end end @@ -25,7 +29,7 @@ def create if movie.save render json: { ok: true, - movie: movie.as_json(only: [:id]) + id: movie.as_json(only: [:id])["id"] }, status: :ok else @@ -39,6 +43,6 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :inventory) + params.permit(:id, :title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c0b487950..b6f997d16 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -21,8 +21,8 @@ it "returns a movie with valid keys" do get movie_path(id) body = JSON.parse(response.body) - keys = %w(title overview release_date inventory available_inventory).sort - expect(body["movie"].keys.sort).must_equal keys + keys = %w(title overview Date.parse(release_date) inventory available_inventory).sort + expect(keys.sort).must_equal keys end it "returns status not found ok false for invalid ids" do From 3a4a0f89d990ccd793e9913679c47d8436f450e8 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 13:33:17 -0800 Subject: [PATCH 36/56] Created helper method for number of checked out movies --- app/models/movie.rb | 10 +++++----- test/models/movie_test.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0f098dc4d..fa52bc645 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -16,11 +16,11 @@ def check_inventory end def reduce_inventory - if check_inventory - self.inventory -= 1 - else - return false - end + check_inventory ? self.inventory -= 1 : false + end + + def number_of_checked_out_movies + self.rentals.length end private diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ae0a4d9d4..6fb811ef5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -82,6 +82,21 @@ end end + describe "set_checkout" do + it "is equal to the date the rental was created" do + # binding.pry + end + end + + describe "number of checked out movies" do + it "returns the number of movies that are currently checked out" do + movie = movies(:funny) + expect(movie.number_of_checked_out_movies).must_equal movie.rentals.length + + end + + end + describe "check inventory" do @@ -98,6 +113,18 @@ end it "calculates available inventory" do + movie = movies(:funny) + start_available = movie.available_inventory + # Creating a rental to reduce number available + binding.pry + Rental.create(checkout_date: Date.today, + due_date: Date.today + 7, + movie_id: movie.id, + customer_id: customers(:cassy).id + ) + + # Checking that available inventory was reduced + binding.pry end From f4974968ae628f21466a4e0edf1b9ed01bc68c32 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 13:41:35 -0800 Subject: [PATCH 37/56] Continued work on setting the available inventory --- app/models/movie.rb | 4 ++-- test/controllers/movies_controller_test.rb | 1 + test/models/movie_test.rb | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index fa52bc645..44aae0126 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -20,13 +20,13 @@ def reduce_inventory end def number_of_checked_out_movies - self.rentals.length + self.rentals.length end private def set_available_inventory_default - self.available_inventory = self.inventory + self.available_inventory = self.inventory - number_of_checked_out_movies end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5448d0cd5..dfda7364d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -48,6 +48,7 @@ end it "can creates a new movie given valid params" do + binding.pry #Act expect { post movies_path, params: movie_params diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 6fb811ef5..499332108 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -92,14 +92,10 @@ it "returns the number of movies that are currently checked out" do movie = movies(:funny) expect(movie.number_of_checked_out_movies).must_equal movie.rentals.length - end - end - describe "check inventory" do - it "returns true if inventory is greater than 1" do movie = movies(:funny) expect(movie.check_inventory).must_equal true @@ -109,7 +105,6 @@ movie.inventory = 0 expect(movie.check_inventory).must_equal false end - end it "calculates available inventory" do From eec5c88b66969a17feb2d1c039c512887a630ee8 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 15:29:53 -0800 Subject: [PATCH 38/56] Continued work on testing available inventory --- app/controllers/rentals_controller.rb | 9 ++++++ app/models/movie.rb | 33 ++++++++++++--------- test/controllers/movies_controller_test.rb | 1 - test/controllers/rentals_controller_test.rb | 21 +++++++++++++ test/models/movie_test.rb | 26 ++++------------ test/models/rental_test.rb | 24 ++++++++++++++- 6 files changed, 78 insertions(+), 36 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a916201a4..8c9712c3e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,6 +9,15 @@ def checkout # Only returning the customer and movie ids rental: rental.as_json(only: [ :customer_id, :movie_id ] ) }, status: :ok + + # Reduce the inventory (should reduce the inventory/save the movie) + # Saving movie triggers the set_available_inventory + # binding.pry + rental.movie.reduce_inventory + + # Add to customer checked out count + rental.customer.add_movie_to_count + else render json: { ok: false, diff --git a/app/models/movie.rb b/app/models/movie.rb index 44aae0126..10a6e4ee3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,6 @@ class Movie < ApplicationRecord - - # Sets default value of available inventory to inventory - before_save :set_available_inventory_default + # before_create :set_available_inventory + before_save :set_available_inventory has_many :rentals has_many :customers, through: :rentals @@ -11,24 +10,30 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true - def check_inventory - self.inventory > 0 ? true : false - end - - def reduce_inventory - check_inventory ? self.inventory -= 1 : false - end - def number_of_checked_out_movies self.rentals.length end - private - - def set_available_inventory_default + def set_available_inventory + # binding.pry self.available_inventory = self.inventory - number_of_checked_out_movies end + def check_inventory + self.inventory > 0 ? true : false + end + + def reduce_inventory + if check_inventory + self.inventory -= 1 + # Saving movie should trigger an update to + # set_available_inventory + self.save + else + return false + end + end + private end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1168f5c0f..292ef6fd6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -45,7 +45,6 @@ } end it "can creates a new movie given valid params" do - binding.pry #Act expect { post movies_path, params: movie_hash diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a33849eca..7c5910f7f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -49,6 +49,27 @@ must_respond_with :bad_request end + + it "calculates available inventory" do + movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 3) + start_available = movie.available_inventory + rental_hash = { + rental: { + checkout_date: Date.today, + due_date: Date.today + 7, + movie_id: movie.id, + customer_id: customers(:cassy).id + } + } + + # Do a post request for a rental that has that movie's id + post checkout_path, params: rental_hash + # Checking that available inventory was reduced + # binding.pry + expect(movie.available_inventory).must_equal start_available - 1 + + end + # # it "Removes one from the movies inventory" do # # post check_out_path, params: rental_hash diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 499332108..472ceca84 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -8,6 +8,7 @@ inventory: 2 } + describe "validations" do it "must be valid" do value(complete_movie).must_be :valid? @@ -40,7 +41,7 @@ result.must_equal false expect(complete_movie.errors).must_include "inventory" end - end + end # Validation end describe "relations" do let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } @@ -64,7 +65,7 @@ rental.must_be_kind_of Rental end end - end + end # End of relations describe "custom logic" do let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } @@ -77,10 +78,10 @@ end it "Returns false if inventory is 0" do - movie.inventory = 0 - expect(movie.reduce_inventory).must_equal false + movie.inventory = 0 + expect(movie.reduce_inventory).must_equal false end - end + end # End of reduce inventory describe "set_checkout" do it "is equal to the date the rental was created" do @@ -107,21 +108,6 @@ end end - it "calculates available inventory" do - movie = movies(:funny) - start_available = movie.available_inventory - # Creating a rental to reduce number available - binding.pry - Rental.create(checkout_date: Date.today, - due_date: Date.today + 7, - movie_id: movie.id, - customer_id: customers(:cassy).id - ) - - # Checking that available inventory was reduced - binding.pry - - end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d70447650..cee7ae7ec 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -65,7 +65,29 @@ describe "custom logic" do - # TODO Test that self.due_date is working + # TODO Test that self.due_date is working + + # it "calculates available inventory" do + # movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 3) + # start_available = movie.available_inventory + # rental_hash = { + # rental: { + # checkout_date: Date.today, + # due_date: Date.today + 7, + # movie_id: movie.id, + # customer_id: customers(:cassy).id + # } + # } + # binding.pry + # + # # Do a post request for a rental that has that movie's id + # post checkout_path, params: rental_hash + # # Checking that available inventory was reduced + # # binding.pry + # expect(movie.available_inventory).must_equal start_available - 1 + # + # end + end end From 78a7ef767ecb3bf40de47efac18b4ce9a4d4a027 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 15:54:13 -0800 Subject: [PATCH 39/56] Continued debugging available inventory failure --- app/controllers/rentals_controller.rb | 1 + app/models/movie.rb | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8c9712c3e..dc6576d7c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,7 @@ def checkout # Reduce the inventory (should reduce the inventory/save the movie) # Saving movie triggers the set_available_inventory # binding.pry + # binding.pry rental.movie.reduce_inventory # Add to customer checked out count diff --git a/app/models/movie.rb b/app/models/movie.rb index 10a6e4ee3..63778b983 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -16,7 +16,7 @@ def number_of_checked_out_movies def set_available_inventory # binding.pry - self.available_inventory = self.inventory - number_of_checked_out_movies + self.available_inventory = self.inventory - number_of_checked_out_movies end def check_inventory @@ -25,11 +25,16 @@ def check_inventory def reduce_inventory if check_inventory - self.inventory -= 1 + # binding.pry + # self.inventory -= 1 + binding.pry + self.available_inventory = self.inventory - number_of_checked_out_movies + # Saving movie should trigger an update to # set_available_inventory self.save else + # binding.pry return false end end From f965a47a23467b9d53d656690f467d91415e287f Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Wed, 7 Nov 2018 19:25:49 -0800 Subject: [PATCH 40/56] Created methods to return the available inventory/count of movies checked out. Will remove those from schema. Corrected test for movie show keys. Added validation to rental for movie with no available inventory --- app/controllers/customers_controller.rb | 3 +- app/controllers/movies_controller.rb | 9 ++-- app/controllers/rentals_controller.rb | 1 + app/models/customer.rb | 16 ++++--- app/models/movie.rb | 44 ++++++++++--------- app/models/rental.rb | 9 ++++ test/controllers/customers_controller_test.rb | 1 + test/controllers/movies_controller_test.rb | 4 +- 8 files changed, 55 insertions(+), 32 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5d501573b..809e4a5e7 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all.order(:name) - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + movies_checked_out_count = movies_checked_out_count + render json: customers.as_json( methods: :movies_checked_out_count, only: [:id, :name, :registered_at, :postal_code, :phone, "movies_checked_out_count" => movies_checked_out_count]), status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7dedf306a..1d06deefc 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,14 +11,17 @@ def show render json: {ok: false, message: 'not found'}, status: :not_found else - + # available_inventory = movie.available_inventory + binding.pry render json: { - ok: true, + # ok: true, + # methods: :available_inventory, title: movie.as_json(only: [:title])["title"], overview: movie.as_json(only: [:overview])["overview"], release_date: movie.as_json(only: [:release_date])["release_date"], inventory: movie.as_json(only: [:inventory])["inventory"], - available_inventory: movie.as_json(only: [:available_inventory])["available_inventory"] + "available_inventory" => movie.available_inventory + # available_inventory: movie.as_json(only: [:available_inventory])["available_inventory"] }, status: :ok end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dc6576d7c..759610588 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,6 +14,7 @@ def checkout # Saving movie triggers the set_available_inventory # binding.pry # binding.pry + # Do calculation - Don't need a calculation.... rental.movie.reduce_inventory # Add to customer checked out count diff --git a/app/models/customer.rb b/app/models/customer.rb index a4e88d9b3..71e0e7290 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,12 +5,18 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals validates_presence_of :name, :address, :city, :state, :postal_code, :phone + # Just calculate the total movies here and pass to controller + def movies_checked_out_count + # Maybe set status to show "active" rentals later + self.rentals.length + end - def add_movie_to_count - # How do I access the movies checked out count - # For this customer? - self.movies_checked_out_count += 1 - end + # def add_movie_to_count + # # How do I access the movies checked out count + # # For this customer? + # # TODO customer.rentals.length based on if active or inactive + # self.movies_checked_out_count += 1 + # end private def set_registered_at diff --git a/app/models/movie.rb b/app/models/movie.rb index 63778b983..ee0cce742 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord # before_create :set_available_inventory - before_save :set_available_inventory + # before_save :set_available_inventory has_many :rentals has_many :customers, through: :rentals @@ -11,34 +11,36 @@ class Movie < ApplicationRecord validates :inventory, presence: true def number_of_checked_out_movies + # Might add a flag later for "active rentals" self.rentals.length end - def set_available_inventory + def available_inventory # binding.pry - self.available_inventory = self.inventory - number_of_checked_out_movies + return self.inventory - number_of_checked_out_movies end + + # If we add validation to rental that movie inventory must be > 0 + # We won't need this logic def check_inventory self.inventory > 0 ? true : false end - def reduce_inventory - if check_inventory - # binding.pry - # self.inventory -= 1 - binding.pry - self.available_inventory = self.inventory - number_of_checked_out_movies - - # Saving movie should trigger an update to - # set_available_inventory - self.save - else - # binding.pry - return false - end - end - - private - + # Don't need to do this + # Have available_inventory attribute set to return as method + # def reduce_inventory + # if check_inventory + # # binding.pry + # # self.inventory -= 1 + # binding.pry + # self.available_inventory = self.inventory - number_of_checked_out_movies + # + # # Saving movie should trigger an update to + # # set_available_inventory + # self.save + # else + # # binding.pry + # return false + # end end diff --git a/app/models/rental.rb b/app/models/rental.rb index aadde2a48..f64ea03af 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,4 +2,13 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer validates_presence_of :checkout_date, :due_date, :movie_id, :customer_id + validate :available_inventory_of_movie + + def available_inventory_of_movie + unless self.movie.available_inventory > 0 + errors.add(:available_inventory_of_movie, "Must be greater than 0") + end + end + + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 3a8cf17bc..fc66d22c5 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -9,6 +9,7 @@ it "should get index as a real working route and returns JSON" do expect(response.header['Content-Type']).must_include 'json' + # binding.pry must_respond_with :success end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 292ef6fd6..20e07a1fa 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -21,8 +21,8 @@ it "returns a movie with valid keys" do get movie_path(id) body = JSON.parse(response.body) - keys = %w(title overview Date.parse(release_date) inventory available_inventory).sort - expect(keys.sort).must_equal keys + keys = %w(title overview release_date inventory available_inventory).sort + expect(body.keys.sort).must_equal keys end it "returns status not found ok false for invalid ids" do From 7cfb761c955716085ab8cd6ffa56ab8c630ba009 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Thu, 8 Nov 2018 07:46:16 -0800 Subject: [PATCH 41/56] Debugged issue with number of checked out movies method --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 9 +- app/models/movie.rb | 9 +- test/controllers/rentals_controller_test.rb | 175 ++++++++++++-------- test/models/customer_test.rb | 24 ++- test/models/movie_test.rb | 29 ++-- 6 files changed, 148 insertions(+), 100 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1d06deefc..f300eaea7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,7 +12,7 @@ def show status: :not_found else # available_inventory = movie.available_inventory - binding.pry + # binding.pry render json: { # ok: true, # methods: :available_inventory, diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 759610588..fc833f32e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,14 +11,7 @@ def checkout }, status: :ok # Reduce the inventory (should reduce the inventory/save the movie) - # Saving movie triggers the set_available_inventory - # binding.pry - # binding.pry - # Do calculation - Don't need a calculation.... - rental.movie.reduce_inventory - - # Add to customer checked out count - rental.customer.add_movie_to_count + # Saving movie triggers the available_inventory else render json: { diff --git a/app/models/movie.rb b/app/models/movie.rb index ee0cce742..5cda68f60 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -12,20 +12,19 @@ class Movie < ApplicationRecord def number_of_checked_out_movies # Might add a flag later for "active rentals" - self.rentals.length + return Rental.where(movie_id: self.id).length end def available_inventory - # binding.pry return self.inventory - number_of_checked_out_movies end # If we add validation to rental that movie inventory must be > 0 # We won't need this logic - def check_inventory - self.inventory > 0 ? true : false - end + # def check_inventory + # self.inventory > 0 ? true : false + # end # Don't need to do this # Have available_inventory attribute set to return as method diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7c5910f7f..c3f2ba80f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -15,87 +15,130 @@ customer_id: customers(:cassy).id } } - end + end - it "should have a working route and returns JSON" do - post checkout_path, params: rental_hash + it "should have a working route and returns JSON" do + post checkout_path, params: rental_hash - expect(response.header['Content-Type']).must_include 'json' + expect(response.header['Content-Type']).must_include 'json' - must_respond_with :success + must_respond_with :success - end + end - it "can create a new rental if given valid params" do - expect { - post checkout_path, params: rental_hash - }.must_change 'Rental.count', 1 + it "can create a new rental if given valid params" do + expect { + post checkout_path, params: rental_hash + }.must_change 'Rental.count', 1 - expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] - expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] - expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] - expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] + expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] + expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] + expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] + expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] - end + end - it "responds with an error for invalid params" do - rental_hash[:rental][:customer_id] = nil + it "responds with an error for invalid params" do + rental_hash[:rental][:customer_id] = nil - expect { - post checkout_path, params: rental_hash - }.wont_change 'Rental.count' + expect { + post checkout_path, params: rental_hash + }.wont_change 'Rental.count' - must_respond_with :bad_request + must_respond_with :bad_request - end + end + + ###### PROBABLY REVISE THIS ######## + + describe "available inventory" do + + it "Has an accurate available inventory after a rental is created" do + movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 3) + + start_count = movie.available_inventory + + rental_hash = { + rental: { + checkout_date: Date.today, + due_date: Date.today + 7, + movie_id: movie.id, + customer_id: customers(:cassy).id + } + } + + # Do a post request for a rental that has that movie's id + post checkout_path, params: rental_hash + # Checking that available inventory was reduced + + expect(movie.available_inventory).must_equal start_count - 1 + end + + it "increases the number of movies the customer had checked out" do + + # Testing in rental controller as route will only run in this controller + movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 3) + customer = customers(:cassy) + # start_count = movie.customer.movies.length + rental_hash = { + rental: { + checkout_date: Date.today, + due_date: Date.today + 7, + movie_id: movie.id, + customer_id: customer.id + } + } + + start_count = customer.movies.length + + # Do a post request for a rental that has that movie's id + post checkout_path, params: rental_hash + # Checking that customer movies went up by one + expect(customer.movies.length).must_equal start_count + 1 - it "calculates available inventory" do - movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 3) - start_available = movie.available_inventory - rental_hash = { - rental: { - checkout_date: Date.today, - due_date: Date.today + 7, - movie_id: movie.id, - customer_id: customers(:cassy).id + end + end + + it "Does not allow removal from an empty inventory" do + # post check_out_path, params: rental_hash + movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 0) + + rental_hash = { + rental: { + checkout_date: Date.today, + due_date: Date.today + 7, + movie_id: movie.id, + customer_id: customers(:cassy).id + } } - } - # Do a post request for a rental that has that movie's id - post checkout_path, params: rental_hash - # Checking that available inventory was reduced - # binding.pry - expect(movie.available_inventory).must_equal start_available - 1 + #Expect it will have errors + # # # HOW # # # + # Not sure how to test this + post checkout_path, params: rental_hash + + + + end + + # it "adds one to the customer movies" do + + # end + # + # it "has a check-out date set to today" do + # # post check_out_path, params: rental_hash + # + # + # end + # + # it "has a due date set to a week from today" do + # # post check_out_path, params: rental_hash + # + end end - -# -# it "Removes one from the movies inventory" do -# # post check_out_path, params: rental_hash -# -# -# end -# -# it "Does not allow removal from an empty inventory" do -# # post check_out_path, params: rental_hash -# -# -# end -# -# it "has a check-out date set to today" do -# # post check_out_path, params: rental_hash -# -# -# end -# -# it "has a due date set to a week from today" do -# # post check_out_path, params: rental_hash -# -# end -end -# -# describe 'check-in' do -# + # # + # # describe 'check-in' do + # # # end -end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 69e876b7b..6d21150af 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -86,13 +86,23 @@ describe "custom logic" do let(:customer) { customers(:cassy) } - it "adds one to movies_checked_out_count" do - # customer.add_movie_to_count - # expect that this adds one to count - start_movies_checked_out = customer.movies_checked_out_count - customer.add_movie_to_count - expect(customer.movies_checked_out_count).must_equal start_movies_checked_out + 1 - end + #### REVISE - + # Anything that adjust after a rental + # Should live in rental controller ... + # After a checkout from rental + # (do in rental controller) + # Know the start value for the movie (0?) + # the customer.movies count goes up by 1 + # that last movie is the one the customer checked out + # The available inventory of the movie + # movies_checked_out_count + # it "adds one to movies_checked_out_count" do + # # customer.add_movie_to_count + # # # expect that this adds one to count + # # start_movies_checked_out = customer.movies_checked_out_count + # # customer.add_movie_to_count + # # expect(customer.movies_checked_out_count).must_equal start_movies_checked_out + 1 + # end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 472ceca84..428d08e40 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -69,19 +69,22 @@ describe "custom logic" do let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } - - describe "reduce inventory" do - it "Reduces inventory by one if there is at least one item in inventory" do - start_inventory_count = movie.inventory - movie.reduce_inventory - expect(movie.inventory).must_equal start_inventory_count - 1 - end - - it "Returns false if inventory is 0" do - movie.inventory = 0 - expect(movie.reduce_inventory).must_equal false - end - end # End of reduce inventory + # Remove - + # Should be testing that after a rent + # post the available_inventory returned + # in the body keys is correct + # describe "reduce inventory" do + # it "Reduces inventory by one if there is at least one item in inventory" do + # start_inventory_count = movie.inventory + # movie.reduce_inventory + # expect(movie.inventory).must_equal start_inventory_count - 1 + # end + # + # it "Returns false if inventory is 0" do + # movie.inventory = 0 + # expect(movie.reduce_inventory).must_equal false + # end + # end # End of reduce inventory describe "set_checkout" do it "is equal to the date the rental was created" do From b1759fa3de5523aa0491452c53f99119ddc045fc Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Thu, 8 Nov 2018 07:50:07 -0800 Subject: [PATCH 42/56] Debugged issue with movies_checked_out_count --- app/models/customer.rb | 11 ++--------- test/controllers/rentals_controller_test.rb | 8 ++------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 71e0e7290..3c8be899b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,19 +5,12 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals validates_presence_of :name, :address, :city, :state, :postal_code, :phone - # Just calculate the total movies here and pass to controller + # Calculate the total movies here and pass to controller def movies_checked_out_count # Maybe set status to show "active" rentals later - self.rentals.length + return Rental.where(customer_id: self.id).length end - # def add_movie_to_count - # # How do I access the movies checked out count - # # For this customer? - # # TODO customer.rentals.length based on if active or inactive - # self.movies_checked_out_count += 1 - # end - private def set_registered_at self.registered_at = self.created_at diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c3f2ba80f..519499267 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -50,8 +50,6 @@ end - ###### PROBABLY REVISE THIS ######## - describe "available inventory" do it "Has an accurate available inventory after a rental is created" do @@ -94,8 +92,9 @@ # Do a post request for a rental that has that movie's id post checkout_path, params: rental_hash + # Checking that customer movies went up by one - expect(customer.movies.length).must_equal start_count + 1 + expect(customer.movies_checked_out_count).must_equal start_count + 1 end end @@ -118,9 +117,6 @@ # Not sure how to test this post checkout_path, params: rental_hash - - - end # it "adds one to the customer movies" do From ee58aa4cba0fca773f3fcd7e5760d60e66c9aace Mon Sep 17 00:00:00 2001 From: Shelan Date: Thu, 8 Nov 2018 07:52:45 -0800 Subject: [PATCH 43/56] testing controller --- test/models/movie_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ae0a4d9d4..d989604c1 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,11 +44,12 @@ describe "relations" do let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } - let(:customer) {customers(:cassy) } + let(:customer) { customers(:cassy) } it "has many customers through rental" do #Act movie.customers << customer #add 1st customer to a movie's customer + binding.pry customers = movie.customers #customers = movie's customers #assert From fe3b31383993f97b5e7b46f4f3f4b6004100dd2a Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Thu, 8 Nov 2018 08:26:49 -0800 Subject: [PATCH 44/56] Continued working on test. Added test in movie for available inventoyr and number of checked out movies --- test/models/movie_test.rb | 30 ++++++++++------- test/models/rental_test.rb | 66 ++++++++++++++------------------------ 2 files changed, 42 insertions(+), 54 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 428d08e40..72e9299e7 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -72,7 +72,7 @@ # Remove - # Should be testing that after a rent # post the available_inventory returned - # in the body keys is correct + # in the body keys is correct # describe "reduce inventory" do # it "Reduces inventory by one if there is at least one item in inventory" do # start_inventory_count = movie.inventory @@ -95,22 +95,28 @@ describe "number of checked out movies" do it "returns the number of movies that are currently checked out" do movie = movies(:funny) - expect(movie.number_of_checked_out_movies).must_equal movie.rentals.length + expect(movie.number_of_checked_out_movies).must_equal Rental.where(movie_id: movie.id).length end end - describe "check inventory" do - it "returns true if inventory is greater than 1" do - movie = movies(:funny) - expect(movie.check_inventory).must_equal true - end + describe "available_inventory" do + it "correctly calculates the available_inventory" do + movie = Movie.create title: "What Dreams May Come", + overview: "Very artsy movie", + release_date: Date.today, + inventory: 3 - it "returns false if inventory is less than one" do - movie.inventory = 0 - expect(movie.check_inventory).must_equal false - end - end + Rental.create checkout_date: (Date.today - 1), + checkin_date: Date.today, + due_date: Date.today + 6, + movie_id: movie.id, + customer_id: customers(:cassy).id + binding.pry + expect(movie.available_inventory).must_equal 2 + + end + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index cee7ae7ec..7decc78d6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,16 +1,12 @@ require "test_helper" describe Rental do - # Does not know what scary or customer is - # let(:customer){customers[:cassy]} - # let(:movie){movies[:funny]} + describe 'validations' do let(:complete_rental){ Rental.new checkout_date: (Date.today - 1), checkin_date: Date.today, due_date: Date.today + 6, - # movie: Movie.first, - # customer: Customer.first movie_id: movies(:scary).id, customer_id: customers(:cassy).id } @@ -34,19 +30,11 @@ expect(complete_rental.errors).must_include "due_date" end - it "is invalid if movie is missing" do - complete_rental.movie_id = nil - result = complete_rental.valid? - result.must_equal false - expect(complete_rental.errors).must_include "movie_id" - end - - it "is invalid if customer is missing" do - complete_rental.customer_id = nil - result = complete_rental.valid? - result.must_equal false - expect(complete_rental.errors).must_include "customer_id" - end + ##### TODO ####### + # Do we need to test that it breaks without a customer/movie? + # Can't do that to movie as if movie is nil then custom validator breaks + # What about independent destroy or nullify for if one of those get deleted? + # end describe 'relationships' do @@ -63,31 +51,25 @@ end end - describe "custom logic" do - - # TODO Test that self.due_date is working + # describe "custom logic" do + # # Logic for movie available inventory + # # will live in rental controller test + # # as that happens only after a rental post request + # let(:movie){ + # Movie.create title: "What Dreams May Come", + # overview: "Very artsy movie", + # release_date: Date.today, + # inventory: 3 + # } - # it "calculates available inventory" do - # movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 3) - # start_available = movie.available_inventory - # rental_hash = { - # rental: { - # checkout_date: Date.today, - # due_date: Date.today + 7, - # movie_id: movie.id, - # customer_id: customers(:cassy).id - # } - # } - # binding.pry - # - # # Do a post request for a rental that has that movie's id - # post checkout_path, params: rental_hash - # # Checking that available inventory was reduced - # # binding.pry - # expect(movie.available_inventory).must_equal start_available - 1 - # + # before do + # # Creating a rental to reduce available inventory + # binding.pry + # Rental.create checkout_date: (Date.today - 1), + # checkin_date: Date.today, + # due_date: Date.today + 6, + # movie_id: movie.id, + # customer_id: customers(:cassy).id # end - end -end From e03b5f0a5726fb8481788e1e44f7bf3f9f689c66 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Thu, 8 Nov 2018 08:50:56 -0800 Subject: [PATCH 45/56] Removed customer movie count and available inventory columsn --- app/models/customer.rb | 2 +- app/models/rental.rb | 13 ++++- ...64346_removeavailableinventoryfrommovie.rb | 5 ++ ...1108164549_customercountofmoviesremoval.rb | 5 ++ db/schema.rb | 4 +- test/controllers/rentals_controller_test.rb | 3 +- test/models/movie_test.rb | 5 -- test/models/rental_test.rb | 53 +++++++------------ 8 files changed, 44 insertions(+), 46 deletions(-) create mode 100644 db/migrate/20181108164346_removeavailableinventoryfrommovie.rb create mode 100644 db/migrate/20181108164549_customercountofmoviesremoval.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 3c8be899b..41afaee9a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord before_create :set_registered_at + before_save :set_registered_at has_many :rentals has_many :movies, through: :rentals @@ -16,5 +17,4 @@ def set_registered_at self.registered_at = self.created_at end - end diff --git a/app/models/rental.rb b/app/models/rental.rb index f64ea03af..51987ab79 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,7 +1,9 @@ class Rental < ApplicationRecord + before_create :set_checkout_date, :set_due_date + belongs_to :movie belongs_to :customer - validates_presence_of :checkout_date, :due_date, :movie_id, :customer_id + validates_presence_of :movie_id, :customer_id validate :available_inventory_of_movie def available_inventory_of_movie @@ -10,5 +12,14 @@ def available_inventory_of_movie end end + private + def set_checkout_date + self.checkout_date = self.created_at + end + + def set_due_date + self.due_date = self.checkout_date + 7 + end + end diff --git a/db/migrate/20181108164346_removeavailableinventoryfrommovie.rb b/db/migrate/20181108164346_removeavailableinventoryfrommovie.rb new file mode 100644 index 000000000..014edcabd --- /dev/null +++ b/db/migrate/20181108164346_removeavailableinventoryfrommovie.rb @@ -0,0 +1,5 @@ +class Removeavailableinventoryfrommovie < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :available_inventory + end +end diff --git a/db/migrate/20181108164549_customercountofmoviesremoval.rb b/db/migrate/20181108164549_customercountofmoviesremoval.rb new file mode 100644 index 000000000..f21285f59 --- /dev/null +++ b/db/migrate/20181108164549_customercountofmoviesremoval.rb @@ -0,0 +1,5 @@ +class Customercountofmoviesremoval < ActiveRecord::Migration[5.2] + def change + remove_column :customers, :movies_checked_out_count + end +end diff --git a/db/schema.rb b/db/schema.rb index 65721f18d..66fe593d4 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_220858) do +ActiveRecord::Schema.define(version: 2018_11_08_164549) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,6 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -35,7 +34,6 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "inventory" - t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 519499267..46c8c027f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -17,7 +17,6 @@ } end - it "should have a working route and returns JSON" do post checkout_path, params: rental_hash @@ -92,7 +91,7 @@ # Do a post request for a rental that has that movie's id post checkout_path, params: rental_hash - + # Checking that customer movies went up by one expect(customer.movies_checked_out_count).must_equal start_count + 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 72e9299e7..3fca82dc4 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -86,11 +86,6 @@ # end # end # End of reduce inventory - describe "set_checkout" do - it "is equal to the date the rental was created" do - # binding.pry - end - end describe "number of checked out movies" do it "returns the number of movies that are currently checked out" do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 7decc78d6..b93003474 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -15,21 +15,6 @@ value(complete_rental).must_be :valid? end - it "is invalid if checkout date is missing" do - # binding.pry - complete_rental.checkout_date = nil - result = complete_rental.valid? - result.must_equal false - expect(complete_rental.errors).must_include "checkout_date" - end - - it "is invalid if due_date is missing" do - complete_rental.due_date = nil - result = complete_rental.valid? - result.must_equal false - expect(complete_rental.errors).must_include "due_date" - end - ##### TODO ####### # Do we need to test that it breaks without a customer/movie? # Can't do that to movie as if movie is nil then custom validator breaks @@ -51,25 +36,25 @@ end end - # describe "custom logic" do - # # Logic for movie available inventory - # # will live in rental controller test - # # as that happens only after a rental post request - # let(:movie){ - # Movie.create title: "What Dreams May Come", - # overview: "Very artsy movie", - # release_date: Date.today, - # inventory: 3 - # } + describe "custom logic" do + # Logic for movie available inventory + # will live in rental controller test + # as that happens only after a rental post request + + it "has a checkout_date equal to the date created" do + binding.pry + # Need to remove attribute availabe inventory + # rental = Rental.create { + # movie_id = movies(:funny).id, + # customer_id = customers(:cassy).id + # } - # before do - # # Creating a rental to reduce available inventory - # binding.pry - # Rental.create checkout_date: (Date.today - 1), - # checkin_date: Date.today, - # due_date: Date.today + 6, - # movie_id: movie.id, - # customer_id: customers(:cassy).id - # end + binding.pry + end + + it "has a due date equal to a week after the checkout date" do + + end end +end From e9a3b717f55fc4cc75b7ba8b62bfdaaa0bc632b5 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Thu, 8 Nov 2018 09:36:49 -0800 Subject: [PATCH 46/56] Created tests for checkout date and due date --- app/models/rental.rb | 6 +++--- test/models/movie_test.rb | 2 +- test/models/rental_test.rb | 20 +++++++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 51987ab79..f30957b1b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,5 @@ class Rental < ApplicationRecord - before_create :set_checkout_date, :set_due_date + after_save :set_checkout_date, :set_due_date belongs_to :movie belongs_to :customer @@ -14,11 +14,11 @@ def available_inventory_of_movie private def set_checkout_date - self.checkout_date = self.created_at + self.checkout_date = (self.created_at) end def set_due_date - self.due_date = self.checkout_date + 7 + self.due_date = (self.checkout_date + 7) end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3fca82dc4..fdab508a5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -107,7 +107,7 @@ movie_id: movie.id, customer_id: customers(:cassy).id - binding.pry + # binding.pry expect(movie.available_inventory).must_equal 2 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index b93003474..d70868880 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -42,18 +42,24 @@ # as that happens only after a rental post request it "has a checkout_date equal to the date created" do - binding.pry - # Need to remove attribute availabe inventory - # rental = Rental.create { - # movie_id = movies(:funny).id, - # customer_id = customers(:cassy).id - # } + # Need to remove attribute availabe inventory + rental = Rental.new movie_id: movies(:funny).id, + customer_id: customers(:cassy).id - binding.pry + rental.save + + expect(rental.checkout_date).must_equal rental.created_at.to_date end it "has a due date equal to a week after the checkout date" do + # Need to remove attribute availabe inventory + rental = Rental.new movie_id: movies(:funny).id, + customer_id: customers(:cassy).id + + rental.save + + expect(rental.due_date).must_equal rental.checkout_date + 7 end end From 274ca17fa1bdbad232d9f9e621b1653f8a4b1a07 Mon Sep 17 00:00:00 2001 From: Shelan Date: Thu, 8 Nov 2018 10:02:02 -0800 Subject: [PATCH 47/56] rental test model --- test/models/movie_test.rb | 3 ++- test/models/rental_test.rb | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 978133d63..c43d52eda 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -49,7 +49,8 @@ it "has many customers through rental" do #Act - movie.customers << customer #add 1st customer to a movie's customer + binding.pry + movie.rentals.customers << customer #add 1st customer to a movie's customer binding.pry customers = movie.customers #customers = movie's customers diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d70868880..b9398fae0 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -15,6 +15,21 @@ value(complete_rental).must_be :valid? end + it ' can rent out a movie if available inventory is greater than 1' do + movie = Movie.new(title: "test", overview: "test", release_date: Date.today, inventory: 0) + result = movie.valid? + result.must_equal false + expect(movie.errors.messages).must_equal "Must be greater than 0" + end + + # it 'cannot rent out a movie if available inventory is less than 1' do + # complete_rental.available_inventory = 0 + # result = complete_rental.valid? + # result.must_equal false + # expect(movie.errors.messages).must_equal "Must be greater than 0" + # end + + ##### TODO ####### # Do we need to test that it breaks without a customer/movie? # Can't do that to movie as if movie is nil then custom validator breaks @@ -59,7 +74,7 @@ rental.save - expect(rental.due_date).must_equal rental.checkout_date + 7 + expect(rental.due_date).must_equal rental.checkout_date + 7 end end From 56c15faf09e9608b7b423de8bcbddbea62034de3 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Thu, 8 Nov 2018 10:02:41 -0800 Subject: [PATCH 48/56] Continued work on rental test --- test/controllers/rentals_controller_test.rb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 46c8c027f..159d5981a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -117,22 +117,8 @@ post checkout_path, params: rental_hash end - - # it "adds one to the customer movies" do - - # end - # - # it "has a check-out date set to today" do - # # post check_out_path, params: rental_hash - # - # - # end - # - # it "has a due date set to a week from today" do - # # post check_out_path, params: rental_hash - # - end end +end # # # # describe 'check-in' do # # From 4c2d4b747385a81d92fdeef348aeaa4ab2e46e5e Mon Sep 17 00:00:00 2001 From: Shelan Date: Thu, 8 Nov 2018 12:25:17 -0800 Subject: [PATCH 49/56] rental custom testing --- test/models/rental_test.rb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index b9398fae0..f31750d9d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -15,19 +15,20 @@ value(complete_rental).must_be :valid? end - it ' can rent out a movie if available inventory is greater than 1' do - movie = Movie.new(title: "test", overview: "test", release_date: Date.today, inventory: 0) - result = movie.valid? + it 'cannot rent out a movie if available inventory is greater than 1' do + movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 0) + rental = Rental.new(movie_id: movie.id, customer_id: Customer.first.id) + result = rental.valid? + binding.pry result.must_equal false - expect(movie.errors.messages).must_equal "Must be greater than 0" + expect(rental.errors.messages[:available_inventory_of_movie][0]).must_include "Must be greater than 0" end - # it 'cannot rent out a movie if available inventory is less than 1' do - # complete_rental.available_inventory = 0 - # result = complete_rental.valid? - # result.must_equal false - # expect(movie.errors.messages).must_equal "Must be greater than 0" - # end + it 'can rent out a movie if available inventory is greater than 0' do + movie = Movie.new(title: "test", overview: "test", release_date: Date.today, inventory: 2) + result = movie.valid? + result.must_equal true + end ##### TODO ####### From 4dee88741b7fdd8d1ca6ec1f12b92cacc28d2403 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Thu, 8 Nov 2018 18:00:56 -0800 Subject: [PATCH 50/56] Revised tests/methods for available movie and movies checkout out count so only rentals with nil for checkin are selected --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- test/models/customer_test.rb | 41 ++++++++++++++++++++++++++++++++++++ test/models/movie_test.rb | 22 ++++++++++++++----- 4 files changed, 60 insertions(+), 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 41afaee9a..7825c5f57 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,7 +9,7 @@ class Customer < ApplicationRecord # Calculate the total movies here and pass to controller def movies_checked_out_count # Maybe set status to show "active" rentals later - return Rental.where(customer_id: self.id).length + return Rental.all.select{ |rental| rental.customer_id == self.id && rental.checkin_date.nil?}.length end private diff --git a/app/models/movie.rb b/app/models/movie.rb index 5cda68f60..dfcbceb79 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -12,7 +12,7 @@ class Movie < ApplicationRecord def number_of_checked_out_movies # Might add a flag later for "active rentals" - return Rental.where(movie_id: self.id).length + return Rental.all.select{ |rental| rental.movie_id == self.id && rental.checkin_date.nil?}.length end def available_inventory diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 6d21150af..c136c911b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -85,6 +85,47 @@ describe "custom logic" do let(:customer) { customers(:cassy) } + let(:movie){ + Movie.create title: "Cher", + overview: "The Best Movie", + release_date: DateTime.new(2018,11,3), + inventory: 2 + } + + describe "movies_checked_out_count" do + it "is increased if a movie is not checked in" do + + start_count = customer.movies_checked_out_count + + # Creating "Checked out" rental. Should be included in customer movies count + Rental.create checkout_date: (Date.today - 1), + checkin_date: nil, + due_date: Date.today + 6, + movie_id: movie.id, + customer_id: customer.id + + expect(customer.movies_checked_out_count).must_equal start_count + 1 + + end + + it "is decreased if a movie is checked in" do + + Rental.create checkout_date: (Date.today - 1), + checkin_date: nil, + due_date: Date.today + 6, + movie_id: movie.id, + customer_id: customer.id + + start_count = customer.movies_checked_out_count + + # "Checking in" prior rental - should reduce start count + rental = customer.rentals.last + rental.checkin_date = Date.today + rental.save + + expect(customer.movies_checked_out_count).must_equal start_count - 1 + end + end #### REVISE - # Anything that adjust after a rental diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index c43d52eda..e55f75542 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -8,7 +8,6 @@ inventory: 2 } - describe "validations" do it "must be valid" do value(complete_movie).must_be :valid? @@ -51,7 +50,6 @@ #Act binding.pry movie.rentals.customers << customer #add 1st customer to a movie's customer - binding.pry customers = movie.customers #customers = movie's customers #assert @@ -97,22 +95,36 @@ end describe "available_inventory" do - it "correctly calculates the available_inventory" do + it "does not included checked in movies " do movie = Movie.create title: "What Dreams May Come", overview: "Very artsy movie", release_date: Date.today, inventory: 3 + # Creating "Checked in" rental. Should not be included in reduced inventory Rental.create checkout_date: (Date.today - 1), checkin_date: Date.today, due_date: Date.today + 6, movie_id: movie.id, customer_id: customers(:cassy).id - # binding.pry + expect(movie.available_inventory).must_equal 3 + end - expect(movie.available_inventory).must_equal 2 + it "is reduced if a movie is not checked in" do + movie = Movie.create title: "What Dreams May Come", + overview: "Very artsy movie", + release_date: Date.today, + inventory: 3 + # Creating "Checked in" rental. Should not be included in reduced inventory + Rental.create checkout_date: (Date.today - 1), + checkin_date: nil, + due_date: Date.today + 6, + movie_id: movie.id, + customer_id: customers(:cassy).id + + expect(movie.available_inventory).must_equal 2 end end end From 907e9f53004cc43bb253dfb0f7a289750bb3e7ed Mon Sep 17 00:00:00 2001 From: Shelan Date: Fri, 9 Nov 2018 12:51:59 -0800 Subject: [PATCH 51/56] check-in method for rental created --- app/controllers/rentals_controller.rb | 26 +++++++++- app/models/rental.rb | 6 +++ config/routes.rb | 2 + test/controllers/rentals_controller_test.rb | 55 +++++++++++++++------ test/fixtures/rentals.yml | 3 +- test/models/rental_test.rb | 15 ++++++ 6 files changed, 89 insertions(+), 18 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fc833f32e..9dfd7fd90 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,6 +2,7 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) + if rental.save render json: { @@ -21,11 +22,34 @@ def checkout end end + def checkin + movie_id = params[:rental][:movie_id] + customer_id = params[:rental][:customer_id] + rental = Rental.find_by(movie_id: movie_id, customer_id: customer_id) + if rental.check_in! + # binding.pry + + render json: { + ok: true, + rental: rental.as_json(only: [ :customer_id, :movie_id ] ) + }, status: :ok + + else + render json: { + ok: false, + message: rental.errors.messages + }, status: :bad_request + end + end + + private def rental_params - params.require(:rental).permit(:checkout_date, :due_date, :checkin_date, :movie_id, :customer_id) + return params.require(:rental).permit(:movie_id, :customer_id, :checkout_date, :due_date, :checkin_date) end + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index f30957b1b..701bd85a7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,7 @@ class Rental < ApplicationRecord after_save :set_checkout_date, :set_due_date + belongs_to :movie belongs_to :customer validates_presence_of :movie_id, :customer_id @@ -12,6 +13,11 @@ def available_inventory_of_movie end end + def check_in! #checks in a customer's rental(customer_id, movie_id) + self.checkin_date = Date.today + self.save + end + private def set_checkout_date self.checkout_date = (self.created_at) diff --git a/config/routes.rb b/config/routes.rb index 98b136652..b217b523e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,4 +7,6 @@ #Rental post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + 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 159d5981a..c81d2722a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -30,6 +30,7 @@ expect { post checkout_path, params: rental_hash }.must_change 'Rental.count', 1 + expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] @@ -98,28 +99,52 @@ end end - it "Does not allow removal from an empty inventory" do - # post check_out_path, params: rental_hash - movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 0) + # it "Does not allow removal from an empty inventory" do + # # post check_out_path, params: rental_hash + # movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 0) + # + # rental_hash = { + # rental: { + # checkout_date: Date.today, + # due_date: Date.today + 7, + # movie_id: movie.id, + # customer_id: customers(:cassy).id + # } + # } + # + # #Expect it will have errors + # # # # HOW # # # + # # Not sure how to test this + # post checkout_path, params: rental_hash + # + # end + end + describe 'check-in' do + let(:rental) {rentals(:check_out_rental)} + + it 'sets the check-in date to today' do rental_hash = { rental: { - checkout_date: Date.today, - due_date: Date.today + 7, - movie_id: movie.id, - customer_id: customers(:cassy).id + # checkout_date: rental.checkout_date, + # due_date: rental.due_date, + movie_id: rental.movie.id, + customer_id: rental.customer.id } } - #Expect it will have errors - # # # HOW # # # - # Not sure how to test this - post checkout_path, params: rental_hash + post checkin_path, params: rental_hash + + rental.reload + expect(rental.checkin_date).must_equal Date.today end end end - # # - # # describe 'check-in' do - # # -# end + + + +# def check_in! +# self.checkin_date = Date.today +# self.save +# end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 7b1a50499..a86b43573 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -14,9 +14,8 @@ two: movie: romantic customer: cassy -three: +check_out_rental: checkout_date: <% Date.today - 3 %> - checkin_date: <% Date.today %> due_date: <% Date.today + 7 %> movie: scary customer: cassy diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index f31750d9d..bb18d15b0 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -79,4 +79,19 @@ end end + describe "check in method for a movie" do + + it "has a check_in date equal to today's date when movie is checked in" do + rental = Rental.new movie_id: movies(:funny).id, + customer_id: customers(:cassy).id + + rental.save + + expect(rental.checkin_date).must_equal nil + + rental.check_in! + + expect(rental.checkin_date).must_equal Date.today + end + end end From 3427b43594ff56ca1a60bc3b00b395637fcee31f Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Fri, 9 Nov 2018 12:53:01 -0800 Subject: [PATCH 52/56] Removed old comments --- app/controllers/movies_controller.rb | 1 - app/controllers/rentals_controller.rb | 7 ----- app/models/customer.rb | 2 -- app/models/movie.rb | 27 ------------------ test/controllers/customers_controller_test.rb | 1 - test/models/customer_test.rb | 21 -------------- test/models/movie_test.rb | 28 ++++--------------- 7 files changed, 5 insertions(+), 82 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f300eaea7..7f26b766e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,7 +12,6 @@ def show status: :not_found else # available_inventory = movie.available_inventory - # binding.pry render json: { # ok: true, # methods: :available_inventory, diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fc833f32e..12727e990 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,13 +6,8 @@ def checkout if rental.save render json: { ok: true, - # Only returning the customer and movie ids rental: rental.as_json(only: [ :customer_id, :movie_id ] ) }, status: :ok - - # Reduce the inventory (should reduce the inventory/save the movie) - # Saving movie triggers the available_inventory - else render json: { ok: false, @@ -21,11 +16,9 @@ def checkout end end - private def rental_params params.require(:rental).permit(:checkout_date, :due_date, :checkin_date, :movie_id, :customer_id) end - end diff --git a/app/models/customer.rb b/app/models/customer.rb index 7825c5f57..df2e9b008 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,9 +6,7 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals validates_presence_of :name, :address, :city, :state, :postal_code, :phone - # Calculate the total movies here and pass to controller def movies_checked_out_count - # Maybe set status to show "active" rentals later return Rental.all.select{ |rental| rental.customer_id == self.id && rental.checkin_date.nil?}.length end diff --git a/app/models/movie.rb b/app/models/movie.rb index dfcbceb79..4a1071de1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,4 @@ class Movie < ApplicationRecord - # before_create :set_available_inventory - # before_save :set_available_inventory has_many :rentals has_many :customers, through: :rentals @@ -11,35 +9,10 @@ class Movie < ApplicationRecord validates :inventory, presence: true def number_of_checked_out_movies - # Might add a flag later for "active rentals" return Rental.all.select{ |rental| rental.movie_id == self.id && rental.checkin_date.nil?}.length end def available_inventory return self.inventory - number_of_checked_out_movies end - - - # If we add validation to rental that movie inventory must be > 0 - # We won't need this logic - # def check_inventory - # self.inventory > 0 ? true : false - # end - - # Don't need to do this - # Have available_inventory attribute set to return as method - # def reduce_inventory - # if check_inventory - # # binding.pry - # # self.inventory -= 1 - # binding.pry - # self.available_inventory = self.inventory - number_of_checked_out_movies - # - # # Saving movie should trigger an update to - # # set_available_inventory - # self.save - # else - # # binding.pry - # return false - # end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index fc66d22c5..3a8cf17bc 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -9,7 +9,6 @@ it "should get index as a real working route and returns JSON" do expect(response.header['Content-Type']).must_include 'json' - # binding.pry must_respond_with :success end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index c136c911b..28d388399 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -105,7 +105,6 @@ customer_id: customer.id expect(customer.movies_checked_out_count).must_equal start_count + 1 - end it "is decreased if a movie is checked in" do @@ -126,25 +125,5 @@ expect(customer.movies_checked_out_count).must_equal start_count - 1 end end - - #### REVISE - - # Anything that adjust after a rental - # Should live in rental controller ... - # After a checkout from rental - # (do in rental controller) - # Know the start value for the movie (0?) - # the customer.movies count goes up by 1 - # that last movie is the one the customer checked out - # The available inventory of the movie - # movies_checked_out_count - # it "adds one to movies_checked_out_count" do - # # customer.add_movie_to_count - # # # expect that this adds one to count - # # start_movies_checked_out = customer.movies_checked_out_count - # # customer.add_movie_to_count - # # expect(customer.movies_checked_out_count).must_equal start_movies_checked_out + 1 - # end - - end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e55f75542..664669c46 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -40,10 +40,10 @@ result.must_equal false expect(complete_movie.errors).must_include "inventory" end - end # Validation end + end describe "relations" do - let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } + let(:movie) { movies(:romantic) } let(:customer) { customers(:cassy) } it "has many customers through rental" do @@ -65,31 +65,13 @@ rental.must_be_kind_of Rental end end - end # End of relations + end describe "custom logic" do - let(:movie) { movies(:romantic) } #romantic_movie is being initialized as --> { movies(:romantic) } - # Remove - - # Should be testing that after a rent - # post the available_inventory returned - # in the body keys is correct - # describe "reduce inventory" do - # it "Reduces inventory by one if there is at least one item in inventory" do - # start_inventory_count = movie.inventory - # movie.reduce_inventory - # expect(movie.inventory).must_equal start_inventory_count - 1 - # end - # - # it "Returns false if inventory is 0" do - # movie.inventory = 0 - # expect(movie.reduce_inventory).must_equal false - # end - # end # End of reduce inventory - - + let(:movie) { movies(:romantic) } describe "number of checked out movies" do it "returns the number of movies that are currently checked out" do - movie = movies(:funny) + # movie = movies(:funny) expect(movie.number_of_checked_out_movies).must_equal Rental.where(movie_id: movie.id).length end end From a6ba0d71ad9a7943dfb88c4b65256dd826b70b6c Mon Sep 17 00:00:00 2001 From: Shelan Date: Fri, 9 Nov 2018 12:56:26 -0800 Subject: [PATCH 53/56] resolved merge conflict --- test/models/movie_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e55f75542..251dfe358 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -48,7 +48,7 @@ it "has many customers through rental" do #Act - binding.pry + movie.rentals.customers << customer #add 1st customer to a movie's customer customers = movie.customers #customers = movie's customers From c836746b113f301c8d9d7b13a6ea1b19ec9cadd1 Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Fri, 9 Nov 2018 14:25:21 -0800 Subject: [PATCH 54/56] Passed smoke tests --- app/controllers/rentals_controller.rb | 9 +-- app/models/rental.rb | 9 ++- test/controllers/rentals_controller_test.rb | 62 ++++++--------------- test/fixtures/rentals.yml | 4 ++ test/models/rental_test.rb | 18 +++++- 5 files changed, 49 insertions(+), 53 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6a2bb2f4e..e108cdfa4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,10 +1,12 @@ class RentalsController < ApplicationController def checkout - rental = Rental.new(rental_params) - - + rental = Rental.create(rental_params) + # binding.pry + # If it's able to be saved, + # We'll have the created_at value we need if rental.save + rental.set_checkout_values! render json: { ok: true, rental: rental.as_json(only: [ :customer_id, :movie_id ] ) @@ -22,7 +24,6 @@ def checkin customer_id = params[:rental][:customer_id] rental = Rental.find_by(movie_id: movie_id, customer_id: customer_id) if rental.check_in! - # binding.pry render json: { ok: true, diff --git a/app/models/rental.rb b/app/models/rental.rb index 701bd85a7..8c3fcc0ea 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,4 @@ class Rental < ApplicationRecord - after_save :set_checkout_date, :set_due_date - belongs_to :movie belongs_to :customer @@ -18,6 +16,12 @@ def check_in! #checks in a customer's rental(customer_id, movie_id) self.save end + def set_checkout_values! + set_checkout_date + set_due_date + self.save + end + private def set_checkout_date self.checkout_date = (self.created_at) @@ -27,5 +31,4 @@ def set_due_date self.due_date = (self.checkout_date + 7) end - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c81d2722a..85642a96d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,15 +2,13 @@ describe RentalsController do describe 'check-out' do - # Create for rental - let(:movie) { movies(:funny) } #romantic_movie is being initialized as --> { movies(:romantic) } + # + let(:movie) { movies(:funny) } let(:customer) {customers(:shelan) } let (:rental_hash) do { rental: { - checkout_date: Date.today, - due_date: Date.today + 7, movie_id: movies(:scary).id, customer_id: customers(:cassy).id } @@ -27,16 +25,22 @@ end it "can create a new rental if given valid params" do - expect { + + # rental = rentals(:pre_check_out_rental) + + rental_hash = { + rental: { + movie_id: movies(:funny).id, + customer_id: customers(:cassy).id + } + } + post checkout_path, params: rental_hash - }.must_change 'Rental.count', 1 - - expect(Rental.last.checkout_date).must_equal rental_hash[:rental][:checkout_date] - expect(Rental.last.due_date).must_equal rental_hash[:rental][:due_date] - expect(Rental.last.customer_id).must_equal rental_hash[:rental][:customer_id] - expect(Rental.last.movie_id).must_equal rental_hash[:rental][:movie_id] + rental = Rental.find_by( movie_id: movies(:funny).id, customer_id: customers(:cassy).id, due_date: Date.today + 7, checkout_date: Date.today ) + expect(rental.checkout_date).must_equal Date.today + expect(rental.due_date).must_equal Date.today + 7 end it "responds with an error for invalid params" do @@ -66,19 +70,16 @@ } } - # Do a post request for a rental that has that movie's id post checkout_path, params: rental_hash - # Checking that available inventory was reduced expect(movie.available_inventory).must_equal start_count - 1 end it "increases the number of movies the customer had checked out" do - # Testing in rental controller as route will only run in this controller movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 3) customer = customers(:cassy) - # start_count = movie.customer.movies.length + rental_hash = { rental: { checkout_date: Date.today, @@ -88,7 +89,7 @@ } } - start_count = customer.movies.length + start_count = customer.movies_checked_out_count # Do a post request for a rental that has that movie's id post checkout_path, params: rental_hash @@ -98,27 +99,8 @@ end end - - # it "Does not allow removal from an empty inventory" do - # # post check_out_path, params: rental_hash - # movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 0) - # - # rental_hash = { - # rental: { - # checkout_date: Date.today, - # due_date: Date.today + 7, - # movie_id: movie.id, - # customer_id: customers(:cassy).id - # } - # } - # - # #Expect it will have errors - # # # # HOW # # # - # # Not sure how to test this - # post checkout_path, params: rental_hash - # - # end end + describe 'check-in' do let(:rental) {rentals(:check_out_rental)} @@ -137,14 +119,6 @@ rental.reload expect(rental.checkin_date).must_equal Date.today - end end end - - - -# def check_in! -# self.checkin_date = Date.today -# self.save -# end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a86b43573..c104cc6cf 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -19,3 +19,7 @@ check_out_rental: due_date: <% Date.today + 7 %> movie: scary customer: cassy + +pre_check_out_rental: + movie: funny + customer: shelan diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index bb18d15b0..267aa98fd 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -19,7 +19,6 @@ movie = Movie.create(title: "test", overview: "test", release_date: Date.today, inventory: 0) rental = Rental.new(movie_id: movie.id, customer_id: Customer.first.id) result = rental.valid? - binding.pry result.must_equal false expect(rental.errors.messages[:available_inventory_of_movie][0]).must_include "Must be greater than 0" end @@ -63,6 +62,7 @@ customer_id: customers(:cassy).id rental.save + rental.set_checkout_values! expect(rental.checkout_date).must_equal rental.created_at.to_date @@ -74,10 +74,24 @@ customer_id: customers(:cassy).id rental.save + rental.set_checkout_values! expect(rental.due_date).must_equal rental.checkout_date + 7 end + + it "set checkout values creates a checkout date and due date" do + rental = Rental.new movie_id: movies(:funny).id, + customer_id: customers(:cassy).id + + rental.save + + rental.set_checkout_values! + # binding.pry + expect(rental.due_date).must_equal Date.today + 7 + expect(rental.checkout_date).must_equal Date.today + + end end describe "check in method for a movie" do @@ -88,7 +102,7 @@ rental.save expect(rental.checkin_date).must_equal nil - + rental.check_in! expect(rental.checkin_date).must_equal Date.today From a76203cd1b0b23513ae3de145f875f0b57e594e6 Mon Sep 17 00:00:00 2001 From: Shelan Date: Fri, 9 Nov 2018 14:40:16 -0800 Subject: [PATCH 55/56] model testing movie --- test/models/movie_test.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 56a8ed7b0..bb36b67ef 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -46,16 +46,13 @@ let(:movie) { movies(:romantic) } let(:customer) { customers(:cassy) } - it "has many customers through rental" do - #Act - - movie.rentals.customers << customer #add 1st customer to a movie's customer - customers = movie.customers #customers = movie's customers + it "can have many customers" do + + movie.must_respond_to :customers - #assert - expect(customers.length).must_be :>=, 1 #customers length should change by 1 - customers.each do |customer| - expect(customer).must_be_instance_of Customer + + movie.customers.each do |customer| + customer.must_be_kind_of Customer end end From 4aa6a16139bb754a852354eb230e15ba75d5ea1c Mon Sep 17 00:00:00 2001 From: Cassandra Archibald Date: Fri, 9 Nov 2018 15:28:11 -0800 Subject: [PATCH 56/56] Changed some methods to private --- app/controllers/movies_controller.rb | 6 +---- app/controllers/rentals_controller.rb | 1 - app/models/movie.rb | 12 ++++++--- app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 28 ++++++++++----------- test/models/movie_test.rb | 8 +----- test/models/rental_test.rb | 15 ----------- 7 files changed, 24 insertions(+), 48 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7f26b766e..3740f4206 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,6 @@ class MoviesController < ApplicationController def index - movies = Movie.all + movies = Movie.all.order(:title) render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end @@ -11,16 +11,12 @@ def show render json: {ok: false, message: 'not found'}, status: :not_found else - # available_inventory = movie.available_inventory render json: { - # ok: true, - # methods: :available_inventory, title: movie.as_json(only: [:title])["title"], overview: movie.as_json(only: [:overview])["overview"], release_date: movie.as_json(only: [:release_date])["release_date"], inventory: movie.as_json(only: [:inventory])["inventory"], "available_inventory" => movie.available_inventory - # available_inventory: movie.as_json(only: [:available_inventory])["available_inventory"] }, status: :ok end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e108cdfa4..a89103f15 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,7 +2,6 @@ class RentalsController < ApplicationController def checkout rental = Rental.create(rental_params) - # binding.pry # If it's able to be saved, # We'll have the created_at value we need if rental.save diff --git a/app/models/movie.rb b/app/models/movie.rb index 4a1071de1..8ee591cc2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,11 +8,15 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true - def number_of_checked_out_movies - return Rental.all.select{ |rental| rental.movie_id == self.id && rental.checkin_date.nil?}.length - end - def available_inventory return self.inventory - number_of_checked_out_movies end + + private + + def number_of_checked_out_movies + return Rental.all.select{ |rental| rental.movie_id == self.id && rental.checkin_date.nil?}.length + end + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 8c3fcc0ea..6c09a08b1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -23,6 +23,7 @@ def set_checkout_values! end private + def set_checkout_date self.checkout_date = (self.created_at) end @@ -30,5 +31,4 @@ def set_checkout_date def set_due_date self.due_date = (self.checkout_date + 7) end - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 85642a96d..439059713 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -26,21 +26,23 @@ it "can create a new rental if given valid params" do - # rental = rentals(:pre_check_out_rental) - - rental_hash = { - rental: { - movie_id: movies(:funny).id, - customer_id: customers(:cassy).id - } + rental_hash = { + rental: { + movie_id: movies(:funny).id, + customer_id: customers(:cassy).id } + } - post checkout_path, params: rental_hash + post checkout_path, params: rental_hash - rental = Rental.find_by( movie_id: movies(:funny).id, customer_id: customers(:cassy).id, due_date: Date.today + 7, checkout_date: Date.today ) + # Finding rental with information that is the same + # As our post request. + # Wasn't sure how else to do this as we don't have an + # id in the post request + rental = Rental.find_by( movie_id: movies(:funny).id, customer_id: customers(:cassy).id, due_date: Date.today + 7, checkout_date: Date.today ) - expect(rental.checkout_date).must_equal Date.today - expect(rental.due_date).must_equal Date.today + 7 + expect(rental.checkout_date).must_equal Date.today + expect(rental.due_date).must_equal Date.today + 7 end it "responds with an error for invalid params" do @@ -51,7 +53,6 @@ }.wont_change 'Rental.count' must_respond_with :bad_request - end describe "available inventory" do @@ -96,7 +97,6 @@ # Checking that customer movies went up by one expect(customer.movies_checked_out_count).must_equal start_count + 1 - end end end @@ -108,8 +108,6 @@ rental_hash = { rental: { - # checkout_date: rental.checkout_date, - # due_date: rental.due_date, movie_id: rental.movie.id, customer_id: rental.customer.id } diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index bb36b67ef..62a6d14f9 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -50,7 +50,7 @@ movie.must_respond_to :customers - + movie.customers.each do |customer| customer.must_be_kind_of Customer end @@ -66,12 +66,6 @@ describe "custom logic" do let(:movie) { movies(:romantic) } - describe "number of checked out movies" do - it "returns the number of movies that are currently checked out" do - # movie = movies(:funny) - expect(movie.number_of_checked_out_movies).must_equal Rental.where(movie_id: movie.id).length - end - end describe "available_inventory" do it "does not included checked in movies " do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 267aa98fd..5ecefe460 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -93,19 +93,4 @@ end end - describe "check in method for a movie" do - - it "has a check_in date equal to today's date when movie is checked in" do - rental = Rental.new movie_id: movies(:funny).id, - customer_id: customers(:cassy).id - - rental.save - - expect(rental.checkin_date).must_equal nil - - rental.check_in! - - expect(rental.checkin_date).must_equal Date.today - end - end end