From fdcccdb2e3b4c0ebc3525284613859d9a23bce5b Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 11:55:30 -0800 Subject: [PATCH 01/36] Rails setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 59 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 + tmp/.keep | 0 vendor/.keep | 0 58 files changed, 932 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..160fe391c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..8143da43e --- /dev/null +++ b/Gemfile @@ -0,0 +1,59 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..981f08e8a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) + erubi (1.9.0) + ffi (1.11.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.3.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + minitest-rails (5.2.0) + minitest (~> 5.10) + railties (~> 5.2.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.1) + nio4r (2.5.2) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + ruby_dep (1.5.0) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + debase (>= 0.2.4.1) + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.0.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..56f84c20c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6cc616cd1 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video-store-api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..97f8a810d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +eXUUfWj/X/EFb4/BwlsYhgfZAXk24AeAPiALQveIV5S8FXfWfl5R+bYGEXNGcCevMSiFwN87g7M9KLD8lJJvubZ31gzWD+Z4omSlNaE7j9mrO5hC5Rk9YdhAnHMBF9i5/Lf76eyGPJWAQ+2L3Nczk2jMT5QwHwovrIinLQrvfUZ7pT4bDcY0A9hkHKHf1yR+5QzjTHfZ6XeIvcv2elC2ZQ0/xc6lmkelLHnBV5jwAO7vRMYPdDB6dERorMbWz9NYweBte3N3M88nWOFZ/aFTEW8TvIT1XJ7+d0+EcS7Z/oU/yL8iNxo90dTOVqFZJFYRYlX8nErf6/NV1fM7aQA+oR2NW1bg8va0n5MBd6XkDaWe2WdvLT17Qt4KF8zz7ob58p3MNrVxWCUcqwxxlMv8dEmjpa/G2f4ACl64--4EKp6XzBFISxssIC--pe+4LviN6NW3Jo+9Cxy43A== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..25f76c8e1 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video-store-api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video-store-api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video-store-api_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video-store-api_production + username: video-store-api + password: <%= ENV['VIDEO-STORE-API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f023a796 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video-store-api_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 8f315df238434b26cd23cbfc155df96ef13476ab Mon Sep 17 00:00:00 2001 From: gracexinran Date: Tue, 5 Nov 2019 13:27:00 -0800 Subject: [PATCH 02/36] Created controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 6 files changed, 27 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..b11d50cea --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From fd820f67efac748381ad28ba8ba8bcf7e8557833 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Tue, 5 Nov 2019 13:32:04 -0800 Subject: [PATCH 03/36] Created models --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20191105212829_create_movies.rb | 12 ++++++++++++ db/migrate/20191105213015_create_customers.rb | 14 ++++++++++++++ db/migrate/20191105213143_create_rentals.rb | 10 ++++++++++ test/models/customer_test.rb | 7 +++++++ test/models/movie_test.rb | 7 +++++++ test/models/rental_test.rb | 7 +++++++ 9 files changed, 63 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20191105212829_create_movies.rb create mode 100644 db/migrate/20191105213015_create_customers.rb create mode 100644 db/migrate/20191105213143_create_rentals.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20191105212829_create_movies.rb b/db/migrate/20191105212829_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20191105212829_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20191105213015_create_customers.rb b/db/migrate/20191105213015_create_customers.rb new file mode 100644 index 000000000..f6ae258aa --- /dev/null +++ b/db/migrate/20191105213015_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20191105213143_create_rentals.rb b/db/migrate/20191105213143_create_rentals.rb new file mode 100644 index 000000000..bbb9344ed --- /dev/null +++ b/db/migrate/20191105213143_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :check_in + t.date :check_out + + t.timestamps + end + end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..cd59ab14a --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Movie do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 998626d9cbece31997c8383985785ebd28c4c48b Mon Sep 17 00:00:00 2001 From: gracexinran Date: Tue, 5 Nov 2019 13:34:46 -0800 Subject: [PATCH 04/36] Created schema --- db/schema.rb | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..eacf1dbe1 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,45 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_11_05_213143) 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.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.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_in" + t.date "check_out" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 7e892cddac398ef11bab3bf033462b738bd2b486 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 13:35:09 -0800 Subject: [PATCH 05/36] Created schema --- db/schema.rb | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..eacf1dbe1 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,45 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_11_05_213143) 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.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.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_in" + t.date "check_out" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 7a885d12c523af6c16c8e503089ca695ee74c257 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 13:43:09 -0800 Subject: [PATCH 06/36] Added RESTful routes --- config/routes.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..5c119f462 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +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/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end From 5331c125162b67a95679c2abe3547c223007c3d2 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 14:12:58 -0800 Subject: [PATCH 07/36] Modified index action of customers controller and added tests --- app/controllers/customers_controller.rb | 9 ++++++ test/controllers/customers_controller_test.rb | 32 +++++++++++++++++-- test/test_helper.rb | 15 +++++++-- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..ece5314f0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,11 @@ class CustomersController < ApplicationController + def index + customers = Customer.all.as_json + + if customers.empty? + render json: { message: "No customers" }, status: :ok + else + render json: customers, status: :ok + end + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..ea1ae2a2b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,33 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responds with JSON and success" do + get customers_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :ok + end + + it "responds with an array of customer hashes" do + get customers_path + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + + names = Customer.columns.map { |column| column.name } + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal names.sort + end + end + it "responds with a message and empty array if there are no customers" do + get customers_path + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body.keys).must_include "message" + assert_equal "No customers", body["message"] + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..392a45b77 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,15 @@ -ENV['RAILS_ENV'] ||= 'test' -require_relative '../config/environment' -require 'rails/test_help' +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 +) class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From b8849d0fb8065f0e8f7bdd1b4c30c976c6ab99a7 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 14:37:13 -0800 Subject: [PATCH 08/36] Refactored index action of CustomersController & tests Co-authored-by: gracexinran --- app/controllers/customers_controller.rb | 7 +------ test/controllers/customers_controller_test.rb | 12 +++++++----- test/fixtures/customers.yml | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ece5314f0..a48a202f2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,11 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all.as_json - - if customers.empty? - render json: { message: "No customers" }, status: :ok - else - render json: customers, status: :ok - end + render json: customers, status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ea1ae2a2b..f54aba88d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -13,7 +13,8 @@ get customers_path body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash + + expect(body).must_be_instance_of Array names = Customer.columns.map { |column| column.name } body.each do |customer| @@ -21,13 +22,14 @@ expect(customer.keys.sort).must_equal names.sort end end - it "responds with a message and empty array if there are no customers" do + + it "responds with an empty array if there are no customers" do + Customer.destroy_all get customers_path body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash - expect(body.keys).must_include "message" - assert_equal "No customers", body["message"] + expect(body).must_be_instance_of Array + expect(body).must_equal [] end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..ae2594c7c --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,15 @@ +one: + name: Ada + address: 123 Ada St + city: Seattle + state: WA + postal_code: 98101 + phone: 206-533-8999 + +two: + name: Bill + address: 890 Weller St + city: Seattle + state: WA + postal_code: 98109 + phone: 206-533-0000 \ No newline at end of file From c4ee6795f8d95f73497f03e1ef102631f9a933f6 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 14:47:15 -0800 Subject: [PATCH 09/36] Added registered_at column to Customers table and ran seed file --- db/migrate/20191105224420_add_registered_at_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- db/seeds.rb | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20191105224420_add_registered_at_to_customers.rb diff --git a/db/migrate/20191105224420_add_registered_at_to_customers.rb b/db/migrate/20191105224420_add_registered_at_to_customers.rb new file mode 100644 index 000000000..f97d91f88 --- /dev/null +++ b/db/migrate/20191105224420_add_registered_at_to_customers.rb @@ -0,0 +1,5 @@ +class AddRegisteredAtToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :registered_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index eacf1dbe1..efb8f6e91 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_213143) do +ActiveRecord::Schema.define(version: 2019_11_05_224420) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,6 +24,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "registered_at" end create_table "movies", force: :cascade do |t| diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..7bf2fbee1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| Movie.create!(movie) end From 289aa9c3de32fb30823890971a6e3bf756b334c8 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 15:16:17 -0800 Subject: [PATCH 10/36] Added validations on controllers and relationships --- app/models/customer.rb | 8 ++++++++ app/models/movie.rb | 6 ++++++ app/models/rental.rb | 2 ++ test/fixtures/movies.yml | 11 +++++++++++ test/models/customer_test.rb | 5 ++--- 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/movies.yml diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..236e40593 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,10 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..fe32190b1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,8 @@ class Movie < ApplicationRecord + validates :title, presence: true, uniqueness: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true + + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..a4a561c70 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +croods: + title: The Croods + overview: Prehistoric family live in a dangerous moment in time + release_date: 2013-03-22 + inventory: 10 + +ghibli: + title: Spirited Away + overview: Girl meets boy in spa resort + release_date: 2002-08-31 + inventory: 10 \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..4019be780 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + end end From 823e23e04a3ec9706a6ccb535aaf143ec8f8a743 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 15:43:44 -0800 Subject: [PATCH 11/36] Added foreign keys to Rentals table --- ...91105233849_add_foreign_keys_to_rentals.rb | 6 ++++ db/schema.rb | 7 +++-- test/fixtures/rentals.yml | 11 +++++++ test/models/customer_test.rb | 25 +++++++++++++++ test/models/movie_test.rb | 31 +++++++++++++++++-- 5 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20191105233849_add_foreign_keys_to_rentals.rb create mode 100644 test/fixtures/rentals.yml diff --git a/db/migrate/20191105233849_add_foreign_keys_to_rentals.rb b/db/migrate/20191105233849_add_foreign_keys_to_rentals.rb new file mode 100644 index 000000000..4898b6cf3 --- /dev/null +++ b/db/migrate/20191105233849_add_foreign_keys_to_rentals.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer + add_reference :rentals, :movie + end +end diff --git a/db/schema.rb b/db/schema.rb index efb8f6e91..781d4aa51 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_224420) do +ActiveRecord::Schema.define(version: 2019_11_05_233849) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,6 +41,9 @@ t.date "check_out" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end - end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..fac0c1eb0 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +one: + customer: one + movie: croods + +two: + customer: one + movie: ghibli + +three: + customer: two + movie: croods \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 4019be780..8b5eedebf 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,6 +1,31 @@ require "test_helper" describe Customer do + let (:new_customer) { customers(:one) } describe "validations" do + it "is a valid customer" do + assert(new_customer.valid?) + end + + it "requires all fields" do + required_fields = [:name, :address, :city, :state, :postal_code, :phone] + + required_fields.each do |field| + new_customer[field] = nil + + expect(new_customer.valid?).must_equal false + + new_customer.reload + end + end + end + + describe "relationships" do + it "has a list of rentals" do + new_customer.must_respond_to :rentals + new_customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cd59ab14a..072c6ec7b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,32 @@ require "test_helper" describe Movie do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:movie) { + movies(:croods) + } + + describe "validations" do + it "can be created" do + assert(movie.valid?) + end + + it "requires title, overview, release_date, inventory" do + required_fields = [:title, :overview, :release_date, :inventory] + + required_fields.each do |field| + movie[field] = nil + refute(movie.valid?) + movie.reload + end + end + end + + describe "relationships" do + it "has a list of rentals" do + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_instance_of Rental + end + end + end end From 1d1c8a3c3f19fe547b524e97e7d481feb07d07c7 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 15:56:55 -0800 Subject: [PATCH 12/36] Edited parts of test to remove deprecated minitest --- test/models/customer_test.rb | 4 ++-- test/models/movie_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 8b5eedebf..902c72220 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -22,9 +22,9 @@ describe "relationships" do it "has a list of rentals" do - new_customer.must_respond_to :rentals + _(new_customer).must_respond_to :rentals new_customer.rentals.each do |rental| - rental.must_be_kind_of Rental + _(rental).must_be_kind_of Rental end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 072c6ec7b..3d33ceb7f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -23,9 +23,9 @@ describe "relationships" do it "has a list of rentals" do - movie.must_respond_to :rentals + _(movie).must_respond_to :rentals movie.rentals.each do |rental| - rental.must_be_instance_of Rental + _(rental).must_be_instance_of Rental end end end From 67d1e2b55cf4bf06d60f0b501081feb8be1b3542 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 16:32:16 -0800 Subject: [PATCH 13/36] Edited the index action of the Customers controller and test --- .DS_Store | Bin 0 -> 8196 bytes app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8e4226f13a4e6f970c4a04b7765da57323be6f49 GIT binary patch literal 8196 zcmeHML66cv6n?WHw5&!Bn&sGoCLV~{&2E;1F+pTw_F!Vf=t0dc1>9}6v;@i$MGO~z zgdRPZ_*47^{t$nFes5;Pc7Tfq^QJT3H}l@tLi-94iN?6QLsTIm2bFDk6U~ak z^IVt8h90>NE5N6?Sj^CzQ$eslHJ zAB4du+1~ypHgfq(g`(q>oYIxj%hqW;X(jDsJZiLu&-v(4J2~}r|4AH&i+SOqSI0y*Voh4cS|_3!^LMljY(tAJJD zj}#F3W~ Date: Tue, 5 Nov 2019 17:14:03 -0800 Subject: [PATCH 14/36] Created controller actions for Movies and added tests --- app/controllers/movies_controller.rb | 39 +++++++++ test/controllers/movies_controller_test.rb | 95 +++++++++++++++++++++- 2 files changed, 131 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..28af86669 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,41 @@ class MoviesController < ApplicationController + def index + movies = Movie.all.as_json(only: [:id, :title, :release_date]) + render json: movies, status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + return + else + render json: { + "errors": ["Not found"], + }, + status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + errors: movie.errors.messages, + }, status: :bad_request + return + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b11d50cea..613196c52 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,96 @@ require "test_helper" describe MoviesController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responses with JSON and success" do + get movies_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :ok + end + + it "responds with an array of movie hashes" do + get movies_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |movie| + expect(movie).must_be_instance_of Hash + expect(movie.keys.sort).must_equal ["id", "title", "release_date"].sort + end + end + + it "responds with an empty array if there are no movies" do + Movie.destroy_all + get movies_path + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end + + describe "show" do + it "retrieves one movie" do + movie = Movie.first + + get movie_path(movie.id) + body = JSON.parse(response.body) + + must_respond_with :ok + expect(response.header["Content-Type"]).must_include "json" + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal ["inventory", "overview", "release_date", "title"] + end + + it "returns a not_found if given an invalid ID" do + invalid_id = -1 + + get movie_path(invalid_id) + body = JSON.parse(response.body) + + must_respond_with :not_found + expect(body).must_be_instance_of Hash + expect(response.header["Content-Type"]).must_include "json" + expect(body.keys).must_include "errors" + end + end + + describe "create" do + let(:movie_data) { + { + movie: { + title: "new movie", + overview: "a movie", + release_date: Date.today, + inventory: 10, + }, + } + } + + it "can create a new movie" do + # binding.pry + + expect { + post movies_path, params: movie_data + }.must_differ "Movie.count", 1 + must_respond_with :created + end + + it "will respond with bad_request for invalid data" do + movie_data[:movie][:title] = nil + + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + + must_respond_with :bad_request + + expect(response.header["Content-Type"]).must_include "json" + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end + end end From f1f2e51eeee2454ad1503b5d7d20e29851931a84 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Tue, 5 Nov 2019 17:14:27 -0800 Subject: [PATCH 15/36] Changed date format --- test/controllers/movies_controller_test.rb | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 613196c52..ad286c2b0 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,60 +4,60 @@ describe "index" do it "responses with JSON and success" do get movies_path - + expect(response.header["Content-Type"]).must_include "json" must_respond_with :ok end - + it "responds with an array of movie hashes" do get movies_path - + body = JSON.parse(response.body) - + expect(body).must_be_instance_of Array - + body.each do |movie| expect(movie).must_be_instance_of Hash expect(movie.keys.sort).must_equal ["id", "title", "release_date"].sort end end - + it "responds with an empty array if there are no movies" do Movie.destroy_all get movies_path - + body = JSON.parse(response.body) expect(body).must_be_instance_of Array expect(body).must_equal [] end end - + describe "show" do it "retrieves one movie" do movie = Movie.first - + get movie_path(movie.id) body = JSON.parse(response.body) - + must_respond_with :ok expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal ["inventory", "overview", "release_date", "title"] end - + it "returns a not_found if given an invalid ID" do invalid_id = -1 - + get movie_path(invalid_id) body = JSON.parse(response.body) - + must_respond_with :not_found expect(body).must_be_instance_of Hash expect(response.header["Content-Type"]).must_include "json" expect(body.keys).must_include "errors" end end - + describe "create" do let(:movie_data) { { @@ -69,25 +69,25 @@ }, } } - + it "can create a new movie" do # binding.pry - + expect { post movies_path, params: movie_data }.must_differ "Movie.count", 1 must_respond_with :created end - + it "will respond with bad_request for invalid data" do movie_data[:movie][:title] = nil - + expect { post movies_path, params: movie_data }.wont_change "Movie.count" - + must_respond_with :bad_request - + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body["errors"].keys).must_include "title" From 3ba1835f6c96e023772c751045adc063c56b0447 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Wed, 6 Nov 2019 10:26:28 -0800 Subject: [PATCH 16/36] Run migration --- .DS_Store | Bin 8196 -> 8196 bytes db/schema.rb | 1 + 2 files changed, 1 insertion(+) diff --git a/.DS_Store b/.DS_Store index 8e4226f13a4e6f970c4a04b7765da57323be6f49..15f04a51340650ee24b4a08cc84fda437c9e006b 100644 GIT binary patch delta 21 ccmZp1XmQvuUzo$l)Ko{o$lP@Ea^YAW07~!%PXGV_ delta 21 ccmZp1XmQvuUzo$p#7sxQ(A;?Qa^YAW080-BPyhe` diff --git a/db/schema.rb b/db/schema.rb index 781d4aa51..4eb9e908f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -46,4 +46,5 @@ t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end + end From eda44ababc5ec06f0e7eb3ac4ec9320ef840fac1 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Wed, 6 Nov 2019 11:10:45 -0800 Subject: [PATCH 17/36] Modified indentation --- app/controllers/movies_controller.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 28af86669..ab6e4c858 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,10 +11,7 @@ def show render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) return else - render json: { - "errors": ["Not found"], - }, - status: :not_found + render json: { "errors": ["Not found"] }, status: :not_found end end @@ -25,10 +22,7 @@ def create render json: movie.as_json(only: [:id]), status: :created return else - render json: { - ok: false, - errors: movie.errors.messages, - }, status: :bad_request + render json: { ok: false, errors: movie.errors.messages }, status: :bad_request return end end From 90fb1205238ded910a510ad969a6532ee8ffae9d Mon Sep 17 00:00:00 2001 From: gracexinran Date: Wed, 6 Nov 2019 12:31:37 -0800 Subject: [PATCH 18/36] Modified movie_params in movies controller and tests to pass smoke test --- app/controllers/movies_controller.rb | 4 ++-- test/controllers/movies_controller_test.rb | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ab6e4c858..9368771b9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -19,7 +19,7 @@ def create movie = Movie.new(movie_params) if movie.save - render json: movie.as_json(only: [:id]), status: :created + render json: movie.as_json(only: [:id]), status: :ok return else render json: { ok: false, errors: movie.errors.messages }, status: :bad_request @@ -30,6 +30,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 diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ad286c2b0..e4c9c3b95 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -61,12 +61,10 @@ describe "create" do let(:movie_data) { { - movie: { - title: "new movie", - overview: "a movie", - release_date: Date.today, - inventory: 10, - }, + title: "new movie", + overview: "a movie", + release_date: Date.today, + inventory: 10, } } @@ -76,11 +74,11 @@ expect { post movies_path, params: movie_data }.must_differ "Movie.count", 1 - must_respond_with :created + must_respond_with :ok end it "will respond with bad_request for invalid data" do - movie_data[:movie][:title] = nil + movie_data[:title] = nil expect { post movies_path, params: movie_data From 3f04f31abe25ac57bb5ed28eea24f39cdc81382b Mon Sep 17 00:00:00 2001 From: gracexinran Date: Wed, 6 Nov 2019 12:46:48 -0800 Subject: [PATCH 19/36] Added columns to movies and customers --- .../20191106204239_add_columns_to_movies_and_customers.rb | 6 ++++++ db/schema.rb | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191106204239_add_columns_to_movies_and_customers.rb diff --git a/db/migrate/20191106204239_add_columns_to_movies_and_customers.rb b/db/migrate/20191106204239_add_columns_to_movies_and_customers.rb new file mode 100644 index 000000000..d41558228 --- /dev/null +++ b/db/migrate/20191106204239_add_columns_to_movies_and_customers.rb @@ -0,0 +1,6 @@ +class AddColumnsToMoviesAndCustomers < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 4eb9e908f..d49e541b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_233849) do +ActiveRecord::Schema.define(version: 2019_11_06_204239) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.datetime "registered_at" + t.integer "movies_checked_out_count", default: 0 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| From 501e9b8735e3aede07c7873912d60a7d269312fd Mon Sep 17 00:00:00 2001 From: gracexinran Date: Wed, 6 Nov 2019 12:59:16 -0800 Subject: [PATCH 20/36] Refactored customers and movies controllers and tests, passed wave-2 smoke test. Co-authored-by: Nicky Choi --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 16 ++++++++-------- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 85ac689e4..04ef07f10 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) render json: customers, status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9368771b9..a309a5775 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,21 +3,21 @@ def index movies = Movie.all.as_json(only: [:id, :title, :release_date]) render json: movies, status: :ok end - + def show movie = Movie.find_by(id: params[:id]) - + if movie - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) return else render json: { "errors": ["Not found"] }, status: :not_found end end - + def create movie = Movie.new(movie_params) - + if movie.save render json: movie.as_json(only: [:id]), status: :ok return @@ -26,10 +26,10 @@ def create return end end - + private - + def movie_params - params.permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 4fc3e7e82..34eabee6c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -16,7 +16,7 @@ expect(body).must_be_instance_of Array - names = ["id", "name", "registered_at", "postal_code", "phone"] + names = ["id", "name", "registered_at", "postal_code", "phone", "movies_checked_out_count"] body.each do |customer| expect(customer).must_be_instance_of Hash expect(customer.keys.sort).must_equal names.sort diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e4c9c3b95..f0257166d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -42,7 +42,7 @@ must_respond_with :ok expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal ["inventory", "overview", "release_date", "title"] + expect(body.keys.sort).must_equal ["inventory", "overview", "release_date", "title", "available_inventory"].sort end it "returns a not_found if given an invalid ID" do From 5c211563823ed97da0fdb8e7b40ac5fd5c0e71f3 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Wed, 6 Nov 2019 15:55:54 -0800 Subject: [PATCH 21/36] Added model methods to customer and movie --- app/controllers/movies_controller.rb | 1 + app/controllers/rentals_controller.rb | 38 +++++++++++++++++++ app/models/customer.rb | 7 +++- app/models/movie.rb | 23 ++++++++++- test/controllers/customers_controller_test.rb | 14 +++---- 5 files changed, 74 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a309a5775..408879d91 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -19,6 +19,7 @@ def create movie = Movie.new(movie_params) if movie.save + movie.available_inventory = movie.inventory render json: movie.as_json(only: [:id]), status: :ok return else diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..6086a4b80 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,40 @@ class RentalsController < ApplicationController + def checkout + rental = Rental.new(rental_params) + rental.check_out = Date.today if !rental.movie.available_inventory + rental.check_in = Date.today + 7 + rental.movie.set_inventory + + if rental.movie.available_inventory > 0 + if rental.save + rental.movie.decrease_inventory + rental.customer.increase_movies_checkout + render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok + return + else + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + return + end + else + render json: { ok: false, errors: "Stock unavailable!" }, status: :bad_request + end + end + + def checkin + rental = Rental.new(rental_params) + if rental.save + rental.movie.increase_inventory + render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok + return + else + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + return + end + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 236e40593..a7810af49 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,6 +5,11 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true - + has_many :rentals + + def increase_movies_checkout + self.movies_checked_out_count += 1 + self.save + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index fe32190b1..9d6826487 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,6 +3,27 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true - + has_many :rentals + + def set_inventory + if self.available_inventory.nil? + self.available_inventory = self.inventory + end + self.save + end + + def decrease_inventory + self.available_inventory -= 1 + self.save + end + + def increase_inventory + if !self.available_inventory + self.available_inventory = self.inventory + end + self.available_inventory += 1 + self.save + end + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 34eabee6c..41a12222f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,29 +4,29 @@ describe "index" do it "responds with JSON and success" do get customers_path - + expect(response.header["Content-Type"]).must_include "json" must_respond_with :ok end - + it "responds with an array of customer hashes" do get customers_path - + body = JSON.parse(response.body) - + expect(body).must_be_instance_of Array - + names = ["id", "name", "registered_at", "postal_code", "phone", "movies_checked_out_count"] body.each do |customer| expect(customer).must_be_instance_of Hash expect(customer.keys.sort).must_equal names.sort end end - + it "responds with an empty array if there are no customers" do Customer.destroy_all get customers_path - + body = JSON.parse(response.body) expect(body).must_be_instance_of Array expect(body).must_equal [] From c8c822e3895c976ccc8e25b19401508b2f416b37 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Wed, 6 Nov 2019 16:29:21 -0800 Subject: [PATCH 22/36] Added decrease_movies_checkout_count method to movie model and modified seed file --- app/controllers/rentals_controller.rb | 1 + app/models/customer.rb | 5 +++++ db/seeds.rb | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6086a4b80..63370444b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,6 +24,7 @@ def checkin rental = Rental.new(rental_params) if rental.save rental.movie.increase_inventory + rental.customer.decrease_movies_checkout render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok return else diff --git a/app/models/customer.rb b/app/models/customer.rb index a7810af49..4c0e26107 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -12,4 +12,9 @@ def increase_movies_checkout self.movies_checked_out_count += 1 self.save end + + def decrease_movies_checkout + self.movies_checked_out_count -= 1 + self.save + end end diff --git a/db/seeds.rb b/db/seeds.rb index 7bf2fbee1..959828d7d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,11 @@ JSON.parse(File.read("db/seeds/customers.json")).each do |customer| - Customer.create!(customer) + new_customer = Customer.create!(customer) + new_customer.movies_checked_out_count = 0 + new_customer.save end JSON.parse(File.read("db/seeds/movies.json")).each do |movie| - Movie.create!(movie) + new_movie = Movie.create!(movie) + new_movie.available_inventory = new_movie.inventory + new_movie.save end From 02df53d67c7996b5f90939fc32f836bbbe5f332d Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Thu, 7 Nov 2019 13:37:05 -0800 Subject: [PATCH 23/36] Added tests for movie model custom methods --- .DS_Store | Bin 8196 -> 8196 bytes app/controllers/rentals_controller.rb | 8 +++---- test/models/movie_test.rb | 30 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.DS_Store b/.DS_Store index 15f04a51340650ee24b4a08cc84fda437c9e006b..8e4226f13a4e6f970c4a04b7765da57323be6f49 100644 GIT binary patch delta 21 ccmZp1XmQvuUzo$p#7sxQ(A;?Qa^YAW080-BPyhe` delta 21 ccmZp1XmQvuUzo$l)Ko{o$lP@Ea^YAW07~!%PXGV_ diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 63370444b..176fc31be 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,7 +4,7 @@ def checkout rental.check_out = Date.today if !rental.movie.available_inventory rental.check_in = Date.today + 7 rental.movie.set_inventory - + if rental.movie.available_inventory > 0 if rental.save rental.movie.decrease_inventory @@ -19,7 +19,7 @@ def checkout render json: { ok: false, errors: "Stock unavailable!" }, status: :bad_request end end - + def checkin rental = Rental.new(rental_params) if rental.save @@ -32,9 +32,9 @@ def checkin return end end - + private - + def rental_params params.permit(:customer_id, :movie_id) end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3d33ceb7f..d25495897 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -29,4 +29,34 @@ end end end + + describe "custom methods" do + describe "set_inventory" do + it "will set the available inventory to the movie's inventory" do + movie.set_inventory + + expect(movie.available_inventory).must_equal movie.inventory + end + end + + describe "decrease_inventory" do + it "will decrease the movie's inventory" do + movie.set_inventory + + movie.decrease_inventory + + expect(movie.available_inventory).must_equal 9 + end + end + + describe "increase_inventory" do + it "will increase the movie's inventory" do + movie.set_inventory + + movie.increase_inventory + + expect(movie.available_inventory).must_equal 11 + end + end + end end From c3e78f6e99eaa0a6daa414fa78adbfc20df1678a Mon Sep 17 00:00:00 2001 From: gracexinran Date: Thu, 7 Nov 2019 13:37:37 -0800 Subject: [PATCH 24/36] Refactored rentals controller 'checkin' action --- app/controllers/rentals_controller.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 63370444b..410d4404f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,8 +21,8 @@ def checkout end def checkin - rental = Rental.new(rental_params) - if rental.save + rental = Rental.find_by(rental_params) + if rental rental.movie.increase_inventory rental.customer.decrease_movies_checkout render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..99ef134b0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,14 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "checkout" do + + end + + describe "checkin" do + it "finds the existing rental" do + rental = rentals(:one) + post checkin_path(rental) + end + end end From 61171230122f9fe226e81183857fb116b2b34a25 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Thu, 7 Nov 2019 13:46:25 -0800 Subject: [PATCH 25/36] Added tests for customer model --- app/models/customer.rb | 6 ++++-- test/models/customer_test.rb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 4c0e26107..4e2db2ba7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,16 +5,18 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true - + has_many :rentals - + def increase_movies_checkout self.movies_checked_out_count += 1 self.save + return self.movies_checked_out_count end def decrease_movies_checkout self.movies_checked_out_count -= 1 self.save + return self.movies_checked_out_count end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 902c72220..dd541c5b3 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -28,4 +28,20 @@ end end end + + describe "custom methods" do + describe "increase_movies_checkout" do + it "increases the movie checkout count" do + start_count = new_customer.movies_checked_out_count + expect(new_customer.increase_movies_checkout).must_equal start_count + 1 + end + end + + describe "decrease_movies_checkout" do + it "decreases the movie checkout count" do + start_count = new_customer.movies_checked_out_count + expect(new_customer.decrease_movies_checkout).must_equal start_count - 1 + end + end + end end From ee0f19b20f5928408656ac7123a48120ac585358 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Thu, 7 Nov 2019 13:56:42 -0800 Subject: [PATCH 26/36] Refactored the Rentals controller to move business logic to model class --- app/controllers/movies_controller.rb | 14 +++++++------- app/controllers/rentals_controller.rb | 7 +++---- app/models/movie.rb | 15 +++++++++------ app/models/rental.rb | 5 +++++ 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 408879d91..2f010cf26 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,10 +3,10 @@ def index movies = Movie.all.as_json(only: [:id, :title, :release_date]) render json: movies, status: :ok end - + def show movie = Movie.find_by(id: params[:id]) - + if movie render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) return @@ -14,12 +14,12 @@ def show render json: { "errors": ["Not found"] }, status: :not_found end end - + def create movie = Movie.new(movie_params) - + if movie.save - movie.available_inventory = movie.inventory + movie.set_inventory render json: movie.as_json(only: [:id]), status: :ok return else @@ -27,9 +27,9 @@ def create return end end - + private - + def movie_params params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 874016d3d..3c94ba787 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,10 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) - rental.check_out = Date.today if !rental.movie.available_inventory - rental.check_in = Date.today + 7 - rental.movie.set_inventory - if rental.movie.available_inventory > 0 + rental.setup_dates + + if rental.movie.check_inventory if rental.save rental.movie.decrease_inventory rental.customer.increase_movies_checkout diff --git a/app/models/movie.rb b/app/models/movie.rb index 9d6826487..e2fa3b7c1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,21 +3,25 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true - + has_many :rentals - + def set_inventory if self.available_inventory.nil? - self.available_inventory = self.inventory + self.available_inventory = self.inventory end self.save end - + + def check_inventory + return self.available_inventory > 0 + end + def decrease_inventory self.available_inventory -= 1 self.save end - + def increase_inventory if !self.available_inventory self.available_inventory = self.inventory @@ -25,5 +29,4 @@ def increase_inventory self.available_inventory += 1 self.save end - end diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..32acc66c9 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,9 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + def setup_dates + self.check_out = Date.today if !self.movie.available_inventory + self.check_in = Date.today + 7 + end end From 22d83f267845df00268ce64a50fb3c502fd6a5ce Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Thu, 7 Nov 2019 14:21:27 -0800 Subject: [PATCH 27/36] Created rental model tests for relationships and custom method --- test/models/movie_test.rb | 13 ++++++++ test/models/rental_test.rb | 61 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index d25495897..3b5e1c7d5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -39,6 +39,19 @@ end end + describe "check_inventory" do + it "will return true when available inventory is greater than 0" do + movie.set_inventory + assert(movie.check_inventory) + end + + it "will return false when available inventory is less than or equal to 0" do + movie.set_inventory + 10.times { movie.decrease_inventory } + refute(movie.check_inventory) + end + end + describe "decrease_inventory" do it "will decrease the movie's inventory" do movie.set_inventory diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..140a81876 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,62 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:rental) { + rentals(:one) + } + + let(:customer) { + customers(:one) + } + + let(:movie) { + movies(:croods) + } + + describe "relationships" do + describe "relationship with Customer" do + it "belongs to Customer and can set the customer_id through customer" do + new_rental = Rental.new(movie_id: movie.id) + new_rental.customer = customer + new_rental.save + expect(new_rental.customer).must_be_instance_of Customer + expect(new_rental.customer_id).must_equal customer.id + end + + it "can set the customer through customer_id" do + new_rental = Rental.new(movie_id: movie.id) + new_rental.customer_id = customer.id + new_rental.save + expect(new_rental.customer).must_be_instance_of Customer + end + end + + describe "relationship with Movie" do + it "belongs to Movie and can set the movie_id through movie" do + new_rental = Rental.new(customer_id: customer.id) + new_rental.movie = movie + new_rental.save + expect(new_rental.movie).must_be_instance_of Movie + expect(new_rental.movie_id).must_equal movie.id + end + + it "can set the movie through movie_id" do + new_rental = Rental.new(customer_id: customer.id) + new_rental.movie_id = movie.id + new_rental.save + expect(new_rental.movie).must_be_instance_of Movie + end + end + end + + describe "custom methods" do + describe "setup_dates" do + it "will setup the check out and check in dates" do + rental.setup_dates + + expect(rental.check_out).must_equal Date.today + expect(rental.check_in).must_equal Date.today + 7 + end + end + end end From 4eee4608316944cfd53d9c749288951bc02a221e Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Thu, 7 Nov 2019 15:15:35 -0800 Subject: [PATCH 28/36] Added Rentals Controller tests --- app/controllers/rentals_controller.rb | 25 +++--- app/models/rental.rb | 2 +- test/controllers/movies_controller_test.rb | 42 ++++----- test/controllers/rentals_controller_test.rb | 99 +++++++++++++++++++-- test/fixtures/movies.yml | 4 +- 5 files changed, 133 insertions(+), 39 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3c94ba787..94bfe5afa 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,19 +3,22 @@ def checkout rental = Rental.new(rental_params) rental.setup_dates - - if rental.movie.check_inventory - if rental.save - rental.movie.decrease_inventory - rental.customer.increase_movies_checkout - render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok - return + if rental.valid? + if rental.movie.check_inventory + if rental.save + rental.movie.decrease_inventory + rental.customer.increase_movies_checkout + render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok + return + else + render json: { ok: false, errors: "Rental cannot be created!" }, status: :bad_request + return + end else - render json: { ok: false, errors: rental.errors.messages }, status: :bad_request - return + render json: { ok: false, errors: "Stock unavailable!" }, status: :bad_request end else - render json: { ok: false, errors: "Stock unavailable!" }, status: :bad_request + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request end end @@ -27,7 +30,7 @@ def checkin render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok return else - render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + render json: { ok: false, errors: "Rental is not found!" }, status: :bad_request return end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 32acc66c9..dd0cf6d5a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,7 +3,7 @@ class Rental < ApplicationRecord belongs_to :movie def setup_dates - self.check_out = Date.today if !self.movie.available_inventory + self.check_out = Date.today self.check_in = Date.today + 7 end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f0257166d..d730ecae6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,62 +2,62 @@ describe MoviesController do describe "index" do - it "responses with JSON and success" do + it "responds with JSON and success" do get movies_path - + expect(response.header["Content-Type"]).must_include "json" must_respond_with :ok end - + it "responds with an array of movie hashes" do get movies_path - + body = JSON.parse(response.body) - + expect(body).must_be_instance_of Array - + body.each do |movie| expect(movie).must_be_instance_of Hash expect(movie.keys.sort).must_equal ["id", "title", "release_date"].sort end end - + it "responds with an empty array if there are no movies" do Movie.destroy_all get movies_path - + body = JSON.parse(response.body) expect(body).must_be_instance_of Array expect(body).must_equal [] end end - + describe "show" do it "retrieves one movie" do movie = Movie.first - + get movie_path(movie.id) body = JSON.parse(response.body) - + must_respond_with :ok expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal ["inventory", "overview", "release_date", "title", "available_inventory"].sort end - + it "returns a not_found if given an invalid ID" do invalid_id = -1 - + get movie_path(invalid_id) body = JSON.parse(response.body) - + must_respond_with :not_found expect(body).must_be_instance_of Hash expect(response.header["Content-Type"]).must_include "json" expect(body.keys).must_include "errors" end end - + describe "create" do let(:movie_data) { { @@ -67,25 +67,25 @@ inventory: 10, } } - + it "can create a new movie" do # binding.pry - + expect { post movies_path, params: movie_data }.must_differ "Movie.count", 1 must_respond_with :ok end - + it "will respond with bad_request for invalid data" do movie_data[:title] = nil - + expect { post movies_path, params: movie_data }.wont_change "Movie.count" - + must_respond_with :bad_request - + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body["errors"].keys).must_include "title" diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 99ef134b0..58bea27b0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,14 +1,103 @@ require "test_helper" describe RentalsController do - describe "checkout" do + let(:rental_data) { + { + movie_id: movies(:croods).id, + customer_id: customers(:one).id, + } + } + describe "checkout" do + it "can create a rental" do + expect { + post checkout_path, params: rental_data + }.must_differ "Rental.count", 1 + must_respond_with :ok + end + + it "responds with JSON" do + post checkout_path, params: rental_data + expect(response.header["Content-Type"]).must_include "json" + end + + it "responds with an array of movie hashes" do + post checkout_path, params: rental_data + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal ["customer_id", "movie_id"].sort + end + + it "will return a bad request if stock is unavailable" do + movie = movies(:croods) + + movie.available_inventory = 0 + movie.save + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + + expect(response.header["Content-Type"]).must_include "json" + body = JSON.parse(response.body) + expect(body["errors"]).must_equal "Stock unavailable!" + end + + it "will return a bad_request if rental cannot be created" do + rental_data[:movie_id] = nil + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + + expect(response.header["Content-Type"]).must_include "json" + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "movie" + end end - describe "checkin" do - it "finds the existing rental" do - rental = rentals(:one) - post checkin_path(rental) + describe "checkin" do + it "can find the existing rental" do + expect { + post checkin_path, params: rental_data + }.wont_change "Rental.count" + must_respond_with :ok + end + + it "responds with JSON" do + post checkin_path, params: rental_data + expect(response.header["Content-Type"]).must_include "json" + end + + it "responds with an array of rental hashes" do + post checkin_path, params: rental_data + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal ["customer_id", "movie_id"].sort + end + + it "responds with bad_request and an error message if no rental is found" do + Rental.destroy_all + expect { + post checkin_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + expect(response.header["Content-Type"]).must_include "json" + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["errors"]).must_equal "Rental is not found!" end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index a4a561c70..a6a090815 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -3,9 +3,11 @@ croods: overview: Prehistoric family live in a dangerous moment in time release_date: 2013-03-22 inventory: 10 + available_inventory: 8 ghibli: title: Spirited Away overview: Girl meets boy in spa resort release_date: 2002-08-31 - inventory: 10 \ No newline at end of file + inventory: 10 + available_inventory: 9 \ No newline at end of file From 0125d574974946ce0e3803fa331a1677d4b60c99 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Thu, 7 Nov 2019 15:21:13 -0800 Subject: [PATCH 29/36] Fixed failing tests --- test/models/movie_test.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3b5e1c7d5..9049a7683 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -33,6 +33,7 @@ describe "custom methods" do describe "set_inventory" do it "will set the available inventory to the movie's inventory" do + movie.available_inventory = nil movie.set_inventory expect(movie.available_inventory).must_equal movie.inventory @@ -54,21 +55,21 @@ describe "decrease_inventory" do it "will decrease the movie's inventory" do - movie.set_inventory + start_inventory = movie.available_inventory movie.decrease_inventory - expect(movie.available_inventory).must_equal 9 + expect(movie.available_inventory).must_equal start_inventory - 1 end end describe "increase_inventory" do it "will increase the movie's inventory" do - movie.set_inventory + start_inventory = movie.available_inventory movie.increase_inventory - expect(movie.available_inventory).must_equal 11 + expect(movie.available_inventory).must_equal start_inventory + 1 end end end From 96b65ddf4b1ec5341767366de45de801ef518ee7 Mon Sep 17 00:00:00 2001 From: Nicky Choi Date: Thu, 7 Nov 2019 17:10:14 -0800 Subject: [PATCH 30/36] Added pagination gem and refactored Customers Controller index action --- Gemfile | 3 +++ Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 8143da43e..1fdd2df8a 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,9 @@ gem 'puma', '~> 3.11' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.1.0', require: false +## Gemfile for Rails 3+, Sinatra, or Merb +gem 'will_paginate', '~> 3.1.1' + # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' diff --git a/Gemfile.lock b/Gemfile.lock index 981f08e8a..f166a9910 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,6 +148,7 @@ GEM websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) + will_paginate (3.1.8) PLATFORMS ruby @@ -167,6 +168,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + will_paginate (~> 3.1.1) RUBY VERSION ruby 2.5.5p157 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 04ef07f10..d80671320 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,16 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) - render json: customers, status: :ok + if params[:sort] + customers = Customer.order(params[:sort]) + elsif params[:n] && params[:p] && !params[:sort] + customers = Customer.page(params[:p]) + elsif params[:n] && params[:p] && params[:sort] + customers = Customer.paginate(page: params[:p], per_page: params[:n]) + else + customers = Customer.all + end + + find_customers = customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) + render json: find_customers, status: :ok end end From af8c57f08c39b4002c5b023bcb12ad86b765a938 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Thu, 7 Nov 2019 22:34:15 -0800 Subject: [PATCH 31/36] Implemented sort and paginate functions to customers controller index action --- app/controllers/customers_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d80671320..218375a30 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,15 +1,15 @@ class CustomersController < ApplicationController def index + customers = Customer.all + if params[:sort] customers = Customer.order(params[:sort]) - elsif params[:n] && params[:p] && !params[:sort] - customers = Customer.page(params[:p]) - elsif params[:n] && params[:p] && params[:sort] - customers = Customer.paginate(page: params[:p], per_page: params[:n]) - else - customers = Customer.all end - + + if params[:p] || params[:n] + customers = customers.paginate(page: params[:p], per_page: params[:n]) + end + find_customers = customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) render json: find_customers, status: :ok end From d7637eb7634e65d6597c5fb7c4cf76203c573e78 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Fri, 8 Nov 2019 13:51:41 -0800 Subject: [PATCH 32/36] Added sorting to movies and rentals, added is_overdue column to rentals --- app/controllers/customers_controller.rb | 3 +- app/controllers/movies_controller.rb | 14 ++++++- app/controllers/rentals_controller.rb | 41 +++++++++++++++++-- config/routes.rb | 1 + .../20191108214706_add_overdue_to_rental.rb | 5 +++ db/schema.rb | 3 +- test/controllers/rentals_controller_test.rb | 6 +++ 7 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20191108214706_add_overdue_to_rental.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 218375a30..5e011dd9d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ def index customers = Customer.all if params[:sort] - customers = Customer.order(params[:sort]) + customers = customers.order(params[:sort]) end if params[:p] || params[:n] @@ -12,5 +12,6 @@ def index find_customers = customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) render json: find_customers, status: :ok + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2f010cf26..2dbf8b783 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,17 @@ class MoviesController < ApplicationController def index - movies = Movie.all.as_json(only: [:id, :title, :release_date]) - render json: movies, status: :ok + movies = Movie.all + + if params[:sort] + movies = Movie.order(params[:sort]) + end + + if params[:p] || params[:n] + movies = movies.paginate(page: params[:p], per_page: params[:n]) + end + + find_movies = movies.as_json(only: [:id, :title, :release_date]) + render json: find_movies, status: :ok end def show diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 94bfe5afa..45ca983b4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,8 +1,8 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) - rental.setup_dates + if rental.valid? if rental.movie.check_inventory if rental.save @@ -21,7 +21,7 @@ def checkout render json: { ok: false, errors: rental.errors.messages }, status: :bad_request end end - + def checkin rental = Rental.find_by(rental_params) if rental @@ -34,10 +34,43 @@ def checkin return end end - + + def overdue + rentals = Rental.where(check_in: ) + rentals = Rental.all.map{|rental| rental if rental.check_in > Date.today - 1 } + + if params[:p] || params[:n] + rentals = rentals.paginate(page: params[:p], per_page: params[:n]) + end + + json_body = [] + + rentals.each do |rental| + json_body << { + "customer_id" => rental.customer_id, + "movie_id" => rental.movie_id, + "name" => rental.customer.name} + end + + if params[:sort] + json_body = json_body.sort_by{|rental| rental[params[:sort]]} + end + + + if json_body.empty? + render json: {messages: "No overdue rentals!"}, status: :ok + return + else + render json: json_body, status: :ok + return + end + + end + private - + def rental_params params.permit(:customer_id, :movie_id) end + end diff --git a/config/routes.rb b/config/routes.rb index 5c119f462..1f89aab58 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,5 @@ post "/rentals/check-out", to: "rentals#checkout", as: "checkout" post "/rentals/check-in", to: "rentals#checkin", as: "checkin" + get "/rentals/overdue", to: "rentals#overdue", as: "overdue" end diff --git a/db/migrate/20191108214706_add_overdue_to_rental.rb b/db/migrate/20191108214706_add_overdue_to_rental.rb new file mode 100644 index 000000000..d8ab0bea2 --- /dev/null +++ b/db/migrate/20191108214706_add_overdue_to_rental.rb @@ -0,0 +1,5 @@ +class AddOverdueToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :is_overdue, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index d49e541b2..0482d6c46 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_06_204239) do +ActiveRecord::Schema.define(version: 2019_11_08_214706) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.boolean "is_overdue", default: false t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 58bea27b0..120cbf4c1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -100,4 +100,10 @@ expect(body["errors"]).must_equal "Rental is not found!" end end + + describe "overdue" do + it "returns a list of all overdue rentals" do + get overdue_path + end + end end From 292d5a583ec5ed86b92f3a677969a741b7b37a34 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Fri, 8 Nov 2019 13:59:56 -0800 Subject: [PATCH 33/36] Refactored rentals 'overdue' action. Co-authored-by: Nicky Choi --- app/controllers/rentals_controller.rb | 50 +++++++++++++++------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 45ca983b4..9b90c5f84 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -36,8 +36,7 @@ def checkin end def overdue - rentals = Rental.where(check_in: ) - rentals = Rental.all.map{|rental| rental if rental.check_in > Date.today - 1 } + rentals = Rental.where(is_overdue: true) if params[:p] || params[:n] rentals = rentals.paginate(page: params[:p], per_page: params[:n]) @@ -47,30 +46,35 @@ def overdue rentals.each do |rental| json_body << { - "customer_id" => rental.customer_id, - "movie_id" => rental.movie_id, - "name" => rental.customer.name} - end - - if params[:sort] - json_body = json_body.sort_by{|rental| rental[params[:sort]]} + "movie_id" => rental.movie_id, + "title" => rental.movie.title, + "customer_id" => rental.customer_id, + "name" => rental.customer.name, + "postal_code" => rental.customer.postal_code, + "checkout_date" => rental.check_out, + "due_date" => rental.check_in} + end + + if params[:sort] + json_body = json_body.sort_by{|rental| rental[params[:sort]]} + end + + + if json_body.empty? + render json: {messages: "No overdue rentals!"}, status: :ok + return + else + render json: json_body, status: :ok + return + end + end + private - if json_body.empty? - render json: {messages: "No overdue rentals!"}, status: :ok - return - else - render json: json_body, status: :ok - return + def rental_params + params.permit(:customer_id, :movie_id) end end - - private - - def rental_params - params.permit(:customer_id, :movie_id) - end - -end + \ No newline at end of file From e8b12f5de53a1179e3d3815cfbe2833066d83724 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Fri, 8 Nov 2019 14:21:06 -0800 Subject: [PATCH 34/36] Added tests for movies 'overdue' action, updated rentals fixture --- app/controllers/rentals_controller.rb | 3 +- test/controllers/movies_controller_test.rb | 40 +++++------ test/controllers/rentals_controller_test.rb | 76 ++++++++++++++------- test/fixtures/rentals.yml | 5 +- 4 files changed, 76 insertions(+), 48 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9b90c5f84..7b180fdc8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -59,9 +59,8 @@ def overdue json_body = json_body.sort_by{|rental| rental[params[:sort]]} end - if json_body.empty? - render json: {messages: "No overdue rentals!"}, status: :ok + render json: { messages: "No overdue rental is found!" }, status: :ok return else render json: json_body, status: :ok diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d730ecae6..93ee25253 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,60 +4,60 @@ describe "index" do it "responds with JSON and success" do get movies_path - + expect(response.header["Content-Type"]).must_include "json" must_respond_with :ok end - + it "responds with an array of movie hashes" do get movies_path - + body = JSON.parse(response.body) - + expect(body).must_be_instance_of Array - + body.each do |movie| expect(movie).must_be_instance_of Hash expect(movie.keys.sort).must_equal ["id", "title", "release_date"].sort end end - + it "responds with an empty array if there are no movies" do Movie.destroy_all get movies_path - + body = JSON.parse(response.body) expect(body).must_be_instance_of Array expect(body).must_equal [] end end - + describe "show" do it "retrieves one movie" do movie = Movie.first - + get movie_path(movie.id) body = JSON.parse(response.body) - + must_respond_with :ok expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal ["inventory", "overview", "release_date", "title", "available_inventory"].sort end - + it "returns a not_found if given an invalid ID" do invalid_id = -1 - + get movie_path(invalid_id) body = JSON.parse(response.body) - + must_respond_with :not_found expect(body).must_be_instance_of Hash expect(response.header["Content-Type"]).must_include "json" expect(body.keys).must_include "errors" end end - + describe "create" do let(:movie_data) { { @@ -67,25 +67,25 @@ inventory: 10, } } - + it "can create a new movie" do # binding.pry - + expect { post movies_path, params: movie_data }.must_differ "Movie.count", 1 must_respond_with :ok end - + it "will respond with bad_request for invalid data" do movie_data[:title] = nil - + expect { post movies_path, params: movie_data }.wont_change "Movie.count" - + must_respond_with :bad_request - + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body["errors"].keys).must_include "title" diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 120cbf4c1..740b19915 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -12,58 +12,58 @@ expect { post checkout_path, params: rental_data }.must_differ "Rental.count", 1 - + must_respond_with :ok end - + it "responds with JSON" do post checkout_path, params: rental_data expect(response.header["Content-Type"]).must_include "json" end - + it "responds with an array of movie hashes" do post checkout_path, params: rental_data - + body = JSON.parse(response.body) - + expect(body).must_be_instance_of Hash - + expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal ["customer_id", "movie_id"].sort end - + it "will return a bad request if stock is unavailable" do movie = movies(:croods) - + movie.available_inventory = 0 movie.save - + expect { post checkout_path, params: rental_data }.wont_change "Rental.count" - + must_respond_with :bad_request - + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body["errors"]).must_equal "Stock unavailable!" end - + it "will return a bad_request if rental cannot be created" do rental_data[:movie_id] = nil - + expect { post checkout_path, params: rental_data }.wont_change "Rental.count" - + must_respond_with :bad_request - + expect(response.header["Content-Type"]).must_include "json" body = JSON.parse(response.body) expect(body["errors"].keys).must_include "movie" end end - + describe "checkin" do it "can find the existing rental" do expect { @@ -71,39 +71,65 @@ }.wont_change "Rental.count" must_respond_with :ok end - + it "responds with JSON" do post checkin_path, params: rental_data expect(response.header["Content-Type"]).must_include "json" end - + it "responds with an array of rental hashes" do post checkin_path, params: rental_data body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - + expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal ["customer_id", "movie_id"].sort end - + it "responds with bad_request and an error message if no rental is found" do Rental.destroy_all expect { post checkin_path, params: rental_data }.wont_change "Rental.count" - + must_respond_with :bad_request expect(response.header["Content-Type"]).must_include "json" - + body = JSON.parse(response.body) expect(body).must_be_instance_of Hash expect(body["errors"]).must_equal "Rental is not found!" end end - + describe "overdue" do - it "returns a list of all overdue rentals" do + it "responds with JSON and success" do + get overdue_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :ok + end + + it "responds with an array of overdue rental hashes" do + get overdue_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |rental| + expect(rental).must_be_instance_of Hash + expect(rental.keys.sort).must_equal ["movie_id", "title", "customer_id", "name", "postal_code", "checkout_date", "due_date"].sort + end + end + + it "responds with a message in an array if there are no overdue rental found" do + Rental.destroy_all get overdue_path + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body.keys).must_include "messages" + assert_equal body['messages'], "No overdue rental is found!" end end -end +end \ No newline at end of file diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index fac0c1eb0..3922dcd41 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,14 @@ one: customer: one movie: croods + is_overdue: true two: customer: one movie: ghibli + is_overdue: true three: customer: two - movie: croods \ No newline at end of file + movie: croods + is_overdue: true \ No newline at end of file From ba729a583480df1d01f32e5f22a2e4835af86473 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Fri, 8 Nov 2019 14:58:38 -0800 Subject: [PATCH 35/36] Updated the rental fixtures and added tests for rental model 'rental_overdue' method --- app/controllers/rentals_controller.rb | 51 ++++++++++++++------------- app/models/rental.rb | 9 ++++- test/fixtures/rentals.yml | 17 ++++++--- test/models/rental_test.rb | 18 ++++++++++ 4 files changed, 64 insertions(+), 31 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7b180fdc8..7e8fffb94 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -27,6 +27,8 @@ def checkin if rental rental.movie.increase_inventory rental.customer.decrease_movies_checkout + rental.rental_overdue + render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok return else @@ -46,34 +48,33 @@ def overdue rentals.each do |rental| json_body << { - "movie_id" => rental.movie_id, - "title" => rental.movie.title, - "customer_id" => rental.customer_id, - "name" => rental.customer.name, - "postal_code" => rental.customer.postal_code, - "checkout_date" => rental.check_out, - "due_date" => rental.check_in} - end - - if params[:sort] - json_body = json_body.sort_by{|rental| rental[params[:sort]]} - end - - if json_body.empty? - render json: { messages: "No overdue rental is found!" }, status: :ok - return - else - render json: json_body, status: :ok - return - end - + "movie_id" => rental.movie_id, + "title" => rental.movie.title, + "customer_id" => rental.customer_id, + "name" => rental.customer.name, + "postal_code" => rental.customer.postal_code, + "checkout_date" => rental.check_out, + "due_date" => rental.check_in} end - private + if params[:sort] + json_body = json_body.sort_by{|rental| rental[params[:sort]]} + end - def rental_params - params.permit(:customer_id, :movie_id) + if json_body.empty? + render json: { messages: "No overdue rental is found!" }, status: :ok + return + else + render json: json_body, status: :ok + return end end - \ No newline at end of file + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end + +end diff --git a/app/models/rental.rb b/app/models/rental.rb index dd0cf6d5a..3c6481ad1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,9 +1,16 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - + def setup_dates self.check_out = Date.today self.check_in = Date.today + 7 end + + def rental_overdue + if Date.today > self.check_in + self.is_overdue = true + self.save + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 3922dcd41..93b5790b2 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,14 +1,21 @@ one: customer: one movie: croods - is_overdue: true - + check_out: <%= 9.day.ago.to_date %> + check_in: <%= 2.day.ago.to_date %> + is_overdue: false + two: customer: one movie: ghibli - is_overdue: true - + check_out: <%= 5.day.ago.to_date %> + check_in: <%= Date.tomorrow %> + is_overdue: false + three: customer: two movie: croods - is_overdue: true \ No newline at end of file + check_out: <%= 5.day.ago.to_date %> + check_in: <%= Date.tomorrow %> + is_overdue: true + \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 140a81876..ffcd3f780 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -58,5 +58,23 @@ expect(rental.check_in).must_equal Date.today + 7 end end + + describe "rental overdue" do + it "changes the is_overdue status to true" do + rental = rentals(:one) + + rental.rental_overdue + + expect(rental.is_overdue).must_equal true + end + + it "doesn't change the is_overdue status" do + rental = rentals(:two) + + rental.rental_overdue + + expect(rental.is_overdue).must_equal false + end + end end end From 0e014dbc09c0fd15102c2934703e7a54e5681266 Mon Sep 17 00:00:00 2001 From: gracexinran Date: Fri, 8 Nov 2019 15:12:07 -0800 Subject: [PATCH 36/36] Refactored movies controller tests --- test/controllers/movies_controller_test.rb | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 93ee25253..9aa91805f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -67,28 +67,27 @@ inventory: 10, } } - + it "can create a new movie" do - # binding.pry - expect { post movies_path, params: movie_data }.must_differ "Movie.count", 1 must_respond_with :ok end - + it "will respond with bad_request for invalid data" do - movie_data[:title] = nil - - expect { - post movies_path, params: movie_data - }.wont_change "Movie.count" - - must_respond_with :bad_request - - expect(response.header["Content-Type"]).must_include "json" - body = JSON.parse(response.body) - expect(body["errors"].keys).must_include "title" + [:title, :overview, :release_date, :inventory].each do |field| + movie_data[field] = nil + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + + must_respond_with :bad_request + + expect(response.header["Content-Type"]).must_include "json" + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include field.to_s + end end end end