From ef9517289c5375d57357e69e14d07ac31b26aac0 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Tue, 5 Nov 2019 13:06:08 -0800 Subject: [PATCH 01/24] api setup complete --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 59 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 + tmp/.keep | 0 vendor/.keep | 0 58 files changed, 932 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..160fe391c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..8143da43e --- /dev/null +++ b/Gemfile @@ -0,0 +1,59 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +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..981f08e8a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) + erubi (1.9.0) + ffi (1.11.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.3.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + minitest-rails (5.2.0) + minitest (~> 5.10) + railties (~> 5.2.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.1) + nio4r (2.5.2) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + ruby_dep (1.5.0) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + debase (>= 0.2.4.1) + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.0.2 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..d89ee495f --- /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..56f84c20c --- /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..6cc616cd1 --- /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: video-store-api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..ef792da0c --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +gHGlAEV9fui7J2duRhPLXLgLWwl1enaDlXN6jPrUG0CBoEeMmodMjCZhMWU9ER6omNypJMdwGRzEXKELl1UOk1vkgH1pJMRbQMf+XvN8cvPuPSeRww4Uy6mHckzhIfbBWRyXAaLluZBkx0bi4EgHu/ZLnL3h9z/8f28hNsksryLCrJuQh4HFpy5/qVREy4BbbZDeAMmtjk3hyPyL1nnZj8WTL/GD+G+74a9GrYY3jbI7sd7ZhyMG7z+/tsFytBp0kHPD/7ENh0oAuptmVbUM9xTi4DSItF+uQap4TXgq5lZYHCKl0S1ZrEknlGPaick1VMozKAMlD94wz2D+gk36Qzqem+ON2+yIH5gRmTmrFVgpsjmz8BSIRJtUZ6psJHjPfVd8EsjLcHxFCQ8G92mNl4BYtTFXH4JPcIt0--MTtPDULNcn37i37j--mi/dfVpJsvJ+6/xexXz/Vg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..25f76c8e1 --- /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: video-store-api_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: video-store-api + + # 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: video-store-api_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: video-store-api_production + username: video-store-api + password: <%= ENV['VIDEO-STORE-API_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..5f023a796 --- /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 = "video-store-api_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 26b3e8262713e20de5f8b6ecc104ae658330850e Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Tue, 5 Nov 2019 13:29:00 -0800 Subject: [PATCH 02/24] generated models and ran schema migrations --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/models/rental.rb | 2 + db/migrate/20191105211239_create_customers.rb | 14 ++++++ db/migrate/20191105211249_create_movies.rb | 11 +++++ db/migrate/20191105211318_create_rentals.rb | 10 ++++ db/schema.rb | 47 +++++++++++++++++++ test/models/customer_test.rb | 7 +++ test/models/movie_test.rb | 7 +++ test/models/rental_test.rb | 7 +++ 10 files changed, 109 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20191105211239_create_customers.rb create mode 100644 db/migrate/20191105211249_create_movies.rb create mode 100644 db/migrate/20191105211318_create_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20191105211239_create_customers.rb b/db/migrate/20191105211239_create_customers.rb new file mode 100644 index 000000000..fc653de37 --- /dev/null +++ b/db/migrate/20191105211239_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.timestamps + end + end +end diff --git a/db/migrate/20191105211249_create_movies.rb b/db/migrate/20191105211249_create_movies.rb new file mode 100644 index 000000000..f100f60f8 --- /dev/null +++ b/db/migrate/20191105211249_create_movies.rb @@ -0,0 +1,11 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + t.timestamps + end + end +end diff --git a/db/migrate/20191105211318_create_rentals.rb b/db/migrate/20191105211318_create_rentals.rb new file mode 100644 index 000000000..bbdf87e56 --- /dev/null +++ b/db/migrate/20191105211318_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :check_out_date + t.date :check_in_date + t.date :due_date + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..8b7a25213 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,47 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_11_05_211318) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_out_date" + t.date "check_in_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..cd59ab14a --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Movie do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From b6ab7bb64dfb1b78362e9ae98957b119db372e97 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Tue, 5 Nov 2019 14:14:34 -0800 Subject: [PATCH 03/24] added controller, routes, model validation --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 10 ++++++++++ app/controllers/rentals_controller.rb | 4 ++++ app/models/customer.rb | 7 +++++++ app/models/movie.rb | 4 ++++ app/models/rental.rb | 2 ++ config/routes.rb | 4 +++- ...1105220415_update_rentals_check_out_date_default.rb | 6 ++++++ .../20191105221006_rentals_check_out_default_remove.rb | 6 ++++++ db/schema.rb | 4 ++-- test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 13 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 db/migrate/20191105220415_update_rentals_check_out_date_default.rb create mode 100644 db/migrate/20191105221006_rentals_check_out_default_remove.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..a78ada353 --- /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/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..95ecb854f --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,4 @@ +class RentalsController < ApplicationController + def create + end +end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..9c0035179 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,9 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, 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..eb5885304 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 end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..f95c2eca6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + validates :check_out_date, presence: true + validates :due_date, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..2a7131a04 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + resources :rentals, only: [:create] end diff --git a/db/migrate/20191105220415_update_rentals_check_out_date_default.rb b/db/migrate/20191105220415_update_rentals_check_out_date_default.rb new file mode 100644 index 000000000..f728c7adc --- /dev/null +++ b/db/migrate/20191105220415_update_rentals_check_out_date_default.rb @@ -0,0 +1,6 @@ +class UpdateRentalsCheckOutDateDefault < ActiveRecord::Migration[5.2] + def change + remove_column :rentals, :check_out_date + add_column :rentals, :check_out_date, :date, default: Date.today + end +end diff --git a/db/migrate/20191105221006_rentals_check_out_default_remove.rb b/db/migrate/20191105221006_rentals_check_out_default_remove.rb new file mode 100644 index 000000000..d1c1740ac --- /dev/null +++ b/db/migrate/20191105221006_rentals_check_out_default_remove.rb @@ -0,0 +1,6 @@ +class RentalsCheckOutDefaultRemove < ActiveRecord::Migration[5.2] + def change + remove_column :rentals, :check_out_date + add_column :rentals, :check_out_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 8b7a25213..72232b4b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_211318) do +ActiveRecord::Schema.define(version: 2019_11_05_221006) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,11 +37,11 @@ end create_table "rentals", force: :cascade do |t| - t.date "check_out_date" t.date "check_in_date" t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.date "check_out_date" end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..b11d50cea --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 1f729b94130894a9519771a5dac1ee970b659e46 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Tue, 5 Nov 2019 14:28:32 -0800 Subject: [PATCH 04/24] added movie model validation tests and passed --- test/fixtures/movies.yml | 5 +++++ test/models/movie_test.rb | 33 ++++++++++++++++++++++++++++++--- test/test_helper.rb | 7 +++++++ 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/movies.yml diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..ad7ffc36a --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,5 @@ +one: + title: a new movie + overview: very interesting movie + release_date: 2019-11-05 + inventory: 4 \ No newline at end of file diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cd59ab14a..6ec3b03d0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe Movie do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + let(:movie){movies(:one)} + it "must have a title" do + movie.title = "" + refute movie.valid? + expect(movie.errors.messages).must_include :title + expect(movie.errors.messages[:title]).must_include "can't be blank" + end + + it "must have a overview" do + movie.overview = "" + refute movie.valid? + expect(movie.errors.messages).must_include :overview + expect(movie.errors.messages[:overview]).must_include "can't be blank" + end + + it "must have a release date" do + movie.release_date = "" + refute movie.valid? + expect(movie.errors.messages).must_include :release_date + expect(movie.errors.messages[:release_date]).must_include "can't be blank" + end + + it "must have an inventory" do + movie.inventory = nil + refute movie.valid? + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_include "can't be blank" + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..2bf90f52f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,13 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require "minitest/rails" + +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From caa27d77dd4a3909eb0b3530b5bcfba07723d287 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Tue, 5 Nov 2019 14:40:32 -0800 Subject: [PATCH 05/24] added customer testing --- test/fixtures/customers.yml | 8 +++++ test/models/customer_test.rb | 62 ++++++++++++++++++++++++++++++++++-- test/models/movie_test.rb | 11 +++++-- 3 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..c8866a755 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,8 @@ +bob: + name: Bob + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 123 abc street + city: Seattle + state: WA + postal_code: 12345 + phone: (123) 456-7890 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..86aef23ee 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,63 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + let(:customer){customers(:bob)} + + it "must have a name" do + customer.name = nil + + refute customer.valid? + expect(customer.errors.messages).must_include :name + expect(customer.errors.messages[:name]).must_include "can't be blank" + end + + it "must have a registration date" do + customer.registered_at = nil + + refute customer.valid? + expect(customer.errors.messages).must_include :registered_at + expect(customer.errors.messages[:registered_at]).must_include "can't be blank" + end + + it "must have an address" do + customer.address = nil + + refute customer.valid? + expect(customer.errors.messages).must_include :address + expect(customer.errors.messages[:address]).must_include "can't be blank" + end + + it "must have a city" do + customer.city = nil + + refute customer.valid? + expect(customer.errors.messages).must_include :city + expect(customer.errors.messages[:city]).must_include "can't be blank" + end + + it "must have a state" do + customer.state = nil + + refute customer.valid? + expect(customer.errors.messages).must_include :state + expect(customer.errors.messages[:state]).must_include "can't be blank" + end + + it "must have a postal code" do + customer.postal_code = nil + + refute customer.valid? + expect(customer.errors.messages).must_include :postal_code + expect(customer.errors.messages[:postal_code]).must_include "can't be blank" + end + + it "must have a phone number" do + customer.phone = nil + + refute customer.valid? + expect(customer.errors.messages).must_include :phone + expect(customer.errors.messages[:phone]).must_include "can't be blank" + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 6ec3b03d0..41499b66d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,27 +3,32 @@ describe Movie do describe "validations" do let(:movie){movies(:one)} + + it "can be valid" do + assert movie.valid? + end + it "must have a title" do movie.title = "" refute movie.valid? expect(movie.errors.messages).must_include :title expect(movie.errors.messages[:title]).must_include "can't be blank" end - + it "must have a overview" do movie.overview = "" refute movie.valid? expect(movie.errors.messages).must_include :overview expect(movie.errors.messages[:overview]).must_include "can't be blank" end - + it "must have a release date" do movie.release_date = "" refute movie.valid? expect(movie.errors.messages).must_include :release_date expect(movie.errors.messages[:release_date]).must_include "can't be blank" end - + it "must have an inventory" do movie.inventory = nil refute movie.valid? From 93bb32951421e955b57d47386f47643f6ecb8173 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Tue, 5 Nov 2019 14:48:19 -0800 Subject: [PATCH 06/24] pushing straggler test --- test/models/customer_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 86aef23ee..fbc501c62 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,6 +4,10 @@ describe "validations" do let(:customer){customers(:bob)} + it "can be valid" do + assert customer.valid? + end + it "must have a name" do customer.name = nil From 684dfc9b891d99308e1455e284b99a430937c907 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Tue, 5 Nov 2019 15:46:55 -0800 Subject: [PATCH 07/24] added index actions for movies and customers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..5f7257137 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,6 @@ class CustomersController < ApplicationController def index + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + render json: customers, status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a78ada353..e91a7829b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,8 +1,17 @@ class MoviesController < ApplicationController def index + movies = Movie.all.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + render json: movies, status: :ok + end def show + movie = Movie.find_by(id: params[:id]).as_json(only: [:title, :overview, :release_date, :inventory]) + if movie + render json: movie, status: :ok + else + render json: {errors: "could not find movie with id #{params[:id]}"}, status: :not_found + end end def create From 5bff6d0ac5a72f457db13bb3a24bb8cc8b1c4878 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Tue, 5 Nov 2019 16:08:28 -0800 Subject: [PATCH 08/24] added wave 2 columns to movie and customer schema --- ...191105235550_add_movies_checked_out_count_to_customers.rb | 5 +++++ .../20191105235809_add_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 4 +++- db/seeds.rb | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191105235550_add_movies_checked_out_count_to_customers.rb create mode 100644 db/migrate/20191105235809_add_available_inventory_to_movies.rb diff --git a/db/migrate/20191105235550_add_movies_checked_out_count_to_customers.rb b/db/migrate/20191105235550_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..dac80cbe6 --- /dev/null +++ b/db/migrate/20191105235550_add_movies_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/migrate/20191105235809_add_available_inventory_to_movies.rb b/db/migrate/20191105235809_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..9bcb714a6 --- /dev/null +++ b/db/migrate/20191105235809_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 72232b4b2..4f053ca69 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_221006) do +ActiveRecord::Schema.define(version: 2019_11_05_235809) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..656319bd4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,6 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| + # movie[:available_inventory] = movie[:inventory] Movie.create!(movie) end From 486f5dbe3e87b1a6128c9b821530c079ff23cf47 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Tue, 5 Nov 2019 16:24:40 -0800 Subject: [PATCH 09/24] added new columns to controllers --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 6 +++--- db/seeds.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5f7257137..44290734f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) render json: customers, status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e91a7829b..a45be8e69 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,12 +1,12 @@ class MoviesController < ApplicationController def index - movies = Movie.all.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + movies = Movie.all.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) render json: movies, status: :ok - + end def show - movie = Movie.find_by(id: params[:id]).as_json(only: [:title, :overview, :release_date, :inventory]) + movie = Movie.find_by(id: params[:id]).as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) if movie render json: movie, status: :ok else diff --git a/db/seeds.rb b/db/seeds.rb index 656319bd4..1a91f67b1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,6 +3,6 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - # movie[:available_inventory] = movie[:inventory] + movie["available_inventory"] = movie["inventory"] Movie.create!(movie) end From a51a30b154bd8ca31b36e1b67fb06116c876bb3b Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Tue, 5 Nov 2019 16:50:48 -0800 Subject: [PATCH 10/24] updated strong params for movie --- app/controllers/movies_controller.rb | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a45be8e69..f9993b065 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,5 +15,24 @@ def show end def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id]), status: :ok + return + else + render json: { + ok: false, + errors: movie.errors.messages + }, + status: :bad_request + return + end + end + + private + + def movie_params + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end -end +end \ No newline at end of file From adce877e13fce4e086cb82588d6d9377f97dd859 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Wed, 6 Nov 2019 12:12:40 -0800 Subject: [PATCH 11/24] added controller tests for customer and movie. They are passing --- app/controllers/movies_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 30 +++++- test/controllers/movies_controller_test.rb | 92 ++++++++++++++++++- test/fixtures/customers.yml | 19 ++++ test/fixtures/movies.yml | 15 ++- test/test_helper.rb | 11 ++- 6 files changed, 160 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f9993b065..d350a8e9a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -35,4 +35,4 @@ def create def movie_params params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end -end \ No newline at end of file +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..f12cb8c31 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,31 @@ require "test_helper" +CUSTOMER_FIELDS = ["address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at", "state"] + describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responds with JSON, success, and an array of customer hashes" do + get customers_path + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "will respond with an empty array when there are no customers" do + Customer.destroy_all + + get customers_path + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + expect(body).must_equal [] + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b11d50cea..b92aaf564 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,93 @@ require "test_helper" +MOVIE_FIELDS = ["available_inventory", "id", "inventory", "overview", "release_date", "title"] + describe MoviesController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responds with JSON, success, and an array of movie hashes" do + get movies_path + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + + body.each do |movie| + expect(movie).must_be_instance_of Hash + expect(movie.keys.sort).must_equal MOVIE_FIELDS + end + end + + it "will respond with an empty array when there are no movies" do + Movie.destroy_all + + get movies_path + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + expect(body).must_equal [] + end + end + + describe "show" do + it "responds with JSON, success, and info for one movie stored in a hash" do + movie = movies(:three) + + get movie_path(id: movie.id) + + check_response(expected_type: Hash) + + body = JSON.parse(response.body) + + expect(body.keys.sort).must_equal ["available_inventory", "inventory", "overview", "release_date", "title"] + expect(body["title"]).must_equal "Titanic" + end + + it "responds with not found if the movie does not exist" do + get movie_path(-1) + + check_response(expected_type: Hash, expected_status: :not_found) + + body = JSON.parse(response.body) + + expect(body.keys).must_include "errors" + end + end + + describe "create" do + let(:movie_data){ + { + "title" => "Happy Feet", + "overview" => "A movie about cartoon penguins.", + "release_date" => "2019-10-03", + "inventory" => "5" + } + } + + it "can create a new movie" do + expect { + post movies_path, params: movie_data + }.must_differ 'Movie.count', 1 + + check_response(expected_type: Hash) + + body = JSON.parse(response.body) + expect(body["id"]).must_be_instance_of Integer + end + + it "will respond with bad_request and errors for invalid data" do + movie_data["title"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change 'Movie.count' + + check_response(expected_type: Hash, expected_status: :bad_request) + + body = JSON.parse(response.body) + + expect(body.keys).must_include "errors" + expect(body["errors"].keys).must_include "title" + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index c8866a755..8273bbdee 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,3 +6,22 @@ bob: state: WA postal_code: 12345 phone: (123) 456-7890 + movies_checked_out_count: 0 +hannah: + name: Hannah + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 456 def street + city: Seattle + state: WA + postal_code: 22222 + phone: (123) 456-1234 + movies_checked_out_count: 0 +mochi: + name: Mochi Cat + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 314 home street + city: Austin + state: TX + postal_code: 11111 + phone: (123) 123-4567 + movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ad7ffc36a..5a048625a 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -2,4 +2,17 @@ one: title: a new movie overview: very interesting movie release_date: 2019-11-05 - inventory: 4 \ No newline at end of file + inventory: 4 + available_inventory: 4 +two: + title: a second movie + overview: less interesting movie + release_date: 2019-10-03 + inventory: 2 + available_inventory: 2 +three: + title: Titanic + overview: Romance on a sinking ship + release_date: 1998-02-15 + inventory: 10 + available_inventory: 10 diff --git a/test/test_helper.rb b/test/test_helper.rb index 2bf90f52f..b197cbd4a 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -12,6 +12,15 @@ 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... + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end end From 96c79abf3a47a4eb8799260aa3b0fe473fc8bd43 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Wed, 6 Nov 2019 13:50:51 -0800 Subject: [PATCH 12/24] added foreign keys to rentals, added check_out controller action --- app/controllers/rentals_controller.rb | 36 ++++++++++++++++++- app/models/customer.rb | 7 ++++ app/models/movie.rb | 7 ++++ app/models/rental.rb | 2 ++ config/routes.rb | 3 +- ...06212823_add_movies_cust_ref_to_rentals.rb | 6 ++++ db/schema.rb | 8 ++++- 7 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20191106212823_add_movies_cust_ref_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 95ecb854f..4fe590c09 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,4 +1,38 @@ class RentalsController < ApplicationController - def create + + def check_out + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + + if movie && customer + rental = Rental.new(customer_id: customer.id, movie_id: movie.id) + rental.check_out_date = Date.today + rental.due_date = Date.today + 7 + if rental.save + movie.decrease_inventory + customer.add_to_checked_out + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { + ok: false, + errors: rental.errors.messages + }, + status: :bad_request + return + end + else + render json: { + ok: false, + errors: "Unable to create rental" + }, + status: :bad_request + return + end end + + def check_in + + end + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 9c0035179..05ce5377a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,11 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true + has_many :rentals + has_many :movies, through: :rentals + + def add_to_checked_out + self.movies_checked_out_count += 1 + self.save + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index eb5885304..9d52c3651 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,11 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true + has_many :rentals + has_many :customers, through: :rentals + + def decrease_inventory + self.available_inventory -= 1 + self.save + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index f95c2eca6..a1044fc97 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord validates :check_out_date, presence: true validates :due_date, presence: true + belongs_to :movie + belongs_to :customer end diff --git a/config/routes.rb b/config/routes.rb index 2a7131a04..f6380ccd9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - resources :rentals, only: [:create] + post "/rentals/check-out", to: "rentals#check_out", as: "check_out" + post "/rentals/check-in", to: "rentals#check_in", as: "check_in" end diff --git a/db/migrate/20191106212823_add_movies_cust_ref_to_rentals.rb b/db/migrate/20191106212823_add_movies_cust_ref_to_rentals.rb new file mode 100644 index 000000000..1eb7b10d8 --- /dev/null +++ b/db/migrate/20191106212823_add_movies_cust_ref_to_rentals.rb @@ -0,0 +1,6 @@ +class AddMoviesCustRefToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 4f053ca69..591dc1051 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_235809) do +ActiveRecord::Schema.define(version: 2019_11_06_212823) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,6 +44,12 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.date "check_out_date" + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 22d6854f239a928911b8e989028ffe1eb887ab23 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Wed, 6 Nov 2019 14:32:04 -0800 Subject: [PATCH 13/24] add check in action for rentals. adjusted movie controller params --- app/controllers/movies_controller.rb | 3 +- app/controllers/rentals_controller.rb | 40 +++++++++++++++++++++++---- app/models/customer.rb | 7 ++++- app/models/movie.rb | 7 ++++- 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d350a8e9a..5f3f34f95 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -16,6 +16,7 @@ def show def create movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory if movie.save render json: movie.as_json(only: [:id]), status: :ok @@ -33,6 +34,6 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4fe590c09..cb03ee1f1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,9 @@ class RentalsController < ApplicationController - + def check_out customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - + if movie && customer rental = Rental.new(customer_id: customer.id, movie_id: movie.id) rental.check_out_date = Date.today @@ -11,7 +11,7 @@ def check_out if rental.save movie.decrease_inventory customer.add_to_checked_out - render json: rental.as_json(only: [:id]), status: :ok + render json: rental.as_json(only: [:id, :due_date]), status: :ok return else render json: { @@ -30,9 +30,37 @@ def check_out return end end - + def check_in - + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + + if movie && customer + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental.check_in_date = Date.today + + if rental.save + movie.increase_inventory + customer.remove_checked_out + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { + ok: false, + errors: rental.errors.messages + }, + status: :bad_request + return + end + + else + render json: { + ok: false, + errors: "Unable to check-in rental. Please check inputs." + }, + status: :bad_request + return + end end - + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 05ce5377a..02e06289d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,9 +8,14 @@ class Customer < ApplicationRecord validates :phone, presence: true has_many :rentals has_many :movies, through: :rentals - + def add_to_checked_out self.movies_checked_out_count += 1 self.save end + + def remove_checked_out + self.movies_checked_out_count -= 1 + self.save + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 9d52c3651..3f2f8e6ef 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,9 +5,14 @@ class Movie < ApplicationRecord validates :inventory, presence: true has_many :rentals has_many :customers, through: :rentals - + def decrease_inventory self.available_inventory -= 1 self.save end + + def increase_inventory + self.available_inventory += 1 + self.save + end end From a63e4e5fb647487857391acccae956e961dbfacf Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Wed, 6 Nov 2019 14:46:43 -0800 Subject: [PATCH 14/24] added testing for customer model methods --- test/models/customer_test.rb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index fbc501c62..b9030c8cc 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Customer do + let(:customer){customers(:bob)} + describe "validations" do - let(:customer){customers(:bob)} - it "can be valid" do assert customer.valid? end @@ -64,4 +64,18 @@ expect(customer.errors.messages[:phone]).must_include "can't be blank" end end + + describe "custom methods" do + describe "add_to_checked_out" do + it "will increase movies_checked_out_count by one" do + expect{ customer.add_to_checked_out }.must_differ "customer.movies_checked_out_count", 1 + end + end + + describe "remove_checked_out" do + it "will decrease movies_checked_out_count by one" do + expect{ customer.remove_checked_out }.must_differ "customer.movies_checked_out_count", -1 + end + end + end end From a0b5c7befa06ef89217db6f8010da4c0b6fc8aa9 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Wed, 6 Nov 2019 14:49:18 -0800 Subject: [PATCH 15/24] added tests for custom model methods --- test/models/movie_test.rb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 41499b66d..05c1be5ec 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,8 +1,9 @@ require "test_helper" describe Movie do + let(:movie){movies(:one)} describe "validations" do - let(:movie){movies(:one)} + it "can be valid" do assert movie.valid? @@ -36,4 +37,20 @@ expect(movie.errors.messages[:inventory]).must_include "can't be blank" end end + + describe "decrease_inventory" do + it "will decrease a movie's available inventory by 1" do + before = movie.available_inventory + movie.decrease_inventory + expect(movie.available_inventory).must_equal before - 1 + end + end + + describe "increase_inventory" do + it "will increase a movie's available inventory by 1" do + before = movie.available_inventory + movie.increase_inventory + expect(movie.available_inventory).must_equal before + 1 + end + end end From e9bc43d221c20ab394c324bcdac45f06b4afe768 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Wed, 6 Nov 2019 15:16:59 -0800 Subject: [PATCH 16/24] added check_out test to rentals controller --- test/controllers/rentals_controller_test.rb | 36 +++++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..4fd34d2d8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:rental_params){ + {"customer_id" => customers(:bob).id.to_s, + "movie_id" => movies(:one).id.to_s, + } +} + describe "check_out" do + it "creates a new rental" do + expect{ post check_out_path, params: rental_params}.must_change "Rental.count", 1 + + check_response(expected_type: Hash, expected_status: :ok) + + end + + it "returns a bad request if movie or customer is missing" do + rental_params["movie_id"] = nil + expect{ post check_out_path, params: rental_params}.wont_change "Rental.count" + check_response(expected_type: Hash, expected_status: :bad_request) + end + + it "increases a customer's checked out and decreases movie's inventory" do + before_movie_count = movies(:one).available_inventory + before_cust_count = customers(:bob).movies_checked_out_count + post check_out_path, params: rental_params + updated_movie = Movie.find_by(id: movies(:one).id) + updated_cust = Customer.find_by(id: customers(:bob).id) + expect(updated_movie.available_inventory).must_equal before_movie_count - 1 + expect(updated_cust.movies_checked_out_count).must_equal before_cust_count + 1 + end + end + + describe "check_in" do + + end end From 753560b6e0fe65b4be518c70bdebab7b64fc4516 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Wed, 6 Nov 2019 15:42:22 -0800 Subject: [PATCH 17/24] added rental check in test --- app/controllers/rentals_controller.rb | 26 +++++++++----- test/controllers/rentals_controller_test.rb | 40 ++++++++++++++++++--- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cb03ee1f1..34d0cad77 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -37,18 +37,28 @@ def check_in if movie && customer rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) - rental.check_in_date = Date.today - if rental.save - movie.increase_inventory - customer.remove_checked_out - render json: rental.as_json(only: [:id]), status: :ok - return + if rental + rental.check_in_date = Date.today + + if rental.save + movie.increase_inventory + customer.remove_checked_out + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { + ok: false, + errors: rental.errors.messages + }, + status: :bad_request + return + end else render json: { ok: false, - errors: rental.errors.messages - }, + errors: "Unable to check-in rental. Could not find rental record." + }, status: :bad_request return end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4fd34d2d8..98d5f954c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,8 +4,8 @@ let(:rental_params){ {"customer_id" => customers(:bob).id.to_s, "movie_id" => movies(:one).id.to_s, + } } -} describe "check_out" do it "creates a new rental" do expect{ post check_out_path, params: rental_params}.must_change "Rental.count", 1 @@ -13,13 +13,13 @@ check_response(expected_type: Hash, expected_status: :ok) end - + it "returns a bad request if movie or customer is missing" do rental_params["movie_id"] = nil expect{ post check_out_path, params: rental_params}.wont_change "Rental.count" check_response(expected_type: Hash, expected_status: :bad_request) end - + it "increases a customer's checked out and decreases movie's inventory" do before_movie_count = movies(:one).available_inventory before_cust_count = customers(:bob).movies_checked_out_count @@ -30,8 +30,38 @@ expect(updated_cust.movies_checked_out_count).must_equal before_cust_count + 1 end end - + describe "check_in" do - + it "can update a rental with valid data" do + post check_out_path, params: rental_params + expect{ post check_in_path, params: rental_params }.wont_change "Rental.count" + check_response(expected_type: Hash) + end + + it "bad request if there is no checked out rental with given movie and customer id" do + expect{ post check_in_path, params: rental_params }.wont_change "Rental.count" + check_response(expected_type: Hash, expected_status: :bad_request) + end + + it "returns bad_request if movie or customer id is missing" do + rental_params["movie_id"] = nil + expect{ post check_in_path, params: rental_params}.wont_change "Rental.count" + check_response(expected_type: Hash, expected_status: :bad_request) + end + + it "decreases a customer's checked out and increases movie's inventory" do + post check_out_path, params: rental_params + + before_movie_count = Movie.find_by(id: movies(:one).id).available_inventory + before_cust_count = Customer.find_by(id: customers(:bob).id).movies_checked_out_count + + post check_in_path, params: rental_params + + updated_movie = Movie.find_by(id: movies(:one).id) + updated_cust = Customer.find_by(id: customers(:bob).id) + + expect(updated_movie.available_inventory).must_equal before_movie_count + 1 + expect(updated_cust.movies_checked_out_count).must_equal before_cust_count - 1 + end end end From 625b373287bef38a2674305b3574e31f001fab3d Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Thu, 7 Nov 2019 10:27:18 -0800 Subject: [PATCH 18/24] added in stock validation for movies and nil check in date for check in validation. plus tests --- app/controllers/rentals_controller.rb | 6 +++- app/models/movie.rb | 8 ++++++ test/controllers/rentals_controller_test.rb | 31 +++++++++++++++++++++ test/models/movie_test.rb | 23 +++++++++++++-- 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 34d0cad77..996c5910c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,6 +4,10 @@ def check_out customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) + if movie + movie = movie.in_stock + end + if movie && customer rental = Rental.new(customer_id: customer.id, movie_id: movie.id) rental.check_out_date = Date.today @@ -36,7 +40,7 @@ def check_in movie = Movie.find_by(id: params[:movie_id]) if movie && customer - rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id, check_in_date: nil) if rental rental.check_in_date = Date.today diff --git a/app/models/movie.rb b/app/models/movie.rb index 3f2f8e6ef..3ca66b6b0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -15,4 +15,12 @@ def increase_inventory self.available_inventory += 1 self.save end + + def in_stock + if self.available_inventory == 0 + return nil + end + + return self + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 98d5f954c..3a10c4f87 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -29,6 +29,15 @@ expect(updated_movie.available_inventory).must_equal before_movie_count - 1 expect(updated_cust.movies_checked_out_count).must_equal before_cust_count + 1 end + + it "returns bad request if the movie is not in stock" do + movie = movies(:one) + movie.available_inventory = 0 + movie.save! + + expect{ post check_out_path, params: rental_params}.wont_change "Rental.count" + check_response(expected_type: Hash, expected_status: :bad_request) + end end describe "check_in" do @@ -63,5 +72,27 @@ expect(updated_movie.available_inventory).must_equal before_movie_count + 1 expect(updated_cust.movies_checked_out_count).must_equal before_cust_count - 1 end + + it "finds the correct rental if more than one exists for the same movie/customer combination" do + post check_out_path, params: rental_params + post check_in_path, params: rental_params + + post check_out_path, params: rental_params + current_rental = Rental.last + expect(current_rental.check_in_date).must_be_nil + + post check_in_path, params: rental_params + + updated_rental = Rental.find_by(id: current_rental.id) + expect(updated_rental.check_in_date).must_equal Date.today + end + + it "returns bad request when checking in an already check-ed in movie" do + post check_out_path, params: rental_params + post check_in_path, params: rental_params + + post check_in_path, params: rental_params + check_response(expected_type: Hash, expected_status: :bad_request) + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 05c1be5ec..ec85c34ee 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -37,7 +37,7 @@ expect(movie.errors.messages[:inventory]).must_include "can't be blank" end end - + describe "decrease_inventory" do it "will decrease a movie's available inventory by 1" do before = movie.available_inventory @@ -45,7 +45,7 @@ expect(movie.available_inventory).must_equal before - 1 end end - + describe "increase_inventory" do it "will increase a movie's available inventory by 1" do before = movie.available_inventory @@ -53,4 +53,23 @@ expect(movie.available_inventory).must_equal before + 1 end end + + describe "in_stock" do + it "returns the Movie object when available inventory is not zero" do + movie = movies(:two) + + expect(movie.in_stock).must_be_kind_of Movie + expect(movie.title).must_equal "a second movie" + end + + it "returns nil when there is no available inventory" do + movie = movies(:two) + movie.available_inventory = 0 + movie.save! + + expect(movie.available_inventory).must_equal 0 + + expect(movie.in_stock).must_be_nil + end + end end From b482e1ab6198adedb16fb835ae65da1cf6e01fd0 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Thu, 7 Nov 2019 15:03:59 -0800 Subject: [PATCH 19/24] added dependent nullify to movie and customer --- app/controllers/customers_controller.rb | 8 ++++++++ app/controllers/movies_controller.rb | 8 ++++++++ app/controllers/rentals_controller.rb | 5 +++++ app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- app/models/rental.rb | 2 ++ config/routes.rb | 5 +++++ test/controllers/rentals_controller_test.rb | 10 ++++++++++ test/fixtures/rentals.yml | 21 +++++++++++++++++++++ 9 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 44290734f..8a1aed3ad 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,4 +3,12 @@ def index customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) render json: customers, status: :ok end + + def current + + end + + def history + + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5f3f34f95..4ef88b3a4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -30,6 +30,14 @@ def create return end end + + def current + + end + + def history + + end private diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 996c5910c..3fef496f5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -76,5 +76,10 @@ def check_in return end end + + def overdue + overdue_rentals = Rental.where(check_in_date: nil).where("due_date < ?", Date.today) + render json: overdue_rentals, status: :ok + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 02e06289d..fdc38de60 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,7 +6,7 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true - has_many :rentals + has_many :rentals, dependent: :nullify has_many :movies, through: :rentals def add_to_checked_out diff --git a/app/models/movie.rb b/app/models/movie.rb index 3ca66b6b0..6aa104f3e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,7 +3,7 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true - has_many :rentals + has_many :rentals, dependent: :nullify has_many :customers, through: :rentals def decrease_inventory diff --git a/app/models/rental.rb b/app/models/rental.rb index a1044fc97..7782e9434 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,4 +3,6 @@ class Rental < ApplicationRecord validates :due_date, presence: true belongs_to :movie belongs_to :customer + + end diff --git a/config/routes.rb b/config/routes.rb index f6380ccd9..b30389d24 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,9 @@ resources :movies, only: [:index, :show, :create] post "/rentals/check-out", to: "rentals#check_out", as: "check_out" post "/rentals/check-in", to: "rentals#check_in", as: "check_in" + get "/rentals/overdue", to: "rentals#overdue", as: "overdue" + get "/movies/:id/current", to: "movies#current", as: "current_movie" + get "/movies/:id/history", to: "movies#history", as: "movie_history" + get "/customers/:id/current", to: "customers#current", as: "current_cust" + get "/customers/:id/history", to: "customers#history", as: "cust_history" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3a10c4f87..b79b18149 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -95,4 +95,14 @@ check_response(expected_type: Hash, expected_status: :bad_request) end end + + describe "overdue" do + it "returns all rentals that have due dates that have passed" do + get overdue_path + + check_response(expected_type: Hash, expected_status: :ok) + + end + + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..ba5927efb --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,21 @@ +rental1: + movie: one + customer: mochi + check_out_date: 2019-09-01 + due_date: 2019-09-08 + check_in_date: nil + +rental2: + movie: one + customer: mochi + check_out_date: 2019-09-01 + due_date: 2019-09-08 + check_in_date: nil + +rental3: + movie: one + customer: mochi + check_out_date: 2019-09-01 + due_date: 2019-09-08 + check_in_date: 2019-10-11 + From 5a0ea0e7fde0863e31ee2347a24fac390c7d77c7 Mon Sep 17 00:00:00 2001 From: Kristy Hisaw Date: Thu, 7 Nov 2019 15:22:45 -0800 Subject: [PATCH 20/24] finished overdue action and tests --- app/controllers/rentals_controller.rb | 9 +++++++-- test/controllers/rentals_controller_test.rb | 13 ++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3fef496f5..167751e4d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -78,8 +78,13 @@ def check_in end def overdue - overdue_rentals = Rental.where(check_in_date: nil).where("due_date < ?", Date.today) - render json: overdue_rentals, status: :ok + overdue_rentals = Rental.where(check_in_date: nil).where("due_date < ?", Date.today).as_json(only: [:id, :check_in_date, :check_out_date, :due_date, :movie_id, :customer_id]) + if overdue_rentals.empty? + render json: { errors: "No overdue movies at this time" }, status: :ok + return + else + render json: overdue_rentals, status: :ok + end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b79b18149..e49919912 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -100,9 +100,20 @@ it "returns all rentals that have due dates that have passed" do get overdue_path - check_response(expected_type: Hash, expected_status: :ok) + check_response(expected_type: Array) + + body = JSON.parse(response.body) + body.each do |rental| + expect(rental).must_be_instance_of Hash + expect(rental.keys.sort).must_equal ["check_in_date", "check_out_date", "customer_id", "due_date", "id", "movie_id"] + end end + it "returns 'no overdue movies' if none are overdue" do + Rental.destroy_all + get overdue_path + check_response(expected_type: Hash, expected_status: :ok) + end end end From 7dc293368ece30087183ea5b127f8657aca43d79 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Thu, 7 Nov 2019 21:24:35 -0800 Subject: [PATCH 21/24] created separate find current rentals and find past rentals --- app/controllers/movies_controller.rb | 36 ++++++- app/models/movie.rb | 32 ++++++ test/controllers/movies_controller_test.rb | 39 +++++++ test/fixtures/customers.yml | 45 ++++++++ test/fixtures/movies.yml | 12 +++ test/fixtures/rentals.yml | 30 ++++++ test/models/movie_test.rb | 116 ++++++++++++++++----- 7 files changed, 281 insertions(+), 29 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4ef88b3a4..a04981710 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -30,13 +30,41 @@ def create return end end - + def current - + movie = Movie.find_by(id: params[:id]) + + if movie.nil? + render json: { + ok: false, + errors: "No movie assossiated with #{params[:id]}." + }, + status: :not_found + return + end + + current_rentals = movie.find_curr_rentals.as_json + + render json: current_rentals, status: :ok + return end - + def history - + movie = Movie.find_by(id: params[:id]) + + if movie.nil? + render json: { + ok: false, + errors: "No movie assossiated with #{params[:id]}." + }, + status: :not_found + return + end + + past_rentals = movie.find_past_rentals.as_json + + render json: past_rentals, status: :ok + return end private diff --git a/app/models/movie.rb b/app/models/movie.rb index 6aa104f3e..699c90eda 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -23,4 +23,36 @@ def in_stock return self end + + def find_curr_rentals + current_rentals = self.rentals.select { |rental| rental.check_in_date == nil } + + curr_customer_info = current_rentals.map { |rental| + { + customer_id: rental.customer.id, + name: rental.customer.name, + postal_code: rental.customer.postal_code, + check_out_date: rental.check_out_date, + due_date: rental.due_date + } + } + + return curr_customer_info + end + + def find_past_rentals + past_rentals = self.rentals.select { |rental| rental.check_in_date != nil } + + past_customer_info = past_rentals.map { |rental| + { + customer_id: rental.customer.id, + name: rental.customer.name, + postal_code: rental.customer.postal_code, + check_out_date: rental.check_out_date, + due_date: rental.due_date + } + } + + return past_customer_info + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b92aaf564..51a504c16 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -90,4 +90,43 @@ expect(body["errors"].keys).must_include "title" end end + + describe "current" do + CURR_RENT_FIELDS = ["check_out_date", "customer_id", "due_date", "name", "postal_code"] + + it "responds with JSON, success, and an array of custom rental hashes" do + movie = movies(:star_wars) + get current_movie_path(id: movie.id) + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + + body.each do |rental| + expect(rental).must_be_instance_of Hash + expect(rental.keys.sort).must_equal CURR_RENT_FIELDS + end + end + + it "responds with JSON, success, and an empty array for a movie with no current check-outs" do + movie = movies(:unpopular) + get current_movie_path(id: movie.id) + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + + expect(body).must_equal [] + end + + it "responds with JSON and not found for an invalid ID" do + get current_movie_path(id: -1) + + check_response(expected_type: Hash, expected_status: :not_found) + + body = JSON.parse(response.body) + + expect(body["errors"]).must_include "No movie assossiated with -1." + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 8273bbdee..958f4bb80 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -25,3 +25,48 @@ mochi: postal_code: 11111 phone: (123) 123-4567 movies_checked_out_count: 0 +uno: + name: Uno + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 314 home street + city: Austin + state: TX + postal_code: 11111 + phone: (123) 123-4567 + movies_checked_out_count: 1 +dos: + name: Dos + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 314 home street + city: Austin + state: TX + postal_code: 11111 + phone: (123) 123-4567 + movies_checked_out_count: 0 +tres: + name: Tres + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 314 home street + city: Austin + state: TX + postal_code: 11111 + phone: (123) 123-4567 + movies_checked_out_count: 1 +cuatro: + name: Cuatro + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 314 home street + city: Austin + state: TX + postal_code: 11111 + phone: (123) 123-4567 + movies_checked_out_count: 0 +cinco: + name: Cinco + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 314 home street + city: Austin + state: TX + postal_code: 11111 + phone: (123) 123-4567 + movies_checked_out_count: 1 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 5a048625a..8eea76f16 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -16,3 +16,15 @@ three: release_date: 1998-02-15 inventory: 10 available_inventory: 10 +star_wars: + title: Star Wars + overview: Hero story and western set in space. + release_date: 1998-04-19 + inventory: 5 + available_inventory: 2 +unpopular: + title: Unpopular Movie + overview: No one wants to rent this movie. + release_date: 1998-04-19 + inventory: 1 + available_inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index ba5927efb..cec2231af 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -19,3 +19,33 @@ rental3: due_date: 2019-09-08 check_in_date: 2019-10-11 +rental_sw1: + movie: star_wars + customer: uno + check_out_date: 2019-09-01 + due_date: 2019-09-08 + check_in_date: nil +rental_sw2: + movie: star_wars + customer: dos + check_out_date: 2019-09-01 + due_date: 2019-09-08 + check_in_date: 2019-09-08 +rental_sw3: + movie: star_wars + customer: tres + check_out_date: 2019-11-07 + due_date: 2019-11-14 + check_in_date: nil +rental_sw4: + movie: star_wars + customer: cuatro + check_out_date: 2019-04-01 + due_date: 2019-04-08 + check_in_date: 2019-04-08 +rental_sw5: + movie: star_wars + customer: cinco + check_out_date: 2019-11-06 + due_date: 2019-11-13 + check_in_date: nil diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ec85c34ee..98ec82069 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -38,38 +38,104 @@ end end - describe "decrease_inventory" do - it "will decrease a movie's available inventory by 1" do - before = movie.available_inventory - movie.decrease_inventory - expect(movie.available_inventory).must_equal before - 1 + describe "custom methods" do + describe "decrease_inventory" do + it "will decrease a movie's available inventory by 1" do + before = movie.available_inventory + movie.decrease_inventory + expect(movie.available_inventory).must_equal before - 1 + end end - end - - describe "increase_inventory" do - it "will increase a movie's available inventory by 1" do - before = movie.available_inventory - movie.increase_inventory - expect(movie.available_inventory).must_equal before + 1 + + describe "increase_inventory" do + it "will increase a movie's available inventory by 1" do + before = movie.available_inventory + movie.increase_inventory + expect(movie.available_inventory).must_equal before + 1 + end end - end - - describe "in_stock" do - it "returns the Movie object when available inventory is not zero" do - movie = movies(:two) + + describe "in_stock" do + it "returns the Movie object when available inventory is not zero" do + movie = movies(:two) + + expect(movie.in_stock).must_be_kind_of Movie + expect(movie.title).must_equal "a second movie" + end - expect(movie.in_stock).must_be_kind_of Movie - expect(movie.title).must_equal "a second movie" + it "returns nil when there is no available inventory" do + movie = movies(:two) + movie.available_inventory = 0 + movie.save! + + expect(movie.available_inventory).must_equal 0 + + expect(movie.in_stock).must_be_nil + end end - it "returns nil when there is no available inventory" do - movie = movies(:two) - movie.available_inventory = 0 - movie.save! + describe "find_curr_rentals" do + CURR_RENT_FIELDS = [:check_out_date, :customer_id, :due_date, :name, :postal_code] + + it "returns an array of customers who have currently checked out a movie" do + movie = movies(:star_wars) + current_rentals = movie.find_curr_rentals + + expect(current_rentals).must_be_kind_of Array + expect(current_rentals.length).must_equal 3 + expect(current_rentals.first).must_be_kind_of Hash + expect(current_rentals.first.keys.sort).must_equal CURR_RENT_FIELDS + end - expect(movie.available_inventory).must_equal 0 + it "returns an empty array if no copies of a movie are currently checked out" do + movie = movies(:unpopular) + current_customers = movie.find_curr_rentals + + expect(current_customers).must_be_kind_of Array + expect(current_customers.length).must_equal 0 + end + end + + RENTAL_FIELDS = [:check_out_date, :customer_id, :due_date, :name, :postal_code] + + describe "find_curr_rentals" do + it "returns an array of customers who have currently checked out a movie" do + movie = movies(:star_wars) + current_rentals = movie.find_curr_rentals + + expect(current_rentals).must_be_kind_of Array + expect(current_rentals.length).must_equal 3 + expect(current_rentals.first).must_be_kind_of Hash + expect(current_rentals.first.keys.sort).must_equal CURR_RENT_FIELDS + end + + it "returns an empty array if no copies of a movie are currently checked out" do + movie = movies(:unpopular) + current_customers = movie.find_curr_rentals + + expect(current_customers).must_be_kind_of Array + expect(current_customers.length).must_equal 0 + end + end + + describe "find_past_rentals" do + it "returns an array of customers who have currently checked out a movie" do + movie = movies(:star_wars) + current_rentals = movie.find_curr_rentals + + expect(current_rentals).must_be_kind_of Array + expect(current_rentals.length).must_equal 3 + expect(current_rentals.first).must_be_kind_of Hash + expect(current_rentals.first.keys.sort).must_equal CURR_RENT_FIELDS + end - expect(movie.in_stock).must_be_nil + it "returns an empty array if no copies of a movie are currently checked out" do + movie = movies(:unpopular) + current_customers = movie.find_curr_rentals + + expect(current_customers).must_be_kind_of Array + expect(current_customers.length).must_equal 0 + end end end end From f93a1e1a60b3a66aac25139f7d19bdf2f2b198e2 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Thu, 7 Nov 2019 21:39:03 -0800 Subject: [PATCH 22/24] merged current and past rental info finder into one. all tests passing --- app/controllers/movies_controller.rb | 8 ++-- app/models/movie.rb | 28 ++++------- test/controllers/movies_controller_test.rb | 45 ++++++++++++++++-- test/models/movie_test.rb | 55 +++++++--------------- 4 files changed, 69 insertions(+), 67 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a04981710..e8b5e2703 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -37,13 +37,13 @@ def current if movie.nil? render json: { ok: false, - errors: "No movie assossiated with #{params[:id]}." + errors: "No movie assossiated with ID #{params[:id]}." }, status: :not_found return end - current_rentals = movie.find_curr_rentals.as_json + current_rentals = movie.find_rentals("current").as_json render json: current_rentals, status: :ok return @@ -55,13 +55,13 @@ def history if movie.nil? render json: { ok: false, - errors: "No movie assossiated with #{params[:id]}." + errors: "No movie assossiated with ID #{params[:id]}." }, status: :not_found return end - past_rentals = movie.find_past_rentals.as_json + past_rentals = movie.find_rentals("past").as_json render json: past_rentals, status: :ok return diff --git a/app/models/movie.rb b/app/models/movie.rb index 699c90eda..0cf302037 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -24,26 +24,14 @@ def in_stock return self end - def find_curr_rentals - current_rentals = self.rentals.select { |rental| rental.check_in_date == nil } - - curr_customer_info = current_rentals.map { |rental| - { - customer_id: rental.customer.id, - name: rental.customer.name, - postal_code: rental.customer.postal_code, - check_out_date: rental.check_out_date, - due_date: rental.due_date - } - } - - return curr_customer_info - end - - def find_past_rentals - past_rentals = self.rentals.select { |rental| rental.check_in_date != nil } + def find_rentals(category) + if category == "current" + selected_rentals = self.rentals.select { |rental| rental.check_in_date == nil } + elsif category == "past" + selected_rentals = self.rentals.select { |rental| rental.check_in_date != nil } + end - past_customer_info = past_rentals.map { |rental| + customer_info = selected_rentals.map { |rental| { customer_id: rental.customer.id, name: rental.customer.name, @@ -53,6 +41,6 @@ def find_past_rentals } } - return past_customer_info + return customer_info end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 51a504c16..0201c4628 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -91,9 +91,9 @@ end end + RENTAL_FIELDS = ["check_out_date", "customer_id", "due_date", "name", "postal_code"] + describe "current" do - CURR_RENT_FIELDS = ["check_out_date", "customer_id", "due_date", "name", "postal_code"] - it "responds with JSON, success, and an array of custom rental hashes" do movie = movies(:star_wars) get current_movie_path(id: movie.id) @@ -104,7 +104,7 @@ body.each do |rental| expect(rental).must_be_instance_of Hash - expect(rental.keys.sort).must_equal CURR_RENT_FIELDS + expect(rental.keys.sort).must_equal RENTAL_FIELDS end end @@ -126,7 +126,44 @@ body = JSON.parse(response.body) - expect(body["errors"]).must_include "No movie assossiated with -1." + expect(body["errors"]).must_include "No movie assossiated with ID -1." + end + end + + describe "history" do + it "responds with JSON, success, and an array of custom rental hashes" do + movie = movies(:star_wars) + get current_movie_path(id: movie.id) + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + + body.each do |rental| + expect(rental).must_be_instance_of Hash + expect(rental.keys.sort).must_equal RENTAL_FIELDS + end + end + + it "responds with JSON, success, and an empty array for a movie with no past check-outs" do + movie = movies(:unpopular) + get current_movie_path(id: movie.id) + + check_response(expected_type: Array) + + body = JSON.parse(response.body) + + expect(body).must_equal [] + end + + it "responds with JSON and not found for an invalid ID" do + get current_movie_path(id: -1) + + check_response(expected_type: Hash, expected_status: :not_found) + + body = JSON.parse(response.body) + + expect(body["errors"]).must_include "No movie assossiated with ID -1." end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 98ec82069..ab93defe7 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -74,68 +74,45 @@ end end - describe "find_curr_rentals" do - CURR_RENT_FIELDS = [:check_out_date, :customer_id, :due_date, :name, :postal_code] + describe "find_rentals" do + RENTAL_FIELDS = [:check_out_date, :customer_id, :due_date, :name, :postal_code] - it "returns an array of customers who have currently checked out a movie" do + it "returns an array of rental info of currently checked-outmovie" do movie = movies(:star_wars) - current_rentals = movie.find_curr_rentals + current_rentals = movie.find_rentals("current") expect(current_rentals).must_be_kind_of Array expect(current_rentals.length).must_equal 3 expect(current_rentals.first).must_be_kind_of Hash - expect(current_rentals.first.keys.sort).must_equal CURR_RENT_FIELDS + expect(current_rentals.first.keys.sort).must_equal RENTAL_FIELDS end it "returns an empty array if no copies of a movie are currently checked out" do movie = movies(:unpopular) - current_customers = movie.find_curr_rentals - - expect(current_customers).must_be_kind_of Array - expect(current_customers.length).must_equal 0 - end - end - - RENTAL_FIELDS = [:check_out_date, :customer_id, :due_date, :name, :postal_code] - - describe "find_curr_rentals" do - it "returns an array of customers who have currently checked out a movie" do - movie = movies(:star_wars) - current_rentals = movie.find_curr_rentals + current_rentals = movie.find_rentals("current") expect(current_rentals).must_be_kind_of Array - expect(current_rentals.length).must_equal 3 - expect(current_rentals.first).must_be_kind_of Hash - expect(current_rentals.first.keys.sort).must_equal CURR_RENT_FIELDS + expect(current_rentals.length).must_equal 0 end - it "returns an empty array if no copies of a movie are currently checked out" do - movie = movies(:unpopular) - current_customers = movie.find_curr_rentals - - expect(current_customers).must_be_kind_of Array - expect(current_customers.length).must_equal 0 - end - end - - describe "find_past_rentals" do - it "returns an array of customers who have currently checked out a movie" do + it "returns an array of rental info of movie check-out in the past" do movie = movies(:star_wars) - current_rentals = movie.find_curr_rentals + current_rentals = movie.find_rentals("past") expect(current_rentals).must_be_kind_of Array - expect(current_rentals.length).must_equal 3 + expect(current_rentals.length).must_equal 2 expect(current_rentals.first).must_be_kind_of Hash - expect(current_rentals.first.keys.sort).must_equal CURR_RENT_FIELDS + expect(current_rentals.first.keys.sort).must_equal RENTAL_FIELDS end - it "returns an empty array if no copies of a movie are currently checked out" do + it "returns an empty array if a movie has never been checked out" do movie = movies(:unpopular) - current_customers = movie.find_curr_rentals + current_rentals = movie.find_rentals("past") - expect(current_customers).must_be_kind_of Array - expect(current_customers.length).must_equal 0 + expect(current_rentals).must_be_kind_of Array + expect(current_rentals.length).must_equal 0 end end + end end From c33eefec575e2b31f5d34527ece53619ee0bc2b8 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Thu, 7 Nov 2019 21:41:50 -0800 Subject: [PATCH 23/24] added controller testing. all tests pass --- test/controllers/movies_controller_test.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 0201c4628..1c9b704c8 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -91,8 +91,6 @@ end end - RENTAL_FIELDS = ["check_out_date", "customer_id", "due_date", "name", "postal_code"] - describe "current" do it "responds with JSON, success, and an array of custom rental hashes" do movie = movies(:star_wars) @@ -104,7 +102,7 @@ body.each do |rental| expect(rental).must_be_instance_of Hash - expect(rental.keys.sort).must_equal RENTAL_FIELDS + expect(rental.keys.sort).must_equal ["check_out_date", "customer_id", "due_date", "name", "postal_code"] end end @@ -141,7 +139,7 @@ body.each do |rental| expect(rental).must_be_instance_of Hash - expect(rental.keys.sort).must_equal RENTAL_FIELDS + expect(rental.keys.sort).must_equal ["check_out_date", "customer_id", "due_date", "name", "postal_code"] end end From 9ca957f7174ba5a12f8cec8a4538f059ac5b2983 Mon Sep 17 00:00:00 2001 From: Tiffany Chio Date: Fri, 8 Nov 2019 13:34:11 -0800 Subject: [PATCH 24/24] merged tests --- app/controllers/customers_controller.rb | 8 -------- config/routes.rb | 2 -- 2 files changed, 10 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 8a1aed3ad..44290734f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,12 +3,4 @@ def index customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) render json: customers, status: :ok end - - def current - - end - - def history - - end end diff --git a/config/routes.rb b/config/routes.rb index b30389d24..247294b97 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,4 @@ get "/rentals/overdue", to: "rentals#overdue", as: "overdue" get "/movies/:id/current", to: "movies#current", as: "current_movie" get "/movies/:id/history", to: "movies#history", as: "movie_history" - get "/customers/:id/current", to: "customers#current", as: "current_cust" - get "/customers/:id/history", to: "customers#history", as: "cust_history" end