From 6477b50bc7e715d8dd907e87885a411f9184b4d1 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 07:04:17 -0700 Subject: [PATCH 01/45] rails new --api --- .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 +++ db/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 60 files changed, 1124 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 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..41b7d4311 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..43301a817 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..ab9b0a179 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +YKzrlbUsCMBBV+lrRNDEirbqyVPUzM0ve/N8pAIWT7nZ0EIsUBi69BQ5izuzMltTqx019EVIKnr1qHJKj3DW/V0VU6jXybSJypwXf8HBMnvb47Y//Ac1JgfbuJetoN9xsN0KYwLto59ILislwxht55NyAvcjkJNtTOvEzBeSyCjx2qFLbdmEqNFMXqIT3oTkPyR+cs7k5LmpWYghA7YI3WXIy/hO9m1xOO2K4Wtx1xN4JABmRh1IAeLB9f5gSdxdu43FsB/1VSvR1n/gfp46YDlBTrGSWqeO77qs1FMamo+78q4gsU15Dc804o5ax/yTVd6nLvF66NU99VbO2SjF6ptJBBpCHN2pLnBk2S4v27mQoxtimT5GFpQuBiCdxvZBgLKWxxbh0uWMHDB4uY5UcwX1mnBz7rfnLsYl--SjR4NFzVofhCAV0Z--yHDZqPifDWKX0l5c8lPdSw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b10373ba6 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 8acf7aa656a0e9fec3a6c177876a28ae579e1d86 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 07:32:10 -0700 Subject: [PATCH 02/45] Added Video and Customer models, seeded the db --- app/models/customer.rb | 2 ++ app/models/video.rb | 2 ++ db/migrate/20200527140803_create_customers.rb | 14 +++++++++++ ...1643_add_registration_date_to_customers.rb | 5 ++++ ...d_videos_checked_out_count_to_customers.rb | 5 ++++ db/migrate/20200527142312_create_videos.rb | 13 ++++++++++ db/schema.rb | 25 ++++++++++++++++++- test/models/customer_test.rb | 7 ++++++ test/models/video_test.rb | 7 ++++++ 9 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200527140803_create_customers.rb create mode 100644 db/migrate/20200527141643_add_registration_date_to_customers.rb create mode 100644 db/migrate/20200527142029_add_videos_checked_out_count_to_customers.rb create mode 100644 db/migrate/20200527142312_create_videos.rb create mode 100644 test/models/customer_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/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/20200527140803_create_customers.rb b/db/migrate/20200527140803_create_customers.rb new file mode 100644 index 000000000..5f74d7bc5 --- /dev/null +++ b/db/migrate/20200527140803_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20200527141643_add_registration_date_to_customers.rb b/db/migrate/20200527141643_add_registration_date_to_customers.rb new file mode 100644 index 000000000..9e71b4714 --- /dev/null +++ b/db/migrate/20200527141643_add_registration_date_to_customers.rb @@ -0,0 +1,5 @@ +class AddRegistrationDateToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :registered_at, :timestamp + end +end diff --git a/db/migrate/20200527142029_add_videos_checked_out_count_to_customers.rb b/db/migrate/20200527142029_add_videos_checked_out_count_to_customers.rb new file mode 100644 index 000000000..7975b96ef --- /dev/null +++ b/db/migrate/20200527142029_add_videos_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCountToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/migrate/20200527142312_create_videos.rb b/db/migrate/20200527142312_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200527142312_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..d41bb4367 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,32 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2020_05_27_142312) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.datetime "registered_at" + t.integer "videos_checked_out_count" + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + end diff --git a/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/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 b7777dfff8058f166ed676df9d61d4ad31e073b0 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 07:43:33 -0700 Subject: [PATCH 03/45] Added routes for videos and customers --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index c06383a17..66598d30a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :videos, only [:index, :show, :create] + resources :vustomers, only [:index] end From 97830a483ef5457ee8810816352722d2d0f84f9c Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 07:47:40 -0700 Subject: [PATCH 04/45] Fixed a bug in routes.rb --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 66598d30a..0f6e6a707 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html - resources :videos, only [:index, :show, :create] - resources :vustomers, only [:index] + resources :videos, only: [:index, :show, :create] + resources :vustomers, only: [:index] end From 06e4509b58407ed9c5e60b145f473aac7ea5b02f Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 07:54:23 -0700 Subject: [PATCH 05/45] Generated VideosController and wrote the first test for index --- app/controllers/videos_controller.rb | 2 ++ test/controllers/videos_controller_test.rb | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..fcd6eefb2 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,2 @@ +class VideosController < ApplicationController +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..ae9fd5568 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,21 @@ +require "test_helper" + +describe VideosController do + INDEX_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "responds with JSON and success" do + get videos_path + check_response(expected_type: Array) + end + end +end From 2e521973efff0231b798989da90ccfdf6be03473 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 07:57:48 -0700 Subject: [PATCH 06/45] Wrote VideosController#index --- app/controllers/videos_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fcd6eefb2..7c55c1dd3 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,2 +1,6 @@ class VideosController < ApplicationController + def index + videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory]) + render json: videos, status: :ok + end end From c42ddbcca7a302c6d26753459be05831ff145dfa Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:04:22 -0700 Subject: [PATCH 07/45] Added fixtures for videos --- test/fixtures/videos.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/fixtures/videos.yml diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..4d78309db --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,18 @@ +frozen: + title: Frozen + overview: When their kingdom becomes trapped in perpetual winter, fearless Anna (Kristen Bell) joins forces with mountaineer Kristoff (Jonathan Groff) and his reindeer sidekick to find Anna's sister, Snow Queen Elsa (Idina Menzel), and break her icy spell. + release_date: 2017-11-27 + total_inventory: 10 + available_inventory: 5 +moana: + title: Moana + overview: An adventurous teenager sails out on a daring mission to save her people. During her journey, Moana meets the once-mighty demigod Maui, who guides her in her quest to become a master way-finder. Together they sail across the open ocean... + release_date: 2016-11-23 + total_inventory: 8 + available_inventory: 4 +maleficent: + title: Maleficent + overview: As a beautiful young woman of pure heart, Maleficent (Angelina Jolie) has an idyllic life in a forest kingdom. When an invading army threatens the land, Maleficent rises up to become its fiercest protector. + release_date: 2014-05-30 + total_invenory: 2 + available_inventory: 0 \ No newline at end of file From 53564121588a09c3cace2cbe9cde387f5a5b2c34 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:06:13 -0700 Subject: [PATCH 08/45] Fixed a typo in video fixtures --- test/fixtures/videos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 4d78309db..37ed27d40 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -14,5 +14,5 @@ maleficent: title: Maleficent overview: As a beautiful young woman of pure heart, Maleficent (Angelina Jolie) has an idyllic life in a forest kingdom. When an invading army threatens the land, Maleficent rises up to become its fiercest protector. release_date: 2014-05-30 - total_invenory: 2 + total_inventory: 2 available_inventory: 0 \ No newline at end of file From ca14804fac8f68a09305561181b3a536a0472113 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:10:47 -0700 Subject: [PATCH 09/45] Added more tests for VideosController#index --- test/controllers/videos_controller_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index ae9fd5568..8576f72bc 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -17,5 +17,21 @@ def check_response(expected_type:, expected_status: :success) get videos_path check_response(expected_type: Array) end + + it "responds with an array of videos hashes" do + get videos_path + body = check_response(expected_type: Array) + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal INDEX_VIDEO_FIELDS + end + end + + it "will respond with an empty array when there are no videos" do + Video.destroy_all + get videos_path + body = check_response(expected_type: Array) + expect(body).must_equal [] + end end end From 8c19eee47eea0b6f54a047988b08f7f813ddc11a Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:18:52 -0700 Subject: [PATCH 10/45] Added fixtures for customers --- 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..6488f7f51 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +nataliya: + name: Nataliya + registered_at: Wed, 29 Apr 2015 14:54:14 UTC +00:00 + address: 1313 111th Dr SE + city: Monroe + state: WA + postal_code: 98989 + phone: 425-425-25-25 + videos_checked_out_count: 6 +cody: + name: Cody + registered_at: Wed, 29 Apr 2015 16:54:14 UTC +00:00 + city: Monroe + state: WA + postal_code: 98989 + phone: 260-260-60-60 + videos_checked_out_count: 0 From 181d134b3ef6d66e8aee33473cebca839efabd0e Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:20:22 -0700 Subject: [PATCH 11/45] Generated CustomersController --- app/controllers/customers_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 0f30652571c85cbf9987159e4682c114976ddab1 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:27:31 -0700 Subject: [PATCH 12/45] Fixed typo in routes.rb --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 0f6e6a707..3a46a86af 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :videos, only: [:index, :show, :create] - resources :vustomers, only: [:index] + resources :customers, only: [:index] end From 82bad3e3f274de494f237a7a631f83d45550edcb Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:28:59 -0700 Subject: [PATCH 13/45] Added CustomersController#index and tests for it --- app/controllers/customers_controller.rb | 6 ++++ test/controllers/customers_controller_test.rb | 36 +++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..330b6fa8a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,8 @@ class CustomersController < ApplicationController + def index + customers = Customer.all.as_json( + only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] + ) + render json: customers, status: :ok + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..7dc5a4f4a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + INDEX_CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal-code", "phone", "customers_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 "responds with JSON and success" do + get customers_path + check_response(expected_type: Array) + end + + it "responds with an array of customers hashes" do + get customers_path + body = check_response(expected_type: Array) + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal INDEX_CUSTOMER_FIELDS + end + end + + it "will respond with an empty array when there are no customers" do + Customer.destroy_all + get customers_path + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end end From f36b7c9807b609f5eb3e5abda94e8e91e224a1b8 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 08:32:17 -0700 Subject: [PATCH 14/45] Fixed typo in customers_controller_test.rb --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7dc5a4f4a..eecf3cc54 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - INDEX_CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal-code", "phone", "customers_checked_out_count"].sort + INDEX_CUSTOMER_FIELDS = ["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 From 443b23148845436f3a44f4a6783abd153a4cd626 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 09:18:03 -0700 Subject: [PATCH 15/45] Added VideosController#show --- app/controllers/videos_controller.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 7c55c1dd3..5e722e261 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,4 +3,18 @@ def index videos = Video.all.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 + render json: video.as_json( + only: [:title, :overview, :release_date, :total_inventory, :available_inventory] + ) + return + else + render json: { ok: false, errors: ["Not Found"] }, status: :not_found + return + end + end end From c44fc8c0daba2603525daf8fd9d83ebdbb533535 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 13:38:42 -0700 Subject: [PATCH 16/45] Added tests for VideosController#show --- app/controllers/videos_controller.rb | 2 +- test/controllers/videos_controller_test.rb | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 5e722e261..6c38fcdc9 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -13,7 +13,7 @@ def show ) return else - render json: { ok: false, errors: ["Not Found"] }, status: :not_found + render json: { ok: false, errors: ["Unable to find the video with id #{params[:id]}"] }, status: :not_found return end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 8576f72bc..08d487929 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,6 +2,7 @@ describe VideosController do INDEX_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + SHOW_VIDEO_FIELDS = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status @@ -34,4 +35,28 @@ def check_response(expected_type:, expected_status: :success) expect(body).must_equal [] end end + + describe "show" do + it "responds with JSON, success, and video data if the video exists" do + video = videos(:frozen) + get video_path(video.id) + + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal SHOW_VIDEO_FIELDS + expect(body["title"]).must_equal video.title + expect(body["overview"]).must_equal video.overview + expect(body["release_date"]).must_equal video.release_date.strftime("%Y-%m-%d") + expect(body["total_inventory"]).must_equal video.total_inventory + expect(body["available_inventory"]).must_equal video.available_inventory + end + + it "responds with JSON, not found, and errors if video doesn't exist" do + get video_path(-1) + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["ok"]).must_equal false + expect(body["errors"]).must_include "Unable to find the video with id -1" + end + + end end From d16c29757dbb898ba5d93f1dc1c7fede4415d71b Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 14:05:24 -0700 Subject: [PATCH 17/45] Added VideosController#create --- app/controllers/videos_controller.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 6c38fcdc9..5b90398a1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -17,4 +17,25 @@ def show return end end + + def create + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + errors: video.errors.messages + }, status: :bad_request + return + end + end + + private + + def video_params + params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + end end From a7d5c9188cedaf1a8e4691bb4405305e2cb6fcd4 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 14:11:03 -0700 Subject: [PATCH 18/45] Added tests for VideosController#show --- test/controllers/videos_controller_test.rb | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 08d487929..955bad056 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -57,6 +57,35 @@ def check_response(expected_type:, expected_status: :success) expect(body["ok"]).must_equal false expect(body["errors"]).must_include "Unable to find the video with id -1" end + end + + describe "create" do + let(:video_data) { + { + video: { + title: "Cinderella", + overview: "After her father unexpectedly dies, young Ella (Lily James) finds herself at the mercy of her cruel stepmother (Cate Blanchett) and stepsisters, who reduce her to scullery maid. Despite her circumstances, she refuses to despair.", + release_date: "2015-03-06", + total_inventory: 5, + 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 + video_data[:video][:title] = nil + expect {post videos_path, params: video_data}.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 28b13b4cd93132ae7b3d5c14533d748d2be293ce Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 14:15:12 -0700 Subject: [PATCH 19/45] Added title presence validation for Video model --- app/models/video.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..ad37f57ce 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,3 @@ class Video < ApplicationRecord + validates :title, presence: true end From 59c7caec57adc0434bc64d5f39294aa0cb52c16c Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 14:29:52 -0700 Subject: [PATCH 20/45] Added validation rules to Video model --- app/models/video.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index ad37f57ce..61523c6f8 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,3 +1,7 @@ class Video < ApplicationRecord validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true, numericality: { only_integer: true, greater_than: 0 } + validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than: -1 } end From b462fa729921a92563f9577d7f5373373b4311a7 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 15:01:22 -0700 Subject: [PATCH 21/45] Wrote validation tests for Video model --- test/models/video_test.rb | 79 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..74a0eb91e 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,80 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + let(:video_data) { + { + video: { + title: "Cinderella", + overview: "After her father unexpectedly dies, young Ella (Lily James) finds herself at the mercy of her cruel stepmother (Cate Blanchett) and stepsisters, who reduce her to scullery maid. Despite her circumstances, she refuses to despair.", + release_date: "2015-03-06", + total_inventory: 5, + available_inventory: 5 + } + } + } + + it "is valid when all fields are present" do + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal true + end + + it "is invalid without a title" do + video_data[:video][:title] = nil + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + end + + it "is invalid without an overview" do + video_data[:video][:overview] = nil + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + end + + it "is invalid without a release_date" do + video_data[:video][:release_date] = nil + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + end + + it "is invalid without a total_inventory" do + video_data[:video][:total_inventory] = nil + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + end + + it "is invalid without a available_inventory" do + video_data[:video][:available_inventory] = nil + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + end + + it "total_inventory should be an integer larger than 0" do + video_data[:video][:total_inventory] = "I don't know!" + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + + video_data[:video][:total_inventory] = 0 + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + + video_data[:video][:total_inventory] = 1 + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal true + end + + it "available_inventory should be an integer 0 or larger" do + video_data[:video][:available_inventory] = "I don't know!" + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + + video_data[:video][:available_inventory] = -9 + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal false + + video_data[:video][:available_inventory] = 0 + video = Video.new(video_data[:video]) + expect(video.valid?).must_equal true + end + end end From 17c732598bf7d11b587f209a28f0527d844abad0 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 15:12:30 -0700 Subject: [PATCH 22/45] Wrote validation rules for Customer model --- app/models/customer.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..7745f609b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,10 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + validates :videos_checked_out_count, presence: true, numericality: { only_integer: true, greater_than: -1 } end From 7a7fb40bcf41b9aa5c1b6e15d860f408bc37f8ca Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 17:27:11 -0700 Subject: [PATCH 23/45] Wrote validation tests for Customer model --- test/models/customer_test.rb | 86 ++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..a3da74ee1 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,87 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + let(:customer_data) { + { + customer: { + name: "Nataliya", + registered_at: "Wed, 29 Apr 2015 14:54:14 UTC +00:00", + address: "13133 111th Dr Se", + city: "Monroe", + state: "WA", + postal_code: "98989", + phone: "425 425 44 44", + videos_checked_out_count: 3 + } + } + } + + it "is valid when all fields are present" do + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal true + end + + it "is invalid without a name" do + customer_data[:customer][:name] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "is invalid without registered_at" do + customer_data[:customer][:registered_at] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "is invalid without an address" do + customer_data[:customer][:address] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "is invalid without a city" do + customer_data[:customer][:city] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "is invalid without a state" do + customer_data[:customer][:state] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "is invalid without a postal_code" do + customer_data[:customer][:postal_code] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "is invalid without a phone" do + customer_data[:customer][:phone] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "is invalid without videos_checked_out_count" do + customer_data[:customer][:videos_checked_out_count] = nil + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + end + + it "videos_checked_out_count should be integer 0 or larger" do + customer_data[:customer][:videos_checked_out_count] = "I don't know" + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + + customer_data[:customer][:videos_checked_out_count] = -1 + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal false + + customer_data[:customer][:videos_checked_out_count] = 0 + customer = Customer.new(customer_data[:customer]) + expect(customer.valid?).must_equal true + end + end end From 676ae16fb44d011fd84dc9bbc2d1078492382203 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 17:46:23 -0700 Subject: [PATCH 24/45] Changed VideosController#show and tests to pass smoke tests --- app/controllers/videos_controller.rb | 2 +- test/controllers/videos_controller_test.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 5b90398a1..68094b8c0 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -13,7 +13,7 @@ def show ) return else - render json: { ok: false, errors: ["Unable to find the video with id #{params[:id]}"] }, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found return end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 955bad056..1bb008007 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -54,8 +54,7 @@ def check_response(expected_type:, expected_status: :success) get video_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["ok"]).must_equal false - expect(body["errors"]).must_include "Unable to find the video with id -1" + expect(body["errors"]).must_include "Not Found" end end From cb000dd6e9e879e028901480bbf86db68ed8fe54 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 18:13:36 -0700 Subject: [PATCH 25/45] Fixed Video params structure to pass smoke tests --- app/controllers/videos_controller.rb | 2 +- test/controllers/videos_controller_test.rb | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 68094b8c0..1b31bfc00 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -36,6 +36,6 @@ def create private def video_params - params.require(:video).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/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 1bb008007..24f7deba5 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -61,13 +61,11 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:video_data) { { - video: { - title: "Cinderella", - overview: "After her father unexpectedly dies, young Ella (Lily James) finds herself at the mercy of her cruel stepmother (Cate Blanchett) and stepsisters, who reduce her to scullery maid. Despite her circumstances, she refuses to despair.", - release_date: "2015-03-06", - total_inventory: 5, - available_inventory: 5 - } + title: "Cinderella", + overview: "After her father unexpectedly dies, young Ella (Lily James) finds herself at the mercy of her cruel stepmother (Cate Blanchett) and stepsisters, who reduce her to scullery maid. Despite her circumstances, she refuses to despair.", + release_date: "2015-03-06", + total_inventory: 5, + available_inventory: 5 } } @@ -80,7 +78,7 @@ def check_response(expected_type:, expected_status: :success) end it "will respond with bad_request for invalid data" do - video_data[:video][:title] = nil + video_data[:title] = nil expect {post videos_path, params: video_data}.wont_change "Video.count" body = check_response(expected_type: Hash, expected_status: :bad_request) From e5dfe2f2a7b77f50a91dbfb3d15759dea1b55771 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 18:16:42 -0700 Subject: [PATCH 26/45] Updated VideosController#create action to pass smoke tests --- app/controllers/videos_controller.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 1b31bfc00..116df4ead 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -25,10 +25,7 @@ def create render json: video.as_json(only: [:id]), status: :created return else - render json: { - ok: false, - errors: video.errors.messages - }, status: :bad_request + render json: { errors: video.errors.messages }, status: :bad_request return end end From 0bcb047211ed832e43030398d76f0e3d8ede7dd1 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 18:36:42 -0700 Subject: [PATCH 27/45] Created Rental model and set up relation with Video and Customer --- app/models/customer.rb | 2 ++ app/models/rental.rb | 4 ++++ app/models/video.rb | 2 ++ db/migrate/20200528012608_create_rentals.rb | 9 +++++++++ ...0528012843_add_videos_and_customers_to_rentals.rb | 6 ++++++ db/schema.rb | 12 +++++++++++- test/models/rental_test.rb | 7 +++++++ 7 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200528012608_create_rentals.rb create mode 100644 db/migrate/20200528012843_add_videos_and_customers_to_rentals.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 7745f609b..5ae0b59eb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals, dependent: :destroy + validates :name, presence: true validates :registered_at, presence: true validates :address, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..2420bf8cc --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :video + belongs_to :customer +end diff --git a/app/models/video.rb b/app/models/video.rb index 61523c6f8..85554183c 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,6 @@ class Video < ApplicationRecord + has_many :rentals, dependent: :destroy + validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true diff --git a/db/migrate/20200528012608_create_rentals.rb b/db/migrate/20200528012608_create_rentals.rb new file mode 100644 index 000000000..98aa3c29c --- /dev/null +++ b/db/migrate/20200528012608_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20200528012843_add_videos_and_customers_to_rentals.rb b/db/migrate/20200528012843_add_videos_and_customers_to_rentals.rb new file mode 100644 index 000000000..0a350fcda --- /dev/null +++ b/db/migrate/20200528012843_add_videos_and_customers_to_rentals.rb @@ -0,0 +1,6 @@ +class AddVideosAndCustomersToRentals < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :video, index: true + add_reference :rentals, :customer, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index d41bb4367..49cb3b0c3 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_142312) do +ActiveRecord::Schema.define(version: 2020_05_28_012843) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,6 +28,16 @@ t.integer "videos_checked_out_count" end + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "video_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" + end + create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 34a2268a17f358d56dcbfb3e698e430b7fca8466 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 18:45:09 -0700 Subject: [PATCH 28/45] Added active attribute to Rental model --- db/migrate/20200528014235_add_active_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200528014235_add_active_to_rentals.rb diff --git a/db/migrate/20200528014235_add_active_to_rentals.rb b/db/migrate/20200528014235_add_active_to_rentals.rb new file mode 100644 index 000000000..bb79587f5 --- /dev/null +++ b/db/migrate/20200528014235_add_active_to_rentals.rb @@ -0,0 +1,5 @@ +class AddActiveToRentals < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :active, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 49cb3b0c3..af4a996ec 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_28_012843) do +ActiveRecord::Schema.define(version: 2020_05_28_014235) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "video_id" t.bigint "customer_id" + t.boolean "active" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["video_id"], name: "index_rentals_on_video_id" end From 81704948a0a2438b95a09691a54ae57d68ce966b Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 19:09:45 -0700 Subject: [PATCH 29/45] Set default value for Rental.active to true in the model --- app/models/rental.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 2420bf8cc..2cf49d9b9 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,10 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer + + before_save :default_values + def default_values + self.active = true if self.active.nil? + #self.due_date ||= self.created_at + 7.day # but created_at is nil! :( + end end From ec67590efcfe539f245462fa36a69df01f9e5880 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 19:11:38 -0700 Subject: [PATCH 30/45] Added validation rules to Rental model --- app/models/rental.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 2cf49d9b9..90d824a77 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,11 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer + validates :work_id, presence: true + validates :customer_id, presence: true + validates :due_date, presence: true + validates :active, presence: true + before_save :default_values def default_values self.active = true if self.active.nil? From b2e8b575b8fea37977e1e1db94fcb01f1a1ce060 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 19:38:58 -0700 Subject: [PATCH 31/45] Added default due_date calc to Rental model --- app/models/rental.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 90d824a77..5778f483a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,14 +2,14 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer - validates :work_id, presence: true + validates :video_id, presence: true validates :customer_id, presence: true - validates :due_date, presence: true - validates :active, presence: true + # validates :due_date, presence: true + # validates :active, presence: true before_save :default_values def default_values self.active = true if self.active.nil? - #self.due_date ||= self.created_at + 7.day # but created_at is nil! :( + self.due_date = Date.today + 7.day if self.due_date.nil? end end From 00e70ed45e2f2360401918ef07de3fa072030330 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 20:03:28 -0700 Subject: [PATCH 32/45] Added validation tests for Rental model --- test/models/rental_test.rb | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..36c501ffa 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,29 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + let(:rental_data) { + { + video_id: videos(:frozen).id, + customer_id: customers(:nataliya).id + } + } + + it "is valid when video_id and customer_id are present" do + rental = Rental.new(rental_data) + expect(rental.valid?).must_equal true + end + + it "is invalid without a video" do + rental_data[:video_id] = nil + rental = Rental.new(rental_data) + expect(rental.valid?).must_equal false + end + + it "is invalid without a customer" do + rental_data[:customer_id] = nil + rental = Rental.new(rental_data) + expect(rental.valid?).must_equal false + end + end end From f49f7113ad0326eedf9e2f0cbc39f2f916846532 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 20:10:41 -0700 Subject: [PATCH 33/45] Added tests for default_values of Rental model --- test/models/rental_test.rb | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 36c501ffa..5dd954f2c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,14 +1,14 @@ require "test_helper" describe Rental do - describe "validations" do - let(:rental_data) { - { - video_id: videos(:frozen).id, - customer_id: customers(:nataliya).id - } + let(:rental_data) { + { + video_id: videos(:frozen).id, + customer_id: customers(:nataliya).id } + } + describe "validations" do it "is valid when video_id and customer_id are present" do rental = Rental.new(rental_data) expect(rental.valid?).must_equal true @@ -26,4 +26,20 @@ expect(rental.valid?).must_equal false end end + + describe "default_values" do + it "sets default value for active to true" do + rental = Rental.new(rental_data) + rental.save + + expect(rental.active).must_equal true + end + + it "sets default due_date to 7 days from the current date" do + rental = Rental.new(rental_data) + rental.save + + expect (rental.due_date).must_equal Date.today + 7.day + end + end end From 302e3f83b3bfede1434fc56f608ce2722991c2c2 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 20:19:12 -0700 Subject: [PATCH 34/45] Added RentalsController --- app/controllers/rentals_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From ce72750e5542329d5a115b13c1551c6e89553bed Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Wed, 27 May 2020 20:23:40 -0700 Subject: [PATCH 35/45] Added routes for checking-out --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 3a46a86af..ca62951f9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,7 @@ # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :videos, only: [:index, :show, :create] resources :customers, only: [:index] + resources :rentals, only: [:create] + + post "/rentals/check-out", to: "rentals#create", as: "check-out" end From 611d987780cabce74780277e7269af1e42cb80dd Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 06:56:54 -0700 Subject: [PATCH 36/45] Added the core code for RentalsController#create --- app/controllers/rentals_controller.rb | 32 ++++++++++++++++++ test/controllers/rentals_controller_test.rb | 36 +++++++++++++++++++-- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..da7187e23 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,34 @@ class RentalsController < ApplicationController + def create + rental = Rental.new(rental_params) + + if rental.save + rental.customer.videos_checked_out_count += 1 + rental.customer.save + rental.video.available_inventory -= 1 + rental.video.save + + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + }, status: :ok + else + render json: { + ok: false, + errors: rental.errors.messages + }, status: :bad_request + end + end + + private + + def rental_params + return params.permit(:video_id, :customer_id) + end + + # def require_customer + # @customer = Customer.find_by() end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..356d754c0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + 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 "create" do + let(:rental_data) { + { + video_id: videos(:frozen).id, + customer_id: customers(:nataliya).id + } + } + + it "can create a rental" do + expect{post rentals_path, params: rental_data}.must_differ "Rental.count", 1 + check_response(expected_type: Hash) + end + + it "increase the customer's videos_checked_out_count by one" do + expect(customers(:nataliya).videos_checked_out_count).must_equal 6 + + post rentals_path, params: rental_data + expect(customers(:nataliya).videos_checked_out_count).must_equal 7 + end + + + + end + end end From 395d58c100f4b9dd3fbd0c96fa720eb5f629fa3d Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 07:37:32 -0700 Subject: [PATCH 37/45] Added edge cases handling to RentalsController#create and uniquness validation to Rental model --- app/controllers/rentals_controller.rb | 37 +++++++++++++++++++++++---- app/models/rental.rb | 2 +- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index da7187e23..195e29f9b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,6 +1,11 @@ class RentalsController < ApplicationController + before_action :require_inventory + # before_action :require_customer + # before_action :require_work + + def create - rental = Rental.new(rental_params) + rental = Rental.new(customer_id: params[:customer_id], video_id: @video.id) if rental.save rental.customer.videos_checked_out_count += 1 @@ -15,20 +20,42 @@ def create videos_checked_out_count: rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory }, status: :ok + else render json: { ok: false, errors: rental.errors.messages - }, status: :bad_request + }, status: :not_found end end private - def rental_params - return params.permit(:video_id, :customer_id) + def require_inventory + @video = Video.find_by(id: params[:video_id]) + if @video.available_inventory == 0 + render json: { errors: ["No available copies of the video available"] }, status: :bad_request + end end + # def require_customer - # @customer = Customer.find_by() + # customer = Customer.find_by(id: params[:video_id]) + # if customer.nil? + # render json: { errors: ["Customer Not Found"] }, status: :not_found + # end + # end + + # Covered by Rails: + # { + # "ok": false, + # "errors": { + # "customer": [ + # "must exist" + # ], + # "customer_id": [ + # "can't be blank" + # ] + # } + # } end diff --git a/app/models/rental.rb b/app/models/rental.rb index 5778f483a..96ce2f51a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,7 +2,7 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer - validates :video_id, presence: true + validates :video_id, presence: true, uniqueness: {scope: :customer_id} validates :customer_id, presence: true # validates :due_date, presence: true # validates :active, presence: true From c28c4d5e0f1e8f1b14c2304146637154fa3d2b36 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 08:06:35 -0700 Subject: [PATCH 38/45] Fixed bugs in RentalsController#create and wrote tests for it --- app/controllers/rentals_controller.rb | 21 +++++++----- test/controllers/rentals_controller_test.rb | 37 +++++++++++++++++++-- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 195e29f9b..3af9b5a65 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,16 @@ class RentalsController < ApplicationController - before_action :require_inventory + # before_action :require_inventory # before_action :require_customer # before_action :require_work def create - rental = Rental.new(customer_id: params[:customer_id], video_id: @video.id) + rental = Rental.new(customer_id: params[:customer_id], video_id: params[:video_id]) + + if Video.find_by(id: params[:video_id]) && rental.video.available_inventory == 0 + render json: { errors: ["No available copies of the video available"] }, status: :bad_request + return + end if rental.save rental.customer.videos_checked_out_count += 1 @@ -31,12 +36,12 @@ def create private - def require_inventory - @video = Video.find_by(id: params[:video_id]) - if @video.available_inventory == 0 - render json: { errors: ["No available copies of the video available"] }, status: :bad_request - end - end + # def require_inventory + # @video = Video.find_by(id: params[:video_id]) + # if @video.available_inventory == 0 + # render json: { errors: ["No available copies of the video available"] }, status: :bad_request + # end + # end # def require_customer diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 356d754c0..8e3829b50 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -7,6 +7,7 @@ def check_response(expected_type:, expected_status: :success) body = JSON.parse(response.body) expect(body).must_be_kind_of expected_type + pp body return body end @@ -26,12 +27,42 @@ def check_response(expected_type:, expected_status: :success) it "increase the customer's videos_checked_out_count by one" do expect(customers(:nataliya).videos_checked_out_count).must_equal 6 - post rentals_path, params: rental_data - expect(customers(:nataliya).videos_checked_out_count).must_equal 7 + # post rentals_path, params: rental_data + # expect(customers(:nataliya).videos_checked_out_count).must_equal 7 end + it "decrease the video's available_inventory by one" do + end - + it "will respond with 404: Not Found if the customer does not exist" do + rental_data[:customer_id] = -1 + expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"].keys).must_include "customer" + end + + it "will respond with 404: Not Found if the video does not exist" do + rental_data[:video_id] = -1 + expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"].keys).must_include "video" + end + + it "will respond with 400: Bad Request if the video does not have any available inventory before check out" do + rental_data = { + video_id: videos(:maleficent).id, + customer_id: customers(:nataliya).id + } + expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"]).must_equal ["No available copies of the video available"] + end + + it "will respond with 404: Not Found if the customer is already renting this video title" do + post rentals_path, params: rental_data + expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"].keys).must_include "video_id" end end end From cb8a2d0b6b36c580e59ab3fe625b85e5e6cbf703 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 13:12:41 -0700 Subject: [PATCH 39/45] Added routes for rentals to check in --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index ca62951f9..221cef0de 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,8 @@ # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :videos, only: [:index, :show, :create] resources :customers, only: [:index] - resources :rentals, only: [:create] + resources :rentals, only: [:create, :destroy] post "/rentals/check-out", to: "rentals#create", as: "check-out" + post "/rentals/check-in", to: "rentals#destroy", as: "check-in" end From 9f185cdc14dd0aa005d71f4edb3d2c6498177893 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 13:20:15 -0700 Subject: [PATCH 40/45] Wrote the scaffolding for tests --- test/controllers/rentals_controller_test.rb | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8e3829b50..64625ee81 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -24,6 +24,10 @@ def check_response(expected_type:, expected_status: :success) check_response(expected_type: Hash) end + it "will return JSON with the following keys: customer_id, video_id, due_date, videos_checked_out_count, available_inventory" do + + end + it "increase the customer's videos_checked_out_count by one" do expect(customers(:nataliya).videos_checked_out_count).must_equal 6 @@ -65,4 +69,27 @@ def check_response(expected_type:, expected_status: :success) expect(body["errors"].keys).must_include "video_id" end end + + describe "destroy" do + it "will destroy the instance of rental" do + + end + + it "will decrease the customer's videos_checked_out_count by one" do + end + + it "increase the video's available_inventory by one" do + + end + + it "will return JSON with the following keys: customer_id, video_id, videos_checked_out_count, available_inventory" do + + end + + it "it will return 404: Not Found if the customer does not exist" do + end + + it "404: Not Found if the video does not exist" do + end + end end From b81ecdc49fc0a7cc6be54b509c825856b4ffcd0e Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 13:43:41 -0700 Subject: [PATCH 41/45] Wrote the first test for RentalsController#check_in and the core code for the action --- app/controllers/rentals_controller.rb | 19 +++++++++++++++++++ config/routes.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 15 +++++++++++++-- test/fixtures/rentals.yml | 5 +++++ 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3af9b5a65..775f6fd00 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,6 +34,25 @@ def create end end + def check_in + rental = Rental.find_by(video_id: params[:video_id], customer_id: params[:customer_id]) + + if rental + rental.destroy + rental.customer.videos_checked_out_count -= 1 + rental.customer.save + rental.video.available_inventory += 1 + rental.video.save + + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + }, status: :ok + end + end + private # def require_inventory diff --git a/config/routes.rb b/config/routes.rb index 221cef0de..e0b93859e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,6 @@ resources :customers, only: [:index] resources :rentals, only: [:create, :destroy] - post "/rentals/check-out", to: "rentals#create", as: "check-out" - post "/rentals/check-in", to: "rentals#destroy", as: "check-in" + post "/rentals/check-out", to: "rentals#create", as: "check_out" + post "/rentals/check-in", to: "rentals#check_in", as: "check_in" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 64625ee81..e516e555a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,13 +1,14 @@ require "test_helper" describe RentalsController do + 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 - pp body + # pp body return body end @@ -70,8 +71,18 @@ def check_response(expected_type:, expected_status: :success) end end - describe "destroy" do + describe "check-in" do + let(:rental_data) { + { + video_id: videos(:moana).id, + customer_id: customers(:nataliya).id + } + } + it "will destroy the instance of rental" do + rental = Rental.find_by(video_id: rental_data[:video_id], customer_id: rental_data[:customer_id]) + expect{post check_in_path, params: rental_data}.must_differ "Rental.count", -1 + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..221285661 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,5 @@ +moana_rental: + video: moana + customer: nataliya + due_date: 2020-06-06 + active: true From 916841e60caebeff69befef0d89e8c3fe8a78285 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 16:37:52 -0700 Subject: [PATCH 42/45] Added more positive tests for RentalsController#check_in and fixed a few bugs in testing --- test/controllers/rentals_controller_test.rb | 141 ++++++++++++++++---- test/fixtures/rentals.yml | 5 - 2 files changed, 113 insertions(+), 33 deletions(-) delete mode 100644 test/fixtures/rentals.yml diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e516e555a..b64369d77 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -8,47 +8,88 @@ def check_response(expected_type:, expected_status: :success) body = JSON.parse(response.body) expect(body).must_be_kind_of expected_type - # pp body return body end describe "create" do - let(:rental_data) { - { - video_id: videos(:frozen).id, - customer_id: customers(:nataliya).id + before do + Customer.create( + name: "Evelynn", + registered_at: "Wed, 29 Apr 2015 14:54:14 UTC +00:00", + address: "13133 111th Dr Se", + city: "Monroe", + state: "WA", + postal_code: "98989", + phone: "425 425 44 44", + videos_checked_out_count: 0 + ) + + Video.create( + title: "Cinderella", + overview: "After her father unexpectedly dies, young Ella (Lily James) finds herself at the mercy of her cruel stepmother (Cate Blanchett) and stepsisters, who reduce her to scullery maid. Despite her circumstances, she refuses to despair.", + release_date: "2015-03-06", + total_inventory: 5, + available_inventory: 5 + ) + + @customer = Customer.find_by(name: "Evelynn") + @video = Video.find_by(title: "Cinderella") + + @rental_data = { + video_id: @video.id, + customer_id: @customer.id } - } + end it "can create a rental" do - expect{post rentals_path, params: rental_data}.must_differ "Rental.count", 1 + expect{post rentals_path, params: @rental_data}.must_differ "Rental.count", 1 check_response(expected_type: Hash) end it "will return JSON with the following keys: customer_id, video_id, due_date, videos_checked_out_count, available_inventory" do + json_fields = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort + + post rentals_path, params: @rental_data + body = check_response(expected_type: Hash) + rental = Rental.last + customer = Customer.find_by(name: "Evelynn") + video = Video.find_by(title: "Cinderella") + + + expect(body.keys.sort).must_equal json_fields + expect(body["customer_id"]).must_equal customer.id + expect(body["video_id"]).must_equal video.id + expect(body["videos_checked_out_count"]).must_equal customer.videos_checked_out_count + expect(body["available_inventory"]).must_equal video.available_inventory end it "increase the customer's videos_checked_out_count by one" do - expect(customers(:nataliya).videos_checked_out_count).must_equal 6 + expect(@customer.videos_checked_out_count).must_equal 0 - # post rentals_path, params: rental_data - # expect(customers(:nataliya).videos_checked_out_count).must_equal 7 + post rentals_path, params: @rental_data + customer = Customer.find_by(name: "Evelynn") + expect(customer.videos_checked_out_count).must_equal 1 end it "decrease the video's available_inventory by one" do + expect(@video.available_inventory).must_equal 5 + + post rentals_path, params: @rental_data + video = Video.find_by(title: "Cinderella") + expect(video.available_inventory).must_equal 4 end it "will respond with 404: Not Found if the customer does not exist" do - rental_data[:customer_id] = -1 - expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + @rental_data[:customer_id] = -1 + expect{post rentals_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"].keys).must_include "customer" end it "will respond with 404: Not Found if the video does not exist" do - rental_data[:video_id] = -1 - expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + @rental_data[:video_id] = -1 + expect{post rentals_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"].keys).must_include "video" end @@ -64,40 +105,84 @@ def check_response(expected_type:, expected_status: :success) end it "will respond with 404: Not Found if the customer is already renting this video title" do - post rentals_path, params: rental_data - expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + post rentals_path, params: @rental_data + expect{post rentals_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"].keys).must_include "video_id" end end describe "check-in" do - let(:rental_data) { - { - video_id: videos(:moana).id, - customer_id: customers(:nataliya).id + before do + Customer.create( + name: "Evelynn", + registered_at: "Wed, 29 Apr 2015 14:54:14 UTC +00:00", + address: "13133 111th Dr Se", + city: "Monroe", + state: "WA", + postal_code: "98989", + phone: "425 425 44 44", + videos_checked_out_count: 0 + ) + + Video.create( + title: "Cinderella", + overview: "After her father unexpectedly dies, young Ella (Lily James) finds herself at the mercy of her cruel stepmother (Cate Blanchett) and stepsisters, who reduce her to scullery maid. Despite her circumstances, she refuses to despair.", + release_date: "2015-03-06", + total_inventory: 5, + available_inventory: 5 + ) + + @customer = Customer.find_by(name: "Evelynn") + @video = Video.find_by(title: "Cinderella") + + @rental_data = { + video_id: @video.id, + customer_id: @customer.id } - } + + post check_out_path, params: @rental_data + end it "will destroy the instance of rental" do - rental = Rental.find_by(video_id: rental_data[:video_id], customer_id: rental_data[:customer_id]) - expect{post check_in_path, params: rental_data}.must_differ "Rental.count", -1 + expect{post check_in_path, params: @rental_data}.must_differ "Rental.count", -1 + check_response(expected_type: Hash) + end + + it "will return JSON with the following keys: customer_id, video_id, videos_checked_out_count, available_inventory" do + json_fields = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort + post check_in_path, params: @rental_data + body = check_response(expected_type: Hash) + customer = Customer.find_by(id: @rental_data[:customer_id]) + video = Video.find_by(id: @rental_data[:video_id]) + + expect(body.keys.sort).must_equal json_fields + expect(body["customer_id"]).must_equal customer.id + expect(body["video_id"]).must_equal video.id + expect(body["videos_checked_out_count"]).must_equal customer.videos_checked_out_count + expect(body["available_inventory"]).must_equal video.available_inventory end it "will decrease the customer's videos_checked_out_count by one" do + customer = Customer.find_by(id: @rental_data[:customer_id]) + expect(customer.videos_checked_out_count).must_equal 1 + post check_in_path, params: @rental_data + customer = Customer.find_by(id: @rental_data[:customer_id]) + expect(customer.videos_checked_out_count).must_equal 0 end it "increase the video's available_inventory by one" do - - end - - it "will return JSON with the following keys: customer_id, video_id, videos_checked_out_count, available_inventory" do - + video = Video.find_by(id: @rental_data[:video_id]) + expect(video.available_inventory).must_equal 4 + post check_in_path, params: @rental_data + video = Video.find_by(id: @rental_data[:video_id]) + expect(video.available_inventory).must_equal 5 end it "it will return 404: Not Found if the customer does not exist" do + end it "404: Not Found if the video does not exist" do diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml deleted file mode 100644 index 221285661..000000000 --- a/test/fixtures/rentals.yml +++ /dev/null @@ -1,5 +0,0 @@ -moana_rental: - video: moana - customer: nataliya - due_date: 2020-06-06 - active: true From 90b47433c86e947e080b27719ec66192039a6f3b Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 17:02:46 -0700 Subject: [PATCH 43/45] Wrote negative and edge case tests for RentalsController#check_in --- app/controllers/rentals_controller.rb | 30 ++++++++++++++------- test/controllers/rentals_controller_test.rb | 21 ++++++++++----- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 775f6fd00..14fd9b3ca 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,7 @@ class RentalsController < ApplicationController # before_action :require_inventory - # before_action :require_customer - # before_action :require_work + before_action :require_customer, only: [:check_in] + before_action :require_video, only: [:check_in] def create @@ -35,7 +35,7 @@ def create end def check_in - rental = Rental.find_by(video_id: params[:video_id], customer_id: params[:customer_id]) + rental = Rental.find_by(video_id: params[:video_id], customer_id: @customer.id) if rental rental.destroy @@ -50,6 +50,12 @@ def check_in videos_checked_out_count: rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory }, status: :ok + + else + render json: { + ok: false, + errors: rental.errors.messages + }, status: :not_found end end @@ -62,13 +68,19 @@ def check_in # end # end + def require_customer + @customer = Customer.find_by(id: params[:customer_id]) + if @customer.nil? + render json: { errors: ["Customer Not Found"] }, status: :not_found + end + end - # def require_customer - # customer = Customer.find_by(id: params[:video_id]) - # if customer.nil? - # render json: { errors: ["Customer Not Found"] }, status: :not_found - # end - # end + def require_video + @video = Video.find_by(id: params[:video_id]) + if @video.nil? + render json: { errors: ["Video Not Found"] }, status: :not_found + end + end # Covered by Rails: # { diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b64369d77..d9d046157 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -82,14 +82,14 @@ def check_response(expected_type:, expected_status: :success) it "will respond with 404: Not Found if the customer does not exist" do @rental_data[:customer_id] = -1 - expect{post rentals_path, params: @rental_data}.wont_change "Rental.count", 1 + expect{post check_out_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"].keys).must_include "customer" end it "will respond with 404: Not Found if the video does not exist" do @rental_data[:video_id] = -1 - expect{post rentals_path, params: @rental_data}.wont_change "Rental.count", 1 + expect{post check_out_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"].keys).must_include "video" end @@ -99,14 +99,14 @@ def check_response(expected_type:, expected_status: :success) video_id: videos(:maleficent).id, customer_id: customers(:nataliya).id } - expect{post rentals_path, params: rental_data}.wont_change "Rental.count", 1 + expect{post check_out_path, params: rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_equal ["No available copies of the video available"] end it "will respond with 404: Not Found if the customer is already renting this video title" do post rentals_path, params: @rental_data - expect{post rentals_path, params: @rental_data}.wont_change "Rental.count", 1 + expect{post check_out_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"].keys).must_include "video_id" end @@ -181,11 +181,18 @@ def check_response(expected_type:, expected_status: :success) expect(video.available_inventory).must_equal 5 end - it "it will return 404: Not Found if the customer does not exist" do - + it "will respond with 404: Not Found if the customer does not exist" do + @rental_data[:customer_id] = -1 + expect{post check_in_path, params: @rental_data}.wont_change "Rental.count" + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_equal ["Customer Not Found"] end - it "404: Not Found if the video does not exist" do + it "will respond with 404: Not Found if the video does not exist" do + @rental_data[:video_id] = -1 + expect{post check_in_path, params: @rental_data}.wont_change "Rental.count" + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_equal ["Video Not Found"] end end end From b9735f4d9b3aafcc196fef86440742a535df2e42 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Thu, 28 May 2020 17:25:33 -0700 Subject: [PATCH 44/45] Fixed code to pass smoke tests --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 14 ++++++-------- app/controllers/videos_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 8 ++++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 330b6fa8a..7a837cd60 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json( + customers = Customer.order(:name).as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] ) render json: customers, status: :ok diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 14fd9b3ca..146fc4603 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,11 @@ class RentalsController < ApplicationController # before_action :require_inventory - before_action :require_customer, only: [:check_in] - before_action :require_video, only: [:check_in] + before_action :require_customer + before_action :require_video def create - rental = Rental.new(customer_id: params[:customer_id], video_id: params[:video_id]) + rental = Rental.new(customer_id: @customer.id, video_id: @video.id) if Video.find_by(id: params[:video_id]) && rental.video.available_inventory == 0 render json: { errors: ["No available copies of the video available"] }, status: :bad_request @@ -28,7 +28,6 @@ def create else render json: { - ok: false, errors: rental.errors.messages }, status: :not_found end @@ -53,8 +52,7 @@ def check_in else render json: { - ok: false, - errors: rental.errors.messages + errors: ["No existing rental for this video and customer"] }, status: :not_found end end @@ -71,14 +69,14 @@ def check_in def require_customer @customer = Customer.find_by(id: params[:customer_id]) if @customer.nil? - render json: { errors: ["Customer Not Found"] }, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found end end def require_video @video = Video.find_by(id: params[:video_id]) if @video.nil? - render json: { errors: ["Video Not Found"] }, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 116df4ead..b027d853a 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,6 +1,6 @@ class VideosController < ApplicationController def index - videos = Video.all.as_json(only: [: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 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d9d046157..52d39666f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -84,14 +84,14 @@ def check_response(expected_type:, expected_status: :success) @rental_data[:customer_id] = -1 expect{post check_out_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"].keys).must_include "customer" + expect(body["errors"]).must_equal ["Not Found"] end it "will respond with 404: Not Found if the video does not exist" do @rental_data[:video_id] = -1 expect{post check_out_path, params: @rental_data}.wont_change "Rental.count", 1 body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"].keys).must_include "video" + expect(body["errors"]).must_equal ["Not Found"] end it "will respond with 400: Bad Request if the video does not have any available inventory before check out" do @@ -185,14 +185,14 @@ def check_response(expected_type:, expected_status: :success) @rental_data[:customer_id] = -1 expect{post check_in_path, params: @rental_data}.wont_change "Rental.count" body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"]).must_equal ["Customer Not Found"] + expect(body["errors"]).must_equal ["Not Found"] end it "will respond with 404: Not Found if the video does not exist" do @rental_data[:video_id] = -1 expect{post check_in_path, params: @rental_data}.wont_change "Rental.count" body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"]).must_equal ["Video Not Found"] + expect(body["errors"]).must_equal ["Not Found"] end end end From 9ea32ec4392e9437d7556c60d13d6308d4017694 Mon Sep 17 00:00:00 2001 From: Nataliya Pogodina Date: Fri, 29 May 2020 16:03:17 -0700 Subject: [PATCH 45/45] Cleaned up the code --- app/controllers/rentals_controller.rb | 24 +----------------------- app/models/rental.rb | 2 -- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 146fc4603..370b7d75c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,13 +1,11 @@ class RentalsController < ApplicationController - # before_action :require_inventory before_action :require_customer before_action :require_video - def create rental = Rental.new(customer_id: @customer.id, video_id: @video.id) - if Video.find_by(id: params[:video_id]) && rental.video.available_inventory == 0 + if rental.video.available_inventory == 0 render json: { errors: ["No available copies of the video available"] }, status: :bad_request return end @@ -59,13 +57,6 @@ def check_in private - # def require_inventory - # @video = Video.find_by(id: params[:video_id]) - # if @video.available_inventory == 0 - # render json: { errors: ["No available copies of the video available"] }, status: :bad_request - # end - # end - def require_customer @customer = Customer.find_by(id: params[:customer_id]) if @customer.nil? @@ -79,17 +70,4 @@ def require_video render json: { errors: ["Not Found"] }, status: :not_found end end - - # Covered by Rails: - # { - # "ok": false, - # "errors": { - # "customer": [ - # "must exist" - # ], - # "customer_id": [ - # "can't be blank" - # ] - # } - # } end diff --git a/app/models/rental.rb b/app/models/rental.rb index 96ce2f51a..00252947c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,8 +4,6 @@ class Rental < ApplicationRecord validates :video_id, presence: true, uniqueness: {scope: :customer_id} validates :customer_id, presence: true - # validates :due_date, presence: true - # validates :active, presence: true before_save :default_values def default_values