From 2f7d6a14cf23658f2e1d776419cd0be188d29407 Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 14:03:31 -0700 Subject: [PATCH 01/45] setting up --- .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 | 105 +++++++++ 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 node_modules/.yarn-integrity | 10 + public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 4 + 62 files changed, 1129 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 node_modules/.yarn-integrity create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..4395591b3 --- /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 + 1.17.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..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..524dfd3f2 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,105 @@ +#!/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 || ">= 0.a" + 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 ||= begin + env_var_version || cli_arg_version || + lockfile_version || "#{Gem::Requirement.default}.a" + end + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + # must dup string for RG < 1.8 compatibility + activate_bundler(bundler_version.dup) + end + + def activate_bundler(bundler_version) + if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0") + bundler_version = "< 2" + end + gem_error = activation_error_handling do + gem "bundler", bundler_version + 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_version).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`" + 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..566c3969a --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +d8OTsEiKPxL9rPh7r00vXIhu/7u1tWmdKmtrq1HSduN49hBj7qKCBSwDL1Bb9up/h2qqYsfIxoKYRtmR6wpvHglH8NpstYT3hOvJ6korZeb1w6HGicXGXIXtycYtJhCNtu6j1Mn3GyI8ray/XLFYadL8GaiJqnkt8xk5r6ymbWFan2gEaSaWpJunwHjnGAoARZd9xjENxjefbLOoFjhFROZCfvC+hblzaOlc463vV0hAPgDGTxVsYUt23GW4pCDs9IIx6i3bp+F1h2bv6xBAd2P1I9Sa0NOtDk0N/rvIsXCoW++fOHKwzF3LUPrkJ+CM9CuKRt178jawi0YrQvtb7FZsX35kldR6NRbuGXZHi3qO/++AGf/8gfaRscRfEl0UvG2Rb75RPCeUWMxDcP25nAqgchiMi7gJ66Bl--HY/vIDjZHkvN29ap--zAEqkMWNVu/wQ2/DBPAl8g== \ 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/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..0f19eb7ab --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-83", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..fb57ccd13 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From b3eb3bc3a7c85132a0f9d7bc2dc58281aa458d84 Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 14:25:17 -0700 Subject: [PATCH 02/45] video model and customer model --- app/models/customer.rb | 2 ++ app/models/video.rb | 2 ++ db/migrate/20200526212125_create_customers.rb | 15 ++++++++++++ db/migrate/20200526212320_create_videos.rb | 13 ++++++++++ db/schema.rb | 24 ++++++++++++++++++- test/models/customer_test.rb | 7 ++++++ test/models/video_test.rb | 7 ++++++ 7 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200526212125_create_customers.rb create mode 100644 db/migrate/20200526212320_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/20200526212125_create_customers.rb b/db/migrate/20200526212125_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200526212125_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20200526212320_create_videos.rb b/db/migrate/20200526212320_create_videos.rb new file mode 100644 index 000000000..282e7354c --- /dev/null +++ b/db/migrate/20200526212320_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..1b175692d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,31 @@ # # 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_26_212320) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + 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 ce7787dda3334c8246626d2314ca98fbc7f44416 Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 15:54:06 -0700 Subject: [PATCH 03/45] migrate and seed trying --- db/migrate/20200526215853_add_column_customer.rb | 5 +++++ db/schema.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200526215853_add_column_customer.rb diff --git a/db/migrate/20200526215853_add_column_customer.rb b/db/migrate/20200526215853_add_column_customer.rb new file mode 100644 index 000000000..837a502f9 --- /dev/null +++ b/db/migrate/20200526215853_add_column_customer.rb @@ -0,0 +1,5 @@ +class AddColumnCustomer < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 1b175692d..99adb65e1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_212320) do +ActiveRecord::Schema.define(version: 2020_05_26_215853) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 8fce28509d84c14ff8f9c853eebb3a6e68b7fd75 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 26 May 2020 16:01:35 -0700 Subject: [PATCH 04/45] Successful seeding of db --- db/schema.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/schema.rb b/db/schema.rb index 99adb65e1..15e581ad1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" end create_table "videos", force: :cascade do |t| From 21e8c27cd4eb93b3b7941698a2955802c380cd02 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 26 May 2020 17:02:21 -0700 Subject: [PATCH 05/45] Added videos controller --- app/controllers/videos_controller.rb | 10 ++++++++++ config/routes.rb | 3 +++ test/controllers/videos_controller_test.rb | 19 +++++++++++++++++++ 3 files changed, 32 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..8c63e1d04 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,10 @@ +class VideosController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..ca7bfbee7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do + get 'videos/index' + get 'videos/show' + get 'videos/create' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..fe6ee33c3 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe VideosController do + it "must get index" do + get videos_index_url + must_respond_with :success + end + + it "must get show" do + get videos_show_url + must_respond_with :success + end + + it "must get create" do + get videos_create_url + must_respond_with :success + end + +end From 5d0c05b1c76cd1d2d6a4599619ba19610e586150 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 26 May 2020 17:10:33 -0700 Subject: [PATCH 06/45] Added index route and resources for videos. --- app/controllers/videos_controller.rb | 3 +++ config/routes.rb | 4 +--- test/controllers/videos_controller_test.rb | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 8c63e1d04..78acb6695 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,5 +1,8 @@ class VideosController < ApplicationController def index + @videos = Video.all.order(:title) + + # render json: { ok: 'RENDERING JSON??'}, status: :ok end def show diff --git a/config/routes.rb b/config/routes.rb index ca7bfbee7..efbadb9db 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,4 @@ Rails.application.routes.draw do - get 'videos/index' - get 'videos/show' - get 'videos/create' + resources :videos, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index fe6ee33c3..6ad44ec6d 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,8 +2,9 @@ describe VideosController do it "must get index" do - get videos_index_url + get videos_path must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' end it "must get show" do From f1cdc452da7f0ff08e83c7153dd35c1046b1c10c Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 26 May 2020 17:20:30 -0700 Subject: [PATCH 07/45] Added initial index action. --- app/controllers/videos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 78acb6695..083cf3bc1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -2,7 +2,7 @@ class VideosController < ApplicationController def index @videos = Video.all.order(:title) - # render json: { ok: 'RENDERING JSON??'}, status: :ok + render json: { ok: 'Rendering JSON now!}, status: :ok end def show From f262bbcb02e083153ca284ccbb71ba5b40f09945 Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 17:23:02 -0700 Subject: [PATCH 08/45] customer controller - empty --- app/controllers/customers_controller.rb | 4 ++++ test/controllers/customers_controller_test.rb | 7 +++++++ 2 files changed, 11 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..626980b86 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +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 7f51fdecc49d93fce9da6c818a93fbd9964ff439 Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 17:26:16 -0700 Subject: [PATCH 09/45] customer route --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index c06383a17..e0f9e46c5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :customers, only: [:index] end From c83ce3836bc3d455263d4a39edc47a5621e5cf6a Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 26 May 2020 17:32:43 -0700 Subject: [PATCH 10/45] Renders json for video index and added nominal fields and edge case tests. --- app/controllers/videos_controller.rb | 5 +++-- test/controllers/videos_controller_test.rb | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 083cf3bc1..749871134 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,8 +1,9 @@ class VideosController < ApplicationController def index - @videos = Video.all.order(:title) + videos = Video.all.order(:title) - render json: { ok: 'Rendering JSON now!}, status: :ok + render json: videos.as_json(only: [:id, :title, :overview, :release_date, + :total_inventory, :available_inventory]), status: :ok end def show diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 6ad44ec6d..8cf4a74f8 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,12 +1,33 @@ require "test_helper" describe VideosController do + VIDEO_FIELDS = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort + it "must get index" do get videos_path must_respond_with :success expect(response.header['Content-Type']).must_include 'json' end + it "will return proper fields for a list of videos" do + get videos_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end + + it "returns empty array is no videos exist" do + Video.destroy_all + get videos_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end + it "must get show" do get videos_show_url must_respond_with :success From cfe48d8475c667f9ff1e8b42b1cdddd7478c0a76 Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 18:32:35 -0700 Subject: [PATCH 11/45] index and test for index --- app/controllers/customers_controller.rb | 1 + test/controllers/customers_controller_test.rb | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 626980b86..ce57074a4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,5 @@ class CustomersController < ApplicationController def index + @customers = Customer.all.order(:name) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..2720f93d8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,9 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "must get index" do + get customers_path + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end end From 08d9e9dcb36e10deda8071aa853b057947340faa Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 20:34:25 -0700 Subject: [PATCH 12/45] return proper fields for a list of customer --- app/controllers/customers_controller.rb | 4 +++- test/controllers/customers_controller_test.rb | 20 +++++++++++++++++++ test/fixtures/customers.yml | 8 ++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/customers.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ce57074a4..f2a23a903 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,7 @@ class CustomersController < ApplicationController def index - @customers = Customer.all.order(:name) + customers = Customer.all.order(:name) + render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), + status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2720f93d8..da3b66ce5 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -6,4 +6,24 @@ must_respond_with :success expect(response.header['Content-Type']).must_include 'json' end + it "will return the proper fields for a list of customer" do + customer_field = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort + get customers_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal customer_field + end + end + + # it "returns an empty array if no customers exist" do + # Customer.destroy_all + + # get customers_path + + # body = + # end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..b2eb9400d --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,8 @@ +shelley: + name: Shelley Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: Ap 292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 From f223245aa08a566dda5700f64c023d50011b1759 Mon Sep 17 00:00:00 2001 From: Ada Date: Tue, 26 May 2020 21:34:29 -0700 Subject: [PATCH 13/45] fixing bug --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f2a23a903..b7db7e967 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all.order(:name) - render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index da3b66ce5..0a9a05a88 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,7 +7,7 @@ expect(response.header['Content-Type']).must_include 'json' end it "will return the proper fields for a list of customer" do - customer_field = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort + customer_field = ['id', 'name', 'registered_at', 'postal_code', 'phone', 'videos_checked_out_count'].sort get customers_path body = JSON.parse(response.body) @@ -19,11 +19,14 @@ end end - # it "returns an empty array if no customers exist" do - # Customer.destroy_all + it "returns an empty array if no customers exist" do + Customer.destroy_all - # get customers_path + get customers_path + + body = JSON.parse(response.body) - # body = - # end + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end From 9949fa679242bfd8c38be73b0cc8115ae9d62a2c Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 26 May 2020 22:43:17 -0700 Subject: [PATCH 14/45] Added show action, tests and videos.yml created. --- app/controllers/videos_controller.rb | 12 ++++ test/controllers/videos_controller_test.rb | 76 ++++++++++++++-------- test/fixtures/videos.yml | 13 ++++ 3 files changed, 74 insertions(+), 27 deletions(-) create mode 100644 test/fixtures/videos.yml diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 749871134..ac8cbdbf8 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -7,6 +7,18 @@ def index end def show + video = Video.find_by(id: params[:id]) + + if video.nil? + render json: { + ok: false, + message: 'Video not found' + }, status: :not_found + return + end + + render json: video.as_json(only: [:id, :title, :overview, :release_date, + :total_inventory, :available_inventory]), status: :ok end def create diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 8cf4a74f8..8ddfd1c93 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,41 +1,63 @@ require "test_helper" describe VideosController do - VIDEO_FIELDS = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort + VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort - it "must get index" do - get videos_path - must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' - end + describe "index" do + it "must get index" do + get videos_path + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end - it "will return proper fields for a list of videos" do - get videos_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - - body.each do |video| - expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + it "will return proper fields for a list of videos" do + get videos_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end end - end - it "returns empty array is no videos exist" do - Video.destroy_all - get videos_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - expect(body.length).must_equal 0 + it "returns empty array is no videos exist" do + Video.destroy_all + get videos_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end - it "must get show" do - get videos_show_url - must_respond_with :success + describe "show" do + + it "will return a hash with the proper fields for an existing video" do + video = videos(:video_1) + get video_path(video.id) + body = JSON.parse(response.body) + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal VIDEO_FIELDS + end + + it "will return a 404 request with json for a non-existing video" do + get video_path(-1) + + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Video not found' + end end - it "must get create" do - get videos_create_url - must_respond_with :success + describe "create" do + it "must get create" do + get videos_create_url + must_respond_with :success + end end end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..5f4a166f6 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,13 @@ +video_1: + title: "Remember the Titans" + overview: "Football and stuff" + release_date: "1944-03-24" + total_inventory: 10 + available_inventory: 8 + +video_2: + title: "Velocipastor" + overview: "A pastor who questions his fate travels to the Orient where he acquires dinosaur transformative powers" + release_date: "2020-05-01" + total_inventory: 2 + available_inventory: 2 \ No newline at end of file From 2fa1abcf66e648dec5b0eec1be2f0fd37518e47b Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 27 May 2020 10:25:31 -0700 Subject: [PATCH 15/45] Fixed actions and tests in video model to reflect wiki requirements for postman tests. --- app/controllers/videos_controller.rb | 4 ++-- test/controllers/videos_controller_test.rb | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index ac8cbdbf8..e29114ec7 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,7 +3,7 @@ def index videos = Video.all.order(:title) render json: videos.as_json(only: [:id, :title, :overview, :release_date, - :total_inventory, :available_inventory]), status: :ok + :available_inventory]), status: :ok end def show @@ -17,7 +17,7 @@ def show return end - render json: video.as_json(only: [:id, :title, :overview, :release_date, + render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 8ddfd1c93..2fc907572 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,8 @@ require "test_helper" describe VideosController do - VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + INDEX_FIELDS = ["id", "title", "overview", "release_date", "available_inventory"].sort + SHOW_FIELDS = ["title", "overview", "release_date", "available_inventory", "total_inventory"].sort describe "index" do it "must get index" do @@ -17,7 +18,7 @@ body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + expect(video.keys.sort).must_equal INDEX_FIELDS end end @@ -39,7 +40,7 @@ must_respond_with :success expect(response.header['Content-Type']).must_include 'json' expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal SHOW_FIELDS end it "will return a 404 request with json for a non-existing video" do From 05ad00778c010e286c4d6f9a38074cfe3557fee1 Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 27 May 2020 10:27:03 -0700 Subject: [PATCH 16/45] just some extra comments --- app/controllers/customers_controller.rb | 33 +++++++++++++++++++++++++ app/models/customer.rb | 1 + app/models/video.rb | 3 +++ 3 files changed, 37 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index b7db7e967..71bd284d2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,3 +5,36 @@ def index status: :ok end end + +#test for creating video +#TODO we need a route to create video +# describe "create" do +# it "can create a new video" do +# video_params = { +# video: { +# title: "Blacksmith Of The Banished", +# overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", +# release_date: "1979-01-18", +# total_inventory: 10, +# available_inventory: 9 +# } +# } +# expect { post videos_path, params: video_params }.must_differ "Pet.count", 1 +# must_respond_with :created +# end +# end + +#create method for video +def create + video = Video.new(video_params) + if video.save + render json: video.as_json(only: [:id]), status: :created + else + #TODO + end +end + +private +def video_params + return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) +end \ No newline at end of file diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..a17d7df02 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + end diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..5e893e39b 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,5 @@ class Video < ApplicationRecord + #TODO validates :name, presence: true + #validates :title, presence: true + #:overview, :release_date, :total_inventory, :available_inventory end From 6965547520013a4ef274f1f7dbee0aa852a29a08 Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 27 May 2020 10:41:07 -0700 Subject: [PATCH 17/45] create method and tests for video --- app/controllers/customers_controller.rb | 35 +--------------------- app/controllers/videos_controller.rb | 15 ++++++++-- test/controllers/videos_controller_test.rb | 21 +++++++++---- 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 71bd284d2..babf54d3b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,37 +4,4 @@ def index render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok end -end - -#test for creating video -#TODO we need a route to create video -# describe "create" do -# it "can create a new video" do -# video_params = { -# video: { -# title: "Blacksmith Of The Banished", -# overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", -# release_date: "1979-01-18", -# total_inventory: 10, -# available_inventory: 9 -# } -# } -# expect { post videos_path, params: video_params }.must_differ "Pet.count", 1 -# must_respond_with :created -# end -# end - -#create method for video -def create - video = Video.new(video_params) - if video.save - render json: video.as_json(only: [:id]), status: :created - else - #TODO - end -end - -private -def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) -end \ No newline at end of file +end \ No newline at end of file diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index e29114ec7..0f3af24d1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -21,6 +21,17 @@ def show :total_inventory, :available_inventory]), status: :ok end - def create - end + def create + video = Video.new(video_params) + if video.save + render json: video.as_json(only: [:id]), status: :created + else + #TODO + end + end + + private + def video_params + return params.require(:video).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 2fc907572..4d3a4d019 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -54,11 +54,20 @@ end end - describe "create" do - it "must get create" do - get videos_create_url - must_respond_with :success - end - end + describe "create" do + it "can create a new video" do + video_params = { + video: { + title: "Blacksmith Of The Banished", + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", + release_date: "1979-01-18", + total_inventory: 10, + available_inventory: 9 + } + } + expect { post videos_path, params: video_params }.must_differ "Pet.count", 1 + must_respond_with :created + end + end end From 6d0200b8e81339e7c98bf8c9ebc4cb93b9caae54 Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 27 May 2020 11:40:21 -0700 Subject: [PATCH 18/45] changed the show method and tests to pass postman tests --- app/controllers/videos_controller.rb | 9 ++--- app/models/video.rb | 3 +- test/controllers/videos_controller_test.rb | 40 +++++++++++++++------- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 0f3af24d1..70492140f 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -2,7 +2,7 @@ class VideosController < ApplicationController def index videos = Video.all.order(:title) - render json: videos.as_json(only: [:id, :title, :overview, :release_date, + render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok end @@ -11,8 +11,7 @@ def show if video.nil? render json: { - ok: false, - message: 'Video not found' + errors: ['Not Found'] }, status: :not_found return end @@ -24,14 +23,16 @@ def show def create video = Video.new(video_params) if video.save + #only render the id because user does not need the other info render json: video.as_json(only: [:id]), status: :created else - #TODO + render json: { errors: video.errors.messages }, status: :bad_request end end private def video_params + #TODO check if we need all the params as permit return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/app/models/video.rb b/app/models/video.rb index 5e893e39b..56285c84a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,4 @@ class Video < ApplicationRecord - #TODO validates :name, presence: true - #validates :title, presence: true + validates :title, presence: true #:overview, :release_date, :total_inventory, :available_inventory end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 4d3a4d019..fcb4e0c5f 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe VideosController do - INDEX_FIELDS = ["id", "title", "overview", "release_date", "available_inventory"].sort + INDEX_FIELDS = ["id", "title", "release_date", "available_inventory"].sort SHOW_FIELDS = ["title", "overview", "release_date", "available_inventory", "total_inventory"].sort describe "index" do @@ -49,25 +49,39 @@ must_respond_with :not_found body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Video not found' + expect(body['errors']).must_equal ['Not Found'] end end describe "create" do - it "can create a new video" do - video_params = { - video: { - title: "Blacksmith Of The Banished", - overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", - release_date: "1979-01-18", - total_inventory: 10, - available_inventory: 9 - } + let(:video_params) { + { + video: { + title: "Blacksmith Of The Banished", + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", + release_date: "1979-01-18", + total_inventory: 10, + available_inventory: 9 } - expect { post videos_path, params: video_params }.must_differ "Pet.count", 1 + } + } + it "can create a new video" do + + expect { post videos_path, params: video_params }.must_differ "Video.count", 1 must_respond_with :created end + it "gives bad_requests status when user gives bad data" do + #TODO validations for video + video_params[:video][:title] = nil + #video count does not change + expect {post videos_path, params: video_params}.wont_change "Video.count" + #response code bad_request + must_respond_with :bad_request + #errors should contain "name" + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include 'title' + end end end From dc5c2e1b240347ea68ec4f60203f5771be92e599 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 27 May 2020 11:58:59 -0700 Subject: [PATCH 19/45] Deleted Sara's comments from Customers Controller. --- app/controllers/customers_controller.rb | 35 +------------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 71bd284d2..babf54d3b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,37 +4,4 @@ def index render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok end -end - -#test for creating video -#TODO we need a route to create video -# describe "create" do -# it "can create a new video" do -# video_params = { -# video: { -# title: "Blacksmith Of The Banished", -# overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", -# release_date: "1979-01-18", -# total_inventory: 10, -# available_inventory: 9 -# } -# } -# expect { post videos_path, params: video_params }.must_differ "Pet.count", 1 -# must_respond_with :created -# end -# end - -#create method for video -def create - video = Video.new(video_params) - if video.save - render json: video.as_json(only: [:id]), status: :created - else - #TODO - end -end - -private -def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) -end \ No newline at end of file +end \ No newline at end of file From 298c5f3e721673b42217f0686e61197cba43d1ac Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 27 May 2020 14:13:32 -0700 Subject: [PATCH 20/45] Removed require in video_params to make smoke tests pass for create action. --- app/controllers/videos_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 70492140f..87681062d 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,4 +1,5 @@ class VideosController < ApplicationController + require 'pry' def index videos = Video.all.order(:title) @@ -22,9 +23,10 @@ def show def create video = Video.new(video_params) - if video.save + if video.save! #only render the id because user does not need the other info render json: video.as_json(only: [:id]), status: :created + # render json: { "video": { "id": video.id }} else render json: { errors: video.errors.messages }, status: :bad_request end @@ -33,6 +35,6 @@ def create private def video_params #TODO check if we need all the params as permit - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end From 5a378a2444dd7b341c8385bd3c9eb87f56da40c8 Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 27 May 2020 14:15:47 -0700 Subject: [PATCH 21/45] video tests changed --- app/controllers/videos_controller.rb | 4 +++- app/models/video.rb | 3 +-- test/controllers/videos_controller_test.rb | 8 +++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 70492140f..0fbbfa774 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -25,8 +25,10 @@ def create if video.save #only render the id because user does not need the other info render json: video.as_json(only: [:id]), status: :created + return else - render json: { errors: video.errors.messages }, status: :bad_request + render json: { ok: false, errors: video.errors.messages }, status: :bad_request + return end end diff --git a/app/models/video.rb b/app/models/video.rb index 56285c84a..6df4dfbe7 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,3 @@ class Video < ApplicationRecord - validates :title, presence: true - #:overview, :release_date, :total_inventory, :available_inventory + validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index fcb4e0c5f..5583cebf5 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -73,6 +73,10 @@ it "gives bad_requests status when user gives bad data" do #TODO validations for video video_params[:video][:title] = nil + video_params[:video][:overview] = nil + video_params[:video][:release_date] = nil + video_params[:video][:total_inventory] = nil + video_params[:video][:available_inventory] = nil #video count does not change expect {post videos_path, params: video_params}.wont_change "Video.count" #response code bad_request @@ -80,7 +84,9 @@ #errors should contain "name" expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - expect(body["errors"].keys).must_include 'title' + body.each do |video| + expect(body["errors"].keys.sort).must_equal SHOW_FIELDS + end end end From 370db2f7fb3be659335a305e4123163a15625608 Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 27 May 2020 15:03:26 -0700 Subject: [PATCH 22/45] set relation between models and created rentals model --- app/controllers/videos_controller.rb | 6 ++++-- app/models/customer.rb | 5 +++-- app/models/rental.rb | 4 ++++ app/models/video.rb | 2 ++ db/migrate/20200527212234_create_rentals.rb | 10 ++++++++++ ...00527212754_relation_rental_to_customer_video.rb | 6 ++++++ db/schema.rb | 13 ++++++++++++- test/models/rental_test.rb | 7 +++++++ 8 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200527212234_create_rentals.rb create mode 100644 db/migrate/20200527212754_relation_rental_to_customer_video.rb create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 0fbbfa774..f64332bc9 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,4 +1,5 @@ class VideosController < ApplicationController + require 'pry' def index videos = Video.all.order(:title) @@ -22,10 +23,11 @@ def show def create video = Video.new(video_params) - if video.save + if video.save! #only render the id because user does not need the other info render json: video.as_json(only: [:id]), status: :created return + else render json: { ok: false, errors: video.errors.messages }, status: :bad_request return @@ -35,6 +37,6 @@ def create private def video_params #TODO check if we need all the params as permit - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index a17d7df02..4dcaed778 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ -class Customer < ApplicationRecord - +class Customer < ApplicationRecord + has_many :rentals + has_many :videos, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..624b67c88 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video +end diff --git a/app/models/video.rb b/app/models/video.rb index 6df4dfbe7..3f97d0f2c 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,3 +1,5 @@ class Video < ApplicationRecord validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true + has_many :rentals + has_many :customers, through: :rentals end diff --git a/db/migrate/20200527212234_create_rentals.rb b/db/migrate/20200527212234_create_rentals.rb new file mode 100644 index 000000000..bd60e8deb --- /dev/null +++ b/db/migrate/20200527212234_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.datetime :due_date + t.boolean :returned + + t.timestamps + end + end +end diff --git a/db/migrate/20200527212754_relation_rental_to_customer_video.rb b/db/migrate/20200527212754_relation_rental_to_customer_video.rb new file mode 100644 index 000000000..9eaad28d7 --- /dev/null +++ b/db/migrate/20200527212754_relation_rental_to_customer_video.rb @@ -0,0 +1,6 @@ +class RelationRentalToCustomerVideo < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, index: true + add_reference :rentals, :video, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 15e581ad1..a47716f6a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_215853) do +ActiveRecord::Schema.define(version: 2020_05_27_212754) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,6 +28,17 @@ t.integer "videos_checked_out_count" end + create_table "rentals", force: :cascade do |t| + t.datetime "due_date" + t.boolean "returned" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "customer_id" + t.bigint "video_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" + end + create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" 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 49e7eb7c6da5ed8d780013bdef125f4edddfbdb0 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 27 May 2020 16:35:21 -0700 Subject: [PATCH 23/45] Modified create action to render json structure correctly for errors to pass all wave 1 postman tests. Added edge case tests for missing video params; all passing. --- app/controllers/videos_controller.rb | 7 +-- test/controllers/videos_controller_test.rb | 61 ++++++++++++++++------ 2 files changed, 50 insertions(+), 18 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 758666518..f8d7fe247 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -23,14 +23,15 @@ def show def create video = Video.new(video_params) - if video.save! + + if video.save #only render the id because user does not need the other info render json: video.as_json(only: [:id]), status: :created return - # render json: { "video": { "id": video.id }} else - render json: { ok: false, errors: video.errors.messages }, status: :bad_request + # binding.pry + render json: { errors: video.errors.messages }, status: :bad_request return end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5583cebf5..347561dc7 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -56,7 +56,6 @@ describe "create" do let(:video_params) { { - video: { title: "Blacksmith Of The Banished", overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", release_date: "1979-01-18", @@ -64,29 +63,61 @@ available_inventory: 9 } } - } + it "can create a new video" do expect { post videos_path, params: video_params }.must_differ "Video.count", 1 must_respond_with :created end - it "gives bad_requests status when user gives bad data" do - #TODO validations for video - video_params[:video][:title] = nil - video_params[:video][:overview] = nil - video_params[:video][:release_date] = nil - video_params[:video][:total_inventory] = nil - video_params[:video][:available_inventory] = nil - #video count does not change + + it "gives bad_request status when user gives bad data: video missing title" do + video_params[:title] = nil + expect {post videos_path, params: video_params}.wont_change "Video.count" - #response code bad_request must_respond_with :bad_request - #errors should contain "name" expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - body.each do |video| - expect(body["errors"].keys.sort).must_equal SHOW_FIELDS - end + expect(body["errors"].keys).must_equal ["title"] + end + + it "gives bad_request status when user gives bad data: video missing overview" do + video_params[:overview] = nil + + expect {post videos_path, params: video_params}.wont_change "Video.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_equal ["overview"] + end + + it "gives bad_request status when user gives bad data: video missing release_date" do + video_params[:release_date] = nil + + expect {post videos_path, params: video_params}.wont_change "Video.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_equal ["release_date"] + end + + it "gives bad_request status when user gives bad data: video missing available_inventory" do + video_params[:available_inventory] = nil + + expect {post videos_path, params: video_params}.wont_change "Video.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_equal ["available_inventory"] + end + + it "gives bad_request status when user gives bad data: video missing total_inventory" do + video_params[:total_inventory] = nil + + expect {post videos_path, params: video_params}.wont_change "Video.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_equal ["total_inventory"] end end From a674657d52c77f5e2736a64523a02b89f804f621 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 27 May 2020 17:04:56 -0700 Subject: [PATCH 24/45] Added rentals controller, implemented controller filters for setting a customer and video before checkout and checkin methods. --- app/controllers/rentals_controller.rb | 28 +++++++++++++++++++++ test/controllers/rentals_controller_test.rb | 7 ++++++ 2 files changed, 35 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..4db42b845 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,28 @@ +class RentalsController < ApplicationController + + # need private controller filters to set video_id and set customer_id before running checkout/in methods + before_action :set_customer, only: [:check_out, :check_in] + before_action :set_video, only: [:check_out, :check_in] + + # check-out instance method + + + # check-in instance method + + private + + def set_customer + @customer = Customer.find_by(id: params[:customer_id]) + if @customer.nil? + render json: { errors: { customer_id: ["Error: couldn't find a customer with customer_id #{params[:customer_id]}"] } }, status: :not_found + end + end + + def set_video + @video = Video.find_by(title: params[:title]) + if @video.nil? + render json: { errors: { title: ["Error: couldn't find a video with the title #{params[:title]}"] } }, status: :not_found + end + end + +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 2328485d2a09b91dc8724a95527268481eb4ad79 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 27 May 2020 17:30:53 -0700 Subject: [PATCH 25/45] Scaffolded tests for set_customer and set_movie. --- app/controllers/rentals_controller.rb | 35 +++++++++++++++++++-- test/controllers/rentals_controller_test.rb | 24 ++++++++++++-- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4db42b845..e23bf6147 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,21 +7,52 @@ class RentalsController < ApplicationController # check-out instance method + + + + + + + + + + # check-in instance method + + + + + + + + + + + private def set_customer @customer = Customer.find_by(id: params[:customer_id]) + if @customer.nil? - render json: { errors: { customer_id: ["Error: couldn't find a customer with customer_id #{params[:customer_id]}"] } }, status: :not_found + render json: { + errors: { + customer_id: ["Error: couldn't find a customer with customer_id #{params[:customer_id]}"] + } + }, status: :not_found end end def set_video @video = Video.find_by(title: params[:title]) + if @video.nil? - render json: { errors: { title: ["Error: couldn't find a video with the title #{params[:title]}"] } }, status: :not_found + render json: { + errors: { + title: ["Error: couldn't find a video with title #{params[:title]}"] + } + }, status: :not_found end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..73d152d24 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,25 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + # TODO FILL IN THESE TESTS + describe "set_customer" do + it "correctly finds an existing valid customer" do + customer = customers(:shelley) + + expect(self.set_customer).must_equal customer + + end + + it "returns json with an error message if the customer could not be found" do + end + end + + describe "set_video" do + it "correctly finds and existing valid video" do + end + + it "returns json with an error message if the video could not be found" do + end + end end From 0901a3034f70f75093c0df83747f94702b839ffd Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 27 May 2020 20:05:04 -0700 Subject: [PATCH 26/45] reseed the database --- config/routes.rb | 2 ++ db/seeds.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index dc5244cb1..efe33c71a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,6 @@ resources :videos, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index] + post "/rentals/check-in", to: "rentals#check-in", as: "check-in" + post "rentals/check-out", to: "rentals#check-out", as: "check-out" end diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..b9c7addf4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 + customer['videos_checked_out_count'] = 0 Customer.create!(customer) end From 8ef00143a6e536352a29f043d93c57537ed34ad7 Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 27 May 2020 20:41:50 -0700 Subject: [PATCH 27/45] getting started with checkout method --- app/controllers/rentals_controller.rb | 17 +++++++++++------ app/controllers/videos_controller.rb | 1 - config/routes.rb | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e23bf6147..7dd635b36 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,16 +5,21 @@ class RentalsController < ApplicationController before_action :set_video, only: [:check_out, :check_in] # check-out instance method + def index + end + #'customer_id', 'video_id', 'due_date', 'videos_checked_out_count', 'available_inventory' + def check_out + + new_rent = Rental.new(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) + #videos_checked_out_count:, available_inventory: - - - - - - + # increase the customer's videos_checked_out_count by one + # decrease the video's available_inventory by one + # create a due date. The rental's due date is the seven days from the current date. + end # check-in instance method diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f8d7fe247..94816a8b5 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,5 +1,4 @@ class VideosController < ApplicationController - require 'pry' def index videos = Video.all.order(:title) diff --git a/config/routes.rb b/config/routes.rb index efe33c71a..37a187bb7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ resources :videos, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index] + resources :rentals, only: [:index] post "/rentals/check-in", to: "rentals#check-in", as: "check-in" post "rentals/check-out", to: "rentals#check-out", as: "check-out" end From aaba5be9801429e9100342bd8581b27696c636f2 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 28 May 2020 13:29:13 -0700 Subject: [PATCH 28/45] Implemented first version of checkin on rental controller. --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 39 ++++++++++++++++++------- app/controllers/videos_controller.rb | 2 +- config/routes.rb | 2 +- db/schema.rb | 2 +- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index babf54d3b..1decfee0a 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.order(:name) + customers = Customer.order(:name) render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e23bf6147..aee9dfc42 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -19,16 +19,35 @@ class RentalsController < ApplicationController # check-in instance method - - - - - - - - - - + def checkin + # find the right rental instance in db to check in (video_id, customer_id) + rental = Rental.find_by(params[:customer_id], params[:video_id]) + + if rental + # decrease customer's videos_checked_out_count by 1 + rental.customer.videos_checked_out_count -= 1 + # increase movie's available_inventory count by 1 + rental.video.available_inventory += 1 + # update rental instance in db/save => returned = true + rental.returned = true + + if rental.save + # might need to change this based on smoke tests + render json: {}, status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + else + # BAD REQUEST - change based on smoke tests? + render json: { + errors: { + rental: ["Customer #{@customer.id} has not checked out #{@video.title}"] + } + }, status: :not_found + return + end + end + end private diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f8d7fe247..c46b3ee2e 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,7 @@ class VideosController < ApplicationController require 'pry' def index - videos = Video.all.order(:title) + videos = Video.order(:title) render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok diff --git a/config/routes.rb b/config/routes.rb index efe33c71a..0cbe73c3b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ resources :videos, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index] - post "/rentals/check-in", to: "rentals#check-in", as: "check-in" + post "/rentals/check-in", to: "rentals#check_in", as: "check-in" post "rentals/check-out", to: "rentals#check-out", as: "check-out" end diff --git a/db/schema.rb b/db/schema.rb index a47716f6a..aed035d18 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -30,7 +30,7 @@ create_table "rentals", force: :cascade do |t| t.datetime "due_date" - t.boolean "returned" + t.boolean "returned", default: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "customer_id" From bd077f77235087ceefdf6e7d8c22c5315fee2915 Mon Sep 17 00:00:00 2001 From: Ada Date: Thu, 28 May 2020 17:50:18 -0700 Subject: [PATCH 29/45] checkout method works --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 90 +++++++++------------ app/controllers/videos_controller.rb | 2 +- app/models/rental.rb | 31 +++++++ config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 72 +++++++++++++---- test/controllers/videos_controller_test.rb | 10 +-- test/fixtures/customers.yml | 1 + test/fixtures/rentals.yml | 7 ++ 9 files changed, 143 insertions(+), 76 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index babf54d3b..1decfee0a 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.order(:name) + customers = Customer.order(:name) render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7dd635b36..c1c3aee58 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,64 +1,48 @@ class RentalsController < ApplicationController - # need private controller filters to set video_id and set customer_id before running checkout/in methods - before_action :set_customer, only: [:check_out, :check_in] - before_action :set_video, only: [:check_out, :check_in] + def checkout + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) - # check-out instance method - def index - end - - - - #'customer_id', 'video_id', 'due_date', 'videos_checked_out_count', 'available_inventory' - def check_out - - new_rent = Rental.new(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) - #videos_checked_out_count:, available_inventory: + if customer.nil? || video.nil? + render json: { + errors: ['Not Found'] + }, status: :not_found + return + end - # increase the customer's videos_checked_out_count by one - # decrease the video's available_inventory by one - # create a due date. The rental's due date is the seven days from the current date. + if video.available_inventory <= 0 + render json: { errors: video.errors.messages }, status: :bad_request + return + elsif video && customer + new_rent = Rental.new(rental_params) + new_rent.due_date = Date.today + 7 + + if new_rent.save + render json: { + customer_id: new_rent.customer_id, + video_id: new_rent.video_id, + due_date: new_rent.due_date, + videos_checked_out_count: new_rent.customer.videos_checked_out_count, + available_inventory: new_rent.video.available_inventory + }, status: :ok + return + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + return + end + end end - - - # check-in instance method - - - - - - + def checkin + end - - - private - - def set_customer - @customer = Customer.find_by(id: params[:customer_id]) - - if @customer.nil? - render json: { - errors: { - customer_id: ["Error: couldn't find a customer with customer_id #{params[:customer_id]}"] - } - }, status: :not_found - end - end - - def set_video - @video = Video.find_by(title: params[:title]) - - if @video.nil? - render json: { - errors: { - title: ["Error: couldn't find a video with title #{params[:title]}"] - } - }, status: :not_found - end - end + def rental_params + return params.permit(:customer_id, :video_id) + end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 94816a8b5..e6d79baa5 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.order(:title) + videos = Video.order(:title) render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok diff --git a/app/models/rental.rb b/app/models/rental.rb index 624b67c88..99ada26d1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,35 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + +# Model methods with help from Sharon Cheung + after_create :increment_videos_checked_out_count, :decrement_available_inventory + + def increment_videos_checked_out_count + self.customer.videos_checked_out_count += 1 #nil + self.customer.save + return self.customer.videos_checked_out_count #integer + end + + def decrement_available_inventory + self.video.available_inventory -= 1 + self.video.save + return self.video.available_inventory #integer + end + + def decrement_videos_checked_out_count + self.customer.videos_checked_out_count -= 1 + self.customer.save + return self.customer.videos_checked_out_count + end + + def increment_available_inventory + self.video.available_inventory += 1 + self.video.save + return self.video.available_inventory + end + + + + end diff --git a/config/routes.rb b/config/routes.rb index 37a187bb7..074be5f5c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,6 @@ # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index] resources :rentals, only: [:index] - post "/rentals/check-in", to: "rentals#check-in", as: "check-in" - post "rentals/check-out", to: "rentals#check-out", as: "check-out" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 73d152d24..5f2d43a0f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,25 +1,69 @@ require "test_helper" +require 'pry' describe RentalsController do + describe "checkout" do + + before do + @customer = customers(:shelley) + @video = videos(:video_1) + @rental = rentals(:rental_1) - # TODO FILL IN THESE TESTS - describe "set_customer" do - it "correctly finds an existing valid customer" do - customer = customers(:shelley) - - expect(self.set_customer).must_equal customer - + @rental_params = { + customer_id: @customer.id, + video_id: @video.id + } end + + it "can create a rental for valid input and responds with ok" do + available_before_rental = @video.available_inventory #int 1mu + customer_rentals_before_count = @customer.rentals.count + + expect { post checkout_path, params: @rental_params }.must_differ "Rental.count", 1 + must_respond_with :ok + binding.pry + + puts "HERE IS THE CUSTOMER RENTALS COUNT: #{@customer.rentals.count}" + puts "HERE IS THE VIDEO INVENTORY COUNT: #{@video.available_inventory}" + + expect(response.header['Content-Type']).must_include 'json' + expect(@customer.rentals.count).must_equal (customer_rentals_before_count + 1) + # expect(@video.available_inventory).must_equal (available_before_rental - 1) + + # expect(rental info here).must_equal @video.available_inventory + # expect that the rental is added to the customer's rentals (increments video_checked_out_count) + # expect that the rental is decreasing the video's available_inventory count + end - it "returns json with an error message if the customer could not be found" do - end - end + it "returns a bad request when inventory is 0 before rental checkout" do + @video.available_inventory = 0 + @video.save + expect { post checkout_path, params: @rental_params }.wont_change "Rental.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + end - describe "set_video" do - it "correctly finds and existing valid video" do + it "returns not_found when video is not found for rental" do + rental_params = { + customer_id: @customer.id, + video_id: -1 + } + + expect { post checkout_path, params: rental_params }.wont_change "Rental.count" + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' end - it "returns json with an error message if the video could not be found" do + it "returns not_found when customer is not found for rental" do + rental_params = { + customer_id: -3, + video_id: @video.id + } + + expect { post checkout_path, params: rental_params }.wont_change "Rental.count" + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' end - end + + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 347561dc7..1ecefb4a3 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -56,11 +56,11 @@ describe "create" do let(:video_params) { { - title: "Blacksmith Of The Banished", - overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", - release_date: "1979-01-18", - total_inventory: 10, - available_inventory: 9 + title: "Blacksmith Of The Banished", + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", + release_date: "1979-01-18", + total_inventory: 10, + available_inventory: 9 } } diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index b2eb9400d..9c7554135 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,3 +6,4 @@ shelley: state: OR postal_code: 24309 phone: (322) 510-8695 + videos_checked_out_count: 0 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..9675bc4be --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,7 @@ +rental_1: + customer_id: customers(:shelley).id + video_id: videos(:video_1).id + +rental_2: + customer_id: customers(:shelley).id + video_id: videos(:video_2).id \ No newline at end of file From 96f66f45494b0f8237633920cf213fe1b08cfa23 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 28 May 2020 17:51:26 -0700 Subject: [PATCH 30/45] Progress on tests. --- test/controllers/rentals_controller_test.rb | 45 ++++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 73d152d24..8421d14a4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,24 +2,49 @@ describe RentalsController do - # TODO FILL IN THESE TESTS - describe "set_customer" do - it "correctly finds an existing valid customer" do - customer = customers(:shelley) + describe "checkin" do + it "finds the correct customer and video ids for checking in an existing valid rental" do + end - expect(self.set_customer).must_equal customer + it "returns 200 ok status and json when checking in an existing valid rental" do + end + it "decreases the customer's videos_checked_out count by 1 for a valid rental" do end - it "returns json with an error message if the customer could not be found" do + it "increases the video's available count by 1 for a valid rental" do end - end - describe "set_video" do - it "correctly finds and existing valid video" do + it "sets the rental's returned status to be true for a valid rental" do end - it "returns json with an error message if the video could not be found" do + it "returns error message and 404 not_found for a rental with a customer that does not exist" do end + + it "returns error message and 404 not_found for a rental with a video that does not exist" do + end + + end + + # TODO FILL IN THESE TESTS + # describe "set_customer" do + # it "correctly finds an existing valid customer" do + # customer = customers(:shelley) + + # expect(self.set_customer).must_equal customer + + # end + + # it "returns json with an error message if the customer could not be found" do + # end + # end + + # describe "set_video" do + # it "correctly finds and existing valid video" do + # end + + # it "returns json with an error message if the video could not be found" do + # end + # end end From 8faac7167c87addacf32b7e52b016b4ae7bc4323 Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 20:11:14 -0700 Subject: [PATCH 31/45] customer validations tests --- app/controllers/rentals_controller.rb | 65 ++------------------- app/models/customer.rb | 1 + app/models/rental.rb | 1 + config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 5 +- test/models/customer_test.rb | 38 +++++++++++- 6 files changed, 44 insertions(+), 70 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b05f9af60..9fd7e3241 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,64 +3,12 @@ class RentalsController < ApplicationController def checkout video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) - - # check-out instance method - - - - - - - - - - - - - # check-in instance method - - def checkin - # find the right rental instance in db to check in (video_id, customer_id) - rental = Rental.find_by(params[:customer_id], params[:video_id]) - - if rental - # decrease customer's videos_checked_out_count by 1 - rental.customer.videos_checked_out_count -= 1 - # increase movie's available_inventory count by 1 - rental.video.available_inventory += 1 - # update rental instance in db/save => returned = true - rental.returned = true - - if rental.save - # might need to change this based on smoke tests - render json: {}, status: :ok - else - render json: { errors: rental.errors.messages }, status: :bad_request - end - else - # BAD REQUEST - change based on smoke tests? + if video.nil? || customer.nil? render json: { - errors: { - rental: ["Customer #{@customer.id} has not checked out #{@video.title}"] - } - }, status: :not_found - return - end - end - end - - private - - def set_customer - @customer = Customer.find_by(id: params[:customer_id]) - - if @customer.nil? - render json: { errors: ['Not Found'] - }, status: :not_found - return - end - + }, status: :not_found + return + end if video.available_inventory <= 0 render json: { errors: video.errors.messages }, status: :bad_request return @@ -86,11 +34,6 @@ def set_customer end end - def checkin - - end - - def rental_params return params.permit(:customer_id, :video_id) end diff --git a/app/models/customer.rb b/app/models/customer.rb index 4dcaed778..1e5060d69 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord + validates :name, :phone, :registered_at, presence: true has_many :rentals has_many :videos, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 99ada26d1..50bb39776 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,5 @@ class Rental < ApplicationRecord + validates :due_date, presence: true belongs_to :customer belongs_to :video diff --git a/config/routes.rb b/config/routes.rb index 50b6ed20d..89e3fb9a8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ resources :videos, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index] - post "/rentals/check-in", to: "rentals#checkin", as: "check-in" - post "/rentals/check-out", to: "rentals#checkout", as: "check-out" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ee9925048..7e1436c71 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,5 +1,5 @@ require "test_helper" -require 'pry' + describe RentalsController do describe "checkout" do before do @@ -16,9 +16,6 @@ customer_rentals_before_count = @customer.rentals.count expect { post checkout_path, params: @rental_params }.must_differ "Rental.count", 1 must_respond_with :ok - binding.pry - puts "HERE IS THE CUSTOMER RENTALS COUNT: #{@customer.rentals.count}" - puts "HERE IS THE VIDEO INVENTORY COUNT: #{@video.available_inventory}" expect(response.header['Content-Type']).must_include 'json' expect(@customer.rentals.count).must_equal (customer_rentals_before_count + 1) # expect(@video.available_inventory).must_equal (available_before_rental - 1) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..3da7f7f53 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,39 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @customer = customers(:shelley) + end + describe "validations" do + + it "can not create customer without name" do + @customer.name = nil + @customer.save + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages[:name]).must_equal ["can't be blank"] + end + it "can not create customer without phone" do + @customer.phone = nil + @customer.save + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages[:phone]).must_equal ["can't be blank"] + end + it "can not create customer without registered_at" do + @customer.registered_at = nil + @customer.save + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages[:registered_at]).must_equal ["can't be blank"] + end + + end + + describe "Relations" do + it "can have multiple rentals" do + + end + it "can have multiple videos through rentals" do + end + + end + end From e440bd517b296a311a4d98e87a013a696674b8ba Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 21:01:39 -0700 Subject: [PATCH 32/45] validation for the model tests --- test/fixtures/rentals.yml | 8 +++--- test/models/rental_test.rb | 28 ++++++++++++++++--- test/models/video_test.rb | 55 +++++++++++++++++++++++++++++++++++--- 3 files changed, 81 insertions(+), 10 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 9675bc4be..a0f857481 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,7 +1,7 @@ rental_1: - customer_id: customers(:shelley).id - video_id: videos(:video_1).id + customer_id: 1 + video_id: 1 rental_2: - customer_id: customers(:shelley).id - video_id: videos(:video_2).id \ No newline at end of file + customer_id: 2 + video_id: 2 \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..f2d33ae76 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 + before do + @rental = rentals(:rental_1) + @customer = customers(:shelley) + @video = videos(:video_1) + end + describe "validations" do + it "can not create rental without due_date" do + @rental.due_date = nil + expect(@rental.valid?).must_equal false + expect(@rental.errors.messages[:due_date]).must_equal ["can't be blank"] + end + end + describe "relations" do + it "will have customer id" do + new_rental = Rental.new(customer_id: @customer.id, video_id: @video.id) + new_rental.save + expect(new_rental.customer_id).must_equal @customer.id + end + end + describe "increment_videos_checked_out_count" do + + end + describe "decrement_available_inventory" do + + end end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..d5c02a92b 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,56 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @video = videos(:video_1) + @customer = customers(:shelley) + + end + describe "validations" do + it "can not create video without title" do + @video.title = nil + @video.save + expect(@video.valid?).must_equal false + expect(@video.errors.messages[:title]).must_equal ["can't be blank"] + end + it "can not create video without title" do + @video.title = nil + @video.save + expect(@video.valid?).must_equal false + expect(@video.errors.messages[:title]).must_equal ["can't be blank"] + end + it "can not create video without overview" do + @video.overview = nil + @video.save + expect(@video.valid?).must_equal false + expect(@video.errors.messages[:overview]).must_equal ["can't be blank"] + end + it "can not create video without release_date" do + @video.release_date = nil + @video.save + expect(@video.valid?).must_equal false + expect(@video.errors.messages[:release_date]).must_equal ["can't be blank"] + end + it "can not create video without total_inventory" do + @video.total_inventory = nil + @video.save + expect(@video.valid?).must_equal false + expect(@video.errors.messages[:total_inventory]).must_equal ["can't be blank"] + end + it "can not create video without available_inventory" do + @video.available_inventory = nil + @video.save + expect(@video.valid?).must_equal false + expect(@video.errors.messages[:available_inventory]).must_equal ["can't be blank"] + end + end + describe "relations" do + it "can have rentals" do + + rental_one = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) + rental_two = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) + @video.save + expect(@video.rentals.size).must_equal 2 + end + end end From c11cc7b0ff7e328252ec12648bc11d49b454c74b Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 21:09:54 -0700 Subject: [PATCH 33/45] checkin method --- app/controllers/rentals_controller.rb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9fd7e3241..f799b78b1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,6 +34,33 @@ def checkout end end + def checkin + # find the right rental instance in db to check in (video_id, customer_id) + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + rental = Rental.find_by(customer: customer, video: video) + if rental + # RENDER THE CORRECT JSON, update returned value and save + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + videos_checked_out_count: rental.decrement_videos_checked_out_count, + available_inventory: rental.increment_available_inventory + }, status: :ok + # rental.returned = true + # rental.save + return + else + # customer or video were nil + render json: { + errors: ['Not Found'] + }, status: :not_found + return + end + end + + private + def rental_params return params.permit(:customer_id, :video_id) end From e6c6bb618a0ce4a23dbdc23151d3b4cd884467f6 Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 21:17:56 -0700 Subject: [PATCH 34/45] check in not passing test --- test/controllers/rentals_controller_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7e1436c71..17677474c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -49,4 +49,16 @@ expect(response.header['Content-Type']).must_include 'json' end end + + describe "checkin" do + it "returns 200 ok status and correct json when checking in an existing valid rental" do + post checkin_path + must_respond_with :ok + expect(response.header['Content-Type']).must_include 'json' + # check the json keys/values + # expect(response.body.keys.sort) + end + it "returns not found if the rental params are invalid" do + end + end end \ No newline at end of file From 724253ae83eaf531b6d85f36de43e7148b514664 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 28 May 2020 21:31:21 -0700 Subject: [PATCH 35/45] Worked on tests for rental controller. --- test/controllers/rentals_controller_test.rb | 41 ++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 17677474c..f8adb1977 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require "pry" describe RentalsController do describe "checkout" do @@ -51,13 +52,51 @@ end describe "checkin" do + before do + @customer = customers(:shelley) + @video = videos(:video_1) + @rental = rentals(:rental_1) + @rental_params = { + customer_id: @customer.id, + video_id: @video.id, + due_date: Date.today + 7 + } + end + it "returns 200 ok status and correct json when checking in an existing valid rental" do - post checkin_path + expect{post checkin_path, params: @rental_params}.wont_change "Rental.count" + binding.pry must_respond_with :ok expect(response.header['Content-Type']).must_include 'json' # check the json keys/values # expect(response.body.keys.sort) end + + + + + + + + + + + + + + + + + + + + + + + + + + it "returns not found if the rental params are invalid" do end end From 5c23b4a1dfacceb73cce6015fbedf43860f49e1c Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 28 May 2020 21:54:16 -0700 Subject: [PATCH 36/45] Added invalid tests for checkin --- test/controllers/rentals_controller_test.rb | 54 +++++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f8adb1977..ad91f8800 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -63,14 +63,14 @@ } end - it "returns 200 ok status and correct json when checking in an existing valid rental" do - expect{post checkin_path, params: @rental_params}.wont_change "Rental.count" - binding.pry - must_respond_with :ok - expect(response.header['Content-Type']).must_include 'json' - # check the json keys/values - # expect(response.body.keys.sort) - end + # it "returns 200 ok status and correct json when checking in an existing valid rental" do + # expect{post checkin_path, params: @rental_params}.wont_change "Rental.count" + # binding.pry + # must_respond_with :ok + # expect(response.header['Content-Type']).must_include 'json' + # # check the json keys/values + # # expect(response.body.keys.sort) + # end @@ -97,7 +97,43 @@ - it "returns not found if the rental params are invalid" do + it "returns 200 ok status and correct json when checking in an existing valid rental" do + check_in_fields = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort + expect{ post checkin_path, params: @rental_params }.wont_change "Rental.count" + binding.pry + must_respond_with :ok + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal check_in_fields + end + + it "returns not found if the rental params are invalid: invalid customer_id" do + invalid_rental_params = { + customer_id: -1, + video_id: 2 + } + + expect{ post checkin_path, params: invalid_rental_params }.wont_change "Rental.count" + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['errors']).must_equal ['Not Found'] + end + + it "returns not found if the rental params are invalid: invalid video_id" do + invalid_rental_params = { + customer_id: 1, + video_id: -5 + } + + expect{ post checkin_path, params: invalid_rental_params }.wont_change "Rental.count" + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['errors']).must_equal ['Not Found'] end end end \ No newline at end of file From 413b64f1c9d7c35249e0061c680309cb3766c7da Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 22:25:51 -0700 Subject: [PATCH 37/45] bugs fixed, fixture was messing up the tests --- app/controllers/rentals_controller.rb | 6 ++++-- test/controllers/rentals_controller_test.rb | 24 +++++++++++---------- test/models/rental_test.rb | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f799b78b1..796705f21 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -36,9 +36,11 @@ def checkout def checkin # find the right rental instance in db to check in (video_id, customer_id) + customer = Customer.find_by(id: params[:customer_id]) video = Video.find_by(id: params[:video_id]) - rental = Rental.find_by(customer: customer, video: video) + rental = Rental.find_by(customer: customer, video:video) + if rental # RENDER THE CORRECT JSON, update returned value and save render json: { @@ -58,7 +60,7 @@ def checkin return end end - + private def rental_params diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 17677474c..0a4fdb452 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,16 +1,17 @@ require "test_helper" describe RentalsController do + before do + @customer = customers(:shelley) + @video = videos(:video_1) + @rental = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) + @rental_params = { + customer_id: @customer.id, + video_id: @video.id + } + end describe "checkout" do - before do - @customer = customers(:shelley) - @video = videos(:video_1) - @rental = rentals(:rental_1) - @rental_params = { - customer_id: @customer.id, - video_id: @video.id - } - end + it "can create a rental for valid input and responds with ok" do available_before_rental = @video.available_inventory #int 1mu customer_rentals_before_count = @customer.rentals.count @@ -51,10 +52,11 @@ end describe "checkin" do + it "returns 200 ok status and correct json when checking in an existing valid rental" do - post checkin_path + expect { post checkin_path, params: @rental_params }.wont_differ "Rental.count" must_respond_with :ok - expect(response.header['Content-Type']).must_include 'json' + #expect(response.header['Content-Type']).must_include 'json' # check the json keys/values # expect(response.body.keys.sort) end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index f2d33ae76..2912447bf 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -21,7 +21,7 @@ end end describe "increment_videos_checked_out_count" do - + end describe "decrement_available_inventory" do From d4ba5cf3b0343c9bd30127b71a959ccd3630a5fc Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 28 May 2020 22:36:37 -0700 Subject: [PATCH 38/45] Checkin unit tests all passing. --- app/controllers/rentals_controller.rb | 10 +++++++++- test/controllers/rentals_controller_test.rb | 20 +++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f799b78b1..2ef75d760 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -38,7 +38,15 @@ def checkin # find the right rental instance in db to check in (video_id, customer_id) customer = Customer.find_by(id: params[:customer_id]) video = Video.find_by(id: params[:video_id]) - rental = Rental.find_by(customer: customer, video: video) + + if customer.nil? || video.nil? + render json: { + errors: ['Not Found'] + }, status: :not_found + return + end + + rental = Rental.find_by(customer_id: customer.id, video_id: video.id) if rental # RENDER THE CORRECT JSON, update returned value and save render json: { diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ad91f8800..29a27fba5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -99,8 +99,17 @@ it "returns 200 ok status and correct json when checking in an existing valid rental" do check_in_fields = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort - expect{ post checkin_path, params: @rental_params }.wont_change "Rental.count" - binding.pry + + shelley_rental_params = { + customer_id: @customer.id, + video_id: @video.id, + # due_date: Date.today + 7 + } + + # simulate a video rental checkout + post checkout_path, params: shelley_rental_params + + expect{ post checkin_path, params: shelley_rental_params }.wont_change "Rental.count" must_respond_with :ok expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) @@ -115,11 +124,12 @@ } expect{ post checkin_path, params: invalid_rental_params }.wont_change "Rental.count" + binding.pry must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' - body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash - expect(body['errors']).must_equal ['Not Found'] + # body = JSON.parse(response.body) + # expect(body).must_be_instance_of Hash + # expect(body['errors']).must_equal ['Not Found'] end it "returns not found if the rental params are invalid: invalid video_id" do From 4edfcdae292fbc9f7c6022c75b8d65495795d941 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 28 May 2020 22:41:44 -0700 Subject: [PATCH 39/45] Cleaned comments from rentals controller checkin. --- test/controllers/rentals_controller_test.rb | 50 ++------------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1bc6ea2b2..a3958cd82 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -54,53 +54,12 @@ describe "checkin" do - it "returns 200 ok status and correct json when checking in an existing valid rental" do - expect { post checkin_path, params: @rental_params }.wont_differ "Rental.count" - must_respond_with :ok - - end - - # it "returns 200 ok status and correct json when checking in an existing valid rental" do - # expect{post checkin_path, params: @rental_params}.wont_change "Rental.count" - # binding.pry - # must_respond_with :ok - # expect(response.header['Content-Type']).must_include 'json' - # # check the json keys/values - # # expect(response.body.keys.sort) - # end - - - - - - - - - - - - - - - - - - - - - - - - - - it "returns 200 ok status and correct json when checking in an existing valid rental" do check_in_fields = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort shelley_rental_params = { customer_id: @customer.id, - video_id: @video.id, - # due_date: Date.today + 7 + video_id: @video.id } # simulate a video rental checkout @@ -121,12 +80,11 @@ } expect{ post checkin_path, params: invalid_rental_params }.wont_change "Rental.count" - binding.pry must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' - # body = JSON.parse(response.body) - # expect(body).must_be_instance_of Hash - # expect(body['errors']).must_equal ['Not Found'] + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['errors']).must_equal ['Not Found'] end it "returns not found if the rental params are invalid: invalid video_id" do From 8d4faf63bd0bb14eddd20d27fe3a5c66f43cdbb2 Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 23:12:25 -0700 Subject: [PATCH 40/45] can increment videos checked out --- test/controllers/rentals_controller_test.rb | 39 +-------------------- test/models/customer_test.rb | 10 +++--- test/models/rental_test.rb | 25 +++++++++++-- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 241eb9b78..82df5b2bd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,5 +1,4 @@ require "test_helper" -require "pry" describe RentalsController do before do @@ -57,47 +56,11 @@ it "returns 200 ok status and correct json when checking in an existing valid rental" do expect { post checkin_path, params: @rental_params }.wont_differ "Rental.count" must_respond_with :ok - - end - - # it "returns 200 ok status and correct json when checking in an existing valid rental" do - # expect{post checkin_path, params: @rental_params}.wont_change "Rental.count" - # binding.pry - # must_respond_with :ok - # expect(response.header['Content-Type']).must_include 'json' - # # check the json keys/values - # # expect(response.body.keys.sort) - # end - - - - - - - - - - - - - - - - - - - - - - - - - + end it "returns 200 ok status and correct json when checking in an existing valid rental" do check_in_fields = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort expect{ post checkin_path, params: @rental_params }.wont_change "Rental.count" - binding.pry must_respond_with :ok expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3da7f7f53..af5cf9e0d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,6 +3,7 @@ describe Customer do before do @customer = customers(:shelley) + @video = videos(:video_1) end describe "validations" do @@ -29,11 +30,12 @@ describe "Relations" do it "can have multiple rentals" do - - end - it "can have multiple videos through rentals" do + rental_one = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) + rental_two = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) + @customer.save + expect(@customer.rentals.size).must_equal 2 end - + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 2912447bf..945cd8e65 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -21,9 +21,30 @@ end end describe "increment_videos_checked_out_count" do - + it "can increment videos checked out" do + new_customer = Customer.create!( + name: "Shelley Rocha", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + phone: "(322) 510-8695", + videos_checked_out_count: 0 + ) + expect(new_customer.videos_checked_out_count).must_equal 0 + new_rental = Rental.create!(customer_id: new_customer.id, video_id: @video.id, due_date: Date.today + 7) + new_customer.reload + @video.reload + expect(new_customer.videos_checked_out_count).must_equal 1 + end end describe "decrement_available_inventory" do - + it "can decrement_available_inventory" do + end + end + describe "decrement_videos_checked_out_count" do + it "can decrement_videos_checked_out_count" do + end + end + describe "increment_available_inventory" do + it "increment_available_inventory" do + end end end From c346ff0cba02143389241e470ed5060599e24771 Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 23:18:03 -0700 Subject: [PATCH 41/45] decrement available inventory --- test/controllers/rentals_controller_test.rb | 8 +------- test/models/rental_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 82df5b2bd..ee633dd97 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -13,16 +13,10 @@ describe "checkout" do it "can create a rental for valid input and responds with ok" do - available_before_rental = @video.available_inventory #int 1mu - customer_rentals_before_count = @customer.rentals.count + expect { post checkout_path, params: @rental_params }.must_differ "Rental.count", 1 must_respond_with :ok expect(response.header['Content-Type']).must_include 'json' - expect(@customer.rentals.count).must_equal (customer_rentals_before_count + 1) - # expect(@video.available_inventory).must_equal (available_before_rental - 1) - # expect(rental info here).must_equal @video.available_inventory - # expect that the rental is added to the customer's rentals (increments video_checked_out_count) - # expect that the rental is decreasing the video's available_inventory count end it "returns a bad request when inventory is 0 before rental checkout" do @video.available_inventory = 0 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 945cd8e65..60d355473 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -37,10 +37,16 @@ end describe "decrement_available_inventory" do it "can decrement_available_inventory" do + expect(@video.available_inventory).must_equal 8 + new_rental = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) + @customer.reload + @video.reload + expect(@video.available_inventory).must_equal 7 end end describe "decrement_videos_checked_out_count" do it "can decrement_videos_checked_out_count" do + end end describe "increment_available_inventory" do From d93601b13578cd1d9105b680864bbe0daa1bb479 Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Thu, 28 May 2020 23:29:07 -0700 Subject: [PATCH 42/45] all rental models tests are passing --- app/controllers/rentals_controller.rb | 6 ------ app/controllers/videos_controller.rb | 5 +---- app/models/rental.rb | 6 +++--- test/models/rental_test.rb | 18 +++++++++--------- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 796705f21..115947b2f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -35,25 +35,19 @@ def checkout end def checkin - # find the right rental instance in db to check in (video_id, customer_id) - customer = Customer.find_by(id: params[:customer_id]) video = Video.find_by(id: params[:video_id]) rental = Rental.find_by(customer: customer, video:video) if rental - # RENDER THE CORRECT JSON, update returned value and save render json: { customer_id: rental.customer_id, video_id: rental.video_id, videos_checked_out_count: rental.decrement_videos_checked_out_count, available_inventory: rental.increment_available_inventory }, status: :ok - # rental.returned = true - # rental.save return else - # customer or video were nil render json: { errors: ['Not Found'] }, status: :not_found diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index e6d79baa5..3fe95a355 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -24,12 +24,10 @@ def create video = Video.new(video_params) if video.save - #only render the id because user does not need the other info + render json: video.as_json(only: [:id]), status: :created return - # render json: { "video": { "id": video.id }} else - # binding.pry render json: { errors: video.errors.messages }, status: :bad_request return end @@ -37,7 +35,6 @@ def create private def video_params - #TODO check if we need all the params as permit return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 50bb39776..92a1c9f52 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,9 +7,9 @@ class Rental < ApplicationRecord after_create :increment_videos_checked_out_count, :decrement_available_inventory def increment_videos_checked_out_count - self.customer.videos_checked_out_count += 1 #nil + self.customer.videos_checked_out_count += 1 self.customer.save - return self.customer.videos_checked_out_count #integer + return self.customer.videos_checked_out_count end def decrement_available_inventory @@ -24,7 +24,7 @@ def decrement_videos_checked_out_count return self.customer.videos_checked_out_count end - def increment_available_inventory + def self.video.available_inventory += 1 self.video.save return self.video.available_inventory diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 60d355473..d570a8e3f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -33,6 +33,11 @@ new_customer.reload @video.reload expect(new_customer.videos_checked_out_count).must_equal 1 + + new_rental.decrement_videos_checked_out_count + new_customer.reload + + expect(new_customer.videos_checked_out_count).must_equal 0 end end describe "decrement_available_inventory" do @@ -42,15 +47,10 @@ @customer.reload @video.reload expect(@video.available_inventory).must_equal 7 - end - end - describe "decrement_videos_checked_out_count" do - it "can decrement_videos_checked_out_count" do - end - end - describe "increment_available_inventory" do - it "increment_available_inventory" do - end + new_rental.increment_available_inventory + @video.reload + expect(@video.available_inventory).must_equal 8 + end end end From 009a108593073485dbedb08543a9bb7679938d76 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Fri, 29 May 2020 12:23:15 -0700 Subject: [PATCH 43/45] Cleaned tests for rental.rb --- app/models/rental.rb | 2 +- test/fixtures/rentals.yml | 1 + test/models/rental_test.rb | 11 ++++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 0c8fd85b0..45563d071 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,7 @@ class Rental < ApplicationRecord after_create :increment_videos_checked_out_count, :decrement_available_inventory def increment_videos_checked_out_count - self.customer.videos_checked_out_count += 1 #nil + self.customer.videos_checked_out_count += 1 self.customer.save return self.customer.videos_checked_out_count end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a0f857481..4144a86d4 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,6 +1,7 @@ rental_1: customer_id: 1 video_id: 1 + due_date: Fri, 29 May 2020 10:21:36 UTC +00:00 rental_2: customer_id: 2 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d570a8e3f..77b6239db 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -7,6 +7,10 @@ @video = videos(:video_1) end describe "validations" do + it "can create a rental with all the required fields" do + new_rental = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today) + expect(new_rental.valid?).must_equal true + end it "can not create rental without due_date" do @rental.due_date = nil expect(@rental.valid?).must_equal false @@ -14,11 +18,16 @@ end end describe "relations" do - it "will have customer id" do + it "will have customer_id" do new_rental = Rental.new(customer_id: @customer.id, video_id: @video.id) new_rental.save expect(new_rental.customer_id).must_equal @customer.id end + it "will have video_id" do + new_rental = Rental.new(customer_id: @customer.id, video_id: @video.id) + new_rental.save + expect(new_rental.video_id).must_equal @video.id + end end describe "increment_videos_checked_out_count" do it "can increment videos checked out" do From b29ee326fb398ccd49b9ca6404aff0763bf98bf8 Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Fri, 29 May 2020 13:19:00 -0700 Subject: [PATCH 44/45] last changes --- test/models/rental_test.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d570a8e3f..ee921cd83 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -7,6 +7,10 @@ @video = videos(:video_1) end describe "validations" do + it "can create a rental with all the required fields" do + new_rental = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today) + expect(new_rental.valid?).must_equal true + end it "can not create rental without due_date" do @rental.due_date = nil expect(@rental.valid?).must_equal false @@ -19,9 +23,14 @@ new_rental.save expect(new_rental.customer_id).must_equal @customer.id end + it "will have video_id" do + new_rental = Rental.new(customer_id: @customer.id, video_id: @video.id) + new_rental.save + expect(new_rental.video_id).must_equal @video.id + end end describe "increment_videos_checked_out_count" do - it "can increment videos checked out" do + it "can increment videos checked out and descrement_videos_checked_out_count" do new_customer = Customer.create!( name: "Shelley Rocha", registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", @@ -41,7 +50,7 @@ end end describe "decrement_available_inventory" do - it "can decrement_available_inventory" do + it "can decrement_available_inventory and increment_available_inventory" do expect(@video.available_inventory).must_equal 8 new_rental = Rental.create!(customer_id: @customer.id, video_id: @video.id, due_date: Date.today + 7) @customer.reload From ace25612b9c31129d8a64cf632689ac63d1325de Mon Sep 17 00:00:00 2001 From: Sara Nilsen Date: Mon, 22 Jun 2020 15:32:20 -0700 Subject: [PATCH 45/45] cors config and added gem rack cors --- .gitignore | 2 ++ Gemfile | 2 +- Gemfile.lock | 3 +++ app/models/rental.rb | 3 +++ config/initializers/cors.rb | 11 +++++++++-- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8a1b1134b..ed5094af8 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +.env \ No newline at end of file diff --git a/Gemfile b/Gemfile index b585a3d2b..ed268dfde 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'puma', '~> 4.1' 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' +gem 'rack-cors' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 4395591b3..efffd00f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,6 +128,8 @@ GEM puma (4.3.5) nio4r (~> 2.0) rack (2.2.2) + rack-cors (1.1.1) + rack (>= 2.0.0) rack-test (1.1.0) rack (>= 1.0, < 3) rails (6.0.3.1) @@ -199,6 +201,7 @@ DEPENDENCIES pg (>= 0.18, < 2.0) pry-rails puma (~> 4.1) + rack-cors rails (~> 6.0.3, >= 6.0.3.1) ruby-debug-ide (>= 0.7.0) spring diff --git a/app/models/rental.rb b/app/models/rental.rb index 45563d071..6148cd62e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -34,3 +34,6 @@ def increment_available_inventory end + + + diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index 3b1c1b5ed..83de7f39f 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -7,10 +7,17 @@ # Rails.application.config.middleware.insert_before 0, Rack::Cors do # allow do -# origins 'example.com' -# +# origins 'localhost' + # resource '*', # headers: :any, # methods: [:get, :post, :put, :patch, :delete, :options, :head] # end # end + +Rails.application.config.middleware.insert_before 0, Rack::Cors do + allow do + origins '*' + resource '*', headers: :any, methods: [:get, :post, :patch, :put] + end +end \ No newline at end of file