From 0aaf6e035ca8ebe2035921b812b02dca09558289 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:12:14 -0700 Subject: [PATCH 01/43] rails boilerplate, set up Video model --- .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/models/video.rb | 2 + 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 +++ db/migrate/20200526211137_create_videos.rb | 13 ++ db/schema.rb | 28 +++ lib/tasks/.keep | 0 log/.keep | 0 node_modules/.yarn-integrity | 10 + 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/models/video_test.rb | 7 + test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 4 + 65 files changed, 1170 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/models/video.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/migrate/20200526211137_create_videos.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 node_modules/.yarn-integrity 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/models/video_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep create mode 100644 yarn.lock 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..95c25b78d --- /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' +# 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..7f91bc2cb --- /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) + 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/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/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..8e0eeeb51 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +76HqEzhueE4Tvl8+45pokBxUbpZxJcEIZG9WnymI9KEARPMrg+jbj1nAPgGcwlgN7lDZBNOR+M27WxTn43eo4ACF7s9aBRLx4mkB4cgD35bizRfc/GhkXLvA5+AtJecoyNqTIW+KCo6SJUa1r8sVryYTidudwUWYDwxiQhHlZ9XFYm6gxOhWLYd8C7+9+FYAropP5nkM/rJmac6cO6wa18dehVXlOzNbEwag58LtekEqm9DEdzjnXgrJpVsza4HfHAq3LZdhP9uTG9L+9B78tG+6uRXWVlYIliQtRRaxz6/YZdl75/ftdpLW1xSLhBjYvrubeh6dZqr4Y8tLgFuGFKaNxb12gNmD6YR5gN0DE+ISf1y/2YtLT/mjXBhlXMu0F03UPnGTYm0mWDh3Hv3jVzHfU6mqjfuklHn3--2PqCrmTINoTliXrj--9By5Qnd1AfHTYqItbC2hsg== \ 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/db/migrate/20200526211137_create_videos.rb b/db/migrate/20200526211137_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200526211137_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.date :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1b71392c4 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# 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_211137) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..0f19eb7ab --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-83", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file 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/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 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 diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..fb57ccd13 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 62bff5e633ff728fe23e4a3941a2bf0d4161629a Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:13:19 -0700 Subject: [PATCH 02/43] set up model Customer --- app/models/customer.rb | 2 ++ db/migrate/20200526211300_create_customers.rb | 15 +++++++++++++++ db/schema.rb | 14 +++++++++++++- test/models/customer_test.rb | 7 +++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20200526211300_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/20200526211300_create_customers.rb b/db/migrate/20200526211300_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200526211300_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 1b71392c4..754094089 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,23 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_211137) do +ActiveRecord::Schema.define(version: 2020_05_26_211300) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" 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 3661132ecf40d2cbb5956fdd70072143905df6fd Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:17:41 -0700 Subject: [PATCH 03/43] add videos checked out column to Customers --- .../20200526211640_add_videos_checked_out_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200526211640_add_videos_checked_out_to_customers.rb diff --git a/db/migrate/20200526211640_add_videos_checked_out_to_customers.rb b/db/migrate/20200526211640_add_videos_checked_out_to_customers.rb new file mode 100644 index 000000000..d275260ca --- /dev/null +++ b/db/migrate/20200526211640_add_videos_checked_out_to_customers.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 754094089..9fc8fd84d 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_211300) do +ActiveRecord::Schema.define(version: 2020_05_26_211640) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" end create_table "videos", force: :cascade do |t| From 2c56d1cf949f3ea94da7ab8f6df4b39716a84d92 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:21:50 -0700 Subject: [PATCH 04/43] create model Rental --- app/models/rental.rb | 2 ++ db/migrate/20200526212132_create_rentals.rb | 9 +++++++++ db/schema.rb | 8 +++++++- test/models/rental_test.rb | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200526212132_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/20200526212132_create_rentals.rb b/db/migrate/20200526212132_create_rentals.rb new file mode 100644 index 000000000..98aa3c29c --- /dev/null +++ b/db/migrate/20200526212132_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 9fc8fd84d..302428174 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_211640) do +ActiveRecord::Schema.define(version: 2020_05_26_212132) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,6 +28,12 @@ t.integer "videos_checked_out_count" end + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" 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 6d92ad1fa91807ae11d5c19d4eb1ada1dccbd74f Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:24:57 -0700 Subject: [PATCH 05/43] migration linking video and customer and rental --- .../20200526212225_connect_video_and_customer_to_rental.rb | 6 ++++++ db/schema.rb | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200526212225_connect_video_and_customer_to_rental.rb diff --git a/db/migrate/20200526212225_connect_video_and_customer_to_rental.rb b/db/migrate/20200526212225_connect_video_and_customer_to_rental.rb new file mode 100644 index 000000000..442d7ec35 --- /dev/null +++ b/db/migrate/20200526212225_connect_video_and_customer_to_rental.rb @@ -0,0 +1,6 @@ +class ConnectVideoAndCustomerToRental < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :video, index: true + add_reference :rentals, :customer, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 302428174..fa4306ecd 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_212132) do +ActiveRecord::Schema.define(version: 2020_05_26_212225) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,6 +32,10 @@ t.date "due_date" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "video_id" + t.bigint "customer_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| From 620fd03f63318c134d9f47938c2d2f1c81fae7f7 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:35:39 -0700 Subject: [PATCH 06/43] add relationships to models --- app/models/customer.rb | 2 ++ app/models/rental.rb | 2 ++ app/models/video.rb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..70960f483 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :videos, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..72fb50a12 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video end diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..3a5a893b9 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,4 @@ class Video < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals end From 6da63709ea24edd3be8dc42ed7b1d01c343035b2 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:40:16 -0700 Subject: [PATCH 07/43] create controllers for models --- app/controllers/customers_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ app/controllers/videos_controller.rb | 2 ++ config/routes.rb | 3 +++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ test/controllers/videos_controller_test.rb | 7 +++++++ 7 files changed, 30 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..fcd6eefb2 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,2 @@ +class VideosController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..e3307284e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :videos, only: [:index, :show, :create] + + resources :customers, only: [:index] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end 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 99a7de60fb35fa9e428f1b2d24d189430749da01 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 14:56:58 -0700 Subject: [PATCH 08/43] method for GETall videos, + testing --- app/controllers/videos_controller.rb | 4 +++ test/controllers/videos_controller_test.rb | 37 ++++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fcd6eefb2..ccd312fb9 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,2 +1,6 @@ class VideosController < ApplicationController + def index + videos = Video.all.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]) + render json: videos, status: :ok + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7f1649fd0..e290a8222 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe VideosController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + describe "index" do + it "responds with JSON and success" do + get videos_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it "responds with an array of video info" 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 + required_attrs = ["title", "overview", "release_date", "total_inventory", "available_inventory"] + expect(video.keys.sort).must_equal required_attrs.sort + end + end + + it "will give back an empty array if no videos" do + Video.destroy_all + + get videos_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body).must_be_empty + end + end + end From 0a28dcb4410fe1ef9df14f8a4767c870e890be69 Mon Sep 17 00:00:00 2001 From: Catherina Date: Tue, 26 May 2020 14:59:32 -0700 Subject: [PATCH 09/43] Create index action for Customer, add test for index action --- app/controllers/customers_controller.rb | 7 +++++++ node_modules/.yarn-integrity | 6 ++++-- test/models/customer_test.rb | 12 +++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..d5e5494d3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,9 @@ class CustomersController < ApplicationController + + def index + customers = Customer.all.order(:name) + + render json: customers.as_json(only: [:id, :name, :registered_at, + :address, :city, :state, :postal_code, :phone]) + end end diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 0f19eb7ab..2cb174c20 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,6 +1,8 @@ { - "systemParams": "darwin-x64-83", - "modulesFolders": [], + "systemParams": "darwin-x64-72", + "modulesFolders": [ + "node_modules" + ], "flags": [], "linkedModules": [], "topLevelPatterns": [], diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..fe549f805 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,13 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort + + it "includes json and responds with success" do + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + end From 98a1ad7d269fe235e1729d683ce0182aa5ef55d7 Mon Sep 17 00:00:00 2001 From: Catherina Date: Tue, 26 May 2020 15:04:51 -0700 Subject: [PATCH 10/43] Add customer controller test to verify fields --- test/controllers/customers_controller_test.rb | 26 ++++++++++++++++--- test/models/customer_test.rb | 11 +------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..ec2511875 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,27 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort + + it "includes json and responds with success" do + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :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.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index fe549f805..999b4a102 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,13 +1,4 @@ require "test_helper" describe Customer do - CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort - - it "includes json and responds with success" do - get customers_path - - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :success - end - -end +end \ No newline at end of file From 660e5baf4c8bc25ad081a24e92a9bcff5b382638 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 15:12:06 -0700 Subject: [PATCH 11/43] show action for single video + testing --- app/controllers/videos_controller.rb | 16 +++++++++ test/controllers/videos_controller_test.rb | 38 ++++++++++++++++++++-- test/fixtures/videos.yml | 6 ++++ 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/videos.yml diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index ccd312fb9..963091625 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,4 +3,20 @@ def index videos = Video.all.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]) render json: videos, status: :ok end + + def show + video = Video.find_by(id: params[:id]) + + if video.nil? + render json: { + 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 diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e290a8222..17964ffc9 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,6 +1,7 @@ require "test_helper" describe VideosController do + REQUIRED_ATTRS = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort describe "index" do it "responds with JSON and success" do @@ -19,8 +20,7 @@ body.each do |video| expect(video).must_be_instance_of Hash - required_attrs = ["title", "overview", "release_date", "total_inventory", "available_inventory"] - expect(video.keys.sort).must_equal required_attrs.sort + expect(video.keys.sort).must_equal REQUIRED_ATTRS end end @@ -35,4 +35,38 @@ end end + describe "show" do + it "responds with JSON and success" do + video = videos(:fake_vid) + get video_path(video.id) + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it "will return a hash of correct information for existing video" do + video = videos(:fake_vid) + get video_path(video.id) + + must_respond_with :success + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal REQUIRED_ATTRS + end + + it "will return a 404 in JSON for 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 diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..19db39642 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,6 @@ +fake_vid: + title: Fake Video + overview: This is about a fake video. + release_date: 1979-01-18 + total_inventory: 10 + available_inventory: 9 \ No newline at end of file From 3ce415488a5f2e4c7f7df6bd35ce249622fe91f7 Mon Sep 17 00:00:00 2001 From: Catherina Date: Tue, 26 May 2020 15:12:13 -0700 Subject: [PATCH 12/43] Add test for edge cases for customer index action --- test/controllers/customers_controller_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ec2511875..f9bb6fcfc 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -22,6 +22,17 @@ expect(customer.keys.sort).must_equal CUSTOMER_FIELDS end end + + it "will return 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 From fea2941dbefd852783a3cb6deed9148d56fc06fe Mon Sep 17 00:00:00 2001 From: Catherina Date: Tue, 26 May 2020 15:19:15 -0700 Subject: [PATCH 13/43] Add fixture file for customers --- test/controllers/customers_controller_test.rb | 2 -- test/fixtures/customers.yml | 9 +++++++++ 2 files changed, 9 insertions(+), 2 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 f9bb6fcfc..9d47624e1 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -33,6 +33,4 @@ expect(body).must_be_instance_of Array expect(body.length).must_equal 0 end - - end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..fa3bc8bc6 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,9 @@ +customer_one: + id: 1 + name: Mary + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: Main Street + city: Seattle + state: WA + postal_code: 98116a + phone: (436)4276232 \ No newline at end of file From 6c33a0fb9666df693f42df998a54671ef09d7009 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 15:33:33 -0700 Subject: [PATCH 14/43] create video func --- app/controllers/videos_controller.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 963091625..a7b9738fe 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -19,4 +19,25 @@ 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) + + 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, :total_inventory, :available_inventory) + end end From 5a45b38965a242c7530f17b39f711b24e745a73f Mon Sep 17 00:00:00 2001 From: Catherina Date: Tue, 26 May 2020 15:55:32 -0700 Subject: [PATCH 15/43] Add tests to create action and validations for video model --- app/models/video.rb | 6 +++ test/controllers/videos_controller_test.rb | 47 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index 3a5a893b9..33f6d1260 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,10 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 17964ffc9..c6d03b8ae 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -69,4 +69,51 @@ end end + describe "create" do + let(:video_data) { + { + video: { + title: "Fake Video", + overview: "fake overview", + release_date: "2020-01-28", + total_inventory: 10, + available_inventory: 9 + } + } + } + + it "can create a new video" do + puts "ALL VIDEOS before DESTROY = #{Video.count}" + + Video.destroy_all + + + puts "ALL VIDEOS before = #{Video.count}" + + + expect{ + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + puts "ALL VIDEOS = #{Video.count}" + + must_respond_with :created + end + + it "will respond with bad_request for invalid data" do + video_data[:video][:title] = nil + + expect { + post videos_path, params: video_data + }.wont_change "Video.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end + end + + end From a6fe0cab47252a91ca2e51b76d4a537deacce8cf Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 16:50:14 -0700 Subject: [PATCH 16/43] new route for check out, method for checkout, testing for checkout --- app/controllers/rentals_controller.rb | 55 +++++++++++++++++++++ config/routes.rb | 3 ++ test/controllers/rentals_controller_test.rb | 36 ++++++++++++-- test/controllers/videos_controller_test.rb | 8 --- test/fixtures/customers.yml | 3 +- 5 files changed, 93 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..24268eb64 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,57 @@ class RentalsController < ApplicationController + + def check_out + customer = Customer.find_by(id: rental_params[:customer_id]) + if customer.nil? + render json: { + ok: false, + errors: 'Customer does not exist.' + }, status: :bad_request + return + else + customer.videos_checked_out_count += 1 + end + + video = Video.find_by(id: rental_params[:video_id]) + if video.nil? + render json: { + ok: false, + errors: 'Video does not exist.' + }, status: :bad_request + return + elsif video.available_inventory == 0 + render json: { + ok: false, + errors: 'This video is out of stock.' + }, status: :ok + return + else + video.available_inventory -= 1 + end + + rental = Rental.new(rental_params) + rental.due_date = Date.today + 7 + + if rental.save + render json: rental.as_json(only: [:customer_id, :video_id, :due_date]), status: :ok + return + else + render json: { + ok: false, + errors: rental.errors.messages + }, status: :bad_request + return + end + end + + def check_in + + end + + private + + def rental_params + return params.require(:rental).permit(:customer_id, :video_id) + end + end diff --git a/config/routes.rb b/config/routes.rb index e3307284e..e8b305f97 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,7 @@ resources :videos, only: [:index, :show, :create] resources :customers, only: [:index] + + post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..9f64591b3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + REQUIRED_ATTRS = ["customer_id", "video_id", "due_date"].sort + + describe "check out" do + let(:check_out_data) { + { + rental: { + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id, + } + } + } + + it "creates a rental checkout" do + expect { + post check_out_path, params: check_out_data + }.must_differ "Rental.count", 1 + + # expect(customers(:customer_one).videos_checked_out_count).must_equal 1 + # expect(videos(:fake_vid).available_inventory).must_equal 8 + + must_respond_with :ok + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal REQUIRED_ATTRS + end + + end + + describe "check in" do + + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index c6d03b8ae..7e01af4fa 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -83,20 +83,12 @@ } it "can create a new video" do - puts "ALL VIDEOS before DESTROY = #{Video.count}" - Video.destroy_all - - puts "ALL VIDEOS before = #{Video.count}" - - expect{ post videos_path, params: video_data }.must_differ "Video.count", 1 - puts "ALL VIDEOS = #{Video.count}" - must_respond_with :created end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index fa3bc8bc6..dfaf3611f 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,4 +6,5 @@ customer_one: city: Seattle state: WA postal_code: 98116a - phone: (436)4276232 \ No newline at end of file + phone: (436)4276232 + videos_checked_out_count: 0 \ No newline at end of file From 243958b75eef4262142cb7b4b0eb971761fe1e53 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 17:04:08 -0700 Subject: [PATCH 17/43] edge case testing for checkout --- app/models/rental.rb | 3 ++ test/controllers/rentals_controller_test.rb | 53 +++++++++++++++++++++ test/fixtures/videos.yml | 8 +++- 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 72fb50a12..6a6391ea1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + + validates :customer_id, presence: true + validates :video_id, presence: true end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9f64591b3..3aff55dd4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -29,6 +29,59 @@ expect(body.keys.sort).must_equal REQUIRED_ATTRS end + it "will respond with bad_request if the customer is not found" do + check_out_data[:rental][:customer_id] = nil + + expect { + post check_out_path, params: check_out_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal 'Customer does not exist.' + end + + it "will respond with bad_request if the video is not found" do + check_out_data[:rental][:video_id] = nil + + expect { + post check_out_path, params: check_out_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal 'Video does not exist.' + end + + it "will respond with ok false if the video is not in stock" do + check_out_data[:rental][:video_id] = videos(:none_avail_vid).id + + expect { + post check_out_path, params: check_out_data + }.wont_change "Rental.count" + + must_respond_with :ok + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal 'This video is out of stock.' + end + + it "will respond with bad_request if rental request is invalid" do + check_out_data[:rental][:video_id] = nil + check_out_data[:rental][:customer_id] = nil + + expect { + post check_out_path, params: check_out_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + end end describe "check in" do diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 19db39642..724ce910d 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -3,4 +3,10 @@ fake_vid: overview: This is about a fake video. release_date: 1979-01-18 total_inventory: 10 - available_inventory: 9 \ No newline at end of file + available_inventory: 9 +none_avail_vid: + title: Rails Video + overview: This is about not having inventory. + release_date: 2010-04-22 + total_inventory: 4 + available_inventory: 0 \ No newline at end of file From 29ad42b747d2a63592c038784d5efcfb670c7a72 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 17:08:59 -0700 Subject: [PATCH 18/43] update status codes --- app/controllers/rentals_controller.rb | 6 +++--- test/controllers/rentals_controller_test.rb | 18 +++--------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 24268eb64..46ab5a373 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,7 +6,7 @@ def check_out render json: { ok: false, errors: 'Customer does not exist.' - }, status: :bad_request + }, status: :not_found return else customer.videos_checked_out_count += 1 @@ -17,13 +17,13 @@ def check_out render json: { ok: false, errors: 'Video does not exist.' - }, status: :bad_request + }, status: :not_found return elsif video.available_inventory == 0 render json: { ok: false, errors: 'This video is out of stock.' - }, status: :ok + }, status: :bad_request return else video.available_inventory -= 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3aff55dd4..4d8507a63 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -36,7 +36,7 @@ post check_out_path, params: check_out_data }.wont_change "Rental.count" - must_respond_with :bad_request + must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) @@ -50,7 +50,7 @@ post check_out_path, params: check_out_data }.wont_change "Rental.count" - must_respond_with :bad_request + must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) @@ -64,24 +64,12 @@ post check_out_path, params: check_out_data }.wont_change "Rental.count" - must_respond_with :ok + must_respond_with :bad_request expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) expect(body["errors"]).must_equal 'This video is out of stock.' end - - it "will respond with bad_request if rental request is invalid" do - check_out_data[:rental][:video_id] = nil - check_out_data[:rental][:customer_id] = nil - - expect { - post check_out_path, params: check_out_data - }.wont_change "Rental.count" - - must_respond_with :bad_request - expect(response.header['Content-Type']).must_include 'json' - end end describe "check in" do From 50ea2d65060ea73058e0ae777206c0f279260151 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 17:39:38 -0700 Subject: [PATCH 19/43] model testing --- app/controllers/rentals_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 46ab5a373..5e82cf603 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -10,6 +10,7 @@ def check_out return else customer.videos_checked_out_count += 1 + customer.save end video = Video.find_by(id: rental_params[:video_id]) @@ -27,6 +28,7 @@ def check_out return else video.available_inventory -= 1 + video.save end rental = Rental.new(rental_params) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4d8507a63..0d773a8c1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -19,8 +19,8 @@ post check_out_path, params: check_out_data }.must_differ "Rental.count", 1 - # expect(customers(:customer_one).videos_checked_out_count).must_equal 1 - # expect(videos(:fake_vid).available_inventory).must_equal 8 + expect(customers(:customer_one).videos_checked_out_count).must_equal 1 + expect(videos(:fake_vid).available_inventory).must_equal 8 must_respond_with :ok From 72201e35447797eb1e034b72fe0c1591c9d87a1a Mon Sep 17 00:00:00 2001 From: Catherina Date: Tue, 26 May 2020 17:41:01 -0700 Subject: [PATCH 20/43] Add check-in method --- app/controllers/rentals_controller.rb | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5e82cf603..356ba79bc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -47,7 +47,42 @@ def check_out end def check_in + customer = Customer.find_by(id: rental_params[:customer_id]) + + if customer.nil? + render json: { + ok: false, + errors: 'Customer does not exist.' + }, status: :not_found + return + end + + video = Video.find_by(id: rental_params[:video_id]) + + if video.nil? + render json: { + ok: false, + errors: 'Video does not exist.' + }, status: :not_found + return + end + + rental = Rental.where(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) + if rental != nil + customer.videos_checked_out_count -= 1 + video.available_inventory += 1 + render json: rental.as_json(only: [:customer_id, :video_id]), status: :ok + puts "REACHING?" + return + else + render json: { + ok: false, + errors: rental.errors.messages + }, status: :bad_request + return + end + end private From 9878b791a620b5ccca6060544b7f35d492d5a2b2 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Tue, 26 May 2020 17:47:08 -0700 Subject: [PATCH 21/43] updates to check-in --- app/controllers/rentals_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 356ba79bc..80778048f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -67,13 +67,14 @@ def check_in return end - rental = Rental.where(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) + rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) - if rental != nil + if rental customer.videos_checked_out_count -= 1 + customer.save video.available_inventory += 1 + video.save render json: rental.as_json(only: [:customer_id, :video_id]), status: :ok - puts "REACHING?" return else render json: { From 0d91ad413f4acfc7b5bc90733227306281a67eab Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 10:10:49 -0700 Subject: [PATCH 22/43] Add tests for the rentals check-in --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 61 +++++++++++++++++++++ test/fixtures/rentals.yml | 3 + test/fixtures/videos.yml | 2 + 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/rentals.yml diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 356ba79bc..2548cbb37 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -67,7 +67,7 @@ def check_in return end - rental = Rental.where(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) + rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) if rental != nil customer.videos_checked_out_count -= 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0d773a8c1..09c13cb11 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,6 +3,7 @@ describe RentalsController do REQUIRED_ATTRS = ["customer_id", "video_id", "due_date"].sort + CHECKIN_ATTR = ["customer_id", "video_id", "videos_checked_out_count", "available_invemtory"].sort describe "check out" do let(:check_out_data) { @@ -73,6 +74,66 @@ end describe "check in" do + let(:check_in_data) { + { + rental: { + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id, + } + } + } + + it "Successfully checks in a rental" do + customer = customers(:customer_one) + customer.videos_checked_out_count = 2 + customer.save + + video = videos(:fake_vid) + video.available_inventory = 7 + video.save + + + expect{ + post check_in_path, params: check_in_data + }.wont_change "Rental.count" + + must_respond_with :ok + + expect(customers(:customer_one).videos_checked_out_count).must_equal 1 + expect(videos(:fake_vid).available_inventory).must_equal 8 + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal CHECKIN_ATTR + end + + it "Will respond with not_found if customer is not found" do + check_in_data[:rental][:customer_id] = nil + + expect { + post check_in_path, params: check_in_data + }.wont_change "Rental.count" + + must_respond_with :not_found + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal 'Customer does not exist.' + end + + it "Will respond with not_found if video is not found" do + check_in_data[:rental][:video_id] = nil + + expect { + post check_in_path, params: check_in_data + }.wont_change "Rental.count" + + must_respond_with :not_found + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal 'Video does not exist.' + end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..1785f7bb8 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,3 @@ +rental_one: + customer_id: 1 + video_id: 1 \ No newline at end of file diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 724ce910d..8ca6b02f3 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,10 +1,12 @@ fake_vid: + id: 1 title: Fake Video overview: This is about a fake video. release_date: 1979-01-18 total_inventory: 10 available_inventory: 9 none_avail_vid: + id: 2 title: Rails Video overview: This is about not having inventory. release_date: 2010-04-22 From cc1871b540d9820f0160a36553ecf161e4b1c5eb Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 14:38:42 -0700 Subject: [PATCH 23/43] testing + return correct info for rental creation --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 17 +++++++- test/controllers/customers_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 43 +++++++++++++++++-- test/fixtures/customers.yml | 3 +- test/fixtures/videos.yml | 4 +- 6 files changed, 58 insertions(+), 13 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d5e5494d3..6ab93ed30 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,6 +4,6 @@ def index customers = Customer.all.order(:name) render json: customers.as_json(only: [:id, :name, :registered_at, - :address, :city, :state, :postal_code, :phone]) + :address, :city, :state, :postal_code, :phone, :videos_checked_out_count]) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 80778048f..250405da2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,7 +9,9 @@ def check_out }, status: :not_found return else + puts "BEFORE CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" customer.videos_checked_out_count += 1 + puts "AFTER CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" customer.save end @@ -27,7 +29,9 @@ def check_out }, status: :bad_request return else + puts "BEFORE VIDEO CHECKOUT: #{video.available_inventory}" video.available_inventory -= 1 + puts "AFTER VIDEO CHECKOUT: #{video.available_inventory}" video.save end @@ -35,7 +39,15 @@ def check_out rental.due_date = Date.today + 7 if rental.save - render json: rental.as_json(only: [:customer_id, :video_id, :due_date]), status: :ok + rental_info = { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + available_inventory: video.available_inventory, + videos_checked_out_count: customer.videos_checked_out_count + } + + render json: rental_info.as_json, status: :ok return else render json: { @@ -67,7 +79,7 @@ def check_in return end - rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) + rental = Rental.where(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) if rental customer.videos_checked_out_count -= 1 @@ -77,6 +89,7 @@ def check_in render json: rental.as_json(only: [:customer_id, :video_id]), status: :ok return else + puts "HERE?" render json: { ok: false, errors: rental.errors.messages diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9d47624e1..de93262ae 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort + CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone", "videos_checked_out_count"].sort it "includes json and responds with success" do get customers_path diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 09c13cb11..035ed475d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,7 +3,7 @@ describe RentalsController do REQUIRED_ATTRS = ["customer_id", "video_id", "due_date"].sort - CHECKIN_ATTR = ["customer_id", "video_id", "videos_checked_out_count", "available_invemtory"].sort + CHECKIN_ATTR = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort describe "check out" do let(:check_out_data) { @@ -16,12 +16,48 @@ } it "creates a rental checkout" do + # puts "BEFORE CHECKOUT: #{customers(:customer_one).videos_checked_out_count}" + # puts Rental.count + # new_customer = Customer.create( + # name: "New Customer", + # registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + # address: "Main Street", + # city: "Seattle", + # state: "WA", + # postal_code: "98116a", + # phone: "(436)4276232", + # videos_checked_out_count: 5, + # ) + + # new_video = Video.create( + # title: "New Video", + # overview: "Testing a new video", + # release_date: "2010-04-22", + # total_inventory: 5, + # available_inventory: 4 + # ) + + # parameters = { + # rental: { + # customer_id: new_customer.id, + # video_id: new_video.id, + # } + # } + customer_before_video_count = customers(:customer_one).videos_checked_out_count + videos_before_available_count = videos(:fake_vid).available_inventory + expect { post check_out_path, params: check_out_data }.must_differ "Rental.count", 1 - expect(customers(:customer_one).videos_checked_out_count).must_equal 1 - expect(videos(:fake_vid).available_inventory).must_equal 8 + expect(customers(:customer_one).videos_checked_out_count).must_equal (customer_before_video_count + 1) + expect(videos(:fake_vid).available_inventory).must_equal (videos_before_available_count - 1) + + # puts "AFTER CHECKOUT: #{customers(:customer_one).videos_checked_out_count}" + # puts Rental.count + + # expect(customers(:customer_one).videos_checked_out_count).must_equal 2 + # expect(videos(:fake_vid).available_inventory).must_equal 6 must_respond_with :ok @@ -92,7 +128,6 @@ video.available_inventory = 7 video.save - expect{ post check_in_path, params: check_in_data }.wont_change "Rental.count" diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dfaf3611f..1efee4c2e 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,5 +1,4 @@ customer_one: - id: 1 name: Mary registered_at: Wed, 29 Apr 2015 07:54:14 -0700 address: Main Street @@ -7,4 +6,4 @@ customer_one: state: WA postal_code: 98116a phone: (436)4276232 - videos_checked_out_count: 0 \ No newline at end of file + videos_checked_out_count: 1 \ No newline at end of file diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 8ca6b02f3..b501e9b9d 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,12 +1,10 @@ fake_vid: - id: 1 title: Fake Video overview: This is about a fake video. release_date: 1979-01-18 total_inventory: 10 - available_inventory: 9 + available_inventory: 7 none_avail_vid: - id: 2 title: Rails Video overview: This is about not having inventory. release_date: 2010-04-22 From 8397600f71d7fa4719f5a17cded1b33b6c5677d1 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 14:54:18 -0700 Subject: [PATCH 24/43] change to logic for checkout dependent on video avail inventory --- app/controllers/rentals_controller.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 250405da2..44b4b9e33 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,11 +8,6 @@ def check_out errors: 'Customer does not exist.' }, status: :not_found return - else - puts "BEFORE CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" - customer.videos_checked_out_count += 1 - puts "AFTER CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" - customer.save end video = Video.find_by(id: rental_params[:video_id]) @@ -22,23 +17,28 @@ def check_out errors: 'Video does not exist.' }, status: :not_found return - elsif video.available_inventory == 0 + elsif video.available_inventory < 1 render json: { ok: false, errors: 'This video is out of stock.' }, status: :bad_request return - else - puts "BEFORE VIDEO CHECKOUT: #{video.available_inventory}" - video.available_inventory -= 1 - puts "AFTER VIDEO CHECKOUT: #{video.available_inventory}" - video.save end rental = Rental.new(rental_params) rental.due_date = Date.today + 7 if rental.save + puts "BEFORE CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" + customer.videos_checked_out_count += 1 + puts "AFTER CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" + customer.save + + puts "BEFORE VIDEO CHECKOUT: #{video.available_inventory}" + video.available_inventory -= 1 + puts "AFTER VIDEO CHECKOUT: #{video.available_inventory}" + video.save + rental_info = { customer_id: rental.customer_id, video_id: rental.video_id, From d553c812a5b7f86fb3d8fe5b189d8fe353bbdf20 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 14:54:19 -0700 Subject: [PATCH 25/43] Add validation for video_checked_out count and add rental_info as json --- app/controllers/rentals_controller.rb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 250405da2..9140c7d52 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -79,6 +79,14 @@ def check_in return end + if customer.videos_checked_out_count < 1 + render json: { + ok: false, + errors: 'You cannot check-in a video.' + }, status: :bad_request + return + end + rental = Rental.where(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) if rental @@ -86,7 +94,16 @@ def check_in customer.save video.available_inventory += 1 video.save - render json: rental.as_json(only: [:customer_id, :video_id]), status: :ok + + rental_info = { + customer_id: customer.id, + video_id: video.id, + available_inventory: video.available_inventory, + videos_checked_out_count: customer.videos_checked_out_count + } + + render json: rental_info, status: :ok + return else puts "HERE?" From 24344367d936bfa1d741be65dea80ffe1592deed Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 15:23:56 -0700 Subject: [PATCH 26/43] rental checkout testing --- app/controllers/rentals_controller.rb | 9 ++- test/controllers/rentals_controller_test.rb | 62 ++++++--------------- test/models/customer_test.rb | 44 +++++++++++++++ 3 files changed, 68 insertions(+), 47 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8d46b5815..4fc03fb46 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -47,7 +47,7 @@ def check_out videos_checked_out_count: customer.videos_checked_out_count } - render json: rental_info.as_json, status: :ok + render json: rental_info.as_json, status: :created return else render json: { @@ -87,7 +87,7 @@ def check_in return end - rental = Rental.where(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) + rental = Rental.find_by(customer_id: rental_params[:customer_id].to_i, video_id: rental_params[:video_id].to_i) if rental customer.videos_checked_out_count -= 1 @@ -95,6 +95,9 @@ def check_in video.available_inventory += 1 video.save + puts "AFTER CUSTOMER CHECKIN: #{customer.videos_checked_out_count}" + puts "AFTER VIDEO CHECKIN: #{video.available_inventory}" + rental_info = { customer_id: customer.id, video_id: video.id, @@ -109,7 +112,7 @@ def check_in puts "HERE?" render json: { ok: false, - errors: rental.errors.messages + errors: ['Rental was not found.'] }, status: :bad_request return end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 035ed475d..b98ade74f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,7 +2,7 @@ describe RentalsController do - REQUIRED_ATTRS = ["customer_id", "video_id", "due_date"].sort + REQUIRED_ATTRS = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort CHECKIN_ATTR = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort describe "check out" do @@ -16,33 +16,6 @@ } it "creates a rental checkout" do - # puts "BEFORE CHECKOUT: #{customers(:customer_one).videos_checked_out_count}" - # puts Rental.count - # new_customer = Customer.create( - # name: "New Customer", - # registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", - # address: "Main Street", - # city: "Seattle", - # state: "WA", - # postal_code: "98116a", - # phone: "(436)4276232", - # videos_checked_out_count: 5, - # ) - - # new_video = Video.create( - # title: "New Video", - # overview: "Testing a new video", - # release_date: "2010-04-22", - # total_inventory: 5, - # available_inventory: 4 - # ) - - # parameters = { - # rental: { - # customer_id: new_customer.id, - # video_id: new_video.id, - # } - # } customer_before_video_count = customers(:customer_one).videos_checked_out_count videos_before_available_count = videos(:fake_vid).available_inventory @@ -50,16 +23,13 @@ post check_out_path, params: check_out_data }.must_differ "Rental.count", 1 + customers(:customer_one).reload + videos(:fake_vid).reload + expect(customers(:customer_one).videos_checked_out_count).must_equal (customer_before_video_count + 1) expect(videos(:fake_vid).available_inventory).must_equal (videos_before_available_count - 1) - # puts "AFTER CHECKOUT: #{customers(:customer_one).videos_checked_out_count}" - # puts Rental.count - - # expect(customers(:customer_one).videos_checked_out_count).must_equal 2 - # expect(videos(:fake_vid).available_inventory).must_equal 6 - - must_respond_with :ok + must_respond_with :created body = JSON.parse(response.body) expect(body).must_be_instance_of Hash @@ -120,22 +90,26 @@ } it "Successfully checks in a rental" do - customer = customers(:customer_one) - customer.videos_checked_out_count = 2 - customer.save + post check_out_path, params: check_in_data + must_respond_with :created - video = videos(:fake_vid) - video.available_inventory = 7 - video.save + customer_before_video_count = customers(:customer_one).videos_checked_out_count + videos_before_available_count = videos(:fake_vid).available_inventory + + customers(:customer_one).reload + videos(:fake_vid).reload expect{ post check_in_path, params: check_in_data }.wont_change "Rental.count" - must_respond_with :ok + customers(:customer_one).reload + videos(:fake_vid).reload + + must_respond_with :ok - expect(customers(:customer_one).videos_checked_out_count).must_equal 1 - expect(videos(:fake_vid).available_inventory).must_equal 8 + expect(customers(:customer_one).videos_checked_out_count).must_equal (customer_before_video_count - 1) + expect(videos(:fake_vid).available_inventory).must_equal (videos_before_available_count + 1) body = JSON.parse(response.body) expect(body).must_be_instance_of Hash diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 999b4a102..8ace1ea7c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,4 +1,48 @@ require "test_helper" describe Customer do + describe "validations" do + # it "must have a title" do + # work.title = nil + + # # Assert + # expect(work.valid?).must_equal false + # expect(work.errors.messages).must_include :title + # expect(work.errors.messages[:title]).must_equal ["can't be blank"] + # end + + # it "must have a category" do + # work.category = nil + + # # Assert + # expect(work.valid?).must_equal false + # expect(work.errors.messages).must_include :category + # expect(work.errors.messages[:category]).must_equal ["can't be blank"] + # end + + # it "must have a creator" do + # work.creator = nil + + # # Assert + # expect(work.valid?).must_equal false + # expect(work.errors.messages).must_include :creator + # expect(work.errors.messages[:creator]).must_equal ["can't be blank"] + # end + + # it "must have a publication_year" do + # work.publication_year = nil + + # # Assert + # expect(work.valid?).must_equal false + # expect(work.errors.messages).must_include :publication_year + # expect(work.errors.messages[:publication_year]).must_equal ["can't be blank"] + # end + + # it "must have a description" do + # work.description = nil + + # # Assert + # expect(work.valid?).must_equal true + # end + end end \ No newline at end of file From 9a8c82269e955cde47d5bb55c4e52d04f72e39a4 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 15:28:33 -0700 Subject: [PATCH 27/43] check in testing --- test/controllers/rentals_controller_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b98ade74f..7fa6ddef0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -93,12 +93,12 @@ post check_out_path, params: check_in_data must_respond_with :created - customer_before_video_count = customers(:customer_one).videos_checked_out_count - videos_before_available_count = videos(:fake_vid).available_inventory - customers(:customer_one).reload videos(:fake_vid).reload + customer_before_video_count = customers(:customer_one).videos_checked_out_count + videos_before_available_count = videos(:fake_vid).available_inventory + expect{ post check_in_path, params: check_in_data }.wont_change "Rental.count" From bca0ddacd73c263b09180cdc78f4219be3b66b8e Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 15:33:58 -0700 Subject: [PATCH 28/43] delete unnecessary puts, code cleanup --- app/controllers/rentals_controller.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4fc03fb46..e37f50e11 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,6 +2,7 @@ class RentalsController < ApplicationController def check_out customer = Customer.find_by(id: rental_params[:customer_id]) + if customer.nil? render json: { ok: false, @@ -11,6 +12,7 @@ def check_out end video = Video.find_by(id: rental_params[:video_id]) + if video.nil? render json: { ok: false, @@ -29,14 +31,9 @@ def check_out rental.due_date = Date.today + 7 if rental.save - puts "BEFORE CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" customer.videos_checked_out_count += 1 - puts "AFTER CUSTOMER CHECKOUT: #{customer.videos_checked_out_count}" customer.save - - puts "BEFORE VIDEO CHECKOUT: #{video.available_inventory}" video.available_inventory -= 1 - puts "AFTER VIDEO CHECKOUT: #{video.available_inventory}" video.save rental_info = { @@ -95,9 +92,6 @@ def check_in video.available_inventory += 1 video.save - puts "AFTER CUSTOMER CHECKIN: #{customer.videos_checked_out_count}" - puts "AFTER VIDEO CHECKIN: #{video.available_inventory}" - rental_info = { customer_id: customer.id, video_id: video.id, @@ -106,10 +100,8 @@ def check_in } render json: rental_info, status: :ok - return else - puts "HERE?" render json: { ok: false, errors: ['Rental was not found.'] From 79689cc7eb373f29c1163bb7f91a4b55ee7d94d6 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 15:45:35 -0700 Subject: [PATCH 29/43] Fix required attributes array --- test/controllers/rentals_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7fa6ddef0..53d1e9567 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,7 +2,7 @@ describe RentalsController do - REQUIRED_ATTRS = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort + CHECKOUT_ATTRS = ["available_inventory", "customer_id", "due_date", "video_id", "videos_checked_out_count"].sort CHECKIN_ATTR = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort describe "check out" do @@ -33,7 +33,7 @@ body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal REQUIRED_ATTRS + expect(body.keys.sort).must_equal CHECKOUT_ATTRS end it "will respond with bad_request if the customer is not found" do From 8617d6e18ae421cfe38ce39fe4b0ee202ad9620c Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 16:14:35 -0700 Subject: [PATCH 30/43] Updated what json is rendering --- app/controllers/customers_controller.rb | 2 +- app/controllers/videos_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6ab93ed30..a9b810486 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,6 +4,6 @@ def index customers = Customer.all.order(:name) render json: customers.as_json(only: [:id, :name, :registered_at, - :address, :city, :state, :postal_code, :phone, :videos_checked_out_count]) + :postal_code, :phone, :videos_checked_out_count]) end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index a7b9738fe..ec9c75b92 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,6 +1,6 @@ class VideosController < ApplicationController def index - videos = Video.all.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]) + videos = Video.all.order(:title).as_json(only: [:id, :title, :release_date, :available_inventory]) render json: videos, status: :ok end @@ -10,7 +10,7 @@ def show if video.nil? render json: { ok: false, - message: 'Not Found', + messages: 'Not Found', }, status: :not_found return From aec5a79be1279560bb5fce4667b9728932786dcb Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 16:30:46 -0700 Subject: [PATCH 31/43] Smoke tests wave 1 fixes --- app/controllers/videos_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index ec9c75b92..25f57b7cf 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -9,8 +9,7 @@ def show if video.nil? render json: { - ok: false, - messages: 'Not Found', + errors: ['Not Found'], }, status: :not_found return @@ -28,7 +27,6 @@ def create return else render json: { - ok: false, errors: video.errors.messages }, status: :bad_request return @@ -38,6 +36,6 @@ def create private def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end From 3f2a15955c53271d0e591fc7532c19afaa0f2619 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 16:42:18 -0700 Subject: [PATCH 32/43] Pass smoke tests for wave 2 --- app/controllers/rentals_controller.rb | 33 ++++++++------------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e37f50e11..73642ccb0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,8 +5,7 @@ def check_out if customer.nil? render json: { - ok: false, - errors: 'Customer does not exist.' + errors: ['Not Found'] }, status: :not_found return end @@ -15,14 +14,12 @@ def check_out if video.nil? render json: { - ok: false, - errors: 'Video does not exist.' + errors: ['Not Found'] }, status: :not_found return elsif video.available_inventory < 1 render json: { - ok: false, - errors: 'This video is out of stock.' + errors: ['Not Found'] }, status: :bad_request return end @@ -44,12 +41,11 @@ def check_out videos_checked_out_count: customer.videos_checked_out_count } - render json: rental_info.as_json, status: :created + render json: rental_info.as_json, status: :ok return else render json: { - ok: false, - errors: rental.errors.messages + errors: ['Not Found'] }, status: :bad_request return end @@ -60,8 +56,7 @@ def check_in if customer.nil? render json: { - ok: false, - errors: 'Customer does not exist.' + errors: ['Not Found'] }, status: :not_found return end @@ -70,20 +65,11 @@ def check_in if video.nil? render json: { - ok: false, - errors: 'Video does not exist.' + errors: ['Not Found'] }, status: :not_found return end - if customer.videos_checked_out_count < 1 - render json: { - ok: false, - errors: 'You cannot check-in a video.' - }, status: :bad_request - return - end - rental = Rental.find_by(customer_id: rental_params[:customer_id].to_i, video_id: rental_params[:video_id].to_i) if rental @@ -103,8 +89,7 @@ def check_in return else render json: { - ok: false, - errors: ['Rental was not found.'] + errors: ['Not Found'] }, status: :bad_request return end @@ -114,7 +99,7 @@ def check_in private def rental_params - return params.require(:rental).permit(:customer_id, :video_id) + return params.permit(:customer_id, :video_id) end end From 14eaa2437dad6a14cba79bf6cd9a300b73ee7098 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 17:05:31 -0700 Subject: [PATCH 33/43] Fix controller tests --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 36 +++++++++---------- test/controllers/videos_controller_test.rb | 22 ++++++------ 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a9b810486..00e51c9de 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all.order(:name) - + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index de93262ae..5ed88ab1f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone", "videos_checked_out_count"].sort + CUSTOMER_FIELDS = ["id", "name", "phone", "postal_code", "registered_at", "videos_checked_out_count"].sort it "includes json and responds with success" do get customers_path diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 53d1e9567..0a9664ef9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -8,10 +8,8 @@ describe "check out" do let(:check_out_data) { { - rental: { - customer_id: customers(:customer_one).id, - video_id: videos(:fake_vid).id, - } + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id, } } @@ -29,7 +27,7 @@ expect(customers(:customer_one).videos_checked_out_count).must_equal (customer_before_video_count + 1) expect(videos(:fake_vid).available_inventory).must_equal (videos_before_available_count - 1) - must_respond_with :created + must_respond_with :ok body = JSON.parse(response.body) expect(body).must_be_instance_of Hash @@ -37,7 +35,7 @@ end it "will respond with bad_request if the customer is not found" do - check_out_data[:rental][:customer_id] = nil + check_out_data[:customer_id] = nil expect { post check_out_path, params: check_out_data @@ -47,11 +45,11 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - expect(body["errors"]).must_equal 'Customer does not exist.' + expect(body["errors"]).must_equal ["Not Found"] end it "will respond with bad_request if the video is not found" do - check_out_data[:rental][:video_id] = nil + check_out_data[:video_id] = nil expect { post check_out_path, params: check_out_data @@ -61,11 +59,11 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - expect(body["errors"]).must_equal 'Video does not exist.' + expect(body["errors"]).must_equal ["Not Found"] end it "will respond with ok false if the video is not in stock" do - check_out_data[:rental][:video_id] = videos(:none_avail_vid).id + check_out_data[:video_id] = videos(:none_avail_vid).id expect { post check_out_path, params: check_out_data @@ -75,23 +73,21 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - expect(body["errors"]).must_equal 'This video is out of stock.' + expect(body["errors"]).must_equal ["Not Found"] end end describe "check in" do let(:check_in_data) { { - rental: { - customer_id: customers(:customer_one).id, - video_id: videos(:fake_vid).id, - } + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id, } } it "Successfully checks in a rental" do post check_out_path, params: check_in_data - must_respond_with :created + must_respond_with :ok customers(:customer_one).reload videos(:fake_vid).reload @@ -117,7 +113,7 @@ end it "Will respond with not_found if customer is not found" do - check_in_data[:rental][:customer_id] = nil + check_in_data[:customer_id] = nil expect { post check_in_path, params: check_in_data @@ -127,11 +123,11 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - expect(body["errors"]).must_equal 'Customer does not exist.' + expect(body["errors"]).must_equal ["Not Found"] end it "Will respond with not_found if video is not found" do - check_in_data[:rental][:video_id] = nil + check_in_data[:video_id] = nil expect { post check_in_path, params: check_in_data @@ -141,7 +137,7 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - expect(body["errors"]).must_equal 'Video does not exist.' + expect(body["errors"]).must_equal ["Not Found"] end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7e01af4fa..5aeee841a 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe VideosController do - REQUIRED_ATTRS = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort + REQUIRED_ATTRS = ["available_inventory", "overview", "release_date", "title", "total_inventory"].sort describe "index" do it "responds with JSON and success" do @@ -18,9 +18,10 @@ expect(body).must_be_instance_of Array + expect(body[0].keys.sort).must_equal ['id', 'title', 'release_date', 'available_inventory'].sort + body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal REQUIRED_ATTRS end end @@ -64,21 +65,18 @@ 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' + expect(body['errors']).must_equal ['Not Found'] end end describe "create" do let(:video_data) { { - video: { - title: "Fake Video", - overview: "fake overview", - release_date: "2020-01-28", - total_inventory: 10, - available_inventory: 9 - } + title: "Fake Video", + overview: "fake overview", + release_date: "2020-01-28", + total_inventory: 10, + available_inventory: 9 } } @@ -93,7 +91,7 @@ end it "will respond with bad_request for invalid data" do - video_data[:video][:title] = nil + video_data[:title] = nil expect { post videos_path, params: video_data From 06a403004acbd77618cda30a2e3f5d3e8aaf779c Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 17:15:53 -0700 Subject: [PATCH 34/43] move increase and decrease inventory logic for video to models --- app/controllers/rentals_controller.rb | 6 ++-- app/models/video.rb | 11 +++++++ test/models/customer_test.rb | 44 --------------------------- 3 files changed, 13 insertions(+), 48 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 73642ccb0..736d6bee6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -30,8 +30,7 @@ def check_out if rental.save customer.videos_checked_out_count += 1 customer.save - video.available_inventory -= 1 - video.save + video.decrease_avail_inventory rental_info = { customer_id: rental.customer_id, @@ -75,8 +74,7 @@ def check_in if rental customer.videos_checked_out_count -= 1 customer.save - video.available_inventory += 1 - video.save + video.increase_avail_inventory rental_info = { customer_id: customer.id, diff --git a/app/models/video.rb b/app/models/video.rb index 33f6d1260..22e42cd86 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -7,4 +7,15 @@ class Video < ApplicationRecord validates :release_date, presence: true validates :total_inventory, presence: true validates :available_inventory, presence: true + + def increase_avail_inventory + self.available_inventory += 1 + self.save + end + + def decrease_avail_inventory + self.available_inventory -= 1 + self.save + end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 8ace1ea7c..999b4a102 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,48 +1,4 @@ require "test_helper" describe Customer do - describe "validations" do - # it "must have a title" do - # work.title = nil - - # # Assert - # expect(work.valid?).must_equal false - # expect(work.errors.messages).must_include :title - # expect(work.errors.messages[:title]).must_equal ["can't be blank"] - # end - - # it "must have a category" do - # work.category = nil - - # # Assert - # expect(work.valid?).must_equal false - # expect(work.errors.messages).must_include :category - # expect(work.errors.messages[:category]).must_equal ["can't be blank"] - # end - - # it "must have a creator" do - # work.creator = nil - - # # Assert - # expect(work.valid?).must_equal false - # expect(work.errors.messages).must_include :creator - # expect(work.errors.messages[:creator]).must_equal ["can't be blank"] - # end - - # it "must have a publication_year" do - # work.publication_year = nil - - # # Assert - # expect(work.valid?).must_equal false - # expect(work.errors.messages).must_include :publication_year - # expect(work.errors.messages[:publication_year]).must_equal ["can't be blank"] - # end - - # it "must have a description" do - # work.description = nil - - # # Assert - # expect(work.valid?).must_equal true - # end - end end \ No newline at end of file From 5dc3b00e11dfa4522ca7f88ec6601ae366388c28 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 17:20:57 -0700 Subject: [PATCH 35/43] Add model methods for customer --- app/controllers/rentals_controller.rb | 19 ++----------------- app/models/customer.rb | 10 ++++++++++ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 736d6bee6..6dfd5fe9c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,16 +3,9 @@ class RentalsController < ApplicationController def check_out customer = Customer.find_by(id: rental_params[:customer_id]) - if customer.nil? - render json: { - errors: ['Not Found'] - }, status: :not_found - return - end - video = Video.find_by(id: rental_params[:video_id]) - if video.nil? + if video.nil? || customer.nil? render json: { errors: ['Not Found'] }, status: :not_found @@ -53,16 +46,9 @@ def check_out def check_in customer = Customer.find_by(id: rental_params[:customer_id]) - if customer.nil? - render json: { - errors: ['Not Found'] - }, status: :not_found - return - end - video = Video.find_by(id: rental_params[:video_id]) - if video.nil? + if video.nil? || customer.nil? render json: { errors: ['Not Found'] }, status: :not_found @@ -99,5 +85,4 @@ def check_in def rental_params return params.permit(:customer_id, :video_id) end - end diff --git a/app/models/customer.rb b/app/models/customer.rb index 70960f483..509109b65 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,14 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals + + def check_out_increase + self.videos_checked_out_count += 1 + self.save + end + + def check_in_decrease + self.videos_checked_out_count -= 1 + self.save + end end From 95c20dd1f23ef01dd465ee77a71adcaea8f6c3d6 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 17:51:08 -0700 Subject: [PATCH 36/43] Call model methods from rentals controller --- app/controllers/rentals_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6dfd5fe9c..9d01565dd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,7 +21,7 @@ def check_out rental.due_date = Date.today + 7 if rental.save - customer.videos_checked_out_count += 1 + customer.check_out_increase customer.save video.decrease_avail_inventory @@ -58,7 +58,7 @@ def check_in rental = Rental.find_by(customer_id: rental_params[:customer_id].to_i, video_id: rental_params[:video_id].to_i) if rental - customer.videos_checked_out_count -= 1 + customer.check_in_decrease customer.save video.increase_avail_inventory From 9df9423d14ce82058ff731f31efd7ccb3a181355 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 22:28:14 -0700 Subject: [PATCH 37/43] Add validation tests for Rental --- app/models/rental.rb | 1 + test/controllers/rentals_controller_test.rb | 39 +++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 6a6391ea1..e91ef8758 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,4 +4,5 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :video_id, presence: true + validates :due_date, presence: true end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0a9664ef9..22e71d310 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -139,6 +139,45 @@ body = JSON.parse(response.body) expect(body["errors"]).must_equal ["Not Found"] end + end + + describe "validations" do + before do + @rental = Rental.create( + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id, + due_date: Date.today + 7 + ) + end + + it "is valid when all fields are present" do + result = @rental.valid? + + expect(result).must_equal true + end + + it "is invalid without a customer_id" do + @rental.customer_id = nil + + result = @rental.valid? + expect(result).must_equal false + end + + it "is invalid without a video_id" do + @rental.video_id = nil + + result = @rental.valid? + + expect(result).must_equal false + end + + it "is invalid without a due_date" do + @rental.due_date = nil + + result = @rental.valid? + + expect(result).must_equal false + end end end From 69d50fa5dd30888db3750686b8abbed30479c522 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 22:31:46 -0700 Subject: [PATCH 38/43] Move validation tests to rental_test file --- test/controllers/rentals_controller_test.rb | 40 -------------------- test/models/rental_test.rb | 42 +++++++++++++++++++-- 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 22e71d310..d4523159f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -140,44 +140,4 @@ expect(body["errors"]).must_equal ["Not Found"] end end - - describe "validations" do - before do - @rental = Rental.create( - customer_id: customers(:customer_one).id, - video_id: videos(:fake_vid).id, - due_date: Date.today + 7 - ) - end - - it "is valid when all fields are present" do - result = @rental.valid? - - expect(result).must_equal true - end - - it "is invalid without a customer_id" do - @rental.customer_id = nil - - result = @rental.valid? - - expect(result).must_equal false - end - - it "is invalid without a video_id" do - @rental.video_id = nil - - result = @rental.valid? - - expect(result).must_equal false - end - - it "is invalid without a due_date" do - @rental.due_date = nil - - result = @rental.valid? - - expect(result).must_equal false - end - end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..3e83b1824 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,43 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + before do + @rental = Rental.create( + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id, + due_date: Date.today + 7 + ) + end + + it "is valid when all fields are present" do + result = @rental.valid? + + expect(result).must_equal true + end + + it "is invalid without a customer_id" do + @rental.customer_id = nil + + result = @rental.valid? + + expect(result).must_equal false + end + + it "is invalid without a video_id" do + @rental.video_id = nil + + result = @rental.valid? + + expect(result).must_equal false + end + + it "is invalid without a due_date" do + @rental.due_date = nil + + result = @rental.valid? + + expect(result).must_equal false + end + end end From b0965679433f5bb04f84c202c10dd9e2c91ea0fb Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 22:41:54 -0700 Subject: [PATCH 39/43] validations testing for video --- test/models/video_test.rb | 75 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..6bbee6926 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,76 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + let (:new_video) { + Video.new( + title: 'New Video', + overview: 'Test video has a test description.', + release_date: '2020-01-01', + total_inventory: 10, + available_inventory: 10, + ) + } + + it "can be instantiated" do + # Assert + expect(new_video.valid?).must_equal true + end + + it "will have the required fields" do + # Arrange + new_video.save + find_video = Video.first + [:title, :overview, :release_date, :total_inventory, :available_inventory].each do |field| + # Assert + expect(find_video).must_respond_to field + end + end + + describe "validations" do + it "must have a title" do + new_video.title = nil + + # Assert + expect(new_video.valid?).must_equal false + expect(new_video.errors.messages).must_include :title + expect(new_video.errors.messages[:title]).must_equal ["can't be blank"] + end + + it "must have a overview" do + new_video.overview = nil + + # Assert + expect(new_video.valid?).must_equal false + expect(new_video.errors.messages).must_include :overview + expect(new_video.errors.messages[:overview]).must_equal ["can't be blank"] + end + + it "must have a release_date" do + new_video.release_date = nil + + # Assert + expect(new_video.valid?).must_equal false + expect(new_video.errors.messages).must_include :release_date + expect(new_video.errors.messages[:release_date]).must_equal ["can't be blank"] + end + + it "must have a total_inventory" do + new_video.total_inventory = nil + + # Assert + expect(new_video.valid?).must_equal false + expect(new_video.errors.messages).must_include :total_inventory + expect(new_video.errors.messages[:total_inventory]).must_equal ["can't be blank"] + end + + it "must have a available_inventory" do + new_video.available_inventory = nil + + # Assert + expect(new_video.valid?).must_equal false + expect(new_video.errors.messages).must_include :available_inventory + expect(new_video.errors.messages[:available_inventory]).must_equal ["can't be blank"] + end + end end From 4c05096c980e77cd07ca3469c956b589ec0babc3 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 22:54:37 -0700 Subject: [PATCH 40/43] model custom method testing --- test/models/video_test.rb | 49 ++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 6bbee6926..0dc11b02e 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -13,16 +13,14 @@ } it "can be instantiated" do - # Assert expect(new_video.valid?).must_equal true end it "will have the required fields" do - # Arrange new_video.save find_video = Video.first + [:title, :overview, :release_date, :total_inventory, :available_inventory].each do |field| - # Assert expect(find_video).must_respond_to field end end @@ -31,7 +29,6 @@ it "must have a title" do new_video.title = nil - # Assert expect(new_video.valid?).must_equal false expect(new_video.errors.messages).must_include :title expect(new_video.errors.messages[:title]).must_equal ["can't be blank"] @@ -40,7 +37,6 @@ it "must have a overview" do new_video.overview = nil - # Assert expect(new_video.valid?).must_equal false expect(new_video.errors.messages).must_include :overview expect(new_video.errors.messages[:overview]).must_equal ["can't be blank"] @@ -49,7 +45,6 @@ it "must have a release_date" do new_video.release_date = nil - # Assert expect(new_video.valid?).must_equal false expect(new_video.errors.messages).must_include :release_date expect(new_video.errors.messages[:release_date]).must_equal ["can't be blank"] @@ -58,7 +53,6 @@ it "must have a total_inventory" do new_video.total_inventory = nil - # Assert expect(new_video.valid?).must_equal false expect(new_video.errors.messages).must_include :total_inventory expect(new_video.errors.messages[:total_inventory]).must_equal ["can't be blank"] @@ -67,10 +61,49 @@ it "must have a available_inventory" do new_video.available_inventory = nil - # Assert expect(new_video.valid?).must_equal false expect(new_video.errors.messages).must_include :available_inventory expect(new_video.errors.messages[:available_inventory]).must_equal ["can't be blank"] end end + + describe "custom methods" do + + let(:check_in_data) { + { + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id, + } + } + + describe "increase_avail_inventory" do + it "increases count for increase_avail_inventory" do + new_rental = Rental.create( + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id + ) + + videos_before_available_count = videos(:fake_vid).available_inventory + + videos(:fake_vid).increase_avail_inventory + + expect(videos(:fake_vid).available_inventory).must_equal (videos_before_available_count + 1) + end + end + + describe "decrease_avail_inventory" do + it "decreases count for decrease_avail_inventory" do + new_rental = Rental.create( + customer_id: customers(:customer_one).id, + video_id: videos(:fake_vid).id + ) + + videos_before_available_count = videos(:fake_vid).available_inventory + + videos(:fake_vid).decrease_avail_inventory + + expect(videos(:fake_vid).available_inventory).must_equal (videos_before_available_count - 1) + end + end + end end From d29f96e37703f9c1208a7b7870b9eadf68fd4190 Mon Sep 17 00:00:00 2001 From: Catherina Date: Wed, 27 May 2020 22:54:41 -0700 Subject: [PATCH 41/43] Add Customer model tests --- test/models/customer_test.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 999b4a102..3b1f8e519 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,4 +1,29 @@ require "test_helper" describe Customer do + before do + @customer = customers(:customer_one) + end + + describe "check_out_increase" do + it "will increase videos_checked_out_count" do + + count_before = @customer.videos_checked_out_count + @customer.check_out_increase + count_after = @customer.videos_checked_out_count + + expect(count_after).must_equal count_before + 1 + end + end + + describe "check_in_decrease" do + it "will decrease videos_checked_out_count" do + + count_before = @customer.videos_checked_out_count + @customer.check_in_decrease + count_after = @customer.videos_checked_out_count + + expect(count_after).must_equal count_before - 1 + end + end end \ No newline at end of file From b1f21adbeada4d4c468975cefab3c61d130f475d Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Wed, 27 May 2020 22:55:55 -0700 Subject: [PATCH 42/43] code cleanup --- test/models/video_test.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 0dc11b02e..f1e9b2907 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -69,13 +69,6 @@ describe "custom methods" do - let(:check_in_data) { - { - customer_id: customers(:customer_one).id, - video_id: videos(:fake_vid).id, - } - } - describe "increase_avail_inventory" do it "increases count for increase_avail_inventory" do new_rental = Rental.create( From 5829e2d44c69878d56ce98999bf57a68a8076611 Mon Sep 17 00:00:00 2001 From: Jessica Liang Date: Thu, 28 May 2020 09:20:20 -0700 Subject: [PATCH 43/43] minor format, spacing changes --- app/controllers/rentals_controller.rb | 2 -- test/controllers/videos_controller_test.rb | 6 +++--- test/models/customer_test.rb | 2 -- test/models/video_test.rb | 10 ---------- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9d01565dd..f0c46fc85 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,7 +2,6 @@ class RentalsController < ApplicationController def check_out customer = Customer.find_by(id: rental_params[:customer_id]) - video = Video.find_by(id: rental_params[:video_id]) if video.nil? || customer.nil? @@ -45,7 +44,6 @@ def check_out def check_in customer = Customer.find_by(id: rental_params[:customer_id]) - video = Video.find_by(id: rental_params[:video_id]) if video.nil? || customer.nil? diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5aeee841a..35422d37f 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -29,8 +29,8 @@ Video.destroy_all get videos_path - body = JSON.parse(response.body) + body = JSON.parse(response.body) expect(body).must_be_instance_of Array expect(body).must_be_empty end @@ -39,6 +39,7 @@ describe "show" do it "responds with JSON and success" do video = videos(:fake_vid) + get video_path(video.id) expect(response.header['Content-Type']).must_include 'json' @@ -47,12 +48,12 @@ it "will return a hash of correct information for existing video" do video = videos(:fake_vid) + get video_path(video.id) must_respond_with :success body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal REQUIRED_ATTRS end @@ -63,7 +64,6 @@ must_respond_with :not_found body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash expect(body['errors']).must_equal ['Not Found'] end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3b1f8e519..b863e10b0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -7,7 +7,6 @@ describe "check_out_increase" do it "will increase videos_checked_out_count" do - count_before = @customer.videos_checked_out_count @customer.check_out_increase count_after = @customer.videos_checked_out_count @@ -18,7 +17,6 @@ describe "check_in_decrease" do it "will decrease videos_checked_out_count" do - count_before = @customer.videos_checked_out_count @customer.check_in_decrease count_after = @customer.videos_checked_out_count diff --git a/test/models/video_test.rb b/test/models/video_test.rb index f1e9b2907..a157766dd 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -71,11 +71,6 @@ describe "increase_avail_inventory" do it "increases count for increase_avail_inventory" do - new_rental = Rental.create( - customer_id: customers(:customer_one).id, - video_id: videos(:fake_vid).id - ) - videos_before_available_count = videos(:fake_vid).available_inventory videos(:fake_vid).increase_avail_inventory @@ -86,11 +81,6 @@ describe "decrease_avail_inventory" do it "decreases count for decrease_avail_inventory" do - new_rental = Rental.create( - customer_id: customers(:customer_one).id, - video_id: videos(:fake_vid).id - ) - videos_before_available_count = videos(:fake_vid).available_inventory videos(:fake_vid).decrease_avail_inventory