From 98953807302806373deb8380ba77b3c9fe6394cd Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Tue, 14 May 2019 13:44:27 -0700 Subject: [PATCH 01/20] created models for Customer and Movies and controllers --- .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/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 8 + config/spring.rb | 6 + config/storage.yml | 34 ++++ db/migrate/20190514203303_create_movies.rb | 12 ++ db/migrate/20190514204301_create_customers.rb | 15 ++ db/schema.rb | 39 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 7 + test/controllers/movies_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 71 files changed, 1078 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/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb 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/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/migrate/20190514203303_create_movies.rb create mode 100644 db/migrate/20190514204301_create_customers.rb create mode 100644 db/schema.rb 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/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87697ba34 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 2.0.1 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/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/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/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/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..7b954d67b --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +pfocQaiLExh8APd9Du8k8KYO29hwXtKTUA2HyAxhZ8szsho+1Up2Lu8xPWTSr+/9cZsltSfBzqEPMyDorvP6aMcGIbvWjvo0kxLd+exlpv9AwNyaJBRbKQiNDiGa+vkAXGmSc/JU0b893qzzsQypFFQdp4vlU/QBapiLT5vJBg7sdjjybo278U+LC5ecggX4Ku1gZKSX8jSKUComZhFiRb+eqKPAHHrbeL0azyCxg6gdcgTratyspKg2PsNhqmB8mDA6uQxfcN2ynFLuUMJ2cPR3EEOeITIdrvmjb0AwBfpZE37Obo/w8+O8Jq9dMOCPsxLyQjg8Q/AUYR/T4w/fVSDYnwAr4d20nHxHOymqJRTFJ1chgPeobQfXh1wHBzBVvfVUTNcvDtzj0lrGxXVJ/bHGlsLe0RiIFSCS--9tbrawmHatXP7KHG--ctCej0l9v2GVUrxjqMQQOQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..f949efc0b --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,8 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + # resources :customers, only: [:index] + # resources :movies, only: [:index, :show, :create] + # post "rentals/checkout", to: "rentals#checkout", as: rentals_checkout + # post "rentals/checkin", to: "rentals#checkout", as: rentals_checkout + +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/db/migrate/20190514203303_create_movies.rb b/db/migrate/20190514203303_create_movies.rb new file mode 100644 index 000000000..95d31e0f8 --- /dev/null +++ b/db/migrate/20190514203303_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514204301_create_customers.rb b/db/migrate/20190514204301_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514204301_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..9b3eeaa75 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_204301) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end 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/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 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..873a3f737 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 13:43:01 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 13:43:01 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 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/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..659aaae39 --- /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 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 1061e165457c4c3e0895a18865448d08485a4578 Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Tue, 14 May 2019 14:12:45 -0700 Subject: [PATCH 02/20] index and show actions for movies --- app/controllers/movies_controller.rb | 13 +++++++++++++ config/routes.rb | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..0c2d29708 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,15 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(except: [:created_at, :updated_at]), status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok + else + render json: { error: "This movie was not found" }, status: :not_found + end + end end diff --git a/config/routes.rb b/config/routes.rb index f949efc0b..f39f492b6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # resources :customers, only: [:index] - # resources :movies, only: [:index, :show, :create] + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] # post "rentals/checkout", to: "rentals#checkout", as: rentals_checkout # post "rentals/checkin", to: "rentals#checkout", as: rentals_checkout - end From ce28a4eca583deea880cdddff306c56b4a77d5c7 Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Tue, 14 May 2019 14:15:35 -0700 Subject: [PATCH 03/20] movies create action --- app/controllers/movies_controller.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0c2d29708..5f497aa66 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,4 +12,19 @@ def show render json: { error: "This movie was not found" }, status: :not_found end end + + def create + movie = movie.new(movie_params) + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { errors: movie.errors.messages }, + status: :bad_request + end + end + + private + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end From d352c42b23108e17d0b83fa5fe186070a6a1289f Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Tue, 14 May 2019 14:27:09 -0700 Subject: [PATCH 04/20] customer index action --- app/models/customer.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..33fa36138 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,10 @@ class Customer < ApplicationRecord + def index + customers = Customer.all + if !customers.empty? + render json: customers.as_json(except: [:created_at, :updated_at]), status: :ok + else + render json: { message: "There are currently no customers." } + end + end end From 953d83fd9f06226877525e29dc78f7885cb0ebad Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Tue, 14 May 2019 14:50:13 -0700 Subject: [PATCH 05/20] moved index from model to customer controller --- app/controllers/customers_controller.rb | 8 ++++++++ app/models/customer.rb | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..e8c68ac71 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,10 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + if !customers.empty? + render json: customers.as_json(except: [:created_at, :updated_at]), status: :ok + else + render json: { message: "There are currently no customers." } + end + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 33fa36138..0b5277335 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,10 +1,2 @@ class Customer < ApplicationRecord - def index - customers = Customer.all - if !customers.empty? - render json: customers.as_json(except: [:created_at, :updated_at]), status: :ok - else - render json: { message: "There are currently no customers." } - end - end end From 2b23869c94d3a4a87fc86e64fcbef3b54c8c764c Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Tue, 14 May 2019 15:32:16 -0700 Subject: [PATCH 06/20] movie to Move in #create --- app/controllers/movies_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5f497aa66..05669f3a7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,7 +14,7 @@ def show end def create - movie = movie.new(movie_params) + movie = Movie.new(movie_params) if movie.save render json: { id: movie.id }, status: :ok else @@ -25,6 +25,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end From 4ac66093852f3e3fb7323668ce0f084ba2e79712 Mon Sep 17 00:00:00 2001 From: Mello-Cello Date: Tue, 14 May 2019 16:53:29 -0700 Subject: [PATCH 07/20] Wrote tests for movies and customers controllers. More movies controller tests to be finished. --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 13 ++- test/controllers/customers_controller_test.rb | 44 +++++++++- test/controllers/movies_controller_test.rb | 84 ++++++++++++++++++- test/fixtures/movies.yml | 10 +-- test/test_helper.rb | 4 +- 6 files changed, 139 insertions(+), 18 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e8c68ac71..4be73e7ba 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,7 @@ def index if !customers.empty? render json: customers.as_json(except: [:created_at, :updated_at]), status: :ok else - render json: { message: "There are currently no customers." } + render json: {message: "There are currently no customers."} end end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 05669f3a7..2afcd3529 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,11 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(except: [:created_at, :updated_at]), status: :ok + if !movies.empty? + render json: movies.as_json(except: [:created_at, :updated_at]), status: :ok + else + render json: {message: "There are currently no movies."} + end end def show @@ -9,21 +13,22 @@ def show if movie render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok else - render json: { error: "This movie was not found" }, status: :not_found + render json: {error: "This movie was not found"}, status: :not_found end end def create movie = Movie.new(movie_params) if movie.save - render json: { id: movie.id }, status: :ok + render json: {id: movie.id}, status: :ok else - render json: { errors: movie.errors.messages }, + render json: {errors: movie.errors.messages}, status: :bad_request end end private + def movie_params params.permit(:title, :overview, :release_date, :inventory) end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..33c211b61 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,45 @@ require "test_helper" +require "pry" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "customers_path is a working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an array" do + get customers_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all customers" do + get customers_path + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customer with the fields required to be included in the json" do + keys = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"] + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.must_equal keys + end + end + + it "return 'no customer' message if there are no customers" do + Customer.destroy_all + get customers_path + # binding.pry + must_respond_with :success + expect(JSON.parse(response.body)["message"]).must_equal "There are currently no customers." + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..9a129dd1e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,85 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "movies_path is a working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an array" do + get movies_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all movies" do + get movies_path + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movie with the fields required to be included in the json" do + keys = %w(id title overview release_date inventory) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.must_equal keys + end + end + + it "return 'no customer' message if there are no customers" do + Movie.destroy_all + get movies_path + # binding.pry + must_respond_with :success + expect(JSON.parse(response.body)["message"]).must_equal "There are currently no movies." + end + end + + describe "show" do + it "can get a movie" do + this_movie = movies(:GreenMile) + get movie_path(this_movie) + must_respond_with :success + this_movie.title.must_equal "The Green Mile" + end + + it "returns json" do + # get movies_path + # expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an array" do + # get movies_path + # body = JSON.parse(response.body) + # body.must_be_kind_of Array + end + + it "returns movie with the fields required to be included in the json" do + # keys = %w(id title overview release_date inventory) + # get movies_path + # body = JSON.parse(response.body) + # body.each do |movie| + # movie.keys.must_equal keys + # end + end + + it "returns 404 if movie is not found" do + end + end + + describe "create" do + + it "makes a new movie" do + end + + it "returns an error for invalid movie data" do + + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..adf1b4cdb 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,10 +1,10 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 +GreenMile: + title: The Green Mile + overview: Great movie, tearjerker. + release_date: 2000-05-05 + inventory: 15 two: title: MyString diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..3f7dc7d3e 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, @@ -9,7 +10,6 @@ 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" From 492628c94fcd730c7340dc077eea2b1784ee1b6b Mon Sep 17 00:00:00 2001 From: Mello-Cello Date: Tue, 14 May 2019 16:54:39 -0700 Subject: [PATCH 08/20] fixed a missing end --- test/controllers/movies_controller_test.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 9a129dd1e..c3eda6f29 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -75,11 +75,10 @@ end describe "create" do + it "makes a new movie" do + end - it "makes a new movie" do - end - - it "returns an error for invalid movie data" do - + it "returns an error for invalid movie data" do + end end end From 4c018903b6ede46a3ba3f00d4509362918057023 Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Wed, 15 May 2019 13:04:55 -0700 Subject: [PATCH 09/20] movie validation test for title, added movie create and show action tests --- app/models/movie.rb | 1 + test/controllers/movies_controller_test.rb | 71 +++++++++++++++++----- test/models/movie_test.rb | 9 ++- 3 files changed, 64 insertions(+), 17 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..d34b59f22 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + validates :title, presence: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c3eda6f29..dd5b5bee4 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -43,42 +43,83 @@ end describe "show" do + before do + @this_movie = movies(:GreenMile) + end it "can get a movie" do - this_movie = movies(:GreenMile) - get movie_path(this_movie) + get movie_path(@this_movie) must_respond_with :success - this_movie.title.must_equal "The Green Mile" + @this_movie.title.must_equal "The Green Mile" end it "returns json" do - # get movies_path - # expect(response.header["Content-Type"]).must_include "json" + get movie_path(@this_movie) + expect(response.header["Content-Type"]).must_include "json" end - it "returns an array" do - # get movies_path - # body = JSON.parse(response.body) - # body.must_be_kind_of Array + it "returns an Hash" do + get movie_path(@this_movie) + body = JSON.parse(response.body) + body.must_be_kind_of Hash end it "returns movie with the fields required to be included in the json" do - # keys = %w(id title overview release_date inventory) - # get movies_path - # body = JSON.parse(response.body) - # body.each do |movie| - # movie.keys.must_equal keys - # end + keys = %w(id title overview release_date inventory) + get movie_path(@this_movie) + body = JSON.parse(response.body) + body.keys.must_equal keys end it "returns 404 if movie is not found" do + get movie_path(-1) + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_include "error" end end describe "create" do + let(:movie_params) { + { + title: "Stardust", + inventory: 10, + release_date: "20191010", + overview: "fantasy world star falls to earth and adventures ensue", + } + } it "makes a new movie" do + expect { + post movies_path, params: movie_params + }.must_change "Movie.count", +1 end it "returns an error for invalid movie data" do + movie_params[:title] = nil + expect { + post movies_path, params: movie_params + }.wont_change "Movie.count" + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_include "errors" + end + + it "returns json" do + post movies_path, params: movie_params + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Hash" do + post movies_path, params: movie_params + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns movie with the fields required to be included in the json" do + keys = ["id"] + post movies_path, params: movie_params + body = JSON.parse(response.body) + body.keys.must_equal keys end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 659aaae39..9a976ef93 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,14 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { Movie.new(title: "Stardust") } -it "must be valid" do + it "must be valid" do value(movie).must_be :valid? end + + it "returns false for invalid movie data" do + movie = Movie.new + movie.valid?.must_equal false + end end From 31b2e16a1224f9a21f9529e2546f624403651ca1 Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Wed, 15 May 2019 13:25:42 -0700 Subject: [PATCH 10/20] rentals table --- app/models/rental.rb | 4 ++++ db/migrate/20190515202222_create_rentals.rb | 12 ++++++++++++ db/schema.rb | 15 ++++++++++++++- test/fixtures/rentals.yml | 13 +++++++++++++ test/models/rental_test.rb | 9 +++++++++ 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190515202222_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20190515202222_create_rentals.rb b/db/migrate/20190515202222_create_rentals.rb new file mode 100644 index 000000000..bcfc29afc --- /dev/null +++ b/db/migrate/20190515202222_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.references :movie, foreign_key: true + t.references :customer, foreign_key: true + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 9b3eeaa75..3906a7bb9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_204301) do +ActiveRecord::Schema.define(version: 2019_05_15_202222) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,17 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.bigint "movie_id" + t.bigint "customer_id" + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..8181fafcb --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + movie: one + customer: one + checkout_date: 2019-05-15 + due_date: 2019-05-15 + +two: + movie: two + customer: two + checkout_date: 2019-05-15 + due_date: 2019-05-15 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 1c79508eaf2cb26ac4b07e065b0c01bb0d61e3ef Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Thu, 16 May 2019 08:55:25 -0700 Subject: [PATCH 11/20] tests for checkout --- app/controllers/application_controller.rb | 1 + app/controllers/rentals_controller.rb | 43 ++++++++++ app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 4 +- config/routes.rb | 5 +- ...0515204213_add_checkedin_column_rentals.rb | 5 ++ ...7_add_movies_checked_out_count_customer.rb | 5 ++ ...add_column_available_inventory_to_movie.rb | 5 ++ db/schema.rb | 5 +- test/controllers/customers_controller_test.rb | 1 - test/controllers/rentals_controller_test.rb | 82 +++++++++++++++++++ test/fixtures/customers.yml | 2 + test/fixtures/movies.yml | 3 +- test/test_helper.rb | 1 + 15 files changed, 157 insertions(+), 7 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 db/migrate/20190515204213_add_checkedin_column_rentals.rb create mode 100644 db/migrate/20190515211617_add_movies_checked_out_count_customer.rb create mode 100644 db/migrate/20190515211755_add_column_available_inventory_to_movie.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..f5b855168 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,3 @@ class ApplicationController < ActionController::API + require "date" end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..0b37c61fb --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,43 @@ +class RentalsController < ApplicationController + def checkout + # change the inventory by -1, add update action to movie + # create an instance of Rental, with today's date in checkout column and due date defined as today + 7 days + movie = Movie.find_by(id: params[:movie_id]) + if movie == nil + render json: { error: "Movie was not found in database or no movie id was provided." }, status: :no_content + return + end + + if movie.available_inventory > 0 || movie.available_inventory == nil + rental = Rental.new(rental_params) + + if rental.save + customer = Customer.find_by(id: params[:customer_id]) + render json: { id: rental.id }, status: :ok + existing_movie_count = customer.movies_checked_out_count + customer.update(movies_checked_out_count: existing_movie_count + 1) + + current_movie_inventory = movie.available_inventory + movie.update(available_inventory: current_movie_inventory - 1) + + # find customer; update movies_checked_out_count column + # find movie; update available_inventory + else + render json: { error: rental.errors.messages }, status: :bad_request + end + else + render json: { message: "This movie is not available for checkout." }, status: :forbidden + end + end + + def checkin + # change the inventory by +1 + # update instance of rental with checked-in date + end + + private + + def rental_params + params.permit(:movie_id, :customer_id, :checkout_date, :due_date, :checked_in_date) + end +end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..9e5dede9e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals, dependent: :nullify end diff --git a/app/models/movie.rb b/app/models/movie.rb index d34b59f22..9035c2d83 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,4 @@ class Movie < ApplicationRecord validates :title, presence: true + has_many :rentals, dependent: :destroy end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..695ea727d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord - belongs_to :movie - belongs_to :customer + belongs_to :movie, dependent: :delete + belongs_to :customer, dependent: :delete end diff --git a/config/routes.rb b/config/routes.rb index f39f492b6..c412b41c5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,8 @@ Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - # post "rentals/checkout", to: "rentals#checkout", as: rentals_checkout - # post "rentals/checkin", to: "rentals#checkout", as: rentals_checkout + post "rentals/checkout", to: "rentals#checkout", as: "rentals_checkout" + post "rentals/checkin", to: "rentals#checkin", as: "rentals_checkin" end diff --git a/db/migrate/20190515204213_add_checkedin_column_rentals.rb b/db/migrate/20190515204213_add_checkedin_column_rentals.rb new file mode 100644 index 000000000..1ce7c934d --- /dev/null +++ b/db/migrate/20190515204213_add_checkedin_column_rentals.rb @@ -0,0 +1,5 @@ +class AddCheckedinColumnRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checked_in_date, :date + end +end diff --git a/db/migrate/20190515211617_add_movies_checked_out_count_customer.rb b/db/migrate/20190515211617_add_movies_checked_out_count_customer.rb new file mode 100644 index 000000000..fed339c07 --- /dev/null +++ b/db/migrate/20190515211617_add_movies_checked_out_count_customer.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/migrate/20190515211755_add_column_available_inventory_to_movie.rb b/db/migrate/20190515211755_add_column_available_inventory_to_movie.rb new file mode 100644 index 000000000..2d2dcc5e5 --- /dev/null +++ b/db/migrate/20190515211755_add_column_available_inventory_to_movie.rb @@ -0,0 +1,5 @@ +class AddColumnAvailableInventoryToMovie < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 3906a7bb9..dfd9ede00 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_15_202222) do +ActiveRecord::Schema.define(version: 2019_05_15_211755) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| @@ -43,6 +45,7 @@ t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.date "checked_in_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 33c211b61..e629d6c87 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -37,7 +37,6 @@ it "return 'no customer' message if there are no customers" do Customer.destroy_all get customers_path - # binding.pry must_respond_with :success expect(JSON.parse(response.body)["message"]).must_equal "There are currently no customers." end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..72294d695 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,82 @@ +require "test_helper" + +describe RentalsController do + let(:rental_data) { + { + movie_id: movies(:GreenMile).id, + customer_id: customers(:one).id, + checkout_date: Date.today, + due_date: Date.today + 7, + } + } + describe "checkout" do + it "should create a rental given valid data" do + expect { + post rentals_checkout_path, params: rental_data + }.must_change "Rental.count", +1 + + must_respond_with :success + end + + it "will return bad request if given invalid data" do + rental_data[:movie_id] = nil + expect { + post rentals_checkout_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :no_content + end + + it "returns json" do + post rentals_checkout_path, params: rental_data + must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns a hash" do + post rentals_checkout_path, params: rental_data + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns rental record with the fields required to be included in the json" do + keys = %w(id) + post rentals_checkout_path, params: rental_data + body = JSON.parse(response.body) + body.keys.must_equal keys + end + + it "updates the customer movies_checked_out_count" do + initial_checked_out_count = customers(:one).movies_checked_out_count + post rentals_checkout_path, params: rental_data + customers(:one).reload + customers(:one).movies_checked_out_count.must_equal initial_checked_out_count + 1 + end + + it "updates the movie's available_inventory" do + initial_movie_inventory = movies(:GreenMile).available_inventory + post rentals_checkout_path, params: rental_data + movies(:GreenMile).reload + movies(:GreenMile).available_inventory.must_equal initial_movie_inventory - 1 + end + + it "returns 204 if movie is not found or not provided" do + rental_data[:movie_id] = -1 + expect { post rentals_checkout_path, params: rental_data }.wont_change "Rental.count" + must_respond_with :no_content + end + + it "returns a message and doesn't save the rental if inventory < 1" do + rental_data[:movie_id] = movies(:two).id + expect { post rentals_checkout_path, params: rental_data }.wont_change "Rental.count" + must_respond_with :forbidden + end + end + + describe "checkin" do + it "should get checkin" do + post rentals_checkin_path + must_respond_with :success + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 873a3f737..6d4450149 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ one: state: MyString postal_code: MyString phone: MyString + movies_checked_out_count: 2 two: name: MyString @@ -17,3 +18,4 @@ two: state: MyString postal_code: MyString phone: MyString + movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index adf1b4cdb..51616af5d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,10 @@ GreenMile: overview: Great movie, tearjerker. release_date: 2000-05-05 inventory: 15 + available_inventory: 13 two: title: MyString overview: MyString release_date: MyString - inventory: 1 + available_inventory: 0 diff --git a/test/test_helper.rb b/test/test_helper.rb index 3f7dc7d3e..e845c575f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -3,6 +3,7 @@ require "rails/test_help" require "minitest/rails" require "minitest/reporters" # for Colorized output +require "date" # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 67600addde51a2ea30aaf89984275ee3db4379ed Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Thu, 16 May 2019 10:14:36 -0700 Subject: [PATCH 12/20] tests for checkin --- app/controllers/rentals_controller.rb | 28 ++++++++++-- config/routes.rb | 4 +- db/seeds.rb | 6 ++- test/controllers/rentals_controller_test.rb | 50 ++++++++++++++++++++- test/fixtures/rentals.yml | 2 +- 5 files changed, 80 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 0b37c61fb..aaaec1589 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,7 @@ def checkout return end - if movie.available_inventory > 0 || movie.available_inventory == nil + if movie.available_inventory > 0 rental = Rental.new(rental_params) if rental.save @@ -31,8 +31,30 @@ def checkout end def checkin - # change the inventory by +1 - # update instance of rental with checked-in date + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + if !customer + render json: { error: "Customer id #{params[:customer_id]}not found" }, status: :no_content + return + end + if !movie + render json: { error: "Movie id #{params[:movie_id]} not found" }, status: :no_content + return + end + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + if !rental + render json: { error: "Rental not found" }, status: :no_content + return + end + + rental.checked_in_date = Date.today + rental.save + + existing_movie_count = customer.movies_checked_out_count + customer.update(movies_checked_out_count: existing_movie_count - 1) + + current_movie_inventory = movie.available_inventory + movie.update(available_inventory: current_movie_inventory + 1) end private diff --git a/config/routes.rb b/config/routes.rb index c412b41c5..b5b6ae883 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post "rentals/checkout", to: "rentals#checkout", as: "rentals_checkout" - post "rentals/checkin", to: "rentals#checkin", as: "rentals_checkin" + post "rentals/check-out", to: "rentals#checkout", as: "rentals_checkout" + post "rentals/check-in", to: "rentals#checkin", as: "rentals_checkin" end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..87aefe190 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,9 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| + customer.merge!("movies_checked_out_count" => 0) Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| + movie.merge!("available_inventory" => movie["inventory"]) Movie.create!(movie) end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 72294d695..b4ded3172 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -74,9 +74,55 @@ end describe "checkin" do - it "should get checkin" do - post rentals_checkin_path + let(:rental_params) { + { + customer_id: customers(:one).id, + movie_id: movies(:GreenMile).id, + } + } + it "should checkin a movie with valid data" do + post rentals_checkout_path, params: rental_data + post rentals_checkin_path, params: rental_params must_respond_with :success end + + it "will return 204 if the customer doesn't exist" do + rental_params[:customer_id] = -1 + post rentals_checkin_path, params: rental_params + must_respond_with :no_content + end + + it "will return 204 if the movie doesn't exist" do + rental_params[:movie_id] = -1 + post rentals_checkin_path, params: rental_params + must_respond_with :no_content + end + + it "will return 204 if the rental doesn't exist" do + rental_params[:customer_id] = customers(:two).id + post rentals_checkin_path, params: rental_params + must_respond_with :no_content + end + + it "updates the customer movies_checked_out_count" do + initial_checked_out_count = customers(:one).movies_checked_out_count + + post rentals_checkin_path, params: rental_params + customers(:one).reload + customers(:one).movies_checked_out_count.must_equal initial_checked_out_count - 1 + end + + it "updates the movie's available_inventory" do + initial_movie_inventory = movies(:GreenMile).available_inventory + post rentals_checkin_path, params: rental_data + movies(:GreenMile).reload + movies(:GreenMile).available_inventory.must_equal initial_movie_inventory + 1 + end + + it "updates the rentals checked in date" do + post rentals_checkin_path, params: rental_data + rentals(:one).reload + rentals(:one).checked_in_date.must_equal Date.today + end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 8181fafcb..25906140e 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - movie: one + movie: GreenMile customer: one checkout_date: 2019-05-15 due_date: 2019-05-15 From 7a7bb3ba5112fb200a92ca165b66b17fa30d07f4 Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Thu, 16 May 2019 11:43:38 -0700 Subject: [PATCH 13/20] dont know what I changed --- 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 aaaec1589..78618b44c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,6 +31,10 @@ def checkout end def checkin + # begin + # Rental.return(customer_id, movie_id) + # rescue Rental::CheckinError => exception + # end customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) if !customer @@ -55,6 +59,8 @@ def checkin current_movie_inventory = movie.available_inventory movie.update(available_inventory: current_movie_inventory + 1) + render json: { id: rental.id, message: "checked-in successful" }, status: :ok + end private From 71b6f87a4f4677655fae95c043df62768d9aa8f5 Mon Sep 17 00:00:00 2001 From: Mello-Cello Date: Thu, 16 May 2019 12:11:42 -0700 Subject: [PATCH 14/20] Wrote remaining tests for rentals_controller. --- app/controllers/movies_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2afcd3529..c6615c481 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,6 +5,8 @@ def index render json: movies.as_json(except: [:created_at, :updated_at]), status: :ok else render json: {message: "There are currently no movies."} + # Another syntax, below, returns a different data structure (hash with ok: true as one key-value pair and pet: pets.as... as another key-value pair; this second key-value pair is the same as what's returned above - an array of hashes) + # render json: {ok: true, pet: pets.as_json(except: [:created_at, :updated_at])} end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b4ded3172..5ed44225d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -80,6 +80,7 @@ movie_id: movies(:GreenMile).id, } } + it "should checkin a movie with valid data" do post rentals_checkout_path, params: rental_data post rentals_checkin_path, params: rental_params @@ -124,5 +125,24 @@ rentals(:one).reload rentals(:one).checked_in_date.must_equal Date.today end + + it "returns json" do + post rentals_checkin_path, params: rental_params + must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns a hash" do + post rentals_checkin_path, params: rental_params + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns rental record with the fields required to be included in the json" do + keys = %w(id message) + post rentals_checkin_path, params: rental_params + body = JSON.parse(response.body) + body.keys.must_equal keys + end end end From f44fc7210f4b2f3d499f1268dfa08dafbbd05c29 Mon Sep 17 00:00:00 2001 From: Mello-Cello Date: Thu, 16 May 2019 13:09:34 -0700 Subject: [PATCH 15/20] Wrote model tests. Updated controller to accomodate saving the due date and checkout date in the checkout action. --- app/controllers/rentals_controller.rb | 23 +++++++------- test/controllers/rentals_controller_test.rb | 11 +++++++ test/models/customer_test.rb | 7 +++-- test/models/movie_test.rb | 19 ++++++++---- test/models/rental_test.rb | 33 +++++++++++++++++++-- 5 files changed, 73 insertions(+), 20 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 78618b44c..8ea16de6b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,16 +4,18 @@ def checkout # create an instance of Rental, with today's date in checkout column and due date defined as today + 7 days movie = Movie.find_by(id: params[:movie_id]) if movie == nil - render json: { error: "Movie was not found in database or no movie id was provided." }, status: :no_content + render json: {error: "Movie was not found in database or no movie id was provided."}, status: :no_content return end if movie.available_inventory > 0 rental = Rental.new(rental_params) - + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 if rental.save + p rental customer = Customer.find_by(id: params[:customer_id]) - render json: { id: rental.id }, status: :ok + render json: {id: rental.id}, status: :ok existing_movie_count = customer.movies_checked_out_count customer.update(movies_checked_out_count: existing_movie_count + 1) @@ -23,10 +25,10 @@ def checkout # find customer; update movies_checked_out_count column # find movie; update available_inventory else - render json: { error: rental.errors.messages }, status: :bad_request + render json: {error: rental.errors.messages}, status: :bad_request end else - render json: { message: "This movie is not available for checkout." }, status: :forbidden + render json: {message: "This movie is not available for checkout."}, status: :forbidden end end @@ -38,16 +40,16 @@ def checkin customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) if !customer - render json: { error: "Customer id #{params[:customer_id]}not found" }, status: :no_content + render json: {error: "Customer id #{params[:customer_id]}not found"}, status: :no_content return end if !movie - render json: { error: "Movie id #{params[:movie_id]} not found" }, status: :no_content + render json: {error: "Movie id #{params[:movie_id]} not found"}, status: :no_content return end rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) if !rental - render json: { error: "Rental not found" }, status: :no_content + render json: {error: "Rental not found"}, status: :no_content return end @@ -59,13 +61,12 @@ def checkin current_movie_inventory = movie.available_inventory movie.update(available_inventory: current_movie_inventory + 1) - render json: { id: rental.id, message: "checked-in successful" }, status: :ok - + render json: {id: rental.id, message: "checked-in successful"}, status: :ok end private def rental_params - params.permit(:movie_id, :customer_id, :checkout_date, :due_date, :checked_in_date) + params.permit(:movie_id, :customer_id) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 5ed44225d..8b1391c06 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -71,6 +71,17 @@ expect { post rentals_checkout_path, params: rental_data }.wont_change "Rental.count" must_respond_with :forbidden end + + it "due date is today + 7 days" do + movie = movies(:GreenMile) + customer = customers(:two) + rental_params = {movie_id: movie.id, customer_id: customer.id} + # binding.pry + + post rentals_checkout_path, params: rental_params + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental.due_date.must_equal Date.today + 7 + end end describe "checkin" do diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..9dd262ed4 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,7 +3,10 @@ describe Customer do let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + describe "relations" do + it "customer has_many rentals" do + customer = customers(:two) + customer.rentals.must_include rentals(:two) + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9a976ef93..86355712a 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,12 +3,21 @@ describe Movie do let(:movie) { Movie.new(title: "Stardust") } - it "must be valid" do - value(movie).must_be :valid? + describe "validations" do + it "must be valid" do + value(movie).must_be :valid? + end + + it "returns false for invalid movie data" do + movie = Movie.new + movie.valid?.must_equal false + end end - it "returns false for invalid movie data" do - movie = Movie.new - movie.valid?.must_equal false + describe "relations" do + it "has_many rentals" do + movie = movies(:GreenMile) + movie.rentals.count.must_equal 1 + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..58a0682af 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,38 @@ require "test_helper" +require "pry" describe Rental do let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? + describe "validations" do + it "due date is today + 7 days" do + movie = movies(:two) + customer = customers(:two) + rental_params = {movie_id: movie.id, customer_id: customer.id} + # binding.pry + + post rentals_checkout_path + rental = Rental.last + rental.due_date.must_equal Date.today + 7 + end + + it "checkout_date is today" do + movie = movies(:two) + customer = customers(:two) + rental_params = {movie_id: movie.id, customer_id: customer.id} + # binding.pry + + post rentals_checkout_path + rental = Rental.last + rental.checkout_date.must_equal Date.today + end + end + + describe "relations" do + it "belongs_to movie" do + end + + it "belongs_to customer" do + end end end From 491c428317604f7cf7577a2122866d9daf7ff3a7 Mon Sep 17 00:00:00 2001 From: Mello-Cello Date: Thu, 16 May 2019 13:21:07 -0700 Subject: [PATCH 16/20] Finished model tests for Rental. --- test/controllers/rentals_controller_test.rb | 11 ++++++ test/models/rental_test.rb | 44 ++++++++++++--------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8b1391c06..7b8470387 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -82,6 +82,17 @@ rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) rental.due_date.must_equal Date.today + 7 end + + it "checkout_date is today" do + movie = movies(:GreenMile) + customer = customers(:two) + rental_params = {movie_id: movie.id, customer_id: customer.id} + # binding.pry + + post rentals_checkout_path, params: rental_params + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental.checkout_date.must_equal Date.today + end end describe "checkin" do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 58a0682af..d27b40070 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -5,34 +5,40 @@ let(:rental) { Rental.new } describe "validations" do - it "due date is today + 7 days" do - movie = movies(:two) - customer = customers(:two) - rental_params = {movie_id: movie.id, customer_id: customer.id} - # binding.pry - - post rentals_checkout_path - rental = Rental.last - rental.due_date.must_equal Date.today + 7 - end + # # NOTE: THESE TESTS ARE DUPLICATED IN THE CONTROLLER TESTS, AND THEY DON'T WORK HERE. RENTALS_CHECKOUT_PATH IS UNDEFINED VARIABLE OR METHOD + # it "due date is today + 7 days" do - it "checkout_date is today" do - movie = movies(:two) - customer = customers(:two) - rental_params = {movie_id: movie.id, customer_id: customer.id} - # binding.pry + # movie = movies(:GreenMile) + # customer = customers(:two) + # rental_params = {movie_id: movie.id, customer_id: customer.id} + # # binding.pry - post rentals_checkout_path - rental = Rental.last - rental.checkout_date.must_equal Date.today - end + # post rentals_checkout_path, params: rental_params + # rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + # rental.due_date.must_equal Date.today + 7 + # end + + # it "checkout_date is today" do + # movie = movies(:GreenMile) + # customer = customers(:two) + # rental_params = {movie_id: movie.id, customer_id: customer.id} + # # binding.pry + + # post rentals_checkout_path, params: rental_params + # rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + # rental.checkout_date.must_equal Date.today + # end end describe "relations" do it "belongs_to movie" do + rental = rentals(:one) + rental.movie.must_equal movies(:GreenMile) end it "belongs_to customer" do + rental = rentals(:one) + rental.customer.must_equal customers(:one) end end end From c1ae8e7045c424a31ec5a3dc805a04fe40f665f2 Mon Sep 17 00:00:00 2001 From: Mello-Cello Date: Fri, 17 May 2019 11:17:43 -0700 Subject: [PATCH 17/20] Fixed tests that were broken by adding more columns. --- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e629d6c87..0ef36a57b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,7 +26,7 @@ end it "returns customer with the fields required to be included in the json" do - keys = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"] + keys = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone", "movies_checked_out_count"] get customers_path body = JSON.parse(response.body) body.each do |customer| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index dd5b5bee4..f9ad51a45 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -25,7 +25,8 @@ end it "returns movie with the fields required to be included in the json" do - keys = %w(id title overview release_date inventory) + # THIS TEST IS DUPLICATED IN THE SHOW TESTS VERBATIM; DELTE ONE? + keys = %w(id title overview release_date inventory available_inventory) get movies_path body = JSON.parse(response.body) body.each do |movie| @@ -64,7 +65,7 @@ end it "returns movie with the fields required to be included in the json" do - keys = %w(id title overview release_date inventory) + keys = %w(id title overview release_date inventory available_inventory) get movie_path(@this_movie) body = JSON.parse(response.body) body.keys.must_equal keys From 01e0bb4da38d52ee6fd724b8a2752e7cecd7d321 Mon Sep 17 00:00:00 2001 From: Mello-Cello Date: Fri, 17 May 2019 14:36:11 -0700 Subject: [PATCH 18/20] Cleaned up tests. --- app/controllers/rentals_controller.rb | 1 - test/models/rental_test.rb | 30 +++++---------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8ea16de6b..e77f7e9cf 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,7 +13,6 @@ def checkout rental.checkout_date = Date.today rental.due_date = Date.today + 7 if rental.save - p rental customer = Customer.find_by(id: params[:customer_id]) render json: {id: rental.id}, status: :ok existing_movie_count = customer.movies_checked_out_count diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d27b40070..242c524ad 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,32 +2,12 @@ require "pry" describe Rental do - let(:rental) { Rental.new } - describe "validations" do - # # NOTE: THESE TESTS ARE DUPLICATED IN THE CONTROLLER TESTS, AND THEY DON'T WORK HERE. RENTALS_CHECKOUT_PATH IS UNDEFINED VARIABLE OR METHOD - # it "due date is today + 7 days" do - - # movie = movies(:GreenMile) - # customer = customers(:two) - # rental_params = {movie_id: movie.id, customer_id: customer.id} - # # binding.pry - - # post rentals_checkout_path, params: rental_params - # rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) - # rental.due_date.must_equal Date.today + 7 - # end - - # it "checkout_date is today" do - # movie = movies(:GreenMile) - # customer = customers(:two) - # rental_params = {movie_id: movie.id, customer_id: customer.id} - # # binding.pry - - # post rentals_checkout_path, params: rental_params - # rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) - # rental.checkout_date.must_equal Date.today - # end + it "must be a valid rental" do + rental = Rental.new(customer_id: customers(:one).id, movie_id: movies(:two).id) + rental.save + rental.valid?.must_equal true + end end describe "relations" do From 1c038ea98b44447b6d4a15ef4d92c69535b61e79 Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Fri, 17 May 2019 15:26:23 -0700 Subject: [PATCH 19/20] moved logic on updating customers movies checked out count and movie's available inventory to model method in rental --- app/controllers/rentals_controller.rb | 42 ++++++++------------- app/models/rental.rb | 21 +++++++++++ test/controllers/rentals_controller_test.rb | 6 +-- test/models/rental_test.rb | 36 ++++++++++++++++++ 4 files changed, 75 insertions(+), 30 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e77f7e9cf..00a9e2783 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,7 +4,7 @@ def checkout # create an instance of Rental, with today's date in checkout column and due date defined as today + 7 days movie = Movie.find_by(id: params[:movie_id]) if movie == nil - render json: {error: "Movie was not found in database or no movie id was provided."}, status: :no_content + render json: { error: "Movie was not found in database or no movie id was provided." }, status: :no_content return end @@ -14,53 +14,41 @@ def checkout rental.due_date = Date.today + 7 if rental.save customer = Customer.find_by(id: params[:customer_id]) - render json: {id: rental.id}, status: :ok - existing_movie_count = customer.movies_checked_out_count - customer.update(movies_checked_out_count: existing_movie_count + 1) - - current_movie_inventory = movie.available_inventory - movie.update(available_inventory: current_movie_inventory - 1) + render json: { id: rental.id }, status: :ok + rental.checkout_update_customer_movie(customer, movie) # find customer; update movies_checked_out_count column # find movie; update available_inventory else - render json: {error: rental.errors.messages}, status: :bad_request + render json: { error: rental.errors.messages }, status: :bad_request end else - render json: {message: "This movie is not available for checkout."}, status: :forbidden + render json: { message: "This movie is not available for checkout." }, status: :forbidden end end def checkin - # begin - # Rental.return(customer_id, movie_id) - # rescue Rental::CheckinError => exception - # end - customer = Customer.find_by(id: params[:customer_id]) - movie = Movie.find_by(id: params[:movie_id]) + customer_id = params[:customer_id] + movie_id = params[:movie_id] + customer = Customer.find_by(id: customer_id) + movie = Movie.find_by(id: movie_id) if !customer - render json: {error: "Customer id #{params[:customer_id]}not found"}, status: :no_content + render json: { error: "Customer id #{params[:customer_id]}not found" }, status: :no_content return end if !movie - render json: {error: "Movie id #{params[:movie_id]} not found"}, status: :no_content + render json: { error: "Movie id #{params[:movie_id]} not found" }, status: :no_content return end - rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + rental = Rental.return(customer_id, movie_id) if !rental - render json: {error: "Rental not found"}, status: :no_content + render json: { error: "rental not found" }, status: :no_content return end - rental.checked_in_date = Date.today rental.save - - existing_movie_count = customer.movies_checked_out_count - customer.update(movies_checked_out_count: existing_movie_count - 1) - - current_movie_inventory = movie.available_inventory - movie.update(available_inventory: current_movie_inventory + 1) - render json: {id: rental.id, message: "checked-in successful"}, status: :ok + rental.checkin_update_customer_movie(customer, movie) + render json: { id: rental.id, message: "checked-in successful" }, status: :ok end private diff --git a/app/models/rental.rb b/app/models/rental.rb index 695ea727d..d9fb46f11 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,25 @@ class Rental < ApplicationRecord belongs_to :movie, dependent: :delete belongs_to :customer, dependent: :delete + + def checkout_update_customer_movie(customer, movie) + existing_movie_count = customer.movies_checked_out_count + customer.update(movies_checked_out_count: existing_movie_count + 1) + + current_movie_inventory = movie.available_inventory + movie.update(available_inventory: current_movie_inventory - 1) + end + + def checkin_update_customer_movie(customer, movie) + existing_movie_count = customer.movies_checked_out_count + customer.update(movies_checked_out_count: existing_movie_count - 1) + + current_movie_inventory = movie.available_inventory + movie.update(available_inventory: current_movie_inventory + 1) + end + + def self.return(customer_id, movie_id) + rental = Rental.find_by(customer_id: customer_id, movie_id: movie_id) + return rental + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7b8470387..f2645530a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -75,7 +75,7 @@ it "due date is today + 7 days" do movie = movies(:GreenMile) customer = customers(:two) - rental_params = {movie_id: movie.id, customer_id: customer.id} + rental_params = { movie_id: movie.id, customer_id: customer.id } # binding.pry post rentals_checkout_path, params: rental_params @@ -86,7 +86,7 @@ it "checkout_date is today" do movie = movies(:GreenMile) customer = customers(:two) - rental_params = {movie_id: movie.id, customer_id: customer.id} + rental_params = { movie_id: movie.id, customer_id: customer.id } # binding.pry post rentals_checkout_path, params: rental_params @@ -121,7 +121,7 @@ must_respond_with :no_content end - it "will return 204 if the rental doesn't exist" do + it "will return checkin error if the rental doesn't exist" do rental_params[:customer_id] = customers(:two).id post rentals_checkin_path, params: rental_params must_respond_with :no_content diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 242c524ad..471d24a94 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -21,4 +21,40 @@ rental.customer.must_equal customers(:one) end end + + describe "checkout_update_movies_customers" do + it "increases customer's movies checked out count by 1" do + rental = rentals(:one) + initial_movies_checked_out = rental.customer.movies_checked_out_count + rental.checkout_update_customer_movie(rental.customer, rental.movie) + rental.reload + expect(rental.customer.movies_checked_out_count).must_equal initial_movies_checked_out + 1 + end + + it "decreases movie's available inventory by 1" do + rental = rentals(:one) + initial_available_inventory = rental.movie.available_inventory + rental.checkout_update_customer_movie(rental.customer, rental.movie) + rental.reload + expect(rental.movie.available_inventory).must_equal initial_available_inventory - 1 + end + end + + describe "checkin_update_movies_customers" do + it "decreases customer's movies checked out count by 1" do + rental = rentals(:one) + initial_movies_checked_out = rental.customer.movies_checked_out_count + rental.checkin_update_customer_movie(rental.customer, rental.movie) + rental.reload + expect(rental.customer.movies_checked_out_count).must_equal initial_movies_checked_out - 1 + end + + it "increases movie's available inventory by 1" do + rental = rentals(:one) + initial_available_inventory = rental.movie.available_inventory + rental.checkin_update_customer_movie(rental.customer, rental.movie) + rental.reload + expect(rental.movie.available_inventory).must_equal initial_available_inventory + 1 + end + end end From 6b2aed38109ca54cfa24a3f5b92de0a17f002453 Mon Sep 17 00:00:00 2001 From: Cyndi Lopez Date: Fri, 17 May 2019 15:32:04 -0700 Subject: [PATCH 20/20] deleted unncessary comments --- app/controllers/movies_controller.rb | 2 -- app/controllers/rentals_controller.rb | 4 ---- 2 files changed, 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c6615c481..2afcd3529 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,8 +5,6 @@ def index render json: movies.as_json(except: [:created_at, :updated_at]), status: :ok else render json: {message: "There are currently no movies."} - # Another syntax, below, returns a different data structure (hash with ok: true as one key-value pair and pet: pets.as... as another key-value pair; this second key-value pair is the same as what's returned above - an array of hashes) - # render json: {ok: true, pet: pets.as_json(except: [:created_at, :updated_at])} end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 00a9e2783..35ebb530e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,5 @@ class RentalsController < ApplicationController def checkout - # change the inventory by -1, add update action to movie - # create an instance of Rental, with today's date in checkout column and due date defined as today + 7 days movie = Movie.find_by(id: params[:movie_id]) if movie == nil render json: { error: "Movie was not found in database or no movie id was provided." }, status: :no_content @@ -17,8 +15,6 @@ def checkout render json: { id: rental.id }, status: :ok rental.checkout_update_customer_movie(customer, movie) - # find customer; update movies_checked_out_count column - # find movie; update available_inventory else render json: { error: rental.errors.messages }, status: :bad_request end