From f5f0d742d4a0fe12ce5dda1313ad3759b89777d3 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 26 May 2020 14:51:26 -0700 Subject: [PATCH 01/65] initial Rails setup --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ 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 | 7 + 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 | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ 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 | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ 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 | 38 ++++ 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 .../application_cable/connection_test.rb | 11 + 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 | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 59 files changed, 1106 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 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/channels/application_cable/connection_test.rb 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 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# 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 pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.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..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', 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.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 'guard' + gem 'guard-minitest' + 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..41b7d4311 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + 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 (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + 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 (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 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..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +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..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end 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..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # 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') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + 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/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..43301a817 --- /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_mailbox/engine" +require "action_text/engine" +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 + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # 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..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +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..69d93d83d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +PnlUXdgfJMNm0WV7yiWON9LQAjREkIJ4f1YrNUk695gOSwU9/8mkPpDrHFViG3F6E4+AIu/GVItE0EUntzl/jMZzRy+8f6lDTusANvWPTzBjXen2R/gpSrzIvfIOOXnWk6rVjLrPnDSlRbJw+QpAAyieaOc+bkmhxyCflg176ZFxfVHgqcI5LNm3gP0GugNrblbIfi4srWXD7vd3IhMIHURAavy0hR/kCPU9+D306DEGcnALlMtcXktLLErD/x+gplav6krEOWq4+SOngGBdQh+GJG+KeG8sMAtaEU+S45+OeVWJcSD1dAUR9beygvd83Eqjshk4h/cklyfxSFc5071Kd1+60vq5CYWtTOa77DY71Vzd4a0duHBMd6jHU0j7fNlj3GzfE64M0ZJN5Wlrc2U1zCWXfk2iso9o--vQlNXAwlZcF1Aikl--eMUtqy7kYFvXQrfaHmw1hg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS 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 + # https://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/credentials.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 https://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..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +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.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..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +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 + + # 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_production" + + 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 + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# 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! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = 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 + config.cache_store = :null_store + + # 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..cf9b342d0 --- /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 https://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..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# 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. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_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 `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server 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..c06383a17 --- /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 https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) 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..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://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/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end 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..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +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 + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # 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/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 6cb08b64ad9cecf97d397fdd3f32067b1dd42e4e Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Tue, 26 May 2020 15:01:42 -0700 Subject: [PATCH 02/65] adds Customers controller --- app/controllers/customers_controller.rb | 5 +++++ config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 9 +++++++++ 3 files changed, 15 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..a7441e6c6 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,5 @@ +class CustomersController < ApplicationController + def index + render json: { ok: "it works!" }, status: :ok + end +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..3ff3fcacc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + resources :customers, only: [:index] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..20069eb1a --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "must get index" do + get customers_index_url + must_respond_with :success + end + +end From d07f8c1ebe8fdb2551f13a4f756e8151a6c9a298 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Tue, 26 May 2020 15:05:59 -0700 Subject: [PATCH 03/65] adds Customer model --- app/models/customer.rb | 2 ++ db/migrate/20200526220533_create_customers.rb | 13 +++++++++++++ test/models/customer_test.rb | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20200526220533_create_customers.rb create mode 100644 test/models/customer_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/db/migrate/20200526220533_create_customers.rb b/db/migrate/20200526220533_create_customers.rb new file mode 100644 index 000000000..27a6a894f --- /dev/null +++ b/db/migrate/20200526220533_create_customers.rb @@ -0,0 +1,13 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :postal_code + t.string :phone + t.integer :videos_checked_out_count + + 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 From 272bd83a9d39c026e4bdbdf0374ee62294e54a18 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 26 May 2020 15:07:40 -0700 Subject: [PATCH 04/65] added Video model --- app/models/video.rb | 2 ++ db/migrate/20200526220727_create_videos.rb | 13 +++++++++++++ test/models/video_test.rb | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200526220727_create_videos.rb create mode 100644 test/models/video_test.rb diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/db/migrate/20200526220727_create_videos.rb b/db/migrate/20200526220727_create_videos.rb new file mode 100644 index 000000000..282e7354c --- /dev/null +++ b/db/migrate/20200526220727_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From ad727cbe98e5c48f534439827768d82a3bbd39ec Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Tue, 26 May 2020 15:12:49 -0700 Subject: [PATCH 05/65] adds Rental model --- app/models/rental.rb | 2 ++ db/migrate/20200526221236_create_rentals.rb | 9 +++++++++ test/models/rental_test.rb | 7 +++++++ 3 files changed, 18 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200526221236_create_rentals.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20200526221236_create_rentals.rb b/db/migrate/20200526221236_create_rentals.rb new file mode 100644 index 000000000..40372753f --- /dev/null +++ b/db/migrate/20200526221236_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.string :due_date + + t.timestamps + end + 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 dd45d660478692d728fd008815ff13a7fc110d97 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Tue, 26 May 2020 15:15:23 -0700 Subject: [PATCH 06/65] generates migration relating customer and video to rentals --- .../20200526221330_relates_customer_and_video_to_rental.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20200526221330_relates_customer_and_video_to_rental.rb diff --git a/db/migrate/20200526221330_relates_customer_and_video_to_rental.rb b/db/migrate/20200526221330_relates_customer_and_video_to_rental.rb new file mode 100644 index 000000000..cf0d4c17f --- /dev/null +++ b/db/migrate/20200526221330_relates_customer_and_video_to_rental.rb @@ -0,0 +1,6 @@ +class RelatesCustomerAndVideoToRental < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :video, foreign_key: true + end +end From b6495e8a3eb0ae87277e5b3b41013ab3fb4109f1 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 26 May 2020 15:21:01 -0700 Subject: [PATCH 07/65] added migration for videos_checked_out_count for cust --- ...200526221908_add_videos_checked_out_count_to_customer.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb diff --git a/db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb b/db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb new file mode 100644 index 000000000..6aa1fe9b5 --- /dev/null +++ b/db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb @@ -0,0 +1,6 @@ +class AddVideosCheckedOutCountToCustomer < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer, default: 0 + add_index :customers, :videos_checked_out_count + end +end From 09c9135e0871734f843c156d1e3a9e588dc6aeb5 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Tue, 26 May 2020 15:23:07 -0700 Subject: [PATCH 08/65] generates migration adds available_inventory to videos --- .../20200526222215_add_available_inventory_to_videos.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20200526222215_add_available_inventory_to_videos.rb diff --git a/db/migrate/20200526222215_add_available_inventory_to_videos.rb b/db/migrate/20200526222215_add_available_inventory_to_videos.rb new file mode 100644 index 000000000..0b26d6bf5 --- /dev/null +++ b/db/migrate/20200526222215_add_available_inventory_to_videos.rb @@ -0,0 +1,6 @@ +class AddAvailableInventoryToVideos < ActiveRecord::Migration[6.0] + def change + add_column :videos, :available_inventory, :integer, default: 0 + add_index :videos, :available_inventory + end +end From 400c09e92f583eda00c8dd372db66a5fa1a005a3 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Tue, 26 May 2020 15:30:33 -0700 Subject: [PATCH 09/65] removes duplicate column from customers and videos, migrates database --- ...dd_videos_checked_out_count_to_customer.rb | 1 + ...22215_add_available_inventory_to_videos.rb | 1 + db/schema.rb | 52 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 db/schema.rb diff --git a/db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb b/db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb index 6aa1fe9b5..27a5ab2da 100644 --- a/db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb +++ b/db/migrate/20200526221908_add_videos_checked_out_count_to_customer.rb @@ -1,5 +1,6 @@ class AddVideosCheckedOutCountToCustomer < ActiveRecord::Migration[6.0] def change + remove_column :customers, :videos_checked_out_count add_column :customers, :videos_checked_out_count, :integer, default: 0 add_index :customers, :videos_checked_out_count end diff --git a/db/migrate/20200526222215_add_available_inventory_to_videos.rb b/db/migrate/20200526222215_add_available_inventory_to_videos.rb index 0b26d6bf5..27e716ad7 100644 --- a/db/migrate/20200526222215_add_available_inventory_to_videos.rb +++ b/db/migrate/20200526222215_add_available_inventory_to_videos.rb @@ -1,5 +1,6 @@ class AddAvailableInventoryToVideos < ActiveRecord::Migration[6.0] def change + remove_column :videos, :available_inventory add_column :videos, :available_inventory, :integer, default: 0 add_index :videos, :available_inventory end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1a01bc6cb --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,52 @@ +# 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. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_26_222215) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count", default: 0 + t.index ["videos_checked_out_count"], name: "index_customers_on_videos_checked_out_count" + end + + create_table "rentals", force: :cascade do |t| + t.string "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "customer_id" + t.bigint "video_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "total_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.integer "available_inventory", default: 0 + t.index ["available_inventory"], name: "index_videos_on_available_inventory" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" +end From fa0778092084e50f7fb391a2b3d79e7fb8f4a756 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 09:13:15 -0700 Subject: [PATCH 10/65] created Videos controller --- config/routes.rb | 1 + test/controllers/videos_controller_test.rb | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 test/controllers/videos_controller_test.rb diff --git a/config/routes.rb b/config/routes.rb index 3ff3fcacc..9ed090a23 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do resources :customers, only: [:index] + resources :videos, only: [:index, :show] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..7f1649fd0 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VideosController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From bf7a34da280618f1b01a1915881761a4d806cd5a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 09:22:18 -0700 Subject: [PATCH 11/65] videos index tests complete --- test/controllers/videos_controller_test.rb | 35 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7f1649fd0..f8ff19435 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,36 @@ require "test_helper" describe VideosController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + + it "must get index" do + get videos_path + + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end + + it "will return all the proper fields for a list of videos" do + get videos_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end + + it "returns an empty array if no videos exist" do + Video.destroy_all + + get videos_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end From 20caa72a3c5c4210c2cf8b112925526ff12a3678 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 09:22:56 -0700 Subject: [PATCH 12/65] video index controller action complete --- app/controllers/videos_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/controllers/videos_controller.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..dd0c94605 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,11 @@ +class VideosController < ApplicationController + def index + videos = Video.all.order(:title) + + render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), + status: :ok + end + + def show + end +end From 1b6c77ec6cc5ec561bd1867f0cc3342b93965fca Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 09:24:56 -0700 Subject: [PATCH 13/65] added test for a status 200 for index when empty array --- test/controllers/videos_controller_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index f8ff19435..74cafa291 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -30,6 +30,7 @@ body = JSON.parse(response.body) + must_respond_with :success expect(body).must_be_instance_of Array expect(body.length).must_equal 0 end From 152d29df739ab372569c6236b64139f7b0306cc2 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 10:08:37 -0700 Subject: [PATCH 14/65] adds first test for customers#index action --- test/controllers/customers_controller_test.rb | 13 +++++++++---- test/fixtures/customers.yml | 13 +++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 20069eb1a..03790f0d7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,14 @@ require "test_helper" describe CustomersController do - it "must get index" do - get customers_index_url - must_respond_with :success - end + CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"].sort + + describe "index" do + it "must get index" do + get customers_path + must_respond_with :ok + expect(response.header['Content-Type']).must_include 'json' + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..a790a2391 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,13 @@ +diana: + name: Diana + registered_at: Date.today + postal_code: 01337 + phone: (555) 555-5555 + videos_checked_out_count: 0 +lee: + name: Lee + registered_at: Date.today + postal_code: 13370 + phone: (555) 555-5556 + videos_checked_out_count: 0 + \ No newline at end of file From 8148bb59d1967a05b2c1245042b63e9344171bfb Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 10:11:53 -0700 Subject: [PATCH 15/65] adds tests checking that customers#index returns proper fields --- test/controllers/customers_controller_test.rb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 03790f0d7..179283e2b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -10,5 +10,29 @@ must_respond_with :ok expect(response.header['Content-Type']).must_include 'json' end + + it "will return all the proper fields for a list of customers" do + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "returns an empty array if no customers exist" do + Customer.destroy_all + + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end end From cbe446310aa7b28bbc4ab6e6aab512659afd21c7 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 10:17:23 -0700 Subject: [PATCH 16/65] defines customers#index action, gets a list of customers --- app/controllers/customers_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a7441e6c6..fdcd8ecec 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,8 @@ class CustomersController < ApplicationController def index - render json: { ok: "it works!" }, status: :ok + customers = Customer.order(:name) + + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), + status: :ok end end From 91ffdddb0aa1fcbd496a404b0586653520bcc608 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 10:20:21 -0700 Subject: [PATCH 17/65] revises test for if no customers exists, checks for 200 status --- test/controllers/customers_controller_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 179283e2b..5acb619d9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -24,10 +24,11 @@ end end - it "returns an empty array if no customers exist" do + it "returns an empty array and status 200 if no customers exist" do Customer.destroy_all get customers_path + must_respond_with :ok body = JSON.parse(response.body) From 30c1bf8bd322eae0ceaf1e2082912e0468d3b025 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 11:13:13 -0700 Subject: [PATCH 18/65] added 3 records for videos fixtures --- test/fixtures/videos.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/fixtures/videos.yml diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..9a88784e2 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,18 @@ +inception: + title: Inception + overview: A thief who steals corporate secrets through the use of dream-sharing technology is given the inverse task of planting an idea into the mind of a C.E.O. + release_date: 2010-07-13 + total_inventory: 5 + available_inventory: 5 +sunshine: + title: Eternal Sunshine of the Spotless Mind + overview: A sci-fi romantic drama film that follows an estranged couple who have erased each other from their memories. + release_date: 2004-03-19 + total_inventory: 7 + available_inventory: 7 +grand_budapest: + title: The Grand Budapest Hotel + overview: The Grand Budapest Hotel is a 2014 comedy-drama film written and directed by Wes Anderson, which explores tragedy, war, fascism, nostalgia, friendship, and loyalty. Ralph Fiennes leads a seventeen-actor ensemble cast as Monsieur Gustave H., famed concierge of a mountainside resort in the Republic of Zubrowka. + release_date: 2014-03-28 + total_inventory: 9 + available_inventory: 9 \ No newline at end of file From bbb01795faaca3789804dbf4d0b9c703995ebc3c Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 13:09:58 -0700 Subject: [PATCH 19/65] generates migration to change release_date and due_date datatypes to date not string --- .../20200527200806_change_date_fields_to_date_datatype.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20200527200806_change_date_fields_to_date_datatype.rb diff --git a/db/migrate/20200527200806_change_date_fields_to_date_datatype.rb b/db/migrate/20200527200806_change_date_fields_to_date_datatype.rb new file mode 100644 index 000000000..2f2a5b584 --- /dev/null +++ b/db/migrate/20200527200806_change_date_fields_to_date_datatype.rb @@ -0,0 +1,6 @@ +class ChangeDateFieldsToDateDatatype < ActiveRecord::Migration[6.0] + def change + change_column :videos, :release_date, :date + change_column :rentals, :due_date, :date + end +end From 88cd2b466c806a815a40f113e8f7c8f6ccfcae43 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 13:15:21 -0700 Subject: [PATCH 20/65] updates the change date datatype migration by implementing 'using cast' syntax --- .../20200527200806_change_date_fields_to_date_datatype.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20200527200806_change_date_fields_to_date_datatype.rb b/db/migrate/20200527200806_change_date_fields_to_date_datatype.rb index 2f2a5b584..b87ec23cf 100644 --- a/db/migrate/20200527200806_change_date_fields_to_date_datatype.rb +++ b/db/migrate/20200527200806_change_date_fields_to_date_datatype.rb @@ -1,6 +1,6 @@ class ChangeDateFieldsToDateDatatype < ActiveRecord::Migration[6.0] def change - change_column :videos, :release_date, :date - change_column :rentals, :due_date, :date + change_column :videos, :release_date, 'date USING CAST(release_date AS date)' + change_column :rentals, :due_date, 'date USING CAST(due_date AS date)' end end From 22ab770e9c488f0fa224c0a27d17eeb6f0ae69c0 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 13:06:32 -0700 Subject: [PATCH 21/65] generates migration for adding address, city, state to customers --- db/migrate/20200527200419_add_columns_to_customer.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 db/migrate/20200527200419_add_columns_to_customer.rb diff --git a/db/migrate/20200527200419_add_columns_to_customer.rb b/db/migrate/20200527200419_add_columns_to_customer.rb new file mode 100644 index 000000000..138700013 --- /dev/null +++ b/db/migrate/20200527200419_add_columns_to_customer.rb @@ -0,0 +1,7 @@ +class AddColumnsToCustomer < ActiveRecord::Migration[6.0] + def change + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :state, :string + end +end From 59be3092ff25449aa79abdb33804f4e910bbfdfd Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 13:33:12 -0700 Subject: [PATCH 22/65] adds test for videos#show action --- test/controllers/videos_controller_test.rb | 68 ++++++++++++++++------ 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 74cafa291..1909b7626 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -3,35 +3,65 @@ describe VideosController do VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort - it "must get index" do - get videos_path + describe "index" do + it "must get index" do + get videos_path - must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' - end + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end + + it "will return all the proper fields for a list of videos" do + get videos_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end - it "will return all the proper fields for a list of videos" do - get videos_path + it "returns an empty array if no videos exist" do + Video.destroy_all - body = JSON.parse(response.body) + get videos_path - expect(body).must_be_instance_of Array + body = JSON.parse(response.body) - body.each do |video| - expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + must_respond_with :success + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 end end - it "returns an empty array if no videos exist" do - Video.destroy_all + describe "show" do + it "will return a hash with the proper fields for an existing video" do + video = videos(:inception) - get videos_path + get video_path(video.id) - body = JSON.parse(response.body) + must_respond_with :ok - must_respond_with :success - expect(body).must_be_instance_of Array - expect(body.length).must_equal 0 + body = JSON.parse(response.body) + + expect(response.header['Content-Type']).must_include 'json' + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal VIDEO_FIELDS + end + + it "will respond with a 404 status for a non-existent video" do + get video_path(-1) + + must_respond_with :not_found + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Not found' + end end end From c3ff2d43603a5b5b3101772dd82852db15613f90 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 13:35:53 -0700 Subject: [PATCH 23/65] adds videos#show action, renders error message when id is invalid --- app/controllers/videos_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index dd0c94605..cd73fc4e2 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -7,5 +7,13 @@ def index end def show + video = Video.find_by(id: params[:id]) + + if !video + render json: { + ok: false, + message: "Not found" + }, status: :not_found + end end end From 3e7daf462a0f7f60f872d9d496b56fd9c755f259 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 13:42:12 -0700 Subject: [PATCH 24/65] changes VIDEO_FIELDS constant to VIDEO_INDEX_FIELDS, adds VIDEO_SHOW_FIELDS --- test/controllers/videos_controller_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 1909b7626..5db0adcc3 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,8 @@ require "test_helper" describe VideosController do - VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + VIDEO_INDEX_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + VIDEO_SHOW_FIELDS = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort describe "index" do it "must get index" do @@ -20,7 +21,7 @@ body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + expect(video.keys.sort).must_equal VIDEO_INDEX_FIELDS end end @@ -49,7 +50,7 @@ expect(response.header['Content-Type']).must_include 'json' expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal VIDEO_SHOW_FIELDS end it "will respond with a 404 status for a non-existent video" do From b41fcff57d764da2cc02668ab412cdd40468a68d Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 13:44:06 -0700 Subject: [PATCH 25/65] completes videos#show action, renders details about specific video --- app/controllers/videos_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index cd73fc4e2..3874b1a99 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -14,6 +14,10 @@ def show ok: false, message: "Not found" }, status: :not_found + return end + + render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), + status: :ok end end From 7ca030e86985482e646e9266e07a147246e7c02e Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 13:51:23 -0700 Subject: [PATCH 26/65] updates schema.rb to reflect latest migrations AddColumnsToCustomers and ChangeDateFieldsToDateDatatype --- db/schema.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 1a01bc6cb..982852277 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: 2020_05_26_222215) do +ActiveRecord::Schema.define(version: 2020_05_27_200806) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -23,11 +23,14 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.integer "videos_checked_out_count", default: 0 + t.string "address" + t.string "city" + t.string "state" t.index ["videos_checked_out_count"], name: "index_customers_on_videos_checked_out_count" end create_table "rentals", force: :cascade do |t| - t.string "due_date" + t.date "due_date" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "customer_id" @@ -39,7 +42,7 @@ create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" - t.string "release_date" + t.date "release_date" t.integer "total_inventory" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false From b5b3a44036a7d7157db48e8dfafe00fee99b02aa Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 14:09:47 -0700 Subject: [PATCH 27/65] added validations for video model --- app/models/video.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..3002df92e 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,6 @@ class Video < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :available_inventory, numericality: true end From 848e6a4c3ffca918c0a09f695c325c6f0962e2ea Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 14:10:52 -0700 Subject: [PATCH 28/65] added validations to video model --- app/models/video.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/video.rb b/app/models/video.rb index 3002df92e..82e7ed8e2 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -3,4 +3,5 @@ class Video < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :available_inventory, numericality: true + end From 21b36f257de979284eda75683e6034def806575e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 14:47:58 -0700 Subject: [PATCH 29/65] added videos#create action --- app/controllers/videos_controller.rb | 23 ++++++++++++++++++++++- config/routes.rb | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index dd0c94605..3b966e6e0 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -6,6 +6,27 @@ def index status: :ok end - def show + def create + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + errors: video.errors.messages + }, status: :bad_request + return + end end + + + + private + + def video_params + return params.require(:video).permit(:title, :overview, :release_date, :available_inventory) + end + end diff --git a/config/routes.rb b/config/routes.rb index 9ed090a23..de22be9b3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do resources :customers, only: [:index] - resources :videos, only: [:index, :show] + resources :videos, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From e8f6bb927a257a3ac3178a2b1c482858406821e7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 27 May 2020 14:49:05 -0700 Subject: [PATCH 30/65] added `check_response` helper method and video#create tests which all pass --- test/controllers/videos_controller_test.rb | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 74cafa291..3fd17cd54 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -3,6 +3,15 @@ describe VideosController do VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + it "must get index" do get videos_path @@ -34,4 +43,44 @@ expect(body).must_be_instance_of Array expect(body.length).must_equal 0 end + + describe "create" do + let(:video_data) { + { + video: { + title: "Run for Dream", + overview: "Chen Yen-Po is a famous Taiwanese ultra-marathon athlete, who became the first ever Asian athlete to complete the 4 Deserts Race Series and achieved the title of World Champion, in 2016. The documentary 'Run for Dream' records Chen Yen-Po’s exciting yet treacherous ten-year journey to become the champion.", + release_date: "2019-05-27", + available_inventory: 2 + } + } + } + + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + end + + it "will respond with bad_request for invalid data" do + # Arrange - using let from above + # Our PetsController test should just test generically + # for any kind of invalid data, so we will randomly pick + # the age attribute to invalidate + video_data[:video][:title] = nil + + expect { + # Act + post videos_path, params: video_data + + # Assert + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end + + end end From 78241077336629179f3e7de3b80c4a5b13e7a3ee Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Wed, 27 May 2020 22:42:57 -0700 Subject: [PATCH 31/65] dries up videos #index and #show tests using check_response method --- test/controllers/videos_controller_test.rb | 24 ++++++---------------- test/test_helper.rb | 8 ++++++++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5db0adcc3..f46c14978 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -8,16 +8,13 @@ it "must get index" do get videos_path - must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' + check_response(expected_type: Array, expected_status: :success) end it "will return all the proper fields for a list of videos" do get videos_path - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array, expected_status: :success) body.each do |video| expect(video).must_be_instance_of Hash @@ -30,10 +27,8 @@ get videos_path - body = JSON.parse(response.body) + body = check_response(expected_type: Array, expected_status: :success) - must_respond_with :success - expect(body).must_be_instance_of Array expect(body.length).must_equal 0 end end @@ -44,23 +39,16 @@ get video_path(video.id) - must_respond_with :ok - - body = JSON.parse(response.body) - - expect(response.header['Content-Type']).must_include 'json' - expect(body).must_be_instance_of Hash + body = check_response(expected_type: Hash, expected_status: :success) + expect(body.keys.sort).must_equal VIDEO_SHOW_FIELDS end it "will respond with a 404 status for a non-existent video" do get video_path(-1) - must_respond_with :not_found - - body = JSON.parse(response.body) + body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body).must_be_instance_of Hash expect(body['ok']).must_equal false expect(body['message']).must_equal 'Not found' end diff --git a/test/test_helper.rb b/test/test_helper.rb index b19af0d5b..d014ba55e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -18,4 +18,12 @@ class ActiveSupport::TestCase fixtures :all # Add more helper methods to be used by all tests here... + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end end From e361da2f65837d6869c2ade98ee8c0035df5b615 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 14:56:34 -0700 Subject: [PATCH 32/65] adds validations and relationships to models --- app/models/customer.rb | 4 ++++ app/models/rental.rb | 4 ++++ app/models/video.rb | 8 ++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..b7457732f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,6 @@ class Customer < ApplicationRecord + validates :videos_checked_out_count, numericality: { greater_than_or_equal_to: 0, only_integer: true } + + has_many :rentals + has_many :videos, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..6154e630a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,6 @@ class Rental < ApplicationRecord + validates :customer_id, :video_id, presence: true + + belongs_to :customer + belongs_to :video end diff --git a/app/models/video.rb b/app/models/video.rb index 82e7ed8e2..ffa7921c4 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,7 +1,7 @@ class Video < ApplicationRecord - validates :title, presence: true - validates :overview, presence: true - validates :release_date, presence: true - validates :available_inventory, numericality: true + validates :title, :overview, :release_date, presence: true + validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } + has_many :rentals + has_many :customers, through: :rentals end From 2f08270800d7892dbde280d3f67fdbf160b0d8fc Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 15:06:06 -0700 Subject: [PATCH 33/65] fixes syntax error with missing end after show action --- app/controllers/videos_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index eb3466b1e..4e289dedb 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -19,7 +19,8 @@ def show render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok - + end + def create video = Video.new(video_params) @@ -40,5 +41,4 @@ def create def video_params return params.require(:video).permit(:title, :overview, :release_date, :available_inventory) end - end From d7ccd1b46e63cbe3d6ba0db0941a2809a42fb24e Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 15:16:18 -0700 Subject: [PATCH 34/65] fixes response errors for videos#show action and test to pass smoke test --- app/controllers/videos_controller.rb | 5 ++--- test/controllers/videos_controller_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 4e289dedb..88d7bdc0f 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -11,8 +11,7 @@ def show if !video render json: { - ok: false, - message: "Not found" + errors: ['Not Found'] }, status: :not_found return end @@ -20,7 +19,7 @@ def show render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end - + def create video = Video.new(video_params) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 8c3b2e4ae..e24295930 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -49,8 +49,8 @@ body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Not found' + expect(body['errors']).must_be_instance_of Array + expect(body['errors'].first).must_equal 'Not Found' end end From 03a9cf8cd59ce571d8a16b15a0802b27985c307c Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 15:47:42 -0700 Subject: [PATCH 35/65] removes require :video from video_params to pass smoke tests --- app/controllers/videos_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 88d7bdc0f..c725a1cfa 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -28,7 +28,6 @@ def create return else render json: { - ok: false, errors: video.errors.messages }, status: :bad_request return @@ -38,6 +37,6 @@ def create private def video_params - return params.require(:video).permit(:title, :overview, :release_date, :available_inventory) + return params.permit(:title, :overview, :release_date, :available_inventory) end end From 93aa81594b9e0e333ad42117de1fc34291e0ecd9 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 15:48:18 -0700 Subject: [PATCH 36/65] adds validations for :total_inventory and :available_inventory, must be present --- app/models/video.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/video.rb b/app/models/video.rb index ffa7921c4..e0964a9d8 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,5 @@ class Video < ApplicationRecord - validates :title, :overview, :release_date, presence: true + validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } has_many :rentals From fe03d0c3e1562002b3eb74b85f1199f699cdd06d Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 15:51:12 -0700 Subject: [PATCH 37/65] generates migration for videos, changes available_inventory default to nil --- db/migrate/20200528224844_change_column_default_value.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20200528224844_change_column_default_value.rb diff --git a/db/migrate/20200528224844_change_column_default_value.rb b/db/migrate/20200528224844_change_column_default_value.rb new file mode 100644 index 000000000..374107336 --- /dev/null +++ b/db/migrate/20200528224844_change_column_default_value.rb @@ -0,0 +1,5 @@ +class ChangeColumnDefaultValue < ActiveRecord::Migration[6.0] + def change + change_column :videos, :available_inventory, :integer, default: nil + end +end diff --git a/db/schema.rb b/db/schema.rb index 982852277..5be19d181 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: 2020_05_27_200806) do +ActiveRecord::Schema.define(version: 2020_05_28_224844) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -46,7 +46,7 @@ t.integer "total_inventory" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.integer "available_inventory", default: 0 + t.integer "available_inventory" t.index ["available_inventory"], name: "index_videos_on_available_inventory" end From a1ccb85a96732a7dda7aae62294d673db2eaa0d1 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 15:53:28 -0700 Subject: [PATCH 38/65] adds total_inventory to video_params, all smoke tests for wave 1 passing --- app/controllers/videos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index c725a1cfa..0cb3eee91 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -37,6 +37,6 @@ def create private def video_params - return params.permit(:title, :overview, :release_date, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end From 12678b75c79d9d350a3b5128433a5efd02d873e9 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 15:58:29 -0700 Subject: [PATCH 39/65] fixes videos#create tests --- test/controllers/videos_controller_test.rb | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e24295930..94f4330c9 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -57,12 +57,11 @@ describe "create" do let(:video_data) { { - video: { - title: "Run for Dream", - overview: "Chen Yen-Po is a famous Taiwanese ultra-marathon athlete, who became the first ever Asian athlete to complete the 4 Deserts Race Series and achieved the title of World Champion, in 2016. The documentary 'Run for Dream' records Chen Yen-Po’s exciting yet treacherous ten-year journey to become the champion.", - release_date: "2019-05-27", - available_inventory: 2 - } + title: "Run for Dream", + overview: "Chen Yen-Po is a famous Taiwanese ultra-marathon athlete, who became the first ever Asian athlete to complete the 4 Deserts Race Series and achieved the title of World Champion, in 2016. The documentary 'Run for Dream' records Chen Yen-Po’s exciting yet treacherous ten-year journey to become the champion.", + release_date: "2019-05-27", + total_inventory: 2, + available_inventory: 2 } } @@ -75,18 +74,11 @@ end it "will respond with bad_request for invalid data" do - # Arrange - using let from above - # Our PetsController test should just test generically - # for any kind of invalid data, so we will randomly pick - # the age attribute to invalidate - video_data[:video][:title] = nil + video_data[:title] = nil expect { - # Act post videos_path, params: video_data - - # Assert - }.wont_change "Video.count" + }.wont_differ "Video.count" body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"].keys).must_include "title" From 87c4d78db1db245d7bc4bf98a47f4af13904ef33 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 16:24:25 -0700 Subject: [PATCH 40/65] adds tests for customer videos_checked_out_count validations --- test/models/customer_test.rb | 38 +++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..a13429b2e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,39 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @customer = customers(:lee) + end + + describe "validations" do + it "will only allow a number for videos_checked_out_count" do + @customer.videos_checked_out_count = "zero" + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :videos_checked_out_count + expect(@customer.errors.messages[:videos_checked_out_count]).must_equal ["is not a number"] + end + + it "will only allow a number greater than or equal to 0 for videos_checked_out_count" do + @customer.videos_checked_out_count = -1 + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :videos_checked_out_count + expect(@customer.errors.messages[:videos_checked_out_count]).must_equal ["must be greater than or equal to 0"] + end + + it "will only allow an integer for videos_checked_out_count" do + @customer.videos_checked_out_count = 1.1 + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :videos_checked_out_count + expect(@customer.errors.messages[:videos_checked_out_count]).must_equal ["must be an integer"] + end + + it "will set videos_checked_out_count to 0 by default" do + new_customer = Customer.create!() + + expect(new_customer.videos_checked_out_count).must_equal 0 + end + end end From c8ed746089676375a862027a74b8058e83b38cc5 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 28 May 2020 16:53:55 -0700 Subject: [PATCH 41/65] added tests for video model validations --- test/models/video_test.rb | 59 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..7a7721473 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,60 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + before do + @video = videos(:grand_budapest) + end + + it "is invalid without a title" do + @video.title = nil + + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :title + expect(@video.errors.messages[:title]).must_equal ["can't be blank"] + end + + it "is invalid without an overview" do + @video.overview = nil + + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :overview + expect(@video.errors.messages[:overview]).must_equal ["can't be blank"] + end + + it "is invalid without a release date" do + @video.release_date = nil + + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :release_date + expect(@video.errors.messages[:release_date]).must_equal ["can't be blank"] + end + + it "is invalid without a total inventory" do + @video.total_inventory = nil + + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :total_inventory + expect(@video.errors.messages[:total_inventory]).must_equal ["can't be blank"] + end + + it "is invalid without an available inventory" do + @video.available_inventory = nil + + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :available_inventory + expect(@video.errors.messages[:available_inventory]).must_equal ["can't be blank", "is not a number"] + end + + end end From 7b61db10728207a8f81bebed1f5b5b9d2494d552 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 17:08:12 -0700 Subject: [PATCH 42/65] adds tests for rental validations --- test/fixtures/rentals.yml | 3 +++ test/models/rental_test.rb | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..81c7d1aad --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,3 @@ +rental: + customer: diana + video: inception diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..a4b22d6d8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,25 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @rental = rentals(:rental) + end + + describe "validations" do + it "must have a customer_id" do + @rental.customer_id = nil + + expect(@rental.valid?).must_equal false + expect(@rental.errors.messages).must_include :customer_id + expect(@rental.errors.messages[:customer_id]).must_equal ["can't be blank"] + end + + it "must have a video_id" do + @rental.video_id = nil + + expect(@rental.valid?).must_equal false + expect(@rental.errors.messages).must_include :video_id + expect(@rental.errors.messages[:video_id]).must_equal ["can't be blank"] + end + end end From d63a15767c8500d8a7862ef9b907173ddaf26dda Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 17:12:35 -0700 Subject: [PATCH 43/65] adds dependent:nullify to rental relationship in customer and video models --- app/models/customer.rb | 2 +- app/models/video.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index b7457732f..2f4064e31 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord validates :videos_checked_out_count, numericality: { greater_than_or_equal_to: 0, only_integer: true } - has_many :rentals + has_many :rentals, dependent: :nullify # if a customer is destroyed, the customer_id on associated rentals will be set to nil has_many :videos, through: :rentals end diff --git a/app/models/video.rb b/app/models/video.rb index e0964a9d8..36aa13d45 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -2,6 +2,6 @@ class Video < ApplicationRecord validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } - has_many :rentals + has_many :rentals, dependent: :nullify # if a video is destroyed, the video_id on associated rentals will be set to nil has_many :customers, through: :rentals end From c785f668fc1e0997d79692ed222b4cfcbbb5d052 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 18:10:18 -0700 Subject: [PATCH 44/65] creates rentals/check-in route, adds pseudocode and test cases for rentals#check_in action --- app/controllers/rentals_controller.rb | 20 +++++++++++++ config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 31 +++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..64cb156bc --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,20 @@ +class RentalsController < ApplicationController + def check_in + # find rental by customer_id and video_id + # if the rental does not exist + # render json errors: ["Not Found"] and status :not_found + # return + # else + # decrement rental.customer videos_checked_out_count + # increment rental.video available_inventory + # set due_date to nil + # render json only: customer_id, user_id, and include: customers videos_checked_out_count, and include: videos available_inventory + # status ok + end + + private + + def rental_params + return params.permit(:customer_id, :video_id) + end +end diff --git a/config/routes.rb b/config/routes.rb index de22be9b3..0f13329a0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..b48122c0d --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,31 @@ +require "test_helper" + +describe RentalsController do + CHECK_IN_FIELDS = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort + + describe "check_in" do + it "must return all the proper fields for a rental check-in" do + + end + + it "must decrement the customer videos_checked_out_count" do + + end + + it "must increment the video available_inventory count" do + + end + + it "must set the due_date to nil" do + + end + + it "must return detailed errors and a status 404 if the customer does not exist" do + + end + + it "must return detailed errors and a status 404 if the video does not exist" do + + end + end +end From b00195821c80a6a1d7963eb600c92be5d7d06aaa Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 19:43:23 -0700 Subject: [PATCH 45/65] renders json for rentals#check-in action, tests whether the proper fields are returned for a valid rental --- app/controllers/rentals_controller.rb | 9 +++++++-- test/controllers/rentals_controller_test.rb | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 64cb156bc..dd904ee12 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,6 +1,7 @@ class RentalsController < ApplicationController def check_in # find rental by customer_id and video_id + rental = Rental.find_by(rental_params) # if the rental does not exist # render json errors: ["Not Found"] and status :not_found # return @@ -8,8 +9,12 @@ def check_in # decrement rental.customer videos_checked_out_count # increment rental.video available_inventory # set due_date to nil - # render json only: customer_id, user_id, and include: customers videos_checked_out_count, and include: videos available_inventory - # status ok + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + }, status: :ok end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b48122c0d..9c648d65e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,8 +4,21 @@ CHECK_IN_FIELDS = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort describe "check_in" do - it "must return all the proper fields for a rental check-in" do - + let (:rental_data) { + { + customer: customers(:lee), + video: videos(:inception), + } + } + + it "can check-in a video for a customer and return all the proper fields" do + expect { + post check_in_path, params: rental_data + }.wont_differ "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :success) + + expect(body.keys.sort).must_equal CHECK_IN_FIELDS end it "must decrement the customer videos_checked_out_count" do From b2c9264a5a738f769c09a2aa7f9b1e3bed24ee62 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 19:55:43 -0700 Subject: [PATCH 46/65] tests whether rentals#check-in decrements videos_checked_out_count, increments available_inventory, and sets the due_date to nil --- test/controllers/rentals_controller_test.rb | 22 +++++++++++++++++++-- test/fixtures/customers.yml | 2 +- test/fixtures/rentals.yml | 1 + test/fixtures/videos.yml | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9c648d65e..708daf51d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,10 +4,15 @@ CHECK_IN_FIELDS = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort describe "check_in" do + before do + @customer = customers(:diana) + @video = videos(:inception) + end + let (:rental_data) { { - customer: customers(:lee), - video: videos(:inception), + customer: @customer, + video: @video, } } @@ -22,15 +27,28 @@ end it "must decrement the customer videos_checked_out_count" do + post check_in_path, params: rental_data + + check_response(expected_type: Hash, expected_status: :success) + expect(@customer.videos_checked_out_count).must_equal 0 end it "must increment the video available_inventory count" do + post check_in_path, params: rental_data + check_response(expected_type: Hash, expected_status: :success) + + expect(@video.available_inventory).must_equal 5 end it "must set the due_date to nil" do + post check_in_path, params: rental_data + rental = Rental.find_by(rental_data) + + check_response(expected_type: Hash, expected_status: :success) + expect(rental.due_date).must_be_nil end it "must return detailed errors and a status 404 if the customer does not exist" do diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index a790a2391..065860499 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -3,7 +3,7 @@ diana: registered_at: Date.today postal_code: 01337 phone: (555) 555-5555 - videos_checked_out_count: 0 + videos_checked_out_count: 1 lee: name: Lee registered_at: Date.today diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 81c7d1aad..afa64c010 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,3 +1,4 @@ rental: customer: diana video: inception + due_date: 2020-06-06 \ No newline at end of file diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 9a88784e2..8089a7200 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -3,7 +3,7 @@ inception: overview: A thief who steals corporate secrets through the use of dream-sharing technology is given the inverse task of planting an idea into the mind of a C.E.O. release_date: 2010-07-13 total_inventory: 5 - available_inventory: 5 + available_inventory: 4 sunshine: title: Eternal Sunshine of the Spotless Mind overview: A sci-fi romantic drama film that follows an estranged couple who have erased each other from their memories. From 7aab4daa529401a9c39fd99581a9c2dee2cc2172 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 20:02:13 -0700 Subject: [PATCH 47/65] tests whether rentals#check-in returns detailed errors and a 404 if customer or video does not exist --- test/controllers/rentals_controller_test.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 708daf51d..7b21f908c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -44,19 +44,31 @@ it "must set the due_date to nil" do post check_in_path, params: rental_data - rental = Rental.find_by(rental_data) - + check_response(expected_type: Hash, expected_status: :success) + rental = Rental.find_by(rental_data) expect(rental.due_date).must_be_nil end it "must return detailed errors and a status 404 if the customer does not exist" do + rental_data[:customer] = nil + post check_in_path, params: rental_data + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body['errors']).must_be_instance_of Array + expect(body['errors'].first).must_equal 'Not Found' end it "must return detailed errors and a status 404 if the video does not exist" do + rental_data[:video] = nil + post check_in_path, params: rental_data + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body['errors']).must_be_instance_of Array + expect(body['errors'].first).must_equal 'Not Found' end end end From 18e0e04029f93257e544202f60bdd3edfb7f4e80 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 28 May 2020 20:19:04 -0700 Subject: [PATCH 48/65] added fixture for edge case when a checkout is requested with 0 available_inventory --- test/fixtures/videos.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 9a88784e2..992cf1d3c 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -15,4 +15,10 @@ grand_budapest: overview: The Grand Budapest Hotel is a 2014 comedy-drama film written and directed by Wes Anderson, which explores tragedy, war, fascism, nostalgia, friendship, and loyalty. Ralph Fiennes leads a seventeen-actor ensemble cast as Monsieur Gustave H., famed concierge of a mountainside resort in the Republic of Zubrowka. release_date: 2014-03-28 total_inventory: 9 - available_inventory: 9 \ No newline at end of file + available_inventory: 9 +rested: + title: Restful in Seattle + overview: When interview week is over and C13 is probably going to get lots of rest + release_date: 2020-06-06 + total_inventory: 48 + available_inventory: 0 \ No newline at end of file From 24ecf8197f87f26b3903decb1f03c54e4faa729f Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 28 May 2020 20:19:26 -0700 Subject: [PATCH 49/65] added check_out model method for rentals --- app/models/rental.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 6154e630a..b582607db 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,4 +3,10 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + + # checkout method + def self.check_out(customer_id, video_id) + Customer.increment_counter(:videos_checked_out_count, customer_id, touch: true) + Video.decrement_counter(:available_inventory, video_id, touch: true) + end end From c0f55de28e283adb4441cc159845b6653016918a Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 20:19:26 -0700 Subject: [PATCH 50/65] fixes tests for rentals#check-in: reloads customer and video, changes rental_data params --- test/controllers/rentals_controller_test.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7b21f908c..b89a058e1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -11,8 +11,8 @@ let (:rental_data) { { - customer: @customer, - video: @video, + customer_id: @customer.id, + video_id: @video.id, } } @@ -31,6 +31,7 @@ check_response(expected_type: Hash, expected_status: :success) + @customer.reload expect(@customer.videos_checked_out_count).must_equal 0 end @@ -38,7 +39,8 @@ post check_in_path, params: rental_data check_response(expected_type: Hash, expected_status: :success) - + + @video.reload expect(@video.available_inventory).must_equal 5 end @@ -52,7 +54,7 @@ end it "must return detailed errors and a status 404 if the customer does not exist" do - rental_data[:customer] = nil + rental_data[:customer_id] = nil post check_in_path, params: rental_data body = check_response(expected_type: Hash, expected_status: :not_found) @@ -62,7 +64,7 @@ end it "must return detailed errors and a status 404 if the video does not exist" do - rental_data[:video] = nil + rental_data[:video_id] = nil post check_in_path, params: rental_data body = check_response(expected_type: Hash, expected_status: :not_found) From a3a91d0d92433ff1bc6b492455d2516af97d7474 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 28 May 2020 20:19:48 -0700 Subject: [PATCH 51/65] added rentals#checkout action --- app/controllers/rentals_controller.rb | 59 +++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 app/controllers/rentals_controller.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..860621fe3 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,59 @@ +class RentalsController < ApplicationController + def checkout + # create new rental + rental = Rental.new(rental_params) + + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + + if !customer + render json: { + errors: ['Not Found'] + }, status: :not_found + return + end + + if !video + render json: { + errors: ['Not Found'] + }, status: :not_found + return + end + + if video.available_inventory == 0 + render json: { + errors: ['Bad Request'] + }, status: :bad_request + return + end + + Rental.check_out(rental.customer_id, rental.video_id) + customer.reload + video.reload + + rental.due_date = Time.now + 7.days + + if rental.save + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + }, status: :created + return + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + return + end + end + + + private + + def rental_params + return params.permit(:customer_id, :video_id, :due_date) + end +end From fa8509202765b28dc5c54f3cb87dc77c829394f5 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 28 May 2020 20:20:03 -0700 Subject: [PATCH 52/65] added rentals#checkout action for rentals controller --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index de22be9b3..e36bcbcca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + + post "rentals/check-out", to: "rentals#checkout", as: "checkout" end From bab81df0d7b981b6ad02e04a32b8e7830e423bfa Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 28 May 2020 20:20:32 -0700 Subject: [PATCH 53/65] added nominal and edge case tests for rentals#checkout action --- test/controllers/rentals_controller_test.rb | 64 +++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..d4d2e2431 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,64 @@ +require "test_helper" + +describe RentalsController do + RENTAL_CHECKOUT_FIELDS = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort + + describe "checkout" do + before do + @expected_check_out_rental = { + "customer_id" => customers(:lee).id, + "video_id" => videos(:inception).id, + "due_date" => (Time.now + 7.days).strftime("%Y-%m-%d"), + "videos_checked_out_count" => customers(:lee).videos_checked_out_count + 1, + "available_inventory" => videos(:inception).available_inventory - 1 + } + end + + let(:rental_data) { + { + customer_id: customers(:lee).id, + video_id: videos(:inception).id + } + } + + it "can create a rental with the correct information when a checkout is made" do + expect { + post checkout_path, params: rental_data + }.must_differ "Rental.count", 1 + + body = check_response(expected_type: Hash, expected_status: :success) + + assert_equal(@expected_check_out_rental, body) + end + + it "returns back detailed errors and a status 404: Not Found if the customer does not exist" do + Customer.destroy_all + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + end + + it "return back detailed errors and a status 404: Not Found if the video does not exist" do + Video.destroy_all + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + end + + it "returns back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do + rental_data[:video_id] = videos(:rested).id + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + end + end +end From 0a5891599f8a666540bb986466d6c717a8b136f0 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 20:41:31 -0700 Subject: [PATCH 54/65] completes rentals#check-in action --- app/controllers/rentals_controller.rb | 32 +++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dd904ee12..e0faf0118 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,20 +1,24 @@ class RentalsController < ApplicationController def check_in - # find rental by customer_id and video_id rental = Rental.find_by(rental_params) - # if the rental does not exist - # render json errors: ["Not Found"] and status :not_found - # return - # else - # decrement rental.customer videos_checked_out_count - # increment rental.video available_inventory - # set due_date to nil - render json: { - customer_id: rental.customer_id, - video_id: rental.video_id, - videos_checked_out_count: rental.customer.videos_checked_out_count, - available_inventory: rental.video.available_inventory - }, status: :ok + + if !rental + render json: { + errors: ['Not Found'] + }, status: :not_found + return + else + Customer.decrement_counter(:videos_checked_out_count, rental.customer_id, touch: true) + Video.increment_counter(:available_inventory, rental.video_id, touch: true) + rental.update(due_date: nil) + + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + }, status: :ok + end end private From 373436d508a467a2b3879da205b4cd85240c2748 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 20:46:32 -0700 Subject: [PATCH 55/65] moves decrement videos_checked_out_count, increment available_inventory, and update due_date logic to video model method --- app/controllers/rentals_controller.rb | 4 +--- app/models/rental.rb | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e0faf0118..423b7c07b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,9 +8,7 @@ def check_in }, status: :not_found return else - Customer.decrement_counter(:videos_checked_out_count, rental.customer_id, touch: true) - Video.increment_counter(:available_inventory, rental.video_id, touch: true) - rental.update(due_date: nil) + rental.check_in render json: { customer_id: rental.customer_id, diff --git a/app/models/rental.rb b/app/models/rental.rb index 6154e630a..4b519b6cc 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,4 +3,10 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + + def check_in + Customer.decrement_counter(:videos_checked_out_count, customer_id, touch: true) + Video.increment_counter(:available_inventory, video_id, touch: true) + self.update(due_date: nil) + end end From 0d1d322b1b0612104150b3c924b73043d21f528f Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 21:05:46 -0700 Subject: [PATCH 56/65] adds edge case test for if the customer videos_checked_out_count is 0 --- test/controllers/rentals_controller_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b89a058e1..7d4c23bb5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -72,5 +72,16 @@ expect(body['errors']).must_be_instance_of Array expect(body['errors'].first).must_equal 'Not Found' end + + it "must return detailed errors and a status 400 if customer videos_checked_out_count is 0" do + @customer.update(videos_checked_out_count: 0) + + post check_in_path, params: rental_data + + body = check_response(expected_type: Hash, expected_status: :bad_request) + + expect(body['errors']).must_be_instance_of Array + expect(body['errors'].first).must_equal 'Customer does not have any videos checked out' + end end end From b14dd41b4dda1f77c066fe667ffa57dab7ab3c59 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 21:06:50 -0700 Subject: [PATCH 57/65] updates rentals#check-in so it returns an error if the customer videos_checked_out_count is < 1 --- app/controllers/rentals_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 423b7c07b..38fd4b0ab 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,6 +7,11 @@ def check_in errors: ['Not Found'] }, status: :not_found return + elsif rental.customer.videos_checked_out_count < 1 + render json: { + errors: ['Customer does not have any videos checked out'] + }, status: :bad_request + return else rental.check_in From 1bf8ecce56d525ea0e44999ee411f8e7517f8ce5 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 28 May 2020 21:09:33 -0700 Subject: [PATCH 58/65] broke up validation test of checkout fields into smaller tests --- test/controllers/rentals_controller_test.rb | 51 +++++++++++++-------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d4d2e2431..855800826 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,19 +1,9 @@ require "test_helper" describe RentalsController do - RENTAL_CHECKOUT_FIELDS = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort + CHECKOUT_FIELDS = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort describe "checkout" do - before do - @expected_check_out_rental = { - "customer_id" => customers(:lee).id, - "video_id" => videos(:inception).id, - "due_date" => (Time.now + 7.days).strftime("%Y-%m-%d"), - "videos_checked_out_count" => customers(:lee).videos_checked_out_count + 1, - "available_inventory" => videos(:inception).available_inventory - 1 - } - end - let(:rental_data) { { customer_id: customers(:lee).id, @@ -21,18 +11,43 @@ } } - it "can create a rental with the correct information when a checkout is made" do + it "can create a rental with the correct fields when a checkout is made" do expect { post checkout_path, params: rental_data }.must_differ "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :success) - assert_equal(@expected_check_out_rental, body) + + CHECKOUT_FIELDS.each do |field| + assert_equal(true, body.has_key?(field)) + end + end + + it "creates a rental with a due date that is 7 days from the current date" do + post checkout_path, params: rental_data + + rental = check_response(expected_type: Hash, expected_status: :success) + + assert_equal((Time.now + 7.days).strftime("%Y-%m-%d"), rental["due_date"]) + end + + it "increments a customer's videos_checked_out_count by 1" do + expect { + post checkout_path, params: rental_data + customers(:lee).reload + }.must_differ "customers(:lee).videos_checked_out_count", 1 + end + + it "decrements a videos's available_inventory by 1" do + expect { + post checkout_path, params: rental_data + videos(:inception).reload + }.must_differ "videos(:inception).available_inventory", -1 end - it "returns back detailed errors and a status 404: Not Found if the customer does not exist" do - Customer.destroy_all + it "returns errors messages and a status 404: Not Found if the customer does not exist" do + rental_data[:customer_id] = -505 expect { post checkout_path, params: rental_data @@ -41,8 +56,8 @@ body = check_response(expected_type: Hash, expected_status: :not_found) end - it "return back detailed errors and a status 404: Not Found if the video does not exist" do - Video.destroy_all + it "return errors messages and a status 404: Not Found if the video does not exist" do + rental_data[:video_id] = -807 expect { post checkout_path, params: rental_data @@ -51,7 +66,7 @@ body = check_response(expected_type: Hash, expected_status: :not_found) end - it "returns back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do + it "returns errors messages and a status 400: Bad Request if the video does not have any available inventory before check out" do rental_data[:video_id] = videos(:rested).id expect { From cebbef161e8f350ee80a83ca95fdd30e028fe612 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 21:35:35 -0700 Subject: [PATCH 59/65] reloads customer and video in after calling the rentals#check_in method --- app/controllers/rentals_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 38fd4b0ab..aac2f6872 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,6 +14,8 @@ def check_in return else rental.check_in + rental.customer.reload + rental.video.reload render json: { customer_id: rental.customer_id, From 099fce16bcc38eaa6b997baabd3cc99cad247a62 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 21:37:27 -0700 Subject: [PATCH 60/65] adds edge case test for when the video available_inventory is equal to total_inventory --- test/controllers/rentals_controller_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7d4c23bb5..18bf8cab4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -83,5 +83,16 @@ expect(body['errors']).must_be_instance_of Array expect(body['errors'].first).must_equal 'Customer does not have any videos checked out' end + + it "must return detailed errors and a status 400 if video available_inventory is equal to total_inventory" do + @video.update(available_inventory: @video.total_inventory) + + post check_in_path, params: rental_data + + body = check_response(expected_type: Hash, expected_status: :bad_request) + + expect(body['errors']).must_be_instance_of Array + expect(body['errors'].first).must_equal 'Available inventory exceeds total inventory for this video' + end end end From e60a97aa0d22ea9549f68f0644fefd8149375674 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 21:42:01 -0700 Subject: [PATCH 61/65] updates rentals#check-in so it returns an error if the video available_inventory would exceed total_inventory --- app/controllers/rentals_controller.rb | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index aac2f6872..13c39a27d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,21 +7,29 @@ def check_in errors: ['Not Found'] }, status: :not_found return - elsif rental.customer.videos_checked_out_count < 1 + end + + customer = rental.customer + video = rental.video + if customer.videos_checked_out_count <= 0 render json: { errors: ['Customer does not have any videos checked out'] }, status: :bad_request return + elsif video.available_inventory >= video.total_inventory + render json: { + errors: ['Available inventory exceeds total inventory for this video'] + }, status: :bad_request else rental.check_in - rental.customer.reload - rental.video.reload + customer.reload + video.reload render json: { - customer_id: rental.customer_id, - video_id: rental.video_id, - videos_checked_out_count: rental.customer.videos_checked_out_count, - available_inventory: rental.video.available_inventory + customer_id: customer.id, + video_id: video.id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory }, status: :ok end end From ee503c1d34ade50e8f386aa9fd2338a922b188c1 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Thu, 28 May 2020 21:49:54 -0700 Subject: [PATCH 62/65] removes edge case test for available_inventory, was causing smoke tests to fail --- app/controllers/rentals_controller.rb | 4 ---- test/controllers/rentals_controller_test.rb | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 13c39a27d..3e38fd611 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -16,10 +16,6 @@ def check_in errors: ['Customer does not have any videos checked out'] }, status: :bad_request return - elsif video.available_inventory >= video.total_inventory - render json: { - errors: ['Available inventory exceeds total inventory for this video'] - }, status: :bad_request else rental.check_in customer.reload diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 18bf8cab4..7d4c23bb5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -83,16 +83,5 @@ expect(body['errors']).must_be_instance_of Array expect(body['errors'].first).must_equal 'Customer does not have any videos checked out' end - - it "must return detailed errors and a status 400 if video available_inventory is equal to total_inventory" do - @video.update(available_inventory: @video.total_inventory) - - post check_in_path, params: rental_data - - body = check_response(expected_type: Hash, expected_status: :bad_request) - - expect(body['errors']).must_be_instance_of Array - expect(body['errors'].first).must_equal 'Available inventory exceeds total inventory for this video' - end end end From 1dd02e4393826214ea6b47670f70dd7c3dc7154b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 29 May 2020 14:00:21 -0700 Subject: [PATCH 63/65] dried up rental#checkout for video and customer validations and removed due_date from rental_params --- app/controllers/rentals_controller.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 860621fe3..7cd180fe8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,14 +6,7 @@ def checkout customer = Customer.find_by(id: params[:customer_id]) video = Video.find_by(id: params[:video_id]) - if !customer - render json: { - errors: ['Not Found'] - }, status: :not_found - return - end - - if !video + if !customer || !video render json: { errors: ['Not Found'] }, status: :not_found @@ -54,6 +47,6 @@ def checkout private def rental_params - return params.permit(:customer_id, :video_id, :due_date) + return params.permit(:customer_id, :video_id) end end From c5de788da1e15a1f784807a1d9cc027dea2308c0 Mon Sep 17 00:00:00 2001 From: peachmakkoli Date: Fri, 29 May 2020 15:32:37 -0700 Subject: [PATCH 64/65] dries up customer controller tests using check_response helper method --- test/controllers/customers_controller_test.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5acb619d9..f0f39e34c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,16 +7,13 @@ it "must get index" do get customers_path - must_respond_with :ok - expect(response.header['Content-Type']).must_include 'json' + check_response(expected_type: Array, expected_status: :success) end it "will return all the proper fields for a list of customers" do get customers_path - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array, expected_status: :success) body.each do |customer| expect(customer).must_be_instance_of Hash @@ -28,11 +25,9 @@ Customer.destroy_all get customers_path - must_respond_with :ok - - body = JSON.parse(response.body) + + body = check_response(expected_type: Array, expected_status: :success) - expect(body).must_be_instance_of Array expect(body.length).must_equal 0 end end From 6844a5a3be6b31bf663a4a59d5c62ae4a127084a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 29 May 2020 15:36:41 -0700 Subject: [PATCH 65/65] changed succesful created rental from status :created to have status :ok --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c8b17d5fc..f14ab5a73 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,7 +34,7 @@ def checkout due_date: rental.due_date, videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory - }, status: :created + }, status: :ok return else render json: {