From 6c92b56a822535c27909ba0ac1fd8f0a69f3650c Mon Sep 17 00:00:00 2001 From: thenora Date: Tue, 26 May 2020 13:27:38 -0700 Subject: [PATCH 01/45] initial rails setup --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 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/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 4 + 61 files changed, 1120 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 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/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..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..41b7d4311 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..43301a817 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..b8d8fe543 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +FWCHswNbJ6zXCH3FXQUvy2eN5RgeO0JmvfEKvuF9NP65OO9rsW4qVx2ADdJai/oKp61JYQWCEalePoERqiJmy2m6sxh7FtQvNrWa3ZWefZoJfYT8cTcmvlbEpvdXsG98GK8nzMKfoNplSneHIE7N2LiwgqZSKebJArha/N0MLOecB7WmBKXE8SCWmoVz7MoaBIIW8ugsLLEZ0R1dftivLtSPADpk62cKTn+/8xs3jrhMbouzxwexQYwhep5BCjgu7mP20mo95Utt/CbZYQfUFFqMX/G1H4ClHqqcXvGOnuChZ918aDn0zzpcnyAkzoOAjZvsYgZ191tnYjv3bH10Fl6VWBkqJCjYijv1gP1vc5x7P/GlButt97yr/WWpk3TKD8rlaq2SyWs9+FB180LPcubabbI+7gtVOHPc--Dpe4bKsiGdX+8j1f--R6kxC9IgiKYWspjCYHg9rQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/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/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 88e4cacffa03cfed0d189cb91609915f16408e1e Mon Sep 17 00:00:00 2001 From: thenora Date: Tue, 26 May 2020 22:35:59 -0700 Subject: [PATCH 02/45] added models, relationship migrations --- app/models/customer.rb | 2 + app/models/rental.rb | 2 + app/models/video.rb | 2 + db/migrate/20200527051436_create_videos.rb | 14 +++++ db/migrate/20200527051509_create_rentals.rb | 13 +++++ db/migrate/20200527051518_create_customers.rb | 15 ++++++ ...200527053312_add_rental_id_to_customers.rb | 5 ++ .../20200527053339_add_rental_id_to_videos.rb | 5 ++ db/schema.rb | 54 +++++++++++++++++++ test/models/customer_test.rb | 7 +++ test/models/rental_test.rb | 7 +++ test/models/video_test.rb | 7 +++ 12 files changed, 133 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/rental.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200527051436_create_videos.rb create mode 100644 db/migrate/20200527051509_create_rentals.rb create mode 100644 db/migrate/20200527051518_create_customers.rb create mode 100644 db/migrate/20200527053312_add_rental_id_to_customers.rb create mode 100644 db/migrate/20200527053339_add_rental_id_to_videos.rb create mode 100644 db/schema.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/rental_test.rb create mode 100644 test/models/video_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/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/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/db/migrate/20200527051436_create_videos.rb b/db/migrate/20200527051436_create_videos.rb new file mode 100644 index 000000000..f1897a743 --- /dev/null +++ b/db/migrate/20200527051436_create_videos.rb @@ -0,0 +1,14 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :total_inventory + t.integer :available_inventory + + + t.timestamps + end + end +end diff --git a/db/migrate/20200527051509_create_rentals.rb b/db/migrate/20200527051509_create_rentals.rb new file mode 100644 index 000000000..d28536a7b --- /dev/null +++ b/db/migrate/20200527051509_create_rentals.rb @@ -0,0 +1,13 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.date :due_date + t.date :checkin_date + t.date :checkout_date + + + + t.timestamps + end + end +end diff --git a/db/migrate/20200527051518_create_customers.rb b/db/migrate/20200527051518_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200527051518_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/migrate/20200527053312_add_rental_id_to_customers.rb b/db/migrate/20200527053312_add_rental_id_to_customers.rb new file mode 100644 index 000000000..41b52dadc --- /dev/null +++ b/db/migrate/20200527053312_add_rental_id_to_customers.rb @@ -0,0 +1,5 @@ +class AddRentalIdToCustomers < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20200527053339_add_rental_id_to_videos.rb b/db/migrate/20200527053339_add_rental_id_to_videos.rb new file mode 100644 index 000000000..631ffcdf6 --- /dev/null +++ b/db/migrate/20200527053339_add_rental_id_to_videos.rb @@ -0,0 +1,5 @@ +class AddRentalIdToVideos < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :videos, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..ecb685169 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,54 @@ +# 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_27_053339) 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 "rentals", force: :cascade do |t| + t.date "due_date" + t.date "checkin_date" + t.date "checkout_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "customer_id" + t.bigint "videos_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["videos_id"], name: "index_rentals_on_videos_id" + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "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 + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos", column: "videos_id" +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/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 diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 1f54ff3987daceb7329b9d647ef32626509bb3d5 Mon Sep 17 00:00:00 2001 From: thenora Date: Tue, 26 May 2020 22:42:54 -0700 Subject: [PATCH 03/45] added has_many and belongs_to --- app/models/customer.rb | 3 +++ app/models/rental.rb | 3 +++ app/models/video.rb | 2 ++ 3 files changed, 8 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..744b078bb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,5 @@ 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..67e41e413 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,5 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video + end diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..419065b4b 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 868f02f7fc6e9334f33c71e198bb6757b0b73faa Mon Sep 17 00:00:00 2001 From: thenora Date: Tue, 26 May 2020 23:43:47 -0700 Subject: [PATCH 04/45] added & corrected name for movies_checked_out --- db/migrate/20200527062728_add_column_to_customers.rb | 5 +++++ .../20200527064101_change_customers_movies_checked_out.rb | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 db/migrate/20200527062728_add_column_to_customers.rb create mode 100644 db/migrate/20200527064101_change_customers_movies_checked_out.rb diff --git a/db/migrate/20200527062728_add_column_to_customers.rb b/db/migrate/20200527062728_add_column_to_customers.rb new file mode 100644 index 000000000..6460785b6 --- /dev/null +++ b/db/migrate/20200527062728_add_column_to_customers.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/migrate/20200527064101_change_customers_movies_checked_out.rb b/db/migrate/20200527064101_change_customers_movies_checked_out.rb new file mode 100644 index 000000000..41f0b66e6 --- /dev/null +++ b/db/migrate/20200527064101_change_customers_movies_checked_out.rb @@ -0,0 +1,5 @@ +class ChangeCustomersMoviesCheckedOut < ActiveRecord::Migration[6.0] + def change + rename_column :customers, :movies_checked_out_count, :videos_checked_out_count + end +end From f8f7d3defe7428a2417d0e9105925dfaff9c502f Mon Sep 17 00:00:00 2001 From: thenora Date: Tue, 26 May 2020 23:44:06 -0700 Subject: [PATCH 05/45] added default time to customers registered_at --- .../20200527063642_change_default_for_registered_at.rb | 5 +++++ db/schema.rb | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20200527063642_change_default_for_registered_at.rb diff --git a/db/migrate/20200527063642_change_default_for_registered_at.rb b/db/migrate/20200527063642_change_default_for_registered_at.rb new file mode 100644 index 000000000..6c29ad6d3 --- /dev/null +++ b/db/migrate/20200527063642_change_default_for_registered_at.rb @@ -0,0 +1,5 @@ +class ChangeDefaultForRegisteredAt < ActiveRecord::Migration[6.0] + def change + change_column(:customers, :registered_at, :datetime, default: -> { 'CURRENT_TIMESTAMP' } ) + end +end diff --git a/db/schema.rb b/db/schema.rb index ecb685169..ffbcb805c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_053339) do +ActiveRecord::Schema.define(version: 2020_05_27_064101) 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.datetime "registered_at", default: -> { "CURRENT_TIMESTAMP" } t.string "address" t.string "city" t.string "state" @@ -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", default: 0 end create_table "rentals", force: :cascade do |t| From c3d462e3c7f03f6598245b364ffb6e30fb6300de Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 00:15:53 -0700 Subject: [PATCH 06/45] added routes --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index c06383a17..57fae1a80 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + + resources :customers, only: [:index, :show] + resources :movies, only: [:index, :show, :create] + + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end From ce1a810305b97bc44b348f3319bd2a51020a7b8d Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 00:29:22 -0700 Subject: [PATCH 07/45] added controllers --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/rentals_controller.rb | 2 ++ app/controllers/videos_controller.rb | 10 ++++++++++ test/controllers/customers_controller_test.rb | 9 +++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ test/controllers/videos_controller_test.rb | 19 +++++++++++++++++++ 6 files changed, 51 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..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +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..8c63e1d04 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,10 @@ +class VideosController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..20069eb1a --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "must get index" do + get customers_index_url + must_respond_with :success + end + +end 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..c5994fef5 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe VideosController do + it "must get index," do + get videos_index,_url + must_respond_with :success + end + + it "must get show," do + get videos_show,_url + must_respond_with :success + end + + it "must get create" do + get videos_create_url + must_respond_with :success + end + +end From 2308a35d46bfba8175481217dba2bd079567d833 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 07:58:31 -0700 Subject: [PATCH 08/45] Video controller tests plus fixed route --- config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 11 +- test/controllers/videos_controller_test.rb | 109 ++++++++++++++++-- 3 files changed, 111 insertions(+), 11 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 57fae1a80..44c149e10 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] - resources :movies, only: [:index, :show, :create] + resources :videos, only: [:index, :show, :create] post "/rentals/check-out", to: "rentals#checkout", as: "checkout" post "/rentals/check-in", to: "rentals#checkin", as: "checkin" diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 20069eb1a..bd354e4ae 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,8 +2,17 @@ describe CustomersController do it "must get index" do - get customers_index_url + get customers_path must_respond_with :success end + it "responds with JSON and success" do + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + + end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index c5994fef5..190647d27 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,19 +1,110 @@ require "test_helper" describe VideosController do - it "must get index," do - get videos_index,_url - must_respond_with :success + + REQUIRED_VIDEO_FIELDS = [ + "id", "title", "overview", + "release_date", "total_inventory", + "available_inventory"].sort + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body end - it "must get show," do - get videos_show,_url - must_respond_with :success + + describe "index" do + it "must get index" do + get videos_path + check_response(expected_type: Array) + end + + it "responds with an array of video hashes" do + # Act + get videos_path + + # Assert + body = check_response(expected_type: Array) + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + end + end + + it "will respond with an empty array when there are no videos" do + # Arrange + Video.destroy_all + + # Act + get videos_path + + # Assert + body = check_response(expected_type: Array) + expect(body).must_equal [] + end end - it "must get create" do - get videos_create_url - must_respond_with :success + describe "show" do + let(:new_video) { + Video.create( + title: "Star Wars", + overview: "Family Space Odissey", + release_date: Date.today, + total_inventory: 10, + available_inventory: 5 + ) + } + + it "must get show for a valid video" do + get video_path(new_video) + video = check_response(expected_type: Hash) + expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + end + + it "must return 404 for an invalid video" do + get video_path(-1) + video = check_response(expected_type: Hash, expected_status: :not_found) + end end + describe "create" do + let(:video_data) { + { + video: { + title: "Star Wars", + overview: "Family Space Odissey", + release_date: Date.today, + total_inventory: 10, + available_inventory: 5 + } + } + } + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + end + + it "will respond with bad_request for invalid data" do + # Arrange - using let from above + video_data[:video][:title] = nil + + expect { + # Act + post videos_path, params: video_data + + # Assert + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end + end + end From 8ee579d94cdbb7cb453948d0b62cab97553fee5f Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 08:03:36 -0700 Subject: [PATCH 09/45] Customer controller tests --- test/controllers/customers_controller_test.rb | 47 +++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index bd354e4ae..d3d9028d7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,18 +1,49 @@ require "test_helper" describe CustomersController do - it "must get index" do - get customers_path - must_respond_with :success - end - - it "responds with JSON and success" do - get customers_path + REQUIRED_VIDEO_FIELDS = [ + "id", "name", "registered_at", + "address", "city", "state", + "postal_code", "phone" ].sort + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body end + describe "index" do + it "must get index" do + get customers_path + check_response(expected_type: Array) + end + + it "responds with an array of customer hashes" do + # Act + get customers_path + # Assert + body = check_response(expected_type: Array) + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + end + end + + it "will respond with an empty array when there are no customers" do + # Arrange + Customer.destroy_all + + # Act + get customers_path + + # Assert + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end end From 1b000ebc4056a75ca90a27b1f95cd8ad27612315 Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 11:26:16 -0700 Subject: [PATCH 10/45] fixed minor misspellings in tests --- test/controllers/videos_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 190647d27..cc4a6a4a3 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -52,7 +52,7 @@ def check_response(expected_type:, expected_status: :success) let(:new_video) { Video.create( title: "Star Wars", - overview: "Family Space Odissey", + overview: "Family Space Odyssey", release_date: Date.today, total_inventory: 10, available_inventory: 5 @@ -76,7 +76,7 @@ def check_response(expected_type:, expected_status: :success) { video: { title: "Star Wars", - overview: "Family Space Odissey", + overview: "Family Space Odyssey", release_date: Date.today, total_inventory: 10, available_inventory: 5 From ebf4676b44f0b50334f65b0a544c8d95245a5292 Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 13:23:44 -0700 Subject: [PATCH 11/45] changed required fields for customer controller to match requirements --- test/controllers/customers_controller_test.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d3d9028d7..4de6aed3a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -3,8 +3,7 @@ describe CustomersController do REQUIRED_VIDEO_FIELDS = [ "id", "name", "registered_at", - "address", "city", "state", - "postal_code", "phone" ].sort + "postal_code", "phone", "videos_checked_out_count" ].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status From cd12f7913becbc3561e3cca2c80aaf4021c10387 Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 13:27:11 -0700 Subject: [PATCH 12/45] customers index created - passing tests --- app/controllers/customers_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..0901ec0e6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,10 @@ class CustomersController < ApplicationController def index + customer = Customer.all.as_json(only: [:id, :name, :registered_at, + :postal_code, :phone, :videos_checked_out_count]) + render json: customer, status: :ok end end + + +# name, registered_at, address*, city*, state*, postal_code, phone, videos_checked_out_count [* not included in API response] \ No newline at end of file From 510f9f066db43c95d4999c99e246fad195fa4ace Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 13:28:54 -0700 Subject: [PATCH 13/45] removed some fields from required video fields --- test/controllers/videos_controller_test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index cc4a6a4a3..572b65874 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -3,9 +3,7 @@ describe VideosController do REQUIRED_VIDEO_FIELDS = [ - "id", "title", "overview", - "release_date", "total_inventory", - "available_inventory"].sort + "id", "title", "release_date", "available_inventory"].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status From 64d9255bce29eda7ef865ffde01bb189fbf728bd Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 14:43:14 -0700 Subject: [PATCH 14/45] made variable plural --- app/controllers/customers_controller.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0901ec0e6..fe87ae3ab 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,7 @@ class CustomersController < ApplicationController def index - customer = Customer.all.as_json(only: [:id, :name, :registered_at, + customers = Customer.order(:name).as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) - render json: customer, status: :ok + render json: customers, status: :ok end end - - -# name, registered_at, address*, city*, state*, postal_code, phone, videos_checked_out_count [* not included in API response] \ No newline at end of file From dd8bd128c1ccae265836f13b6122b3c84b84aba8 Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 14:47:37 -0700 Subject: [PATCH 15/45] all show and index video controller methods pass --- app/controllers/videos_controller.rb | 21 +++++++++++++++++++++ test/controllers/videos_controller_test.rb | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 8c63e1d04..906cad528 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,10 +1,31 @@ class VideosController < ApplicationController def index + videos = Video.order(:title).as_json(only: [:id, :title, + :release_date, :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: "Video not found"}, + status: :not_found + return + end + + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create end + + private + + def video_params + params.permit(:title, :overview, :release_date, :available_inventory) + end end + diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 572b65874..817d2f1a3 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -5,6 +5,10 @@ REQUIRED_VIDEO_FIELDS = [ "id", "title", "release_date", "available_inventory"].sort + REQUIRED_VIDEO_FIELDS_SHOW = [ + "id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + + # TODO - should this go in test helper? def check_response(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' @@ -60,7 +64,7 @@ def check_response(expected_type:, expected_status: :success) it "must get show for a valid video" do get video_path(new_video) video = check_response(expected_type: Hash) - expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS_SHOW end it "must return 404 for an invalid video" do From e37ad892781bcfe6e7ca440913bfd9625be65a1a Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 16:10:54 -0700 Subject: [PATCH 16/45] tweaked videos controller for smoke tests --- app/controllers/videos_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 906cad528..0dafe2fae 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -10,13 +10,12 @@ def show if video.nil? render json: { - ok: false, - message: "Video not found"}, + "errors": ["Not Found"]}, status: :not_found return end - render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok + render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create From bb24af64f9d1e3c0713b22b07734d14299cadbee Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 16:51:43 -0700 Subject: [PATCH 17/45] Completed video controller create, added video validation. Fixed video controller create tests. --- app/controllers/videos_controller.rb | 16 ++++++++++++++-- app/models/video.rb | 3 +++ test/controllers/videos_controller_test.rb | 18 ++++++++---------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 0dafe2fae..7cdb0733d 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -15,16 +15,28 @@ def show return end - render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create + video = Video.new(video_params) + p video + 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 - params.permit(:title, :overview, :release_date, :available_inventory) + params.permit(:title, :overview, :release_date, :available_inventory, :available_inventory) end end diff --git a/app/models/video.rb b/app/models/video.rb index 419065b4b..86a7d9c06 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,7 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, :through => :rentals + + validates :title, presence: true + end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 817d2f1a3..6c1cc9843 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,7 +2,7 @@ describe VideosController do - REQUIRED_VIDEO_FIELDS = [ + REQUIRED_VIDEO_FIELDS_INDEX = [ "id", "title", "release_date", "available_inventory"].sort REQUIRED_VIDEO_FIELDS_SHOW = [ @@ -33,7 +33,7 @@ def check_response(expected_type:, expected_status: :success) body = check_response(expected_type: Array) body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS_INDEX end end @@ -76,13 +76,11 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:video_data) { { - video: { - title: "Star Wars", - overview: "Family Space Odyssey", - release_date: Date.today, - total_inventory: 10, - available_inventory: 5 - } + title: "Star Wars", + overview: "Family Space Odyssey", + release_date: Date.today, + total_inventory: 10, + available_inventory: 5 } } it "can create a new video" do @@ -95,7 +93,7 @@ def check_response(expected_type:, expected_status: :success) it "will respond with bad_request for invalid data" do # Arrange - using let from above - video_data[:video][:title] = nil + video_data[:title] = nil expect { # Act From 25cc7d6b142c3d233b0fcd4868f35ddf6b88dfb0 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 17:46:24 -0700 Subject: [PATCH 18/45] Fixed video controller code after smoke test errors --- app/controllers/videos_controller.rb | 4 +--- app/models/video.rb | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 7cdb0733d..595e6ef82 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -15,18 +15,16 @@ def show return end - render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok + render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create video = Video.new(video_params) - p video 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 diff --git a/app/models/video.rb b/app/models/video.rb index 86a7d9c06..74b7c1a76 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -3,5 +3,8 @@ class Video < ApplicationRecord 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 From ce297ac1571ccaa23778b8af6d25245f91330ed2 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 18:09:18 -0700 Subject: [PATCH 19/45] Smoke test wave 1 --- app/controllers/videos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 595e6ef82..62ff798c0 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -34,7 +34,7 @@ def create private def video_params - params.permit(:title, :overview, :release_date, :available_inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end From f8d881a9e1305f4904a211d23af1c42b33bd58e4 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 18:13:20 -0700 Subject: [PATCH 20/45] Updating code to pass tests --- test/controllers/videos_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 6c1cc9843..04f37ef7b 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -6,7 +6,7 @@ "id", "title", "release_date", "available_inventory"].sort REQUIRED_VIDEO_FIELDS_SHOW = [ - "id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + "title", "overview", "release_date", "total_inventory", "available_inventory"].sort # TODO - should this go in test helper? def check_response(expected_type:, expected_status: :success) From 66e1588446a4f37358541aaf8999ed2a03746ac2 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 18:49:08 -0700 Subject: [PATCH 21/45] Identations --- app/controllers/customers_controller.rb | 10 +++++-- app/controllers/videos_controller.rb | 30 ++++++++++++++----- test/controllers/customers_controller_test.rb | 9 ------ test/controllers/videos_controller_test.rb | 11 ------- test/test_helper.rb | 10 +++++++ 5 files changed, 41 insertions(+), 29 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index fe87ae3ab..19342ca6c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,13 @@ class CustomersController < ApplicationController def index - customers = Customer.order(:name).as_json(only: [:id, :name, :registered_at, - :postal_code, :phone, :videos_checked_out_count]) + customers = Customer.order(:name).as_json(only: [ + :id, + :name, + :registered_at, + :postal_code, + :phone, + :videos_checked_out_count + ]) render json: customers, status: :ok end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 62ff798c0..f60f48b53 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,11 @@ class VideosController < ApplicationController def index - videos = Video.order(:title).as_json(only: [:id, :title, - :release_date, :available_inventory]) + videos = Video.order(:title).as_json(only: [ + :id, + :title, + :release_date, + :available_inventory + ]) render json: videos, status: :ok end @@ -12,10 +16,16 @@ def show render json: { "errors": ["Not Found"]}, status: :not_found - return + return end - render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok + render json: video.as_json(only: [ + :title, + :overview, + :release_date, + :total_inventory, + :available_inventory + ]), status: :ok end def create @@ -25,8 +35,8 @@ def create return else render json: { - errors: video.errors.messages - }, status: :bad_request + errors: video.errors.messages + }, status: :bad_request return end end @@ -34,7 +44,13 @@ def create private def video_params - params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + params.permit( + :title, + :overview, + :release_date, + :total_inventory, + :available_inventory + ) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 4de6aed3a..0f13ab0c3 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -5,15 +5,6 @@ "id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count" ].sort - def check_response(expected_type:, expected_status: :success) - must_respond_with expected_status - expect(response.header['Content-Type']).must_include 'json' - - body = JSON.parse(response.body) - expect(body).must_be_kind_of expected_type - return body - end - describe "index" do it "must get index" do get customers_path diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 04f37ef7b..f33cfd1dc 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -8,17 +8,6 @@ REQUIRED_VIDEO_FIELDS_SHOW = [ "title", "overview", "release_date", "total_inventory", "available_inventory"].sort - # TODO - should this go in test helper? - def check_response(expected_type:, expected_status: :success) - must_respond_with expected_status - expect(response.header['Content-Type']).must_include 'json' - - body = JSON.parse(response.body) - expect(body).must_be_kind_of expected_type - return body - end - - describe "index" do it "must get index" do get videos_path diff --git a/test/test_helper.rb b/test/test_helper.rb index b19af0d5b..b7d12d3f7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -18,4 +18,14 @@ class ActiveSupport::TestCase fixtures :all # Add more helper methods to be used by all tests here... + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + end From 8288188d196002d35d10090f9620bc85aedf5581 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 21:16:19 -0700 Subject: [PATCH 22/45] Implementing Rental checkin --- app/controllers/rentals_controller.rb | 49 +++++++++++++++++++++++++++ app/models/customer.rb | 6 ++++ app/models/rental.rb | 8 +++++ app/models/video.rb | 6 ++++ 4 files changed, 69 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..d95c88860 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,51 @@ class RentalsController < ApplicationController + + def checkin + video = Video.find_by(id: params[:video_id]) + + if video.nil? + render json: { + "errors": ["Video Not Found"]}, + status: :not_found + return + end + + customer = Customer.find_by(id: params[:customer_id]) + + if customer.nil? + render json: { + "errors": ["Customer Not Found"]}, + status: :not_found + return + end + + rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) + + if rental.nil? + render json: { + "errors": ["Rental Not Found"]}, + status: :not_found + return + end + + if !rental.checkedin? + render json: { + "errors": ["Rental Already Checked-In"]}, + status: :bad_request + return + end + + rental.checkin(Date.today) + rental.customer.update_checkout(-1) + rental.video.update_inventory(+1) + + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + } + + end + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 744b078bb..2c7d066e3 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,10 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals + def update_checkout(count) + videos_checked_out_count += count + self.save + end + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 67e41e413..d85df756e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,4 +2,12 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + def checkedin? + return checkin_date.nil? + end + + def checkin(date) + checkin_date = date + self.save + end end diff --git a/app/models/video.rb b/app/models/video.rb index 74b7c1a76..8406cac5a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -7,4 +7,10 @@ class Video < ApplicationRecord validates :release_date, presence: true validates :total_inventory, presence: true validates :available_inventory, presence: true + + def update_inventory(count) + available_inventory += count + self.save + end + end From 5eab456432482154f0d511fb85d20d75578f01cd Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Wed, 27 May 2020 21:31:17 -0700 Subject: [PATCH 23/45] Fixed customer controller typo --- test/controllers/customers_controller_test.rb | 13 ++++-- test/controllers/rentals_controller_test.rb | 43 +++++++++++++++++-- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 0f13ab0c3..d39e579c1 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,14 @@ require "test_helper" describe CustomersController do - REQUIRED_VIDEO_FIELDS = [ - "id", "name", "registered_at", - "postal_code", "phone", "videos_checked_out_count" ].sort + REQUIRED_CUSTOMER_FIELDS = [ + "id", + "name", + "registered_at", + "postal_code", + "phone", + "videos_checked_out_count" + ].sort describe "index" do it "must get index" do @@ -19,7 +24,7 @@ body = check_response(expected_type: Array) body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + expect(customer.keys.sort).must_equal REQUIRED_CUSTOMER_FIELDS end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..1270711c9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,44 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:new_video) { + Video.create( + title: "Star Wars", + overview: "Family Space Odyssey", + release_date: Date.today, + total_inventory: 10, + available_inventory: 5 + ) + } + + describe "checkin" do ### underconstrucion + it "checks in a valid rental" do + # Arrange + + + # Act + expect { + post checkin_path, params: checkin_data + }.must_differ "Video.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + + # Assert + + end + + it "rejects an invalid rental" do + # Arrange + + + # Act + + + # Assert + + end + + + end + end From b2fc4ca903c0d730ed86a7451f7a9efddd6c4848 Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 22:02:16 -0700 Subject: [PATCH 24/45] small style tweaks to checkin method --- app/controllers/rentals_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d95c88860..d944ddba8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,7 +5,7 @@ def checkin if video.nil? render json: { - "errors": ["Video Not Found"]}, + errors: ["Video Not Found"]}, status: :not_found return end @@ -14,7 +14,7 @@ def checkin if customer.nil? render json: { - "errors": ["Customer Not Found"]}, + errors: ["Customer Not Found"]}, status: :not_found return end @@ -23,14 +23,14 @@ def checkin if rental.nil? render json: { - "errors": ["Rental Not Found"]}, + errors: ["Rental Not Found"]}, status: :not_found return end if !rental.checkedin? render json: { - "errors": ["Rental Already Checked-In"]}, + errors: ["Rental Already Checked-In"]}, status: :bad_request return end From e9ecbe5d755938d4c4e61d4c30626ea849ddc270 Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 22:17:03 -0700 Subject: [PATCH 25/45] added customer fixtures --- test/fixtures/customers.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 test/fixtures/customers.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..4d9956234 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +customer1: + name: Nora + registered_at: Wed 27 May 2020 19:54:02 -0700 + address: Stary Lane + city: Smallville + state: WA + postal_code: 98245 + phone: (555) 555-5555 + +customer2: + name: Suely + registered_at: Wed 27 May 2020 19:54:03 -0700 + address: Ada Lane + city: San Francisco + state: California + postal_code: 98210 + phone: (555) 555-5555 From fcc84750c6ec459d99409512673e875bf464efed Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 23:05:54 -0700 Subject: [PATCH 26/45] added checkout tests --- test/controllers/rentals_controller_test.rb | 85 +++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1270711c9..379a59c88 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -11,6 +11,91 @@ ) } + let(:customer1) { customers(:customer1) } + + let(:rental_data) { + { + customer_id: customer1.id, + video_id: new_video.id + } + } + + + describe "checkout" do + before do + rental_data = { + customer_id: customer1.id, video_id: new_video.id + } + end + + it "creates a rental" do + expect { + post checkout_path, params: rental_data + }.must_differ "Rental.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + end + + it "gives a bad request response for invalid customer id" do + # Arrange - using let from above + rental_data[:customer_id] = nil + + expect { + # Act + post checkout_path, params: rental_data + + # Assert + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "customer_id" + end + + it "gives a bad request response for invalid video id" do + # Arrange - using let from above + rental_data[:video_id] = nil + + expect { + # Act + post checkout_path, params: rental_data + + # Assert + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "video_id" + end + + it "has a checkout date" do + post check_out_path, params: rental_data + + expect(Rental.last.check_out_date).must_equal Date.today + end + + it "increases customer's videos_checked_out_count by 1" do + expect(customer1.videos_checked_out_count).must_equal 0 + + post check_out_path, params: @rental_hash + + expect(customer1.videos_checked_out_count).must_equal 1 + end + + it "decreases the video's available inventory by one" do + expect(new_video.available_inventory).must_equal 5 + + expect{post check_out_path, params: rental_data}.must_differ "new_video.available_inventory", -1 + + expect(new_video.available_inventory).must_equal 4 + end + + it "adds a due date 7 days after the checkout" do + post checkout_path, params: rental_data + + expect(Rental.last.due_date).must_equal Date.today + 7 + end + + end + describe "checkin" do ### underconstrucion it "checks in a valid rental" do # Arrange From fbe13f26f5c83cf435f57eeebf48a12689c0a6cd Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 23:06:23 -0700 Subject: [PATCH 27/45] minor style tweak to video controller --- app/controllers/videos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f60f48b53..0a88e0eea 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -14,7 +14,7 @@ def show if video.nil? render json: { - "errors": ["Not Found"]}, + errors: ["Not Found"]}, status: :not_found return end From f45d69293c57f233bfbf09081d80e213c62f924f Mon Sep 17 00:00:00 2001 From: thenora Date: Wed, 27 May 2020 23:06:46 -0700 Subject: [PATCH 28/45] added placeholder checkout method to controller --- app/controllers/rentals_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d944ddba8..0a8233433 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,10 @@ class RentalsController < ApplicationController + def checkout + + end + + def checkin video = Video.find_by(id: params[:video_id]) From 06ca9d2c1f14e724b048610dd89077cc3bf5fb24 Mon Sep 17 00:00:00 2001 From: thenora Date: Thu, 28 May 2020 17:25:10 -0700 Subject: [PATCH 29/45] added model inventory changes to customer/video --- app/models/customer.rb | 6 ++++++ app/models/video.rb | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 2c7d066e3..0b1a25925 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,6 +2,12 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals + # TODO Do we need to test models? + def take_movie_home + self.videos_checked_out_count += 1 + self.save + end + def update_checkout(count) videos_checked_out_count += count self.save diff --git a/app/models/video.rb b/app/models/video.rb index 8406cac5a..5094f7465 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -8,6 +8,11 @@ class Video < ApplicationRecord validates :total_inventory, presence: true validates :available_inventory, presence: true + def send_movie_out + self.available_inventory -= 1 + self.save + end + def update_inventory(count) available_inventory += count self.save From 5d7c892f4a7d55560ea76b8a876fb9721e5d2339 Mon Sep 17 00:00:00 2001 From: thenora Date: Thu, 28 May 2020 17:25:42 -0700 Subject: [PATCH 30/45] wrote checkout - but not passing tests --- app/controllers/rentals_controller.rb | 37 ++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 0a8233433..219979d78 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,42 @@ class RentalsController < ApplicationController def checkout - + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + + @rental = Rental.new( + customer_id: customer.id, + video_id: video.id ) + + @rental.due_date = Date.today + 7 + + if video != nil && customer != nil + if @rental.save + customer.take_movie_home + video.send_movie_out + + rental_data = { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + available_inventory: video.send_movie_out, + videos_checked_out_count: customer.take_movie_home + } + + render json: rental_data.as_json, status: :ok + return + else + render json: { + errors: ["Not Found"]}, + status: :not_found + return + end + else + render json: { + errors: ["Not Found"]}, + status: :not_found + return + end end From 976e8f1c03300aed65f2bba466be9b1c39c86b64 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Thu, 28 May 2020 20:06:48 -0700 Subject: [PATCH 31/45] fixing issues with checkout controller --- app/controllers/rentals_controller.rb | 33 ++++++++++++--------- test/controllers/rentals_controller_test.rb | 21 +++++++------ 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 219979d78..939602147 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,26 +1,32 @@ class RentalsController < ApplicationController def checkout - video = Video.find_by(id: params[:video_id]) + video = Video.find_by(id: params[:videos_id]) customer = Customer.find_by(id: params[:customer_id]) - @rental = Rental.new( - customer_id: customer.id, - video_id: video.id ) + if video != nil && customer != nil - @rental.due_date = Date.today + 7 + @rental = Rental.new( + customer_id: customer.id, + videos_id: video.id + ) + @rental.checkout_date = Date.today + @rental.due_date = Date.today + 7 + + p video + p customer + p @rental - if video != nil && customer != nil if @rental.save customer.take_movie_home video.send_movie_out - + p @rental rental_data = { customer_id: rental.customer_id, - video_id: rental.video_id, + videos_id: rental.videos_id, due_date: rental.due_date, - available_inventory: video.send_movie_out, - videos_checked_out_count: customer.take_movie_home + available_inventory: video.available_inventory, + videos_checked_out_count: customer.videos_checked_out_count } render json: rental_data.as_json, status: :ok @@ -39,9 +45,8 @@ def checkout end end - def checkin - video = Video.find_by(id: params[:video_id]) + video = Video.find_by(id: params[:videos_id]) if video.nil? render json: { @@ -59,7 +64,7 @@ def checkin return end - rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) + rental = Rental.find_by(customer_id: params[:customer_id], videos_id: params[:videos_id]) if rental.nil? render json: { @@ -81,7 +86,7 @@ def checkin render json: { customer_id: rental.customer_id, - video_id: rental.video_id, + videos_id: rental.videos_id, videos_checked_out_count: rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory } diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 379a59c88..e0bbbfd31 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -16,17 +16,16 @@ let(:rental_data) { { customer_id: customer1.id, - video_id: new_video.id + videos_id: new_video.id } } - describe "checkout" do - before do - rental_data = { - customer_id: customer1.id, video_id: new_video.id - } - end + # before do + # rental_data = { + # customer_id: customer1.id, video_id: new_video.id + # } + # end it "creates a rental" do expect { @@ -67,15 +66,15 @@ end it "has a checkout date" do - post check_out_path, params: rental_data + post checkout_path, params: rental_data - expect(Rental.last.check_out_date).must_equal Date.today + expect(Rental.last.checkout_date).must_equal Date.today end it "increases customer's videos_checked_out_count by 1" do expect(customer1.videos_checked_out_count).must_equal 0 - post check_out_path, params: @rental_hash + post checkout_path, params: rental_data expect(customer1.videos_checked_out_count).must_equal 1 end @@ -83,7 +82,7 @@ it "decreases the video's available inventory by one" do expect(new_video.available_inventory).must_equal 5 - expect{post check_out_path, params: rental_data}.must_differ "new_video.available_inventory", -1 + expect{post checkout_path, params: rental_data}.must_differ "new_video.available_inventory", -1 expect(new_video.available_inventory).must_equal 4 end From 787def9b197126ec70c92320d548bf7de3711c65 Mon Sep 17 00:00:00 2001 From: thenora Date: Thu, 28 May 2020 20:13:42 -0700 Subject: [PATCH 32/45] created videos fixtures --- test/fixtures/videos.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 test/fixtures/videos.yml diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..05dd0da11 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,20 @@ +video1: + title: Video1 + overview: Lorem blah blah blah balh. + release_date: '2002-05-18' + total_inventory: 10 + available_inventory: 5 + +video2: + title: Video2 + overview: Stuff and things and huh huh. + release_date: '2017-23-11' + total_inventory: 1 + available_inventory: 1 + +video3: + title: Video3 + overview: Yeah these are words. + release_date: '1999-12-31' + total_inventory: 1 + available_inventory: 1 \ No newline at end of file From 07fe9b834f2a70f33c01515006af1cf6a7478a1d Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Thu, 28 May 2020 20:56:39 -0700 Subject: [PATCH 33/45] Debugging Rental.save --- app/controllers/rentals_controller.rb | 22 ++++++------- test/controllers/rentals_controller_test.rb | 35 ++++++++++++--------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 939602147..b5781396c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,21 +6,15 @@ def checkout if video != nil && customer != nil - @rental = Rental.new( + rental = Rental.new( customer_id: customer.id, videos_id: video.id ) - @rental.checkout_date = Date.today - @rental.due_date = Date.today + 7 - - p video - p customer - p @rental - - if @rental.save + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 + if rental.save customer.take_movie_home video.send_movie_out - p @rental rental_data = { customer_id: rental.customer_id, videos_id: rental.videos_id, @@ -32,6 +26,10 @@ def checkout render json: rental_data.as_json, status: :ok return else + print "debug ---------> " + p rental + print "debug ---------> " + p rental.errors render json: { errors: ["Not Found"]}, status: :not_found @@ -84,13 +82,15 @@ def checkin rental.customer.update_checkout(-1) rental.video.update_inventory(+1) - render json: { + rental_data = { customer_id: rental.customer_id, videos_id: rental.videos_id, videos_checked_out_count: rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory } + render json: rental_data.as_json, status: :ok + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e0bbbfd31..c992f2f60 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -95,33 +95,40 @@ end - describe "checkin" do ### underconstrucion - it "checks in a valid rental" do + describe "checkin" do + it "checkin a valid rental" do # Arrange - + post checkout_path, params: rental_data + new_rental = Rental.last # Act - expect { - post checkin_path, params: checkin_data - }.must_differ "Video.count", 1 - - check_response(expected_type: Hash, expected_status: :created) + post checkin_path, params: rental_data # Assert - + check_response(expected_type: Hash, expected_status: :ok) end - it "rejects an invalid rental" do + it "rejects an invalid rental - bad customer" do # Arrange - + rental_data[:customer_id] = -1 # Act - - + post checkin_path, params: rental_data + # Assert - + check_response(expected_type: Hash, expected_status: :not_found) end + it "rejects an invalid rental - bad video" do + # Arrange + rental_data[:videos_id] = -1 + + # Act + post checkin_path, params: rental_data + + # Assert + check_response(expected_type: Hash, expected_status: :not_found) + end end From 3e1d1de5f11e937d7ec464e5478185b2b71a9b60 Mon Sep 17 00:00:00 2001 From: thenora Date: Thu, 28 May 2020 21:32:39 -0700 Subject: [PATCH 34/45] changing rental column and index name --- db/migrate/20200529042534_change_rentals.rb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 db/migrate/20200529042534_change_rentals.rb diff --git a/db/migrate/20200529042534_change_rentals.rb b/db/migrate/20200529042534_change_rentals.rb new file mode 100644 index 000000000..cbe3e753a --- /dev/null +++ b/db/migrate/20200529042534_change_rentals.rb @@ -0,0 +1,9 @@ +class ChangeRentals < ActiveRecord::Migration[6.0] + def change + rename_index :rentals, 'videos_id', 'video_id' + + change_table :rentals do |t| + t.rename :videos, :video # t.string -> t.rename + end + end +end From 24dd7a11fed7e5ea2674b9df620e3a4bf1b1e464 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Thu, 28 May 2020 21:59:22 -0700 Subject: [PATCH 35/45] Migration to fix the relationship between rentals and videos --- app/controllers/rentals_controller.rb | 12 ++++++------ db/migrate/20200527053339_add_rental_id_to_videos.rb | 2 +- db/migrate/20200529045316_fix_rental_id_in_videos.rb | 6 ++++++ db/schema.rb | 8 ++++---- test/controllers/rentals_controller_test.rb | 4 ++-- 5 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20200529045316_fix_rental_id_in_videos.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b5781396c..40fd56fc1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,14 +1,14 @@ class RentalsController < ApplicationController def checkout - video = Video.find_by(id: params[:videos_id]) + video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) if video != nil && customer != nil rental = Rental.new( customer_id: customer.id, - videos_id: video.id + video_id: video.id ) rental.checkout_date = Date.today rental.due_date = Date.today + 7 @@ -17,7 +17,7 @@ def checkout video.send_movie_out rental_data = { customer_id: rental.customer_id, - videos_id: rental.videos_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 @@ -44,7 +44,7 @@ def checkout end def checkin - video = Video.find_by(id: params[:videos_id]) + video = Video.find_by(id: params[:video_id]) if video.nil? render json: { @@ -62,7 +62,7 @@ def checkin return end - rental = Rental.find_by(customer_id: params[:customer_id], videos_id: params[:videos_id]) + rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) if rental.nil? render json: { @@ -84,7 +84,7 @@ def checkin rental_data = { customer_id: rental.customer_id, - videos_id: rental.videos_id, + video_id: rental.video_id, videos_checked_out_count: rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory } diff --git a/db/migrate/20200527053339_add_rental_id_to_videos.rb b/db/migrate/20200527053339_add_rental_id_to_videos.rb index 631ffcdf6..e3ada14a4 100644 --- a/db/migrate/20200527053339_add_rental_id_to_videos.rb +++ b/db/migrate/20200527053339_add_rental_id_to_videos.rb @@ -1,5 +1,5 @@ class AddRentalIdToVideos < ActiveRecord::Migration[6.0] def change - add_reference :rentals, :videos, foreign_key: true + add_reference :rentals, :video, foreign_key: true end end diff --git a/db/migrate/20200529045316_fix_rental_id_in_videos.rb b/db/migrate/20200529045316_fix_rental_id_in_videos.rb new file mode 100644 index 000000000..7645a035b --- /dev/null +++ b/db/migrate/20200529045316_fix_rental_id_in_videos.rb @@ -0,0 +1,6 @@ +class FixRentalIdInVideos < ActiveRecord::Migration[6.0] + def change + remove_reference :rentals, :videos, foreign_key: true + add_reference :rentals, :video, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index ffbcb805c..f0a1f2dd5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_064101) do +ActiveRecord::Schema.define(version: 2020_05_29_045316) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,9 +35,9 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "customer_id" - t.bigint "videos_id" + t.bigint "video_id" t.index ["customer_id"], name: "index_rentals_on_customer_id" - t.index ["videos_id"], name: "index_rentals_on_videos_id" + t.index ["video_id"], name: "index_rentals_on_video_id" end create_table "videos", force: :cascade do |t| @@ -51,5 +51,5 @@ end add_foreign_key "rentals", "customers" - add_foreign_key "rentals", "videos", column: "videos_id" + add_foreign_key "rentals", "videos" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c992f2f60..a0f5feeb0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -16,7 +16,7 @@ let(:rental_data) { { customer_id: customer1.id, - videos_id: new_video.id + video_id: new_video.id } } @@ -121,7 +121,7 @@ it "rejects an invalid rental - bad video" do # Arrange - rental_data[:videos_id] = -1 + rental_data[:video_id] = -1 # Act post checkin_path, params: rental_data From 28dfc82e5a946ec3a444618803172250dc71f2d1 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Thu, 28 May 2020 22:36:30 -0700 Subject: [PATCH 36/45] Fixed wave 2 tests, checkout and checkin --- app/controllers/rentals_controller.rb | 8 ++----- app/models/customer.rb | 2 +- app/models/video.rb | 2 +- .../20200527053339_add_rental_id_to_videos.rb | 2 +- db/migrate/20200529042534_change_rentals.rb | 9 -------- test/controllers/rentals_controller_test.rb | 23 ++++++++----------- 6 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 db/migrate/20200529042534_change_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 40fd56fc1..fd40b918a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,13 +23,9 @@ def checkout videos_checked_out_count: customer.videos_checked_out_count } - render json: rental_data.as_json, status: :ok + render json: rental_data.as_json, status: :created return else - print "debug ---------> " - p rental - print "debug ---------> " - p rental.errors render json: { errors: ["Not Found"]}, status: :not_found @@ -80,7 +76,7 @@ def checkin rental.checkin(Date.today) rental.customer.update_checkout(-1) - rental.video.update_inventory(+1) + rental.video.update_inventory(1) rental_data = { customer_id: rental.customer_id, diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b1a25925..321b3d03a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,7 +9,7 @@ def take_movie_home end def update_checkout(count) - videos_checked_out_count += count + self.videos_checked_out_count += count self.save end diff --git a/app/models/video.rb b/app/models/video.rb index 5094f7465..eb10bc997 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -14,7 +14,7 @@ def send_movie_out end def update_inventory(count) - available_inventory += count + self.available_inventory += count self.save end diff --git a/db/migrate/20200527053339_add_rental_id_to_videos.rb b/db/migrate/20200527053339_add_rental_id_to_videos.rb index e3ada14a4..631ffcdf6 100644 --- a/db/migrate/20200527053339_add_rental_id_to_videos.rb +++ b/db/migrate/20200527053339_add_rental_id_to_videos.rb @@ -1,5 +1,5 @@ class AddRentalIdToVideos < ActiveRecord::Migration[6.0] def change - add_reference :rentals, :video, foreign_key: true + add_reference :rentals, :videos, foreign_key: true end end diff --git a/db/migrate/20200529042534_change_rentals.rb b/db/migrate/20200529042534_change_rentals.rb deleted file mode 100644 index cbe3e753a..000000000 --- a/db/migrate/20200529042534_change_rentals.rb +++ /dev/null @@ -1,9 +0,0 @@ -class ChangeRentals < ActiveRecord::Migration[6.0] - def change - rename_index :rentals, 'videos_id', 'video_id' - - change_table :rentals do |t| - t.rename :videos, :video # t.string -> t.rename - end - end -end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a0f5feeb0..21c1659aa 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -21,11 +21,6 @@ } describe "checkout" do - # before do - # rental_data = { - # customer_id: customer1.id, video_id: new_video.id - # } - # end it "creates a rental" do expect { @@ -35,7 +30,7 @@ check_response(expected_type: Hash, expected_status: :created) end - it "gives a bad request response for invalid customer id" do + it "fails if given an invalid customer id" do # Arrange - using let from above rental_data[:customer_id] = nil @@ -46,11 +41,10 @@ # Assert }.wont_change "Video.count" - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body["errors"].keys).must_include "customer_id" + body = check_response(expected_type: Hash, expected_status: :not_found) end - it "gives a bad request response for invalid video id" do + it "fails if given an invalid video id" do # Arrange - using let from above rental_data[:video_id] = nil @@ -61,8 +55,7 @@ # Assert }.wont_change "Video.count" - body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body["errors"].keys).must_include "video_id" + body = check_response(expected_type: Hash, expected_status: :not_found) end it "has a checkout date" do @@ -75,6 +68,7 @@ expect(customer1.videos_checked_out_count).must_equal 0 post checkout_path, params: rental_data + customer1.reload expect(customer1.videos_checked_out_count).must_equal 1 end @@ -82,8 +76,11 @@ it "decreases the video's available inventory by one" do expect(new_video.available_inventory).must_equal 5 - expect{post checkout_path, params: rental_data}.must_differ "new_video.available_inventory", -1 - + expect{ + post checkout_path, params: rental_data + new_video.reload + }.must_differ "new_video.available_inventory", -1 + expect(new_video.available_inventory).must_equal 4 end From a52db7e844e4140f84b4e2d6acd151f37e1a11cf Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Thu, 28 May 2020 22:49:09 -0700 Subject: [PATCH 37/45] Fixed errors identified via smoke tests --- app/controllers/rentals_controller.rb | 6 +++--- test/controllers/rentals_controller_test.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fd40b918a..729c891c2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,7 +23,7 @@ def checkout videos_checked_out_count: customer.videos_checked_out_count } - render json: rental_data.as_json, status: :created + render json: rental_data.as_json, status: :ok return else render json: { @@ -44,7 +44,7 @@ def checkin if video.nil? render json: { - errors: ["Video Not Found"]}, + errors: ["Not Found"]}, status: :not_found return end @@ -53,7 +53,7 @@ def checkin if customer.nil? render json: { - errors: ["Customer Not Found"]}, + errors: ["Not Found"]}, status: :not_found return end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 21c1659aa..b07dbd753 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -27,7 +27,7 @@ post checkout_path, params: rental_data }.must_differ "Rental.count", 1 - check_response(expected_type: Hash, expected_status: :created) + check_response(expected_type: Hash, expected_status: :ok) end it "fails if given an invalid customer id" do From f9b3839f5db0fc6717c3ebd7b08273a44ed7548c Mon Sep 17 00:00:00 2001 From: thenora Date: Thu, 28 May 2020 22:50:34 -0700 Subject: [PATCH 38/45] tweaked for smoke tests --- app/controllers/rentals_controller.rb | 6 +++--- db/migrate/20200529045316_fix_rental_id_in_videos.rb | 1 - db/schema.rb | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fd40b918a..d01fa9996 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -44,7 +44,7 @@ def checkin if video.nil? render json: { - errors: ["Video Not Found"]}, + errors: ["Not Found"]}, status: :not_found return end @@ -53,7 +53,7 @@ def checkin if customer.nil? render json: { - errors: ["Customer Not Found"]}, + errors: ["Not Found"]}, status: :not_found return end @@ -62,7 +62,7 @@ def checkin if rental.nil? render json: { - errors: ["Rental Not Found"]}, + errors: ["Not Found"]}, status: :not_found return end diff --git a/db/migrate/20200529045316_fix_rental_id_in_videos.rb b/db/migrate/20200529045316_fix_rental_id_in_videos.rb index 7645a035b..2efd51dd4 100644 --- a/db/migrate/20200529045316_fix_rental_id_in_videos.rb +++ b/db/migrate/20200529045316_fix_rental_id_in_videos.rb @@ -1,6 +1,5 @@ class FixRentalIdInVideos < ActiveRecord::Migration[6.0] def change - remove_reference :rentals, :videos, foreign_key: true add_reference :rentals, :video, foreign_key: true end end diff --git a/db/schema.rb b/db/schema.rb index f0a1f2dd5..d050448cb 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_29_045316) do +ActiveRecord::Schema.define(version: 2020_05_29_045637) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 24b72b56f7d6f7c03db15256f73ad9ea7607de61 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Fri, 29 May 2020 07:29:15 -0700 Subject: [PATCH 39/45] Removed extra methods from customer and video models --- app/controllers/rentals_controller.rb | 4 ++-- app/models/customer.rb | 5 ----- app/models/video.rb | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 729c891c2..82195e45c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,8 +13,8 @@ def checkout rental.checkout_date = Date.today rental.due_date = Date.today + 7 if rental.save - customer.take_movie_home - video.send_movie_out + customer.update_checkout(1) + video.update_inventory(-1) rental_data = { customer_id: rental.customer_id, video_id: rental.video_id, diff --git a/app/models/customer.rb b/app/models/customer.rb index 321b3d03a..1fd8319ce 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,15 +3,10 @@ class Customer < ApplicationRecord has_many :videos, through: :rentals # TODO Do we need to test models? - def take_movie_home - self.videos_checked_out_count += 1 - self.save - end def update_checkout(count) self.videos_checked_out_count += count self.save end - end diff --git a/app/models/video.rb b/app/models/video.rb index eb10bc997..8cd857377 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -8,11 +8,6 @@ class Video < ApplicationRecord validates :total_inventory, presence: true validates :available_inventory, presence: true - def send_movie_out - self.available_inventory -= 1 - self.save - end - def update_inventory(count) self.available_inventory += count self.save From 62ea707e1703c4b765cd51549a57d20211df28bd Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Fri, 29 May 2020 07:38:49 -0700 Subject: [PATCH 40/45] Moved business logic to rental model --- app/controllers/rentals_controller.rb | 6 ++---- app/models/customer.rb | 1 - app/models/rental.rb | 7 ++++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 82195e45c..bdc106d38 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -10,8 +10,7 @@ def checkout customer_id: customer.id, video_id: video.id ) - rental.checkout_date = Date.today - rental.due_date = Date.today + 7 + rental.checkout_update(Date.today) if rental.save customer.update_checkout(1) video.update_inventory(-1) @@ -74,7 +73,7 @@ def checkin return end - rental.checkin(Date.today) + rental.checkin_update(Date.today) rental.customer.update_checkout(-1) rental.video.update_inventory(1) @@ -86,7 +85,6 @@ def checkin } render json: rental_data.as_json, status: :ok - end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 1fd8319ce..1c29b8be2 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,5 +8,4 @@ def update_checkout(count) self.videos_checked_out_count += count self.save end - end diff --git a/app/models/rental.rb b/app/models/rental.rb index d85df756e..b963abcad 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,11 +2,16 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + def checkout_update(date) + self.checkout_date = date + self.due_date = date + 7 + end + def checkedin? return checkin_date.nil? end - def checkin(date) + def checkin_update(date) checkin_date = date self.save end From e5f380486111da1e279eb92f679bd0751da2b665 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Fri, 29 May 2020 09:09:33 -0700 Subject: [PATCH 41/45] Removing comments, fixing indentations and spacing --- app/controllers/rentals_controller.rb | 1 - app/controllers/videos_controller.rb | 3 +-- app/models/customer.rb | 2 -- app/models/video.rb | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index bdc106d38..b60f5634d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,7 +5,6 @@ def checkout customer = Customer.find_by(id: params[:customer_id]) if video != nil && customer != nil - rental = Rental.new( customer_id: customer.id, video_id: video.id diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 0a88e0eea..960ce6adb 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -52,5 +52,4 @@ def video_params :available_inventory ) end -end - +end \ No newline at end of file diff --git a/app/models/customer.rb b/app/models/customer.rb index 1c29b8be2..dbb952b68 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,8 +2,6 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals - # TODO Do we need to test models? - def update_checkout(count) self.videos_checked_out_count += count self.save diff --git a/app/models/video.rb b/app/models/video.rb index 8cd857377..e5062eae4 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -12,5 +12,4 @@ def update_inventory(count) self.available_inventory += count self.save end - end From 5998d16510dd8ae6405e1caff8ec763a2e7c3fe5 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Fri, 29 May 2020 12:06:02 -0700 Subject: [PATCH 42/45] Controller tests checked --- test/controllers/rentals_controller_test.rb | 1 + test/controllers/videos_controller_test.rb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b07dbd753..79227ab2b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -93,6 +93,7 @@ end describe "checkin" do + it "checkin a valid rental" do # Arrange post checkout_path, params: rental_data diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index f33cfd1dc..11edcfb5b 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -9,6 +9,7 @@ "title", "overview", "release_date", "total_inventory", "available_inventory"].sort describe "index" do + it "must get index" do get videos_path check_response(expected_type: Array) @@ -37,9 +38,11 @@ body = check_response(expected_type: Array) expect(body).must_equal [] end + end describe "show" do + let(:new_video) { Video.create( title: "Star Wars", @@ -60,9 +63,11 @@ get video_path(-1) video = check_response(expected_type: Hash, expected_status: :not_found) end + end describe "create" do + let(:video_data) { { title: "Star Wars", @@ -72,6 +77,7 @@ available_inventory: 5 } } + it "can create a new video" do expect { post videos_path, params: video_data @@ -94,6 +100,7 @@ body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"].keys).must_include "title" end + end end From 057713f2528b5465df3a88b46e3a4e74293d6ada Mon Sep 17 00:00:00 2001 From: thenora Date: Fri, 29 May 2020 13:31:22 -0700 Subject: [PATCH 43/45] rentals validations & tests --- app/models/rental.rb | 2 ++ test/models/rental_test.rb | 67 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index b963abcad..add05087e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,8 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + validates :customer_id, :video_id, :due_date, :checkout_date, presence: true + def checkout_update(date) self.checkout_date = date self.due_date = date + 7 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..88d45a7f8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,68 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + +let(:rental1) { + Rental.create( + video_id: videos(:video1).id, + customer_id: customers(:customer1).id, + due_date: Date.today + 3, + checkout_date: Date.today - 3 + ) +} + + describe "validations" do + it 'is valid when all fields are present' do + # Act + result = rental1.valid? + + # Assert + expect(result).must_equal true + end + + it 'is invalid without a customer' do + # Arrange + rental1.customer_id = nil + + # Act + result = rental1.valid? + + # Assert + expect(result).must_equal false + end + + it 'is invalid without a video' do + # Arrange + rental1.video_id = nil + + # Act + result = rental1.valid? + + # Assert + expect(result).must_equal false + end + + it 'is invalid without a due date' do + # Arrange + rental1.due_date = nil + + # Act + result = rental1.valid? + + # Assert + expect(result).must_equal false + end + + it 'is invalid without a checkout date' do + # Arrange + rental1.checkout_date = nil + + # Act + result = rental1.valid? + + # Assert + expect(result).must_equal false + end + end end From ae7839605dcf951c00d59ba40dd64dbc1309d901 Mon Sep 17 00:00:00 2001 From: thenora Date: Fri, 29 May 2020 13:55:39 -0700 Subject: [PATCH 44/45] added video validation tests --- test/models/video_test.rb | 69 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..03810bc12 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,70 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:video1) { videos(:video1) } + + describe "validations" do + it "is valid when all fields are present" do + # Act + result = video1.valid? + + # Assert + expect(result).must_equal true + end + + it "is invalid without a title" do + # Arrange + video1.title = nil + + # Act + result = video1.valid? + + # Assert + expect(result).must_equal false + end + + it "is invalid without a overview" do + # Arrange + video1.overview = nil + + # Act + result = video1.valid? + + # Assert + expect(result).must_equal false + end + + it "is invalid without a release date" do + # Arrange + video1.release_date = nil + + # Act + result = video1.valid? + + # Assert + expect(result).must_equal false + end + + it "is invalid without a total inventory" do + # Arrange + video1.total_inventory = nil + + # Act + result = video1.valid? + + # Assert + expect(result).must_equal false + end + + it "is invalid without a available inventory" do + # Arrange + video1.available_inventory = nil + + # Act + result = video1.valid? + + # Assert + expect(result).must_equal false + end + end end From ea0daba613762e0795a036519a84954838127e83 Mon Sep 17 00:00:00 2001 From: SuelyBarreto Date: Fri, 29 May 2020 14:01:43 -0700 Subject: [PATCH 45/45] Changed migration --- db/migrate/20200527053339_add_rental_id_to_videos.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200527053339_add_rental_id_to_videos.rb b/db/migrate/20200527053339_add_rental_id_to_videos.rb index 631ffcdf6..e3ada14a4 100644 --- a/db/migrate/20200527053339_add_rental_id_to_videos.rb +++ b/db/migrate/20200527053339_add_rental_id_to_videos.rb @@ -1,5 +1,5 @@ class AddRentalIdToVideos < ActiveRecord::Migration[6.0] def change - add_reference :rentals, :videos, foreign_key: true + add_reference :rentals, :video, foreign_key: true end end