From f1a2fe7d3fb207fb6364684544ce60868e8be802 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 5 Nov 2019 13:26:16 -0800 Subject: [PATCH 01/22] rails new --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 59 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 + tmp/.keep | 0 vendor/.keep | 0 58 files changed, 932 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..160fe391c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..8143da43e --- /dev/null +++ b/Gemfile @@ -0,0 +1,59 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..981f08e8a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) + erubi (1.9.0) + ffi (1.11.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.3.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + minitest-rails (5.2.0) + minitest (~> 5.10) + railties (~> 5.2.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.1) + nio4r (2.5.2) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + ruby_dep (1.5.0) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + debase (>= 0.2.4.1) + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.0.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..56f84c20c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6cc616cd1 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video-store-api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..a0cc65f80 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +rWLr4DZc9w5oAa5cvcnCaJUHiDZDLMFJjCWn2LXHHf/sZc7RVVhCcRMVgh0kRBXrbJX6f7FzVwb8DIT64P2Tm8Tq/vsKQM1REkQJFCwQJ6vUpCmR2cvGhq6oiMk1Ulvnns5LE/1Y6FIv5YwJs1EVnvCg7kkzuZ6bxBwwW17VixFnARbraddqivkJ63s9H6M2JO1TrP0ceR/9I6kaDGCCpxcBCvOhBZn58iSAhy0SPpnlWh0N9DRlWCM9BsPdyo4yaLRt3BLc6gxsTtoNlkZb6WweBkHNiMizrDU4VIFCpJnfdi4qoFkDT3FVs2sj0q7rbkvynJwQNt50GI2xgwhIC075rddBZGPhv/l24gnAttVX0YwVteBHeHs8MjYb6SWecBU+fvvV9TWNMioks4usMtG6TP1JE7JsyhkW--ChLx8c0wLOA1fD2Q--JGg49r9ErfRFBbhNZuu08A== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..25f76c8e1 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video-store-api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video-store-api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video-store-api_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video-store-api_production + username: video-store-api + password: <%= ENV['VIDEO-STORE-API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f023a796 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video-store-api_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 5e01d0d3881867583707af8b6b9291c7839cb525 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 5 Nov 2019 13:58:22 -0800 Subject: [PATCH 02/22] created relationship, models and controllers --- app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/models/customer.rb | 3 ++ app/models/movie.rb | 3 ++ db/migrate/20191105212935_create_customers.rb | 15 ++++++ db/migrate/20191105213020_create_movies.rb | 12 +++++ ...0191105213847_add_customer_id_to_movies.rb | 5 ++ ...91105214434_remove_customer_from_movies.rb | 5 ++ ...1105215255_create_customers_movies_join.rb | 8 ++++ db/schema.rb | 46 +++++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +++ test/controllers/movies_controller_test.rb | 7 +++ test/models/customer_test.rb | 7 +++ test/models/movie_test.rb | 7 +++ 14 files changed, 129 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20191105212935_create_customers.rb create mode 100644 db/migrate/20191105213020_create_movies.rb create mode 100644 db/migrate/20191105213847_add_customer_id_to_movies.rb create mode 100644 db/migrate/20191105214434_remove_customer_from_movies.rb create mode 100644 db/migrate/20191105215255_create_customers_movies_join.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..4e914c16d --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_and_belongs_to_many :movies +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..ea8abd0d9 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_and_belongs_to_many :customers +end diff --git a/db/migrate/20191105212935_create_customers.rb b/db/migrate/20191105212935_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20191105212935_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/20191105213020_create_movies.rb b/db/migrate/20191105213020_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20191105213020_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20191105213847_add_customer_id_to_movies.rb b/db/migrate/20191105213847_add_customer_id_to_movies.rb new file mode 100644 index 000000000..4903819c9 --- /dev/null +++ b/db/migrate/20191105213847_add_customer_id_to_movies.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToMovies < ActiveRecord::Migration[5.2] + def change + add_reference :movies, :customer, foreign_key: true + end +end diff --git a/db/migrate/20191105214434_remove_customer_from_movies.rb b/db/migrate/20191105214434_remove_customer_from_movies.rb new file mode 100644 index 000000000..267905712 --- /dev/null +++ b/db/migrate/20191105214434_remove_customer_from_movies.rb @@ -0,0 +1,5 @@ +class RemoveCustomerFromMovies < ActiveRecord::Migration[5.2] + def change + remove_reference(:movies, :customer, index: true, foreign_key: true) + end +end diff --git a/db/migrate/20191105215255_create_customers_movies_join.rb b/db/migrate/20191105215255_create_customers_movies_join.rb new file mode 100644 index 000000000..0088b259a --- /dev/null +++ b/db/migrate/20191105215255_create_customers_movies_join.rb @@ -0,0 +1,8 @@ +class CreateCustomersMoviesJoin < ActiveRecord::Migration[5.2] + def change + create_table :customers_movies_joins do |t| + t.belongs_to :movie, index: true + t.belongs_to :customer, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b46a8d2af --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_11_05_215255) 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 "customers_movies_joins", force: :cascade do |t| + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_customers_movies_joins_on_customer_id" + t.index ["movie_id"], name: "index_customers_movies_joins_on_movie_id" + 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/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..b11d50cea --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..cd59ab14a --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Movie do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From a335a495b5785adad5ec284e12b911e3aac00954 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 5 Nov 2019 16:32:16 -0800 Subject: [PATCH 03/22] updated schema and created rentals class --- app/controllers/rentals_controller.rb | 2 + app/models/customer.rb | 3 +- app/models/movie.rb | 8 +++- app/models/rental.rb | 4 ++ db/migrate/20191105222004_create_rentals.rb | 9 +++++ ...91106001357_add_foreign_keys_to_rentals.rb | 6 +++ db/migrate/20191106002706_drop_join_table.rb | 3 ++ db/schema.rb | 20 ++++++---- test/controllers/rentals_controller_test.rb | 7 ++++ test/models/movie_test.rb | 39 +++++++++++++++++-- test/models/rental_test.rb | 7 ++++ test/test_helper.rb | 8 +++- 12 files changed, 101 insertions(+), 15 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20191105222004_create_rentals.rb create mode 100644 db/migrate/20191106001357_add_foreign_keys_to_rentals.rb create mode 100644 db/migrate/20191106002706_drop_join_table.rb create mode 100644 test/controllers/rentals_controller_test.rb 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/customer.rb b/app/models/customer.rb index 4e914c16d..1d05ffeba 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord - has_and_belongs_to_many :movies + has_many :rentals + has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index ea8abd0d9..6a388b507 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,9 @@ class Movie < ApplicationRecord - has_and_belongs_to_many :customers + has_many :rentals + has_many :customers, through: :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end diff --git a/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/20191105222004_create_rentals.rb b/db/migrate/20191105222004_create_rentals.rb new file mode 100644 index 000000000..f14c8a6f5 --- /dev/null +++ b/db/migrate/20191105222004_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.belongs_to :customer + t.belongs_to :movie + t.timestamps + end + end +end diff --git a/db/migrate/20191106001357_add_foreign_keys_to_rentals.rb b/db/migrate/20191106001357_add_foreign_keys_to_rentals.rb new file mode 100644 index 000000000..115b25905 --- /dev/null +++ b/db/migrate/20191106001357_add_foreign_keys_to_rentals.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20191106002706_drop_join_table.rb b/db/migrate/20191106002706_drop_join_table.rb new file mode 100644 index 000000000..c6c0ebecc --- /dev/null +++ b/db/migrate/20191106002706_drop_join_table.rb @@ -0,0 +1,3 @@ +class DropJoinTable < ActiveRecord::Migration[5.2] + drop_table :customers_movies_joins +end diff --git a/db/schema.rb b/db/schema.rb index b46a8d2af..209cd0176 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_215255) do +ActiveRecord::Schema.define(version: 2019_11_06_002706) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,13 +27,6 @@ t.datetime "updated_at", null: false end - create_table "customers_movies_joins", force: :cascade do |t| - t.bigint "movie_id" - t.bigint "customer_id" - t.index ["customer_id"], name: "index_customers_movies_joins_on_customer_id" - t.index ["movie_id"], name: "index_customers_movies_joins_on_movie_id" - end - create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" @@ -43,4 +36,15 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + 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..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cd59ab14a..6a7741a85 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe Movie do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end + describe "validations" do + before do + @movie = Movie.create(title: "Movie1", overview: "Amazing", release_date: Date.today, inventory: 111) + end + + it "is valid when all fields are present" do + result = @movie.valid? + expect(result).must_equal true + end + + it "is invalid without a title" do + @movie.title = nil + result = @movie.valid? + expect(result).must_equal false + end + + it "is invalid without a overview" do + @movie.overview = nil + result = @movie.valid? + expect(result).must_equal false + end + + it "is invalid without a release date" do + @movie.release_date = nil + result = @movie.valid? + expect(result).must_equal false + end + + it "is invalid without a inventory" do + @movie.inventory = nil + result = @movie.valid? + expect(result).must_equal false + end + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..5b12bbf05 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,9 +2,15 @@ require_relative '../config/environment' require 'rails/test_help' +require 'minitest/rails' +require 'minitest/autorun' +require 'minitest/reporters' + +Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new + 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 From 60cefc9a63064930940d33e26aab24875c278c70 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 5 Nov 2019 17:32:50 -0800 Subject: [PATCH 04/22] created fixtures --- test/fixtures/customers.yml | 26 ++++++++++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/fixtures/rentals.yml | 17 +++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..802ec2f70 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,26 @@ +one: + name: "bob" + address: "1250 4th Ave." + city: "Seattle" + state: "WA" + postal_code: "98101" + phone: "206-555-55555" + # movies_checked_out_count: 2 + +two: + name: "ada" + address: "1250 3th Ave." + city: "Seattle" + state: "WA" + postal_code: "98102" + phone: "313-444-4444" + # movies_checked_out_count: 10 + +three: + name: "grace" + address: "1250 2nd Ave." + city: "Seattle" + state: "WA" + postal_code: "98102" + phone: "310-111-1111" + # movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e7084ec55 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +one: + title: "Babe 2: Pig in the City" + inventory: 2 + overview: "This post-modern gothic addresses themes of loyalty and sacrifice." + release_date: 1998-10-15 + inventory: 2 + +two: + title: "So I Married an Axe Murderer" + inventory: 4 + overview: "A parable about trust, friendship, and the strong bonds of family in San Francisco." + release_date: 1993-10-15 + inventory: 4 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..da205dd37 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,17 @@ +one: + # checkout_date: Date.today - 4 + # due_date: Date.today + 2 + customer: one + movie: two + +two: + # checkout_date: Date.today - 4 + # due_date: Date.today + 2 + customer: one + movie: one + +three: + # checkout_date: Date.today - 1 + # due_date: Date.today + 5 + customer: two + movie: one From 95fbf5f4bae604b629635c06a5b215e230c87643 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 5 Nov 2019 17:44:53 -0800 Subject: [PATCH 05/22] movies model tests for validation and relationship --- test/models/movie_test.rb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 6a7741a85..91394f691 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,11 +1,11 @@ require "test_helper" describe Movie do - describe "validations" do - before do - @movie = Movie.create(title: "Movie1", overview: "Amazing", release_date: Date.today, inventory: 111) - end - + before do + @movie = movies(:one) + end + + describe "validations" do it "is valid when all fields are present" do result = @movie.valid? expect(result).must_equal true @@ -35,4 +35,14 @@ expect(result).must_equal false end end -end + + describe "relationships" do + it "can have many rentals" do + expect(@movie.rentals.count).must_equal 2 + end + + it "can have many customers" do + expect(@movie.customers.count).must_equal 2 + end + end +end From c819f9155733db47c5f51693606c5877a8c5355b Mon Sep 17 00:00:00 2001 From: Vi Date: Tue, 5 Nov 2019 22:00:45 -0800 Subject: [PATCH 06/22] added controller actions to movies and customers --- app/controllers/application_controller.rb | 15 +++++++ app/controllers/customers_controller.rb | 34 +++++++++++++++ app/controllers/movies_controller.rb | 33 ++++++++++++++ app/controllers/rentals_controller.rb | 12 ++++++ app/models/customer.rb | 8 ++++ config/routes.rb | 4 ++ test/controllers/movies_controller_test.rb | 38 ++++++++++++++-- test/models/customer_test.rb | 50 ++++++++++++++++++++-- 8 files changed, 188 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..1383683c4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,17 @@ class ApplicationController < ActionController::API + + def not_found + render json: { + ok: false, + errors: ["Not Found"] + }, status: :not_found + end + + def bad_request + render json: { + ok: false, + errors: pet.errors.messages + }, status: :bad_request + end + end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..01a359585 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,36 @@ class CustomersController < ApplicationController + + def index + @customers = Customer.all + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + render json: customers, status: :ok + end + + def show + customer = Customer.find_by(id: params[:id]) + + if customer + render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + else + not_found + end + end + + def create + customer = Customer.new(customer_params) + + if customer.save + render json: pet.as_json(only: [:id], status: :created) + return + else + bad_request + end + end + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + end + end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..5a00bd48f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,35 @@ class MoviesController < ApplicationController + + def index + @movies = Movie.all + movies = Movie.all.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + render json: movies, status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + else + not_found + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + return + else + bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..40dc12e84 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,14 @@ class RentalsController < ApplicationController + def index + end + + def show + end + + def create + end + + private + def rental_params + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 1d05ffeba..1573dbf29 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,12 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals + + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..a23422240 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ 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, :show, :create] + resources :movies, only: [:index, :show, :create] + resources :rentals, only: [:index, :show, :create] + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b11d50cea..8d5eb2931 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,39 @@ require "test_helper" describe MoviesController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + MOVIE_FIELDS = %w(id inventory overview release_date title) + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "responds with JSON and success" do + gets movies_path + check_response(expected_type: Array) + end + + it "responds with an array of movie hashes" do + get movies_path + body = check_response(expected_type: Array) + + body.each do |movie| + expect(movie.keys.sort).must_equal MOVIE_FIELDS + end + end + + # it "will respond with an empty array when there are no movies" do + # Movie.destroy_all + + # get movies_path + + # body = check_response(expected_type: Array) + # expect(body).must_equal [] + # end + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..82aad05b7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,51 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + before do + @customer = Customer.create(name: "Beep", registered_at: '1999-01-01 00:00', address: "822 Lake St", city: "Seattle", state: "WA", postal_code: "98112", phone:"323-322-5466") + end + + it "is valid when all fields are present" do + result = @customer.valid? + expect(result).must_equal true + end + + it "is invalid without a name" do + @customer.name = nil + result = @customer.valid? + expect(result).must_equal false + end + + it "is invalid without a registered at date" do + @customer.registered_at = nil + refute(@customer.valid?) + end + + it "is invalid without an address" do + @customer.address = nil + refute(@customer.valid?) + end + + it "is invalid without a city" do + @customer.city = nil + refute(@customer.valid?) + end + + it "is invalid without a state" do + @customer.state = nil + refute(@customer.valid?) + end + + it "is invalid without a postal code" do + @customer.postal_code = nil + refute(@customer.valid?) + end + + it "is invalid without a phone" do + @customer.phone = nil + refute(@customer.valid?) + end + + end end From 34f0cdaefd17569ffae220330bce74927a2a0992 Mon Sep 17 00:00:00 2001 From: Vi Date: Tue, 5 Nov 2019 23:09:57 -0800 Subject: [PATCH 07/22] added movies controller test, fixed some errors in movies YML, and updated typos and bugs in controller syntax --- app/controllers/application_controller.rb | 4 +- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 4 +- test/controllers/movies_controller_test.rb | 74 ++++++++++++++++++++-- test/fixtures/movies.yml | 6 +- 5 files changed, 74 insertions(+), 16 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1383683c4..f69c849e0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,10 +7,10 @@ def not_found }, status: :not_found end - def bad_request + def bad_request(model) render json: { ok: false, - errors: pet.errors.messages + errors: model.errors.messages }, status: :bad_request end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 01a359585..38199f499 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -23,7 +23,7 @@ def create render json: pet.as_json(only: [:id], status: :created) return else - bad_request + bad_request(customer) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5a00bd48f..5b46160a7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,10 +20,10 @@ def create movie = Movie.new(movie_params) if movie.save - render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + render json: movie.as_json(only: [:id], status: :created) return else - bad_request + bad_request(movie) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 8d5eb2931..08d51c38c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -14,7 +14,7 @@ def check_response(expected_type:, expected_status: :success) describe "index" do it "responds with JSON and success" do - gets movies_path + get movies_path check_response(expected_type: Array) end @@ -27,13 +27,73 @@ def check_response(expected_type:, expected_status: :success) end end - # it "will respond with an empty array when there are no movies" do - # Movie.destroy_all + it "will respond with an empty array when there are no movies" do + Rental.destroy_all + #probably have to add some state to the movies, like “isDeleted”? + #We can either leave it like this, or add a field to the model so that we can basically leave a Movie in the movies table but have some way to tell that it’s actually deleted and that the controller should filter it out. + Movie.destroy_all + + get movies_path + + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end + + describe "show" do + it "retrieves one movie" do + + movie = Movie.first + + get movie_path(movie) + body = check_response(expected_type: Hash) + + expect(body.keys.sort).must_equal MOVIE_FIELDS + end + + it "sends back not found if the movie doesnt exist" do + get movie_path(-1) + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body.keys).must_include "errors" + end + end + + describe "create" do + let(:movie_data) { + { + movie: { + title: "Babe 2: Pig in the City", + inventory: 2, + overview: "This post-modern gothic addresses themes of loyalty and sacrifice.", + release_date: Date.new(11-1-20) + } + } + } + + it "can create a new movie" do + expect { + post movies_path, params: movie_data + }.must_differ 'Movie.count', 1 + + body = check_response(expected_type: Hash, expected_status: :ok) + + new_movie = Movie.find(body["id"]) + + movie_data[:movie].each do |key, value| + expect(new_movie[key.to_s]).must_equal value + end + end + + + it "will respond with bad_request for invalid data" do + movie_data[:movie][:title] = nil - # get movies_path + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" - # body = check_response(expected_type: Array) - # expect(body).must_equal [] - # end + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e7084ec55..0f4a64365 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,11 @@ one: title: "Babe 2: Pig in the City" - inventory: 2 overview: "This post-modern gothic addresses themes of loyalty and sacrifice." - release_date: 1998-10-15 + release_date: "1998-10-15" inventory: 2 two: title: "So I Married an Axe Murderer" - inventory: 4 overview: "A parable about trust, friendship, and the strong bonds of family in San Francisco." - release_date: 1993-10-15 + release_date: "1993-10-15" inventory: 4 From 55ed510638e66fef73e41d01721c83bc947b5a4a Mon Sep 17 00:00:00 2001 From: Vi Date: Wed, 6 Nov 2019 13:39:57 -0800 Subject: [PATCH 08/22] updated bug on controllers --- app/controllers/application_controller.rb | 4 +++- app/controllers/movies_controller.rb | 3 ++- test/controllers/movies_controller_test.rb | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f69c849e0..2d4c1cf49 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,6 @@ -class ApplicationController < ActionController::API +class ApplicationController < ActionController::API + + private def not_found render json: { diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5b46160a7..23815ee1e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,6 +11,7 @@ def show if movie render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + return else not_found end @@ -20,7 +21,7 @@ def create movie = Movie.new(movie_params) if movie.save - render json: movie.as_json(only: [:id], status: :created) + render json: movie.as_json(only: [:id]), status: :created return else bad_request(movie) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 08d51c38c..366c8a196 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -69,13 +69,13 @@ def check_response(expected_type:, expected_status: :success) } } } - + it "can create a new movie" do expect { post movies_path, params: movie_data }.must_differ 'Movie.count', 1 - body = check_response(expected_type: Hash, expected_status: :ok) + body = check_response(expected_type: Hash, expected_status: :created) new_movie = Movie.find(body["id"]) From ca09f0d5fab81f76f3523c75cad673e79704327f Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 6 Nov 2019 13:43:06 -0800 Subject: [PATCH 09/22] model tests --- app/models/rental.rb | 3 +++ test/models/rental_test.rb | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..910eef438 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + validates :customer_id, presence: true + validades :movie_id, presence: true end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..6522472de 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @rental = rentals(:one) + end end From 540e8fa7c986de5de01d22ac5e787b759fd2ee3b Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 6 Nov 2019 15:08:42 -0800 Subject: [PATCH 10/22] customer controller tests --- app/controllers/customers_controller.rb | 16 ++-- app/models/rental.rb | 2 +- test/controllers/customers_controller_test.rb | 96 ++++++++++++++++++- 3 files changed, 102 insertions(+), 12 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 38199f499..bdb233797 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,36 +1,36 @@ class CustomersController < ApplicationController - + def index @customers = Customer.all customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) render json: customers, status: :ok end - + def show customer = Customer.find_by(id: params[:id]) - + if customer render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) else not_found end end - + def create customer = Customer.new(customer_params) - + if customer.save - render json: pet.as_json(only: [:id], status: :created) + render json: customer.as_json(only: [:id]), status: :created return else bad_request(customer) end end - + private def customer_params params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) end - + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 910eef438..a1a1f64d4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,5 +3,5 @@ class Rental < ApplicationRecord belongs_to :customer validates :customer_id, presence: true - validades :movie_id, presence: true + validates :movie_id, presence: true end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..b7e1b287f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,97 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + CUSTOMER_FIELDS = %w(address city id name phone postal_code registered_at state) + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "responds with JSON and success" do + get customers_path + check_response(expected_type: Array) + end + + it "responds with an array of customers hashes" do + get customers_path + body = check_response(expected_type: Array) + + body.each do |customer| + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "will respond with an empty array when no customers" do + Rental.destroy_all + Customer.destroy_all + + get customers_path + + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end + + describe "show" do + it "retrieves one customer" do + customer = Customer.first + + get customer_path(customer) + body = check_response(expected_type: Hash) + + expect(body.keys.sort).must_equal CUSTOMER_FIELDS + end + + it "sends back not_found if customer doesn't exist" do + get customer_path(-100) + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body.keys).must_include "errors" + end + end + + describe "create" do + let(:customer_data) { + { + customer: { + name: "lisa", + address: "1250 3th Ave.", + registered_at: Date.new(11-1-20), + city: "Seattle", + state: "WA", + postal_code: "98102", + phone: "313-444-4444" + } +} +} + +it "can create a new customer" do + expect { + post customers_path, params: customer_data +}.must_differ "Customer.count", 1 + +body = check_response(expected_type: Hash, expected_status: :created) +new_customer = Customer.find(body["id"]) + +customer_data[:customer].each do |key, value| + expect(new_customer[key.to_s]).must_equal value +end +end + +it "will respond with bad_request for invalid data" do + customer_data[:customer][:name] = nil + + expect { + post customers_path, params: customer_data +}.wont_change "Customer.count" + +body = check_response(expected_type: Hash, expected_status: :bad_request) +expect(body["errors"].keys).must_include "name" +end end +end From 3cee0b3968faabf427ef1a1ecfd156d7e5e05728 Mon Sep 17 00:00:00 2001 From: Vi Date: Wed, 6 Nov 2019 15:10:08 -0800 Subject: [PATCH 11/22] added relationships tests to models- movie and customer, and finished rental model test --- app/models/rental.rb | 2 +- test/fixtures/customers.yml | 3 +++ test/models/customer_test.rb | 37 +++++++++++++++++++++++++--- test/models/movie_test.rb | 19 +++++++++++++++ test/models/rental_test.rb | 47 ++++++++++++++++++++++++++++++++++++ 5 files changed, 104 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 910eef438..a1a1f64d4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,5 +3,5 @@ class Rental < ApplicationRecord belongs_to :customer validates :customer_id, presence: true - validades :movie_id, presence: true + validates :movie_id, presence: true end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 802ec2f70..a33dc830c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,5 +1,6 @@ one: name: "bob" + registered_at: "10-10-20" address: "1250 4th Ave." city: "Seattle" state: "WA" @@ -9,6 +10,7 @@ one: two: name: "ada" + registered_at: "10-10-20" address: "1250 3th Ave." city: "Seattle" state: "WA" @@ -18,6 +20,7 @@ two: three: name: "grace" + registered_at: "10-10-20" address: "1250 2nd Ave." city: "Seattle" state: "WA" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 82aad05b7..a211a4663 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,10 +1,11 @@ require "test_helper" describe Customer do + before do + @customer = customers(:one) + end + describe "validations" do - before do - @customer = Customer.create(name: "Beep", registered_at: '1999-01-01 00:00', address: "822 Lake St", city: "Seattle", state: "WA", postal_code: "98112", phone:"323-322-5466") - end it "is valid when all fields are present" do result = @customer.valid? @@ -48,4 +49,34 @@ end end + + describe "relationships" do + it "can have many rentals" do + expect(@customer.rentals.count).must_equal 2 + end + + it "can have customers" do + expect(@customer.movies.count).must_equal 2 + end + + it "cannot have any movies without rentals" do + Rental.destroy_all + expect(@customer.movies).must_be_empty + end + + it "can exist without customers" do + Rental.destroy_all + Movie.destroy_all + result = @customer.valid? + expect(result).must_equal true + end + + it "can exist without any rentals" do + Rental.destroy_all + result = @customer.valid? + expect(result).must_equal true + end + + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 91394f691..69fd8abea 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,5 +44,24 @@ it "can have many customers" do expect(@movie.customers.count).must_equal 2 end + + it "cannot have customers without rentals" do + Rental.destroy_all + + expect(@movie.customers).must_be_empty + end + + it "can exist without any customers" do + Rental.destroy_all + Customer.destroy_all + result = @movie.valid? + expect(result).must_equal true + end + + it "can exist without any rentals" do + Rental.destroy_all + result = @movie.valid? + expect(result).must_equal true + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6522472de..ceef5bd41 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -4,4 +4,51 @@ before do @rental = rentals(:one) end + + describe "validations" do + it "is valid when all fields are present" do + expect(@rental.valid?).must_equal true + end + + it "is invalid without a movie" do + @rental.movie = nil + expect(@rental.valid?).must_equal false + end + + it "is invalid without a customer" do + @rental.customer = nil + expect(@rental.valid?).must_equal false + end + end + + describe "relationships" do + it "belongs to a movie" do + expect(@rental.movie).must_be_kind_of Movie + end + + it "belongs to a customer" do + expect(@rental.customer).must_be_kind_of Customer + end + + it "can belong to more than one movie" do + rental_two = rentals(:two) + rental_three = rentals(:three) + result = rental_two.movie == rental_three.movie + + expect(result).must_equal true + expect(rental_two).must_be_kind_of Rental + expect(rental_three).must_be_kind_of Rental + + end + + it "can belong to more than one customer" do + rental_one = rentals(:one) + rental_two= rentals(:two) + result = rental_one.customer == rental_two.customer + + expect(result).must_equal true + expect(rental_one).must_be_kind_of Rental + expect(rental_two).must_be_kind_of Rental + end + end end From a00ebe101a0baaf844946b144db0c549205a93be Mon Sep 17 00:00:00 2001 From: Vi Date: Wed, 6 Nov 2019 15:10:45 -0800 Subject: [PATCH 12/22] finished fixing buggo --- app/controllers/customers_controller.rb | 2 +- test/models/movie_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 38199f499..cb17369a9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -20,7 +20,7 @@ def create customer = Customer.new(customer_params) if customer.save - render json: pet.as_json(only: [:id], status: :created) + render json: pet.as_json(only: [:id]), status: :created return else bad_request(customer) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 69fd8abea..40ff129cb 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -53,7 +53,7 @@ it "can exist without any customers" do Rental.destroy_all - Customer.destroy_all + Customer.destroy_all result = @movie.valid? expect(result).must_equal true end From c2a431fc9ea1e369bff9de21bd678d2b0f0352ec Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 6 Nov 2019 15:34:07 -0800 Subject: [PATCH 13/22] added movies_checked_out_count column to customers --- db/migrate/20191106232438_add_column_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191106232438_add_column_to_customers.rb diff --git a/db/migrate/20191106232438_add_column_to_customers.rb b/db/migrate/20191106232438_add_column_to_customers.rb new file mode 100644 index 000000000..90004a728 --- /dev/null +++ b/db/migrate/20191106232438_add_column_to_customers.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 209cd0176..eb5c4fddb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_06_002706) do +ActiveRecord::Schema.define(version: 2019_11_06_232438) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| From 9b809e54b607cb8091f5f9f1aa5c38472957ed1d Mon Sep 17 00:00:00 2001 From: Vi Date: Wed, 6 Nov 2019 15:54:54 -0800 Subject: [PATCH 14/22] updated --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index cb17369a9..c85ea65b2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -30,7 +30,7 @@ def create private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 23815ee1e..36c41803e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -31,6 +31,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end From e7b83a84f0e28bb6996dbc853d1ad465333f5557 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 6 Nov 2019 15:57:12 -0800 Subject: [PATCH 15/22] updated schema and fixtures --- app/controllers/customers_controller.rb | 6 +++--- app/controllers/movies_controller.rb | 20 +++++++++---------- .../20191106235102_add_column_to_movies.rb | 5 +++++ db/schema.rb | 3 ++- test/fixtures/customers.yml | 9 ++++++--- 5 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20191106235102_add_column_to_movies.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index bdb233797..fd777719b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index @customers = Customer.all - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) render json: customers, status: :ok end @@ -10,7 +10,7 @@ def show customer = Customer.find_by(id: params[:id]) if customer - render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) else not_found end @@ -30,7 +30,7 @@ def create private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 23815ee1e..1ebe97ef8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,36 +1,36 @@ class MoviesController < ApplicationController - + def index @movies = Movie.all - movies = Movie.all.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + movies = Movie.all.as_json(only: [:id, :title, :release_date]) render json: movies, status: :ok end - + def show movie = Movie.find_by(id: params[:id]) - + if movie - render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) return else not_found end end - + def create movie = Movie.new(movie_params) - + if movie.save - render json: movie.as_json(only: [:id]), status: :created + render json: movie.as_json(only: [:id]), status: :ok return else bad_request(movie) end end - + private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/db/migrate/20191106235102_add_column_to_movies.rb b/db/migrate/20191106235102_add_column_to_movies.rb new file mode 100644 index 000000000..5d12185f2 --- /dev/null +++ b/db/migrate/20191106235102_add_column_to_movies.rb @@ -0,0 +1,5 @@ +class AddColumnToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index eb5c4fddb..d3449d16f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_06_232438) do +ActiveRecord::Schema.define(version: 2019_11_06_235102) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory", default: 0 end create_table "rentals", force: :cascade do |t| diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 802ec2f70..5eaf56784 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,26 +1,29 @@ one: name: "bob" + registered_at: "10-10-20" address: "1250 4th Ave." city: "Seattle" state: "WA" postal_code: "98101" phone: "206-555-55555" - # movies_checked_out_count: 2 + movies_checked_out_count: 2 two: name: "ada" + registered_at: "10-10-20" address: "1250 3th Ave." city: "Seattle" state: "WA" postal_code: "98102" phone: "313-444-4444" - # movies_checked_out_count: 10 + movies_checked_out_count: 10 three: name: "grace" + registered_at: "10-10-20" address: "1250 2nd Ave." city: "Seattle" state: "WA" postal_code: "98102" phone: "310-111-1111" - # movies_checked_out_count: 0 + movies_checked_out_count: 0 From f44ad41be345475bc21398424cde011b7f5978db Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 7 Nov 2019 10:37:32 -0800 Subject: [PATCH 16/22] fixing bus on model and controller test for movies --- app/models/movie.rb | 1 + test/controllers/movies_controller_test.rb | 71 ++++++++++------------ test/fixtures/movies.yml | 9 ++- test/models/movie_test.rb | 16 +++-- 4 files changed, 51 insertions(+), 46 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 6a388b507..acd20a049 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,4 +6,5 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true + validates :available_inventory, presence: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 366c8a196..abb807fc9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,99 +1,94 @@ require "test_helper" describe MoviesController do - MOVIE_FIELDS = %w(id inventory overview release_date title) - + MOVIE_FIELDS_INDEX = %w(id release_date title) + MOVIE_FIELDS_SHOW = %w(id title overview release_date inventory available_inventory) + def check_response(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' - + body = JSON.parse(response.body) expect(body).must_be_kind_of expected_type return body end - + describe "index" do it "responds with JSON and success" do get movies_path check_response(expected_type: Array) end - + it "responds with an array of movie hashes" do get movies_path body = check_response(expected_type: Array) - + body.each do |movie| - expect(movie.keys.sort).must_equal MOVIE_FIELDS + expect(movie.keys.sort).must_equal MOVIE_FIELDS_INDEX end end - + it "will respond with an empty array when there are no movies" do Rental.destroy_all #probably have to add some state to the movies, like “isDeleted”? #We can either leave it like this, or add a field to the model so that we can basically leave a Movie in the movies table but have some way to tell that it’s actually deleted and that the controller should filter it out. Movie.destroy_all - + get movies_path - + body = check_response(expected_type: Array) expect(body).must_equal [] end end - + describe "show" do it "retrieves one movie" do - movie = Movie.first - + get movie_path(movie) body = check_response(expected_type: Hash) - - expect(body.keys.sort).must_equal MOVIE_FIELDS + + expect(body.keys).must_equal MOVIE_FIELDS_SHOW end - + it "sends back not found if the movie doesnt exist" do get movie_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) expect(body.keys).must_include "errors" end end - + describe "create" do let(:movie_data) { - { - movie: { - title: "Babe 2: Pig in the City", - inventory: 2, - overview: "This post-modern gothic addresses themes of loyalty and sacrifice.", - release_date: Date.new(11-1-20) - } + { + title: "Babe 2: Pig in the City", + inventory: 2, + overview: "This post-modern gothic addresses themes of loyalty and sacrifice.", + release_date: Date.new(11-1-20), + available_inventory: 10 } } - + it "can create a new movie" do expect { post movies_path, params: movie_data }.must_differ 'Movie.count', 1 - - body = check_response(expected_type: Hash, expected_status: :created) - + + body = check_response(expected_type: Hash, expected_status: :ok) + new_movie = Movie.find(body["id"]) - - movie_data[:movie].each do |key, value| - expect(new_movie[key.to_s]).must_equal value - end + expect(body.keys).must_include "id" end - - + it "will respond with bad_request for invalid data" do - movie_data[:movie][:title] = nil - + movie_data[:title] = nil + expect { post movies_path, params: movie_data }.wont_change "Movie.count" - + body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"].keys).must_include "title" end end -end +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 0f4a64365..0fff0c699 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,11 +1,14 @@ one: - title: "Babe 2: Pig in the City" + inventory: 2 overview: "This post-modern gothic addresses themes of loyalty and sacrifice." release_date: "1998-10-15" - inventory: 2 + title: "Babe 2: Pig in the City" + available_inventory: 10 two: + inventory: 4 title: "So I Married an Axe Murderer" overview: "A parable about trust, friendship, and the strong bonds of family in San Francisco." release_date: "1993-10-15" - inventory: 4 + title: "Babe 2: Pig in the City" + available_inventory: 10 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 40ff129cb..3354358d7 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -34,6 +34,12 @@ result = @movie.valid? expect(result).must_equal false end + + it "is invalid without an available_inventory" do + @movie.available_inventory = nil + result = @movie.valid? + expect(result).must_equal false + end end describe "relationships" do @@ -44,20 +50,20 @@ it "can have many customers" do expect(@movie.customers.count).must_equal 2 end - + it "cannot have customers without rentals" do Rental.destroy_all - + expect(@movie.customers).must_be_empty end - + it "can exist without any customers" do Rental.destroy_all - Customer.destroy_all + Customer.destroy_all result = @movie.valid? expect(result).must_equal true end - + it "can exist without any rentals" do Rental.destroy_all result = @movie.valid? From 8b502d99b4470e187b07fb11363e5cbb7c3b1b2f Mon Sep 17 00:00:00 2001 From: Vi Date: Thu, 7 Nov 2019 10:39:16 -0800 Subject: [PATCH 17/22] updated tests after smoke test fixes --- app/controllers/customers_controller.rb | 17 ------- app/models/customer.rb | 1 + test/controllers/customers_controller_test.rb | 51 +++---------------- 3 files changed, 7 insertions(+), 62 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index fd777719b..c4592cd70 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -16,21 +16,4 @@ def show end end - def create - customer = Customer.new(customer_params) - - if customer.save - render json: customer.as_json(only: [:id]), status: :created - return - else - bad_request(customer) - end - end - - private - - def customer_params - params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) - end - end diff --git a/app/models/customer.rb b/app/models/customer.rb index 1573dbf29..62a5fa440 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,4 +9,5 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true + validates :movies_checked_out_count, presence: true end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b7e1b287f..3f799d873 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,8 +1,9 @@ require "test_helper" describe CustomersController do - CUSTOMER_FIELDS = %w(address city id name phone postal_code registered_at state) - + CUSTOMERS_INDEX_FIELDS = %w(id movies_checked_out_count name phone postal_code registered_at) + CUSTOMER_SHOW_FIELDS = %w(address city id movies_checked_out_count name phone postal_code registered_at state) + def check_response(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' @@ -23,7 +24,7 @@ def check_response(expected_type:, expected_status: :success) body = check_response(expected_type: Array) body.each do |customer| - expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + expect(customer.keys.sort).must_equal CUSTOMERS_INDEX_FIELDS end end @@ -42,10 +43,10 @@ def check_response(expected_type:, expected_status: :success) it "retrieves one customer" do customer = Customer.first - get customer_path(customer) + get customer_path(customer.id) body = check_response(expected_type: Hash) - expect(body.keys.sort).must_equal CUSTOMER_FIELDS + expect(body.keys.sort).must_equal CUSTOMER_SHOW_FIELDS end it "sends back not_found if customer doesn't exist" do @@ -54,44 +55,4 @@ def check_response(expected_type:, expected_status: :success) expect(body.keys).must_include "errors" end end - - describe "create" do - let(:customer_data) { - { - customer: { - name: "lisa", - address: "1250 3th Ave.", - registered_at: Date.new(11-1-20), - city: "Seattle", - state: "WA", - postal_code: "98102", - phone: "313-444-4444" - } -} -} - -it "can create a new customer" do - expect { - post customers_path, params: customer_data -}.must_differ "Customer.count", 1 - -body = check_response(expected_type: Hash, expected_status: :created) -new_customer = Customer.find(body["id"]) - -customer_data[:customer].each do |key, value| - expect(new_customer[key.to_s]).must_equal value -end -end - -it "will respond with bad_request for invalid data" do - customer_data[:customer][:name] = nil - - expect { - post customers_path, params: customer_data -}.wont_change "Customer.count" - -body = check_response(expected_type: Hash, expected_status: :bad_request) -expect(body["errors"].keys).must_include "name" -end -end end From 8bf9966b89d4355bd259559e66015ac2ea8a3969 Mon Sep 17 00:00:00 2001 From: Vi Date: Thu, 7 Nov 2019 21:51:22 -0800 Subject: [PATCH 18/22] added checkin and checkout to rentals controller, helper methods in rental model, and update methods in the customer and movie models - added tests for checkout - maybe want to continue adding more helper methods to rental model and refactor controller code --- app/controllers/rentals_controller.rb | 49 ++++++++++++- app/models/customer.rb | 9 +++ app/models/movie.rb | 8 ++ app/models/rental.rb | 15 ++++ config/routes.rb | 7 +- test/controllers/movies_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 81 ++++++++++++++++++++- 7 files changed, 161 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 40dc12e84..3c0aa5db4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,14 +1,55 @@ class RentalsController < ApplicationController - def index - end - def show + def checkout + movie = Rental.find_movie(rental_params) + customer = Rental.find_customer(rental_params) + + if movie && customer && movie.available_inventory > 0 + rental = Rental.new(rental_params) + customer = rental.customer + movie = rental.movie + + #Increment the amount of movies the customers has checked out + customer.update_movies_checked_out("checkout") + + #Decrease the amount of movies there are available in the movie's available inventory + movie.update_available_inventory("checkout") + + if rental.save && customer.save && movie.save + render json: rental.as_json(only: [:id]), status: :ok + return + else + bad_request(rental) + end + else + render json: { + ok: false, + errors: "none available" + }, status: :bad_request + end end - def create + + def checkin + movie = Rental.find_movie(rental_params) + customer = Rental.find_customer(rental_params) + + customer.update_movies_checked_out(checkin) + movie.update_available_inventory(checkin) + + if customer.save && movie.save + render json: rental.as_json(only: [:id]), status: :ok + return + else + bad_request(rental) + end end + private + def rental_params + params.permit(:movie_id, :customer_id) end + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 62a5fa440..0ec9b9bd0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,4 +10,13 @@ class Customer < ApplicationRecord validates :postal_code, presence: true validates :phone, presence: true validates :movies_checked_out_count, presence: true + + def update_movies_checked_out(status) + if status == "checkout" + self.movies_checked_out_count += 1 + elsif status == "checkin" + self.movies_checked_out_count -= 1 + end + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index acd20a049..978cd9d99 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,4 +7,12 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true validates :available_inventory, presence: true + + def update_available_inventory(status) + if status == "checkout" + self.available_inventory -= 1 + elsif status == "checkin" + self.available_inventory += 1 + end + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index a1a1f64d4..742a5b94a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,4 +4,19 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :movie_id, presence: true + + def check_in + end + + def check_out + end + + def self.find_customer(rental_params) + return Customer.find_by(id: rental_params[:customer_id]) + end + + def self.find_movie(rental_params) + return Movie.find_by(id: rental_params[:movie_id]) + end + end diff --git a/config/routes.rb b/config/routes.rb index a23422240..79c055aaa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,10 @@ 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, :show, :create] + resources :customers, only: [:index, :show] resources :movies, only: [:index, :show, :create] - resources :rentals, only: [:index, :show, :create] + + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" + # resources :rentals, only: [:index, :show, :create] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index abb807fc9..969f98384 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -16,7 +16,7 @@ def check_response(expected_type:, expected_status: :success) describe "index" do it "responds with JSON and success" do get movies_path - check_response(expected_type: Array) + check_response(expected_type: Array, expected_status: :success) end it "responds with an array of movie hashes" do diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..8b1ce3966 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,82 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + + let(:customer) { + customers(:three) + } + + let(:movie) { + movies(:one) + } + + let(:rental_data) { + { + customer_id: customer.id, + movie_id: movie.id, + } + } + + describe "checkout" do + it "responds with success when passed in valid params" do + post checkout_path, params: rental_data + + body = check_response(expected_type: Hash, expected_status: :success) + + # new_rental = Rental.find(body["id"]) + expect(body.keys).must_include "id" + end + + it "creates a new rental" do + expect { + post checkout_path, params: rental_data + }.must_differ 'Rental.count', 1 + + end + + it "updates customer movies_checked_out" do + post checkout_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :success) + + new_rental = Rental.find(body["id"]) + customer = new_rental.customer + expect(customer.movies_checked_out_count).must_equal 1 + end + + it "updates movie available_inventory" do + post checkout_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :success) + + new_rental = Rental.find(body["id"]) + movie = new_rental.movie + expect(movie.available_inventory).must_equal 9 + end + + it "responds with bad request when passed invalid params" do + invalid_rental_data = { + customer_id: nil, + movie_id: movie.id + } + + expect{post checkout_path, params: invalid_rental_data}.wont_change 'Rental.count' + + body = check_response(expected_type: Hash, expected_status: :bad_request) + + expect(body["errors"]).must_equal "none available" + end + end + + describe "checkin" do + end + end From d3f1ffc17b071b4cb3a39e0900a996ac29c3419b Mon Sep 17 00:00:00 2001 From: Vi Date: Fri, 8 Nov 2019 15:07:40 -0800 Subject: [PATCH 19/22] added tests for checkin rentals controller --- app/controllers/rentals_controller.rb | 25 ++++--- app/models/rental.rb | 6 -- db/seeds.rb | 4 +- ...Wave_3_smoke_tests.postman_collection.json | 4 +- test/controllers/rentals_controller_test.rb | 71 ++++++++++++++----- test/fixtures/movies.yml | 4 +- 6 files changed, 76 insertions(+), 38 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3c0aa5db4..691ed3c44 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,6 +6,7 @@ def checkout if movie && customer && movie.available_inventory > 0 rental = Rental.new(rental_params) + # rental.due_date = rental.checkout_date + 7 customer = rental.customer movie = rental.movie @@ -33,15 +34,23 @@ def checkout def checkin movie = Rental.find_movie(rental_params) customer = Rental.find_customer(rental_params) - - customer.update_movies_checked_out(checkin) - movie.update_available_inventory(checkin) + rental = Rental.find_by(rental_params) - if customer.save && movie.save - render json: rental.as_json(only: [:id]), status: :ok - return - else - bad_request(rental) + if customer && movie + customer.update_movies_checked_out("checkin") + movie.update_available_inventory("checkin") + + if customer.save && movie.save + render json: rental.as_json(only: [:id]), status: :ok + return + else + bad_request(rental) + end + else + render json: { + ok: false, + errors: "invalid customer or movie", + }, status: :bad_request end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 742a5b94a..5fb29ba07 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,12 +5,6 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :movie_id, presence: true - def check_in - end - - def check_out - end - def self.find_customer(rental_params) return Customer.find_by(id: rental_params[:customer_id]) end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..24c2f6ae7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,7 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + new_movie = Movie.create!(movie) + new_movie.available_inventory = new_movie.inventory + new_movie.save end diff --git a/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json b/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json index 9f640d98c..49c0f69fe 100644 --- a/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json +++ b/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json @@ -305,6 +305,7 @@ "", "var expected = Number(postman.getEnvironmentVariable(\"movie_ai\")) - 1;", "tests[\"Movie available_inventory decreased\"] = movie.available_inventory === expected;" + "postman.setEnvironmentVariable("new_movie_ai", expected);" ] } } @@ -453,8 +454,7 @@ "tests[\"Data is not an array\"] = !Array.isArray(movie);", "", "var expected = Number(postman.getEnvironmentVariable(\"movie_ai\"));", - "tests[\"Movie available_inventory increased\"] = movie.available_inventory === expected;" - ] + "tests["Movie available_inventory increased"] = movie.available_inventory === parseInt(postman.getEnvironmentVariable("new_movie_ai")) + 1;" ] } } ], diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8b1ce3966..226e4fed6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe RentalsController do - + def check_response(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' @@ -10,12 +10,12 @@ def check_response(expected_type:, expected_status: :success) expect(body).must_be_kind_of expected_type return body end - - + + let(:customer) { customers(:three) } - + let(:movie) { movies(:one) } @@ -24,59 +24,92 @@ def check_response(expected_type:, expected_status: :success) { customer_id: customer.id, movie_id: movie.id, - } + } } describe "checkout" do it "responds with success when passed in valid params" do post checkout_path, params: rental_data - body = check_response(expected_type: Hash, expected_status: :success) - + # new_rental = Rental.find(body["id"]) expect(body.keys).must_include "id" end - + it "creates a new rental" do expect { post checkout_path, params: rental_data }.must_differ 'Rental.count', 1 - end - + it "updates customer movies_checked_out" do post checkout_path, params: rental_data body = check_response(expected_type: Hash, expected_status: :success) - + new_rental = Rental.find(body["id"]) customer = new_rental.customer expect(customer.movies_checked_out_count).must_equal 1 end - + it "updates movie available_inventory" do post checkout_path, params: rental_data body = check_response(expected_type: Hash, expected_status: :success) - + new_rental = Rental.find(body["id"]) movie = new_rental.movie expect(movie.available_inventory).must_equal 9 end - + it "responds with bad request when passed invalid params" do invalid_rental_data = { customer_id: nil, movie_id: movie.id } - + expect{post checkout_path, params: invalid_rental_data}.wont_change 'Rental.count' - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body["errors"]).must_equal "none available" end end - + describe "checkin" do - end + before do + @new_rental = Rental.create(rental_data) + end + it "responds with success when passed in valid params" do + post checkin_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :success) + + expect(body.keys).must_include "id" + end + + it "updates customer movies_checked_in" do + post checkin_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :success) + new_rental = Rental.find(body["id"]) + customer = @new_rental.customer + expect(customer.movies_checked_out_count).must_equal 0 + end + + it "updates movie available_inventory" do + post checkin_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :success) + + new_rental = Rental.find(body["id"]) + movie = @new_rental.movie + expect(movie.available_inventory).must_equal 10 + end + + it "responds with bad request when passed invalid params" do + invalid_rental_data = { + customer_id: nil, + movie_id: movie.id + } + + expect{post checkin_path, params: invalid_rental_data}.wont_change 'Rental.count' + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_equal "invalid customer or movie" + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 0fff0c699..082bcb040 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,12 +1,12 @@ one: - inventory: 2 + inventory: 10 overview: "This post-modern gothic addresses themes of loyalty and sacrifice." release_date: "1998-10-15" title: "Babe 2: Pig in the City" available_inventory: 10 two: - inventory: 4 + inventory: 10 title: "So I Married an Axe Murderer" overview: "A parable about trust, friendship, and the strong bonds of family in San Francisco." release_date: "1993-10-15" From 1497a2bb52e6bbe7035e7224473c3b227729b908 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 8 Nov 2019 15:07:48 -0800 Subject: [PATCH 20/22] updated schema --- app/controllers/rentals_controller.rb | 26 ++-- app/models/rental.rb | 10 +- .../20191108220553_add_column_to_rentals.rb | 5 + ...191108222241_remove_column_from_rentals.rb | 5 + ...108222427_add_another_column_to_rentals.rb | 5 + ...91108224732_add_extra_column_to_rentals.rb | 5 + db/schema.rb | 4 +- test/controllers/movies_controller_test.rb | 64 ++++----- test/controllers/rentals_controller_test.rb | 133 +++++++++--------- test/models/rental_test.rb | 32 +++-- 10 files changed, 162 insertions(+), 127 deletions(-) create mode 100644 db/migrate/20191108220553_add_column_to_rentals.rb create mode 100644 db/migrate/20191108222241_remove_column_from_rentals.rb create mode 100644 db/migrate/20191108222427_add_another_column_to_rentals.rb create mode 100644 db/migrate/20191108224732_add_extra_column_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3c0aa5db4..f20b18ecb 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,20 +1,20 @@ class RentalsController < ApplicationController - + def checkout movie = Rental.find_movie(rental_params) customer = Rental.find_customer(rental_params) - + if movie && customer && movie.available_inventory > 0 rental = Rental.new(rental_params) customer = rental.customer movie = rental.movie - + #Increment the amount of movies the customers has checked out customer.update_movies_checked_out("checkout") - + #Decrease the amount of movies there are available in the movie's available inventory movie.update_available_inventory("checkout") - + if rental.save && customer.save && movie.save render json: rental.as_json(only: [:id]), status: :ok return @@ -23,17 +23,16 @@ def checkout end else render json: { - ok: false, - errors: "none available" + ok: false, + errors: "none available" }, status: :bad_request end end - - + def checkin movie = Rental.find_movie(rental_params) customer = Rental.find_customer(rental_params) - + customer.update_movies_checked_out(checkin) movie.update_available_inventory(checkin) @@ -44,12 +43,11 @@ def checkin bad_request(rental) end end - - + private - + def rental_params params.permit(:movie_id, :customer_id) end - + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 742a5b94a..13b317608 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,19 +4,19 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :movie_id, presence: true - + def check_in end - + def check_out end - + def self.find_customer(rental_params) return Customer.find_by(id: rental_params[:customer_id]) end - + def self.find_movie(rental_params) return Movie.find_by(id: rental_params[:movie_id]) end - + end diff --git a/db/migrate/20191108220553_add_column_to_rentals.rb b/db/migrate/20191108220553_add_column_to_rentals.rb new file mode 100644 index 000000000..7486e7cb6 --- /dev/null +++ b/db/migrate/20191108220553_add_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddColumnToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkout_date, :date, default: -> {'CURRENT_TIMESTAMP'} + end +end diff --git a/db/migrate/20191108222241_remove_column_from_rentals.rb b/db/migrate/20191108222241_remove_column_from_rentals.rb new file mode 100644 index 000000000..c3844a10a --- /dev/null +++ b/db/migrate/20191108222241_remove_column_from_rentals.rb @@ -0,0 +1,5 @@ +class RemoveColumnFromRentals < ActiveRecord::Migration[5.2] + def change + remove_column :rentals, :checkout_date + end +end diff --git a/db/migrate/20191108222427_add_another_column_to_rentals.rb b/db/migrate/20191108222427_add_another_column_to_rentals.rb new file mode 100644 index 000000000..b2e5f21f3 --- /dev/null +++ b/db/migrate/20191108222427_add_another_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddAnotherColumnToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkout_date, :datetime, default: -> {'CURRENT_TIMESTAMP'} + end +end diff --git a/db/migrate/20191108224732_add_extra_column_to_rentals.rb b/db/migrate/20191108224732_add_extra_column_to_rentals.rb new file mode 100644 index 000000000..9263efb89 --- /dev/null +++ b/db/migrate/20191108224732_add_extra_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddExtraColumnToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index d3449d16f..7375ac8db 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_06_235102) do +ActiveRecord::Schema.define(version: 2019_11_08_224732) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,8 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.datetime "checkout_date", default: -> { "CURRENT_TIMESTAMP" } + t.datetime "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 969f98384..df0cdf7ba 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,7 +28,7 @@ def check_response(expected_type:, expected_status: :success) end end - it "will respond with an empty array when there are no movies" do + it "will respond with an empty array when no movies" do Rental.destroy_all #probably have to add some state to the movies, like “isDeleted”? #We can either leave it like this, or add a field to the model so that we can basically leave a Movie in the movies table but have some way to tell that it’s actually deleted and that the controller should filter it out. @@ -60,35 +60,35 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:movie_data) { - { - title: "Babe 2: Pig in the City", - inventory: 2, - overview: "This post-modern gothic addresses themes of loyalty and sacrifice.", - release_date: Date.new(11-1-20), - available_inventory: 10 - } - } - - it "can create a new movie" do - expect { - post movies_path, params: movie_data - }.must_differ 'Movie.count', 1 - - body = check_response(expected_type: Hash, expected_status: :ok) - - new_movie = Movie.find(body["id"]) - expect(body.keys).must_include "id" - end - - it "will respond with bad_request for invalid data" do - movie_data[:title] = nil - - expect { - post movies_path, params: movie_data - }.wont_change "Movie.count" - - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body["errors"].keys).must_include "title" - end - end + { + title: "Babe 2: Pig in the City", + inventory: 2, + overview: "This post-modern gothic addresses themes of loyalty and sacrifice.", + release_date: Date.new(11-1-20), + available_inventory: 10 + } +} + +it "can create a new movie" do + expect { + post movies_path, params: movie_data +}.must_differ 'Movie.count', 1 + +body = check_response(expected_type: Hash, expected_status: :ok) + +new_movie = Movie.find(body["id"]) +expect(body.keys).must_include "id" +end + +it "will respond with bad_request for invalid data" do + movie_data[:title] = nil + + expect { + post movies_path, params: movie_data +}.wont_change "Movie.count" + +body = check_response(expected_type: Hash, expected_status: :bad_request) +expect(body["errors"].keys).must_include "title" +end +end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8b1ce3966..948ec7fc8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe RentalsController do - + def check_response(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' @@ -10,73 +10,76 @@ def check_response(expected_type:, expected_status: :success) expect(body).must_be_kind_of expected_type return body end - - + + let(:customer) { - customers(:three) - } - - let(:movie) { - movies(:one) - } + customers(:three) +} + +let(:movie) { +movies(:one) +} + +let(:rental_data) { +{ +customer_id: customer.id, +movie_id: movie.id, +} +} + +describe "checkout" do + it "responds with success when passed in valid params" do + post checkout_path, params: rental_data + + body = check_response(expected_type: Hash, expected_status: :success) + + # new_rental = Rental.find(body["id"]) + expect(body.keys).must_include "id" + end - let(:rental_data) { - { - customer_id: customer.id, - movie_id: movie.id, - } - } + it "creates a new rental" do + expect { + post checkout_path, params: rental_data + }.must_differ 'Rental.count', 1 - describe "checkout" do - it "responds with success when passed in valid params" do - post checkout_path, params: rental_data - - body = check_response(expected_type: Hash, expected_status: :success) - - # new_rental = Rental.find(body["id"]) - expect(body.keys).must_include "id" - end - - it "creates a new rental" do - expect { - post checkout_path, params: rental_data - }.must_differ 'Rental.count', 1 - - end - - it "updates customer movies_checked_out" do - post checkout_path, params: rental_data - body = check_response(expected_type: Hash, expected_status: :success) - - new_rental = Rental.find(body["id"]) - customer = new_rental.customer - expect(customer.movies_checked_out_count).must_equal 1 - end - - it "updates movie available_inventory" do - post checkout_path, params: rental_data - body = check_response(expected_type: Hash, expected_status: :success) - - new_rental = Rental.find(body["id"]) - movie = new_rental.movie - expect(movie.available_inventory).must_equal 9 - end - - it "responds with bad request when passed invalid params" do - invalid_rental_data = { - customer_id: nil, - movie_id: movie.id - } - - expect{post checkout_path, params: invalid_rental_data}.wont_change 'Rental.count' - - body = check_response(expected_type: Hash, expected_status: :bad_request) - - expect(body["errors"]).must_equal "none available" - end - end +end - describe "checkin" do - end +it "updates customer movies_checked_out" do + post checkout_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :success) + + new_rental = Rental.find(body["id"]) + customer = new_rental.customer + expect(customer.movies_checked_out_count).must_equal 1 +end + +it "updates movie available_inventory" do + post checkout_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :success) + + new_rental = Rental.find(body["id"]) + movie = new_rental.movie + expect(movie.available_inventory).must_equal 9 +end + +it "responds with bad request when passed invalid params" do + invalid_rental_data = { + customer_id: nil, + movie_id: movie.id +} + +expect{post checkout_path, params: invalid_rental_data}.wont_change 'Rental.count' +body = check_response(expected_type: Hash, expected_status: :bad_request) +expect(body["errors"]).must_equal "none available" +end +end + +describe "checkin" do + if test + + else + + end +end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index ceef5bd41..4b69c5601 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -4,51 +4,63 @@ before do @rental = rentals(:one) end - + describe "validations" do it "is valid when all fields are present" do expect(@rental.valid?).must_equal true end - + it "is invalid without a movie" do @rental.movie = nil expect(@rental.valid?).must_equal false end - + it "is invalid without a customer" do @rental.customer = nil expect(@rental.valid?).must_equal false end end - + describe "relationships" do it "belongs to a movie" do expect(@rental.movie).must_be_kind_of Movie end - + it "belongs to a customer" do expect(@rental.customer).must_be_kind_of Customer end - + it "can belong to more than one movie" do rental_two = rentals(:two) rental_three = rentals(:three) result = rental_two.movie == rental_three.movie - + expect(result).must_equal true expect(rental_two).must_be_kind_of Rental expect(rental_three).must_be_kind_of Rental - + end - + it "can belong to more than one customer" do rental_one = rentals(:one) rental_two= rentals(:two) result = rental_one.customer == rental_two.customer - + expect(result).must_equal true expect(rental_one).must_be_kind_of Rental expect(rental_two).must_be_kind_of Rental end end + + describe "find_customer" do + it "finds a customer by id" do + @customer = custumers(:one) + + end + end + + describe "find_movie" do + it "finds a movie by id" do + end + end end From ec2574a01036211c38942ab291f6d5822835f3ae Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 8 Nov 2019 16:44:12 -0800 Subject: [PATCH 21/22] refactoring --- test/models/customer_test.rb | 30 ++++++++++++++---------------- test/models/rental_test.rb | 12 ------------ 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a211a4663..0220a0188 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,20 +4,20 @@ before do @customer = customers(:one) end - + describe "validations" do - + it "is valid when all fields are present" do result = @customer.valid? expect(result).must_equal true end - + it "is invalid without a name" do @customer.name = nil result = @customer.valid? expect(result).must_equal false end - + it "is invalid without a registered at date" do @customer.registered_at = nil refute(@customer.valid?) @@ -27,56 +27,54 @@ @customer.address = nil refute(@customer.valid?) end - + it "is invalid without a city" do @customer.city = nil refute(@customer.valid?) end - + it "is invalid without a state" do @customer.state = nil refute(@customer.valid?) end - + it "is invalid without a postal code" do @customer.postal_code = nil refute(@customer.valid?) end - + it "is invalid without a phone" do @customer.phone = nil refute(@customer.valid?) end - + end - + describe "relationships" do it "can have many rentals" do expect(@customer.rentals.count).must_equal 2 end - + it "can have customers" do expect(@customer.movies.count).must_equal 2 end - + it "cannot have any movies without rentals" do Rental.destroy_all expect(@customer.movies).must_be_empty end - + it "can exist without customers" do Rental.destroy_all Movie.destroy_all result = @customer.valid? expect(result).must_equal true end - + it "can exist without any rentals" do Rental.destroy_all result = @customer.valid? expect(result).must_equal true end - end - end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 4b69c5601..8b27a61f8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -50,17 +50,5 @@ expect(rental_one).must_be_kind_of Rental expect(rental_two).must_be_kind_of Rental end - end - - describe "find_customer" do - it "finds a customer by id" do - @customer = custumers(:one) - - end - end - - describe "find_movie" do - it "finds a movie by id" do - end end end From a4fa8163f1a31ffae93af00478cd8d1e9954b0b2 Mon Sep 17 00:00:00 2001 From: Vi Date: Fri, 8 Nov 2019 16:46:58 -0800 Subject: [PATCH 22/22] updated tests and finished wave3 --- app/controllers/rentals_controller.rb | 6 ++++-- test/controllers/rentals_controller_test.rb | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3ad2b5f08..32adedd4a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,7 +6,6 @@ def checkout if movie && customer && movie.available_inventory > 0 rental = Rental.new(rental_params) - # rental.due_date = rental.checkout_date + 7 customer = rental.customer movie = rental.movie @@ -16,7 +15,10 @@ def checkout #Decrease the amount of movies there are available in the movie's available inventory movie.update_available_inventory("checkout") - if rental.save && customer.save && movie.save + if rental.save && customer.save && movie.save + rental.reload + rental.due_date = rental.checkout_date + 7 + render json: rental.as_json(only: [:id]), status: :ok return else diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 226e4fed6..9a20e313e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -32,7 +32,6 @@ def check_response(expected_type:, expected_status: :success) post checkout_path, params: rental_data body = check_response(expected_type: Hash, expected_status: :success) - # new_rental = Rental.find(body["id"]) expect(body.keys).must_include "id" end