From 7751b7eb4d0f016ebfe435332f9993a88961668b Mon Sep 17 00:00:00 2001 From: Anibel America Date: Mon, 5 Nov 2018 12:16:21 -0800 Subject: [PATCH 01/46] ran rails new 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 | 24 +++ tmp/.keep | 0 vendor/.keep | 0 57 files changed, 934 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..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..468878d15 --- /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.6) + 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.4 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..bc0dbdd94 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +GAB3A2W4HZRR6YGo1Ysu2WzS9OB85rf12kwkw8iT2fUYmajKAYSfu0MJVFRFMQUof0KfMSm28LBzeTItDOC2EO2wyJ/PIZRww+eDxDPhKSjkPO/uqVF6tOBEIz9NvALWlZHFu2s4XHH5feLSwTbfIGiwLjsM0e+7BSsTQ/DvaEBh8AqCRqbFlBxnQgTKOPBukOYf8ofvp3b0h/Vi0M3LNhzHsSxYAcOEBOcyfBr8cJS6qEmRPKzbEEGJYhoJmDWHd/mlUBH9R4CsPNqxNib3+eigNdIX0ebrHImehSUnaryHgDMQwIry4BpMcjK1Bt3MBcWiCG2NvCcF20UMAHsQU7NgPqs0yN8zCz2LQfwU8fbIykzhQld+A8GCTnYKGbTYmz0EEnMJVzTbMXsBL0FpUDAY6KlQesBH0iyV--Wmf0JAGXhAzhS3pk--0ESiv+iBY9RCDrTx45dupw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 98bc1d31dc57c093923f38f554880c125944eeb4 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Mon, 5 Nov 2018 12:21:28 -0800 Subject: [PATCH 02/46] adds movie model --- app/models/movie.rb | 2 ++ db/migrate/20181105202003_create_movies.rb | 12 ++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/movie_test.rb | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105202003_create_movies.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20181105202003_create_movies.rb b/db/migrate/20181105202003_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105202003_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..f05dd0894 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 diff --git a/test/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 From 53d5dd4ca8988499d0dbf078b38fbbd3b4a1fb8a Mon Sep 17 00:00:00 2001 From: Anibel America Date: Mon, 5 Nov 2018 12:32:01 -0800 Subject: [PATCH 03/46] add customer model --- app/models/customer.rb | 2 ++ db/migrate/20181105203128_create_customers.rb | 15 +++++++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/models/customer_test.rb | 9 +++++++++ 4 files changed, 45 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20181105203128_create_customers.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/db/migrate/20181105203128_create_customers.rb b/db/migrate/20181105203128_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105203128_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..aa33d22f8 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-11-05 12:31:28 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-11-05 12:31:28 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString 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 From 580db0ca64d2b58fef329909813713561298c28a Mon Sep 17 00:00:00 2001 From: Anibel America Date: Mon, 5 Nov 2018 12:43:24 -0800 Subject: [PATCH 04/46] adds customer and movie model validations --- app/models/customer.rb | 4 ++++ app/models/movie.rb | 4 ++++ db/schema.rb | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 db/schema.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d8c8c2071 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,6 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..c70c4dbf5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true, numericality: true end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..aa9c3d5b1 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_11_05_203128) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 913bd3eb35a8c61ecc4246e10f4853817597be5e Mon Sep 17 00:00:00 2001 From: Anibel America Date: Mon, 5 Nov 2018 13:41:20 -0800 Subject: [PATCH 05/46] adds test route for zomg --- app/controllers/application_controller.rb | 5 +++++ config/routes.rb | 1 + 2 files changed, 6 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..2ee3f7b9b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::API + + def test + render json: { test_message: 'It works!' } + end + end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..bce7c61c1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/zomg', to: 'application#test', as: 'test' end From 1f29efec2ea709250bd11c4ccbf9beadff70a20d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Mon, 5 Nov 2018 15:24:18 -0800 Subject: [PATCH 06/46] adds movie model validation tests --- test/models/movie_test.rb | 81 +++++++++++++++++++++++++++++++++++++-- test/test_helper.rb | 3 +- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..6fe8d23c1 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,84 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + # let(:movie) { Movie.new } + # + # it "must be valid" do + # value(movie).must_be :valid? + # end - it "must be valid" do - value(movie).must_be :valid? + describe 'validations' do + + let(:movie_data) { + { + movie: { + title: 'The Grinch', + overview: 'The Grinch and his loyal dog, Max, live a solitary existence inside a cave on Mount Crumpet.', + release_date: Date.parse("2017-11-06"), + inventory: 2 + } + } + + } + + it 'successfully creates a new movie when given valid title, overview, release_date, and inventory' do + old_count = Movie.count + movie = Movie.new(movie_data[:movie]) + + movie.save + + movie.valid?.must_equal true + (Movie.count).must_equal old_count + 1 + (movie.title).must_equal movie_data[:movie][:title] + (movie.overview).must_equal movie_data[:movie][:overview] + (movie.release_date).must_equal movie_data[:movie][:release_date] + (movie.inventory).must_equal movie_data[:movie][:inventory] + end + + it 'does not create a new movie when missing a title' do + old_count = Movie.count + movie_data[:movie][:title] = nil + movie = Movie.new(movie_data[:movie]) + + movie.valid?.must_equal false + (Movie.count).must_equal old_count + end + + it 'does not create a new movie when missing an overview' do + old_count = Movie.count + movie_data[:movie][:overview] = nil + movie = Movie.new(movie_data[:movie]) + + movie.valid?.must_equal false + (Movie.count).must_equal old_count + end + + it 'does not create a new movie when missing a release_date' do + old_count = Movie.count + movie_data[:movie][:release_date] = nil + movie = Movie.new(movie_data[:movie]) + + movie.valid?.must_equal false + (Movie.count).must_equal old_count + end + + it 'does not create a new movie when missing an inventory' do + old_count = Movie.count + movie_data[:movie][:inventory] = nil + movie = Movie.new(movie_data[:movie]) + + movie.valid?.must_equal false + (Movie.count).must_equal old_count + end + + it 'does not create a new movie when inventory is given as a non-integer' do + old_count = Movie.count + movie_data[:movie][:inventory] = "Not a number" + movie = Movie.new(movie_data[:movie]) + + movie.valid?.must_equal false + (Movie.count).must_equal old_count + end end + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 5ee2c7786fec653633731cf491ef5135fe501c3d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Mon, 5 Nov 2018 16:12:07 -0800 Subject: [PATCH 07/46] adds tests for movie model custom methods --- test/models/movie_test.rb | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 6fe8d23c1..29e5f5516 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -81,4 +81,54 @@ end end + # TODO: These are stubbed for now. Wave 3 may address them + describe 'relations' do + + let(:movie) { Movie.first } + + it 'has some rentals' do + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + + # TODO: Might not be needed, why would we ever need to know the list of customers who have had or currently have rentals + it 'has some customers through rentals' do + movie.must_respond_to :customers + movie.customers.each do |customer| + customer.must_be_kind_of Customer + end + end + end + + # TODO: These are stubbed for now. Wave 3 may address them + describe 'custom methods' do + + describe 'available_inventory' do + + let(:movie) { Movie.first } + + it 'returns the available inventory for a given movie' do + # movie must have 1 current rental on it + # TODO: may want to arrange this now if rentals.yml are old rental dates + (movie.available_inventory).must_equal 0 + end + + end + + describe 'helper method checked_out_count' do + + let(:movie) { Movie.first } + + it 'returns the total checked out copies of this movie' do + # movie must have 1 current rental on it + # TODO: may want to arrange this now if rentals.yml are old rental dates + (movie.checked_out_count).must_equal 1 + end + + end + + end + end From a063b5388660c9918cadf86abe7ce3bf6fccec0a Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Mon, 5 Nov 2018 16:45:32 -0800 Subject: [PATCH 08/46] Write validation tests for Customer and fix test_helper line --- app/models/customer.rb | 5 +--- test/models/customer_test.rb | 49 +++++++++++++++++++++++++++++++++--- test/test_helper.rb | 3 ++- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d8c8c2071..9d0e7b6b8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,3 @@ class Customer < ApplicationRecord - validates :name, presence: true - validates :registered_at, presence: true - validates :postal_code, presence: true - validates :phone, presence: true + validates :name, :phone, :address, :city, :state, :postal_code, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..2aecd879d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,52 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + describe 'validations' do + let(:customer) { customers(:one) } + + it "must be valid" do + value(customer).must_be :valid? + end + + it "must have a name" do + customer.name = nil + customer.valid?.must_equal false + end + + it "must have a phone" do + customer.phone = nil + customer.valid?.must_equal false + end + + it "must have a address" do + customer.phone = nil + customer.valid?.must_equal false + end + + it "must have a city" do + customer.phone = nil + customer.valid?.must_equal false + end + + it "must have a state" do + customer.phone = nil + customer.valid?.must_equal false + end + + it "must have a postal_code" do + customer.phone = nil + customer.valid?.must_equal false + end + + it "must have a phone" do + customer.phone = nil + customer.valid?.must_equal false + end + end + + describe 'relations' do + it 'can have many rentals' do + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 3c2369ddbf4020962b8f87322039fab57e24826e Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 11:43:36 -0800 Subject: [PATCH 09/46] creates movies controller and routes --- .DS_Store | Bin 0 -> 8196 bytes app/controllers/movies_controller.rb | 10 ++++++++++ config/routes.rb | 2 ++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 19 insertions(+) create mode 100644 .DS_Store create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a145ac4ea409567e7fed826892e93b814930354f GIT binary patch literal 8196 zcmeHML5>nZ6#X?IG>k?Tnqk=+6BoolFwSCPg2=?o!o-Ntg_;=}km*d*O`sW6#IW%W z>J2=KC-5L1K;N$_vAckc3**EpQuV8=-mCimbwl@Wh)6W2y&6%Oh#XY5rCl@|3eR(0 zD?57RI;;SnqOKQ29*#wTtyRD(u&w~-?iuRPh( zUkp@^x)f1JuYet-v0~4_7Lr)HMPr&8j1LB5hkE20nC}K=7kl^d0TOX_=?p6msh4IE zNB1!iU7j9*Gn9S@)Hl!^WfFZkjm8cEqQ+ino{TujD}XnJS7Ug`3a#xVIN~HD2hfKx8RKo+cE->#Wu<_ z5?8C=#7-uADVKMgqEoz5eAzyYX6?8WPbbaJ_&Fav>cpp>?mvm5VAbz5P)6%VTis9D03RxE|tXyihU6vWw4D^ I;IAt16J&Tj&j0`b literal 0 HcmV?d00001 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index bce7c61c1..27e61efb0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'application#test', as: 'test' + + resources :movies, only: [:index, :show, :create] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..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 From 0f318ef97ba47a69318f65b5dfa62e6cee0af408 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 11:47:42 -0800 Subject: [PATCH 10/46] creates customers controller and routes --- app/controllers/customers_controller.rb | 7 +++++++ config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 14 ++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..558cf72e7 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + end + + def show + end +end diff --git a/config/routes.rb b/config/routes.rb index 27e61efb0..380fcc678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,5 @@ get '/zomg', to: 'application#test', as: 'test' resources :movies, only: [:index, :show, :create] + resources :customers, only: [:index, :show] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..ac95821cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + + it "should get show" do + get customers_show_url + value(response).must_be :success? + end + +end From 1359e8ed14460159370e38f48d44cbbf5df82b5b Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 12:06:17 -0800 Subject: [PATCH 11/46] adds customers index controller tests and methods --- app/controllers/customers_controller.rb | 10 ++++ app/controllers/movies_controller.rb | 1 + test/controllers/customers_controller_test.rb | 49 ++++++++++++++++--- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 558cf72e7..f7a2d287f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,17 @@ class CustomersController < ApplicationController def index + customers = Customer.all + + render json: jsonify(customers), status: :ok end def show end + + private + + def jsonify(customer_data) + return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone] ) + end + end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..bd6fe1506 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,4 +7,5 @@ def show def create end + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ac95821cd..ac2113ed9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,14 +1,51 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? + # it "should get index" do + # get customers_index_url + # value(response).must_be :success? + # end + # + # it "should get show" do + # get customers_show_url + # value(response).must_be :success? + # end + + def parse_json(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body end - it "should get show" do - get customers_show_url - value(response).must_be :success? + describe 'index' do + it 'should list all customers in JSON and renders a status code of success' do + # Act + get customers_path + + # Assert + body = parse_json(expected_type: Array) + + expect(body.length).must_equal Customer.count + + # body.each do |pet| + # expect(pet.keys.sort).must_equal PET_FIELDS + # end + end + + it "returns an empty array when there are no pets" do + Customer.destroy_all + + get customers_path + + #Assert + body = parse_json(expected_type: Array) + + expect(body).must_equal [] + + end end end From 3957caa1f8b0d65a59a6b7e73690a689a68167a6 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 13:47:52 -0800 Subject: [PATCH 12/46] adds render error method --- app/controllers/application_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2ee3f7b9b..d44b24132 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,4 +4,8 @@ def test render json: { test_message: 'It works!' } end + def render_error(status, errors) + render json: { errors: errors }, status: status + end + end From 284c9c29e8d08d053d22a10889e17581f5b859bc Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 14:21:41 -0800 Subject: [PATCH 13/46] adds movies controller show action tests and methods --- app/controllers/movies_controller.rb | 18 ++++++++++ test/controllers/movies_controller_test.rb | 39 ++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index bd6fe1506..b6154c57e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,11 +1,29 @@ class MoviesController < ApplicationController + + before_action :find_movie, only: [:show] + def index end def show + if @movie + render json: jsonify(@movie) + else + render_error(:not_found, { movie_id: ["Movie does not exist"] }) + end end def create end + private + + def find_movie + @movie = Movie.find_by(id: params[:id]) + end + + def jsonify(movie_data) + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory] ) + end + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..a0752ef84 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,40 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + MOVIE_FIELDS = %w(title overview release_date inventory).sort + + def parse_json(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + it 'is a real working route and returns JSON' do + movie = Movie.first + movie_id = movie.id + + get movie_path(movie_id) + + body = parse_json(expected_type: Hash) + + expect(body.keys.sort).must_equal MOVIE_FIELDS + end + + it 'returns JSON with an error message and status code of not found if pet does not exist' do + movie = Movie.first + movie_id = movie.id + movie.destroy + + #Act + get movie_path(movie_id) + + #Assert + body = parse_json(expected_type: Hash, expected_status: :not_found) + + expect(body["errors"]).must_include "movie_id" + end + end From a3f5635a3cc42a015b0d54265d3fb55d01c2fd66 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 14:56:03 -0800 Subject: [PATCH 14/46] refactors movie and customer controllers to use rabl gem --- Gemfile | 2 ++ Gemfile.lock | 3 +++ app/controllers/customers_controller.rb | 12 +++++++----- app/controllers/movies_controller.rb | 10 ++++------ app/views/customers/index.json.rabl | 18 ++++++++++++++++++ app/views/movies/show.json.rabl | 18 ++++++++++++++++++ config/initializers/rable_config.rb | 3 +++ config/routes.rb | 1 + 8 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 app/views/customers/index.json.rabl create mode 100644 app/views/movies/show.json.rabl create mode 100644 config/initializers/rable_config.rb diff --git a/Gemfile b/Gemfile index a9f49bedc..1f2217e98 100644 --- a/Gemfile +++ b/Gemfile @@ -52,3 +52,5 @@ group :test do gem 'minitest-rails' gem 'minitest-reporters' end + +gem 'rabl', '~> 0.14.0' diff --git a/Gemfile.lock b/Gemfile.lock index 468878d15..dca44bbb3 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.6) 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/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f7a2d287f..768ba77e4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,10 @@ class CustomersController < ApplicationController + def index - customers = Customer.all + @customers = Customer.all - render json: jsonify(customers), status: :ok + # render status: :ok + # render json: jsonify(customers), status: :ok end def show @@ -10,8 +12,8 @@ def show private - def jsonify(customer_data) - return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone] ) - end + # def jsonify(customer_data) + # return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone] ) + # end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b6154c57e..7b2b5e05a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,9 +6,7 @@ def index end def show - if @movie - render json: jsonify(@movie) - else + unless @movie render_error(:not_found, { movie_id: ["Movie does not exist"] }) end end @@ -22,8 +20,8 @@ def find_movie @movie = Movie.find_by(id: params[:id]) end - def jsonify(movie_data) - return movie_data.as_json(only: [:title, :overview, :release_date, :inventory] ) - end + # def jsonify(movie_data) + # return movie_data.as_json(only: [:title, :overview, :release_date, :inventory] ) + # end end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl new file mode 100644 index 000000000..4c9c72ea3 --- /dev/null +++ b/app/views/customers/index.json.rabl @@ -0,0 +1,18 @@ +object @customers +attributes :id, :name, :registered_at, :postal_code, :phone + +# object @article +# attributes :id, :name, :published_at +# +# if current_user.admin? +# node(:edit_url) { |article| edit_article_url(article) } +# end +# +# child :author do +# attributes :id, :name +# node(:url) { |author| author_url(author) } +# end +# +# child :comments do +# attributes :id, :name, :content +# end diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl new file mode 100644 index 000000000..bafb257e6 --- /dev/null +++ b/app/views/movies/show.json.rabl @@ -0,0 +1,18 @@ +object @movie +attributes :title, :overview, :release_date, :inventory + +# object @article +# attributes :id, :name, :published_at +# +# if current_user.admin? +# node(:edit_url) { |article| edit_article_url(article) } +# end +# +# child :author do +# attributes :id, :name +# node(:url) { |author| author_url(author) } +# end +# +# child :comments do +# attributes :id, :name, :content +# end diff --git a/config/initializers/rable_config.rb b/config/initializers/rable_config.rb new file mode 100644 index 000000000..f11eb190d --- /dev/null +++ b/config/initializers/rable_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 380fcc678..1af17bef6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,5 @@ resources :movies, only: [:index, :show, :create] resources :customers, only: [:index, :show] + end From 6db5d63cf0577429939afb1e0d2880cade5c4bcd Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 15:13:00 -0800 Subject: [PATCH 15/46] fixes controller tests to use rabl --- app/controllers/customers_controller.rb | 6 ------ app/controllers/movies_controller.rb | 4 ---- app/views/customers/index.json.rabl | 16 ---------------- app/views/movies/show.json.rabl | 16 ---------------- test/controllers/customers_controller_test.rb | 7 ++----- test/controllers/movies_controller_test.rb | 8 ++++---- 6 files changed, 6 insertions(+), 51 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 768ba77e4..b1c9b563f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,8 +3,6 @@ class CustomersController < ApplicationController def index @customers = Customer.all - # render status: :ok - # render json: jsonify(customers), status: :ok end def show @@ -12,8 +10,4 @@ def show private - # def jsonify(customer_data) - # return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone] ) - # end - end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7b2b5e05a..c51343c1e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,8 +20,4 @@ def find_movie @movie = Movie.find_by(id: params[:id]) end - # def jsonify(movie_data) - # return movie_data.as_json(only: [:title, :overview, :release_date, :inventory] ) - # end - end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl index 4c9c72ea3..ea71a43bd 100644 --- a/app/views/customers/index.json.rabl +++ b/app/views/customers/index.json.rabl @@ -1,18 +1,2 @@ object @customers attributes :id, :name, :registered_at, :postal_code, :phone - -# object @article -# attributes :id, :name, :published_at -# -# if current_user.admin? -# node(:edit_url) { |article| edit_article_url(article) } -# end -# -# child :author do -# attributes :id, :name -# node(:url) { |author| author_url(author) } -# end -# -# child :comments do -# attributes :id, :name, :content -# end diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl index bafb257e6..d8d4cbfad 100644 --- a/app/views/movies/show.json.rabl +++ b/app/views/movies/show.json.rabl @@ -1,18 +1,2 @@ object @movie attributes :title, :overview, :release_date, :inventory - -# object @article -# attributes :id, :name, :published_at -# -# if current_user.admin? -# node(:edit_url) { |article| edit_article_url(article) } -# end -# -# child :author do -# attributes :id, :name -# node(:url) { |author| author_url(author) } -# end -# -# child :comments do -# attributes :id, :name, :content -# end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ac2113ed9..68266756e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -23,22 +23,19 @@ def parse_json(expected_type:, expected_status: :success) describe 'index' do it 'should list all customers in JSON and renders a status code of success' do # Act - get customers_path + get customers_path, as: :json # Assert body = parse_json(expected_type: Array) expect(body.length).must_equal Customer.count - # body.each do |pet| - # expect(pet.keys.sort).must_equal PET_FIELDS - # end end it "returns an empty array when there are no pets" do Customer.destroy_all - get customers_path + get customers_path, as: :json #Assert body = parse_json(expected_type: Array) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a0752ef84..cbe364845 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -15,10 +15,10 @@ def parse_json(expected_type:, expected_status: :success) it 'is a real working route and returns JSON' do movie = Movie.first movie_id = movie.id - - get movie_path(movie_id) - + # binding.pry + get movie_path(movie_id), as: :json body = parse_json(expected_type: Hash) + # binding.pry expect(body.keys.sort).must_equal MOVIE_FIELDS end @@ -29,7 +29,7 @@ def parse_json(expected_type:, expected_status: :success) movie.destroy #Act - get movie_path(movie_id) + get movie_path(movie_id), as: :json #Assert body = parse_json(expected_type: Hash, expected_status: :not_found) From 0a1057b8d6c282ba55e2d6d989f3b70a2ec9a4ad Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Tue, 6 Nov 2018 15:35:27 -0800 Subject: [PATCH 16/46] Write tests for index --- test/controllers/movies_controller_test.rb | 45 ++++++++++++---------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index cbe364845..e9924fdef 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -12,29 +12,34 @@ def parse_json(expected_type:, expected_status: :success) return body end - it 'is a real working route and returns JSON' do - movie = Movie.first - movie_id = movie.id - # binding.pry - get movie_path(movie_id), as: :json - body = parse_json(expected_type: Hash) - # binding.pry - - expect(body.keys.sort).must_equal MOVIE_FIELDS - end - - it 'returns JSON with an error message and status code of not found if pet does not exist' do - movie = Movie.first - movie_id = movie.id - movie.destroy + describe 'index' do + it 'should list all customers in JSON and renders a status code of success' do + get customers_path, as: :json - #Act - get movie_path(movie_id), as: :json + body = parse_json(expected_type: Array) - #Assert - body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(body.length).must_equal Movie.count + end + end - expect(body["errors"]).must_include "movie_id" + describe 'show' do + it 'is a real working route and returns JSON' do + movie = Movie.first + movie_id = movie.id + get movie_path(movie_id), as: :json + body = parse_json(expected_type: Hash) + expect(body.keys.sort).must_equal MOVIE_FIELDS + end + + it 'returns JSON with an error message and status code of not found if pet does not exist' do + movie = Movie.first + movie_id = movie.id + movie.destroy + + get movie_path(movie_id), as: :json + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_include "movie_id" + end end end From 74d3a1e64a05d56e862b2442f66e0447ab12c41a Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Tue, 6 Nov 2018 15:36:31 -0800 Subject: [PATCH 17/46] Remove commented code --- test/controllers/customers_controller_test.rb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 68266756e..b3340dc6b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,16 +1,6 @@ require "test_helper" describe CustomersController do - # it "should get index" do - # get customers_index_url - # value(response).must_be :success? - # end - # - # it "should get show" do - # get customers_show_url - # value(response).must_be :success? - # end - def parse_json(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' @@ -22,10 +12,8 @@ def parse_json(expected_type:, expected_status: :success) describe 'index' do it 'should list all customers in JSON and renders a status code of success' do - # Act get customers_path, as: :json - # Assert body = parse_json(expected_type: Array) expect(body.length).must_equal Customer.count @@ -37,12 +25,10 @@ def parse_json(expected_type:, expected_status: :success) get customers_path, as: :json - #Assert body = parse_json(expected_type: Array) expect(body).must_equal [] end end - end From 2bb448110bc8c1e3f464377a9e8c3281cc12e513 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Tue, 6 Nov 2018 15:36:57 -0800 Subject: [PATCH 18/46] Set up index view with rabl --- .DS_Store | Bin 8196 -> 8196 bytes app/controllers/movies_controller.rb | 1 + app/views/movies/index.json.rabl | 2 ++ 3 files changed, 3 insertions(+) create mode 100644 app/views/movies/index.json.rabl diff --git a/.DS_Store b/.DS_Store index a145ac4ea409567e7fed826892e93b814930354f..4be1513e47ff1eb04871cb5f86c7310e1aee33f5 100644 GIT binary patch delta 46 zcmZp1XmOa}&nUJrU^hRb*k&Gqr_7vbDaFZ2`T04Flb;G_ZO)aM&OEV!XEVFRUv>a< CFAyvM delta 33 pcmZp1XmOa}&nUVvU^hRb=w=>)r_7VtMB+C4^Xy>W%r5bl9RRqF3cvsW diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c51343c1e..4adb238f6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,6 +3,7 @@ class MoviesController < ApplicationController before_action :find_movie, only: [:show] def index + @movies = Movie.all end def show diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl new file mode 100644 index 000000000..d587e42c6 --- /dev/null +++ b/app/views/movies/index.json.rabl @@ -0,0 +1,2 @@ +object @movies +attributes :title, :overview, :release_date, :inventory From 8eff1ad4437448fc5be864ab84a6681e86c34796 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Tue, 6 Nov 2018 16:24:15 -0800 Subject: [PATCH 19/46] Add controller tests and methods passing smoke tests --- app/controllers/movies_controller.rb | 11 ++++- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 48 ++++++++++++++++++- 3 files changed, 58 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4adb238f6..cfdef1654 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,12 +13,21 @@ def show end def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id } + else + render_error(:bad_request, movie.errors.messages) + end end private + def movie_params + params.permit(:title, :overview, :release_date, :inventory) + end + def find_movie @movie = Movie.find_by(id: params[:id]) end - end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b3340dc6b..21ebf7edd 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -20,7 +20,7 @@ def parse_json(expected_type:, expected_status: :success) end - it "returns an empty array when there are no pets" do + it "returns an empty array when there are no customers" do Customer.destroy_all get customers_path, as: :json diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e9924fdef..c22c0031e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -20,6 +20,16 @@ def parse_json(expected_type:, expected_status: :success) expect(body.length).must_equal Movie.count end + + it "returns an empty array when there are no movies" do + Movie.destroy_all + + get movies_path, as: :json + + body = parse_json(expected_type: Array) + + expect(body).must_equal [] + end end describe 'show' do @@ -31,7 +41,7 @@ def parse_json(expected_type:, expected_status: :success) expect(body.keys.sort).must_equal MOVIE_FIELDS end - it 'returns JSON with an error message and status code of not found if pet does not exist' do + it 'returns JSON with an error message and status code of not found if movie does not exist' do movie = Movie.first movie_id = movie.id movie.destroy @@ -42,4 +52,40 @@ def parse_json(expected_type:, expected_status: :success) end end + describe 'create' do + let(:movie_params) { + { + title: 'Rocky', + overview: "A very rocky movie", + release_date: "1976-11-21", + inventory: 100 + } + } + + it 'creates a new movie and returns JSON with an id when given valid input' do + previous_count = Movie.count + post movies_path, params: movie_params + new_count = previous_count + 1 + + body = parse_json(expected_type: Hash) + expect(body.keys).must_include "id" + + movie = Movie.last + expect(movie.title).must_equal movie_params[:title] + expect(movie.overview).must_equal movie_params[:overview] + expect(movie.release_date).must_equal movie_params[:release_date].to_date + expect(movie.inventory).must_equal movie_params[:inventory] + expect(Movie.count).must_equal new_count + + end + + it 'renders bad_request status code and returns JSON with error messages if the movie was not successfully saved' do + movie_params[:title] = nil + + post movies_path, params: movie_params + + body = parse_json(expected_type: Hash, expected_status: :bad_request) + expect(body.keys).must_include "errors" + end + end end From fdc6ccddbee4423d7ec94e532b9ce6b124290bc4 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 6 Nov 2018 16:53:32 -0800 Subject: [PATCH 20/46] adds rentals model --- app/models/rental.rb | 2 ++ db/migrate/20181107004132_create_rentals.rb | 9 +++++++++ .../20181107004333_add_foreign_keys_to_rental.rb | 6 ++++++ db/schema.rb | 14 +++++++++++++- test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181107004132_create_rentals.rb create mode 100644 db/migrate/20181107004333_add_foreign_keys_to_rental.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20181107004132_create_rentals.rb b/db/migrate/20181107004132_create_rentals.rb new file mode 100644 index 000000000..6e4c2f610 --- /dev/null +++ b/db/migrate/20181107004132_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.boolean :checked_out?, default: true + + t.timestamps + end + end +end diff --git a/db/migrate/20181107004333_add_foreign_keys_to_rental.rb b/db/migrate/20181107004333_add_foreign_keys_to_rental.rb new file mode 100644 index 000000000..779f605ea --- /dev/null +++ b/db/migrate/20181107004333_add_foreign_keys_to_rental.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customers, foreign_key: true + add_reference :rentals, :movies, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index aa9c3d5b1..b4dda02d1 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_203128) do +ActiveRecord::Schema.define(version: 2018_11_07_004333) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,16 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.boolean "checked_out?", default: true + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customers_id" + t.bigint "movies_id" + t.index ["customers_id"], name: "index_rentals_on_customers_id" + t.index ["movies_id"], name: "index_rentals_on_movies_id" + end + + add_foreign_key "rentals", "customers", column: "customers_id" + add_foreign_key "rentals", "movies", column: "movies_id" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..2097205c8 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + ckeck_out: 2018-11-06 + check_in: 2018-11-06 + +two: + ckeck_out: 2018-11-06 + check_in: 2018-11-06 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 86820f13214fce5f132fe21fe5636d3eec2d0927 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Tue, 6 Nov 2018 17:01:02 -0800 Subject: [PATCH 21/46] Generate rentals controller --- app/controllers/rentals_controller.rb | 7 +++++++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 14 ++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..cfa9cdfb5 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,7 @@ +class RentalsController < ApplicationController + def create # checkout-out method + end + + def update # checkout-in method, update "checked_out?" to be false + end +end diff --git a/config/routes.rb b/config/routes.rb index 1af17bef6..2f6813a6f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + get 'rentals/create' + get 'rentals/update' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'application#test', as: 'test' diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..be1264fab --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe RentalsController do + it "should get create" do + get rentals_create_url + value(response).must_be :success? + end + + it "should get update" do + get rentals_update_url + value(response).must_be :success? + end + +end From 5513f4464e035fa7fe4838ad2e000484c9e18596 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 06:42:33 -0800 Subject: [PATCH 22/46] includes tests for overdue rentals endpoint --- test/controllers/rentals_controller_test.rb | 36 +++++++++++++++++---- test/models/rental_test.rb | 34 +++++++++++++++++-- 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index be1264fab..f94290671 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,14 +1,38 @@ require "test_helper" describe RentalsController do - it "should get create" do - get rentals_create_url - value(response).must_be :success? + + RENTAL_FIELDS = %w(movie_id title customer_id name postal_code checkout_date due_date) + + def parse_json(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body end - it "should get update" do - get rentals_update_url - value(response).must_be :success? + describe 'overdue' do + it 'returns a list of all customers with overdue books in JSON with a status code of success' do + #Arrange + # TODO create rentals in yml files with overdue parameters, or + # update yml rentals to change checked_out? to true (as long as date is + # more than 1 week ago) + + get overdue_rentals_path + + body = parse_json(expected_type: Array) + + expect(body.keys.sort).must_equal MOVIE_FIELDS + end + + it 'returns an empty array with a status code of success if there are no customers with overdue books' do + get overdue_rentals_path + + body = parse_json(expected_type: Array) + expect(body).must_equal [] + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..e20bbb429 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,37 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { Rental.first } + # + # it "must be valid" do + # value(rental).must_be :valid? + # end - it "must be valid" do - value(rental).must_be :valid? + describe 'due_date' do + it 'returns the date for which this instance of rental is due' do + expected_due_date = rental.created_at + 7 + + expect(rental.due_date).must_equal expected_due_date + end end + + describe 'overdue?' do + it 'returns true if this instance of rental is overdue' do + #Arrange + #TODO: update an existing rental so that it's overdue + #rental = Rental.first + #patch rentals_path(rental.id) + + expect(rental.overdue?).must_equal true + end + + it 'returns false if this instance of rental is not overdue' do + #Arrange + #TODO: create a new rental or grab one that's definitely not overdue + #rental = Rental.create + + expect(rental.overdue?).must_equal false + end + end + end From 6899878edd1840c1e8f2a826b73b62b2fc3e99eb Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Wed, 7 Nov 2018 10:09:00 -0800 Subject: [PATCH 23/46] Add due date column to rentals --- db/migrate/20181107175919_add_due_date_column_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181107175919_add_due_date_column_to_rentals.rb diff --git a/db/migrate/20181107175919_add_due_date_column_to_rentals.rb b/db/migrate/20181107175919_add_due_date_column_to_rentals.rb new file mode 100644 index 000000000..f8e5e054a --- /dev/null +++ b/db/migrate/20181107175919_add_due_date_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddDueDateColumnToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index b4dda02d1..1de12ec15 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_004333) do +ActiveRecord::Schema.define(version: 2018_11_07_175919) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,7 @@ t.datetime "updated_at", null: false t.bigint "customers_id" t.bigint "movies_id" + t.date "due_date" t.index ["customers_id"], name: "index_rentals_on_customers_id" t.index ["movies_id"], name: "index_rentals_on_movies_id" end From 3e5a9e16dab6da7ad112e05a82c921f5d571beb8 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 10:19:48 -0800 Subject: [PATCH 24/46] adds preliminary customer parameters --- app/controllers/customers_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index b1c9b563f..41f5d9ab1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,10 @@ class CustomersController < ApplicationController def index + # binding.pry + if params[:sort] + binding.pry + end @customers = Customer.all end From a507f27fd8bfc47442b254a309ab1d1c8e3f265a Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 10:22:46 -0800 Subject: [PATCH 25/46] renames rental columns --- ...81107182057_rename_rentals_column_references.rb | 11 +++++++++++ db/schema.rb | 14 +++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20181107182057_rename_rentals_column_references.rb diff --git a/db/migrate/20181107182057_rename_rentals_column_references.rb b/db/migrate/20181107182057_rename_rentals_column_references.rb new file mode 100644 index 000000000..ec5e3fd06 --- /dev/null +++ b/db/migrate/20181107182057_rename_rentals_column_references.rb @@ -0,0 +1,11 @@ +class RenameRentalsColumnReferences < ActiveRecord::Migration[5.2] + def change + + remove_reference :rentals, :customers, foreign_key: true + remove_reference :rentals, :movies, foreign_key: true + + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + + end +end diff --git a/db/schema.rb b/db/schema.rb index 1de12ec15..892e5c5dd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_175919) do +ActiveRecord::Schema.define(version: 2018_11_07_182057) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -40,13 +40,13 @@ t.boolean "checked_out?", default: true t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.bigint "customers_id" - t.bigint "movies_id" t.date "due_date" - t.index ["customers_id"], name: "index_rentals_on_customers_id" - t.index ["movies_id"], name: "index_rentals_on_movies_id" + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end - add_foreign_key "rentals", "customers", column: "customers_id" - add_foreign_key "rentals", "movies", column: "movies_id" + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 377b5039c6fb1d1f100d49dcae0115364d8dbf6f Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Wed, 7 Nov 2018 10:34:37 -0800 Subject: [PATCH 26/46] Add helper methods to models and def create/update in controller for Rental --- app/controllers/rentals_controller.rb | 30 ++++++++++++++++++++++++++- app/models/rental.rb | 15 ++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cfa9cdfb5..ac69da995 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,35 @@ class RentalsController < ApplicationController def create # checkout-out method + rental = Rental.new(rental_params) + rental.assign_due_date + + if rental.save + # movie.remove_inventory + # For optionals with inventory, need to change amount when movie is checked out. + + render json: { id: rental.id } + else + render_error(:bad_request, rental.errors.messages) + end end - def update # checkout-in method, update "checked_out?" to be false + def update + rental = Rental.find_by(id: parans[:rental_id]) + + rental.check_in_movie + + if rental.update + # movie.add_inventory + # For optionals with inventory, need to change amount when movie is checked back in. + render json: { id: rental.id } + else + render_error(:bad_request, rental.errors.messages) + end + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..6391ad479 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,17 @@ class Rental < ApplicationRecord + ONE_WEEK = 7 + + validates :checked_out?, inclusion: { in: [true, false] } + + belongs_to :customer + belongs_to :movie + + def self.assign_due_date + checkout_date = self.created_at.to_date + self.update(due_date: (checked_out + ONE_WEEK)) + end + + def self.check_in_movie + self.update(checked_out?: false) + end end From 3b65f336617ff80547f265e48cfe8a57dc5b0b58 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Wed, 7 Nov 2018 10:36:19 -0800 Subject: [PATCH 27/46] Add relationships to rentals --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 9d0e7b6b8..8556472d7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord validates :name, :phone, :address, :city, :state, :postal_code, presence: true + + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index c70c4dbf5..265187556 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,6 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: true + + has_many :rentals end From 6f20779d3344d530cababf10240500bbf1dddd8e Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 10:41:25 -0800 Subject: [PATCH 28/46] preliminary customers controller code for sort parameters --- app/controllers/customers_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 41f5d9ab1..480cd2d01 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,11 +1,12 @@ class CustomersController < ApplicationController def index - # binding.pry if params[:sort] - binding.pry + @customers = Customer.order(params[:sort]) + # binding.pry + else + @customers = Customer.all end - @customers = Customer.all end From 8fa866bfa693601bdb9f4f4f1298ec35c45396b8 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Wed, 7 Nov 2018 10:44:33 -0800 Subject: [PATCH 29/46] Add routes for rentals --- config/routes.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 2f6813a6f..028abfd45 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,10 +1,14 @@ Rails.application.routes.draw do - get 'rentals/create' - get 'rentals/update' + post 'rentals/check-out', to:'rentals#create', as: 'check-out' + + patch 'rentals/check-in', to: 'rentals#update', as: 'check-in' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'application#test', as: 'test' resources :movies, only: [:index, :show, :create] resources :customers, only: [:index, :show] - + + + end From c968d9e7f2a65dbd370466b2ee97c9e4fa5b6ee7 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 11:03:57 -0800 Subject: [PATCH 30/46] adds Rental controller check-out and check-in methods --- app/controllers/rentals_controller.rb | 7 +++---- app/models/rental.rb | 8 ++++---- config/routes.rb | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ac69da995..1a7c4e03e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,9 @@ class RentalsController < ApplicationController def create # checkout-out method rental = Rental.new(rental_params) - rental.assign_due_date if rental.save + rental.assign_due_date # movie.remove_inventory # For optionals with inventory, need to change amount when movie is checked out. @@ -14,11 +14,10 @@ def create # checkout-out method end def update - rental = Rental.find_by(id: parans[:rental_id]) + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id] ) rental.check_in_movie - - if rental.update + if rental.save # movie.add_inventory # For optionals with inventory, need to change amount when movie is checked back in. render json: { id: rental.id } diff --git a/app/models/rental.rb b/app/models/rental.rb index 6391ad479..eb572b06b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -6,12 +6,12 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - def self.assign_due_date - checkout_date = self.created_at.to_date - self.update(due_date: (checked_out + ONE_WEEK)) + def assign_due_date + checkout_date = self.created_at + self.update(due_date: (checkout_date + ONE_WEEK)) end - def self.check_in_movie + def check_in_movie self.update(checked_out?: false) end end diff --git a/config/routes.rb b/config/routes.rb index 028abfd45..449d58300 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do post 'rentals/check-out', to:'rentals#create', as: 'check-out' - patch 'rentals/check-in', to: 'rentals#update', as: 'check-in' + post 'rentals/check-in', to: 'rentals#update', as: 'check-in' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'application#test', as: 'test' From 33b5732c2af14cf56b3ea64b676d1f05b876b44e Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 11:09:52 -0800 Subject: [PATCH 31/46] fixes due date on Rental check-out method --- app/controllers/rentals_controller.rb | 1 + app/models/rental.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1a7c4e03e..b7bf1a0ab 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,6 +4,7 @@ def create # checkout-out method if rental.save rental.assign_due_date + binding.pry # movie.remove_inventory # For optionals with inventory, need to change amount when movie is checked out. diff --git a/app/models/rental.rb b/app/models/rental.rb index eb572b06b..72d698718 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,7 @@ class Rental < ApplicationRecord belongs_to :movie def assign_due_date - checkout_date = self.created_at + checkout_date = self.created_at.to_date self.update(due_date: (checkout_date + ONE_WEEK)) end From 797f61dc2f3742cf9265ca8d5afd067c56b8e23b Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Wed, 7 Nov 2018 12:40:36 -0800 Subject: [PATCH 32/46] Get rental controller tests passing --- app/controllers/application_controller.rb | 4 - app/controllers/rentals_controller.rb | 12 ++- config/routes.rb | 6 -- test/controllers/rentals_controller_test.rb | 95 ++++++++++++++++++--- test/fixtures/customers.yml | 4 +- test/fixtures/movies.yml | 4 +- test/fixtures/rentals.yml | 16 ++-- 7 files changed, 106 insertions(+), 35 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d44b24132..63d126ffe 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,9 +1,5 @@ class ApplicationController < ActionController::API - def test - render json: { test_message: 'It works!' } - end - def render_error(status, errors) render json: { errors: errors }, status: status end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b7bf1a0ab..41d5667ff 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,7 +4,6 @@ def create # checkout-out method if rental.save rental.assign_due_date - binding.pry # movie.remove_inventory # For optionals with inventory, need to change amount when movie is checked out. @@ -15,10 +14,19 @@ def create # checkout-out method end def update - rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id] ) + customer_id = params[:customer_id] + movie_id = params[:movie_id] + + rental = Rental.find_by( + customer_id: customer_id, + movie_id: movie_id, + checked_out?: true + ) rental.check_in_movie if rental.save + + #movie = Movie.find_by(id: movie_id) # movie.add_inventory # For optionals with inventory, need to change amount when movie is checked back in. render json: { id: rental.id } diff --git a/config/routes.rb b/config/routes.rb index 449d58300..ec9466e33 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,12 +3,6 @@ post 'rentals/check-in', to: 'rentals#update', as: 'check-in' - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get '/zomg', to: 'application#test', as: 'test' - resources :movies, only: [:index, :show, :create] resources :customers, only: [:index, :show] - - - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f94290671..8cafc4d09 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -13,26 +13,95 @@ def parse_json(expected_type:, expected_status: :success) return body end - describe 'overdue' do - it 'returns a list of all customers with overdue books in JSON with a status code of success' do - #Arrange - # TODO create rentals in yml files with overdue parameters, or - # update yml rentals to change checked_out? to true (as long as date is - # more than 1 week ago) + describe "create" do + let(:rental_data) { + { + customer_id: customers(:customer_two).id, + movie_id: movies(:movie_one).id + } + } - get overdue_rentals_path + it "Creates a new rental" do + expect { + post check_out_path, params: rental_data + }.must_change 'Rental.count', 1 - body = parse_json(expected_type: Array) + new_rental = Rental.last + new_rental.checked_out?.must_equal true + must_respond_with :success + end + + it "returns a bad request for incorrectly creating a rental" do + rental_data.delete(:customer_id) + + expect { + post check_out_path, params: rental_data + }.must_change 'Rental.count', 0 - expect(body.keys.sort).must_equal MOVIE_FIELDS + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "customer" end + end + + describe "update" do + + let(:rental_data) { + { + customer_id: customers(:customer_two).id, + movie_id: movies(:movie_two).id + } + } + + let(:checked_out_rental) {rentals(:rental_one)} + let(:checked_in_rental) {rentals(:rental_two)} + + it "Updates a rental thats is checked-out to be checked-in" do + + post check_out_path, params: rental_data - it 'returns an empty array with a status code of success if there are no customers with overdue books' do - get overdue_rentals_path + rental = Rental.last + rental.checked_out?.must_equal true - body = parse_json(expected_type: Array) - expect(body).must_equal [] + post check_in_path(customer_id: customers(:customer_two).id, movie_id: movies(:movie_two).id) + + rental.reload + + rental.checked_out?.must_equal false + end + + it "does not update a rental that has been checked back in already" do + checked_in_rental.checked_out?.must_equal false + + post check_in_path(customer_id: customers(:customer_one).id, movie_id: movies(:movie_one).id) + + checked_in_rental.checked_out?.must_equal false end + end + # describe 'overdue' do + # it 'returns a list of all customers with overdue books in JSON with a status code of success' do + # #Arrange + # # TODO create rentals in yml files with overdue parameters, or + # # update yml rentals to change checked_out? to true (as long as date is + # # more than 1 week ago) + # + # get overdue_rentals_path + # + # body = parse_json(expected_type: Array) + # + # expect(body.keys.sort).must_equal MOVIE_FIELDS + # end + # + # it 'returns an empty array with a status code of success if there are no customers with overdue books' do + # get overdue_rentals_path + # + # body = parse_json(expected_type: Array) + # expect(body).must_equal [] + # end + # end + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index aa33d22f8..23821ed06 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +customer_one: name: MyString registered_at: 2018-11-05 12:31:28 address: MyString @@ -9,7 +9,7 @@ one: postal_code: MyString phone: MyString -two: +customer_two: name: MyString registered_at: 2018-11-05 12:31:28 address: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..99986f0fa 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,12 +1,12 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +movie_one: title: MyString overview: MyString release_date: 2018-11-05 inventory: 1 -two: +movie_two: title: MyString overview: MyString release_date: 2018-11-05 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 2097205c8..fcb9ba606 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - ckeck_out: 2018-11-06 - check_in: 2018-11-06 +rental_one: + checked_out?: true + due_date: 2018-11-16 + customer: customer_one + movie: movie_one -two: - ckeck_out: 2018-11-06 - check_in: 2018-11-06 +rental_two: + checked_out?: false + due_date: 2018-11-16 + customer: customer_one + movie: movie_one From 2a98cf639c8ce5c10385a011b7cd62f1dad32d0d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 13:28:43 -0800 Subject: [PATCH 33/46] removes json from rabl view names --- app/views/customers/{index.json.rabl => index.rabl} | 0 app/views/movies/{index.json.rabl => index.rabl} | 0 app/views/movies/{show.json.rabl => show.rabl} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename app/views/customers/{index.json.rabl => index.rabl} (100%) rename app/views/movies/{index.json.rabl => index.rabl} (100%) rename app/views/movies/{show.json.rabl => show.rabl} (100%) diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.rabl similarity index 100% rename from app/views/customers/index.json.rabl rename to app/views/customers/index.rabl diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.rabl similarity index 100% rename from app/views/movies/index.json.rabl rename to app/views/movies/index.rabl diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.rabl similarity index 100% rename from app/views/movies/show.json.rabl rename to app/views/movies/show.rabl From f3b178e388024aba72f97609e702dfd19615d7bf Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 14:37:50 -0800 Subject: [PATCH 34/46] adds movies_checked_out_count to customers json --- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 9 +++++++++ app/views/customers/index.rabl | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index cfdef1654..0bda0185e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,7 +20,7 @@ def create render_error(:bad_request, movie.errors.messages) end end - + private def movie_params diff --git a/app/models/customer.rb b/app/models/customer.rb index 8556472d7..03b991911 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,13 @@ class Customer < ApplicationRecord validates :name, :phone, :address, :city, :state, :postal_code, presence: true has_many :rentals + + def movies_checked_out + return self.rentals.select { |rental| rental.checked_out? } + end + + def movies_checked_out_count + return movies_checked_out.count + end + end diff --git a/app/views/customers/index.rabl b/app/views/customers/index.rabl index ea71a43bd..2e2274b4a 100644 --- a/app/views/customers/index.rabl +++ b/app/views/customers/index.rabl @@ -1,2 +1,3 @@ object @customers attributes :id, :name, :registered_at, :postal_code, :phone +node(:movies_checked_out_count) { |customer| customer.movies_checked_out_count } From 1948c1eb1977b8e8bff42479eda5edbf2831d3f8 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 15:18:25 -0800 Subject: [PATCH 35/46] adds tests for custom methods of customer class --- test/models/customer_test.rb | 41 +++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2aecd879d..85c8dce58 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,7 +3,7 @@ describe Customer do describe 'validations' do - let(:customer) { customers(:one) } + let(:customer) { customers(:customer_one) } it "must be valid" do value(customer).must_be :valid? @@ -47,6 +47,45 @@ describe 'relations' do it 'can have many rentals' do + customer = customers(:customer_one) + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end end end + + describe 'custom methods' do + + describe 'movies_checked_out' do + it 'returns an array of rentals currently checked out by this customer' do + customer = customers(:customer_one) + + result = customer.movies_checked_out + result.must_be_kind_of Array + result.each do |rental| + rental.must_be_kind_of Rental + rental.customer_id.must_equal customer.id + end + end + + it 'returns an empty array if there are no currently checked out rentals by this customer' do + customer = customers(:customer_two) + + result = customer.movies_checked_out + result.must_equal [] + end + end + + describe 'movies_checked_out_count' do + it 'returns the number of movies currently checked out by this customer' do + customer = customers(:customer_one) + + result = customer.movies_checked_out_count + expect(result).must_equal 1 + end + end + + end + end From 7f11b0d1f633a1a2be6b697f155799b94a9bdb11 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Wed, 7 Nov 2018 15:28:32 -0800 Subject: [PATCH 36/46] Add pagination with params for customers index --- Gemfile | 3 +++ Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 12 +++++++----- app/views/customers/index.rabl | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 1f2217e98..7b533321a 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,9 @@ gem 'rails', '~> 5.2.1' gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server gem 'puma', '~> 3.11' + +gem 'will_paginate', '~> 3.1.0' + # 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 diff --git a/Gemfile.lock b/Gemfile.lock index dca44bbb3..5f2645032 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,6 +146,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.1.6) PLATFORMS ruby @@ -164,6 +165,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + will_paginate (~> 3.1.0) RUBY VERSION ruby 2.5.1p57 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 480cd2d01..58c28ac01 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,13 +1,15 @@ +require 'will_paginate/array' + class CustomersController < ApplicationController def index - if params[:sort] - @customers = Customer.order(params[:sort]) - # binding.pry - else - @customers = Customer.all + valid_params = %w(name registered_at postal_code) + + if valid_params.include?(params[:sort]) + sort = params[:sort] end + @customers = Customer.order(sort).paginate(page: params[:p], per_page: params[:n]) end def show diff --git a/app/views/customers/index.rabl b/app/views/customers/index.rabl index ea71a43bd..4d232cdb9 100644 --- a/app/views/customers/index.rabl +++ b/app/views/customers/index.rabl @@ -1,2 +1,2 @@ -object @customers +collection @customers attributes :id, :name, :registered_at, :postal_code, :phone From e63300ec3bf5914b4df6528cc032f78d6bc4f846 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 15:32:25 -0800 Subject: [PATCH 37/46] fixes some tests to account for changes in yml files, updates customer rabl views --- app/models/movie.rb | 5 +++++ app/views/customers/index.rabl | 2 +- app/views/movies/show.rabl | 1 + test/models/movie_test.rb | 18 +++++------------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 265187556..16486b082 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,4 +5,9 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: true has_many :rentals + + def available_inventory + # self.rentals + + end end diff --git a/app/views/customers/index.rabl b/app/views/customers/index.rabl index 2e2274b4a..7db8fa996 100644 --- a/app/views/customers/index.rabl +++ b/app/views/customers/index.rabl @@ -1,3 +1,3 @@ -object @customers +collection @customers attributes :id, :name, :registered_at, :postal_code, :phone node(:movies_checked_out_count) { |customer| customer.movies_checked_out_count } diff --git a/app/views/movies/show.rabl b/app/views/movies/show.rabl index d8d4cbfad..20c6f7121 100644 --- a/app/views/movies/show.rabl +++ b/app/views/movies/show.rabl @@ -1,2 +1,3 @@ object @movie attributes :title, :overview, :release_date, :inventory +node(:available_inventory) { |movie| movie.available_inventory } diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 29e5f5516..67ec060ca 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -81,7 +81,6 @@ end end - # TODO: These are stubbed for now. Wave 3 may address them describe 'relations' do let(:movie) { Movie.first } @@ -93,26 +92,18 @@ end end - # TODO: Might not be needed, why would we ever need to know the list of customers who have had or currently have rentals - it 'has some customers through rentals' do - movie.must_respond_to :customers - movie.customers.each do |customer| - customer.must_be_kind_of Customer - end - end end - # TODO: These are stubbed for now. Wave 3 may address them describe 'custom methods' do describe 'available_inventory' do - let(:movie) { Movie.first } + let(:unavailable_movie) { movies(:movie_one) } + let(:available_movie) { movies(:movie_two) } it 'returns the available inventory for a given movie' do - # movie must have 1 current rental on it - # TODO: may want to arrange this now if rentals.yml are old rental dates - (movie.available_inventory).must_equal 0 + (unavailable_movie.available_inventory).must_equal 0 + (available_movie.available_inventory).must_equal 1 end end @@ -122,6 +113,7 @@ let(:movie) { Movie.first } it 'returns the total checked out copies of this movie' do + skip # movie must have 1 current rental on it # TODO: may want to arrange this now if rentals.yml are old rental dates (movie.checked_out_count).must_equal 1 From c02283a7523f395a20ea8caf5c4d5fed1ddd21c2 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 7 Nov 2018 15:40:56 -0800 Subject: [PATCH 38/46] adds available inventory to show movie rabl --- app/models/movie.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 16486b082..32fac5f66 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,7 +7,6 @@ class Movie < ApplicationRecord has_many :rentals def available_inventory - # self.rentals - + return self.inventory - self.rentals.count { |rental| rental.checked_out?} end end From 83af0ffe1619d2d2c2df6877fca6e6bcd32f0399 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Wed, 7 Nov 2018 15:50:39 -0800 Subject: [PATCH 39/46] Add check if inventory is available to create rental --- app/controllers/rentals_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 41d5667ff..477280ba7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,10 +1,14 @@ class RentalsController < ApplicationController def create # checkout-out method rental = Rental.new(rental_params) + movie = Movie.find_by(id: params[:movie_id]) + + unless movie.available_inventory > 0 + #show errror + end if rental.save rental.assign_due_date - # movie.remove_inventory # For optionals with inventory, need to change amount when movie is checked out. render json: { id: rental.id } From 84f0f3814363ba17340d80be0891dc07014562be Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Thu, 8 Nov 2018 09:50:25 -0800 Subject: [PATCH 40/46] Add tests to take into account if there is available inventory --- app/controllers/rentals_controller.rb | 9 ++------- test/controllers/rentals_controller_test.rb | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 477280ba7..f90047c2a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,13 +4,12 @@ def create # checkout-out method movie = Movie.find_by(id: params[:movie_id]) unless movie.available_inventory > 0 - #show errror + render_error(:bad_request, { inventory: ["Not enough inventory available"] }) + return end if rental.save rental.assign_due_date - # For optionals with inventory, need to change amount when movie is checked out. - render json: { id: rental.id } else render_error(:bad_request, rental.errors.messages) @@ -29,10 +28,6 @@ def update rental.check_in_movie if rental.save - - #movie = Movie.find_by(id: movie_id) - # movie.add_inventory - # For optionals with inventory, need to change amount when movie is checked back in. render json: { id: rental.id } else render_error(:bad_request, rental.errors.messages) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8cafc4d09..2b7b3bc20 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -17,7 +17,7 @@ def parse_json(expected_type:, expected_status: :success) let(:rental_data) { { customer_id: customers(:customer_two).id, - movie_id: movies(:movie_one).id + movie_id: movies(:movie_two).id } } @@ -31,6 +31,22 @@ def parse_json(expected_type:, expected_status: :success) must_respond_with :success end + it "does not create a rental for a movie that does not have available inventory and renders a bad request" do + expect { + post check_out_path, params: rental_data + }.must_change 'Rental.count', 1 + + new_rental = Rental.last + new_rental.checked_out?.must_equal true + must_respond_with :success + + expect { + post check_out_path, params: rental_data + }.wont_change 'Rental.count' + + must_respond_with :bad_request + end + it "returns a bad request for incorrectly creating a rental" do rental_data.delete(:customer_id) From b9fc4767af46f03fb7d160bca58cdce23e012f4b Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Thu, 8 Nov 2018 17:48:10 -0800 Subject: [PATCH 41/46] Add id attribute to pass smoke tests --- app/views/movies/index.rabl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/movies/index.rabl b/app/views/movies/index.rabl index d587e42c6..28003f0e3 100644 --- a/app/views/movies/index.rabl +++ b/app/views/movies/index.rabl @@ -1,2 +1,2 @@ object @movies -attributes :title, :overview, :release_date, :inventory +attributes :id, :title, :overview, :release_date, :inventory From cd25fe6d3cb456a522d2953584849b9c08314062 Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Thu, 8 Nov 2018 17:48:38 -0800 Subject: [PATCH 42/46] Edit tests --- test/models/customer_test.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 85c8dce58..9a8edde8d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -85,7 +85,5 @@ expect(result).must_equal 1 end end - end - end From 203fc41d3b87887ec88edb9e2e4f5fdf0734e78d Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Thu, 8 Nov 2018 17:48:49 -0800 Subject: [PATCH 43/46] Edit tests --- test/models/movie_test.rb | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 67ec060ca..41723ea0c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,12 +1,6 @@ require "test_helper" describe Movie do - # let(:movie) { Movie.new } - # - # it "must be valid" do - # value(movie).must_be :valid? - # end - describe 'validations' do let(:movie_data) { @@ -105,22 +99,6 @@ (unavailable_movie.available_inventory).must_equal 0 (available_movie.available_inventory).must_equal 1 end - - end - - describe 'helper method checked_out_count' do - - let(:movie) { Movie.first } - - it 'returns the total checked out copies of this movie' do - skip - # movie must have 1 current rental on it - # TODO: may want to arrange this now if rentals.yml are old rental dates - (movie.checked_out_count).must_equal 1 - end - end - end - end From 2478b877796eb7bc8a6ff0d33083294e7877f4de Mon Sep 17 00:00:00 2001 From: Madaleine Shields Date: Thu, 8 Nov 2018 17:49:12 -0800 Subject: [PATCH 44/46] Add validations, relations, and custom method tests for rental model --- app/models/rental.rb | 3 +- test/fixtures/customers.yml | 4 +-- test/fixtures/movies.yml | 4 +-- test/models/rental_test.rb | 65 +++++++++++++++++++++++++------------ 4 files changed, 50 insertions(+), 26 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 72d698718..a3a4a8974 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,6 @@ +ONE_WEEK = 7 + class Rental < ApplicationRecord - ONE_WEEK = 7 validates :checked_out?, inclusion: { in: [true, false] } diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 23821ed06..ab1dfb066 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html customer_one: - name: MyString + name: Customer One registered_at: 2018-11-05 12:31:28 address: MyString city: MyString @@ -10,7 +10,7 @@ customer_one: phone: MyString customer_two: - name: MyString + name: Customer Two registered_at: 2018-11-05 12:31:28 address: MyString city: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 99986f0fa..9bd826368 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 movie_one: - title: MyString + title: The Devil Wears Prada overview: MyString release_date: 2018-11-05 inventory: 1 movie_two: - title: MyString + title: Black Panther overview: MyString release_date: 2018-11-05 inventory: 1 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index e20bbb429..d189c42dc 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,37 +1,60 @@ require "test_helper" describe Rental do - let(:rental) { Rental.first } - # - # it "must be valid" do - # value(rental).must_be :valid? - # end + describe "validations" do + it "must be valid" do + rental_one = rentals(:rental_one) + rental_one.valid?.must_equal true + end - describe 'due_date' do - it 'returns the date for which this instance of rental is due' do - expected_due_date = rental.created_at + 7 + it "must be valid if checked_out? is false" do + rental_two = rentals(:rental_two) + rental_two.valid?.must_equal true + end - expect(rental.due_date).must_equal expected_due_date + it "must be invalid if due date, customer, and movie are blank" do + invalid_rental = Rental.new() + invalid_rental.valid?.must_equal false end end - describe 'overdue?' do - it 'returns true if this instance of rental is overdue' do - #Arrange - #TODO: update an existing rental so that it's overdue - #rental = Rental.first - #patch rentals_path(rental.id) + describe "relations" do + it "must have a Customer" do + rental_one = rentals(:rental_one) + rental_one.must_respond_to :customer + rental_one.customer.must_be_kind_of Customer + rental_one.customer.name.must_equal "Customer One" + rental_one.customer.must_equal customers(:customer_one) + end - expect(rental.overdue?).must_equal true + it "must have a Movie" do + rental_one = rentals(:rental_one) + rental_one.must_respond_to :movie + rental_one.movie.must_be_kind_of Movie + rental_one.movie.title.must_equal "The Devil Wears Prada" + rental_one.movie.must_equal movies(:movie_one) end + end - it 'returns false if this instance of rental is not overdue' do - #Arrange - #TODO: create a new rental or grab one that's definitely not overdue - #rental = Rental.create + describe "assign_due_date" do + let(:rental) { rentals(:rental_one) } - expect(rental.overdue?).must_equal false + it "can assign a due date 7 days from Rental creation" do + rental.due_date = nil + rental.due_date.must_equal nil + rental.assign_due_date + rental.due_date.must_equal rental.created_at.to_date + ONE_WEEK end end + describe "check_in_movie" do + let(:rental) { rentals(:rental_one) } + + it "can change the status of checked_out? to false" do + rental.checked_out?.must_equal true + rental.check_in_movie + rental.reload + rental.checked_out?.must_equal false + end + end end From 43a4c9f1ceeb859974b8ff9582e4cac484a57a5d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Thu, 8 Nov 2018 22:24:54 -0800 Subject: [PATCH 45/46] adds rental overdue action and tests --- app/controllers/rentals_controller.rb | 9 ++- app/models/rental.rb | 8 ++ app/views/movies/index.rabl | 2 +- app/views/rentals/overdue.rabl | 11 +++ config/routes.rb | 2 + test/controllers/rentals_controller_test.rb | 61 +++++++++------ test/models/rental_test.rb | 85 +++++++++++++++++---- 7 files changed, 138 insertions(+), 40 deletions(-) create mode 100644 app/views/rentals/overdue.rabl diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f90047c2a..4861696e4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,7 +3,10 @@ def create # checkout-out method rental = Rental.new(rental_params) movie = Movie.find_by(id: params[:movie_id]) - unless movie.available_inventory > 0 + if !movie + render_error(:bad_request, { movie: ["Movie must exist"] }) + return + elsif movie.available_inventory < 1 render_error(:bad_request, { inventory: ["Not enough inventory available"] }) return end @@ -34,6 +37,10 @@ def update end end + def overdue + @rentals = Rental.get_overdue + end + private def rental_params diff --git a/app/models/rental.rb b/app/models/rental.rb index a3a4a8974..d40221b7a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -15,4 +15,12 @@ def assign_due_date def check_in_movie self.update(checked_out?: false) end + + def self.get_overdue + return Rental.select { |rental| rental.overdue?} + end + + def overdue? + return self.checked_out? && Date.today > self.due_date + end end diff --git a/app/views/movies/index.rabl b/app/views/movies/index.rabl index 28003f0e3..24f64d0fa 100644 --- a/app/views/movies/index.rabl +++ b/app/views/movies/index.rabl @@ -1,2 +1,2 @@ -object @movies +collection @movies attributes :id, :title, :overview, :release_date, :inventory diff --git a/app/views/rentals/overdue.rabl b/app/views/rentals/overdue.rabl new file mode 100644 index 000000000..1155b7996 --- /dev/null +++ b/app/views/rentals/overdue.rabl @@ -0,0 +1,11 @@ +collection @rentals +attributes :movie_id, :customer_id, :due_date + +glue :movie do + attribute :title +end + +glue :customer do + attributes :name, :postal_code + node(:checkout_date) { |customer| customer.created_at.to_date } +end diff --git a/config/routes.rb b/config/routes.rb index ec9466e33..71799c6b3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,8 @@ post 'rentals/check-in', to: 'rentals#update', as: 'check-in' + get 'rentals/overdue', to: 'rentals#overdue', as: 'overdue' + resources :movies, only: [:index, :show, :create] resources :customers, only: [:index, :show] end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2b7b3bc20..90a7f0c10 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,7 +2,9 @@ describe RentalsController do - RENTAL_FIELDS = %w(movie_id title customer_id name postal_code checkout_date due_date) + RENTAL_FIELDS = %w(movie_id title customer_id name postal_code checkout_date due_date).sort + + OVERDUE_FIELDS = %w(movie_id customer_id due_date title name postal_code checkout_date ).sort def parse_json(expected_type:, expected_status: :success) must_respond_with expected_status @@ -52,7 +54,7 @@ def parse_json(expected_type:, expected_status: :success) expect { post check_out_path, params: rental_data - }.must_change 'Rental.count', 0 + }.wont_change 'Rental.count' must_respond_with :bad_request body = JSON.parse(response.body) @@ -60,6 +62,20 @@ def parse_json(expected_type:, expected_status: :success) body.must_include "errors" body["errors"].must_include "customer" end + + it "returns a bad request for incorrectly creating a rental" do + rental_data.delete(:movie_id) + + expect { + post check_out_path, params: rental_data + }.wont_change 'Rental.count' + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "movie" + end end describe "update" do @@ -98,26 +114,25 @@ def parse_json(expected_type:, expected_status: :success) end - # describe 'overdue' do - # it 'returns a list of all customers with overdue books in JSON with a status code of success' do - # #Arrange - # # TODO create rentals in yml files with overdue parameters, or - # # update yml rentals to change checked_out? to true (as long as date is - # # more than 1 week ago) - # - # get overdue_rentals_path - # - # body = parse_json(expected_type: Array) - # - # expect(body.keys.sort).must_equal MOVIE_FIELDS - # end - # - # it 'returns an empty array with a status code of success if there are no customers with overdue books' do - # get overdue_rentals_path - # - # body = parse_json(expected_type: Array) - # expect(body).must_equal [] - # end - # end + describe 'overdue' do + + it 'returns a list of all customers with overdue books in JSON with a status code of success' do + get overdue_path + + body = parse_json(expected_type: Array) + + expect(body[0].keys.sort).must_equal OVERDUE_FIELDS + end + + it 'returns an empty array with a status code of success if there are no customers with overdue books' do + rental = rentals(:overdue_rental) + rental.update_attribute(:checked_out?, false) + + get overdue_path + + body = parse_json(expected_type: Array) + expect(body).must_equal [] + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d189c42dc..623d23867 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -36,25 +36,80 @@ end end - describe "assign_due_date" do - let(:rental) { rentals(:rental_one) } + describe 'custom methods' do + describe "assign_due_date" do + let(:rental) { rentals(:rental_one) } - it "can assign a due date 7 days from Rental creation" do - rental.due_date = nil - rental.due_date.must_equal nil - rental.assign_due_date - rental.due_date.must_equal rental.created_at.to_date + ONE_WEEK + it "can assign a due date 7 days from Rental creation" do + rental.due_date = nil + rental.due_date.must_equal nil + rental.assign_due_date + rental.due_date.must_equal rental.created_at.to_date + ONE_WEEK + end end - end - describe "check_in_movie" do - let(:rental) { rentals(:rental_one) } + describe "check_in_movie" do + let(:rental) { rentals(:rental_one) } - it "can change the status of checked_out? to false" do - rental.checked_out?.must_equal true - rental.check_in_movie - rental.reload - rental.checked_out?.must_equal false + it "can change the status of checked_out? to false" do + rental.checked_out?.must_equal true + rental.check_in_movie + rental.reload + rental.checked_out?.must_equal false + end end + + describe "Rental.get_overdue" do + let(:rental) { rentals(:rental_one) } + + it "returns an array of Rentals that are overdue" do + overdue = rentals(:overdue_rental) + result = Rental.get_overdue + + result.must_be_kind_of Array + result.each do |rental| + rental.must_be_kind_of Rental + end + result.must_include overdue + end + + it "returns an empty array if there are no overdue rentals" do + overdue = rentals(:overdue_rental) + overdue.update_attribute(:checked_out?, false) + result = Rental.get_overdue + + result.must_equal [] + end + end + + describe "overdue?" do + let(:overdue) { rentals(:overdue_rental) } + let(:rental) { + Rental.create( + movie_id: movies(:overdue_movie).id, + customer_id: customers(:overdue_customer).id + ) + } + + it 'returns true if a rental is overdue and checked out' do + overdue.overdue?.must_equal true + end + + it 'returns false if a rental is overdue but checked in' do + overdue.overdue?.must_equal true + overdue.update_attribute(:checked_out?, false) + overdue.overdue?.must_equal false + end + + it 'returns false if a rental is not overdue and checked in' do + rental.assign_due_date + rental.overdue?.must_equal false + end + end + + + + end + end From a0bd3890064cc3c574913e3765c858fa4efadf45 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Thu, 8 Nov 2018 22:25:14 -0800 Subject: [PATCH 46/46] adjusts yml files and fixes tests --- app/models/customer.rb | 6 +----- app/models/movie.rb | 4 +--- test/controllers/customers_controller_test.rb | 1 + test/controllers/movies_controller_test.rb | 3 ++- test/fixtures/customers.yml | 9 +++++++++ test/fixtures/movies.yml | 6 ++++++ test/fixtures/rentals.yml | 6 ++++++ test/models/customer_test.rb | 20 ------------------- 8 files changed, 26 insertions(+), 29 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 03b991911..6a2ff7231 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,12 +3,8 @@ class Customer < ApplicationRecord has_many :rentals - def movies_checked_out - return self.rentals.select { |rental| rental.checked_out? } - end - def movies_checked_out_count - return movies_checked_out.count + return self.rentals.count { |rental| rental.checked_out? } end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 32fac5f66..741ed8af2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,5 @@ class Movie < ApplicationRecord - validates :title, presence: true - validates :overview, presence: true - validates :release_date, presence: true + validates :title, :overview, :release_date, presence: true validates :inventory, presence: true, numericality: true has_many :rentals diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 21ebf7edd..6f3cfa3de 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -21,6 +21,7 @@ def parse_json(expected_type:, expected_status: :success) end it "returns an empty array when there are no customers" do + Rental.destroy_all Customer.destroy_all get customers_path, as: :json diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c22c0031e..127bf630c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe MoviesController do - MOVIE_FIELDS = %w(title overview release_date inventory).sort + MOVIE_FIELDS = %w(title overview release_date inventory available_inventory).sort def parse_json(expected_type:, expected_status: :success) must_respond_with expected_status @@ -22,6 +22,7 @@ def parse_json(expected_type:, expected_status: :success) end it "returns an empty array when there are no movies" do + Rental.destroy_all Movie.destroy_all get movies_path, as: :json diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index ab1dfb066..395cf8cc9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -17,3 +17,12 @@ customer_two: state: MyString postal_code: MyString phone: MyString + +overdue_customer: + name: Over Dude + registered_at: 2018-11-05 12:31:28 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 9bd826368..81e26dd4f 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,3 +11,9 @@ movie_two: overview: MyString release_date: 2018-11-05 inventory: 1 + +overdue_movie: + title: Goofy Movie + overview: MyString + release_date: 2017-11-05 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index fcb9ba606..c9afbf1e4 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -11,3 +11,9 @@ rental_two: due_date: 2018-11-16 customer: customer_one movie: movie_one + +overdue_rental: + checked_out?: true + due_date: 2018-11-07 + customer: overdue_customer + movie: overdue_movie diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 9a8edde8d..03f5aed5c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -57,26 +57,6 @@ describe 'custom methods' do - describe 'movies_checked_out' do - it 'returns an array of rentals currently checked out by this customer' do - customer = customers(:customer_one) - - result = customer.movies_checked_out - result.must_be_kind_of Array - result.each do |rental| - rental.must_be_kind_of Rental - rental.customer_id.must_equal customer.id - end - end - - it 'returns an empty array if there are no currently checked out rentals by this customer' do - customer = customers(:customer_two) - - result = customer.movies_checked_out - result.must_equal [] - end - end - describe 'movies_checked_out_count' do it 'returns the number of movies currently checked out by this customer' do customer = customers(:customer_one)