From 02f75c07af4d784a0a06d20b8edfb91b47c46b3c Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 11:19:46 -0800 Subject: [PATCH 01/52] API setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 57 files changed, 934 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..a9f49bedc --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..6295b9809 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.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.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..4a605b73e --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +jehO9N9lpBupllZJFlqve4Jn0YlFk3C/XuMOogUcFdwNcBn2gWCM1LoYcxfQJzsY8Z36MpXlOmAPR+mCG+4JhF6XOtDx9iEAF2S6k4FdR1irvQByrkMx695iCkTqvwPGWLq6mTNxmm3YaXGrESpN4olqAbbC7WPFPN8zOFVrP4C7krYxmoGTUmFLTS8ewi3zquVTrRFlwBUMCsZXEc12hWUA4e2FRISKiJtgEa2NMdpqsd2W1MGRfPohFaaeDgbi3N8u1Wx+MlAddsAVAIUZZ/beDQnDD1v+mj9Cjd384JzKJyZrFwNTpEOlaDCo41ZMcJc8X8Q05GOlmnLSIUzRWnsi+GouPIqWgrcYUjEipl6squpYd75aF5oCvE+ztcsCugqwoNGkfdZ23y4x+dyrRHmaDwEJ+ahTT97d--ymxkdEAel+4wim4n--GiDNnxXSSX6ryacbrgZg6A== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From c85a64abc573f6447e2f4a73912d4d2466ba3a0d Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 11:33:01 -0800 Subject: [PATCH 02/52] added customer model and movies model --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + db/migrate/20181105192511_create_movies.rb | 8 ++++ db/migrate/20181105192525_create_customers.rb | 8 ++++ .../20181105192625_add_column_to_movies.rb | 8 ++++ .../20181105193005_add_column_to_customers.rb | 12 ++++++ db/schema.rb | 39 +++++++++++++++++++ test/fixtures/customers.yml | 11 ++++++ test/fixtures/movies.yml | 11 ++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 11 files changed, 119 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105192511_create_movies.rb create mode 100644 db/migrate/20181105192525_create_customers.rb create mode 100644 db/migrate/20181105192625_add_column_to_movies.rb create mode 100644 db/migrate/20181105193005_add_column_to_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20181105192511_create_movies.rb b/db/migrate/20181105192511_create_movies.rb new file mode 100644 index 000000000..a82569703 --- /dev/null +++ b/db/migrate/20181105192511_create_movies.rb @@ -0,0 +1,8 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105192525_create_customers.rb b/db/migrate/20181105192525_create_customers.rb new file mode 100644 index 000000000..21dbca0f6 --- /dev/null +++ b/db/migrate/20181105192525_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105192625_add_column_to_movies.rb b/db/migrate/20181105192625_add_column_to_movies.rb new file mode 100644 index 000000000..5017367f3 --- /dev/null +++ b/db/migrate/20181105192625_add_column_to_movies.rb @@ -0,0 +1,8 @@ +class AddColumnToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :title, :string + add_column :movies, :overview, :string + add_column :movies, :release_date, :date + add_column :movies, :inventory, :integer + end +end diff --git a/db/migrate/20181105193005_add_column_to_customers.rb b/db/migrate/20181105193005_add_column_to_customers.rb new file mode 100644 index 000000000..58691ba8c --- /dev/null +++ b/db/migrate/20181105193005_add_column_to_customers.rb @@ -0,0 +1,12 @@ +class AddColumnToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :name, :string + add_column :customers, :registered_at, :datetime + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :state, :string + add_column :customers, :postal_code, :string + add_column :customers, :phone, :string + + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..d57b7d01a --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_11_05_193005) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + end + + create_table "movies", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end 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 15736020bf2347484ddeacabde89d350f0b34a14 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 11:45:52 -0800 Subject: [PATCH 03/52] Validations for customer and movie --- app/models/customer.rb | 4 ++++ app/models/movie.rb | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d8c8c2071 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,6 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..f79f36c12 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,4 @@ class Movie < ApplicationRecord + validates :title, presence: true, uniqueness: true + validates :release_date, presence: true end From f7721d5b2bc5a0f43814c6625ecc609867eef030 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 11:52:17 -0800 Subject: [PATCH 04/52] added controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 18 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_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/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/test/controllers/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 diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 648263c10e1a9d8cb8f5e8090c7892ea0ecb687a Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 12:10:09 -0800 Subject: [PATCH 05/52] Added Movie#index, Movie#show --- app/controllers/application_controller.rb | 3 +++ app/controllers/customers_controller.rb | 10 ++++++++++ app/controllers/movies_controller.rb | 20 ++++++++++++++++++++ config/routes.rb | 2 ++ 4 files changed, 35 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..3e9b0e635 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,5 @@ class ApplicationController < ActionController::API + def render_error(status, errors) + render json: {errors: errors}, status: status + end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..4ccca15ca 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,12 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customerify(customers), status: :ok + end + + private + + def customerify(customer_data) + return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..5b0326521 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,22 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movify(movies), status: :ok + end + + def show + movie_id = params[:id] + movie = Movie.find_by(id: movie_id) + if movie + render json: movify(movie), status: :ok + else + render_error(:not_found, {movie_id: ["No such movie"]}) + end + end + + private + + def movify(movie_data) + return movie_data.as_json(only: [:id, :title, :release_date]) + end end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..477bf5f8b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers, only: [:index, :show, :create] + resources :movies, only: [:index, :show, :create] end From 5c627d1ef63978e8b5a482bb4301505f3daab107 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 12:14:48 -0800 Subject: [PATCH 06/52] Changed show page --- app/controllers/movies_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5b0326521..c47a97ac0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,14 +1,14 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movify(movies), status: :ok + render json: movify_index(movies), status: :ok end def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) if movie - render json: movify(movie), status: :ok + render json: movify_show(movie), status: :ok else render_error(:not_found, {movie_id: ["No such movie"]}) end @@ -16,7 +16,11 @@ def show private - def movify(movie_data) + def movify_index(movie_data) return movie_data.as_json(only: [:id, :title, :release_date]) end + + def movify_show(movie_data) + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) + end end From b16d71969dc250d0b50ff1062b3fbb352d20f4b6 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 12:20:09 -0800 Subject: [PATCH 07/52] added customer#show method --- app/controllers/customers_controller.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4ccca15ca..3e4b9ba90 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,9 +4,28 @@ def index render json: customerify(customers), status: :ok end + + + def show + customer_id = params[:id] + customer = Customer.find_by(id: customer_id) + if customer + render json: customerify(customer), status: :ok + else + render_error(:not_found, {customer_id: ["No such Customer"]}) + end + end + + private def customerify(customer_data) return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end + + + # def customerify_show(customer_data) + # return customer_data.as_json(only: [:title, :overview, :release_date, :inventory]) + # end + end From 39838a2a1c8ae8dd18150806169ff5f207a80582 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 14:21:46 -0800 Subject: [PATCH 08/52] zomg method --- app/controllers/customers_controller.rb | 3 +++ config/routes.rb | 1 + 2 files changed, 4 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3e4b9ba90..3b0a9e69b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -16,6 +16,9 @@ def show end end + def zomg + render json: { this_route_works: "it works!" } + end private diff --git a/config/routes.rb b/config/routes.rb index 477bf5f8b..bd040b586 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,5 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] + get '/zomg', to: 'customers#zomg' end From 334314c000d0f8ed7fdf45d22d641137e78c5238 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 14:44:51 -0800 Subject: [PATCH 09/52] added model realtions and added rentals table with foreign keys --- app/models/customer.rb | 4 ++++ app/models/movie.rb | 3 +++ app/models/rental.rb | 5 +++++ db/migrate/20181105224001_create_rentals.rb | 8 ++++++++ .../20181105224238_add_foreign_key_to_rentals.rb | 8 ++++++++ db/schema.rb | 13 ++++++++++++- test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 8 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181105224001_create_rentals.rb create mode 100644 db/migrate/20181105224238_add_foreign_key_to_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index d8c8c2071..4ca5f5463 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,4 +3,8 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true + + has_many :rentals + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index f79f36c12..4879a4f7b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :release_date, presence: true + + has_many :rentals + end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..09e05ad13 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,5 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer + +end diff --git a/db/migrate/20181105224001_create_rentals.rb b/db/migrate/20181105224001_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20181105224001_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105224238_add_foreign_key_to_rentals.rb b/db/migrate/20181105224238_add_foreign_key_to_rentals.rb new file mode 100644 index 000000000..89085c869 --- /dev/null +++ b/db/migrate/20181105224238_add_foreign_key_to_rentals.rb @@ -0,0 +1,8 @@ +class AddForeignKeyToRentals < ActiveRecord::Migration[5.2] + def change + + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + + end +end diff --git a/db/schema.rb b/db/schema.rb index d57b7d01a..2ba01d691 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: 2018_11_05_193005) do +ActiveRecord::Schema.define(version: 2018_11_05_224238) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,15 @@ t.integer "inventory" end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end 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 9f4377f513475fcd4f7c271f317ff47cfd628d9d Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 14:55:56 -0800 Subject: [PATCH 10/52] added create method to movies --- app/controllers/customers_controller.rb | 3 --- app/controllers/movies_controller.rb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3b0a9e69b..3e4b9ba90 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -16,9 +16,6 @@ def show end end - def zomg - render json: { this_route_works: "it works!" } - end private diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c47a97ac0..54b9be096 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,8 +14,23 @@ def show end end + + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id } + else + render_error(:bad_request, movie.errors.messages) + end + end + private + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end + def movify_index(movie_data) return movie_data.as_json(only: [:id, :title, :release_date]) end @@ -23,4 +38,8 @@ def movify_index(movie_data) def movify_show(movie_data) return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) end + + + + end From ca183274da98f2c439896bdee032b71fb026e0a4 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 15:25:44 -0800 Subject: [PATCH 11/52] created add method for movies controller --- app/controllers/movies_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 54b9be096..1e609b19a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,3 +1,4 @@ +require 'date' class MoviesController < ApplicationController def index movies = Movie.all @@ -18,6 +19,7 @@ def show def create movie = Movie.new(movie_params) + if movie.save render json: { id: movie.id } else From c72c74205eb568e72d7ddbc84a3bcf9c3b9e0ee5 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 15:25:46 -0800 Subject: [PATCH 12/52] Changed movie model validations --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 4879a4f7b..75d13c6e6 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,7 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :release_date, presence: true - + has_many :rentals end From 0fc3cb5c8f4200bf38067b2d1334d18e44c36e34 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 16:01:17 -0800 Subject: [PATCH 13/52] Customer model tests: validations, relations --- test/models/customer_test.rb | 63 ++++++++++++++++++++++++++++++++++-- test/test_helper.rb | 3 +- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..0fa0f6648 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,7 +3,66 @@ describe Customer do let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + # it "must be valid" do + # value(customer).must_be :valid? + # end + describe 'relations' do + it 'a customer can have many rentals' do + customer = Customer.first + movie_1 = Movie.first + movie_2 = Movie.last + rental_1 = Rental.create!(customer_id: customer.id, movie_id: movie_1.id) + rental_2 = Rental.create!(customer_id: customer.id, movie_id: movie_2.id) + rentals = Rental.where(customer_id: customer.id) + expect(rentals.count).must_equal 2 + end + end + + describe 'validations' do + before do + @customer = Customer.new( + name: "PotatoHead", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + postal_code: "98103", + phone: "(206)222-2222" + ) + end + + it 'is valid when name, registered_at, postal_code and phone are present' do + is_valid = @customer.valid? + expect(is_valid).must_equal true + end + + it 'is invalid without name' do + @customer.name = nil + + is_valid = @customer.valid? + expect(is_valid).must_equal false + expect(@customer.errors.messages).must_include :name + end + + it 'is invalid without registered_at' do + @customer.registered_at = nil + + is_valid = @customer.valid? + expect(is_valid).must_equal false + expect(@customer.errors.messages).must_include :registered_at + end + + it 'is invalid without postal_code' do + @customer.postal_code = nil + + is_valid = @customer.valid? + expect(is_valid).must_equal false + expect(@customer.errors.messages).must_include :postal_code + end + + it 'is invalid without phone' do + @customer.phone = nil + + is_valid = @customer.valid? + expect(is_valid).must_equal false + expect(@customer.errors.messages).must_include :phone + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From b3d679413b86054b2f5c1432d4004c74b8d06936 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 16:12:04 -0800 Subject: [PATCH 14/52] Customer controller tests --- test/controllers/customers_controller_test.rb | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..775bf2de8 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 'should get index' do + get customers_path + must_respond_with :success + end + end + + describe 'show' do + + before do + @customer = Customer.first + end + + it 'will show an existing customer' do + + get customer_path(@customer.id) + must_respond_with :success + end + + it 'will render a status not_found for a non-existant customer' do + destroyed_customer = @customer.destroy + destroyed_customer.save + get customer_path(destroyed_customer.id) + must_respond_with :not_found + end + end end From 14e30de670a716ce5f2c041546bad535a2b38f94 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 16:40:14 -0800 Subject: [PATCH 15/52] added model testing for movies --- app/controllers/movies_controller.rb | 2 -- test/fixtures/movies.yml | 17 ++++++++---- test/models/movie_test.rb | 41 ++++++++++++++++++++++++++-- test/test_helper.rb | 3 +- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1e609b19a..eae78366b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,8 +15,6 @@ def show end end - - def create movie = Movie.new(movie_params) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..2d064b274 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,15 @@ # 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: + title: Blacksmith of the Orange + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. + release_date: "1979-01-18" + inventory: 10 + + +two: + title: Savior Of The Curse + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. + release_date: "2010-11-05" + inventory: 3 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..e727ac7ee 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,44 @@ require "test_helper" - +require 'pry' describe Movie do - let(:movie) { Movie.new } + let (:blacksmith) {movies(:one)} it "must be valid" do - value(movie).must_be :valid? + value(blacksmith).must_be :valid? + end + + it "requires title, release_date" do + required_fields = [:title, :release_date] + + required_fields.each do |field| + blacksmith[field] = nil + + expect(blacksmith.valid?).must_equal false + blacksmith.reload + end + end + + + it "requires title, to be unique" do + repeat = Movie.new( + title: Movie.first.title, + overview: "This is awesome", + release_date: "2018-11-02", + inventory: 10 + ) + # Act + is_valid = repeat.valid? + + # Assert + expect(is_valid).must_equal false + expect(repeat.errors.messages).must_include :title end + + + it "movie has many rentals" do + empty_array = blacksmith.rentals + expect(empty_array).must_equal [] + end + + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From fc063b666f9287b9a8940d7cbc4ac12cf8114af3 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Mon, 5 Nov 2018 16:50:00 -0800 Subject: [PATCH 16/52] added movies avail inventory column, and customer checkout count --- .../20181106004516_add_column_movie_avail_inventory.rb | 6 ++++++ .../20181106004626_add_column_customer_checkout_count.rb | 5 +++++ db/schema.rb | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181106004516_add_column_movie_avail_inventory.rb create mode 100644 db/migrate/20181106004626_add_column_customer_checkout_count.rb diff --git a/db/migrate/20181106004516_add_column_movie_avail_inventory.rb b/db/migrate/20181106004516_add_column_movie_avail_inventory.rb new file mode 100644 index 000000000..9ad1f4a43 --- /dev/null +++ b/db/migrate/20181106004516_add_column_movie_avail_inventory.rb @@ -0,0 +1,6 @@ +class AddColumnMovieAvailInventory < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + + end +end diff --git a/db/migrate/20181106004626_add_column_customer_checkout_count.rb b/db/migrate/20181106004626_add_column_customer_checkout_count.rb new file mode 100644 index 000000000..eb532b445 --- /dev/null +++ b/db/migrate/20181106004626_add_column_customer_checkout_count.rb @@ -0,0 +1,5 @@ +class AddColumnCustomerCheckoutCount < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 2ba01d691..60879a850 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: 2018_11_05_224238) do +ActiveRecord::Schema.define(version: 2018_11_06_004626) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "state" t.string "postal_code" t.string "phone" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From 8f5d149dd1cc12c80d87c4a75263e97f02967b4e Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Mon, 5 Nov 2018 16:54:32 -0800 Subject: [PATCH 17/52] Changed json output --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3e4b9ba90..5e5d86c25 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -20,7 +20,7 @@ def show private def customerify(customer_data) - return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index eae78366b..5b640e5bd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -36,7 +36,7 @@ def movify_index(movie_data) end def movify_show(movie_data) - return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) end From 54a9c065a669df3947959c996972535d108506d0 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 11:56:36 -0800 Subject: [PATCH 18/52] added rental controller --- app/controllers/rentals_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 2 files changed, 9 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/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 2947869d9735378894b2f21242f73b2510b767a3 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 13:47:57 -0800 Subject: [PATCH 19/52] added code for rental_create, not quite finished --- app/controllers/rentals_controller.rb | 21 +++++++++++++++++++++ app/models/movie.rb | 13 ++++++++++++- config/routes.rb | 6 ++++++ db/seeds.rb | 6 ++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..a320b80e1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,23 @@ class RentalsController < ApplicationController + def create + rental = Rental.new(rental_params) + if rental.save + change_avail_inventory(rental_params[:movie_id]) + # binding.pry + render json: { id: rental.id } + else + render_error(:bad_request, {rental: ["no such rental"]}) + end + end + + + def rental_params + params.require(:rental).permit(:movie_id, :customer_id) + end + + def change_avail_inventory(id) + binding.pry + movie = Movie.find_by(id: id) + movie.available_inventory -= 1 + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 75d13c6e6..cc248fc4c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,18 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :release_date, presence: true - + has_many :rentals + + def change_avail_inventory + + movie.available_inventory -= 1 + end + + # def self.change_avail_inventory(movie_id) + # movie = Movie.find_by(id: movie_id ) + # movie.available_inventory -= 1 + # end + end diff --git a/config/routes.rb b/config/routes.rb index bd040b586..9e9b3f0f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,5 +2,11 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] + get '/zomg', to: 'customers#zomg' + + resources :rentals, only: [:index, :show, :create] + + # post '/rental', to: 'rentals#create', as: 'checkout' + end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..9b124bb13 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,9 @@ JSON.parse(File.read('db/seeds/movies.json')).each do |movie| Movie.create!(movie) end + + +JSON.parse(File.read('db/seeds/movies.json')).each do |movie| + movie[available_inventory] = movie[inventory] + Movie.create!(movie) +end From 86ddbb428a35617e69df22ea18b3d447732fc8a8 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 13:48:26 -0800 Subject: [PATCH 20/52] minor space changes --- app/models/movie.rb | 3 --- db/seeds.rb | 6 ------ 2 files changed, 9 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index cc248fc4c..492b49609 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,10 +5,7 @@ class Movie < ApplicationRecord has_many :rentals - def change_avail_inventory - movie.available_inventory -= 1 - end # def self.change_avail_inventory(movie_id) # movie = Movie.find_by(id: movie_id ) diff --git a/db/seeds.rb b/db/seeds.rb index 9b124bb13..5322340ba 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,9 +5,3 @@ JSON.parse(File.read('db/seeds/movies.json')).each do |movie| Movie.create!(movie) end - - -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - movie[available_inventory] = movie[inventory] - Movie.create!(movie) -end From c5b04c991fec3b6afec862e46681e236d903c654 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Tue, 6 Nov 2018 13:55:37 -0800 Subject: [PATCH 21/52] Setting available inventory --- db/seeds.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..a9fa40cc6 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,7 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + x = Movie.create!(movie) + x.available_inventory = x.inventory + x.save end From 96edf477b5f60dc9de7ddc7c85434c6192a9d5b2 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Tue, 6 Nov 2018 14:02:37 -0800 Subject: [PATCH 22/52] Change add inventory to Movie#create --- app/controllers/movies_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5b640e5bd..ecebf6aa9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,7 +17,8 @@ def show def create movie = Movie.new(movie_params) - + movie.available_inventory = movie.inventory + if movie.save render json: { id: movie.id } else From 424aabaf1b0cd217ec5ba3b9a61182ffa2007841 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 14:02:56 -0800 Subject: [PATCH 23/52] put method in movie model --- app/controllers/rentals_controller.rb | 6 +----- app/models/movie.rb | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a320b80e1..c707add7c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,9 +15,5 @@ def rental_params params.require(:rental).permit(:movie_id, :customer_id) end - def change_avail_inventory(id) - binding.pry - movie = Movie.find_by(id: id) - movie.available_inventory -= 1 - end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 492b49609..241342ce9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,6 +6,10 @@ class Movie < ApplicationRecord + def change_avail_inventory(id) + movie = Movie.find_by(id: id) + movie.available_inventory -= 1 + end # def self.change_avail_inventory(movie_id) # movie = Movie.find_by(id: movie_id ) From 9acf14a1946355869d31371b5ef19f52bf7900af Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 14:20:49 -0800 Subject: [PATCH 24/52] moved method from movie model back to rental controller --- app/controllers/rentals_controller.rb | 8 ++++++-- app/models/movie.rb | 5 +---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c707add7c..4c72aefad 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,8 +3,7 @@ def create rental = Rental.new(rental_params) if rental.save change_avail_inventory(rental_params[:movie_id]) - # binding.pry - render json: { id: rental.id } + render json: { id: rental} else render_error(:bad_request, {rental: ["no such rental"]}) end @@ -15,5 +14,10 @@ def rental_params params.require(:rental).permit(:movie_id, :customer_id) end + def change_avail_inventory(id) + movie = Movie.find_by(id: id) + movie.available_inventory -= 1 + movie.save + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 241342ce9..380f5b53d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,10 +6,7 @@ class Movie < ApplicationRecord - def change_avail_inventory(id) - movie = Movie.find_by(id: id) - movie.available_inventory -= 1 - end + # def self.change_avail_inventory(movie_id) # movie = Movie.find_by(id: movie_id ) From 82d7e0971cc4f29142991a2d436b5eed1356ae82 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 14:24:47 -0800 Subject: [PATCH 25/52] added duedate and checkout date to rentals table --- .../20181106222107_add_column_checkout_duedate_rentals.rb | 7 +++++++ db/schema.rb | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181106222107_add_column_checkout_duedate_rentals.rb diff --git a/db/migrate/20181106222107_add_column_checkout_duedate_rentals.rb b/db/migrate/20181106222107_add_column_checkout_duedate_rentals.rb new file mode 100644 index 000000000..2f6d9c718 --- /dev/null +++ b/db/migrate/20181106222107_add_column_checkout_duedate_rentals.rb @@ -0,0 +1,7 @@ +class AddColumnCheckoutDuedateRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :check_out_date, :date + add_column :rentals, :due_date, :date + + end +end diff --git a/db/schema.rb b/db/schema.rb index 60879a850..af2c54980 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: 2018_11_06_004626) do +ActiveRecord::Schema.define(version: 2018_11_06_222107) 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 "check_out_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 From 0dacb7994257227006e7024a2b84a52b0192dff9 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Tue, 6 Nov 2018 14:29:35 -0800 Subject: [PATCH 26/52] Moved change available method --- app/controllers/rentals_controller.rb | 6 +++++- app/models/movie.rb | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c707add7c..460791e4e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,5 +15,9 @@ def rental_params params.require(:rental).permit(:movie_id, :customer_id) end - + def change_avail_inventory(id) + movie = Movie.find_by(id: id) + movie.available_inventory -= 1 + movie.save + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 241342ce9..380f5b53d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,10 +6,7 @@ class Movie < ApplicationRecord - def change_avail_inventory(id) - movie = Movie.find_by(id: id) - movie.available_inventory -= 1 - end + # def self.change_avail_inventory(movie_id) # movie = Movie.find_by(id: movie_id ) From 5cef38bd62a719f20899b587afa23da6014eeff7 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 14:36:31 -0800 Subject: [PATCH 27/52] added date requirement for rental due date and checkout date --- app/controllers/rentals_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4c72aefad..ab60756b5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,6 +1,10 @@ +require 'date' class RentalsController < ApplicationController def create rental = Rental.new(rental_params) + rental.check_out_date = Date.today + rental.due_date = (Date.today + 7) + if rental.save change_avail_inventory(rental_params[:movie_id]) render json: { id: rental} @@ -20,4 +24,6 @@ def change_avail_inventory(id) movie.save end + + end From a0ab03e0f121315b5aea7e1cd1475192fbd952d3 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Tue, 6 Nov 2018 15:06:06 -0800 Subject: [PATCH 28/52] zomg method --- app/controllers/customers_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5e5d86c25..a879b81ca 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -16,7 +16,9 @@ def show end end - + def zomg + render json: { message: "it works!" } + end private def customerify(customer_data) From 365e087f30b5dba8314e61abe641316822ce20cb Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 15:09:36 -0800 Subject: [PATCH 29/52] added delete route and destroy method in rental controller --- app/controllers/rentals_controller.rb | 20 ++++++++++++++++++-- config/routes.rb | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ab60756b5..787f28ed4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,24 @@ def create end end + def destroy + rental = Rental.find_by(id: check_params[:id]) + temp = rental.id + if rental.destroy + render json: { message: "#{temp} has been delted"} + end + end + + + + + + + private + + def check_params + params.require(:rental).permit(:id) + end def rental_params params.require(:rental).permit(:movie_id, :customer_id) @@ -24,6 +42,4 @@ def change_avail_inventory(id) movie.save end - - end diff --git a/config/routes.rb b/config/routes.rb index 9e9b3f0f5..23cd432d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,7 @@ get '/zomg', to: 'customers#zomg' - resources :rentals, only: [:index, :show, :create] + resources :rentals, only: [:create, :destroy] # post '/rental', to: 'rentals#create', as: 'checkout' From ebf19b5527f468ef991a5df50afdd594103e9ed7 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Tue, 6 Nov 2018 15:31:43 -0800 Subject: [PATCH 30/52] Rentals#destroy check_in method added --- app/controllers/rentals_controller.rb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 787f28ed4..aef80beda 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,9 +15,16 @@ def create def destroy rental = Rental.find_by(id: check_params[:id]) - temp = rental.id - if rental.destroy - render json: { message: "#{temp} has been delted"} + if !rental + render json: { message: "Rental id: #{check_params[:id]} doesn't exist. Try again"} + else + + temp = rental.id + temp_movie_id = rental.movie_id + if rental.destroy + checkin_change_avail_inventory(temp_movie_id) + render json: { message: "Rental id: #{temp} has been deleted"} + end end end @@ -42,4 +49,9 @@ def change_avail_inventory(id) movie.save end + def checkin_change_avail_inventory(id) + movie = Movie.find_by(id: id) + movie.available_inventory += 1 + movie.save + end end From b6911cbaa80fc526f4822c8fad7fba43ca0f23c4 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Tue, 6 Nov 2018 16:13:48 -0800 Subject: [PATCH 31/52] Changed search query for Rental#destroy --- app/controllers/rentals_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index aef80beda..cc6fb2a6e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,7 +14,7 @@ def create end def destroy - rental = Rental.find_by(id: check_params[:id]) + rental = Rental.find_by(customer_id: check_params[:customer_id], movie_id: check_params[:movie_id]) if !rental render json: { message: "Rental id: #{check_params[:id]} doesn't exist. Try again"} else @@ -36,7 +36,7 @@ def destroy private def check_params - params.require(:rental).permit(:id) + params.require(:rental).permit(:customer_id, :movie_id) end def rental_params From 43a0ae8305c15138999f49201e3569c41b55fb20 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Tue, 6 Nov 2018 16:26:27 -0800 Subject: [PATCH 32/52] customer fixture --- test/fixtures/customers.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..7a91a422f 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,20 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +shelly: + name: Shelly Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 + +curran: + name": Curran Stout + registered_at: Wed, 16 Apr 2014 21:40:20 -0700 + address: Ap 658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: 94267 + phone: (908) 949-6758 From 7d5fcd39bdbe8df5d689b8beedebd1cb2b9c5820 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 16:26:41 -0800 Subject: [PATCH 33/52] yml for rental --- test/fixtures/rentals.yml | 14 +++++++++----- test/models/rental_test.rb | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..9a5a25419 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,12 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value + + +one: + customer_id: shelly + movie_id: one + +two: + customer_id: curran + movie_id: two diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..73987ce82 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:shelly) {rentals(:one)} it "must be valid" do - value(rental).must_be :valid? + value(shelly).must_be :valid? end end From d3d006ff837b95f0f7a48932816913c7a602cf3c Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 16:48:02 -0800 Subject: [PATCH 34/52] added rental model testing, all tests pass --- test/fixtures/customers.yml | 2 +- test/fixtures/rentals.yml | 8 ++++---- test/models/rental_test.rb | 19 ++++++++++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 7a91a422f..1d99686ae 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -14,7 +14,7 @@ shelly: phone: (322) 510-8695 curran: - name": Curran Stout + name: Curran Stout registered_at: Wed, 16 Apr 2014 21:40:20 -0700 address: Ap 658-1540 Erat Rd. city: San Francisco diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 9a5a25419..f486cc4bb 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,9 +7,9 @@ one: - customer_id: shelly - movie_id: one + customer: shelly + movie: one two: - customer_id: curran - movie_id: two + customer: curran + movie: two diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 73987ce82..3b11ebd53 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,22 @@ require "test_helper" describe Rental do - let(:shelly) {rentals(:one)} + let(:rental_one) {rentals(:one)} - it "must be valid" do - value(shelly).must_be :valid? + it "Rental must be valid" do + value(rental_one).must_be :valid? end + + + it "rental belongs to customer" do + expect(rental_one.customer).must_be_kind_of Customer + expect(rental_one.customer.name).must_equal "Shelly Rocha" + end + + it "rental belongs to movie" do + expect(rental_one.movie).must_be_kind_of Movie + expect(rental_one.movie.title).must_equal "Blacksmith of the Orange" + end + + end From 39323937a049159f08b60f635adb9631ce06afcd Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Tue, 6 Nov 2018 17:05:20 -0800 Subject: [PATCH 35/52] added movies_controller tests --- test/controllers/movies_controller_test.rb | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..94eb30b0b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,4 +4,43 @@ # it "must be a real test" do # flunk "Need real tests" # end + + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "return json" do + get movies_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "return an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + + it "returns pets with exactly the required fields" do + keys = ["id", "title", "release_date"].sort + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + + + end + end From 023c71d59e3087f2f06c7b742a273fd05a7d0cf0 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Wed, 7 Nov 2018 09:32:41 -0800 Subject: [PATCH 36/52] all tests for movie passing --- test/controllers/movies_controller_test.rb | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 94eb30b0b..55b97be6f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -39,8 +39,81 @@ movie.keys.sort.must_equal keys end end + end + + + describe "create" do + let(:movie_data) { + { + title: "new movie", + overview: "best movie ever", + release_date: "2018-11-02", + inventory: 10 + } + } + + it "create a new a movie given valid data" do + expect{ + post movies_path, params: { movie: movie_data } + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + + + it "returns an error for invalid movie data" do + # arrange + movie_data["title"] = nil + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end end + describe "show" do + let(:a_movie) {movies(:one)} + KEYS = ["title", "overview", "release_date", "inventory", "available_inventory"].sort + + it "can get a movie" do + get movie_path(a_movie.id) + must_respond_with :success + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body.keys.sort).must_equal KEYS + end + + it "rendors error not_found, when a movie does not exist" do + + no_movie_id = 33333 + get movie_path(no_movie_id) + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "movie_id" + must_respond_with :not_found + end + end + + + + + end From a01c4771e85cb39e6f3924fb7b9985607d2d44ce Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 09:35:56 -0800 Subject: [PATCH 37/52] fixture data --- app/controllers/movies_controller.rb | 8 ++++++-- test/controllers/rentals_controller_test.rb | 20 +++++++++++++++++--- test/fixtures/customers.yml | 2 +- test/fixtures/rentals.yml | 8 ++++---- test/models/rental_test.rb | 4 ++-- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ecebf6aa9..791c337ab 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def show def create movie = Movie.new(movie_params) movie.available_inventory = movie.inventory - + if movie.save render json: { id: movie.id } else @@ -29,7 +29,11 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + # This version will allow form data to be received (no hashes, just keys and values) + params.permit(:title, :overview, :release_date, :inventory) + + # This version expects incoming data to be in the form of a hash within a hash (exterior hash who has a key of 'rental' => {title: x, overview: x, release: x, inventory: x}) + # params.require(:rental).permit(:title, :overview, :release_date, :inventory) end def movify_index(movie_data) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..3369070f9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,21 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'create' do + + let(:cust_one) {customers(:shelly)} + let(:movie_one) {movies(:one)} + + it 'will create a rental with valid customer and movie data' do + rental = { + rental: { + customer: cust_one.id, + movie: movie_one.id + } + } + + expect{post rentals_path, params: rental}.must_change('Rental.count', +1) + end + + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 7a91a422f..1d99686ae 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -14,7 +14,7 @@ shelly: phone: (322) 510-8695 curran: - name": Curran Stout + name: Curran Stout registered_at: Wed, 16 Apr 2014 21:40:20 -0700 address: Ap 658-1540 Erat Rd. city: San Francisco diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 9a5a25419..f486cc4bb 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,9 +7,9 @@ one: - customer_id: shelly - movie_id: one + customer: shelly + movie: one two: - customer_id: curran - movie_id: two + customer: curran + movie: two diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 73987ce82..e92f59182 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Rental do - let(:shelly) {rentals(:one)} + let(:rental_one) {rentals(:one)} it "must be valid" do - value(shelly).must_be :valid? + value(rental_one).must_be :valid? end end From f2a4d2c14e5bf03dd2ae9123504ce54d40f2b9ce Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Wed, 7 Nov 2018 10:08:16 -0800 Subject: [PATCH 38/52] added test to pass for postman --- app/controllers/rentals_controller.rb | 20 ++++++++++++++------ config/routes.rb | 4 +++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cc6fb2a6e..addd187de 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,6 +6,7 @@ def create rental.due_date = (Date.today + 7) if rental.save + increase_movie_count(rental_params[:customer_id]) change_avail_inventory(rental_params[:movie_id]) render json: { id: rental} else @@ -29,18 +30,14 @@ def destroy end - - - - private def check_params - params.require(:rental).permit(:customer_id, :movie_id) + params.permit(:customer_id, :movie_id) end def rental_params - params.require(:rental).permit(:movie_id, :customer_id) + params.permit(:movie_id, :customer_id) end def change_avail_inventory(id) @@ -54,4 +51,15 @@ def checkin_change_avail_inventory(id) movie.available_inventory += 1 movie.save end + + + def increase_movie_count(id) + customer = Customer.find_by(id: id) + customer.movies_checked_out_count += 1 + customer.save + end + + + + end diff --git a/config/routes.rb b/config/routes.rb index 23cd432d2..3c7297506 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,9 @@ get '/zomg', to: 'customers#zomg' - resources :rentals, only: [:create, :destroy] + resources :rentals, only: [:destroy] + + post '/rentals/check-out', to: 'rentals#create', as: 'checkout' # post '/rental', to: 'rentals#create', as: 'checkout' From aac2af7bd600d7c9fab41a87206f62754ab5a31e Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Wed, 7 Nov 2018 10:22:28 -0800 Subject: [PATCH 39/52] wave 3 for postman passed --- app/controllers/rentals_controller.rb | 6 ++++++ config/routes.rb | 2 ++ 2 files changed, 8 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index addd187de..a2beb5e9b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,6 +15,7 @@ def create end def destroy + decrease_movie_count(check_params[:customer_id]) rental = Rental.find_by(customer_id: check_params[:customer_id], movie_id: check_params[:movie_id]) if !rental render json: { message: "Rental id: #{check_params[:id]} doesn't exist. Try again"} @@ -59,6 +60,11 @@ def increase_movie_count(id) customer.save end + def decrease_movie_count(id) + customer = Customer.find_by(id: id) + customer.movies_checked_out_count -= 1 + customer.save + end diff --git a/config/routes.rb b/config/routes.rb index 3c7297506..f8fe2942e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,8 @@ resources :rentals, only: [:destroy] post '/rentals/check-out', to: 'rentals#create', as: 'checkout' + post '/rentals/check-in', to: 'rentals#destroy', as: 'checkin' + # post '/rental', to: 'rentals#create', as: 'checkout' From e78f56fb38cb75273b1ef4c4dd3bb575cf9bd889 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 10:43:09 -0800 Subject: [PATCH 40/52] Customer#index tests --- test/controllers/customers_controller_test.rb | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 775bf2de8..0b921a241 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -6,6 +6,25 @@ get customers_path must_respond_with :success end + + it "returns json" do + get customers_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end end describe 'show' do @@ -21,9 +40,8 @@ end it 'will render a status not_found for a non-existant customer' do - destroyed_customer = @customer.destroy - destroyed_customer.save - get customer_path(destroyed_customer.id) + non_existant_cust_id = "99999xxxxxxxxxx9999" + get customer_path(non_existant_cust_id) must_respond_with :not_found end end From 7ad09e6b1a1fffe1366d11352436dd3a8d357b10 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 10:48:08 -0800 Subject: [PATCH 41/52] Customer Controller Tests --- test/controllers/customers_controller_test.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 0b921a241..dc9986c71 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -39,10 +39,23 @@ must_respond_with :success end + it "returns json for existing customer" do + get customer_path(@customer.id) + expect(response.header['Content-Type']).must_include 'json' + end + it 'will render a status not_found for a non-existant customer' do non_existant_cust_id = "99999xxxxxxxxxx9999" get customer_path(non_existant_cust_id) must_respond_with :not_found end end + + describe 'zomg' do + it 'renders a json message for this route' do + get zomg_path + body = JSON.parse(response.body) + expect(body["message"]).must_equal "it works!" + end + end end From 24f7eeb953f831b923d834b15cc8b908f18c860c Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 11:33:57 -0800 Subject: [PATCH 42/52] Rentals#create tests --- test/controllers/rentals_controller_test.rb | 24 +++++++++++++++------ test/fixtures/customers.yml | 2 ++ test/fixtures/movies.yml | 3 ++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3369070f9..d068dca44 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -7,15 +7,27 @@ let(:movie_one) {movies(:one)} it 'will create a rental with valid customer and movie data' do - rental = { - rental: { - customer: cust_one.id, - movie: movie_one.id + info = + { + "customer_id" => cust_one.id, + "movie_id" => movie_one.id } - } - expect{post rentals_path, params: rental}.must_change('Rental.count', +1) + expect{post checkout_path, params: info}.must_change('Rental.count', +1) + end + it 'a valid rental will increment the customers movies_checked_out_count' do + info = + { + "customer_id" => cust_one.id, + "movie_id" => movie_one.id + } + post checkout_path, params: info + # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred + cust_one.reload + + expect(cust_one.movies_checked_out_count).must_equal 1 + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 1d99686ae..c263ecd34 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -12,6 +12,7 @@ shelly: state: OR postal_code: 24309 phone: (322) 510-8695 + movies_checked_out_count: 0 curran: name: Curran Stout @@ -21,3 +22,4 @@ curran: state: California postal_code: 94267 phone: (908) 949-6758 + movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 2d064b274..7acd1278c 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -9,10 +9,11 @@ one: overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. release_date: "1979-01-18" inventory: 10 - + available_inventory: 10 two: title: Savior Of The Curse overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. release_date: "2010-11-05" inventory: 3 + available_inventory: 3 From c38f9529ae5cd4992ea87f8b048f927b0dc07415 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Wed, 7 Nov 2018 11:34:00 -0800 Subject: [PATCH 43/52] added test to pass after params was taken out based on the seed data --- app/controllers/rentals_controller.rb | 1 - test/controllers/movies_controller_test.rb | 28 ++++++++++++---------- test/models/movie_test.rb | 10 ++++++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a2beb5e9b..7b04a929c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -20,7 +20,6 @@ def destroy if !rental render json: { message: "Rental id: #{check_params[:id]} doesn't exist. Try again"} else - temp = rental.id temp_movie_id = rental.movie_id if rental.destroy diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 55b97be6f..196ad6d0e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -43,27 +43,29 @@ describe "create" do - let(:movie_data) { - { - title: "new movie", - overview: "best movie ever", - release_date: "2018-11-02", - inventory: 10 - } - } + # + let(:movie_data) { + {"title" => "Cool Movie", "overview" => "This is awesome", "release_date" => "2018-11-02", "inventory" => 10} + } it "create a new a movie given valid data" do + expect{ - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.must_change "Movie.count", 1 + must_respond_with :success + + body = JSON.parse(response.body) + movie = Movie.find(body["id"].to_i) + + expect(body).must_be_kind_of Hash expect(body).must_include "id" - movie = Movie.find(body["id"].to_i) - expect(movie.title).must_equal movie_data[:title] - must_respond_with :success + expect(movie.title).must_equal movie_data["title"] + end @@ -112,7 +114,7 @@ end end - + diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e727ac7ee..434b6c937 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,6 +2,8 @@ require 'pry' describe Movie do let (:blacksmith) {movies(:one)} + let(:person) {customers(:curran)} + it "must be valid" do value(blacksmith).must_be :valid? @@ -36,8 +38,12 @@ it "movie has many rentals" do - empty_array = blacksmith.rentals - expect(empty_array).must_equal [] + rental = Rental.new(customer_id: person.id, movie_id: blacksmith.id) + expect(rental.customer_id).must_equal person.id + expect(rental.movie_id).must_equal blacksmith.id + expect(rental).must_be_kind_of Rental + + end From 994fbff0a5c756ea6515bfb9fb262ff0536ed8da Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 12:19:53 -0800 Subject: [PATCH 44/52] Rentals#create tests --- test/controllers/rentals_controller_test.rb | 53 +++++++++++++++++---- test/models/customer_test.rb | 12 +++-- 2 files changed, 51 insertions(+), 14 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d068dca44..524c4528e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,29 +5,62 @@ let(:cust_one) {customers(:shelly)} let(:movie_one) {movies(:one)} + let(:info) {{"customer_id" => cust_one.id, "movie_id" => movie_one.id}} it 'will create a rental with valid customer and movie data' do - info = - { - "customer_id" => cust_one.id, - "movie_id" => movie_one.id - } expect{post checkout_path, params: info}.must_change('Rental.count', +1) end + it 'will render a bad_request for an invalid rental request' do + fake_movie_id = "999xxxx999xxx9x9x" + rental = { + "customer_id": cust_one.id, + "movie_id": fake_movie_id + } + + post checkout_path, params: rental + must_respond_with :bad_request + end + it 'a valid rental will increment the customers movies_checked_out_count' do - info = - { - "customer_id" => cust_one.id, - "movie_id" => movie_one.id - } + post checkout_path, params: info # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred cust_one.reload expect(cust_one.movies_checked_out_count).must_equal 1 end + + it 'an invalid rental will not increment the customers movies_checked_out_count' do + + fake_movie_id = "999xxxx999xxx9x9x" + rental = { + "customer_id": cust_one.id, + "movie_id": fake_movie_id + } + + start_count = cust_one.movies_checked_out_count + + post checkout_path, params: rental + + cust_one.reload + + end_count = cust_one.movies_checked_out_count + expect(start_count).must_equal end_count + end + + it 'will decrament the movies available_inventory with a valid rental' do + start_availability = movie_one.available_inventory + + post checkout_path, params: info + movie_one.reload + + expect(movie_one.available_inventory).must_equal (start_availability - 1) + must_respond_with :success + end + + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0fa0f6648..c421cfee3 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -11,10 +11,14 @@ customer = Customer.first movie_1 = Movie.first movie_2 = Movie.last - rental_1 = Rental.create!(customer_id: customer.id, movie_id: movie_1.id) - rental_2 = Rental.create!(customer_id: customer.id, movie_id: movie_2.id) - rentals = Rental.where(customer_id: customer.id) - expect(rentals.count).must_equal 2 + + current_rental_count = Rental.where(customer_id: customer.id).count + + rental_1 = Rental.create(customer_id: customer.id, movie_id: movie_1.id) + rental_2 = Rental.create(customer_id: customer.id, movie_id: movie_2.id) + rentals = Rental.where(customer_id: customer.id).count + + expect(rentals).must_equal (current_rental_count + 2) end end From 97757d1b595228d67db62fc21cfed9d037b4612b Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 12:33:18 -0800 Subject: [PATCH 45/52] Rentals#create invalid tests --- test/controllers/rentals_controller_test.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 524c4528e..a5b6a52ff 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -61,6 +61,21 @@ must_respond_with :success end + it 'will not decrament the movies available_inventory with an invalid rental' do + start_availability = movie_one.available_inventory + fake_cust_id = "999xxxx999xxx9x9x" + rental = { + "customer_id": fake_cust_id, + "movie_id": movie_one.id + } + + post checkout_path, params: rental + movie_one.reload + + end_availablity = movie_one.available_inventory + + expect(start_availability).must_equal end_availablity + end end end From 829bb772c4fef315c3b9fffdb5260f2473c6fe44 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 13:57:04 -0800 Subject: [PATCH 46/52] Rentals#create checkout_date and due_date tests --- test/controllers/rentals_controller_test.rb | 40 +++++++++++++++++++++ test/fixtures/rentals.yml | 4 +++ 2 files changed, 44 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a5b6a52ff..e09b712e7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'date' describe RentalsController do describe 'create' do @@ -77,5 +78,44 @@ expect(start_availability).must_equal end_availablity end + + it 'sets a checkout date and due date for a valid rental' do + @customer = Customer.create( + name: "PotatoHead", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + postal_code: "98103", + phone: "(206)222-2222" + ) + + info ={ + "customer_id" => @customer.id, + "movie_id" => movie_one.id + } + + post checkout_path, params: info + rental = Rental.find_by(customer_id: @customer.id) + + expect(rental.check_out_date).must_be_kind_of Date + expect(rental.due_date).must_be_kind_of Date + + end + + it 'sets a due date that is 7 days after the checkout date for a valid rental' do + @customer = Customer.create( + name: "PotatoHead", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + postal_code: "98103", + phone: "(206)222-2222" + ) + + info ={ + "customer_id" => @customer.id, + "movie_id" => movie_one.id + } + + post checkout_path, params: info + rental = Rental.find_by(customer_id: @customer.id) + expect(rental.due_date).must_equal (rental.check_out_date + 7) + end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f486cc4bb..f613e21f4 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -9,7 +9,11 @@ one: customer: shelly movie: one + check_out_date: + due_date: two: customer: curran movie: two + check_out_date: + due_date: From 8d5f45d31a85aa7b7c1d7ef16557ce879c2c782e Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 14:00:37 -0800 Subject: [PATCH 47/52] Preparing for merge --- test/controllers/rentals_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e09b712e7..d9e3c6710 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,5 +1,5 @@ require "test_helper" -require 'date' + describe RentalsController do describe 'create' do @@ -118,4 +118,4 @@ expect(rental.due_date).must_equal (rental.check_out_date + 7) end end -end +# end From cb12abc5e0d8e57d3f39bdb1d0a9091fb4970013 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Wed, 7 Nov 2018 14:01:01 -0800 Subject: [PATCH 48/52] added more rental tests for destroy controller --- app/controllers/rentals_controller.rb | 1 + test/controllers/rentals_controller_test.rb | 213 +++++++++++++++++--- test/fixtures/customers.yml | 11 + test/fixtures/rentals.yml | 4 + 4 files changed, 206 insertions(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7b04a929c..a5c22e354 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -22,6 +22,7 @@ def destroy else temp = rental.id temp_movie_id = rental.movie_id + if rental.destroy checkin_change_avail_inventory(temp_movie_id) render json: { message: "Rental id: #{temp} has been deleted"} diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d068dca44..8c15b8ecc 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,33 +1,200 @@ -require "test_helper" -describe RentalsController do - describe 'create' do - let(:cust_one) {customers(:shelly)} - let(:movie_one) {movies(:one)} - it 'will create a rental with valid customer and movie data' do - info = - { - "customer_id" => cust_one.id, - "movie_id" => movie_one.id - } - expect{post checkout_path, params: info}.must_change('Rental.count', +1) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + describe " destroy " do + + let(:cust_two) {customers(:dave)} + let(:movie_two) {movies(:two)} + let(:cust_three) {customers(:shelly)} + + let(:rental_one) {rentals(:three)} + it 'will destroy a rental with valid customer and movie data' do + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + + cust_two.reload + + expect{post checkin_path, params: info}.must_change('Rental.count', -1) + end + + it 'a valid rental will decrement the customers movies_checked_out_count' do + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + post checkin_path, params: info + # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred + cust_two.reload + + expect(cust_two.movies_checked_out_count).must_equal 4 + end + + + + it "if rental doesn't exsits it reponds with a message" do + info = + { + "customer_id" => cust_three.id, + "movie_id" => movie_two.id + } + + post checkin_path, params: info + must_respond_with :success + expect(response.body).must_include "Rental id: doesn't exist. Try again" end - it 'a valid rental will increment the customers movies_checked_out_count' do - info = - { - "customer_id" => cust_one.id, - "movie_id" => movie_one.id - } - post checkout_path, params: info - # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred - cust_one.reload - - expect(cust_one.movies_checked_out_count).must_equal 1 + it "changes the available inventory for the movie when the movie is checked back in" do + + movie = Movie.find_by(id: movie_two.id) + + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + + post checkin_path, params: info + must_respond_with :success + + movie_two.reload + cust_two.reload + expect(movie_two.available_inventory).must_equal 4 + expect(response.body).must_include "Rental id" + end + + end + + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index c263ecd34..8cdff309c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -23,3 +23,14 @@ curran: postal_code: 94267 phone: (908) 949-6758 movies_checked_out_count: 0 + + +dave: + name: Dave Chump + registered_at: Wed, 18 Apr 2014 21:40:20 -0700 + address: Ap 658-1540 marron Rd. + city: San Diego + state: California + postal_code: 94267 + phone: (908) 949-6758 + movies_checked_out_count: 5 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f486cc4bb..5210c6e0f 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -13,3 +13,7 @@ one: two: customer: curran movie: two + +three: + customer: dave + movie: two From 5633f602da2e0dc8b5e88c586ed7c7d74d349bb3 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 14:06:30 -0800 Subject: [PATCH 49/52] Merge Rental tests --- test/controllers/rentals_controller_test.rb | 81 +++++++++++++++++++-- 1 file changed, 76 insertions(+), 5 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d9e3c6710..9394aee4a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -27,11 +27,11 @@ it 'a valid rental will increment the customers movies_checked_out_count' do - post checkout_path, params: info - # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred - cust_one.reload + post checkout_path, params: info + # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred + cust_one.reload - expect(cust_one.movies_checked_out_count).must_equal 1 + expect(cust_one.movies_checked_out_count).must_equal 1 end it 'an invalid rental will not increment the customers movies_checked_out_count' do @@ -118,4 +118,75 @@ expect(rental.due_date).must_equal (rental.check_out_date + 7) end end -# end + # end + describe " destroy " do + + let(:cust_two) {customers(:dave)} + let(:movie_two) {movies(:two)} + let(:cust_three) {customers(:shelly)} + + let(:rental_one) {rentals(:three)} + it 'will destroy a rental with valid customer and movie data' do + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + + cust_two.reload + + expect{post checkin_path, params: info}.must_change('Rental.count', -1) + end + + it 'a valid rental will decrement the customers movies_checked_out_count' do + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + post checkin_path, params: info + # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred + cust_two.reload + + expect(cust_two.movies_checked_out_count).must_equal 4 + end + + + + it "if rental doesn't exsits it reponds with a message" do + info = + { + "customer_id" => cust_three.id, + "movie_id" => movie_two.id + } + + post checkin_path, params: info + must_respond_with :success + expect(response.body).must_include "Rental id: doesn't exist. Try again" + end + + it "changes the available inventory for the movie when the movie is checked back in" do + + movie = Movie.find_by(id: movie_two.id) + + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + + post checkin_path, params: info + must_respond_with :success + + movie_two.reload + cust_two.reload + expect(movie_two.available_inventory).must_equal 4 + expect(response.body).must_include "Rental id" + + end + + + end + + +end From fa9002608fc24123f766326e993597333d601c47 Mon Sep 17 00:00:00 2001 From: BarbaraWidjono Date: Wed, 7 Nov 2018 14:12:00 -0800 Subject: [PATCH 50/52] prep for merge --- test/controllers/rentals_controller_test.rb | 192 -------------------- 1 file changed, 192 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9394aee4a..e69de29bb 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,192 +0,0 @@ -require "test_helper" - - -describe RentalsController do - describe 'create' do - - let(:cust_one) {customers(:shelly)} - let(:movie_one) {movies(:one)} - let(:info) {{"customer_id" => cust_one.id, "movie_id" => movie_one.id}} - - it 'will create a rental with valid customer and movie data' do - - expect{post checkout_path, params: info}.must_change('Rental.count', +1) - - end - - it 'will render a bad_request for an invalid rental request' do - fake_movie_id = "999xxxx999xxx9x9x" - rental = { - "customer_id": cust_one.id, - "movie_id": fake_movie_id - } - - post checkout_path, params: rental - must_respond_with :bad_request - end - - it 'a valid rental will increment the customers movies_checked_out_count' do - - post checkout_path, params: info - # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred - cust_one.reload - - expect(cust_one.movies_checked_out_count).must_equal 1 - end - - it 'an invalid rental will not increment the customers movies_checked_out_count' do - - fake_movie_id = "999xxxx999xxx9x9x" - rental = { - "customer_id": cust_one.id, - "movie_id": fake_movie_id - } - - start_count = cust_one.movies_checked_out_count - - post checkout_path, params: rental - - cust_one.reload - - end_count = cust_one.movies_checked_out_count - expect(start_count).must_equal end_count - end - - it 'will decrament the movies available_inventory with a valid rental' do - start_availability = movie_one.available_inventory - - post checkout_path, params: info - movie_one.reload - - expect(movie_one.available_inventory).must_equal (start_availability - 1) - must_respond_with :success - end - - it 'will not decrament the movies available_inventory with an invalid rental' do - start_availability = movie_one.available_inventory - - fake_cust_id = "999xxxx999xxx9x9x" - rental = { - "customer_id": fake_cust_id, - "movie_id": movie_one.id - } - - post checkout_path, params: rental - movie_one.reload - - end_availablity = movie_one.available_inventory - - expect(start_availability).must_equal end_availablity - end - - it 'sets a checkout date and due date for a valid rental' do - @customer = Customer.create( - name: "PotatoHead", - registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", - postal_code: "98103", - phone: "(206)222-2222" - ) - - info ={ - "customer_id" => @customer.id, - "movie_id" => movie_one.id - } - - post checkout_path, params: info - rental = Rental.find_by(customer_id: @customer.id) - - expect(rental.check_out_date).must_be_kind_of Date - expect(rental.due_date).must_be_kind_of Date - - end - - it 'sets a due date that is 7 days after the checkout date for a valid rental' do - @customer = Customer.create( - name: "PotatoHead", - registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", - postal_code: "98103", - phone: "(206)222-2222" - ) - - info ={ - "customer_id" => @customer.id, - "movie_id" => movie_one.id - } - - post checkout_path, params: info - rental = Rental.find_by(customer_id: @customer.id) - expect(rental.due_date).must_equal (rental.check_out_date + 7) - end - end - # end - describe " destroy " do - - let(:cust_two) {customers(:dave)} - let(:movie_two) {movies(:two)} - let(:cust_three) {customers(:shelly)} - - let(:rental_one) {rentals(:three)} - it 'will destroy a rental with valid customer and movie data' do - info = - { - "customer_id" => cust_two.id, - "movie_id" => movie_two.id - } - - cust_two.reload - - expect{post checkin_path, params: info}.must_change('Rental.count', -1) - end - - it 'a valid rental will decrement the customers movies_checked_out_count' do - info = - { - "customer_id" => cust_two.id, - "movie_id" => movie_two.id - } - post checkin_path, params: info - # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred - cust_two.reload - - expect(cust_two.movies_checked_out_count).must_equal 4 - end - - - - it "if rental doesn't exsits it reponds with a message" do - info = - { - "customer_id" => cust_three.id, - "movie_id" => movie_two.id - } - - post checkin_path, params: info - must_respond_with :success - expect(response.body).must_include "Rental id: doesn't exist. Try again" - end - - it "changes the available inventory for the movie when the movie is checked back in" do - - movie = Movie.find_by(id: movie_two.id) - - info = - { - "customer_id" => cust_two.id, - "movie_id" => movie_two.id - } - - post checkin_path, params: info - must_respond_with :success - - movie_two.reload - cust_two.reload - expect(movie_two.available_inventory).must_equal 4 - expect(response.body).must_include "Rental id" - - end - - - end - - -end From 4fe8ec0f727af4aee5cb59bf6adab481da9f52a8 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Wed, 7 Nov 2018 14:12:44 -0800 Subject: [PATCH 51/52] empty rental controller, fixed movie yml --- test/controllers/rentals_controller_test.rb | 315 -------------------- test/fixtures/rentals.yml | 7 +- 2 files changed, 3 insertions(+), 319 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 5bc4be58c..e69de29bb 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,315 +0,0 @@ - - -describe RentalsController do - describe 'create' do - - let(:cust_one) {customers(:shelly)} - let(:movie_one) {movies(:one)} - let(:info) {{"customer_id" => cust_one.id, "movie_id" => movie_one.id}} - - it 'will create a rental with valid customer and movie data' do - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - describe " destroy " do - - let(:cust_two) {customers(:dave)} - let(:movie_two) {movies(:two)} - let(:cust_three) {customers(:shelly)} - - let(:rental_one) {rentals(:three)} - it 'will destroy a rental with valid customer and movie data' do - info = - { - "customer_id" => cust_two.id, - "movie_id" => movie_two.id - } - - cust_two.reload - - expect{post checkin_path, params: info}.must_change('Rental.count', -1) - end - - it 'a valid rental will decrement the customers movies_checked_out_count' do - info = - { - "customer_id" => cust_two.id, - "movie_id" => movie_two.id - } - post checkin_path, params: info - # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred - cust_two.reload - - expect(cust_two.movies_checked_out_count).must_equal 4 - end - - - - it "if rental doesn't exsits it reponds with a message" do - info = - { - "customer_id" => cust_three.id, - "movie_id" => movie_two.id - } - - post checkin_path, params: info - must_respond_with :success - expect(response.body).must_include "Rental id: doesn't exist. Try again" - end - -<<<<<<< HEAD - it "changes the available inventory for the movie when the movie is checked back in" do - - movie = Movie.find_by(id: movie_two.id) - - info = - { - "customer_id" => cust_two.id, - "movie_id" => movie_two.id - } - - post checkin_path, params: info - must_respond_with :success - - movie_two.reload - cust_two.reload - expect(movie_two.available_inventory).must_equal 4 - expect(response.body).must_include "Rental id" - - end - - - end - - -end -======= - it 'will render a bad_request for an invalid rental request' do - fake_movie_id = "999xxxx999xxx9x9x" - rental = { - "customer_id": cust_one.id, - "movie_id": fake_movie_id - } - - post checkout_path, params: rental - must_respond_with :bad_request - end - - it 'a valid rental will increment the customers movies_checked_out_count' do - - post checkout_path, params: info - # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred - cust_one.reload - - expect(cust_one.movies_checked_out_count).must_equal 1 - end - - it 'an invalid rental will not increment the customers movies_checked_out_count' do - - fake_movie_id = "999xxxx999xxx9x9x" - rental = { - "customer_id": cust_one.id, - "movie_id": fake_movie_id - } - - start_count = cust_one.movies_checked_out_count - - post checkout_path, params: rental - - cust_one.reload - - end_count = cust_one.movies_checked_out_count - expect(start_count).must_equal end_count - end - - it 'will decrament the movies available_inventory with a valid rental' do - start_availability = movie_one.available_inventory - - post checkout_path, params: info - movie_one.reload - - expect(movie_one.available_inventory).must_equal (start_availability - 1) - must_respond_with :success - end - - it 'will not decrament the movies available_inventory with an invalid rental' do - start_availability = movie_one.available_inventory - - fake_cust_id = "999xxxx999xxx9x9x" - rental = { - "customer_id": fake_cust_id, - "movie_id": movie_one.id - } - - post checkout_path, params: rental - movie_one.reload - - end_availablity = movie_one.available_inventory - - expect(start_availability).must_equal end_availablity - end - - it 'sets a checkout date and due date for a valid rental' do - @customer = Customer.create( - name: "PotatoHead", - registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", - postal_code: "98103", - phone: "(206)222-2222" - ) - - info ={ - "customer_id" => @customer.id, - "movie_id" => movie_one.id - } - - post checkout_path, params: info - rental = Rental.find_by(customer_id: @customer.id) - - expect(rental.check_out_date).must_be_kind_of Date - expect(rental.due_date).must_be_kind_of Date - - end - - it 'sets a due date that is 7 days after the checkout date for a valid rental' do - @customer = Customer.create( - name: "PotatoHead", - registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", - postal_code: "98103", - phone: "(206)222-2222" - ) - - info ={ - "customer_id" => @customer.id, - "movie_id" => movie_one.id - } - - post checkout_path, params: info - rental = Rental.find_by(customer_id: @customer.id) - expect(rental.due_date).must_equal (rental.check_out_date + 7) - end - end -# end ->>>>>>> 8d5f45d31a85aa7b7c1d7ef16557ce879c2c782e diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 110db419c..10c636846 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -10,17 +10,16 @@ one: customer: shelly movie: one check_out_date: - due_date: + due_date: two: customer: curran movie: two -<<<<<<< HEAD + check_out_date: + due_date: three: customer: dave movie: two -======= check_out_date: due_date: ->>>>>>> 8d5f45d31a85aa7b7c1d7ef16557ce879c2c782e From 9dad991dea2e982db4fbb9ac801d6705ee8ad895 Mon Sep 17 00:00:00 2001 From: Pushpa Agr Date: Wed, 7 Nov 2018 14:22:45 -0800 Subject: [PATCH 52/52] Restore rental controller tests --- test/controllers/rentals_controller_test.rb | 192 ++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e69de29bb..9394aee4a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,192 @@ +require "test_helper" + + +describe RentalsController do + describe 'create' do + + let(:cust_one) {customers(:shelly)} + let(:movie_one) {movies(:one)} + let(:info) {{"customer_id" => cust_one.id, "movie_id" => movie_one.id}} + + it 'will create a rental with valid customer and movie data' do + + expect{post checkout_path, params: info}.must_change('Rental.count', +1) + + end + + it 'will render a bad_request for an invalid rental request' do + fake_movie_id = "999xxxx999xxx9x9x" + rental = { + "customer_id": cust_one.id, + "movie_id": fake_movie_id + } + + post checkout_path, params: rental + must_respond_with :bad_request + end + + it 'a valid rental will increment the customers movies_checked_out_count' do + + post checkout_path, params: info + # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred + cust_one.reload + + expect(cust_one.movies_checked_out_count).must_equal 1 + end + + it 'an invalid rental will not increment the customers movies_checked_out_count' do + + fake_movie_id = "999xxxx999xxx9x9x" + rental = { + "customer_id": cust_one.id, + "movie_id": fake_movie_id + } + + start_count = cust_one.movies_checked_out_count + + post checkout_path, params: rental + + cust_one.reload + + end_count = cust_one.movies_checked_out_count + expect(start_count).must_equal end_count + end + + it 'will decrament the movies available_inventory with a valid rental' do + start_availability = movie_one.available_inventory + + post checkout_path, params: info + movie_one.reload + + expect(movie_one.available_inventory).must_equal (start_availability - 1) + must_respond_with :success + end + + it 'will not decrament the movies available_inventory with an invalid rental' do + start_availability = movie_one.available_inventory + + fake_cust_id = "999xxxx999xxx9x9x" + rental = { + "customer_id": fake_cust_id, + "movie_id": movie_one.id + } + + post checkout_path, params: rental + movie_one.reload + + end_availablity = movie_one.available_inventory + + expect(start_availability).must_equal end_availablity + end + + it 'sets a checkout date and due date for a valid rental' do + @customer = Customer.create( + name: "PotatoHead", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + postal_code: "98103", + phone: "(206)222-2222" + ) + + info ={ + "customer_id" => @customer.id, + "movie_id" => movie_one.id + } + + post checkout_path, params: info + rental = Rental.find_by(customer_id: @customer.id) + + expect(rental.check_out_date).must_be_kind_of Date + expect(rental.due_date).must_be_kind_of Date + + end + + it 'sets a due date that is 7 days after the checkout date for a valid rental' do + @customer = Customer.create( + name: "PotatoHead", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + postal_code: "98103", + phone: "(206)222-2222" + ) + + info ={ + "customer_id" => @customer.id, + "movie_id" => movie_one.id + } + + post checkout_path, params: info + rental = Rental.find_by(customer_id: @customer.id) + expect(rental.due_date).must_equal (rental.check_out_date + 7) + end + end + # end + describe " destroy " do + + let(:cust_two) {customers(:dave)} + let(:movie_two) {movies(:two)} + let(:cust_three) {customers(:shelly)} + + let(:rental_one) {rentals(:three)} + it 'will destroy a rental with valid customer and movie data' do + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + + cust_two.reload + + expect{post checkin_path, params: info}.must_change('Rental.count', -1) + end + + it 'a valid rental will decrement the customers movies_checked_out_count' do + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + post checkin_path, params: info + # This reloads the yaml file with the new changes to the variable specified. In this example, it reloaded cust_one data with the changes after checkout_path occurred + cust_two.reload + + expect(cust_two.movies_checked_out_count).must_equal 4 + end + + + + it "if rental doesn't exsits it reponds with a message" do + info = + { + "customer_id" => cust_three.id, + "movie_id" => movie_two.id + } + + post checkin_path, params: info + must_respond_with :success + expect(response.body).must_include "Rental id: doesn't exist. Try again" + end + + it "changes the available inventory for the movie when the movie is checked back in" do + + movie = Movie.find_by(id: movie_two.id) + + info = + { + "customer_id" => cust_two.id, + "movie_id" => movie_two.id + } + + post checkin_path, params: info + must_respond_with :success + + movie_two.reload + cust_two.reload + expect(movie_two.available_inventory).must_equal 4 + expect(response.body).must_include "Rental id" + + end + + + end + + +end