From d1cd55d6137002b9c68299638e22de8cfcc800e3 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 12:05:57 -0700 Subject: [PATCH 01/62] Rails initial setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..d43d20b6e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.6 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..35de2728f --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +DjpUtXwb8/0cFTzZX+I5L8a/+0tuKTDuKVAOnlt0mlx2XDwZgpiofjww5IWImVvMA5/YLiTYrXr9c/zeZOokbDwfOLeOhhaQ9j5dC30r41zJm58FzP3fsPmzCA0xXDSAc+HnpHyLnvBpQTBcJ/02lN1gnXY/sDWXVC1wVakS8QDDkeTQ6PyiO+PupD0OaeCp1ZJi+B2FmR7y8bnyzPUJhlOo+1Fnob/nAwp9s01jLyq7FdCwxdAcsOTKJ6dezMqS0XH7FHtByOVUKs6VqgSmNjq8UxV3SiQBE3fZcHw1IKb+fB1UJDeXUQ65yJOmOJ8GyH46R6n2b9NRwvyitLn+FJtlDdTQ8gppUXTC7yaFgIKFQdZVcw29q/PYJUslP/aySw+3aE9QTTtPDLzPYeas3p6A+JFK4wv7+H1K--sFLrkjNhjFELW6u3--SKXIPLhymtOuitCNK+d/TA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 41542d097649251c0d3ae87ac8bf9661c1344371 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 12:06:40 -0700 Subject: [PATCH 02/62] added routes psueodo draft --- routes_draft.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 routes_draft.txt diff --git a/routes_draft.txt b/routes_draft.txt new file mode 100644 index 000000000..3a6dd9b30 --- /dev/null +++ b/routes_draft.txt @@ -0,0 +1,16 @@ +GET /customers +GET /movies +GET /movies/:id + id +POST /movies + overview string Descriptive summary of the movie + release_date string YYYY-MM-DD Date the movie was released + inventory integer Quantity available in the video store + +POST /rentals/check-out + customer_id integer ID of the customer checking out this film + movie_id integer ID of the movie to be checked out + +POST /rentals/check-in + customer_id integer ID of the customer checking in this film + movie_id integer ID of the movie to be checked in \ No newline at end of file From 10b457aef69f2bb05ff4c0f1b45ada5808ad36c8 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 12:11:41 -0700 Subject: [PATCH 03/62] Generate customers controller --- app/controllers/customers_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From afc48c2b72c062c1f45a7dfcb2820bd8b2e8d3a3 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 12:12:51 -0700 Subject: [PATCH 04/62] Test custom route /zomg --- app/controllers/customers_controller.rb | 4 ++++ config/routes.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..060400308 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def zomg + zomg = ["it works!"] + render json:zomg + end end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..07248b156 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/zomg', to: 'customers#zomg' end From e73abe49039f6778c81db241758488eba5d41ee7 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 12:16:38 -0700 Subject: [PATCH 05/62] model for moview --- app/models/movie.rb | 2 ++ db/migrate/20190514191608_create_movies.rb | 12 ++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/movie_test.rb | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20190514191608_create_movies.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20190514191608_create_movies.rb b/db/migrate/20190514191608_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514191608_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From b3a0be867bf3eee05a40d81219a63e716ef6dfb3 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 12:20:26 -0700 Subject: [PATCH 06/62] added BASIC validations MIN req --- app/models/movie.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..eb5885304 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end From 0b66e820bd9905856a4105d8b0b98daf4d9b698d Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 12:20:57 -0700 Subject: [PATCH 07/62] Generate Customer model & add validations --- app/models/customer.rb | 6 ++++ db/migrate/20190514191448_create_customers.rb | 15 ++++++++++ db/schema.rb | 30 +++++++++++++++++++ test/fixtures/customers.yml | 11 +++++++ test/models/customer_test.rb | 9 ++++++ 5 files changed, 71 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20190514191448_create_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..d8c8c2071 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,6 @@ +class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true +end diff --git a/db/migrate/20190514191448_create_customers.rb b/db/migrate/20190514191448_create_customers.rb new file mode 100644 index 000000000..7dc31531e --- /dev/null +++ b/db/migrate/20190514191448_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/schema.rb b/db/schema.rb new file mode 100644 index 000000000..195f927e9 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,30 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_191448) 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 + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end From e059b6c6ef7edeead65c9b9ebdec80aa868786b3 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 12:21:15 -0700 Subject: [PATCH 08/62] added migration to schema --- db/schema.rb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..03e2d9b5a --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,27 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_191608) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 4202704f61b383d736490aa2a9b523dfb78385ef Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 12:27:19 -0700 Subject: [PATCH 09/62] added rental model with foriegn keys --- app/models/rental.rb | 2 ++ db/migrate/20190514192436_create_rentals.rb | 8 ++++++++ .../20190514192623_add_customer_ref_to_rentals.rb | 5 +++++ .../20190514192647_add_movie_ref_to_rentals.rb | 5 +++++ db/schema.rb | 13 ++++++++++++- test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 7 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514192436_create_rentals.rb create mode 100644 db/migrate/20190514192623_add_customer_ref_to_rentals.rb create mode 100644 db/migrate/20190514192647_add_movie_ref_to_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20190514192436_create_rentals.rb b/db/migrate/20190514192436_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20190514192436_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20190514192623_add_customer_ref_to_rentals.rb b/db/migrate/20190514192623_add_customer_ref_to_rentals.rb new file mode 100644 index 000000000..73afd9cca --- /dev/null +++ b/db/migrate/20190514192623_add_customer_ref_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerRefToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20190514192647_add_movie_ref_to_rentals.rb b/db/migrate/20190514192647_add_movie_ref_to_rentals.rb new file mode 100644 index 000000000..eac10b55b --- /dev/null +++ b/db/migrate/20190514192647_add_movie_ref_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieRefToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 22b86587f..2564ddc91 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_191608) do +ActiveRecord::Schema.define(version: 2019_05_14_192647) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,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/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From dab50eb8ffcd26ba76d38c42f31d611d856aafbd Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 13:27:47 -0700 Subject: [PATCH 10/62] Fix test_helper --- test/test_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 6b38d0acb7fab5e4691f77b2fbf064932bbd5769 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 13:36:30 -0700 Subject: [PATCH 11/62] Add relationships --- app/models/customer.rb | 3 +++ app/models/rental.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index d8c8c2071..301e3e133 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,7 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals + validates :name, presence: true validates :registered_at, presence: true validates :postal_code, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie end From 8acb063f69daeaa09ff465d677ec5403557a2bc3 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 13:36:45 -0700 Subject: [PATCH 12/62] added relationships for movie --- app/models/movie.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index eb5885304..0533a1b45 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals + validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true From 8bf88c35c06bf6eeb09a1c14bf25ca4155c8900b Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 13:41:36 -0700 Subject: [PATCH 13/62] set up ymls for rentals and movies --- test/fixtures/movies.yml | 20 ++++++++++---------- test/fixtures/rentals.yml | 14 +++++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..58f6e3553 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +movie_1: + title: Space Nerds + overview: Many nerds fly through nerds eating nerds + release_date: 2019-05-10 + inventory: 5 -two: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +movie_2: + title: Over the coast + overview: Bird flys over the coast very very far + release_date: 2019-05-13 + inventory: 8 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..4e82b4774 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,12 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value + +rental_1: + movie: movie_1 + customer: customer_1 + +rental_2: + movie: movie_2 + customer: customer_1 + From 9ba89e42ed04fa20193d6a80561f66dd5a93d14b Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 13:43:34 -0700 Subject: [PATCH 14/62] Add customers YML --- test/fixtures/customers.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..5ffe5b843 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,20 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +customer_1: + name: "Bob" + registered_at: Wed, 29 Apr 2015 14:54:14 UTC +00:00 + address: "101 Dalmation St" + city: "Disneytown" + state: "CA" + postal_code: "90210" + phone: "(111) 111-1111" + +customer_2: + name: "Mac" + registered_at: Fri, 22 May 2015 16:56:42 UTC +00:00 + address: "102 Dalmation St" + city: "Disneytown" + state: "CA" + postal_code: "90210" + phone: "(111) 111-1111" \ No newline at end of file From b5e776db4c431ba3dd55885b610d3ef5e0ab260d Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 13:50:07 -0700 Subject: [PATCH 15/62] yml testing --- test/fixtures/movies.yml | 1 + test/models/movie_test.rb | 30 +++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 58f6e3553..e229f16a4 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,3 +11,4 @@ movie_2: overview: Bird flys over the coast very very far release_date: 2019-05-13 inventory: 8 + diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..38566bfd8 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,33 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:movie_1) } - it "must be valid" do - value(movie).must_be :valid? + it "must be valid given complete validations" do + expect(movie.valid?).must_be true + end + + describe "validations" do + it "will not be valid if missing title" do + # movie.title = nil + expect(movie.valid?).must_be false + end + + it "will not be valid if missing overview" do + end + + it "will not be valid if missing release_date" do + end + + it "will not be valid if missing inventory" do + end end end + +# 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 From 3b2a5a60a0626757728deeb05e5f88a0b790e4cf Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 13:57:23 -0700 Subject: [PATCH 16/62] finished validations for movie, set up test scaoffold for relationships movie model --- test/fixtures/movies.yml | 6 ++++++ test/models/movie_test.rb | 30 +++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e229f16a4..558c69176 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -12,3 +12,9 @@ movie_2: release_date: 2019-05-13 inventory: 8 +movie_3: + title: Over the coast II + overview: Bird flys over the coast very very far twice and then get lost + release_date: 2019-05-14 + inventory: 3 + \ No newline at end of file diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 38566bfd8..3286ef22e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -4,22 +4,46 @@ let(:movie) { movies(:movie_1) } it "must be valid given complete validations" do - expect(movie.valid?).must_be true + expect(movie.valid?).must_equal true end describe "validations" do it "will not be valid if missing title" do - # movie.title = nil - expect(movie.valid?).must_be false + movie.title = nil + expect(movie.valid?).must_equal false end it "will not be valid if missing overview" do + movie.overview = nil + expect(movie.valid?).must_equal false end it "will not be valid if missing release_date" do + movie.release_date = nil + expect(movie.valid?).must_equal false end it "will not be valid if missing inventory" do + movie.inventory = nil + expect(movie.valid?).must_equal false + end + end + + describe "relationships" do + describe "rentals, has_many" do + it "can have 0 rentals" do + end + + it "can have 1 or more rentals" do + end + end + + describe "customers, many/through" do + it "can have 0 customers" do + end + + it "can have 1 or more customers" do + end end end end From 37caf537114c70c9e55527d1ad8aa227c1810a7d Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 14:10:28 -0700 Subject: [PATCH 17/62] Test Customer validations & relations --- app/models/customer.rb | 2 +- test/models/customer_test.rb | 52 +++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 301e3e133..dc81002ec 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,7 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - + validates :name, presence: true validates :registered_at, presence: true validates :postal_code, presence: true diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..2490a8a52 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,55 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + before do + @customer = customers(:customer_1) + end + + describe "Validations" do + it "must be valid with valid data" do + @customer.must_be :valid? + end + + it "will not be valid without name" do + @customer.name = nil + expect(@customer.valid?).must_equal false + end + + it "will not be valid without registered_at" do + @customer.registered_at = nil + expect(@customer.valid?).must_equal false + end + + it "will not be valid without postal_code" do + @customer.postal_code = nil + expect(@customer.valid?).must_equal false + end + + it "will not be valid without phone" do + @customer.phone = nil + expect(@customer.valid?).must_equal false + end + end + + describe "relations" do + before do + @cust_with_no_rental = customers(:customer_2) + end + + it "can have 0 rental" do + expect(@cust_with_no_rental.rentals.count).must_equal 0 + end + + it "can have 1 or more rentals" do + expect(@customer.rentals.count).must_equal 2 + end + + it "can have 0 movie" do + expect(@cust_with_no_rental.movies.count).must_equal 0 + end - it "must be valid" do - value(customer).must_be :valid? + it "can have 1 or more movie" do + expect(@customer.movies.count).must_equal 2 + end end end From f73a4f5b1fba153eb55806f854d4b3796cca021c Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 14:15:59 -0700 Subject: [PATCH 18/62] More through relationships test --- test/models/customer_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2490a8a52..350f6b646 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -38,18 +38,24 @@ it "can have 0 rental" do expect(@cust_with_no_rental.rentals.count).must_equal 0 + expect(@cust_with_no_rental.rentals).must_equal [] end it "can have 1 or more rentals" do expect(@customer.rentals.count).must_equal 2 + expect(@customer.rentals.first).must_equal rentals(:rental_1) + expect(@customer.rentals.last).must_equal rentals(:rental_2) end it "can have 0 movie" do expect(@cust_with_no_rental.movies.count).must_equal 0 + expect(@cust_with_no_rental.rentals).must_equal [] end it "can have 1 or more movie" do expect(@customer.movies.count).must_equal 2 + expect(@customer.rentals.first).must_equal rentals(:rental_1) + expect(@customer.rentals.last).must_equal rentals(:rental_2) end end end From 4ce3d9874150bf2ad75af8d8cdd3f6aa7370f937 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 14:17:32 -0700 Subject: [PATCH 19/62] Update YML --- test/fixtures/customers.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 5ffe5b843..f5b9794b7 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -10,7 +10,7 @@ customer_1: address: "101 Dalmation St" city: "Disneytown" state: "CA" - postal_code: "90210" + postal_code: "90202" phone: "(111) 111-1111" customer_2: @@ -19,5 +19,5 @@ customer_2: address: "102 Dalmation St" city: "Disneytown" state: "CA" - postal_code: "90210" - phone: "(111) 111-1111" \ No newline at end of file + postal_code: "55555" + phone: "(222) 222-2222" \ No newline at end of file From b8154d673f7061e9ff85ec4bac7116ba0f56b183 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 14:22:21 -0700 Subject: [PATCH 20/62] testing complete for movie model --- test/models/movie_test.rb | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3286ef22e..b5b0770a5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -32,26 +32,30 @@ describe "relationships" do describe "rentals, has_many" do it "can have 0 rentals" do + movie = movies(:movie_3) + expect(movie.rentals).must_equal [] end it "can have 1 or more rentals" do + expect(movie.rentals).must_equal [rentals(:rental_1)] end end - describe "customers, many/through" do + describe "customers, many/through" do it "can have 0 customers" do + movie = movies(:movie_3) + expect(movie.customers).must_equal [] end it "can have 1 or more customers" do + expect(movie.customers).must_equal [customers(:customer_1)] + rental = Rental.new() + movie.rentals << rental + customers(:customer_2).rentals << rental + movie.reload + expect(movie.customers.sort).must_equal [customers(:customer_1), customers(:customer_2)].sort end end end end -# 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 From acb93cf2565fcc27f6f8376b496eef884f0023e2 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 14:27:27 -0700 Subject: [PATCH 21/62] added extra test to movie model, setup test scaffolding to rental model test --- test/models/movie_test.rb | 5 ++++- test/models/rental_test.rb | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index b5b0770a5..170d29efa 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -38,6 +38,10 @@ it "can have 1 or more rentals" do expect(movie.rentals).must_equal [rentals(:rental_1)] + rental = Rental.new() + movie.rentals << rental + customers(:customer_2).rentals << rental + expect(movie.rentals.sort).must_equal [rentals(:rental_1), rental].sort end end @@ -58,4 +62,3 @@ end end end - diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..1718c89c9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,17 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:rental_1) } it "must be valid" do - value(rental).must_be :valid? + expect(rental.valid?).must_equal true + end + + describe "relationships" do + it "will have one customer and only one" do + end + + it "will have one movie and only one" do + end end end From dc1f872a8e9e608b077b35e4992b1f3438c37f90 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 14:29:45 -0700 Subject: [PATCH 22/62] added relationships tests for rentals --- test/models/rental_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1718c89c9..0d0466be4 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -8,10 +8,12 @@ end describe "relationships" do - it "will have one customer and only one" do + it "will have one customer and only one" do + expect(rental.movie).must_equal movies(:movie_1) end - it "will have one movie and only one" do + it "will have one movie and only one" do + expect(rental.customer).must_equal customers(:customer_1) end end end From 4c4bdec27402a6a4ad217475fab15221611516b3 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 14:34:58 -0700 Subject: [PATCH 23/62] More thorough testing --- test/models/customer_test.rb | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 350f6b646..a7c675836 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -45,17 +45,33 @@ expect(@customer.rentals.count).must_equal 2 expect(@customer.rentals.first).must_equal rentals(:rental_1) expect(@customer.rentals.last).must_equal rentals(:rental_2) + + new_rental = Rental.new() + movie = movies(:movie_2) + movie.rentals << new_rental + + @customer.rentals << new_rental + @customer.reload + expect(@customer.rentals.count).must_equal 3 + expect(@customer.rentals.last).must_equal new_rental end - it "can have 0 movie" do + it "can have 0 movie through rentals" do expect(@cust_with_no_rental.movies.count).must_equal 0 - expect(@cust_with_no_rental.rentals).must_equal [] + expect(@cust_with_no_rental.movies).must_equal [] end - it "can have 1 or more movie" do + it "can have 1 or more movie through rentals" do expect(@customer.movies.count).must_equal 2 - expect(@customer.rentals.first).must_equal rentals(:rental_1) - expect(@customer.rentals.last).must_equal rentals(:rental_2) + expect(@customer.movies.first).must_equal movies(:movie_2) + expect(@customer.movies.last).must_equal movies(:movie_1) + + new_movie = movies(:movie_3) + @customer.movies << new_movie + @customer.reload + + expect(@customer.movies.count).must_equal 3 + expect(@customer.movies.last).must_equal new_movie end end end From 534462a04df65e1c5eff5b2809610326b564c681 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 14:47:34 -0700 Subject: [PATCH 24/62] added routes --- config/routes.rb | 4 +++- test/models/customer_test.rb | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 07248b156..419a13192 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get '/zomg', to: 'customers#zomg' + get "/zomg", to: "customers#zomg" + + resources :movies, only: [:index] end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a7c675836..6f108cdeb 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,28 +9,28 @@ it "must be valid with valid data" do @customer.must_be :valid? end - + it "will not be valid without name" do @customer.name = nil expect(@customer.valid?).must_equal false end - + it "will not be valid without registered_at" do @customer.registered_at = nil expect(@customer.valid?).must_equal false end - + it "will not be valid without postal_code" do @customer.postal_code = nil expect(@customer.valid?).must_equal false end - + it "will not be valid without phone" do @customer.phone = nil expect(@customer.valid?).must_equal false end end - + describe "relations" do before do @cust_with_no_rental = customers(:customer_2) @@ -71,7 +71,7 @@ @customer.reload expect(@customer.movies.count).must_equal 3 - expect(@customer.movies.last).must_equal new_movie + expect(@customer.movies.last).must_equal new_movie end end end From b3249f3e9f8c7874310a769f333978bafd3182b3 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 14:47:44 -0700 Subject: [PATCH 25/62] Add route for Customers Index --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 07248b156..88af596b9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'customers#zomg' + + resources :customers, only: [:index] end From 023993e8bc7638e3d84f534db98fcb359a9f7c02 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:05:08 -0700 Subject: [PATCH 26/62] Add movies_checked_out_count column to Customers --- app/controllers/customers_controller.rb | 6 +++--- ...0029_add_movies_checked_out_count_column_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20190514220029_add_movies_checked_out_count_column_to_customers.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 060400308..b114223ee 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController - def zomg - zomg = ["it works!"] - render json:zomg + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end diff --git a/db/migrate/20190514220029_add_movies_checked_out_count_column_to_customers.rb b/db/migrate/20190514220029_add_movies_checked_out_count_column_to_customers.rb new file mode 100644 index 000000000..7ea710e22 --- /dev/null +++ b/db/migrate/20190514220029_add_movies_checked_out_count_column_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountColumnToCustomers < 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 2564ddc91..fdb758a3a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_192647) do +ActiveRecord::Schema.define(version: 2019_05_14_220029) 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 863f766f390dda1333fc0127777642474d8a5fe0 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 15:05:26 -0700 Subject: [PATCH 27/62] added migration to include available_inventory on movies, updated seed file for defualt to inventory count --- app/controllers/movies_controller.rb | 6 ++++++ config/routes.rb | 2 +- ...90514220129_add_column_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 3 ++- db/seeds.rb | 4 +++- test/controllers/movies_controller_test.rb | 7 +++++++ 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 app/controllers/movies_controller.rb create mode 100644 db/migrate/20190514220129_add_column_available_inventory_to_movies.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..9571afdec --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,6 @@ +class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end +end diff --git a/config/routes.rb b/config/routes.rb index b3e6ba67d..de37a3a24 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ get "/zomg", to: "customers#zomg" resources :movies, only: [:index] - resources :customers, only: [:index] + resources :customers, only: [:index] end diff --git a/db/migrate/20190514220129_add_column_available_inventory_to_movies.rb b/db/migrate/20190514220129_add_column_available_inventory_to_movies.rb new file mode 100644 index 000000000..d62e27652 --- /dev/null +++ b/db/migrate/20190514220129_add_column_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddColumnAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 2564ddc91..cfe5ac55d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_192647) do +ActiveRecord::Schema.define(version: 2019_05_14_220129) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..307b30d26 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) + movie_new = Movie.create!(movie) + movie_new.update(available_inventory: movie_new.inventory) + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 8ec9ef3ee491eed1c4944e69ef8664833a6b23cb Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 15:07:28 -0700 Subject: [PATCH 28/62] updated movies inventory --- app/models/movie.rb | 1 + db/seeds.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0533a1b45..316df004b 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/db/seeds.rb b/db/seeds.rb index 307b30d26..b9be6b6ea 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,5 +5,4 @@ JSON.parse(File.read('db/seeds/movies.json')).each do |movie| movie_new = Movie.create!(movie) movie_new.update(available_inventory: movie_new.inventory) - end From 7ad416eb1dec0d062daad2f421b77890540d684e Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:12:30 -0700 Subject: [PATCH 29/62] Update Customers YML to reflect new column --- test/fixtures/customers.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index f5b9794b7..25e177c8d 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -12,6 +12,7 @@ customer_1: state: "CA" postal_code: "90202" phone: "(111) 111-1111" + movies_checked_out_count: 2 customer_2: name: "Mac" @@ -20,4 +21,5 @@ customer_2: city: "Disneytown" state: "CA" postal_code: "55555" - phone: "(222) 222-2222" \ No newline at end of file + phone: "(222) 222-2222" + movies_checked_out_count: 0 \ No newline at end of file From aa82de82586def07e4700a4d1212db8d53cee4f3 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 15:14:12 -0700 Subject: [PATCH 30/62] updated movie model and tests, and movie yml --- db/seeds.rb | 9 +++++---- test/fixtures/movies.yml | 3 +++ test/models/movie_test.rb | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index b9be6b6ea..9395c80a5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,8 +1,9 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - movie_new = Movie.create!(movie) - movie_new.update(available_inventory: movie_new.inventory) +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| + movie_new = Movie.new(movie) + movie_new.available_inventory = movie_new.inventory + movie_new.save end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 558c69176..268d11a73 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,16 +5,19 @@ movie_1: overview: Many nerds fly through nerds eating nerds release_date: 2019-05-10 inventory: 5 + available_inventory: 5 movie_2: title: Over the coast overview: Bird flys over the coast very very far release_date: 2019-05-13 inventory: 8 + available_inventory: 8 movie_3: title: Over the coast II overview: Bird flys over the coast very very far twice and then get lost release_date: 2019-05-14 inventory: 3 + available_inventory: 3 \ No newline at end of file diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 170d29efa..2b146dc29 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -27,6 +27,11 @@ movie.inventory = nil expect(movie.valid?).must_equal false end + + it "will not be valid if missing available_inventory" do + movie.available_inventory = nil + expect(movie.valid?).must_equal false + end end describe "relationships" do From 0ace69ef087afd4c36b445455b66bfad84aaac54 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:16:54 -0700 Subject: [PATCH 31/62] Update validation & model validation test --- app/models/customer.rb | 1 + test/models/customer_test.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index dc81002ec..d5ec6106f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,5 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true + validates :movies_checked_out_count, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 6f108cdeb..08bd8d064 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -29,6 +29,11 @@ @customer.phone = nil expect(@customer.valid?).must_equal false end + + it "will not be valid without movies_checked_out_count" do + @customer.movies_checked_out_count = nil + expect(@customer.valid?).must_equal false + end end describe "relations" do From 4f7db6ce2b890de82f5eba3eefa35a3f5fcc0b1b Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 15:32:25 -0700 Subject: [PATCH 32/62] added tests for controller movie index action --- test/controllers/movies_controller_test.rb | 33 ++++++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..2959afa0f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + before do + get movies_path + end + it "will get a 200 ok response" do + must_respond_with :ok + end + + it "response will be json" do + expect(response["Content-Type"]).must_include "json" + end + + it "response will be a hash" do + body = JSON.parse(response.body) + expect(body).must_be_kind_of Array + end + + it "return all the movies" do + body = JSON.parse(response.body) + expect(body.length).must_equal Movie.count + end + + it "returns pets with exactly the required fields" do + req_fields = %w(id title release_date) + body = JSON.parse(response.body) + body.each do |movie| + expect(movie.keys.sort).must_equal req_fields.sort + end + end + end end From 0999c6eda073fd60c9dc061df45ce623fc7daf5b Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:34:07 -0700 Subject: [PATCH 33/62] Test Customers Controller Index --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 52 ++++++++++++++++++- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index b114223ee..6116c28ef 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..2f744d143 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,55 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" + describe "index" do + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "returns an array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id name registered_at postal_code phone movies_checked_out_count) + + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys.sort + end + end + end + + + # describe "show" do + # end + + # describe "create" do + # it "creates a new customer given valid data" do + + # end + + # it "returns an error for invalid customer data" do + + # end + # end + end From 534667a728afb7ae728e4a8b66273e27c6f38a4a Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 15:36:21 -0700 Subject: [PATCH 34/62] added routes for next stuffs --- app/controllers/movies_controller.rb | 3 +++ config/routes.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9571afdec..d326a1ff8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,4 +3,7 @@ def index movies = Movie.all render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end + + def show + end end diff --git a/config/routes.rb b/config/routes.rb index de37a3a24..d118b3db3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get "/zomg", to: "customers#zomg" - resources :movies, only: [:index] + resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] end From ca02b88952a88b37e5c7b82619eb98737e1e983d Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:38:58 -0700 Subject: [PATCH 35/62] Add movie create action & strong params --- app/controllers/movies_controller.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d326a1ff8..cdee7ead6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,4 +6,20 @@ def index def show end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { errors: movie.errors.messages }, + status: :bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:id, :title, :release_date) + end end From 7fb28e67f4ff261bb661046b6f96bf279d82a2e3 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:42:27 -0700 Subject: [PATCH 36/62] Update strong params --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index cdee7ead6..0bc8bca03 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,6 +20,6 @@ def create private def movie_params - params.require(:movie).permit(:id, :title, :release_date) + params.require(:movie).permit(:title, :overview, :release_date, :inventory) end end From ee4e8dacad845659b5ff116f4a814948abc9fd08 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:43:20 -0700 Subject: [PATCH 37/62] Set available_inventory --- app/controllers/movies_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0bc8bca03..e18585423 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,6 +9,7 @@ def show def create movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory if movie.save render json: { id: movie.id }, status: :ok else From a23d09a2afa3e09e8cf21cb94245aa0e82d8d3e5 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Tue, 14 May 2019 15:44:59 -0700 Subject: [PATCH 38/62] added show fiq out error --- app/controllers/movies_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d326a1ff8..62c470330 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,5 +5,11 @@ def index end def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(only: [:id, :title, :release_date, :available_inventory, :inventory, :overview]), status: :ok + else + render json: ["wrong info"], status: ok + end end end From bbfe4694e000d88457a6bdfbb181fb0aa6c5a667 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 15:56:20 -0700 Subject: [PATCH 39/62] Remove require(:movie) from strong params --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e18585423..fef42299c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -21,6 +21,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 54813b17f546ca0ff9e41ce1e95f692f776e5d25 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Tue, 14 May 2019 16:37:15 -0700 Subject: [PATCH 40/62] Test movie #create success & failure --- test/controllers/movies_controller_test.rb | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2959afa0f..b25e3e11f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -31,4 +31,40 @@ end end end + + describe "create" do + let(:movie_data) { + { + "title": "Totally Legit Movie Title", + "overview": "It's a totally legit movie.", + "release_date": Date.current, + "inventory": 10, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: movie_data + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + end + + it "returns an error for invalid movie data" do + movie_data["title"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end From 630a21136259ac505fe0857f06315c59a8d7b9de Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 11:25:37 -0700 Subject: [PATCH 41/62] More throrough movies #create tests --- test/controllers/movies_controller_test.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b25e3e11f..b995bebf8 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -47,6 +47,10 @@ post movies_path, params: movie_data }.must_change "Movie.count", 1 + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include "id" @@ -59,12 +63,14 @@ post movies_path, params: movie_data }.wont_change "Movie.count" - body = JSON.parse(response.body) + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include "errors" expect(body["errors"]).must_include "title" - must_respond_with :bad_request end end end From 3a173cd5d8a2ec8fe17c211641f9ef2320f369b7 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 11:52:44 -0700 Subject: [PATCH 42/62] Generate Rentals Controller --- app/controllers/rentals_controller.rb | 9 +++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 2 files changed, 16 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..517ec625b --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,9 @@ +class RentalsController < ApplicationController + def check-out + + end + + def check-in + + end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 49b1861fdfab8324ec971df5eb4e1593b989ca31 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 11:52:57 -0700 Subject: [PATCH 43/62] Add check-out & check-in routes --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index d118b3db3..d01095aeb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,11 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/zomg", to: "customers#zomg" + post "rentals/check-out", to: "rentals#check-out" + post "rentals/check-in", to: "rentals#check-in" + resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] end From b30f1a2ce18e771048fa96e849db29d9a29151fe Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 11:53:48 -0700 Subject: [PATCH 44/62] Renamed methods (without dash) --- app/controllers/rentals_controller.rb | 6 +++--- config/routes.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 517ec625b..74a9ca682 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,9 @@ class RentalsController < ApplicationController - def check-out + def checkout end - def check-in - + def checkin + end end diff --git a/config/routes.rb b/config/routes.rb index d01095aeb..0c975d69d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,10 +1,10 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - + get "/zomg", to: "customers#zomg" - post "rentals/check-out", to: "rentals#check-out" - post "rentals/check-in", to: "rentals#check-in" + post "rentals/check-out", to: "rentals#checkout" + post "rentals/check-in", to: "rentals#checkin" resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] From 17cb4b98de882e7063ba146393af157592c05bc0 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 13:05:42 -0700 Subject: [PATCH 45/62] setup error message --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1980caa77..d781ca8a4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show if movie render json: movie.as_json(only: [:id, :title, :release_date, :available_inventory, :inventory, :overview]), status: :ok else - render json: ["wrong info"], status: ok + render json: {errors: {movie: ["No movie by this id found"]}}, status: :not_found end end From 4a7713eed75cc914f18f122ec8b70c07ca5ad69f Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 13:18:54 -0700 Subject: [PATCH 46/62] strong params for rentals --- app/controllers/rentals_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 74a9ca682..152d45445 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,4 +6,10 @@ def checkout def checkin end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end From f3438a98665857ecfe87bb9d1456dd841995b14c Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 13:39:32 -0700 Subject: [PATCH 47/62] Migration: Add due_date column to Rentals --- db/migrate/20190515203145_add_due_date_column_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190515203145_add_due_date_column_to_rentals.rb diff --git a/db/migrate/20190515203145_add_due_date_column_to_rentals.rb b/db/migrate/20190515203145_add_due_date_column_to_rentals.rb new file mode 100644 index 000000000..d0e16154c --- /dev/null +++ b/db/migrate/20190515203145_add_due_date_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddDueDateColumnToRentals < 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 a5df7f8e6..6eb6baa4b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_220129) do +ActiveRecord::Schema.define(version: 2019_05_15_203145) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + 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 From e8c69ada710cbdcb743084d4ee5f1b1124bb554a Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 13:59:33 -0700 Subject: [PATCH 48/62] Add Rentals checkout action --- app/controllers/rentals_controller.rb | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 152d45445..8e373cf31 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,12 +1,26 @@ +# frozen_string_literal: true + class RentalsController < ApplicationController def checkout + rental = Rental.new(rental_params) + rental.save - end - - def checkin + rental.movie.available_inventory -= 1 + rental.movie.save + rental.customer.movies_checked_out_count += 1 + rental.customer.save + rental.due_date = rental.created_at + 7 + if rental.save + render json: rental.as_json(only: %i[customer_id movie_id]), status: :ok + else + render json: { errors: rental.errors.messages }, + status: :bad_request + end end + def checkin; end + private def rental_params From ab68f9866acfea77409c74d5f2ed1d58784f3d15 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 14:00:28 -0700 Subject: [PATCH 49/62] workingon checkin controller --- app/controllers/rentals_controller.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 152d45445..3563e92f3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,10 +1,19 @@ class RentalsController < ApplicationController def checkout - end def checkin - + customer = Customer.find_by(id: rental_params[:customer_id]) + movie = Movie.find_by(id: rental_params[:movie_id]) + if customer && movie + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental.destroy + movie.update(available_inventory: movie.available_inventory + 1) + customer.update(movies_checked_out_count: customer.movies_checked_out_count + 1) + render json: { status: :ok } + else + render json: { errors: { movie: ["No movie by this id found"] } }, status: :not_found + end end private From 128bc1783334bf9e1b41af78c372cb13150f3ea2 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 14:08:52 -0700 Subject: [PATCH 50/62] Add path helpers for checkin & checkout --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 0c975d69d..1aa8aba25 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ get "/zomg", to: "customers#zomg" - post "rentals/check-out", to: "rentals#checkout" - post "rentals/check-in", to: "rentals#checkin" + post "rentals/check-out", to: "rentals#checkout", as "checkout" + post "rentals/check-in", to: "rentals#checkin", as "checkin" resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] From 50e46619299bbda44769b105570d10d80e232552 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 14:11:37 -0700 Subject: [PATCH 51/62] Add colons --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 1aa8aba25..c1ebca81d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ get "/zomg", to: "customers#zomg" - post "rentals/check-out", to: "rentals#checkout", as "checkout" - post "rentals/check-in", to: "rentals#checkin", as "checkin" + post "rentals/check-out", to: "rentals#checkout", as: "checkout" + post "rentals/check-in", to: "rentals#checkin", as: "checkin" resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] From ad45eba3dfdcc7d71efaa7742867a1af16492f85 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 14:41:38 -0700 Subject: [PATCH 52/62] Handles cases if movie / customer is nil --- app/controllers/rentals_controller.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8e373cf31..a14bec193 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,11 +5,13 @@ def checkout rental = Rental.new(rental_params) rental.save - rental.movie.available_inventory -= 1 - rental.movie.save - rental.customer.movies_checked_out_count += 1 - rental.customer.save - rental.due_date = rental.created_at + 7 + if rental.movie && rental.customer + rental.movie.available_inventory -= 1 + rental.movie.save + rental.customer.movies_checked_out_count += 1 + rental.customer.save + rental.due_date = rental.created_at + 7 + end if rental.save render json: rental.as_json(only: %i[customer_id movie_id]), status: :ok From a8fb87d7b6d875a67516980b4294cafbf56ce4ea Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 14:42:03 -0700 Subject: [PATCH 53/62] Test Rentals checkout action --- test/controllers/rentals_controller_test.rb | 69 ++++++++++++++++++++- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..3d0ab93ad 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,70 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkout" do + let(:rental_data) { + { + customer_id: (customers(:customer_1).id), + movie_id: (movies(:movie_2).id) + } + } + + it "creates a new rental given customer & movie IDs" do + expect { + post checkout_path, params: rental_data + }.must_change "Rental.count", +1 + + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "customer_id" + expect(body).must_include "movie_id" + + rental = Rental.last + + expect(rental.customer_id).must_equal rental_data[:customer_id] + expect(rental.movie_id).must_equal rental_data[:movie_id] + end + + it "returns an error for rental made without customer id" do + # arrange + rental_data["customer_id"] = nil + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer" + end + + it "returns an error for rental made without movie id" do + # arrange + rental_data["movie_id"] = nil + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "movie" + end + end end From fe31803d5be29a5cde4ecc7cbb4708623f1ab86b Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 14:49:47 -0700 Subject: [PATCH 54/62] added tests for controller action rentals#checkin --- app/controllers/rentals_controller.rb | 9 ++-- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 59 +++++++++++++++++++-- 3 files changed, 62 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f1145fcd2..fae7e2d54 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -22,14 +22,15 @@ def checkout def checkin customer = Customer.find_by(id: rental_params[:customer_id]) movie = Movie.find_by(id: rental_params[:movie_id]) - if customer && movie - rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental = Rental.find_by(customer_id: rental_params[:customer_id], movie_id: rental_params[:movie_id]) + if customer && movie && rental rental.destroy movie.update(available_inventory: movie.available_inventory + 1) - customer.update(movies_checked_out_count: customer.movies_checked_out_count + 1) + customer.update(movies_checked_out_count: customer.movies_checked_out_count - 1) render json: { status: :ok } else - render json: { errors: { movie: ["No movie by this id found"] } }, status: :not_found + render json: { errors: { rental: ["Rental not found for customer ID #{rental_params[:customer_id]}, and movie ID #{rental_params[:movie_id]}"] } }, + status: :not_found end end diff --git a/config/routes.rb b/config/routes.rb index 0c975d69d..05f53de57 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ get "/zomg", to: "customers#zomg" post "rentals/check-out", to: "rentals#checkout" - post "rentals/check-in", to: "rentals#checkin" + post "rentals/check-in", to: "rentals#checkin", as: "checkin" resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..2df12af0a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,60 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkin" do + let(:customer) { customers(:customer_1) } + let(:movie) { movies(:movie_1) } + let(:check_in_params) { + { customer_id: customer.id, + movie_id: movie.id } + } + it "will return ok, response body is json & hash" do + post checkin_path, params: check_in_params + must_respond_with :ok + expect(response["Content-Type"]).must_include "json" + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body["status"]).must_equal "ok" + end + + it "will decrease rental count" do + expect { + post checkin_path, params: check_in_params + }.must_change "Rental.count", -1 + end + + it "will decrease customer movies_checked_out_count by 1" do + intitial = customer.movies_checked_out_count + post checkin_path, params: check_in_params + customer.reload + expect(customer.movies_checked_out_count).must_equal intitial - 1 + end + + it "will increase movie available inventory" do + intitial = movie.available_inventory + post checkin_path, params: check_in_params + movie.reload + expect(movie.available_inventory).must_equal intitial + 1 + end + + it "will return 404 if invalid rental params sent and not change rentals, movies, or customers" do + intitial_movie = movie.available_inventory + intitial_cust = customer.movies_checked_out_count + expect { + post checkin_path, params: { customer_id: -1, + movie_id: movie.id } + }.wont_change "Rental.count" + + customer.reload + movie.reload + expect(movie.available_inventory).must_equal intitial_movie + + must_respond_with :not_found + + expect(response["Content-Type"]).must_include "json" + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body["errors"]).must_equal "rental"=>["Rental not found for customer ID -1, and movie ID 485665370"] + end + end end From dbedf4d7ebbf618795cbdbd12270e555df1809cb Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 14:56:20 -0700 Subject: [PATCH 55/62] merge conflict --- config/routes.rb | 4 ---- test/controllers/rentals_controller_test.rb | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 58053a821..c1ebca81d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,11 +3,7 @@ get "/zomg", to: "customers#zomg" -<<<<<<< HEAD - post "rentals/check-out", to: "rentals#checkout" -======= post "rentals/check-out", to: "rentals#checkout", as: "checkout" ->>>>>>> a8fb87d7b6d875a67516980b4294cafbf56ce4ea post "rentals/check-in", to: "rentals#checkin", as: "checkin" resources :movies, only: [:index, :show, :create] diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 14e47e1d6..047337780 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe RentalsController do -<<<<<<< HEAD describe "checkin" do let(:customer) { customers(:customer_1) } let(:movie) { movies(:movie_1) } @@ -55,24 +54,26 @@ expect(response["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body["errors"]).must_equal "rental"=>["Rental not found for customer ID -1, and movie ID 485665370"] -======= + expect(body["errors"]).must_equal "rental" => ["Rental not found for customer ID -1, and movie ID 485665370"] + end + end + describe "checkout" do let(:rental_data) { { customer_id: (customers(:customer_1).id), - movie_id: (movies(:movie_2).id) + movie_id: (movies(:movie_2).id), } } it "creates a new rental given customer & movie IDs" do expect { - post checkout_path, params: rental_data - }.must_change "Rental.count", +1 + post checkout_path, params: rental_data + }.must_change "Rental.count", +1 must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body).must_be_kind_of Hash @@ -95,7 +96,7 @@ must_respond_with :bad_request - expect(response.header['Content-Type']).must_include 'json' + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) @@ -114,14 +115,13 @@ must_respond_with :bad_request - expect(response.header['Content-Type']).must_include 'json' + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include "errors" expect(body["errors"]).must_include "movie" ->>>>>>> a8fb87d7b6d875a67516980b4294cafbf56ce4ea end end end From db17eff3412b95f01395ee4432607f637ffd6f68 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 15:05:55 -0700 Subject: [PATCH 56/62] added tests for show --- test/controllers/movies_controller_test.rb | 40 +++++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b995bebf8..744b425f4 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -13,7 +13,7 @@ expect(response["Content-Type"]).must_include "json" end - it "response will be a hash" do + it "response will be a Array" do body = JSON.parse(response.body) expect(body).must_be_kind_of Array end @@ -32,9 +32,39 @@ end end + describe "show" do + let(:movie) { movies(:movie_1) } + before do + get movie_path(movie.id) + end + it "will get a 200 ok response" do + must_respond_with :ok + end + + it "response will be json" do + expect(response["Content-Type"]).must_include "json" + end + + it "response will be a hash" do + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + end + + it "returns 1 movies" do + body = JSON.parse(response.body) + expect(body["title"]).must_equal movie.title + end + + it "returns pets with exactly the required fields" do + req_fields = ["available_inventory", "id", "inventory", "overview", "release_date", "title"] + body = JSON.parse(response.body) + expect(body.keys.sort).must_equal req_fields.sort + end + end + describe "create" do let(:movie_data) { - { + { "title": "Totally Legit Movie Title", "overview": "It's a totally legit movie.", "release_date": Date.current, @@ -44,12 +74,12 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: movie_data + post movies_path, params: movie_data }.must_change "Movie.count", 1 must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body).must_be_kind_of Hash @@ -65,7 +95,7 @@ must_respond_with :bad_request - expect(response.header['Content-Type']).must_include 'json' + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body).must_be_kind_of Hash From 84d77f38bd86242fab43530a3b16513b6d6eb0c4 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 15:06:52 -0700 Subject: [PATCH 57/62] formatting update --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dba7a36a0..af85712e5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show if movie render json: movie.as_json(only: [:id, :title, :release_date, :available_inventory, :inventory, :overview]), status: :ok else - render json: {errors: {movie: ["No movie by this id found"]}}, status: :not_found + render json: { errors: { movie: ["No movie by this id found"] } }, status: :not_found end end From 768197940be59dd08d9bb3df92ae84a78c911c84 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 15:21:35 -0700 Subject: [PATCH 58/62] added negative test case for 0 movies on index --- test/controllers/movies_controller_test.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 744b425f4..c58f4f215 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -23,6 +23,15 @@ expect(body.length).must_equal Movie.count end + it "0 movies returns an empty array w/ ok status" do + Rental.destroy_all + Movie.destroy_all + get movies_path + must_respond_with :ok + body = JSON.parse(response.body) + expect(body).must_be_kind_of Array + end + it "returns pets with exactly the required fields" do req_fields = %w(id title release_date) body = JSON.parse(response.body) From f400575640d63d604144b7c5fd23031fa0cc2f42 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 15:23:14 -0700 Subject: [PATCH 59/62] added movies controller neg test for index --- test/controllers/movies_controller_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c58f4f215..5bf2a2f6b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -30,6 +30,7 @@ must_respond_with :ok body = JSON.parse(response.body) expect(body).must_be_kind_of Array + expect(body).must_equal [] end it "returns pets with exactly the required fields" do From de8e10c002980710871190ae905635d625c75869 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 15:24:17 -0700 Subject: [PATCH 60/62] Add negative test case for Customer #index --- test/controllers/customers_controller_test.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2f744d143..e7f7798af 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -35,6 +35,19 @@ customer.keys.sort.must_equal keys.sort end end + + it "loads even when there is no customer" do + Rental.destroy_all + Customer.destroy_all + + get customers_path + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.length.must_equal 0 + end end From a168ededbded33c3a716757f1f1295c017072624 Mon Sep 17 00:00:00 2001 From: qqdipps Date: Wed, 15 May 2019 15:40:51 -0700 Subject: [PATCH 61/62] finished adding neg test for movies --- test/controllers/movies_controller_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5bf2a2f6b..505db35ba 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -47,6 +47,7 @@ before do get movie_path(movie.id) end + it "will get a 200 ok response" do must_respond_with :ok end @@ -70,6 +71,13 @@ body = JSON.parse(response.body) expect(body.keys.sort).must_equal req_fields.sort end + + it "invalid movie id with return not found" do + get movie_path(-1) + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body["errors"]).must_equal "movie" => ["No movie by this id found"] + end end describe "create" do From a34e474782c4b1d794293aabf0949e4c9e500a05 Mon Sep 17 00:00:00 2001 From: Pauline Sauget Date: Wed, 15 May 2019 15:52:01 -0700 Subject: [PATCH 62/62] Test updated attributes for checkout action --- test/controllers/rentals_controller_test.rb | 28 ++++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 047337780..1b8c2b914 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,12 +1,13 @@ require "test_helper" describe RentalsController do + let(:customer) { customers(:customer_1) } + let(:movie) { movies(:movie_1) } + describe "checkin" do - let(:customer) { customers(:customer_1) } - let(:movie) { movies(:movie_1) } let(:check_in_params) { - { customer_id: customer.id, - movie_id: movie.id } + { customer_id: customer.id, + movie_id: movie.id } } it "will return ok, response body is json & hash" do post checkin_path, params: check_in_params @@ -123,5 +124,24 @@ expect(body).must_include "errors" expect(body["errors"]).must_include "movie" end + + it "will increase customer movies_checked_out_count" do + before_count = customer.movies_checked_out_count + + post checkout_path, params: rental_data + customer.reload + + expect(customer.movies_checked_out_count).must_equal before_count +1 + end + + it "will decrease movie available inventory" do + test_movie = movies(:movie_2) + before_count = test_movie.available_inventory + + post checkout_path, params: rental_data + test_movie.reload + + expect(test_movie.available_inventory).must_equal before_count -1 + end end end