From ed6a390a5ceae11c625f22395a782cd9bd8be17d Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 11:39:59 -0700 Subject: [PATCH 01/54] intial rails app created --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 25 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 936 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..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87d307d81 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.17.3 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..8ac019d08 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +tADy721PCCySaTeCzsVKPH81MxT1X06r/z3B35fZBfoG9BJMM3m7QvQqvQDR3xYkcIVryPEpuyypGbv3k2PLPBy8bt/rPaw0CzmsuyVMRCG2QbekyZ77KhzmsSsTY0b35kG4fXgWmZf4r1jqC3NiTbnekVTsRpyqm/E8N8mE/BBjiSimxbioCt7PulxeC7WlhxtaJdV40LuXLYSD90Vaz2N2YLVv+I2k7Ez0IfPxl7M2ZIKAEjGboPlseKH6WRuxZbjNZ4g8oljbYYp1IoC+U8PSyscliXJT5U+5AbXwEH4tYXxC/O5ksWDzQyzWmkhkqZWvF3F8fyZyM3yirDZcIUFETLNcumHRWEgFKwG9e3B1xY1wc7qkcYfFpJzbbSMRjZqciI8FLuRRHJ2Mk/eWlmBR0tKeh2ylbs5o--lp9yLwvkIepbFFbw--qeDIUFxDDCjrEPoYzYyBjw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..fb7dd505e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From ea471d65420924fd94ab574f480e225cea966f00 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 11:57:29 -0700 Subject: [PATCH 02/54] generated movie and customer models --- app/controllers/application_controller.rb | 4 ++ app/models/customer.rb | 2 + app/models/movie.rb | 2 + config/routes.rb | 2 +- db/migrate/20190514185521_create_customers.rb | 15 +++++++ db/migrate/20190514185601_create_movies.rb | 12 ++++++ db/schema.rb | 39 +++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++++ test/fixtures/movies.yml | 13 +++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 11 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20190514185521_create_customers.rb create mode 100644 db/migrate/20190514185601_create_movies.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..9f4875d59 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,6 @@ class ApplicationController < ActionController::API + + def index + render json: { message: "it works!"} + end end 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/config/routes.rb b/config/routes.rb index 787824f88..9240ef45e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + end diff --git a/db/migrate/20190514185521_create_customers.rb b/db/migrate/20190514185521_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514185521_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20190514185601_create_movies.rb b/db/migrate/20190514185601_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514185601_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..50bca2f4d --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_185601) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..70d72b941 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 11:55:21 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 11:55:21 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From 521eed1b29296cb6185d2af11c7d827edcde27dc Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 12:08:33 -0700 Subject: [PATCH 03/54] routes added --- config/routes.rb | 6 ++++++ db/schema.rb | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 db/schema.rb diff --git a/config/routes.rb b/config/routes.rb index 787824f88..500b7a8d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,9 @@ 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] + + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end From 9d424f622677a4b5bc8355e4862f5d13dabf3682 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 12:16:09 -0700 Subject: [PATCH 04/54] added some fixtures to movie --- app/models/movie.rb | 1 + test/fixtures/movies.yml | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..5c71438dc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..43d68fb37 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 - -two: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +movie_one: + title: Karate Kid + overview: Learn's how to become an honorable young man + release_date: 1985-05-14 + inventory: 10 + +movie_two: + title: Love and Basketball + overview: Love and stuff + release_date: 1995-05-11 + inventory: 5 + + From 742642bb32f9812c38da8f5edef8c3c609fa804e Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 12:26:21 -0700 Subject: [PATCH 05/54] added model validation tests for movie --- app/models/movie.rb | 2 +- test/models/movie_test.rb | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 5c71438dc..5a7c47da8 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,3 @@ class Movie < ApplicationRecord - + validates :title, :inventory, presence: true end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..090fcd96c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,7 +3,30 @@ describe Movie do let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? + describe "validations" do + it "won't be valid without title and inventory" do + expect(movie).wont_be :valid? + end + + it "will be valid with title and inventory" do + movie.update_attributes({ title: "Test movie", inventory: 5 }) + + expect(movie).must_be :valid? + end + + it "responds to its fields" do + ["title", "overview", "release_date", "inventory"].each do |field| + expect(movie).must_respond_to field + end + end + end + + describe "relationships" do + it "" do + + end + end + + describe "custom methods" do end end From 1bf1b0885b3c4ca646cc641dad0181dfcce5d0b9 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 12:33:07 -0700 Subject: [PATCH 06/54] validation tests added, but failing --- test/fixtures/customers.yml | 28 +++++++------- test/models/customer_test.rb | 75 +++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 15 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 70d72b941..4f58b06e0 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +jose: + name: Jose registered_at: 2019-05-14 11:55:21 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 1234 W 1st st + city: Boston + state: MA + postal_code: 98234 + phone: 1234567890 -two: - name: MyString +skyler: + name: Skyler registered_at: 2019-05-14 11:55:21 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 543 2nd ave + city: Seattle + state: WA + postal_code: 98105 + phone: 9876543210 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..28c7a4642 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,82 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:jose) } it "must be valid" do value(customer).must_be :valid? end + + it "must have a valid customer" do + valid_customer = customer.valid? + expect(valid_customer).must_equal true + end + + describe "validations" do + it "requires a name" do + customer.name = "" + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :name + expect(customer.errors.messages[:name]).must_equal ["can't be blank"] + end + + it "requires a registered location" do + customer.registered_at = "" + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :registered_at + expect(customer.errors.messages[:registered_at]).must_equal ["can't be blank"] + end + + it "requires a address" do + customer.address = "" + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :address + expect(customer.errors.messages[:address]).must_equal ["can't be blank"] + end + + it "requires a city" do + customer.city = "" + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :city + expect(customer.errors.messages[:city]).must_equal ["can't be blank"] + end + + it "requires a state" do + customer.state = "" + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :state + expect(customer.errors.messages[:state]).must_equal ["can't be blank"] + end + + it "requires a postal code" do + customer.postal_code = "" + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :postal_code + expect(customer.errors.messages[:postal_code]).must_equal ["can't be blank"] + end + + it "requires a phone" do + customer.phone = "" + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :phone + expect(customer.errors.messages[:phone]).must_equal ["can't be blank"] + end + end + + describe "relationships" do + end end From c7b295a360982840488f3cd1ed98096a2005ae75 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 12:37:14 -0700 Subject: [PATCH 07/54] added customer model validations and tests pass --- app/models/customer.rb | 7 +++++++ 1 file changed, 7 insertions(+) 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 From 4199ed621d78091da131abca9c9a825e98092bcb Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 13:29:17 -0700 Subject: [PATCH 08/54] added words to describe block --- test/models/movie_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 090fcd96c..1abc4cb3d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,7 +3,7 @@ describe Movie do let(:movie) { Movie.new } - describe "validations" do + describe "validations and instantiation" do it "won't be valid without title and inventory" do expect(movie).wont_be :valid? end From 3722815229b4269166e867a9f572b2a3c2727786 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 13:38:54 -0700 Subject: [PATCH 09/54] added more tests to movie_test --- test/models/movie_test.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 1abc4cb3d..652036330 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -6,12 +6,21 @@ describe "validations and instantiation" do it "won't be valid without title and inventory" do expect(movie).wont_be :valid? + + # for title + expect(movie.errors.messages).must_include :title + expect(movie.errors.messages[:title]).must_equal ["can't be blank"] + + # for inventory + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_equal ["can't be blank"] end it "will be valid with title and inventory" do movie.update_attributes({ title: "Test movie", inventory: 5 }) expect(movie).must_be :valid? + expect(movie.errors.messages).must_be_empty end it "responds to its fields" do From 88242d211256be11243a57748eedb7f02effeff3 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 14:08:06 -0700 Subject: [PATCH 10/54] generated controller movies --- app/controllers/movies_controller.rb | 2 ++ test/controllers/movies_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 9abc444e0d81fb7b026bcdd9b7cc24dfcc151ffe Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 14:28:07 -0700 Subject: [PATCH 11/54] customer controller tests written and CRUD action wrritten, one test not passing --- app/controllers/application_controller.rb | 4 -- app/controllers/customers_controller.rb | 8 ++++ db/schema.rb | 1 + db/seeds.rb | 4 +- ...Wave_2_smoke_tests.postman_collection.json | 2 +- test/controllers/customers_controller_test.rb | 38 +++++++++++++++++++ 6 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9f4875d59..4ac8823b0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,2 @@ class ApplicationController < ActionController::API - - def index - render json: { message: "it works!"} - end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..d22a5a1dc --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,8 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone]), + # render json: { ok: true, pet: pets.as_json(only: [:id, :name, :age, :human])}, + status: :ok + end +end diff --git a/db/schema.rb b/db/schema.rb index bedb1c24c..50bca2f4d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -35,4 +35,5 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false end + end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..7bf2fbee1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| Movie.create!(movie) end diff --git a/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json b/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json index 2173fda2c..a4fd63e93 100644 --- a/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json +++ b/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json @@ -323,4 +323,4 @@ "response": [] } ] -} \ No newline at end of file +} diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..d00718d50 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,38 @@ +require "test_helper" + +describe CustomersController do + describe "index" do + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the pets" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns pets with exactly the required fields" do + keys = %w(name address registered_at city state postal_code phone) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end +end From 60f17601608dc6508963c9afbc0d8c97d4559ea8 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 14:31:30 -0700 Subject: [PATCH 12/54] all controller tests passing --- app/controllers/customers_controller.rb | 1 - test/controllers/customers_controller_test.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d22a5a1dc..d19c40d1a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,6 @@ class CustomersController < ApplicationController def index customers = Customer.all render json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone]), - # render json: { ok: true, pet: pets.as_json(only: [:id, :name, :age, :human])}, status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d00718d50..34e374bd0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,11 +27,11 @@ end it "returns pets with exactly the required fields" do - keys = %w(name address registered_at city state postal_code phone) + keys = %w(name registered_at address city state postal_code phone) get customers_path body = JSON.parse(response.body) body.each do |customer| - customer.keys.sort.must_equal keys + customer.keys.must_equal keys end end end From d187cf154be94af0ad5c95b36aa97083b8fe94d2 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 14:34:50 -0700 Subject: [PATCH 13/54] removed unrelated references --- test/controllers/customers_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 34e374bd0..9898f3094 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -19,14 +19,14 @@ body.must_be_kind_of Array end - it "returns all of the pets" do + it "returns all of the customers" do get customers_path body = JSON.parse(response.body) body.length.must_equal Customer.count end - it "returns pets with exactly the required fields" do + it "returns customers with exactly the required fields" do keys = %w(name registered_at address city state postal_code phone) get customers_path body = JSON.parse(response.body) From 880fcd14b6a4cb51586b668df6dbf98368930f67 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 14:38:08 -0700 Subject: [PATCH 14/54] added basic tests to movies_controller_tests for index action --- app/controllers/application_controller.rb | 4 -- app/controllers/movies_controller.rb | 11 ++++++ test/controllers/movies_controller_test.rb | 43 ++++++++++++++++++++-- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9f4875d59..4ac8823b0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,2 @@ class ApplicationController < ActionController::API - - def index - render json: { message: "it works!"} - end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..3a621c4df 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,13 @@ class MoviesController < ApplicationController + + def index + movies = Movie.all + render status: :ok, json: movies.as_json(only: [:title, :inventory, :overview, :release_date]) + end + + def movie_params + params.require(movie).permit(:title, :inventory, :overview, :release_date) + end end + + diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..97ac3f881 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,44 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "movies_path is a working end-point" do + get movies_path + + must_respond_with :success + end + + it "responds with json" do + get movies_path + + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Array + end + + it "returns all movies " do + get movies_path + + body = JSON.parse(response.body) + + expect(body.count).must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + get movies_path + + keys = %w(title overview release_date inventory) + movie = movies(:movie_one) + body = JSON.parse(response.body) + + body.each do |movie| + movie.keys.must_equal keys + end + end + end end From f2f45c67a6b4ebd48ff16d5e73183ce6700eb8d7 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 14:40:40 -0700 Subject: [PATCH 15/54] made movie params private --- app/controllers/movies_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3a621c4df..f7e691343 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,6 +5,8 @@ def index render status: :ok, json: movies.as_json(only: [:title, :inventory, :overview, :release_date]) end + private + def movie_params params.require(movie).permit(:title, :inventory, :overview, :release_date) end From b6d69cea3b27ff8a589c3ff50ae7398699b98cce Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 14:41:57 -0700 Subject: [PATCH 16/54] added params --- app/controllers/customers_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d19c40d1a..004356516 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,4 +4,10 @@ def index render json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone]), status: :ok end + + private + + def customer_params + params.require(customer).permit(:name, :address, :registered_at, :city, :state, :postal_code, :phone) + end end From fccb4eaf7df018b9a7710b9b9c8d3bf11b2bd1eb Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 14:44:17 -0700 Subject: [PATCH 17/54] changed order --- app/controllers/movies_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f7e691343..b472a97c7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,11 +2,11 @@ class MoviesController < ApplicationController def index movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :inventory, :overview, :release_date]) + render json: movies.as_json(only: [:title, :inventory, :overview, :release_date]), status: :ok end private - + def movie_params params.require(movie).permit(:title, :inventory, :overview, :release_date) end From 401070eb889533421530f44dd95564336bdd778c Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 14:49:32 -0700 Subject: [PATCH 18/54] added id to render movies json --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b472a97c7..1fd4dcec0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:title, :inventory, :overview, :release_date]), status: :ok + render json: movies.as_json(only: [:id, :title, :inventory, :overview, :release_date]), status: :ok end private diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 97ac3f881..5e8fb7f3a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -41,4 +41,10 @@ end end end + + describe "show" do + it "movie_path renders correctly" do + + end + end end From 904b2772bbed1384a493b389a1f6ac22e6cc326d Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 14:51:14 -0700 Subject: [PATCH 19/54] updated for fields that only need to be returned --- app/controllers/customers_controller.rb | 4 ++-- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 004356516..ffe4cbab0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,13 +1,13 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone]), + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end private def customer_params - params.require(customer).permit(:name, :address, :registered_at, :city, :state, :postal_code, :phone) + params.require(customer).permit(:name, :registered_at, :postal_code, :phone) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9898f3094..aff9a930a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(name registered_at address city state postal_code phone) + keys = %w(id name registered_at postal_code phone) get customers_path body = JSON.parse(response.body) body.each do |customer| From 1e67b8acd844c105654c2b4dab878f4501cfa145 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 14:54:35 -0700 Subject: [PATCH 20/54] add id to test line 35 --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5e8fb7f3a..c09d609de 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,7 +32,7 @@ it "returns movies with exactly the required fields" do get movies_path - keys = %w(title overview release_date inventory) + keys = %w(id title overview release_date inventory) movie = movies(:movie_one) body = JSON.parse(response.body) From 3ecdeedad3f93908eb3aae960117e496b6d300a5 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 15:04:37 -0700 Subject: [PATCH 21/54] added movies checked out count column with a default of 0 --- db/migrate/20190514220013_adding_movies_checked_out.rb | 10 ++++++++++ db/schema.rb | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190514220013_adding_movies_checked_out.rb diff --git a/db/migrate/20190514220013_adding_movies_checked_out.rb b/db/migrate/20190514220013_adding_movies_checked_out.rb new file mode 100644 index 000000000..9fd89da79 --- /dev/null +++ b/db/migrate/20190514220013_adding_movies_checked_out.rb @@ -0,0 +1,10 @@ +class AddingMoviesCheckedOut < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer + + Customer.find_each do |customer| + customer.movies_checked_out_count = 0 + customer.save! + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 50bca2f4d..90a9dd0a0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_185601) do +ActiveRecord::Schema.define(version: 2019_05_14_220013) 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" end create_table "movies", force: :cascade do |t| From 79a6fd3191b74abb7a9915faef0517d347be0e54 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 15:05:11 -0700 Subject: [PATCH 22/54] added available_inventory to Movie --- ...20190514220005_add_available_inventory_to_movies.rb | 10 ++++++++++ db/schema.rb | 3 ++- db/seeds.rb | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190514220005_add_available_inventory_to_movies.rb diff --git a/db/migrate/20190514220005_add_available_inventory_to_movies.rb b/db/migrate/20190514220005_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..9d2688f4e --- /dev/null +++ b/db/migrate/20190514220005_add_available_inventory_to_movies.rb @@ -0,0 +1,10 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + + Movie.find_each do |movie| + movie.available_inventory = movie.inventory + movie.save! + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 50bca2f4d..d131b446c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_185601) do +ActiveRecord::Schema.define(version: 2019_05_14_220005) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end end diff --git a/db/seeds.rb b/db/seeds.rb index 7bf2fbee1..d2ad36143 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,8 @@ JSON.parse(File.read("db/seeds/movies.json")).each do |movie| Movie.create!(movie) end + +# Movie.find_each do |movie| +# movie.available_inventory = movie.inventory +# movie.save +# end From 6cbfd75efea95bc47ddda0129653715352629551 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 15:10:45 -0700 Subject: [PATCH 23/54] updated what is returned in JSON to include movie count --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ffe4cbab0..b1b50dbfd 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index aff9a930a..9786a4802 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name registered_at postal_code phone) + keys = %w(id name registered_at postal_code phone movies_checked_out_count) get customers_path body = JSON.parse(response.body) body.each do |customer| From 9c51322da306fec348b615003d377b82733c997c Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 15:10:48 -0700 Subject: [PATCH 24/54] adding available_inventory to test and controller --- app/controllers/movies_controller.rb | 6 +++++- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1fd4dcec0..75d05ede7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,8 +2,12 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:id, :title, :inventory, :overview, :release_date]), status: :ok + render json: movies.as_json(only: [:available_inventory :id, :title, :inventory, :overview, :release_date]), status: :ok end + + # def show + + # end private diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c09d609de..291a3df5a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,7 +32,7 @@ it "returns movies with exactly the required fields" do get movies_path - keys = %w(id title overview release_date inventory) + keys = %w(available_inventory id title overview release_date inventory) movie = movies(:movie_one) body = JSON.parse(response.body) From 1fc4889909af0823f62d8beca975f5261cb6e472 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 15:33:01 -0700 Subject: [PATCH 25/54] wrote tests for movie#show --- app/controllers/movies_controller.rb | 12 +++++++++--- test/controllers/movies_controller_test.rb | 18 ++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 75d05ede7..e343a755c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,12 +2,18 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:available_inventory :id, :title, :inventory, :overview, :release_date]), status: :ok + render json: movies.as_json(only: [:available_inventory, :id, :title, :inventory, :overview, :release_date]), status: :ok end - # def show + def show + movie = Movie.find_by(id: params[:id]) - # end + if movie + render json: movie.as_json(only: [:available_inventory, :id, :title, :inventory, :overview, :release_date]), status: :ok + else + render json: { errors: ["The movie with id #{params[:id]} could not be found"] }, status: :not_found + end + end private diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 291a3df5a..4e18063aa 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,19 +32,33 @@ it "returns movies with exactly the required fields" do get movies_path - keys = %w(available_inventory id title overview release_date inventory) + keys = %w(available_inventory id inventory overview release_date title) movie = movies(:movie_one) body = JSON.parse(response.body) body.each do |movie| - movie.keys.must_equal keys + movie.keys.sort.must_equal keys end end end describe "show" do + let(:a_movie) { movies(:movie_one) } it "movie_path renders correctly" do + get movie_path(a_movie) + body = JSON.parse(response.body) + + must_respond_with :success + expect(body["id"]).must_equal a_movie.id + expect(body["title"]).must_equal a_movie.title + end + + it "responds with 404 with nonexistant id" do + movie_id = Movie.last.id + 1 + get movie_path(movie_id) + must_respond_with :not_found + expect(JSON.parse(response.body)).must_equal "errors"=>["The movie with id 624739302 could not be found"] end end end From 227daf1ae2de797d323e67fe5ae855a062d22616 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 15:56:50 -0700 Subject: [PATCH 26/54] cleaned up show test --- test/controllers/movies_controller_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 4e18063aa..897017f6f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,9 +56,10 @@ it "responds with 404 with nonexistant id" do movie_id = Movie.last.id + 1 get movie_path(movie_id) + body = JSON.parse(response.body) must_respond_with :not_found - expect(JSON.parse(response.body)).must_equal "errors"=>["The movie with id 624739302 could not be found"] + expect(body["errors"]).must_equal ["The movie with id 624739302 could not be found"] end end end From 0370a7d847ef056c4179aaec0a7e7912ca3ebcda Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 15:58:10 -0700 Subject: [PATCH 27/54] changed id literal to variable --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 897017f6f..76655eab8 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -59,7 +59,7 @@ body = JSON.parse(response.body) must_respond_with :not_found - expect(body["errors"]).must_equal ["The movie with id 624739302 could not be found"] + expect(body["errors"]).must_equal ["The movie with id #{movie_id} could not be found"] end end end From 5db714bdabef4699c1beab4d6eeda1f95f50bc2c Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 16:00:13 -0700 Subject: [PATCH 28/54] movie create tests and code --- app/controllers/movies_controller.rb | 21 +++++--- test/controllers/movies_controller_test.rb | 58 +++++++++++++++++++--- 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f7e691343..f06fb610b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,15 +1,24 @@ class MoviesController < ApplicationController - def index movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :inventory, :overview, :release_date]) + render status: :ok, json: movies.as_json(only: [:id, :title, :inventory, :overview, :release_date]) + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id]), + status: :ok + else + render json: { ok: false, errors: ["Movie could not be saved"] }, + status: :bad_request + end end private - + def movie_params - params.require(movie).permit(:title, :inventory, :overview, :release_date) + params.require(:movie).permit(:title, :inventory, :overview, :release_date) end end - - diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 97ac3f881..abbf19991 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,27 +1,28 @@ require "test_helper" +require "pry" describe MoviesController do - describe "index" do - it "movies_path is a working end-point" do + describe "index" do + it "movies_path is a working end-point" do get movies_path must_respond_with :success end - it "responds with json" do + it "responds with json" do get movies_path expect(response.header["Content-Type"]).must_include "json" end - it "returns an Array" do + it "returns an Array" do get movies_path body = JSON.parse(response.body) expect(body).must_be_kind_of Array - end + end - it "returns all movies " do + it "returns all movies " do get movies_path body = JSON.parse(response.body) @@ -29,10 +30,10 @@ expect(body.count).must_equal Movie.count end - it "returns movies with exactly the required fields" do + it "returns movies with exactly the required fields" do get movies_path - keys = %w(title overview release_date inventory) + keys = %w(id title overview release_date inventory) movie = movies(:movie_one) body = JSON.parse(response.body) @@ -41,4 +42,45 @@ end end end + + describe "create" do + let(:movie_data) { + { + title: "Avengers: Endgame", + overview: "Spoilers!", + release_date: Date.parse("2019-04-26"), + inventory: 7, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: { movie: movie_data } + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid movie data" do + movie_data["title"] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_equal ["Movie could not be saved"] + must_respond_with :bad_request + end + end end From 9006772fd8a8ca2376f4ed539134b28d9b341b8c Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 16:26:21 -0700 Subject: [PATCH 29/54] making sure to not lose info --- app/controllers/movies_controller.rb | 1 + test/controllers/movies_controller_test.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f06fb610b..c605ea93c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,6 +6,7 @@ def index def create movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory if movie.save render json: movie.as_json(only: [:id]), diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index abbf19991..e28532e66 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -65,6 +65,7 @@ movie = Movie.find(body["id"].to_i) expect(movie.title).must_equal movie_data[:title] + expect(movie.available_inventory).must_equal movie_data[:inventory] must_respond_with :success end From 96e5db0a630540e7679ff32ebd056ef6e1a58204 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Tue, 14 May 2019 16:36:11 -0700 Subject: [PATCH 30/54] remove ok false --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 10ea894e2..029ad5bd2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,7 +12,7 @@ def create render json: movie.as_json(only: [:id]), status: :ok else - render json: { ok: false, errors: ["Movie could not be saved"] }, + render json: { errors: ["Movie could not be saved"] }, status: :bad_request end end From 266eb41eeb3633e4d05133f80fdc5cee246a2cac Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Tue, 14 May 2019 16:42:06 -0700 Subject: [PATCH 31/54] migrate customer checkout --- db/schema.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 90ab6bfa8..de1c62f9d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,8 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_220005) do - +ActiveRecord::Schema.define(version: 2019_05_14_220013) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 3321de91e719993879a8a8e18f3a10ba7fffc249 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 12:48:11 -0700 Subject: [PATCH 32/54] fixed smoke tests, removed movie hash from params --- app/controllers/movies_controller.rb | 4 ++-- test/controllers/movies_controller_test.rb | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 029ad5bd2..ba805ae10 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def create movie.available_inventory = movie.inventory if movie.save - render json: movie.as_json(only: [:id]), + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else render json: { errors: ["Movie could not be saved"] }, @@ -30,6 +30,6 @@ def show private def movie_params - params.require(:movie).permit(:title, :inventory, :overview, :release_date) + params.permit(:title, :inventory, :overview, :release_date) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 9a7fde884..84ccc9fe4 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -55,12 +55,17 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include "id" + expect(body).must_include "title" + expect(body).must_include "overview" + expect(body).must_include "release_date" + expect(body).must_include "inventory" + expect(body).must_include "available_inventory" movie = Movie.find(body["id"].to_i) From a8b144b7df571183b182efc457a01068a6e946ed Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 13:03:20 -0700 Subject: [PATCH 33/54] simplified tests --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ba805ae10..019717264 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def create movie.available_inventory = movie.inventory if movie.save - render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]), + render json: movie.as_json(only: [:id]), status: :ok else render json: { errors: ["Movie could not be saved"] }, diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 84ccc9fe4..2cd568f05 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -61,11 +61,6 @@ body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include "id" - expect(body).must_include "title" - expect(body).must_include "overview" - expect(body).must_include "release_date" - expect(body).must_include "inventory" - expect(body).must_include "available_inventory" movie = Movie.find(body["id"].to_i) From a6553a4179dd6d2b28c7c9f7cd45cfa64f3f335b Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 13:25:34 -0700 Subject: [PATCH 34/54] updated checkin route --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 500b7a8d2..8dbe00e04 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,5 +5,5 @@ resources :movies, only: [:index, :show, :create] post "/rentals/check-out", to: "rentals#checkout", as: "checkout" - post "/rentals/check-in", to: "rentals#checkin", as: "checkin" + patch "/rentals/check-in", to: "rentals#checkin", as: "checkin" end From fe3031486477ca9952604d70f036fdf4eb09c9bd Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 13:40:02 -0700 Subject: [PATCH 35/54] created rental model and controller --- app/controllers/rentals_controller.rb | 2 ++ app/models/rental.rb | 4 ++++ db/migrate/20190515203444_create_rentals.rb | 13 +++++++++++++ db/schema.rb | 16 +++++++++++++++- test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 15 +++++++++++++++ test/models/rental_test.rb | 9 +++++++++ 7 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190515203444_create_rentals.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20190515203444_create_rentals.rb b/db/migrate/20190515203444_create_rentals.rb new file mode 100644 index 000000000..04ee53c17 --- /dev/null +++ b/db/migrate/20190515203444_create_rentals.rb @@ -0,0 +1,13 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.references :movie, foreign_key: true + t.references :customer, foreign_key: true + t.date :checkout_date + t.date :due_date + t.boolean :available, default: false + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index de1c62f9d..c8de5266f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_220013) do +ActiveRecord::Schema.define(version: 2019_05_15_203444) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,4 +38,18 @@ t.integer "available_inventory" end + create_table "rentals", force: :cascade do |t| + t.bigint "movie_id" + t.bigint "customer_id" + t.date "checkout_date" + t.date "due_date" + t.boolean "available", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + 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 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..6f745877a --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + movie: one + customer: one + checkout_date: 2019-05-15 + due_date: 2019-05-15 + available: false + +two: + movie: two + customer: two + checkout_date: 2019-05-15 + due_date: 2019-05-15 + available: false diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From a754d295ff679e87e7a5df5bf7c8dbe465ffb187 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 13:44:53 -0700 Subject: [PATCH 36/54] removed movie key from test --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2cd568f05..83101f33b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -73,7 +73,7 @@ movie_data["title"] = nil expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.wont_change "Movie.count" body = JSON.parse(response.body) From 07f1078dab87d910a95f337b5f4c44c1188af62a Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Wed, 15 May 2019 13:45:00 -0700 Subject: [PATCH 37/54] DRY up line 58 --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2cd568f05..83101f33b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -73,7 +73,7 @@ movie_data["title"] = nil expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.wont_change "Movie.count" body = JSON.parse(response.body) From 9d8a1ead30b21951f2c73758e6d8d369ab267af2 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 13:56:46 -0700 Subject: [PATCH 38/54] fixed rental model test --- test/fixtures/rentals.yml | 8 ++++---- test/models/rental_test.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 6f745877a..bd98002e1 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - movie: one - customer: one + movie: movie_one + customer: jose checkout_date: 2019-05-15 due_date: 2019-05-15 available: false two: - movie: two - customer: two + movie: movie_two + customer: skyler checkout_date: 2019-05-15 due_date: 2019-05-15 available: false diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..de2006e9d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:one) } it "must be valid" do value(rental).must_be :valid? From fd094e189078f5b5b21ba99b33d29167536a3065 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Wed, 15 May 2019 14:00:18 -0700 Subject: [PATCH 39/54] test stubs for check out --- test/controllers/rentals_controller_test.rb | 33 +++++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..1e2f3916d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkout" do + # nominal success cases + it "when checked out it adds a rental record to the rental table" do + + end + + it "when checked out changes available to false" do + + end + + it "when checked out decreases inventory by one" do + + end + + # nominal failure cases + it "will not checkout a movie when all are unavailable" do + + end + + # edge failure + it "will not check out a non existant (bogus) movie" do + + end + + # edge success + it "will allow a movie to be checked out on the same day it is checked back in" do + # check out movie, check back in and then check out again. + end + + end end From a8f6e3fa9b37a6e1c055435d137d916d764389e6 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Wed, 15 May 2019 14:14:17 -0700 Subject: [PATCH 40/54] added rental_params --- app/controllers/rentals_controller.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..0b2072dde 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,9 @@ class RentalsController < ApplicationController + + + private + + def rental_params + params.permit(:movie_id:, :customer_id) + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1e2f3916d..127529d22 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,7 +4,7 @@ describe "checkout" do # nominal success cases it "when checked out it adds a rental record to the rental table" do - + post checkout_path(movies(:movie_one)) end it "when checked out changes available to false" do From 72e820950bc76273a3f41c1a369c8d4f5ffc450f Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 14:21:24 -0700 Subject: [PATCH 41/54] contoller test shells --- test/controllers/rentals_controller_test.rb | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..0e61b206f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,20 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkin" do + it "can checkin a movie if inventory is greater than available inventory" do + end + + it "will increase the available inventory when a movie is checked in" do + end + + it "can't checkin a movie if inventory equals available inventory" do + end + + it "can't checkin a non existent movie" do + end + + # it "can only checkin a movie that specific customer checked out" do + # end + end end From c82c90369a27a2c0f9cf7713b10f72173817826e Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Wed, 15 May 2019 14:25:59 -0700 Subject: [PATCH 42/54] added checkout method stub --- app/controllers/rentals_controller.rb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 0b2072dde..5b56b11ed 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,24 @@ class RentalsController < ApplicationController + def checkout + # rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id]) + # movie = Movie.find_by(id: params[:movie_id]) + + # rental.checkout_date = Date.today + # rental.due_date = rental.checkout_date + 7 + + # if rental.save + # movie.update_attributes({inventory: movie.inventory - 1}) + # render json: movie.as_json(only: [:id]), + # status: :ok + # else + # render json: {} + # end + end private def rental_params - params.permit(:movie_id:, :customer_id) + params.permit(:movie_id, :customer_id) end end From 8599a883562fc831322a78b538f1d711b359d2bc Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Wed, 15 May 2019 15:26:21 -0700 Subject: [PATCH 43/54] test001 green --- app/controllers/rentals_controller.rb | 30 ++++++++++++--------- app/models/movie.rb | 12 +++++++++ test/controllers/rentals_controller_test.rb | 23 ++++++++++++++-- test/fixtures/movies.yml | 2 ++ 4 files changed, 53 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5b56b11ed..63b9e3343 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,19 +1,25 @@ +require 'pry' class RentalsController < ApplicationController def checkout - # rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id]) - # movie = Movie.find_by(id: params[:movie_id]) + rental = Rental.new(rental_params) + movie = Movie.find_by(id: params[:movie_id]) - # rental.checkout_date = Date.today - # rental.due_date = rental.checkout_date + 7 - - # if rental.save - # movie.update_attributes({inventory: movie.inventory - 1}) - # render json: movie.as_json(only: [:id]), - # status: :ok - # else - # render json: {} - # end + rental.checkout_date = Date.today + rental.due_date = rental.checkout_date + 7 + + if movie.reduce_avail_inventory + if rental.save + render json: rental.as_json(only: [:id, :movie_id, :customer_id, :due_date]), + status: :ok + else + render json: { errors: [rental.errors.messages] }, + status: :bad_request + end + else + render json: { errors: [movie.errors.messages] }, + status: :bad_request + end end private diff --git a/app/models/movie.rb b/app/models/movie.rb index 5a7c47da8..f808cfbef 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,15 @@ class Movie < ApplicationRecord validates :title, :inventory, presence: true + validates :available_inventory, numericality: { greater_than: -1 } + + def reduce_avail_inventory + amount = self.available_inventory + + if amount != 0 + self.available_inventory = amount - 1 + return self.save! + else + return false + end + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 127529d22..cae47ccab 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,9 +2,28 @@ describe RentalsController do describe "checkout" do - # nominal success cases + let(:rental_data) { + rental_data = { + movie_id: movies(:movie_one).id, + customer_id: customers(:jose).id + } + } + it "when checked out it adds a rental record to the rental table" do - post checkout_path(movies(:movie_one)) + movie = movies(:movie_one) + before_inventory = movie.available_inventory + + expect{ + post checkout_path, params: rental_data + }.must_change "Rental.count", +1 + movie.reload + + current_inventory = movie.available_inventory + body = JSON.parse(response.body) + + must_respond_with :ok + expect(current_inventory).must_equal before_inventory - 1 + expect(body.keys).must_equal %w(id movie_id customer_id due_date) end it "when checked out changes available to false" do diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 43d68fb37..be5c6cfdd 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,11 +5,13 @@ movie_one: overview: Learn's how to become an honorable young man release_date: 1985-05-14 inventory: 10 + available_inventory: 10 movie_two: title: Love and Basketball overview: Love and stuff release_date: 1995-05-11 inventory: 5 + available_inventory: 5 From e1a3de5f3cdc4789a99e21d1408560266fb0c8f0 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Wed, 15 May 2019 15:41:52 -0700 Subject: [PATCH 44/54] wrote test for nominal failure case --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 40 ++++++++++++++------- test/fixtures/movies.yml | 6 ++++ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 63b9e3343..b191faac0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,7 +17,7 @@ def checkout status: :bad_request end else - render json: { errors: [movie.errors.messages] }, + render json: { errors: ["Cannot create rental due to insufficient inventory"] }, status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index cae47ccab..e7f1d7399 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -10,43 +10,57 @@ } it "when checked out it adds a rental record to the rental table" do - movie = movies(:movie_one) - before_inventory = movie.available_inventory - + expect{ post checkout_path, params: rental_data }.must_change "Rental.count", +1 - movie.reload - - current_inventory = movie.available_inventory + body = JSON.parse(response.body) must_respond_with :ok - expect(current_inventory).must_equal before_inventory - 1 + expect(response.header["Content-Type"]).must_include "json" expect(body.keys).must_equal %w(id movie_id customer_id due_date) end - it "when checked out changes available to false" do + # it "when checked out changes available to false" do - end + # end it "when checked out decreases inventory by one" do - + movie = movies(:movie_one) + before_inventory = movie.available_inventory + + post checkout_path, params: rental_data + movie.reload + + current_inventory = movie.available_inventory + expect(current_inventory).must_equal before_inventory - 1 end # nominal failure cases it "will not checkout a movie when all are unavailable" do - + cant_rent_data = { + movie_id: movies(:unavailable_movie).id, + customer_id: customers(:jose).id + } + expect{ + post checkout_path, params: cant_rent_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_include "errors" + expect(body["errors"]).must_include "Cannot create rental due to insufficient inventory" + end # edge failure it "will not check out a non existant (bogus) movie" do - + skip end # edge success it "will allow a movie to be checked out on the same day it is checked back in" do - # check out movie, check back in and then check out again. + skip # check out movie, check back in and then check out again. end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index be5c6cfdd..70ffc1d95 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -13,5 +13,11 @@ movie_two: release_date: 1995-05-11 inventory: 5 available_inventory: 5 +unavailable_movie: + title: All Checked Out + overview: You can't rent me + release_date: 2019-05-10 + inventory: 2 + available_inventory: 0 From 60ca72fa38a1cef4dcb618d53b6ffcc65af883eb Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 15:54:46 -0700 Subject: [PATCH 45/54] customer model method and test --- app/models/movie.rb | 9 +++++++++ test/fixtures/movies.yml | 2 ++ test/models/movie_test.rb | 29 ++++++++++++++++++++--------- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 5a7c47da8..24b3d92c0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,12 @@ class Movie < ApplicationRecord validates :title, :inventory, presence: true + + def increase_available_inventory + original_amount = self.available_inventory + + if self.inventory > original_amount + self.available_inventory += 1 + return self.save! + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 43d68fb37..6a4be797d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,11 +5,13 @@ movie_one: overview: Learn's how to become an honorable young man release_date: 1985-05-14 inventory: 10 + available_inventory: 10 movie_two: title: Love and Basketball overview: Love and stuff release_date: 1995-05-11 inventory: 5 + available_inventory: 4 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 652036330..a50e72918 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,39 +3,50 @@ describe Movie do let(:movie) { Movie.new } - describe "validations and instantiation" do + describe "validations and instantiation" do it "won't be valid without title and inventory" do expect(movie).wont_be :valid? # for title expect(movie.errors.messages).must_include :title expect(movie.errors.messages[:title]).must_equal ["can't be blank"] - + # for inventory expect(movie.errors.messages).must_include :inventory expect(movie.errors.messages[:inventory]).must_equal ["can't be blank"] end - it "will be valid with title and inventory" do + it "will be valid with title and inventory" do movie.update_attributes({ title: "Test movie", inventory: 5 }) expect(movie).must_be :valid? expect(movie.errors.messages).must_be_empty end - it "responds to its fields" do + it "responds to its fields" do ["title", "overview", "release_date", "inventory"].each do |field| expect(movie).must_respond_to field end end end - describe "relationships" do - it "" do - + describe "relationships" do + it "" do end end - - describe "custom methods" do + + describe "custom methods" do + let(:movie) { movies(:movie_two) } + + it "will increase the available inventory when a movie is checked in" do + amount = movie.available_inventory + movie.increase_available_inventory + + movie.reload + + new_amount = movie.available_inventory + + expect(new_amount).must_equal amount + 1 + end end end From 6432e846bf10a39046e600d19091a6692871db35 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Wed, 15 May 2019 15:58:20 -0700 Subject: [PATCH 46/54] wrote tests for bad movie_id and customer_id --- app/controllers/rentals_controller.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 26 +++++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b191faac0..fdc27a868 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,7 @@ def checkout rental.checkout_date = Date.today rental.due_date = rental.checkout_date + 7 - if movie.reduce_avail_inventory + if movie && movie.reduce_avail_inventory if rental.save render json: rental.as_json(only: [:id, :movie_id, :customer_id, :due_date]), status: :ok @@ -17,7 +17,7 @@ def checkout status: :bad_request end else - render json: { errors: ["Cannot create rental due to insufficient inventory"] }, + render json: { errors: ["Could not create rental request"] }, status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e7f1d7399..569a97859 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -49,13 +49,35 @@ body = JSON.parse(response.body) expect(body).must_include "errors" - expect(body["errors"]).must_include "Cannot create rental due to insufficient inventory" + expect(body["errors"]).must_include "Could not create rental request" end # edge failure it "will not check out a non existant (bogus) movie" do - skip + rental_no_movie = { + movie_id: -1, + customer_id: customers(:jose).id + } + + expect{ + post checkout_path, params: rental_no_movie + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_include "errors" + expect(body["errors"]).must_include "Could not create rental request" + + end + + it "will not check out a non existant (bogus) customer" do + rental_no_customer = { movie_id: movies(:unavailable_movie).id, + customer_id: -1 + } + + expect{ + post checkout_path, params: rental_no_customer + }.wont_change "Rental.count" end # edge success From 5765bd526b7dbc202841fb14caef5fa031003f00 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 15:58:41 -0700 Subject: [PATCH 47/54] negative test for custom method --- test/fixtures/movies.yml | 1 + test/models/movie_test.rb | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 6a4be797d..e897cc207 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -15,3 +15,4 @@ movie_two: available_inventory: 4 + diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a50e72918..ba4e21077 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -37,6 +37,7 @@ describe "custom methods" do let(:movie) { movies(:movie_two) } + let(:movie1) { movies (:movie_one) } it "will increase the available inventory when a movie is checked in" do amount = movie.available_inventory @@ -48,5 +49,16 @@ expect(new_amount).must_equal amount + 1 end + + it "will not increase the available inventory when the movie is not currently checked out" do + amount = movie1.available_inventory + movie1.increase_available_inventory + + movie1.reload + + new_amount = movie1.available_inventory + + expect(new_amount).must_equal amount + end end end From d6111fb6d4cdb98caaf7c119f209478f9236828a Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 23:42:40 -0700 Subject: [PATCH 48/54] checkin tests and code --- app/controllers/rentals_controller.rb | 13 ++++++--- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 29 +++++++++++++++++---- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 0b2072dde..6fef32a46 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,16 @@ class RentalsController < ApplicationController - - + def checkin + movie = Movie.find_by(id: params[:movie_id]) + if movie.increase_available_inventory + render json: movie.as_json(only: [:available_inventory]), status: :ok + else + render json: { errors: ["The movie with id #{params[:id]} already have full inventory"] }, status: :not_found + end + end + private def rental_params - params.permit(:movie_id:, :customer_id) + params.permit(:movie_id, :customer_id) end end diff --git a/config/routes.rb b/config/routes.rb index 8dbe00e04..500b7a8d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,5 +5,5 @@ resources :movies, only: [:index, :show, :create] post "/rentals/check-out", to: "rentals#checkout", as: "checkout" - patch "/rentals/check-in", to: "rentals#checkin", as: "checkin" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0eeeb199b..34fe22a0c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -28,19 +28,38 @@ end describe "checkin" do + let(:customer1) { customers(:skyler) } + let(:movie1) { movies(:movie_two) } + let(:rental_data1) { + { + movie_id: movie1.id, + customer_id: customer1.id, + } + } + + let(:customer2) { customers(:jose) } + let(:movie2) { movies(:movie_one) } + let(:rental_data2) { + { + movie_id: movie2.id, + customer_id: customer2.id, + } + } + it "can checkin a movie if inventory is greater than available inventory" do - end + post checkin_path, params: rental_data1 - it "will increase the available inventory when a movie is checked in" do + must_respond_with :success end it "can't checkin a movie if inventory equals available inventory" do + post checkin_path, params: rental_data2 + + must_respond_with :not_found end it "can't checkin a non existent movie" do + skip end - - # it "can only checkin a movie that specific customer checked out" do - # end end end From c3ce7c57f3fd2b782e8585d196f8f88948c027a9 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Wed, 15 May 2019 23:52:32 -0700 Subject: [PATCH 49/54] passing controller edge case for checkin --- app/controllers/rentals_controller.rb | 7 +++++-- app/models/movie.rb | 2 ++ test/controllers/rentals_controller_test.rb | 13 +++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6fef32a46..aba76269d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,10 +1,13 @@ class RentalsController < ApplicationController def checkin movie = Movie.find_by(id: params[:movie_id]) - if movie.increase_available_inventory + + if movie.nil? + render json: { errors: ["The movie with id #{params[:id]} could not be found"] }, status: :not_found + elsif movie.increase_available_inventory render json: movie.as_json(only: [:available_inventory]), status: :ok else - render json: { errors: ["The movie with id #{params[:id]} already have full inventory"] }, status: :not_found + render json: { errors: ["The movie with id #{params[:id]} already have full inventory"] }, status: :bad_request end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 24b3d92c0..0f371addc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,6 +2,8 @@ class Movie < ApplicationRecord validates :title, :inventory, presence: true def increase_available_inventory + #return false if Movie.find_by(self.id) == nil + original_amount = self.available_inventory if self.inventory > original_amount diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 34fe22a0c..fc26c6f43 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -46,6 +46,13 @@ } } + let(:rental_data3) { + { + movie_id: "dog", + customer_id: customer2.id, + } + } + it "can checkin a movie if inventory is greater than available inventory" do post checkin_path, params: rental_data1 @@ -55,11 +62,13 @@ it "can't checkin a movie if inventory equals available inventory" do post checkin_path, params: rental_data2 - must_respond_with :not_found + must_respond_with :bad_request end it "can't checkin a non existent movie" do - skip + post checkin_path, params: rental_data3 + + must_respond_with :not_found end end end From 03ab29b8ceed0f7e0703485f7f37624768bde5c9 Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Thu, 16 May 2019 09:26:25 -0700 Subject: [PATCH 50/54] all tests for checkin passing --- app/models/movie.rb | 2 -- test/controllers/rentals_controller_test.rb | 6 ++++ test/models/movie_test.rb | 32 +++++++++++---------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0f371addc..24b3d92c0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,8 +2,6 @@ class Movie < ApplicationRecord validates :title, :inventory, presence: true def increase_available_inventory - #return false if Movie.find_by(self.id) == nil - original_amount = self.available_inventory if self.inventory > original_amount diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index fc26c6f43..071b3cf1e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -59,6 +59,12 @@ must_respond_with :success end + # it "will increase availalbe inventory if a valid checkin" do + # checked_in = post checkin_path, params: rental_data1 + + # expect(Movie.find_by(checked_in.movie_id).available_inventory).must_change 1 + # end + it "can't checkin a movie if inventory equals available inventory" do post checkin_path, params: rental_data2 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ba4e21077..5ee602594 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -36,29 +36,31 @@ end describe "custom methods" do - let(:movie) { movies(:movie_two) } - let(:movie1) { movies (:movie_one) } + describe "checkin" do + let(:movie) { movies(:movie_two) } + let(:movie1) { movies (:movie_one) } - it "will increase the available inventory when a movie is checked in" do - amount = movie.available_inventory - movie.increase_available_inventory + it "will increase the available inventory when a movie is checked in" do + amount = movie.available_inventory + movie.increase_available_inventory - movie.reload + movie.reload - new_amount = movie.available_inventory + new_amount = movie.available_inventory - expect(new_amount).must_equal amount + 1 - end + expect(new_amount).must_equal amount + 1 + end - it "will not increase the available inventory when the movie is not currently checked out" do - amount = movie1.available_inventory - movie1.increase_available_inventory + it "will not increase the available inventory when the movie is not currently checked out" do + amount = movie1.available_inventory + movie1.increase_available_inventory - movie1.reload + movie1.reload - new_amount = movie1.available_inventory + new_amount = movie1.available_inventory - expect(new_amount).must_equal amount + expect(new_amount).must_equal amount + end end end end From 1a11ef0e67d6c9cac541e29d56083c0db329e671 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Thu, 16 May 2019 09:32:37 -0700 Subject: [PATCH 51/54] working on edge success test for checking out on same day something is checked in --- test/controllers/rentals_controller_test.rb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 569a97859..7d1da900f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -67,7 +67,6 @@ body = JSON.parse(response.body) expect(body).must_include "errors" expect(body["errors"]).must_include "Could not create rental request" - end it "will not check out a non existant (bogus) customer" do @@ -78,12 +77,22 @@ expect{ post checkout_path, params: rental_no_customer }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_include "errors" + expect(body["errors"]).must_include "Could not create rental request" end # edge success - it "will allow a movie to be checked out on the same day it is checked back in" do - skip # check out movie, check back in and then check out again. - end + # it "will allow a movie to be checked out on the same day it is checked back in" do + # skip + # post checkout_path, params: rental_data + # # must be same movie + # patch checkin_path, params: checkin_data + # post checkout_path, params: rental_data + + # must_respond_with :success + # end end end From 6e2c452696be78b5b02ba26408344226bb583e7c Mon Sep 17 00:00:00 2001 From: Amy Wyatt Date: Thu, 16 May 2019 09:48:34 -0700 Subject: [PATCH 52/54] added inventory check to controller tests for checkin --- test/controllers/rentals_controller_test.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 071b3cf1e..ddcc1d106 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -54,19 +54,17 @@ } it "can checkin a movie if inventory is greater than available inventory" do - post checkin_path, params: rental_data1 + expect { + post checkin_path, params: rental_data1 + }.must_change "Movie.find(rental_data1[:movie_id]).available_inventory", +1 must_respond_with :success end - # it "will increase availalbe inventory if a valid checkin" do - # checked_in = post checkin_path, params: rental_data1 - - # expect(Movie.find_by(checked_in.movie_id).available_inventory).must_change 1 - # end - it "can't checkin a movie if inventory equals available inventory" do - post checkin_path, params: rental_data2 + expect { + post checkin_path, params: rental_data2 + }.wont_change "Movie.find(rental_data1[:movie_id]).available_inventory" must_respond_with :bad_request end From 2a275208b47a41f67bcf395edcb04ff397614c87 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Thu, 16 May 2019 09:55:07 -0700 Subject: [PATCH 53/54] added model custom method tests --- test/models/movie_test.rb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f00a78323..dcf37b36b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -62,5 +62,33 @@ expect(new_amount).must_equal amount end end + + describe "reduce avail inventory" do + let(:karate_movie) { movies(:movie_one) } + + it "when a movie is checked out will reduce available_inventory by 1" do + current_count = karate_movie.available_inventory + + karate_movie.reduce_avail_inventory + karate_movie.reload + expect(karate_movie.available_inventory).must_equal current_count - 1 + end + + it "returns false if no available inventory to checkout" do + 10.times do + karate_movie.reduce_avail_inventory + end + current_count = karate_movie.available_inventory + expect(current_count).must_equal 0 + + expect{ + karate_movie.reduce_avail_inventory + }.wont_change "karate_movie.available_inventory" + + result = karate_movie.reduce_avail_inventory + + expect(result).must_equal false + end + end end end From 03f7e61384c8712613e72982d60e4ae65f98f223 Mon Sep 17 00:00:00 2001 From: Tatiana Quintana Date: Thu, 16 May 2019 10:23:29 -0700 Subject: [PATCH 54/54] cleaned up some controller tests --- app/models/movie.rb | 2 +- test/controllers/rentals_controller_test.rb | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index d89b54d24..f35125a4a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,7 +6,7 @@ def reduce_avail_inventory amount = self.available_inventory if amount != 0 - self.available_inventory = amount - 1 + self.available_inventory -= 1 return self.save! else return false diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a46e06202..132b51c39 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -23,18 +23,16 @@ end it "when checked out decreases inventory by one" do - movie = movies(:movie_one) - before_inventory = movie.available_inventory - - post checkout_path, params: rental_data - movie.reload + + expect { + post checkout_path, params: rental_data + }.must_change "Movie.find(rental_data[:movie_id]).available_inventory", -1 - current_inventory = movie.available_inventory - expect(current_inventory).must_equal before_inventory - 1 + must_respond_with :success end # nominal failure cases - it "will not checkout a movie when all are unavailable" do + it "will not checkout a movie with 0 available inventory" do cant_rent_data = { movie_id: movies(:unavailable_movie).id, customer_id: customers(:jose).id @@ -47,6 +45,11 @@ expect(body).must_include "errors" expect(body["errors"]).must_include "Could not create rental request" + expect{ + post checkout_path, params: cant_rent_data + }.wont_change "Movie.find(cant_rent_data[:movie_id]).available_inventory" + + must_respond_with :bad_request end # edge failure