From 786aa866c56bac43663c469210ec43b070c26bb5 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 14:41:03 -0700 Subject: [PATCH 01/46] create new rails api app --- .gitignore | 16 ++ Gemfile | 50 ++++++ Gemfile.lock | 154 ++++++++++++++++++ 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 | 35 ++++ bin/spring | 17 ++ bin/update | 29 ++++ config.ru | 5 + config/application.rb | 40 +++++ config/boot.rb | 3 + config/cable.yml | 10 ++ config/database.yml | 85 ++++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 ++++++ config/environments/production.rb | 83 ++++++++++ config/environments/test.rb | 42 +++++ .../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 | 56 +++++++ config/routes.rb | 3 + config/secrets.yml | 32 ++++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + 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 | 26 +++ tmp/.keep | 0 vendor/.keep | 0 53 files changed, 907 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock 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/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt 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..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# 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 + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..78bff8d26 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# 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 Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# 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..e547d2449 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,154 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + 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.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.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.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.1 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..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +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..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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..2fe7718ea --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +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.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # 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..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production 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..abc82221c --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +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. + 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.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # 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 + + + # 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..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = 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 + + # 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..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +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.seconds.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 + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# 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/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..7a379633f --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 846e9a7ecf80786b0760a80941b412a018050f4ce46e51e202e7d3ae734b37d31a207e8dc6da83586784b61be7dd445e1b9a96d65fab5a103b55534d83ee0e3a + +test: + secret_key_base: 80f8ebf4f09a5dbd97c5d89f14bed3e126f09148dadd189bc68531b4bdf9af09e24feb9a33e03577253555819e1717f445855f212745bbd3878f2515e4b47b97 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /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/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/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..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +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 f3beb43b2a449f54df47c52665b552c1fbee81ad Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 14:55:12 -0700 Subject: [PATCH 02/46] create customers controller --- app/controllers/customers_controller.rb | 2 ++ db/schema.rb | 18 ++++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +++++++ 3 files changed, 27 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 db/schema.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/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end 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 1886154612e886a9837f47cec50f427b1328afb1 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 14:58:48 -0700 Subject: [PATCH 03/46] Create customer model --- app/models/customer.rb | 2 ++ db/migrate/20180507215729_create_customers.rb | 15 +++++++++++++++ db/schema.rb | 14 +++++++++++++- test/fixtures/customers.yml | 19 +++++++++++++++++++ test/models/customer_test.rb | 9 +++++++++ 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20180507215729_create_customers.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/db/migrate/20180507215729_create_customers.rb b/db/migrate/20180507215729_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180507215729_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + 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 index 2611543b3..fdcaa11be 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,21 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20180507215729) 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..66881755a --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-05-07 14:57:29 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 14:57:29 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end From 2e5267670862c42f5f72f55aca7f119ee9266919 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 15:08:34 -0700 Subject: [PATCH 04/46] Add relations to customer class --- app/models/customer.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..1d05ffeba 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals end From 3421d2dcb7a1db64738800a9aaa2f8636035dc42 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 15:09:45 -0700 Subject: [PATCH 05/46] added in movies controller and model --- app/controllers/movies_controller.rb | 2 ++ app/models/movie.rb | 4 ++++ db/migrate/20180507215933_create_movies.rb | 13 ++++++++++ db/schema.rb | 28 ++++++++++++++++++++++ test/controllers/movies_controller_test.rb | 7 ++++++ test/fixtures/movies.yml | 15 ++++++++++++ test/models/movie_test.rb | 9 +++++++ 7 files changed, 78 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20180507215933_create_movies.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..6237ce84b --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,4 @@ +class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals +end diff --git a/db/migrate/20180507215933_create_movies.rb b/db/migrate/20180507215933_create_movies.rb new file mode 100644 index 000000000..089a884a3 --- /dev/null +++ b/db/migrate/20180507215933_create_movies.rb @@ -0,0 +1,13 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..8e270511b --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# 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: 20180507215933) 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.integer "available_inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +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 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..b997d3e77 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 + available_inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 + available_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 d9e2415314ae5cc54147a45f25a8543a880ce133 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 15:24:31 -0700 Subject: [PATCH 06/46] added rental model and foreign key relations --- app/models/rental.rb | 2 ++ db/migrate/20180507221506_create_rentals.rb | 9 ++++++ ...80507222050_add_foreign_keys_to_rentals.rb | 4 +++ ...dd_foreign_keys_to_rentals_for_realsies.rb | 6 ++++ db/schema.rb | 29 +++++++++++++------ test/fixtures/rentals.yml | 11 +++++++ test/models/rental_test.rb | 9 ++++++ 7 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180507221506_create_rentals.rb create mode 100644 db/migrate/20180507222050_add_foreign_keys_to_rentals.rb create mode 100644 db/migrate/20180507222307_add_foreign_keys_to_rentals_for_realsies.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/20180507221506_create_rentals.rb b/db/migrate/20180507221506_create_rentals.rb new file mode 100644 index 000000000..2c4e39a06 --- /dev/null +++ b/db/migrate/20180507221506_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + add_reference :rentals, :movies, foreign_key: true + add_reference :rentals, :customers, foreign_key: true + t.timestamps + end + end +end diff --git a/db/migrate/20180507222050_add_foreign_keys_to_rentals.rb b/db/migrate/20180507222050_add_foreign_keys_to_rentals.rb new file mode 100644 index 000000000..fa4102fc5 --- /dev/null +++ b/db/migrate/20180507222050_add_foreign_keys_to_rentals.rb @@ -0,0 +1,4 @@ +class AddForeignKeysToRentals < ActiveRecord::Migration[5.1] + def change + end +end diff --git a/db/migrate/20180507222307_add_foreign_keys_to_rentals_for_realsies.rb b/db/migrate/20180507222307_add_foreign_keys_to_rentals_for_realsies.rb new file mode 100644 index 000000000..7dd6901e3 --- /dev/null +++ b/db/migrate/20180507222307_add_foreign_keys_to_rentals_for_realsies.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRentalsForRealsies < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :movies, foreign_key: true + add_reference :rentals, :customers, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index d3d683ca4..c7dbe2245 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,23 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180507215933) do +ActiveRecord::Schema.define(version: 20180507222307) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" @@ -25,16 +37,15 @@ t.datetime "updated_at", null: false end - 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" + create_table "rentals", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "movies_id" + t.bigint "customers_id" + t.index ["customers_id"], name: "index_rentals_on_customers_id" + t.index ["movies_id"], name: "index_rentals_on_movies_id" end + add_foreign_key "rentals", "customers", column: "customers_id" + add_foreign_key "rentals", "movies", column: "movies_id" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..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 625a9a547edfc742cd92b6e4821f52b9b1c5038a Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 15:27:48 -0700 Subject: [PATCH 07/46] added rentals controller, added relations to rentals --- app/controllers/rentals_controller.rb | 2 ++ app/models/rental.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 3 files changed, 11 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..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer 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 45fcc91ae116c023518a33ffa0837642c1dace07 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 15:44:06 -0700 Subject: [PATCH 08/46] Add /zomg route and confirm it works --- app/controllers/movies_controller.rb | 5 +++++ config/routes.rb | 1 + 2 files changed, 6 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..5830e6cfd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,7 @@ class MoviesController < ApplicationController + + def zomg + render :json => { message: "It works!" } + end + end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..a0f4da001 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: 'movies#zomg', as: 'zomg' end From cbc6002faf43b15d777d2a4ad4d7d84396c63787 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 15:55:15 -0700 Subject: [PATCH 09/46] added model validations to customer and movie --- app/models/customer.rb | 3 +++ app/models/movie.rb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 1d05ffeba..90db60973 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 + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 6237ce84b..9140508c5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,8 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + validates :title, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 1 } + validates :available_inventory, presence: true, numericality: { only_integer: true } end From 41168b6b448a918892fd2ddb13e5a7182d4f7891 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 16:32:23 -0700 Subject: [PATCH 10/46] added and passing customer validation tests --- test/models/customer_test.rb | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..8994a179d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,30 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + describe 'validations' do + before do + @old_customer_count = Customer.count + end + it 'will not create have a name' do + customer = Customer.new(name: "Honey BooBoo") + + customer.must_be :valid? + + customer.save + + Customer.count.must_equal @old_customer_count + 1 + end + + it 'is invaild without a name' do + customer = Customer.new(name: nil) + + customer.wont_be :valid? + + customer.save + + Customer.count.must_equal @old_customer_count + end end + end From 77e01eba3a4e318b6fadda15976876cf07f651a3 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 16:40:45 -0700 Subject: [PATCH 11/46] Build tests for validations on movie model --- app/models/movie.rb | 2 +- test/fixtures/movies.yml | 12 ++++++------ test/models/movie_test.rb | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 9140508c5..1288c99ae 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,6 +3,6 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals validates :title, presence: true - validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 1 } + validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0 } validates :available_inventory, presence: true, numericality: { only_integer: true } end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index b997d3e77..49aba041f 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString +movie_one: + title: movie_one + overview: movie_one_overview release_date: 2018-05-07 inventory: 1 available_inventory: 1 -two: - title: MyString - overview: MyString +movie_two: + title: movie_two + overview: movie_two_overview release_date: 2018-05-07 inventory: 1 available_inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..09dd7bbeb 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,37 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + describe 'validations' do + + before do + @movie = Movie.new(title: 'test movie', inventory: 1, available_inventory: 1) + end + + it "is valid when all required fields are present" do + result = @movie.valid? + result.must_equal true + end + + it "is invalid without a title" do + @movie.title = nil + result = @movie.valid? + result.must_equal false + @movie.errors.messages.must_include :title + end + + it "is invalid if the inventory is less than 1 " do + @movie.inventory = 0 + result = @movie.valid? + result.must_equal false + @movie.errors.messages.must_include :inventory + end + + it "is invalid if the available inventory is not a number" do + @movie.available_inventory = nil + result = @movie.valid? + result.must_equal false + @movie.errors.messages.must_include :available_inventory + end - it "must be valid" do - value(movie).must_be :valid? end end From f0987f09bca75c523c7ea8a911033e3477f5876b Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 17:19:54 -0700 Subject: [PATCH 12/46] write some tests --- ...00930_change_ref_to_singular_on_rentals.rb | 6 ++++ db/schema.rb | 14 +++++----- test/fixtures/customers.yml | 28 +++++++++---------- test/fixtures/movies.yml | 24 ++++++++-------- test/fixtures/rentals.yml | 12 ++++---- test/models/movie_test.rb | 21 ++++++++++++++ 6 files changed, 67 insertions(+), 38 deletions(-) create mode 100644 db/migrate/20180508000930_change_ref_to_singular_on_rentals.rb diff --git a/db/migrate/20180508000930_change_ref_to_singular_on_rentals.rb b/db/migrate/20180508000930_change_ref_to_singular_on_rentals.rb new file mode 100644 index 000000000..68bed5cab --- /dev/null +++ b/db/migrate/20180508000930_change_ref_to_singular_on_rentals.rb @@ -0,0 +1,6 @@ +class ChangeRefToSingularOnRentals < ActiveRecord::Migration[5.1] + def change + rename_column :rentals, :movies_id, :movie_id + rename_column :rentals, :customers_id, :customer_id + end +end diff --git a/db/schema.rb b/db/schema.rb index c7dbe2245..44e1c1a52 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: 20180507222307) do +ActiveRecord::Schema.define(version: 20180508000930) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -40,12 +40,12 @@ create_table "rentals", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.bigint "movies_id" - t.bigint "customers_id" - t.index ["customers_id"], name: "index_rentals_on_customers_id" - t.index ["movies_id"], name: "index_rentals_on_movies_id" + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end - add_foreign_key "rentals", "customers", column: "customers_id" - add_foreign_key "rentals", "movies", column: "movies_id" + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 66881755a..1185fc98e 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - registered_at: 2018-05-07 14:57:29 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Harry Potter + registered_at: 2017-05-05 14:57:29 + address: Under the stairs, 4 Privet Drive + city: Little Whinging + state: Surrey + postal_code: 12345 + phone: 123-456-7890 two: - name: MyString - registered_at: 2018-05-07 14:57:29 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Moaning Myrtle + registered_at: 2008-02-10 14:57:29 + address: That One Bathroom + city: Hogwarts + state: Magicville + postal_code: 88888 + phone: 987-654-3210 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 49aba041f..1ea016f30 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -movie_one: - title: movie_one - overview: movie_one_overview - release_date: 2018-05-07 - inventory: 1 - available_inventory: 1 +one: + title: The Grinch Who Stole Christmas + overview: Oscar the Grouch's northern cousin learns how to enjoy Christmas. Mild parentals issues in that it normalizes breaking and entering and robbery. + release_date: 1966-12-18 + inventory: 3 + available_inventory: 3 -movie_two: - title: movie_two - overview: movie_two_overview - release_date: 2018-05-07 - inventory: 1 - available_inventory: 1 +two: + title: Gone With the Wind + overview: Scarlett's life goes from teenage first world problems to grown up real world problems. Much feelings. So real. + release_date: 1940-01-17 + inventory: 5 + available_inventory: 5 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..9b13481f9 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,10 @@ # 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 +one: + movie_id: one + customer_id: two + +two: + movie_id: two + customer_id: one diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 09dd7bbeb..f0e60fa62 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -34,4 +34,25 @@ end end + + describe 'relations' do + + before do + @movie = movies(:one) + end + + it "has many rentals" do + @movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + + it "has a list of customers who rented it" do + @movie.customers.each do |customer| + customer.must_be_kind_of Customer + end + end + + end + end From 22c1bf7f9a142fbde57127726bb962c51bd5455a Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 17:24:37 -0700 Subject: [PATCH 13/46] wrote relations tests --- test/fixtures/customers.yml | 28 ++++++++++++++-------------- test/fixtures/movies.yml | 20 ++++++++++---------- test/fixtures/rentals.yml | 12 +++++++----- test/models/customer_test.rb | 24 ++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 29 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 66881755a..aaac370cc 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - registered_at: 2018-05-07 14:57:29 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Harry Potter + registered_at: 2017-05-05 14:57:29 + address: Under the stairs, 4 Privet Drive + city: Little Whinging + state: Surrey + postal_code: 12345 + phone: 123-456-7890 two: - name: MyString - registered_at: 2018-05-07 14:57:29 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Moaning Myrtle + registered_at: 2008-02-10 14:57:29 + address: That One Bathroom + city: Hogwarts + state: Magicville + postal_code: 88888 + phone: 987-654-3210 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index b997d3e77..2f7389c39 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString - release_date: 2018-05-07 - inventory: 1 - available_inventory: 1 + title: The Grinch Who Stole Christmas + overview: Oscar the Grouch's northern cousin learns how to enjoy Christmas. Mild parentals issues in that it normalizes breaking and entering and robbery. + release_date: 1966-12-18 + inventory: 3 + available_inventory: 3 two: - title: MyString - overview: MyString - release_date: 2018-05-07 - inventory: 1 - available_inventory: 1 + title: Gone With the Wind + overview: Scarlett's life goes from teenage first world problems to grown up real world problems. Much feelings. So real. + release_date: 1940-01-17 + inventory: 5 + available_inventory: 5 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..38e8cfff4 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,10 @@ # 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 +one: + movie_id: one + customer_id: two + +two: + movie_id: two + customer_id: one diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 8994a179d..b127b6b5a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -27,4 +27,28 @@ end end + describe 'relations' do + + before do + @customer = customer(:one) + end + + it 'connects rental and rentals_id' do + + rental = rentals(:two) + + @customer.rentals.must_include rental + + end + + it 'connects movie and movies_id' do + + movie = movies(:two) + + @customer.movie.must_be movie + + end + + end + end From 0f98b40f565595b0d1b3a9a4b926534231e2c110 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 17:36:03 -0700 Subject: [PATCH 14/46] revised relations tests, passing --- test/models/customer_test.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b127b6b5a..7fa542549 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -30,22 +30,21 @@ describe 'relations' do before do - @customer = customer(:one) + @customer = customers(:one) end - it 'connects rental and rentals_id' do - - rental = rentals(:two) - - @customer.rentals.must_include rental + it 'has many rentals' do + @customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end end - it 'connects movie and movies_id' do - - movie = movies(:two) + it 'has many movies' do - @customer.movie.must_be movie + @customer.movies.each do |movie| + movie.must_be_kind_of Movie + end end From aed934236928a4a41bcb975cdf7ab3b536cd37cc Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 17:47:22 -0700 Subject: [PATCH 15/46] added in negative test cases for relations --- test/models/customer_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7fa542549..0a4a6e6d1 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -40,6 +40,7 @@ end end + it 'has many movies' do @customer.movies.each do |movie| @@ -48,6 +49,16 @@ end + it 'returns an empty array of movies if no rentals placed' do + + test_customer = Customer.new(name: "Napoleon Dynomite") + + test_customer.save + + test_customer.rentals.must_equal [] + test_customer.movies.must_equal [] + end + end end From 08624489471cd2d03e2602892036579262e6d8b1 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 17:48:56 -0700 Subject: [PATCH 16/46] add test for if the movie has not been renter --- test/models/movie_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f0e60fa62..5a7c0a15c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -53,6 +53,12 @@ end end + it "returns an empty array if the movie has not been rented" do + new_movie = Movie.create!(title: 'test', inventory: 2, available_inventory: 2) + new_movie.rentals.must_equal [] + new_movie.customers.must_equal [] + end + end end From eac8b4bd50bdb780c7b2ddec6c30337af17eb639 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 20:34:50 -0700 Subject: [PATCH 17/46] wrote relations tests for rentals model --- test/models/rental_test.rb | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..359f6dd12 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,27 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + describe 'relations' do + + before do + @rental = Rental.new + end + + it 'belongs to a movie' do + + movie = Movie.first + @rental.movie = movie + @rental.movie_id.must_equal movie.id + + end + + it 'belongs to a customer' do + + customer = Customer.first + @rental.customer = customer + @rental.customer_id.must_equal customer.id + + end - it "must be valid" do - value(rental).must_be :valid? end end From 4470c5e82ee98fa140f2e77f61f70a9b49fbd0c4 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 21:00:20 -0700 Subject: [PATCH 18/46] wrote customer#index controller tests - added in route and filled in method TDD --- app/controllers/customers_controller.rb | 6 ++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 29 +++++++++++++++++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..1c5c7ca76 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,8 @@ class CustomersController < ApplicationController + + def index + customers = Customer.all + render json: customers.as_json, status: :ok + end + end diff --git a/config/routes.rb b/config/routes.rb index a0f4da001..6f11d058c 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: 'movies#zomg', as: 'zomg' + + resources :customers, only: [:index] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..a017b8035 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,30 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + describe 'index' do + it 'successfully returns JSON containing all the customers' do + get customers_path + + must_respond_with :success + + response.header['Content-Type'].must_include 'json' + + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.length.must_equal Customer.count + end + + it 'returns customers with the required fields' do + keys = %w(address city created_at id name phone postal_code registered_at state updated_at) + + get customers_path + + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + end end From 6f697701e4b2f9af3f7fbc3b48ca574bbe4710ca Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Mon, 7 May 2018 21:05:38 -0700 Subject: [PATCH 19/46] added in test for if no customers --- test/controllers/customers_controller_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index a017b8035..02e3baa16 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,5 +26,16 @@ end end + it 'returns an empty array if no customers' do + Customer.all.each do |customer| + customer.delete + end + + get customers_path + body = JSON.parse(response.body) + body.must_equal [] + + end + end end From bd9dc0a1abae68d82c4a3ad8b72eabc2ccd6b2d5 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 21:49:48 -0700 Subject: [PATCH 20/46] Add controller tests to movies#index --- test/controllers/movies_controller_test.rb | 41 ++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..69e404295 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,42 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + # Maybe add a controller filter to get movies_url? + + describe 'index' do + it "gets the movies route" do + get movies_url + must_respond_with :success + end + + it "returns json" do + get movies_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get movies_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns a list of all movies" do + get movies_url + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with the required fields" do + keys = %w(id title release_date) + get movies_url + body = JSON.parse(response.body) + body.each do |movie + movie.keys.sort.must_equal keys + end + end + + end + end From 826af9602675a4360f9e9498bab70952f8fc46b5 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Mon, 7 May 2018 21:54:22 -0700 Subject: [PATCH 21/46] Add before block so not repeating code --- test/controllers/movies_controller_test.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 69e404295..a1e737ff5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,36 +1,33 @@ require "test_helper" describe MoviesController do - # Maybe add a controller filter to get movies_url? describe 'index' do - it "gets the movies route" do + + before do get movies_url + end + + it "gets the movies route" do must_respond_with :success end it "returns json" do - get movies_url response.header['Content-Type'].must_include 'json' end it "returns an Array" do - get movies_url - body = JSON.parse(response.body) body.must_be_kind_of Array end it "returns a list of all movies" do - get movies_url - body = JSON.parse(response.body) body.length.must_equal Movie.count end it "returns movies with the required fields" do keys = %w(id title release_date) - get movies_url body = JSON.parse(response.body) body.each do |movie movie.keys.sort.must_equal keys From 7dabaeb5aab7e60578e6c05d9010d9518cdced0a Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Tue, 8 May 2018 09:55:59 -0700 Subject: [PATCH 22/46] added migrations/updated movie.rb to account for setting avialable inventory; edited inventory validation to no longer be greater than zero --- app/models/movie.rb | 10 +++++++++- ...5_add_movies_checked_out_count_to_customer_table.rb | 5 +++++ ...8163445_add_default_value_to_available_inventory.rb | 5 +++++ ...efault_value_to_available_inventory_for_realsies.rb | 9 +++++++++ db/schema.rb | 3 ++- 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20180508043105_add_movies_checked_out_count_to_customer_table.rb create mode 100644 db/migrate/20180508163445_add_default_value_to_available_inventory.rb create mode 100644 db/migrate/20180508164446_add_default_value_to_available_inventory_for_realsies.rb diff --git a/app/models/movie.rb b/app/models/movie.rb index 1288c99ae..9dc4cd0b2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,8 +1,16 @@ class Movie < ApplicationRecord + before_validation :set_available_inventory_default + has_many :rentals has_many :customers, through: :rentals validates :title, presence: true - validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0 } + validates :inventory, presence: true, numericality: { only_integer: true } validates :available_inventory, presence: true, numericality: { only_integer: true } + + + private + def set_available_inventory_default + self.available_inventory = self.inventory + end end diff --git a/db/migrate/20180508043105_add_movies_checked_out_count_to_customer_table.rb b/db/migrate/20180508043105_add_movies_checked_out_count_to_customer_table.rb new file mode 100644 index 000000000..bd3e53949 --- /dev/null +++ b/db/migrate/20180508043105_add_movies_checked_out_count_to_customer_table.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomerTable < ActiveRecord::Migration[5.1] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/migrate/20180508163445_add_default_value_to_available_inventory.rb b/db/migrate/20180508163445_add_default_value_to_available_inventory.rb new file mode 100644 index 000000000..34b6ac324 --- /dev/null +++ b/db/migrate/20180508163445_add_default_value_to_available_inventory.rb @@ -0,0 +1,5 @@ +class AddDefaultValueToAvailableInventory < ActiveRecord::Migration[5.1] + def change + change_column :movies, :available_inventory, :integer, :default => :inventory + end +end diff --git a/db/migrate/20180508164446_add_default_value_to_available_inventory_for_realsies.rb b/db/migrate/20180508164446_add_default_value_to_available_inventory_for_realsies.rb new file mode 100644 index 000000000..1bc819005 --- /dev/null +++ b/db/migrate/20180508164446_add_default_value_to_available_inventory_for_realsies.rb @@ -0,0 +1,9 @@ +class AddDefaultValueToAvailableInventoryForRealsies < ActiveRecord::Migration[5.1] + def change + change_column :movies, :available_inventory, :integer + + reversible do |dir| + dir.up { Movie.update_all('available_inventory = inventory') } + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 44e1c1a52..76a1386af 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: 20180508000930) do +ActiveRecord::Schema.define(version: 20180508164446) 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 eeefb89ac32e1994bbeb47bc85bef774c982da1e Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Tue, 8 May 2018 10:06:08 -0700 Subject: [PATCH 23/46] added in negative test cases for rental.rb --- test/models/rental_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 359f6dd12..41f560035 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -12,7 +12,11 @@ movie = Movie.first @rental.movie = movie @rental.movie_id.must_equal movie.id + end + it 'will be invalid witout a valid movie_id' do + @rental.movie_id = Movie.last.id + 1 + @rental.wont_be :valid? end it 'belongs to a customer' do @@ -20,7 +24,11 @@ customer = Customer.first @rental.customer = customer @rental.customer_id.must_equal customer.id + end + it 'will be invalid witout a valid customer_id' do + @rental.customer_id = Customer.last.id + 1 + @rental.wont_be :valid? end end From b5ca545268a4d71fb8e3728e058731f861794360 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 10:11:59 -0700 Subject: [PATCH 24/46] change order for sort on movies controller test --- test/controllers/movies_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a1e737ff5..df48f2dbd 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -27,9 +27,9 @@ end it "returns movies with the required fields" do - keys = %w(id title release_date) + keys = %w(id release_date title) body = JSON.parse(response.body) - body.each do |movie + body.each do |movie| movie.keys.sort.must_equal keys end end From 53b18abd6f7496a31e86e36ba34e26eaca72ab39 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Tue, 8 May 2018 10:30:19 -0700 Subject: [PATCH 25/46] revised what customers#index removes --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1c5c7ca76..ec1de4ed6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json, status: :ok + render json: customers.as_json(only: [:id, :movies_checked_out_count, :name, :phone, :postal_code, :registered_at]), status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 02e3baa16..9226e2bf0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -16,7 +16,7 @@ end it 'returns customers with the required fields' do - keys = %w(address city created_at id name phone postal_code registered_at state updated_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_path From 4b66bbe39150564eedf8e6d65749783b3348f87f Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 10:34:37 -0700 Subject: [PATCH 26/46] All tests passing --- app/controllers/movies_controller.rb | 5 +++++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 23 +++++++++------------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5830e6cfd..9b10ce294 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,4 +4,9 @@ def zomg render :json => { message: "It works!" } end + 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 a0f4da001..f4c95699d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'movies#zomg', as: 'zomg' + get '/movies', to: 'movies#index', as: 'movies' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index df48f2dbd..d8a84430c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,29 +4,17 @@ describe 'index' do - before do + it "successfully returns json containing a collection of all movies " do get movies_url - end - - it "gets the movies route" do must_respond_with :success - end - - it "returns json" do response.header['Content-Type'].must_include 'json' - end - - it "returns an Array" do body = JSON.parse(response.body) body.must_be_kind_of Array - end - - it "returns a list of all movies" do - body = JSON.parse(response.body) body.length.must_equal Movie.count end it "returns movies with the required fields" do + get movies_url keys = %w(id release_date title) body = JSON.parse(response.body) body.each do |movie| @@ -34,6 +22,13 @@ end end + it "returns an empty array if there are no movies" do + Movie.destroy_all + get movies_url + body = JSON.parse(response.body) + body.must_equal [] + end + end end From 8eebda3a77c29435357d976826427254f03858fc Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 11:22:14 -0700 Subject: [PATCH 27/46] Write initial tests for movie#show --- test/controllers/movies_controller_test.rb | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d8a84430c..2cdf9394c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -31,4 +31,44 @@ end + describe 'show' do + before do + @movie = movies(:one) + end + + it "successfully returns json containing a hash with information for one movie " do + get movie_path(@movie.id) + must_respond_with :success + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "locates the correct movie associated with the uri" do + get movie_path(@movie.id) + body = JSON.parse(response.body) + body["id"].must_equal @movie.id + end + + it "returns a movie with all the requested fields" do + keys = %w(available_inventory inventory overview release_date title) + get movie_path(@movie.id) + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end + + it "renders not_found and displays errors if the movie does not exist" do + bad_movie_id = Movie.last.id + 1 + get movie_path(bad_movie_id) + + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "id" + end + + end + end From 5ae038991ca118303cc46aef79672527198a8e3b Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 11:42:44 -0700 Subject: [PATCH 28/46] movies#show working with passing tests --- app/controllers/movies_controller.rb | 9 +++++++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a0b705ee5..9f2d33ba9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,4 +5,13 @@ def index render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end + def show + movie = Movie.find_by(id: params[:id]) + if movie.nil? + render json: { errors: "Movie with id #{params[:id]}does not exist" }, status: :not_found + else + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + end + end + end diff --git a/config/routes.rb b/config/routes.rb index 039f72e5c..b139c692f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :movies, only: [:index] + resources :movies, only: [:index, :show] resources :customers, only: [:index] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2cdf9394c..e405a3fc5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -44,10 +44,11 @@ body.must_be_kind_of Hash end - it "locates the correct movie associated with the uri" do + it "locates the correct movie" do get movie_path(@movie.id) body = JSON.parse(response.body) - body["id"].must_equal @movie.id + body["title"].must_equal @movie.title + body["overview"].must_equal @movie.overview end it "returns a movie with all the requested fields" do From ff12a1b9e87307d38571a78c2fbafecf20b579a2 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Tue, 8 May 2018 12:12:44 -0700 Subject: [PATCH 29/46] added in movies#create tests --- app/controllers/movies_controller.rb | 2 + test/controllers/movies_controller_test.rb | 75 ++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9f2d33ba9..a17bf88f2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,4 +14,6 @@ def show end end + + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e405a3fc5..20cba7690 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -72,4 +72,79 @@ end + describe 'create' do + + before do + @old_movie_count = Movie.count + end + + it 'can create a new movie with valid data' do + + movie_data = { + title: "test_title", + overview: "what a movie", + release_date: "2018-05-08", + inventory: 4 + } + + post movies_path, params: { movie: movie_data} + + must_respond_with :success + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + + Movie.find(body["id"]).title.must_equal movie_data[:title] + + Movie.count.must_equal @old_movie_count + 1 + + end + + it 'responds with bad_request and error messages if no title' do + + movie_data = { + title: nil, + overview: "what a movie", + release_date: "2018-05-08", + inventory: 4 + } + + post movies_path, params: { movie: movie_data } + + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "title" + + Movie.count.must_equal @old_movie_count + + end + + it 'responds with bad_request and error messages if invalid inventory info' do + + movie_data = { + title: "OMG BEST", + overview: "what a movie", + release_date: "2018-05-08", + inventory: "gh" + } + + post movies_path, params: { movie: movie_data } + + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "inventory" + + Movie.count.must_equal @old_movie_count + + end + end + + end From 019c22b93f7804455f1865f051ea573daab59b4c Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Tue, 8 May 2018 12:50:34 -0700 Subject: [PATCH 30/46] added route and method for movies#create - passing all controller tests --- app/controllers/movies_controller.rb | 15 ++++++++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 33 ++++++++++------------ 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a17bf88f2..403747ea0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,6 +14,21 @@ def show end end + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id }, status: :created + else + render json: { errors: movie.errors.messages }, status: :bad_request + end + + end + + private + + def movie_params + return params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/config/routes.rb b/config/routes.rb index b139c692f..91e3fca31 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :movies, only: [:index, :show] + resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 20cba7690..78c9ddea2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -74,20 +74,21 @@ describe 'create' do - before do - @old_movie_count = Movie.count - end - - it 'can create a new movie with valid data' do - - movie_data = { + let(:movie_data) { + { title: "test_title", overview: "what a movie", release_date: "2018-05-08", inventory: 4 } + } - post movies_path, params: { movie: movie_data} + it 'can create a new movie with valid data' do + + old_movie_count = Movie.count + + + post movies_url, params: { movie: movie_data} must_respond_with :success @@ -97,20 +98,20 @@ Movie.find(body["id"]).title.must_equal movie_data[:title] - Movie.count.must_equal @old_movie_count + 1 + Movie.count.must_equal old_movie_count + 1 end it 'responds with bad_request and error messages if no title' do - movie_data = { + bad_title_data = { title: nil, overview: "what a movie", release_date: "2018-05-08", inventory: 4 } - post movies_path, params: { movie: movie_data } + post movies_url, params: { movie: bad_title_data } must_respond_with :bad_request @@ -119,20 +120,18 @@ body.must_include "errors" body["errors"].must_include "title" - Movie.count.must_equal @old_movie_count - end it 'responds with bad_request and error messages if invalid inventory info' do - movie_data = { - title: "OMG BEST", + bad_inventory_data = { + title: "Movie!", overview: "what a movie", release_date: "2018-05-08", inventory: "gh" } - post movies_path, params: { movie: movie_data } + post movies_url, params: { movie: bad_inventory_data } must_respond_with :bad_request @@ -141,8 +140,6 @@ body.must_include "errors" body["errors"].must_include "inventory" - Movie.count.must_equal @old_movie_count - end end From 63d446f1c567dbe96d635e4e1580cddecf9f743a Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Tue, 8 May 2018 14:24:08 -0700 Subject: [PATCH 31/46] change status for successful movies post from :created to :success to pass postman smoke tests --- 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 403747ea0..f572cc0aa 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def create movie = Movie.new(movie_params) if movie.save - render json: { id: movie.id }, status: :created + render json: { id: movie.id }, status: :ok else render json: { errors: movie.errors.messages }, status: :bad_request end From 8098059bfde4044bce59c139476d7ab1fff05ad6 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 15:59:07 -0700 Subject: [PATCH 32/46] Add checkout date and due date with default values to Rentals table --- app/models/rental.rb | 6 ++++++ db/migrate/20180508224534_add_date_columns_to_rentals.rb | 6 ++++++ db/schema.rb | 4 +++- test/controllers/rentals_controller_test.rb | 3 +++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180508224534_add_date_columns_to_rentals.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..acd5c4339 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,10 @@ class Rental < ApplicationRecord + before_create do + self.checkout_date = Date.today + self.due_date = Date.today + 7 + end + belongs_to :movie belongs_to :customer + end diff --git a/db/migrate/20180508224534_add_date_columns_to_rentals.rb b/db/migrate/20180508224534_add_date_columns_to_rentals.rb new file mode 100644 index 000000000..da68fdb77 --- /dev/null +++ b/db/migrate/20180508224534_add_date_columns_to_rentals.rb @@ -0,0 +1,6 @@ +class AddDateColumnsToRentals < ActiveRecord::Migration[5.1] + def change + add_column :rentals, :checkout_date, :date + add_column :rentals, :due_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 76a1386af..5c6eaf2d2 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: 20180508164446) do +ActiveRecord::Schema.define(version: 20180508224534) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,8 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.date "checkout_date" + t.date "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..65b3a9032 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,4 +4,7 @@ # it "must be a real test" do # flunk "Need real tests" # end + + + end From 5148b7fde576e5110bdff6a642a7778c5692e9bd Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 16:31:09 -0700 Subject: [PATCH 33/46] Write initial controller tests for rentals#checkout --- test/controllers/rentals_controller_test.rb | 70 ++++++++++++++++++++- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 65b3a9032..c64e94330 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,10 +1,74 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'checkout' do + + let(:rental_data) { + { + movie_id: movies(:one), + customer_id: customers(:one) + } + } + + it "creates a new instance of Rental for a valid movie and customer" do + old_rental_count = Rental.count + + post checkout_path, params { rental: rental_data } + + must_respond_with :success + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.customer_id.must_equal customers(:one).id + body.movie_id.must_equal movies(:one).id + + Rental.count.must_equal old_rental_count + 1 + end + + it "sets checkout_date to today and the due date to 7 days later" do + post checkout_path, params { rental: rental_data } + + must_respond_with :success + + body = JSON.parse(response.body) + body.checkout_date.must_equal Date.today + body.due_date.must_equal Date.today + 7 + end + + it "sends bad_request response if movie_id is invalid" do + bad_rental_data = { + movie_id: Movie.last.id + 1, + customer_id: customers(:one) + } + + post checkout_path, params { rental: bad_rental_data } + + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "movie_id" + end + + it "sends bad_request response if customer_id is invalid" do + bad_rental_data = { + movie_id: movies(:one), + customer_id: Customer.last.id + 1 + } + + post checkout_path, params { rental: bad_rental_data } + + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "customer_id" + end + + end end From 6f78be597c29bd1e1b4ddaa9d2b565489c4036f2 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 17:00:26 -0700 Subject: [PATCH 34/46] Write routes for checkout and checkin and code for checkout that passes controller tests --- app/controllers/rentals_controller.rb | 17 ++++++++++++ config/routes.rb | 3 +++ test/controllers/rentals_controller_test.rb | 30 +++++++++------------ 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..6f49c30af 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,19 @@ class RentalsController < ApplicationController + + def create + rental = Rental.new(rental_params) + + if rental.save + render json: { id: rental.id, due_date: rental.due_date }, status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + + end + + private + def rental_params + return params.require(:rental).permit(:movie_id, :customer_id) + end + end diff --git a/config/routes.rb b/config/routes.rb index 91e3fca31..3712b4922 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,7 @@ resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] + post '/checkout', to: 'rentals#create', as: 'checkout' + post '/checkin', to: 'rentals#checkin', as: 'checkin' + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c64e94330..8d8bf192f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,66 +6,62 @@ let(:rental_data) { { - movie_id: movies(:one), - customer_id: customers(:one) + movie_id: movies(:one).id, + customer_id: customers(:one).id } } it "creates a new instance of Rental for a valid movie and customer" do old_rental_count = Rental.count - post checkout_path, params { rental: rental_data } + post checkout_path, params: { rental: rental_data } must_respond_with :success body = JSON.parse(response.body) body.must_be_kind_of Hash - body.customer_id.must_equal customers(:one).id - body.movie_id.must_equal movies(:one).id Rental.count.must_equal old_rental_count + 1 end - it "sets checkout_date to today and the due date to 7 days later" do - post checkout_path, params { rental: rental_data } - - must_respond_with :success + it "returns new rental's id and due date" do + keys = %w(due_date id) + post checkout_path, params: { rental: rental_data } body = JSON.parse(response.body) - body.checkout_date.must_equal Date.today - body.due_date.must_equal Date.today + 7 + body.keys.sort.must_equal keys end it "sends bad_request response if movie_id is invalid" do bad_rental_data = { movie_id: Movie.last.id + 1, - customer_id: customers(:one) + customer_id: customers(:one).id } - post checkout_path, params { rental: bad_rental_data } + post checkout_path, params: { rental: bad_rental_data } must_respond_with :bad_request body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "errors" - body["errors"].must_include "movie_id" + body["errors"].must_include "movie" end it "sends bad_request response if customer_id is invalid" do bad_rental_data = { - movie_id: movies(:one), + movie_id: movies(:one).id, customer_id: Customer.last.id + 1 } - post checkout_path, params { rental: bad_rental_data } + post checkout_path, params: { rental: bad_rental_data } must_respond_with :bad_request body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "errors" - body["errors"].must_include "customer_id" + body["errors"].must_include "customer" end end From 244e3ca7782d599c8dc1316219a34d0202cf2418 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Tue, 8 May 2018 17:07:31 -0700 Subject: [PATCH 35/46] Change checkout and checkin routes to match smoke test requirements --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 3712b4922..79b0416e0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - post '/checkout', to: 'rentals#create', as: 'checkout' - post '/checkin', to: 'rentals#checkin', as: 'checkin' + post 'rentals/check-out', to: 'rentals#create', as: 'checkout' + post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' end From 1c6de97479e4a0a3e74fccd9af2c8df246c48d57 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Wed, 9 May 2018 10:20:57 -0700 Subject: [PATCH 36/46] added in decrement_available_inventory tests; modified the before validation for available inventory to be only on create --- app/models/movie.rb | 3 ++- test/models/movie_test.rb | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 9dc4cd0b2..d2728e7a0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - before_validation :set_available_inventory_default + before_validation :set_available_inventory_default, on: :create has_many :rentals has_many :customers, through: :rentals @@ -11,6 +11,7 @@ class Movie < ApplicationRecord private def set_available_inventory_default + puts "Running set available inventory default" self.available_inventory = self.inventory end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 5a7c0a15c..a0614250a 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,10 +1,11 @@ require "test_helper" +require 'pry' describe Movie do describe 'validations' do before do - @movie = Movie.new(title: 'test movie', inventory: 1, available_inventory: 1) + @movie = movies(:one) end it "is valid when all required fields are present" do @@ -19,16 +20,18 @@ @movie.errors.messages.must_include :title end - it "is invalid if the inventory is less than 1 " do - @movie.inventory = 0 + it "is invalid if the inventory is not a number " do + @movie.inventory = "dfkjgh" result = @movie.valid? result.must_equal false @movie.errors.messages.must_include :inventory end - it "is invalid if the available inventory is not a number" do + it "is valid even if the available inventory is not a number" do @movie.available_inventory = nil result = @movie.valid? + # binding.pry + result.must_equal false @movie.errors.messages.must_include :available_inventory end @@ -61,4 +64,32 @@ end + describe 'decrement_available_inventory' do + + before do + @movie = movies(:one) + end + + it "reduces available inventory for specific movie by 1" do + before_avail_inv = @movie.available_inventory + + @movie.decrement_available_inventory + + @movie.available_inventory.must_equal before_avail_inv - 1 + + end + + it "will not reduce available inventory if count is 0" do + @movie.available_inventory = 0 + + @movie.decrement_available_inventory + + @movie.available_inventory.must_equal 0 + + + end + + end + + end From 494b63c05481c0059f4a4e513a20123a3cb946e7 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Wed, 9 May 2018 10:26:28 -0700 Subject: [PATCH 37/46] wrote decrement_avail_inv, passing all tests --- app/models/movie.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index d2728e7a0..16d984494 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,6 +8,11 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { only_integer: true } validates :available_inventory, presence: true, numericality: { only_integer: true } + def decrement_available_inventory + if self.available_inventory > 0 + self.available_inventory -= 1 + end + end private def set_available_inventory_default From 15408d21c6bceda3520f0063bdd095763fd24c4d Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Wed, 9 May 2018 11:29:24 -0700 Subject: [PATCH 38/46] revised rental#create to accomodate for avail_inv; wrote find_rental_movie, wrote tests, commented out method as it isn't working --- app/controllers/rentals_controller.rb | 16 ++++++++++++---- app/models/rental.rb | 5 +++++ test/models/rental_test.rb | 26 ++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6f49c30af..f788a5569 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,12 +3,20 @@ class RentalsController < ApplicationController def create rental = Rental.new(rental_params) - if rental.save - render json: { id: rental.id, due_date: rental.due_date }, status: :ok + movie = Movie.find_by(id: rental_params[:movie_id]) + if movie.nil? + render json: {errors: "Movie with id #{rental_params[:movie_id]} doesn't exist"}, status: :bad_request else - render json: { errors: rental.errors.messages }, status: :bad_request + if movie.available_inventory > 0 + if rental.save + render json: { id: rental.id, due_date: rental.due_date }, status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + else + render json: { errors: "No available inventory for #{movie.title}" }, status: :bad_request + end end - end private diff --git a/app/models/rental.rb b/app/models/rental.rb index acd5c4339..e1fdd8500 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,4 +7,9 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + # def find_rental_movie(rental_params) + # return Movie.find_by(id: rental_params[:movie_id]) + # end + + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 41f560035..16719467b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'pry' describe Rental do describe 'relations' do @@ -32,4 +33,29 @@ end end + + describe 'find_rental_movie' do + before do + customer_id = customers(:two).id + movie_id = movies(:two).id + @rental_params = {movie_id: movie_id, customer_id: customer_id} + end + it "returns an instance of a Movie given a valid movie id" do + binding.pry + result = find_rental_movie(@rental_params) + + result.must_be_kind_of Movie + result.id.must_equal @rental_params[:movie_id] + + end + + it "returns nil if given invalid movie id" do + @rental_params[:movie_id] = Movie.last.id + 1 + + result = find_rental_movie(@rental_params) + + result.id.must_be nil + end + + end end From 25264f81e697389e0964e963c59d70f876836efc Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Wed, 9 May 2018 12:37:41 -0700 Subject: [PATCH 39/46] revised rental#create, passing all controller tests; moved helper method from model to controller --- app/controllers/rentals_controller.rb | 28 +++++++++++++-------- app/models/movie.rb | 1 - app/models/rental.rb | 5 ---- test/controllers/rentals_controller_test.rb | 26 +++++++++++++++++-- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f788a5569..ed3030134 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,20 +3,24 @@ class RentalsController < ApplicationController def create rental = Rental.new(rental_params) - movie = Movie.find_by(id: rental_params[:movie_id]) + movie = find_rental_movie(rental_params) if movie.nil? render json: {errors: "Movie with id #{rental_params[:movie_id]} doesn't exist"}, status: :bad_request + return + end + + if movie.available_inventory == 0 + render json: { errors: "No available inventory for #{movie.title}" }, status: :bad_request + return + end + + if rental.save + movie.decrement_available_inventory + render json: { id: rental.id, due_date: rental.due_date }, status: :ok else - if movie.available_inventory > 0 - if rental.save - render json: { id: rental.id, due_date: rental.due_date }, status: :ok - else - render json: { errors: rental.errors.messages }, status: :bad_request - end - else - render json: { errors: "No available inventory for #{movie.title}" }, status: :bad_request - end + render json: { errors: rental.errors.messages }, status: :bad_request end + end private @@ -24,4 +28,8 @@ def rental_params return params.require(:rental).permit(:movie_id, :customer_id) end + def find_rental_movie(rental_params) + return Movie.find_by(id: rental_params[:movie_id]) + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 16d984494..397928bf6 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -16,7 +16,6 @@ def decrement_available_inventory private def set_available_inventory_default - puts "Running set available inventory default" self.available_inventory = self.inventory end end diff --git a/app/models/rental.rb b/app/models/rental.rb index e1fdd8500..acd5c4339 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,9 +7,4 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer - # def find_rental_movie(rental_params) - # return Movie.find_by(id: rental_params[:movie_id]) - # end - - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8d8bf192f..4e44b064e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'pry' describe RentalsController do @@ -11,7 +12,7 @@ } } - it "creates a new instance of Rental for a valid movie and customer" do + it "creates a new instance of Rental for a valid customer and a movie that has available inventory" do old_rental_count = Rental.count post checkout_path, params: { rental: rental_data } @@ -45,7 +46,7 @@ body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "errors" - body["errors"].must_include "movie" + body["errors"].must_include "Movie" end it "sends bad_request response if customer_id is invalid" do @@ -64,6 +65,27 @@ body["errors"].must_include "customer" end + it "sends a bad_request if valid movie has no available_inventory" do + + movies(:one).available_inventory = 0 + + movies(:one).save + + bad_rental_data = { + movie_id: movies(:one).id, + customer_id: Customer.last.id + } + + post checkout_path, params: { rental: bad_rental_data } + # binding.pry + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "available inventory" + end + end From 19dfd05cdbc651e189ca727d644b19c646ad9872 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Wed, 9 May 2018 15:06:54 -0700 Subject: [PATCH 40/46] Write tests for increment_available_inventory on Movie class and code that passes said tests (in that order) --- app/models/movie.rb | 6 ++++++ test/models/movie_test.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index 397928bf6..59ca7d2d5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -14,6 +14,12 @@ def decrement_available_inventory end end + def increment_available_inventory + if self.available_inventory < self.inventory + self.available_inventory += 1 + end + end + private def set_available_inventory_default self.available_inventory = self.inventory diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a0614250a..98d7b27d2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -86,6 +86,36 @@ @movie.available_inventory.must_equal 0 + end + + end + + describe 'increment_available_inventory' do + + before do + @movie = movies(:one) + end + + it "increases available inventory for specific movie by 1" do + @movie.available_inventory = @movie.inventory - 1 + @movie.save + + before_avail_inv = @movie.available_inventory + + @movie.increment_available_inventory + + @movie.available_inventory.must_equal before_avail_inv + 1 + + end + + it "will not increase available inventory more than total inventory" do + @movie.available_inventory = @movie.inventory + + before_available_inventory = @movie.available_inventory + + @movie.increment_available_inventory + + @movie.available_inventory.must_equal before_available_inventory end From bd13df2f6616c2f1b21f9b31fb8d9bfe3aac73a2 Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Wed, 9 May 2018 15:30:15 -0700 Subject: [PATCH 41/46] Write intital controller tests for checkin --- app/controllers/rentals_controller.rb | 4 +++ test/controllers/rentals_controller_test.rb | 35 +++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ed3030134..f256950dc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,6 +23,10 @@ def create end + # def update + # + # end + private def rental_params return params.require(:rental).permit(:movie_id, :customer_id) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4e44b064e..80abadaf4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,7 +3,7 @@ describe RentalsController do - describe 'checkout' do + describe 'create' do let(:rental_data) { { @@ -21,6 +21,8 @@ body = JSON.parse(response.body) body.must_be_kind_of Hash + body.must_include "id" + body.must_include "due_date" Rental.count.must_equal old_rental_count + 1 end @@ -77,7 +79,6 @@ } post checkout_path, params: { rental: bad_rental_data } - # binding.pry must_respond_with :bad_request body = JSON.parse(response.body) @@ -88,5 +89,35 @@ end + describe 'update' do + + it "allows a checked out movie to be checked in" do + rental = rentals(:two) + rental.updated_at = rental.created_at + + rental_data = { + movie_id: movies(:two).id, + customer_id: customes(:one).id + } + + post checkin_path, params: { rental: rental_data } + must_respond_with :success + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + body.must_include "check-in date" + end + + it "does not allow a checked in movie to be checked in again" do + + end + + it "does not allow a movie that has not been checked out to be checked in" do + + end + + end + end From d6ba6377b5616092c9e0ad44d487e8e7551305df Mon Sep 17 00:00:00 2001 From: Samantha Berk Date: Fri, 11 May 2018 14:05:24 -0700 Subject: [PATCH 42/46] write rentals#create tests and code that passes those tests --- app/controllers/rentals_controller.rb | 33 ++++++++++++++--- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 40 ++++++++++++++++++--- 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f256950dc..607efda4d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,13 +4,14 @@ def create rental = Rental.new(rental_params) movie = find_rental_movie(rental_params) + #cutsomer existence if movie.nil? render json: {errors: "Movie with id #{rental_params[:movie_id]} doesn't exist"}, status: :bad_request return end if movie.available_inventory == 0 - render json: { errors: "No available inventory for #{movie.title}" }, status: :bad_request + render json: { errors: "No available inventory for #{movie.title}." }, status: :bad_request return end @@ -23,9 +24,33 @@ def create end - # def update - # - # end + def update + rental = Rental.find_by(rental_params) + if rental.nil? + render json: { errors: "This rental does not exist." }, status: :bad_request + return + end + + movie = rental.movie + + #test this & cutsomer existence + # if movie.nil? + # render json: { errors: "Movie with id #{rental_params[:movie_id]} doesn't exist"}, status: :bad_request + # return + # end + + if rental.updated_at != rental.created_at + render json: { errors: "#{movie.title} is already checked-in." }, status: :bad_request + else + if rental.save + movie.increment_available_inventory + render json: { id: rental.id, "check-in date": rental.updated_at }, status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + end + + end private def rental_params diff --git a/config/routes.rb b/config/routes.rb index 79b0416e0..69f3556d5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,6 @@ resources :customers, only: [:index] post 'rentals/check-out', to: 'rentals#create', as: 'checkout' - post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' + post 'rentals/check-in', to: 'rentals#update', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 80abadaf4..4c527561d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -92,14 +92,15 @@ describe 'update' do it "allows a checked out movie to be checked in" do - rental = rentals(:two) - rental.updated_at = rental.created_at - rental_data = { movie_id: movies(:two).id, - customer_id: customes(:one).id + customer_id: customers(:two).id } + rental = Rental.new(rental_data) + rental.valid? + rental.save + post checkin_path, params: { rental: rental_data } must_respond_with :success @@ -110,14 +111,43 @@ end it "does not allow a checked in movie to be checked in again" do + rental_data = { + movie_id: movies(:one).id, + customer_id: customers(:one).id + } + + rental = Rental.new(rental_data) + rental.valid? + rental.save + rental.updated_at = rental.created_at + 1 + rental.save + + post checkin_path, params: { rental: rental_data } + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "already checked-in" end it "does not allow a movie that has not been checked out to be checked in" do + rental_data = { + movie_id: movies(:two).id, + customer_id: customers(:two).id + } + + post checkin_path, params: { rental: rental_data } + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "not exist" end end - end From d2a3620ac58c021ad513c5e504243ad85e456f67 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Fri, 11 May 2018 15:09:38 -0700 Subject: [PATCH 43/46] added customer model increment and decrement movies checked out count. also wrote tests --- app/controllers/rentals_controller.rb | 9 +++++- app/models/customer.rb | 10 ++++++ test/models/customer_test.rb | 44 +++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 607efda4d..c3623f839 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,7 +4,8 @@ def create rental = Rental.new(rental_params) movie = find_rental_movie(rental_params) - #cutsomer existence + customer = find_rental_customer(rental_params) + if movie.nil? render json: {errors: "Movie with id #{rental_params[:movie_id]} doesn't exist"}, status: :bad_request return @@ -17,6 +18,7 @@ def create if rental.save movie.decrement_available_inventory + customer.increment_movies_checked_out_count render json: { id: rental.id, due_date: rental.due_date }, status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request @@ -44,6 +46,7 @@ def update else if rental.save movie.increment_available_inventory + customer.decrement_movies_checked_out_count render json: { id: rental.id, "check-in date": rental.updated_at }, status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request @@ -61,4 +64,8 @@ def find_rental_movie(rental_params) return Movie.find_by(id: rental_params[:movie_id]) end + def find_rental_customer(rental_params) + return Customer.find_by(id: rental_params[:customer_id]) + end + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 90db60973..456845375 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,4 +4,14 @@ class Customer < ApplicationRecord validates :name, presence: true + def decrement_movies_checked_out_count + if self.movies_checked_out_count > 0 + self.movies_checked_out_count -= 1 + end + end + + def increment_movies_checked_out_count + self.available_inventory += 1 + end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0a4a6e6d1..66c3a9b6a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -61,4 +61,48 @@ end + describe 'decrement_movies_checked_out_count' do + + before do + @customer = customers(:one) + end + + it "reduces movies checkout out count for specific customer by 1" do + before_movies_count = @customer.movies_checked_out_count + + @customer.decrement_movies_checked_out_count + + @customer.movies_checked_out_count.must_equal before_movies_count - 1 + + end + + it "will not reduce movies checkout out count if count is 0" do + @customer.movies_checked_out_count = 0 + + @customer.decrement_movies_checked_out_count + + @customer.movies_checked_out_count.must_equal 0 + + end + + end + + describe 'increment_customers_checked_out_count' do + + before do + @customer = customers(:one) + end + + it "increases customers_checked_out_count for specific customer by 1" do + + before_movies_count = @customer.movies_checked_out_count + + @customer.increment_movies_checked_out_count + + @customer.movies_checked_out_count.must_equal before_movies_count + 1 + + end + + end + end From bbfec9faf5634532d3ed9dead4166a78ddf74f2e Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Fri, 11 May 2018 15:13:57 -0700 Subject: [PATCH 44/46] fixed failing tests --- app/models/customer.rb | 2 +- test/models/customer_test.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 456845375..32bab198b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -11,7 +11,7 @@ def decrement_movies_checked_out_count end def increment_movies_checked_out_count - self.available_inventory += 1 + self.movies_checked_out_count += 1 end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 66c3a9b6a..d0641052b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -68,6 +68,9 @@ end it "reduces movies checkout out count for specific customer by 1" do + @customer.movies_checked_out_count = 1 + @customer.save + before_movies_count = @customer.movies_checked_out_count @customer.decrement_movies_checked_out_count From 867062653462072a2a3248b4c22b6e8c3235c956 Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Fri, 11 May 2018 15:28:33 -0700 Subject: [PATCH 45/46] removed 2x private methods for finding movie and customer --- app/controllers/rentals_controller.rb | 19 +++---------------- test/models/movie_test.rb | 1 - test/models/rental_test.rb | 24 ------------------------ 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c3623f839..07cae3a54 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,8 +3,8 @@ class RentalsController < ApplicationController def create rental = Rental.new(rental_params) - movie = find_rental_movie(rental_params) - customer = find_rental_customer(rental_params) + movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) if movie.nil? render json: {errors: "Movie with id #{rental_params[:movie_id]} doesn't exist"}, status: :bad_request @@ -34,12 +34,7 @@ def update end movie = rental.movie - - #test this & cutsomer existence - # if movie.nil? - # render json: { errors: "Movie with id #{rental_params[:movie_id]} doesn't exist"}, status: :bad_request - # return - # end + customer = rental.customer if rental.updated_at != rental.created_at render json: { errors: "#{movie.title} is already checked-in." }, status: :bad_request @@ -60,12 +55,4 @@ def rental_params return params.require(:rental).permit(:movie_id, :customer_id) end - def find_rental_movie(rental_params) - return Movie.find_by(id: rental_params[:movie_id]) - end - - def find_rental_customer(rental_params) - return Customer.find_by(id: rental_params[:customer_id]) - end - end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 98d7b27d2..ac69263d0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -30,7 +30,6 @@ it "is valid even if the available inventory is not a number" do @movie.available_inventory = nil result = @movie.valid? - # binding.pry result.must_equal false @movie.errors.messages.must_include :available_inventory diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 16719467b..f76a896e5 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -34,28 +34,4 @@ end - describe 'find_rental_movie' do - before do - customer_id = customers(:two).id - movie_id = movies(:two).id - @rental_params = {movie_id: movie_id, customer_id: customer_id} - end - it "returns an instance of a Movie given a valid movie id" do - binding.pry - result = find_rental_movie(@rental_params) - - result.must_be_kind_of Movie - result.id.must_equal @rental_params[:movie_id] - - end - - it "returns nil if given invalid movie id" do - @rental_params[:movie_id] = Movie.last.id + 1 - - result = find_rental_movie(@rental_params) - - result.id.must_be nil - end - - end end From 06c43592c015654e650f66f596f883ff9616dd9c Mon Sep 17 00:00:00 2001 From: Hannah Cameron Date: Fri, 11 May 2018 15:49:52 -0700 Subject: [PATCH 46/46] passing all smoke tests - added in customer.save and movie.save --- app/controllers/rentals_controller.rb | 4 ++++ app/models/customer.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 07cae3a54..5bcb3e455 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -18,7 +18,9 @@ def create if rental.save movie.decrement_available_inventory + movie.save customer.increment_movies_checked_out_count + customer.save render json: { id: rental.id, due_date: rental.due_date }, status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request @@ -41,7 +43,9 @@ def update else if rental.save movie.increment_available_inventory + movie.save customer.decrement_movies_checked_out_count + customer.save render json: { id: rental.id, "check-in date": rental.updated_at }, status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request diff --git a/app/models/customer.rb b/app/models/customer.rb index 32bab198b..0b52cba62 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,6 +3,7 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals validates :name, presence: true + validates :movies_checked_out_count, presence: true, numericality: { only_integer: true } def decrement_movies_checked_out_count if self.movies_checked_out_count > 0