From cdca6d373fbb3efc2c5606d6c3cb136cf57a6a96 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 13:04:35 -0700 Subject: [PATCH 01/56] Initial commit --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 59 files changed, 1106 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..95c25b78d --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..7f91bc2cb --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..43301a817 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..2db87f585 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Yu4qHAnVUUR7LMAyY3hTmoYzomkk9umHqozO+h+wuPQeaskwbnHdLh+7/kkrLXmxV1j5EgGvV+SR1uWk0iS6AhO79OtuLsJxlg8HxHeM22KyLZgLTouXsJ+IT6PIiAArl7rsRjznGPF7xEZ0TONNgpR/jTc6bDU+kwujtJ1E60OxiqrivxMmp7CqJz0/gC5X1jKwqeFuSas/93Y0y/pT2xQSblvWbDulg2izBpe9hnThWCPi3YgC4jVNSE9JOQ0eOlAcqlhrjKcfsaFrsT8rB5D7tVSUrQzYsXUnyZsrqmjhrZYwLIdycm2zPg5JruyayxS/IrayPvjhWBX6PKnKDZajLxuuYp9u3FfLqJz5CGKaqTgYgLorrVX/xl3raRdnFDloESaXKNEiPcsB9ogRjcuKNOdisO3o5vYP--mCAI3CP/H35k80Qj--hD/QkQSDTLiYLNs/diHGEQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 1d72dccd1d965dbc13673ce4c270d9db426bcef7 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 17:38:11 -0700 Subject: [PATCH 02/56] created model customer --- app/models/customer.rb | 2 ++ db/migrate/20200527003427_create_customers.rb | 15 +++++++++++++++ node_modules/.yarn-integrity | 10 ++++++++++ test/models/customer_test.rb | 7 +++++++ yarn.lock | 4 ++++ 5 files changed, 38 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20200527003427_create_customers.rb create mode 100644 node_modules/.yarn-integrity create mode 100644 test/models/customer_test.rb create mode 100644 yarn.lock diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/db/migrate/20200527003427_create_customers.rb b/db/migrate/20200527003427_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200527003427_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/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/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/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 7511b7ad6162616db57b217d211aa3ecaa4d0578 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 17:41:53 -0700 Subject: [PATCH 03/56] created customers model --- app/controllers/customers_controller.rb | 4 ++++ config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 9 +++++++++ 3 files changed, 14 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..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..45e6114d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + get 'customers/index' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..20069eb1a --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "must get index" do + get customers_index_url + must_respond_with :success + end + +end From 5b6ef32df8bcea38f288844fa09637385da88775 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 17:44:28 -0700 Subject: [PATCH 04/56] added index route --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 45e6114d0..2eb7a730d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do - get 'customers/index' + resources :customers, only: :index # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From f4f957a0e0769a2c07fdb3178aab19988c530c32 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 18:03:35 -0700 Subject: [PATCH 05/56] Added index test for customer --- app/controllers/customers_controller.rb | 2 ++ db/schema.rb | 30 +++++++++++++++++++ test/controllers/customers_controller_test.rb | 27 ++++++++++++++--- 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 db/schema.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..6116c28ef 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,6 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..3e48db50f --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,30 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_27_003427) 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 + +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 20069eb1a..bc83f3454 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,28 @@ require "test_helper" describe CustomersController do - it "must get index" do - get customers_index_url - must_respond_with :success - end + describe "index" do + it "must get index" do + get customers_path + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it "responds with customer data" do + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash + end + end + it "responds with an empty array when there are no customers" do + Customer.destroy_all + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end end From 2b45a54ba6e814cd20e13ee116538b5ce691d282 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 18:37:07 -0700 Subject: [PATCH 06/56] Added rental relationship --- app/models/customer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end From 5f919772b62d53233b1a3c4e2c4aa483fc8bee2e Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 19:27:20 -0700 Subject: [PATCH 07/56] More customer file --- config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 2 ++ test/fixtures/customers.yml | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/customers.yml diff --git a/config/routes.rb b/config/routes.rb index 2eb7a730d..2222439b4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do - resources :customers, only: :index + resources :customers, only: :index, :show # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index bc83f3454..d4d32ec93 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,6 +1,7 @@ require "test_helper" describe CustomersController do + customer_fields = ["id", "name", ] describe "index" do it "must get index" do get customers_path @@ -22,6 +23,7 @@ get customers_path body = JSON.parse(response.body) expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 expect(body).must_equal [] end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..c209c0119 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,16 @@ +Jane: + name: Jane Doe + registered_at: Wed, 29 Apr 2015 07:54:13 -0700, + address: Ap #292-5216 Ipsu Rd., + city: Hillsboro, + state: OR, + postal_code: 24300, + phone: (322) 510-8690 +Jim: + name: Jim Doe + registered_at: Wed, 10 Apr 2015 07:54:13 -0700, + address: Ap #292-5216 Ipsum Rd., + city: Hillsboro, + state: OR, + postal_code: 24301, + phone: (322) 510-8691 From d654389ab8e96e9664e77f8ab8e0e2ac699ab6e0 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 19:43:18 -0700 Subject: [PATCH 08/56] deleted show for customer --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 2222439b4..2eb7a730d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do - resources :customers, only: :index, :show + resources :customers, only: :index # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 2010fb0e360a1798e579bf3d64f3439940db139a Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:02:11 -0700 Subject: [PATCH 09/56] removed show action --- app/models/customer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..fd1dc21c8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord has_many :rentals + has_many :videos, through: :rentals end From 1c6d5a60e5e5ac08dbfa4facd252f4a2defa6804 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:02:52 -0700 Subject: [PATCH 10/56] generated video and rental models, added relations --- app/models/rental.rb | 4 ++++ app/models/video.rb | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 app/models/video.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..9cd1e13f3 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to: :video + belongs_to: :customers, counter_cache: true +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..fcf708c8d --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,4 @@ +class Video < ApplicationRecord + has_many: :rentals + has_many: :customers, through: :rentals +end From a8962efa26c7ca1dd219e8586aeb2e50eee4182e Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:03:18 -0700 Subject: [PATCH 11/56] initial generation of routes to match new models --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 2222439b4..2eb7a730d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do - resources :customers, only: :index, :show + resources :customers, only: :index # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From caf7fa632c5ea02f5566824dac80e8b8264cbb36 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:03:48 -0700 Subject: [PATCH 12/56] init generated tests for videos and rentals --- test/models/rental_test.rb | 7 +++++++ test/models/video_test.rb | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 test/models/rental_test.rb create mode 100644 test/models/video_test.rb diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From ae59bf2145d2c17b6cf1845c24c9a4f7ee56f9ea Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:04:24 -0700 Subject: [PATCH 13/56] migrations to add columns to rentals and videos, modified schema --- db/migrate/20200527024039_create_rentals.rb | 8 +++++++ db/migrate/20200527024049_create_videos.rb | 13 ++++++++++ ...00527025116_add_foreign_keys_to_rentals.rb | 6 +++++ ...27025451_add_rental_counts_to_customers.rb | 7 ++++++ .../20200527030006_renamed_counter_column.rb | 5 ++++ db/schema.rb | 24 ++++++++++++++++++- 6 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200527024039_create_rentals.rb create mode 100644 db/migrate/20200527024049_create_videos.rb create mode 100644 db/migrate/20200527025116_add_foreign_keys_to_rentals.rb create mode 100644 db/migrate/20200527025451_add_rental_counts_to_customers.rb create mode 100644 db/migrate/20200527030006_renamed_counter_column.rb diff --git a/db/migrate/20200527024039_create_rentals.rb b/db/migrate/20200527024039_create_rentals.rb new file mode 100644 index 000000000..85f45ae24 --- /dev/null +++ b/db/migrate/20200527024039_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20200527024049_create_videos.rb b/db/migrate/20200527024049_create_videos.rb new file mode 100644 index 000000000..282e7354c --- /dev/null +++ b/db/migrate/20200527024049_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/migrate/20200527025116_add_foreign_keys_to_rentals.rb b/db/migrate/20200527025116_add_foreign_keys_to_rentals.rb new file mode 100644 index 000000000..bef700ebd --- /dev/null +++ b/db/migrate/20200527025116_add_foreign_keys_to_rentals.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRentals < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :video, foreign_key: true + end +end diff --git a/db/migrate/20200527025451_add_rental_counts_to_customers.rb b/db/migrate/20200527025451_add_rental_counts_to_customers.rb new file mode 100644 index 000000000..950af0e4d --- /dev/null +++ b/db/migrate/20200527025451_add_rental_counts_to_customers.rb @@ -0,0 +1,7 @@ +class AddRentalCountsToCustomers < ActiveRecord::Migration[6.0] + def change + change_table :customers do |t| + t.integer :rentals_count, default: 0 + end + end +end diff --git a/db/migrate/20200527030006_renamed_counter_column.rb b/db/migrate/20200527030006_renamed_counter_column.rb new file mode 100644 index 000000000..01974cb22 --- /dev/null +++ b/db/migrate/20200527030006_renamed_counter_column.rb @@ -0,0 +1,5 @@ +class RenamedCounterColumn < ActiveRecord::Migration[6.0] + def change + rename_column :customers, :rentals_count, :videos_checked_out_count + end +end diff --git a/db/schema.rb b/db/schema.rb index 3e48db50f..e9ec2ed33 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_003427) do +ActiveRecord::Schema.define(version: 2020_05_27_030006) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,28 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count", default: 0 end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "customer_id" + t.bigint "video_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" end From cdf954770b4d79b8a20f19fd5c5a44a67f062f48 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 20:22:09 -0700 Subject: [PATCH 14/56] Typo --- app/models/rental.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 9cd1e13f3..1adb4a58e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord belongs_to: :video - belongs_to: :customers, counter_cache: true + belongs_to: :customer, counter_cache: true end From 563715cbb357f62c68dac815ccff91041faa298a Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:43:55 -0700 Subject: [PATCH 15/56] added returned column on rentals --- db/migrate/20200527032917_add_returned_to_rentals.rb | 5 +++++ db/migrate/20200527033425_add_default_to_returned_column.rb | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 db/migrate/20200527032917_add_returned_to_rentals.rb create mode 100644 db/migrate/20200527033425_add_default_to_returned_column.rb diff --git a/db/migrate/20200527032917_add_returned_to_rentals.rb b/db/migrate/20200527032917_add_returned_to_rentals.rb new file mode 100644 index 000000000..e12af8e2c --- /dev/null +++ b/db/migrate/20200527032917_add_returned_to_rentals.rb @@ -0,0 +1,5 @@ +class AddReturnedToRentals < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :returned, :boolean + end +end diff --git a/db/migrate/20200527033425_add_default_to_returned_column.rb b/db/migrate/20200527033425_add_default_to_returned_column.rb new file mode 100644 index 000000000..8b816e356 --- /dev/null +++ b/db/migrate/20200527033425_add_default_to_returned_column.rb @@ -0,0 +1,5 @@ +class AddDefaultToReturnedColumn < ActiveRecord::Migration[6.0] + def change + change_column_default(:rentals, :returned, false) + end +end From 3a9bdd72b96de79f35a6450c0af3d8f7783dcb9d Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:44:25 -0700 Subject: [PATCH 16/56] removed extra column in data for now --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6116c28ef..355ca3696 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 - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end end From e29ae14cb2385cb9a89f05003a349fc813cbfe41 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:44:56 -0700 Subject: [PATCH 17/56] modifications to rentals table --- db/schema.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index e9ec2ed33..67aba4c08 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_030006) do +ActiveRecord::Schema.define(version: 2020_05_27_033425) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,6 +33,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "customer_id" t.bigint "video_id" + t.boolean "returned", default: false t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["video_id"], name: "index_rentals_on_video_id" end From 809f3abae165c2d708e8722a1159fbe945deb5e5 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 20:47:38 -0700 Subject: [PATCH 18/56] syntax cleanup --- app/models/rental.rb | 4 ++-- app/models/video.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 1adb4a58e..234408ad8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord - belongs_to: :video - belongs_to: :customer, counter_cache: true + belongs_to :video + belongs_to :customer, counter_cache: true end diff --git a/app/models/video.rb b/app/models/video.rb index fcf708c8d..c40a47c30 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,4 @@ class Video < ApplicationRecord - has_many: :rentals - has_many: :customers, through: :rentals + has_many :rentals + has_many :customers, through: :rentals end From 9d9c52d0dc2aa8590b1756d821d2ecaf2e817175 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 21:08:00 -0700 Subject: [PATCH 19/56] added routing for videos and rentals --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 2eb7a730d..483e3d777 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,10 @@ Rails.application.routes.draw do resources :customers, only: :index + + resources :videos, only: [:index, :show, :create] + + post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check_out', to: 'rentals#check_out', as: 'check_in' + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From cbd7a53b312a1db8a14b53d0d6606a06adf2f37b Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 21:51:21 -0700 Subject: [PATCH 20/56] initial scaffold for videos --- app/controllers/videos_controller.rb | 38 ++++++++++++++++++++++ test/controllers/videos_controller_test.rb | 36 ++++++++++++++++++++ 2 files changed, 74 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..778731036 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,38 @@ +class VideosController < ApplicationController + before_action :set_video, only: [:show] + + # GET /videos + def index + @videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory]) + render json: @videos, status: :ok + end + + + # GET /videos/1 + def show + render json: @video + end + + # POST /videos + def create + @video = Video.new(video_params) + + if @video.save + render json: @video, status: :created, location: @video + else + render json: @video.errors, status: :unprocessable_entity + end + end + + + private + # Use callbacks to share common setup or constraints between actions. + def set_video + @video = Video.find(params[:id]) + end + + # Only allow a trusted parameter "white list" through. + def video_params + params.fetch(:video, {}) + end +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..44cc72a67 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,36 @@ +require "test_helper" + +describe VideosController do + let(:video) { videos(:one) } + + it "should get index" do + get videos_url, as: :json + must_respond_with :success + end + + it "should create video" do + value do + post videos_url, params: { video: { } }, as: :json + end.must_differ "Video.count" + + must_respond_with 201 + end + + it "should show video" do + get video_url(@video), as: :json + must_respond_with :success + end + + it "should update video" do + patch video_url(@video), params: { video: { } }, as: :json + must_respond_with 200 + end + + it "should destroy video" do + value do + delete video_url(@video), as: :json + end.must_differ "Video.count", -1 + + must_respond_with 204 + end +end From 3cd09e19400f9cebe7fe81d59ddf4a1de8951a7a Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 21:58:21 -0700 Subject: [PATCH 21/56] Added model test for customer --- app/models/customer.rb | 1 + test/models/customer_test.rb | 50 +++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index fd1dc21c8..4589aab96 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals + #validates :name, :address, :city, :state, :postal_code, :phone, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..ff0219c45 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,51 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:new_video) { + new_video = Video.new( + title: "Space Jam", + overview: "basketball movie", + release_date: Time.new(2018, 1, 1), + inventory: 10, + ) + } + + describe "instantiation" do + it "can instantiate a customer" do + customer = Customer.new(name: 'Jane Doe', address: 'Ap #292-5216 Ipsu Rd.', city: 'Hillsboro', state: 'OR', postal_code: '24301', phone: '(322) 510-8691') + expect(customer.save)must_equal true + end + end + + describe "relationship" do + it "can have multiple rentals" + new_video.save! + video = Video.last + customer = customers(:customer1) + rental_1 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) + rental_2 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) + + customer.rentals << rental_1 + customer.rentals << rental_2 + + expect(customer.rental.count).must_be :>, 1 + customer.rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + end + + describe "validation" do + it "must have a name" do + customer = customers(:customer1) + expect(customer.valid?).must_equal false + expect(customer.errors.messages).must_include :name + expect(customer.errors.messages[:name]).must_include "can't be blank" + end + it "must have a postal code" do + customer = customers(:customer1) + expect(customer.valid?).must_equal false + expect(customer.errors.messages).must_include :postal_code + expect(customer.errors.messages[:postal_code]).must_include "can't be blank" + end + end end From 505e4108ce367c6bf2f96e50294ec0e6180320b5 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 26 May 2020 22:49:55 -0700 Subject: [PATCH 22/56] Added custom fields for customer model test --- config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- test/models/customer_test.rb | 84 +++++++++---------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 483e3d777..655822a9e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - resources :customers, only: :index + resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d4d32ec93..9c27a4388 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - customer_fields = ["id", "name", ] + CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort describe "index" do it "must get index" do get customers_path diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ff0219c45..449ab55d7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,51 +1,51 @@ require "test_helper" describe Customer do - let(:new_video) { - new_video = Video.new( - title: "Space Jam", - overview: "basketball movie", - release_date: Time.new(2018, 1, 1), - inventory: 10, - ) - } + # let(:new_video) { + # new_video = Video.new( + # title: "Space Jam", + # overview: "basketball movie", + # release_date: Time.new(2018, 1, 1), + # inventory: 10, + # ) + # } - describe "instantiation" do - it "can instantiate a customer" do - customer = Customer.new(name: 'Jane Doe', address: 'Ap #292-5216 Ipsu Rd.', city: 'Hillsboro', state: 'OR', postal_code: '24301', phone: '(322) 510-8691') - expect(customer.save)must_equal true - end - end + # describe "instantiation" do + # it "can instantiate a customer" do + # customer = Customer.new(name: 'Jane Doe', address: 'Ap #292-5216 Ipsu Rd.', city: 'Hillsboro', state: 'OR', postal_code: '24301', phone: '(322) 510-8691') + # expect(customer.save)must_equal true + # end + # end - describe "relationship" do - it "can have multiple rentals" - new_video.save! - video = Video.last - customer = customers(:customer1) - rental_1 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) - rental_2 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) + # describe "relationship" do + # it "can have multiple rentals" + # new_video.save! + # video = Video.last + # customer = customers(:customer1) + # rental_1 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) + # rental_2 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) - customer.rentals << rental_1 - customer.rentals << rental_2 + # customer.rentals << rental_1 + # customer.rentals << rental_2 - expect(customer.rental.count).must_be :>, 1 - customer.rentals.each do |rental| - expect(rental).must_be_instance_of Rental - end - end + # expect(customer.rental.count).must_be :>, 1 + # customer.rentals.each do |rental| + # expect(rental).must_be_instance_of Rental + # end + # end - describe "validation" do - it "must have a name" do - customer = customers(:customer1) - expect(customer.valid?).must_equal false - expect(customer.errors.messages).must_include :name - expect(customer.errors.messages[:name]).must_include "can't be blank" - end - it "must have a postal code" do - customer = customers(:customer1) - expect(customer.valid?).must_equal false - expect(customer.errors.messages).must_include :postal_code - expect(customer.errors.messages[:postal_code]).must_include "can't be blank" - end - end + # describe "validation" do + # it "must have a name" do + # customer = customers(:customer1) + # expect(customer.valid?).must_equal false + # expect(customer.errors.messages).must_include :name + # expect(customer.errors.messages[:name]).must_include "can't be blank" + # end + # it "must have a postal code" do + # customer = customers(:customer1) + # expect(customer.valid?).must_equal false + # expect(customer.errors.messages).must_include :postal_code + # expect(customer.errors.messages[:postal_code]).must_include "can't be blank" + # end + # end end From 5aa99828f15a97c1724c5fc97e6756851ff36cae Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:21:10 -0700 Subject: [PATCH 23/56] added validations to video --- app/models/video.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index c40a47c30..e420fb015 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,12 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: :available_inventory } + validates :available_inventory, presence: true, numericality: { only_integer: true } + + end From 917a53c5fee57e9e744b3c4de18260b2ceda452e Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:21:35 -0700 Subject: [PATCH 24/56] added exception rescue handling to application controller --- app/controllers/application_controller.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..20d9f10e6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,14 @@ class ApplicationController < ActionController::API + + #using error handling pattern from https://blog.rebased.pl/2016/11/07/api-error-handling.html + rescue_from ActiveRecord::RecordInvalid, with: :render_unprocessable_entity_response + rescue_from ActiveRecord::RecordNotFound, with: :render_not_found_response + + def render_unprocessable_entity_response(exception) + render json: exception.record.errors, status: :unprocessable_entity + end + + def render_not_found_response(exception) + render json: { errors: ['Not Found'] } , status: :not_found + end end From 711f1121709f6001926cfa5bcb8f1a989ceb18e9 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:22:17 -0700 Subject: [PATCH 25/56] smoke tests for index and show passing --- app/controllers/videos_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 778731036..f92a0aab4 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -4,13 +4,13 @@ class VideosController < ApplicationController # GET /videos def index @videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory]) - render json: @videos, status: :ok + render json: @videos end - # GET /videos/1 def show - render json: @video + @video = @video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]) + render json: @video, status: :ok end # POST /videos @@ -18,7 +18,7 @@ def create @video = Video.new(video_params) if @video.save - render json: @video, status: :created, location: @video + render json: {id: @video.id}, status: :created, location: @video else render json: @video.errors, status: :unprocessable_entity end @@ -28,7 +28,7 @@ def create private # Use callbacks to share common setup or constraints between actions. def set_video - @video = Video.find(params[:id]) + @video = Video.find(params[:id]) end # Only allow a trusted parameter "white list" through. From fa32b7e3d578343e96c055e05ed483efee02cf38 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:42:01 -0700 Subject: [PATCH 26/56] create method on videos now returning correct response data --- app/controllers/videos_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f92a0aab4..36f0062d6 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -20,11 +20,10 @@ def create if @video.save render json: {id: @video.id}, status: :created, location: @video else - render json: @video.errors, status: :unprocessable_entity + render json: {errors: @video.errors }, status: :bad_request end end - private # Use callbacks to share common setup or constraints between actions. def set_video @@ -33,6 +32,7 @@ def set_video # Only allow a trusted parameter "white list" through. def video_params - params.fetch(:video, {}) + # params.fetch(:video, {}) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end From 2487a0ea51c9feb89c700644af5597ba497069d7 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:47:02 -0700 Subject: [PATCH 27/56] added videos count to customer index results --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 355ca3696..0a103ef55 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 - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok end end From 408d7f5770516c52c3cf5adf99329bcead7df776 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:47:42 -0700 Subject: [PATCH 28/56] file cleanup --- app/controllers/videos_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 36f0062d6..2c4074ddf 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -18,9 +18,9 @@ def create @video = Video.new(video_params) if @video.save - render json: {id: @video.id}, status: :created, location: @video + render json: { id: @video.id }, status: :created, location: @video else - render json: {errors: @video.errors }, status: :bad_request + render json: { errors: @video.errors }, status: :bad_request end end From 1a934994e3d8a7336f5f20d7010c764ba2455ea3 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:48:43 -0700 Subject: [PATCH 29/56] renamed rental routes to match tests --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 655822a9e..29c0c4bab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ resources :videos, only: [:index, :show, :create] - post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' - post '/rentals/check_out', to: 'rentals#check_out', as: 'check_in' + post '/rentals/check_out', to: 'rentals#check_out', as: 'check-out' + post '/rentals/check_out', to: 'rentals#check_out', as: 'check-in' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 8419077dbb25f1a215f44114c73d2f9e857827fa Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Tue, 26 May 2020 23:50:20 -0700 Subject: [PATCH 30/56] scaffolding for rentals controller --- app/controllers/rentals_controller.rb | 51 +++++++++++++++++++++ test/controllers/rentals_controller_test.rb | 36 +++++++++++++++ 2 files changed, 87 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..782ecf070 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,51 @@ +class RentalsController < ApplicationController + before_action :set_rental, only: [:show, :update, :destroy] + + # GET /rentals + def index + @rentals = Rental.all + + render json: @rentals + end + + # GET /rentals/1 + def show + render json: @rental + end + + # POST /rentals + def create + @rental = Rental.new(rental_params) + + if @rental.save + render json: @rental, status: :created, location: @rental + else + render json: @rental.errors, status: :unprocessable_entity + end + end + + # PATCH/PUT /rentals/1 + def update + if @rental.update(rental_params) + render json: @rental + else + render json: @rental.errors, status: :unprocessable_entity + end + end + + # DELETE /rentals/1 + def destroy + @rental.destroy + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_rental + @rental = Rental.find(params[:id]) + end + + # Only allow a trusted parameter "white list" through. + def rental_params + params.fetch(:rental, {}) + end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..9155458ad --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,36 @@ +require "test_helper" + +describe RentalsController do + let(:rental) { rentals(:one) } + + it "should get index" do + get rentals_url, as: :json + must_respond_with :success + end + + it "should create rental" do + value do + post rentals_url, params: { rental: { } }, as: :json + end.must_differ "Rental.count" + + must_respond_with 201 + end + + it "should show rental" do + get rental_url(@rental), as: :json + must_respond_with :success + end + + it "should update rental" do + patch rental_url(@rental), params: { rental: { } }, as: :json + must_respond_with 200 + end + + it "should destroy rental" do + value do + delete rental_url(@rental), as: :json + end.must_differ "Rental.count", -1 + + must_respond_with 204 + end +end From ca8866060e018edaa87f12edff5eb46db2652d28 Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 27 May 2020 00:23:57 -0700 Subject: [PATCH 31/56] Update controller test --- test/controllers/customers_controller_test.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9c27a4388..d14f800e2 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,12 +1,14 @@ require "test_helper" describe CustomersController do - CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort + #CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort describe "index" do - it "must get index" do + it "includes json and responds with success" do get customers_path expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + must_respond_with 200 end it "responds with customer data" do @@ -15,6 +17,7 @@ expect(body).must_be_instance_of Array body.each do |customer| expect(customer).must_be_instance_of Hash + #expect(customer.keys.sort).must_equal CUSTOMER_FIELDS end end @@ -25,6 +28,7 @@ expect(body).must_be_instance_of Array expect(body.length).must_equal 0 expect(body).must_equal [] + end end end From 91da190b668e745644d260deb8263ec7c7d2cf2e Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 00:28:21 -0700 Subject: [PATCH 32/56] replaced boolean returned column with datetime returned column --- db/migrate/20200527072441_removed_returned_column.rb | 5 +++++ db/migrate/20200527072536_add_returned_column_with_date.rb | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 db/migrate/20200527072441_removed_returned_column.rb create mode 100644 db/migrate/20200527072536_add_returned_column_with_date.rb diff --git a/db/migrate/20200527072441_removed_returned_column.rb b/db/migrate/20200527072441_removed_returned_column.rb new file mode 100644 index 000000000..e4b931785 --- /dev/null +++ b/db/migrate/20200527072441_removed_returned_column.rb @@ -0,0 +1,5 @@ +class RemovedReturnedColumn < ActiveRecord::Migration[6.0] + def change + remove_column :rentals, :returned + end +end diff --git a/db/migrate/20200527072536_add_returned_column_with_date.rb b/db/migrate/20200527072536_add_returned_column_with_date.rb new file mode 100644 index 000000000..ea3a1e8d8 --- /dev/null +++ b/db/migrate/20200527072536_add_returned_column_with_date.rb @@ -0,0 +1,5 @@ +class AddReturnedColumnWithDate < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :returned_on, :datetime + end +end From 9e3e28828f5ec9118b8bbd8e926da74883c4f765 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 00:29:13 -0700 Subject: [PATCH 33/56] updated schema --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 67aba4c08..9c69c3409 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_033425) do +ActiveRecord::Schema.define(version: 2020_05_27_072536) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,7 +33,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "customer_id" t.bigint "video_id" - t.boolean "returned", default: false + t.datetime "returned_on" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["video_id"], name: "index_rentals_on_video_id" end From bd53752166ea85c86ff8e97d39627b52c70e8765 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 00:44:33 -0700 Subject: [PATCH 34/56] added validation testing for customer model --- test/models/customer_test.rb | 55 +++++++----------------------------- 1 file changed, 10 insertions(+), 45 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 449ab55d7..5d3ce23f6 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,51 +1,16 @@ require "test_helper" describe Customer do - # let(:new_video) { - # new_video = Video.new( - # title: "Space Jam", - # overview: "basketball movie", - # release_date: Time.new(2018, 1, 1), - # inventory: 10, - # ) - # } + let(:customer) { customers(:Jane) } - # describe "instantiation" do - # it "can instantiate a customer" do - # customer = Customer.new(name: 'Jane Doe', address: 'Ap #292-5216 Ipsu Rd.', city: 'Hillsboro', state: 'OR', postal_code: '24301', phone: '(322) 510-8691') - # expect(customer.save)must_equal true - # end - # end + describe "validations" do + it "is valid when all required fields are present" do + expect(customer.valid?).must_equal true + end - # describe "relationship" do - # it "can have multiple rentals" - # new_video.save! - # video = Video.last - # customer = customers(:customer1) - # rental_1 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) - # rental_2 = Rental.new(video: video, checkout: Time.new(2020, 1, 1), due_date: Time.new(2020, 1, 7)) - - # customer.rentals << rental_1 - # customer.rentals << rental_2 - - # expect(customer.rental.count).must_be :>, 1 - # customer.rentals.each do |rental| - # expect(rental).must_be_instance_of Rental - # end - # end - - # describe "validation" do - # it "must have a name" do - # customer = customers(:customer1) - # expect(customer.valid?).must_equal false - # expect(customer.errors.messages).must_include :name - # expect(customer.errors.messages[:name]).must_include "can't be blank" - # end - # it "must have a postal code" do - # customer = customers(:customer1) - # expect(customer.valid?).must_equal false - # expect(customer.errors.messages).must_include :postal_code - # expect(customer.errors.messages[:postal_code]).must_include "can't be blank" - # end - # end + it "is invalid with a field is missing" do + customer.name = nil + expect(customer.valid?).must_equal false + end + end end From 3079378019137a23cd866d1e74ac82da9de5aef7 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 00:45:31 -0700 Subject: [PATCH 35/56] restored validations for customer model --- app/models/customer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 4589aab96..ff7744115 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals - #validates :name, :address, :city, :state, :postal_code, :phone, presence: true + validates :name, :address, :city, :state, :postal_code, :phone, presence: true end From 3f3bb924b88fa3c5ce6d00c885b216e13f5453ca Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 27 May 2020 00:56:39 -0700 Subject: [PATCH 36/56] Added test for model/video --- test/fixtures/customers.yml | 6 +++--- test/fixtures/videos.yml | 6 ++++++ test/models/rental_test.rb | 4 +--- test/models/video_test.rb | 15 ++++++++++++--- 4 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 test/fixtures/videos.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index c209c0119..bc4f3d63f 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,8 +1,8 @@ Jane: name: Jane Doe - registered_at: Wed, 29 Apr 2015 07:54:13 -0700, - address: Ap #292-5216 Ipsu Rd., - city: Hillsboro, + registered_at: Wed, 29 Apr 2015 07:54:13 -0700 + address: Ap 292-5216 Ipsu Rd + city: Hillsboro state: OR, postal_code: 24300, phone: (322) 510-8690 diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..6be95e9e1 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,6 @@ +Jumanji: + title: Jumanji, + overview: Dark board game, + release_date: 2013-09-13, + total_inventory: 10, + available_inventory: 4, \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..0bea59f1c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,5 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..819eadd06 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,16 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:video) { videos(:Jumanji) } + + describe "validations" do + it "is valid when all required fields are present" do + expect(video.valid?).must_equal true + end + + it "is invalid with a field is missing" do + video.title = nil + expect(video.valid?).must_equal false + end + end end From bd97156e81b6f702de08d9716297f1cd0cb5912e Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 02:37:00 -0700 Subject: [PATCH 37/56] fixed typo in routing --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 29c0c4bab..9d0d89deb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ resources :videos, only: [:index, :show, :create] - post '/rentals/check_out', to: 'rentals#check_out', as: 'check-out' - post '/rentals/check_out', to: 'rentals#check_out', as: 'check-in' + post '/rentals/check-out', to: 'rentals#check_out', as: 'check-out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check-in' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 3ff3ee56e8cfbed2e752687ba92301abe54b1682 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 02:37:25 -0700 Subject: [PATCH 38/56] added customer tests --- test/models/customer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5d3ce23f6..a6fa3e351 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -13,4 +13,4 @@ expect(customer.valid?).must_equal false end end -end +end \ No newline at end of file From d00f39d3d3d47202f4a796e1ca001ee939435c6b Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 02:38:06 -0700 Subject: [PATCH 39/56] checkout method matching expected behavior, passing smoke tests --- app/controllers/rentals_controller.rb | 100 ++++++++++++++++++++------ app/models/customer.rb | 5 ++ app/models/rental.rb | 2 +- 3 files changed, 83 insertions(+), 24 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 782ecf070..4af0b3d54 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,42 +1,96 @@ class RentalsController < ApplicationController before_action :set_rental, only: [:show, :update, :destroy] - # GET /rentals - def index - @rentals = Rental.all + # POST /rentals/check-in + def check_in + # @rental = Rental.new(rental_params) + rental = Rental.last - render json: @rentals - end + # rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) + if rental + rental.returned_on = Time.now + rental.video.available_inventory += 1 + # customer_id, video_id, videos_checked_out_count, available_inventory + response = { + customer_id: rental.customer_id, + video_id: rental.video_id, + videos_checked_out_count: rental.customer.videos_out.count , + returned_on: rental.returned_on, + # videos_checked_out_count: @rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory, + } + render json: response, status: :ok + else + render json: { error: rental }, status: :unprocessable_entity + end - # GET /rentals/1 - def show - render json: @rental end - # POST /rentals - def create + # POST /rentals/check-out + # create a new Rental record + # params: customer_id, video_id + # on success: increase customer's videos checked out +1 (done via counter cache) + # decrease video available inventory by 1 + def check_out @rental = Rental.new(rental_params) if @rental.save - render json: @rental, status: :created, location: @rental + @rental.video.available_inventory -= 1 + response = { + customer_id: @rental.customer_id, + video_id: @rental.video_id, + due_date: get_due_date(@rental), + videos_checked_out_count: @rental.customer.videos_out.count, + # videos_checked_out_count: @rental.customer.videos_checked_out_count, + available_inventory: @rental.video.available_inventory + } + render json: response, status: :ok else render json: @rental.errors, status: :unprocessable_entity end end - # PATCH/PUT /rentals/1 - def update - if @rental.update(rental_params) - render json: @rental - else - render json: @rental.errors, status: :unprocessable_entity - end + def get_due_date(rental) + return rental.created_at + 7.days end - # DELETE /rentals/1 - def destroy - @rental.destroy - end + + # # GET /rentals + # def index + # @rentals = Rental.all + + # render json: @rentals + # end + + # # GET /rentals/1 + # def show + # render json: @rental + # end + + # # POST /rentals + # def create + # @rental = Rental.new(rental_params) + + # if @rental.save + # render json: @rental, status: :created, location: @rental + # else + # render json: @rental.errors, status: :unprocessable_entity + # end + # end + + # # PATCH/PUT /rentals/1 + # def update + # if @rental.update(rental_params) + # render json: @rental + # else + # render json: @rental.errors, status: :unprocessable_entity + # end + # end + + # # DELETE /rentals/1 + # def destroy + # @rental.destroy + # end private # Use callbacks to share common setup or constraints between actions. @@ -46,6 +100,6 @@ def set_rental # Only allow a trusted parameter "white list" through. def rental_params - params.fetch(:rental, {}) + params.permit(:customer_id, :video_id) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index ff7744115..2c1295631 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,9 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals validates :name, :address, :city, :state, :postal_code, :phone, presence: true + + def videos_out + return videos.where("returned_on".nil?) + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 234408ad8..0ff4552ad 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord belongs_to :video - belongs_to :customer, counter_cache: true + belongs_to :customer, counter_cache: :videos_checked_out_count end From b958fc329e840f23138ec883620bb9402d7ac10a Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 02:54:03 -0700 Subject: [PATCH 40/56] removed counter cache --- app/controllers/rentals_controller.rb | 11 +++++------ app/models/rental.rb | 3 ++- db/migrate/20200527095053_remove_counter_cache.rb | 5 +++++ db/schema.rb | 3 +-- 4 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20200527095053_remove_counter_cache.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4af0b3d54..f4074e966 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,18 +3,17 @@ class RentalsController < ApplicationController # POST /rentals/check-in def check_in - # @rental = Rental.new(rental_params) - rental = Rental.last + rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) - # rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) if rental - rental.returned_on = Time.now - rental.video.available_inventory += 1 + # rental.returned_on = Time.now + # rental.video.available_inventory += 1 # customer_id, video_id, videos_checked_out_count, available_inventory response = { customer_id: rental.customer_id, video_id: rental.video_id, - videos_checked_out_count: rental.customer.videos_out.count , + videos_checked_out_count: rental.customer.videos_out.count, + videos: rental.customer.rentals, returned_on: rental.returned_on, # videos_checked_out_count: @rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory, diff --git a/app/models/rental.rb b/app/models/rental.rb index 0ff4552ad..e59b086a5 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,5 @@ class Rental < ApplicationRecord belongs_to :video - belongs_to :customer, counter_cache: :videos_checked_out_count + belongs_to :customer + end diff --git a/db/migrate/20200527095053_remove_counter_cache.rb b/db/migrate/20200527095053_remove_counter_cache.rb new file mode 100644 index 000000000..7abc829ea --- /dev/null +++ b/db/migrate/20200527095053_remove_counter_cache.rb @@ -0,0 +1,5 @@ +class RemoveCounterCache < ActiveRecord::Migration[6.0] + def change + remove_column :customers, :videos_checked_out_count + end +end diff --git a/db/schema.rb b/db/schema.rb index 9c69c3409..d3061ee6e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_072536) do +ActiveRecord::Schema.define(version: 2020_05_27_095053) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,6 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.integer "videos_checked_out_count", default: 0 end create_table "rentals", force: :cascade do |t| From ea7328530e677cd6438d341799012386457b2874 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 03:22:55 -0700 Subject: [PATCH 41/56] refactored video count and index methods --- app/controllers/customers_controller.rb | 8 ++++++-- app/models/customer.rb | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0a103ef55..a6c30027b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,10 @@ class CustomersController < ApplicationController def index - customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok + @customers = Customer.all + + render json: @customers.to_json( + :only => [:id, :name, :registered_at, :postal_code, :phone], :methods => [:videos_checked_out_count]), status: :ok end end + + diff --git a/app/models/customer.rb b/app/models/customer.rb index 2c1295631..866684132 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,8 +3,8 @@ class Customer < ApplicationRecord has_many :videos, through: :rentals validates :name, :address, :city, :state, :postal_code, :phone, presence: true - def videos_out - return videos.where("returned_on".nil?) + def videos_checked_out_count + return videos.where("returned_on".nil?).count end end From ed8821aab0bca598baf3762bc286e9aedc9891fc Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 04:08:16 -0700 Subject: [PATCH 42/56] stable but failing check in smoke tests --- app/controllers/rentals_controller.rb | 17 ++++++++--------- app/models/customer.rb | 6 +++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f4074e966..01df926d4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,17 +6,17 @@ def check_in rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) if rental - # rental.returned_on = Time.now - # rental.video.available_inventory += 1 - # customer_id, video_id, videos_checked_out_count, available_inventory + rental.returned_on = Time.now + rental.save + rental.video.available_inventory += 1 response = { + rental_id: rental.id, customer_id: rental.customer_id, video_id: rental.video_id, - videos_checked_out_count: rental.customer.videos_out.count, - videos: rental.customer.rentals, - returned_on: rental.returned_on, - # videos_checked_out_count: @rental.customer.videos_checked_out_count, + videos_checked_out_count: rental.customer.videos_checked_out_count, + rentals: rental.customer.videos_out, available_inventory: rental.video.available_inventory, + returned_on: rental.returned_on, } render json: response, status: :ok else @@ -39,8 +39,7 @@ def check_out customer_id: @rental.customer_id, video_id: @rental.video_id, due_date: get_due_date(@rental), - videos_checked_out_count: @rental.customer.videos_out.count, - # videos_checked_out_count: @rental.customer.videos_checked_out_count, + videos_checked_out_count: @rental.customer.videos_checked_out_count, available_inventory: @rental.video.available_inventory } render json: response, status: :ok diff --git a/app/models/customer.rb b/app/models/customer.rb index 866684132..8f6216821 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,7 +4,11 @@ class Customer < ApplicationRecord validates :name, :address, :city, :state, :postal_code, :phone, presence: true def videos_checked_out_count - return videos.where("returned_on".nil?).count + return self.rentals.where(returned_on: nil).count + end + + def videos_out + return self.rentals.where(returned_on: nil) end end From 8c18a969d7d554a91bd1f4dba1b4ad812de00899 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 04:36:56 -0700 Subject: [PATCH 43/56] added customer method to calculate number of open rentals --- app/controllers/customers_controller.rb | 1 + app/controllers/rentals_controller.rb | 6 ++---- app/models/customer.rb | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a6c30027b..4a23f3d04 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,6 +4,7 @@ def index render json: @customers.to_json( :only => [:id, :name, :registered_at, :postal_code, :phone], :methods => [:videos_checked_out_count]), status: :ok + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 01df926d4..b67ecda1f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,16 +7,14 @@ def check_in if rental rental.returned_on = Time.now - rental.save rental.video.available_inventory += 1 + rental.save + response = { - rental_id: rental.id, customer_id: rental.customer_id, video_id: rental.video_id, videos_checked_out_count: rental.customer.videos_checked_out_count, - rentals: rental.customer.videos_out, available_inventory: rental.video.available_inventory, - returned_on: rental.returned_on, } render json: response, status: :ok else diff --git a/app/models/customer.rb b/app/models/customer.rb index 8f6216821..762539d0d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,8 +7,4 @@ def videos_checked_out_count return self.rentals.where(returned_on: nil).count end - def videos_out - return self.rentals.where(returned_on: nil) - end - end From 95b849115a9765bb9250c3d503ef44d843ae07ab Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 04:37:34 -0700 Subject: [PATCH 44/56] manual rollback of previous column removal --- .../20200527110848_remove_available_inventory_column.rb | 5 +++++ db/migrate/20200527111329_add_column_back_to_match_seed.rb | 5 +++++ db/schema.rb | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20200527110848_remove_available_inventory_column.rb create mode 100644 db/migrate/20200527111329_add_column_back_to_match_seed.rb diff --git a/db/migrate/20200527110848_remove_available_inventory_column.rb b/db/migrate/20200527110848_remove_available_inventory_column.rb new file mode 100644 index 000000000..9d130900c --- /dev/null +++ b/db/migrate/20200527110848_remove_available_inventory_column.rb @@ -0,0 +1,5 @@ +class RemoveAvailableInventoryColumn < ActiveRecord::Migration[6.0] + def change + remove_column :videos, :available_inventory + end +end diff --git a/db/migrate/20200527111329_add_column_back_to_match_seed.rb b/db/migrate/20200527111329_add_column_back_to_match_seed.rb new file mode 100644 index 000000000..851c6bbf9 --- /dev/null +++ b/db/migrate/20200527111329_add_column_back_to_match_seed.rb @@ -0,0 +1,5 @@ +class AddColumnBackToMatchSeed < ActiveRecord::Migration[6.0] + def change + add_column :videos, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index d3061ee6e..f58776378 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_095053) do +ActiveRecord::Schema.define(version: 2020_05_27_111329) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,9 +42,9 @@ 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 + t.integer "available_inventory" end add_foreign_key "rentals", "customers" From c988eeac2958bdc74d38097fe032ecfa4abb299d Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 11:34:19 -0700 Subject: [PATCH 45/56] removed available inventory column and STICKING WITH IT THIS TIME i promise --- app/controllers/application_controller.rb | 11 - app/controllers/rentals_controller.rb | 8 +- app/controllers/videos_controller.rb | 29 +- app/models/video.rb | 5 +- ...available_inventory_column_for_realsies.rb | 5 + db/schema.rb | 3 +- db/seeds.rb | 1 - db/seeds/videos.json | 270 ++++++------------ 8 files changed, 123 insertions(+), 209 deletions(-) create mode 100644 db/migrate/20200527182514_removing_available_inventory_column_for_realsies.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 20d9f10e6..3f1a60270 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,14 +1,3 @@ class ApplicationController < ActionController::API - #using error handling pattern from https://blog.rebased.pl/2016/11/07/api-error-handling.html - rescue_from ActiveRecord::RecordInvalid, with: :render_unprocessable_entity_response - rescue_from ActiveRecord::RecordNotFound, with: :render_not_found_response - - def render_unprocessable_entity_response(exception) - render json: exception.record.errors, status: :unprocessable_entity - end - - def render_not_found_response(exception) - render json: { errors: ['Not Found'] } , status: :not_found - end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b67ecda1f..3e0a838ea 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,14 +7,14 @@ def check_in if rental rental.returned_on = Time.now - rental.video.available_inventory += 1 + # rental.video.available_inventory += 1 rental.save response = { customer_id: rental.customer_id, video_id: rental.video_id, videos_checked_out_count: rental.customer.videos_checked_out_count, - available_inventory: rental.video.available_inventory, + # available_inventory: rental.video.available_inventory, } render json: response, status: :ok else @@ -32,13 +32,13 @@ def check_out @rental = Rental.new(rental_params) if @rental.save - @rental.video.available_inventory -= 1 + # @rental.video.available_inventory -= 1 response = { customer_id: @rental.customer_id, video_id: @rental.video_id, due_date: get_due_date(@rental), videos_checked_out_count: @rental.customer.videos_checked_out_count, - available_inventory: @rental.video.available_inventory + # available_inventory: @rental.video.available_inventory } render json: response, status: :ok else diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 2c4074ddf..101a7864a 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,14 +3,20 @@ class VideosController < ApplicationController # GET /videos def index - @videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory]) + # TO-DO: available inventory + @videos = Video.all.as_json(only: [:id, :title, :release_date]) render json: @videos end # GET /videos/1 def show - @video = @video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]) - render json: @video, status: :ok + if @video + @video = @video.as_json(only: [:title, :overview, :release_date, :total_inventory]) + render json: @video, status: :ok + else + render json: { errors: ["Not Found"]}, status: :not_found + end + end # POST /videos @@ -18,21 +24,28 @@ def create @video = Video.new(video_params) if @video.save - render json: { id: @video.id }, status: :created, location: @video + render json: {id: @video.id}, status: :created, location: @video else - render json: { errors: @video.errors }, status: :bad_request + render json: {errors: @video.errors }, status: :bad_request end end private # Use callbacks to share common setup or constraints between actions. def set_video - @video = Video.find(params[:id]) + @video = Video.find_by(id: params[:id]) + # @video = Video.find(params[:id]) + + # rescue ActiveRecord::RecordNotFound => e + # render json: { + # error: e.to_s + # }, status: :not_found + end # Only allow a trusted parameter "white list" through. def video_params # params.fetch(:video, {}) - return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory) end -end +end \ No newline at end of file diff --git a/app/models/video.rb b/app/models/video.rb index e420fb015..63b197f1f 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -5,8 +5,7 @@ class Video < ApplicationRecord validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true - validates :total_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: :available_inventory } - validates :available_inventory, presence: true, numericality: { only_integer: true } - + # To-DO: check against available + validates :total_inventory, presence: true, numericality: { only_integer: true } end diff --git a/db/migrate/20200527182514_removing_available_inventory_column_for_realsies.rb b/db/migrate/20200527182514_removing_available_inventory_column_for_realsies.rb new file mode 100644 index 000000000..116d41c2f --- /dev/null +++ b/db/migrate/20200527182514_removing_available_inventory_column_for_realsies.rb @@ -0,0 +1,5 @@ +class RemovingAvailableInventoryColumnForRealsies < ActiveRecord::Migration[6.0] + def change + remove_column :videos, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index f58776378..ce3af55a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_111329) do +ActiveRecord::Schema.define(version: 2020_05_27_182514) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,7 +44,6 @@ t.integer "total_inventory" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.integer "available_inventory" end add_foreign_key "rentals", "customers" diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..cc99c3978 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,4 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 Customer.create!(customer) end diff --git a/db/seeds/videos.json b/db/seeds/videos.json index 341a098ac..6eae14832 100644 --- a/db/seeds/videos.json +++ b/db/seeds/videos.json @@ -3,630 +3,540 @@ "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 + "total_inventory": 10 }, { "title": "Savior Of The Curse", "overview": "The strange woman claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Unsure what to think of all this and of this strange woman, the boy hesitantly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date": "2010-11-05", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Women Of Destruction", "overview": "But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell.", "release_date": "2006-10-01", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Robots Of Eternity", "overview": "The laid-back life of a woman is going in a different direction as a childhood friend enters her life.", "release_date": "2007-10-10", - "total_inventory": 7, - "available_inventory": 5 + "total_inventory": 7 }, { "title": "Rats And Strangers", "overview": "The childhood friend claims the woman is heir to an incredible fortune, all paperwork has been taken care of already, all there's left to do is sign them. Distrustful of both this situation and of this childhood friend, the woman somewhat gladly agrees to the proposal, but there's no time to waste, a decision had to be made quickly.", "release_date": "2012-09-25", - "total_inventory": 2, - "available_inventory": 2 + "total_inventory": 2 }, { "title": "Soldiers And Gangsters", "overview": "But what if this childhood friend is just a crazy person. Or what if the complete opposite is true. How could an ordinary woman be relied upon in something this big. No turning back now though.", "release_date": "1948-03-31", - "total_inventory": 9, - "available_inventory": 8 + "total_inventory": 9 }, { "title": "Body Of Utopia", "overview": "The peaceful life of a teenage girl is going the complete opposite way as a stranger enters her life.", "release_date": "1967-10-25", - "total_inventory": 2, - "available_inventory": 2 + "total_inventory": 2 }, { "title": "Faith Of The Ancestors", "overview": "The stranger claims the teenage girl is now part of a murder investigation and might be the number one suspect, no arrest will be made in front of possible friends and neighbors if there's no resistance. Concerned of the situation and a little distrustful of this stranger, the teenage girl tentatively agrees to the proposal, no matter what, something has to be done in this situation, hopefully this was the right choice.", "release_date": "1953-10-05", - "total_inventory": 7, - "available_inventory": 6 + "total_inventory": 7 }, { "title": "Traces In The Leaders", "overview": "But what if this stranger cannot be relied upon. Or what if somebody is orchestrating all of this. How could an ordinary teenage girl figure out the truth in all of this. Either way, the choice has been made.", "release_date": "1970-11-03", - "total_inventory": 6, - "available_inventory": 4 + "total_inventory": 6 }, { "title": "Bathing In The Void", "overview": "The stressful life of a girl changes for better or worse as a stranger enters her life.", "release_date": "2013-09-13", - "total_inventory": 10, - "available_inventory": 4 + "total_inventory": 10 }, { "title": "Mouse Of My House", "overview": "The stranger claims the girl is now cursed along with everybody else in this town. Why? By whom? What kind of curse exactly? Nobody seems to know, but the person supposedly responsible for this curse will explain everything at the town hall this afternoon, everybody should come. Unsure what to think of all this and of this stranger, the girl cautiously agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date": "1993-12-27", - "total_inventory": 3, - "available_inventory": 2 + "total_inventory": 3 }, { "title": "Baby Of Tomorrow", "overview": "But what if this stranger is trying be misleading. Or what if the complete opposite is true. How could an ordinary girl find out what's happening without help. Only one way to find out.", "release_date": "1977-03-23", - "total_inventory": 4, - "available_inventory": 2 + "total_inventory": 4 }, { "title": "Cats Of Wonder", "overview": "The carefree life of a young girl will change forever as a neighbor enters her life.", "release_date": "1939-03-13", - "total_inventory": 9, - "available_inventory": 2 + "total_inventory": 9 }, { "title": "Kittens Of Excelsior", "overview": "The neighbor claims the young girl better leave the city now. The rivaling gangs have spiraled into an all out war, soon the entire city will be a battleground and the government apparently plans to surround the city and let the gangs fight it out, better to let them kill each other than risk soldier lives they say. Unsure what to think of all this and of this neighbor, the young girl oddly willingly agrees to the proposal, the situation is all too strange, it's best to get more information as soon as possible.", "release_date": "1965-06-10", - "total_inventory": 9, - "available_inventory": 5 + "total_inventory": 9 }, { "title": "Dinos And Boys", "overview": "But what if this neighbor can't be trusted. Or what if all this is an elaborate trap. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. No turning back now though.", "release_date": "1973-10-20", - "total_inventory": 10, - "available_inventory": 9 + "total_inventory": 10 }, { "title": "Tigers And Kids", "overview": "The secluded life of a elderly woman is going in a different direction as a friendly acquaintance enters her life.", "release_date": "2007-03-17", - "total_inventory": 6, - "available_inventory": 2 + "total_inventory": 6 }, { "title": "Wand Of My Country", "overview": "The friendly acquaintance claims the elderly woman is needed, all capable hands are needed. The dam is breaking and if we don't get every person working on repairing it the entire town might be destroyed by the following flood. Concerned of the situation and a little distrustful of this friendly acquaintance, the elderly woman oddly enthusiastically agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date": "1960-06-26", - "total_inventory": 10, - "available_inventory": 9 + "total_inventory": 10 }, { "title": "Tales Of My Imagination", "overview": "But what if this friendly acquaintance is pulling a prank. Or what if the wrong person was picked for this. How could an ordinary elderly woman play a part in all this. No turning back now though.", "release_date": "1985-09-21", - "total_inventory": 3, - "available_inventory": 2 + "total_inventory": 3 }, { "title": "Learning With My Home", "overview": "The calm life of a elderly man is going the complete opposite way as a strange boy enters his life.", "release_date": "1939-09-01", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Fearless With My Home", "overview": "The strange boy claims the elderly man is one of the rare few people in possession of a guardian animal spirit. It's widely known these exist and rituals are held on a near weekly basis to connect with these guardian spirits, now its time to be the center of that ritual. Unconvinced of the situation, but trusting of this strange boy, the elderly man hesitantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date": "1965-03-28", - "total_inventory": 7, - "available_inventory": 7 + "total_inventory": 7 }, { "title": "Thief Without A Conscience", "overview": "But what if this strange boy can't be trusted. Or what if there's a change of mind. How could an ordinary elderly man be this important to the situation. Time to find out.", "release_date": "1982-11-14", - "total_inventory": 3, - "available_inventory": 1 + "total_inventory": 3 }, { "title": "Knight Of Last Rites", "overview": "The normal life of a girl will be changed completely as a strange man enters her life.", "release_date": "1973-12-16", - "total_inventory": 7, - "available_inventory": 5 + "total_inventory": 7 }, { "title": "Horses With Hoods", "overview": "The strange man claims the girl plays a vital role in the future, but that this version of the future cannot be allowed to be. The only way to prevent it is by traveling in time with this supposed time traveler. Sure of the truth in this situation, but somewhat distrustful of this strange man, the girl somewhat hesitantly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date": "1965-09-16", - "total_inventory": 10, - "available_inventory": 6 + "total_inventory": 10 }, { "title": "Heirs With Gold", "overview": "But what if this strange man cannot be relied upon. Or what if all this is an elaborate trap. How could an ordinary girl be relied upon in something this big. Only one way to find out.", "release_date": "1949-10-03", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Scientists And Rats", "overview": "The ordinary life of a young guy take a sharp turn as a childhood friend enters his life.", "release_date": "1973-11-07", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Invaders And Guardians", "overview": "The childhood friend claims the young guy is in possession of a powerful artifact, an artifact which looks like any ordinary object, but an artifact which is of the utmost importance to this person, who will offer a reward for it. Sure of the truth in this situation, but somewhat distrustful of this childhood friend, the young guy oddly willingly agrees to the proposal, if all this turns out to be false, this choice will seem foolish, but it's still worth checking out.", "release_date": "1990-06-04", - "total_inventory": 10, - "available_inventory": 9 + "total_inventory": 10 }, { "title": "Accidents Of Hell", "overview": "But what if this childhood friend is a con artist. Or what if everything told is completely true. How could an ordinary young guy be relied upon in something this big. We're about to find out.", "release_date": "1944-03-24", - "total_inventory": 4, - "available_inventory": 3 + "total_inventory": 4 }, { "title": "Confinement Of War", "overview": "The fast-paced life of a teenage girl changes in an instant as a friendly acquaintance enters her life.", "release_date": "1959-04-06", - "total_inventory": 7, - "available_inventory": 7 + "total_inventory": 7 }, { "title": "Breath Of The Apocalypse", "overview": "The friendly acquaintance claims the teenage girl is actually already dead, a spirit trapped in a state of denial, not ready to move on yet. The person claims there's proof of this elsewhere. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the teenage girl oddly willingly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date": "1965-06-10", - "total_inventory": 5, - "available_inventory": 3 + "total_inventory": 5 }, { "title": "Force Of A Storm", "overview": "But what if this friendly acquaintance cannot be relied upon. Or what if there's a change of mind. How could an ordinary teenage girl find out what's happening without help. Time to find out.", "release_date": "1972-03-25", - "total_inventory": 3, - "available_inventory": 2 + "total_inventory": 3 }, { "title": "Officer Without Fear", "overview": "The ordinary life of a woman changes for better or worse as a strange woman enters her life.", "release_date": "1987-03-06", - "total_inventory": 2, - "available_inventory": 1 + "total_inventory": 2 }, { "title": "Spider Of The Gods", "overview": "The strange woman claims the woman was a witness of a horrific crime, a crime for which an innocent person is in jail for. Due to the horrific nature of the crime the memory was likely blocked, but there's a way to unblock it and save an innocent life. Unconvinced of the situation, but trusting of this strange woman, the woman somewhat keenly agrees to the proposal, the situation is all too strange, it's best to get more information as soon as possible.", "release_date": "2010-01-16", - "total_inventory": 2, - "available_inventory": 1 + "total_inventory": 2 }, { "title": "Women Of Insanity", "overview": "But what if this strange woman can't be trusted. Or what if the complete opposite is true. How could an ordinary woman end up in a situation like this. Only one way to find out.", "release_date": "1997-10-03", - "total_inventory": 10, - "available_inventory": 2 + "total_inventory": 10 }, { "title": "Doctors Of Water", "overview": "The stable life of a teenage girl changes for better or worse as a stranger enters her life.", "release_date": "1953-04-03", - "total_inventory": 11, - "available_inventory": 3 + "total_inventory": 11 }, { "title": "Snakes And Turtles", "overview": "The stranger claims the teenage girl better leave the city now. The rivaling gangs have spiraled into an all out war, soon the entire city will be a battleground and the government apparently plans to surround the city and let the gangs fight it out, better to let them kill each other than risk soldier lives they say. Suspicious of this situation, but somewhat trusting of this stranger, the teenage girl unusually eagerly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date": "1992-12-14", - "total_inventory": 11, - "available_inventory": 8 + "total_inventory": 11 }, { "title": "Rogues And Boys", "overview": "But what if this stranger is pulling a prank. Or what if all this is an elaborate trap. How could an ordinary teenage girl find out what's happening without help. We're about to find out.", "release_date": "1979-12-30", - "total_inventory": 3, - "available_inventory": 1 + "total_inventory": 3 }, { "title": "Loss Of The Sea", "overview": "The relaxed life of a boy will change forever as a lost friend enters his life.", "release_date": "1976-07-16", - "total_inventory": 11, - "available_inventory": 5 + "total_inventory": 11 }, { "title": "Annihilation Of Autumn", "overview": "The lost friend claims the boy is in possession of a powerful artifact, one which looks like any other object, but one which could bring total destruction if fallen in the wrong hands. The person wishes to destroy it, with or without help. Unconvinced of the situation, but trusting of this lost friend, the boy oddly enthusiastically agrees to the proposal, it might be a mistake, but both options could've been the mistake, one had to be chosen.", "release_date": "2016-11-09", - "total_inventory": 6, - "available_inventory": 1 + "total_inventory": 6 }, { "title": "Searching At The Leaders", "overview": "But what if this lost friend is trying be misleading. Or what if the situation has changed or will change. How could an ordinary boy be this important to the situation. We're about to find out.", "release_date": "1995-12-21", - "total_inventory": 3, - "available_inventory": 3 + "total_inventory": 3 }, { "title": "Taste Of The Immortals", "overview": "The rough life of a young girl might turn out differently as a strange woman enters her life.", "release_date": "1948-02-12", - "total_inventory": 5, - "available_inventory": 4 + "total_inventory": 5 }, { "title": "Criminal Arrangement", "overview": "The strange woman claims the young girl is now cursed along with everybody else in this town. Why? By whom? What kind of curse exactly? Nobody seems to know, but the person supposedly responsible for this curse will explain everything at the town hall this afternoon, everybody should come. Unsure what to think of all this and of this strange woman, the young girl somewhat grudgingly agrees to the proposal, it's probably best to get to the bottom of this as soon as possible.", "release_date": "1939-04-23", - "total_inventory": 3, - "available_inventory": 3 + "total_inventory": 3 }, { "title": "Spider In The Window", "overview": "But what if this strange woman is a con artist. Or what if the complete opposite is true. How could an ordinary young girl find out what's happening without help. Either way, the choice has been made.", "release_date": "2007-06-29", - "total_inventory": 10, - "available_inventory": 4 + "total_inventory": 10 }, { "title": "Comedian Makeover", "overview": "The laid-back life of a young girl changes in an instant as a childhood friend enters her life.", "release_date": "1944-06-14", - "total_inventory": 4, - "available_inventory": 4 + "total_inventory": 4 }, { "title": "Baker On A Day Out", "overview": "The childhood friend claims the young girl is in for a fun day. A new casino opened up in town and is giving everybody a free roll on their slot machine, with a little luck who knows what could happen. Skeptical of this situation and of this childhood friend, the young girl cautiously agrees to the proposal, if anything this will at least speed things up, for better and for worse.", "release_date": "1948-07-26", - "total_inventory": 3, - "available_inventory": 2 + "total_inventory": 3 }, { "title": "Spider And Thief", "overview": "But what if this childhood friend is just a crazy person. Or what if everything told is completely true. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. No turning back now though.", "release_date": "1950-05-07", - "total_inventory": 10, - "available_inventory": 8 + "total_inventory": 10 }, { "title": "Rat And Chicken", "overview": "The carefree life of a elderly man will change forever as a strange woman enters his life.", "release_date": "1993-10-05", - "total_inventory": 8, - "available_inventory": 1 + "total_inventory": 8 }, { "title": "Laughing Stalks Me", "overview": "The strange woman claims the elderly man is now the citizen of a different country. The old country has just been taken over by an enemy force, everybody who wishes to leave this new nation has 3 days to do so. Distrustful of both this situation and of this strange woman, the elderly man tentatively agrees to the proposal, this whole situation is both exciting and terrifying at the same time, but surely the right choice was made.", "release_date": "1946-09-06", - "total_inventory": 2, - "available_inventory": 1 + "total_inventory": 2 }, { "title": "Fools Can Cook", "overview": "But what if this strange woman is a con artist. Or what if this proposal is wrong or missing important details. How could an ordinary elderly man be this important to the situation. Only one way to find out.", "release_date": "2013-11-20", - "total_inventory": 9, - "available_inventory": 7 + "total_inventory": 9 }, { "title": "Power Of The Project", "overview": "The unexciting life of a teenage boy is going in a different direction as a lost friend enters his life.", "release_date": "1982-02-19", - "total_inventory": 2, - "available_inventory": 1 + "total_inventory": 2 }, { "title": "Intelligence Of My Teacher", "overview": "The lost friend claims the teenage boy is in possession of a powerful artifact, one which looks like any other object, but one which could bring total destruction if fallen in the wrong hands. The person wishes to destroy it, with or without help. Unsure what to think of all this and of this lost friend, the teenage boy somewhat hesitantly agrees to the proposal, this whole situation is both exciting and terrifying at the same time, but surely the right choice was made.", "release_date": "2017-02-18", - "total_inventory": 10, - "available_inventory": 5 + "total_inventory": 10 }, { "title": "Priest Of Outer Space", "overview": "But what if this lost friend speaks only lies. Or what if the situation has changed or will change. How could an ordinary teenage boy come out of this situation in a better way. No turning back now though.", "release_date": "1975-12-06", - "total_inventory": 9, - "available_inventory": 3 + "total_inventory": 9 }, { "title": "Spy Of A Dog", "overview": "The secluded life of a teenage girl take a sharp turn as a stranger enters her life.", "release_date": "1972-11-18", - "total_inventory": 2, - "available_inventory": 2 + "total_inventory": 2 }, { "title": "Enemies Of The Mountain", "overview": "The stranger claims the teenage girl is in for a treat this afternoon. Supposedly this strange person has discovered a way to unlock the hidden potentials of the brain and will show the whole town this afternoon, it's not an event you want to miss. Concerned of the situation and a little distrusful of this stranger, the teenage girl tentatively agrees to the proposal, if anything this will at least speed things up, for better and for worse.", "release_date": "1956-10-16", - "total_inventory": 3, - "available_inventory": 2 + "total_inventory": 3 }, { "title": "Lions Of Tomorrow", "overview": "But what if this stranger is wrong about all this. Or what if this proposal is wrong or missing important details. How could an ordinary teenage girl be helpful at all in this situation. Either way, the choice has been made.", "release_date": "1983-07-03", - "total_inventory": 4, - "available_inventory": 3 + "total_inventory": 4 }, { "title": "Serpents And Kings", "overview": "The stable life of a elderly man might be changing forever as a friendly acquaintance enters his life.", "release_date": "2016-09-08", - "total_inventory": 7, - "available_inventory": 1 + "total_inventory": 7 }, { "title": "Agents And Robots", "overview": "The friendly acquaintance claims the elderly man plays a vital role in the future, but that this version of the future cannot be allowed to be. The only way to prevent it is by traveling in time with this supposed time traveler. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the elderly man oddly enthusiastically agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date": "1964-06-19", - "total_inventory": 6, - "available_inventory": 1 + "total_inventory": 6 }, { "title": "Death Of The Mountain", "overview": "But what if this friendly acquaintance is trying be misleading. Or what if the complete opposite is true. How could an ordinary elderly man be needed for a situation like this. Time will tell.", "release_date": "1973-07-22", - "total_inventory": 2, - "available_inventory": 1 + "total_inventory": 2 }, { "title": "Picture Of The Lake", "overview": "The casual life of a woman will change forever as a friendly acquaintance enters her life.", "release_date": "2014-10-19", - "total_inventory": 8, - "available_inventory": 7 + "total_inventory": 8 }, { "title": "Muted By The River", "overview": "The friendly acquaintance claims the woman is actually already dead, a spirit trapped in a state of denial, not ready to move on yet. The person claims there's proof of this elsewhere. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the woman hastily agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date": "1992-10-23", - "total_inventory": 3, - "available_inventory": 2 + "total_inventory": 3 }, { "title": "Young In The Chasm", "overview": "But what if this friendly acquaintance cannot be relied upon. Or what if the complete opposite is true. How could an ordinary woman be this important to the situation. Time to find out.", "release_date": "1948-05-21", - "total_inventory": 2, - "available_inventory": 2 + "total_inventory": 2 }, { "title": "Politicians Of The East", "overview": "The normal life of a girl might be changing forever as a new friend enters her life.", "release_date": "2010-11-30", - "total_inventory": 11, - "available_inventory": 2 + "total_inventory": 11 }, { "title": "Women Of Science", "overview": "The new friend claims the girl is the 'chosen one' according to an ancient prophecy. The prophecy states the chosen one will save the world, but only if properly trained. There is no time to waste. Distrustful of both this situation and of this new friend, the girl somewhat reluctantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date": "1956-04-02", - "total_inventory": 8, - "available_inventory": 6 + "total_inventory": 8 }, { "title": "Preys Of The North", "overview": "But what if this new friend is trying to manipulate the situation. Or what if everything told is completely true. How could an ordinary girl come out of this situation in a better way. No turning back now though.", "release_date": "1957-07-12", - "total_inventory": 5, - "available_inventory": 4 + "total_inventory": 5 }, { "title": "Kings Of Medicine", "overview": "The nonchalant life of a woman might turn out differently as a strange woman enters her life.", "release_date": "1966-12-22", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Stars And Sinners", "overview": "The strange woman claims the woman is actually the rightful heir to the throne, this information has obviously been kept secret by the current holders of the throne, but once this information gets out to the public the people will surely stand behind the true heir. Concerned of the situation and a little distrusful of this strange woman, the woman somewhat hesitantly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date": "1985-08-30", - "total_inventory": 11, - "available_inventory": 11 + "total_inventory": 11 }, { "title": "Fungi And Amphibians", "overview": "But what if this strange woman is trying to manipulate the situation. Or what if the wrong person was picked for this. How could an ordinary woman be this lucky, or unlucky, depending on the turnout. Either way, the choice has been made.", "release_date": "1971-02-07", - "total_inventory": 8, - "available_inventory": 2 + "total_inventory": 8 }, { "title": "Wonders Of The Hunt", "overview": "The laid-back life of a young guy has a chance to change, for better or worse, as a strange girl enters his life.", "release_date": "1978-04-01", - "total_inventory": 11, - "available_inventory": 2 + "total_inventory": 11 }, { "title": "Crimes Of The Mountains", "overview": "The strange girl claims the young guy is now part of a murder investigation and might be the number one suspect, no arrest will be made in front of possible friends and neighbors if there's no resistance. Suspicious of this situation, but somewhat trusting of this strange girl, the young guy oddly willingly agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date": "1959-01-29", - "total_inventory": 10, - "available_inventory": 3 + "total_inventory": 10 }, { "title": "Hidden The Swamps", "overview": "But what if this strange girl is wrong about all this. Or what if all this is an elaborate trap. How could an ordinary young guy be needed for a situation like this. We're about to find out.", "release_date": "1951-02-19", - "total_inventory": 7, - "available_inventory": 4 + "total_inventory": 7 }, { "title": "Love For Women", "overview": "The carefree life of a boy changes for better or worse as a friendly acquaintance enters his life.", "release_date": "1952-02-24", - "total_inventory": 5, - "available_inventory": 4 + "total_inventory": 5 }, { "title": "Boyfriend Of The Evening", "overview": "The friendly acquaintance claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Skeptical of this situation and of this friendly acquaintance, the boy oddly willingly agrees to the proposal, it was probably a good idea to make a quick decision anyway.", "release_date": "1973-02-27", - "total_inventory": 10, - "available_inventory": 9 + "total_inventory": 10 }, { "title": "Man Of Dawn", "overview": "But what if this friendly acquaintance is a con artist. Or what if somebody is orchestrating all of this. How could an ordinary boy play a part in all this. Either way, the choice has been made.", "release_date": "1960-07-16", - "total_inventory": 5, - "available_inventory": 5 + "total_inventory": 5 }, { "title": "Trueloves With Freckles", "overview": "The fast-paced life of a elderly man will be permanently altered as a strange girl enters his life.", "release_date": "1977-11-06", - "total_inventory": 3, - "available_inventory": 3 + "total_inventory": 3 }, { "title": "Girlfriends In The Forest", "overview": "The strange girl claims the elderly man will need to find a new home as this current house will be demolished by the government in order to make room for a highway. A large sum of money will be paid if the house is left within a week. Distrustful of both this situation and of this strange girl, the elderly man somewhat keenly agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date": "2009-05-03", - "total_inventory": 10, - "available_inventory": 9 + "total_inventory": 10 }, { "title": "Queens And Trueloves", "overview": "But what if this strange girl is pulling a prank. Or what if everything told is completely true. How could an ordinary elderly man be helpful at all in this situation. Time to find out.", "release_date": "1962-06-22", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Foreigners And Neighbors", "overview": "The calm life of a young girl might turn out differently as a strange boy enters her life.", "release_date": "2005-02-28", - "total_inventory": 10, - "available_inventory": 6 + "total_inventory": 10 }, { "title": "Name Of Fortune", "overview": "The strange boy claims the young girl was a witness of a horrific crime, a crime for which an innocent person is in jail for. Due to the horrific nature of the crime the memory was likely blocked, but there's a way to unblock it and save an innocent life. Suspicious of this situation, but somewhat trusting of this strange boy, the young girl somewhat reluctantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date": "1953-04-19", - "total_inventory": 1, - "available_inventory": 1 + "total_inventory": 1 }, { "title": "Edge Of Tomorrow", "overview": "But what if this strange boy can't be trusted. Or what if the wrong person was picked for this. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. Time to find out.", "release_date": "2008-03-12", - "total_inventory": 7, - "available_inventory": 7 + "total_inventory": 7 }, { "title": "Punished By The Stars", "overview": "The secluded life of a elderly woman is going in a different direction as a childhood friend enters her life.", "release_date": "2004-09-13", - "total_inventory": 9, - "available_inventory": 1 + "total_inventory": 9 }, { "title": "Guarded By My Dreams", "overview": "The childhood friend claims the elderly woman is actually part of a 'sub-species' of humans with hidden powers and wants to show what these hidden powers can do. Unsure about everything, including this childhood friend, the elderly woman somewhat gladly agrees to the proposal, but something does feel very wrong about this whole situation, hopefully the right choice was made.", "release_date": "1986-04-26", - "total_inventory": 11, - "available_inventory": 6 + "total_inventory": 11 }, { "title": "Man Of Exploration", "overview": "But what if this childhood friend is a con artist. Or what if this proposal is wrong or missing important details. How could an ordinary elderly woman figure out the truth in all of this. Only one way to find out.", "release_date": "2011-04-28", - "total_inventory": 8, - "available_inventory": 5 + "total_inventory": 8 }, { "title": "Leader Of New Earth", "overview": "The normal life of a young girl changes for better or worse as a strange man enters her life.", "release_date": "1955-10-14", - "total_inventory": 8, - "available_inventory": 5 + "total_inventory": 8 }, { "title": "Guardians Of Eternity", "overview": "The strange man claims the young girl has been chosen to compete against others of other regions in a 'competition'. The winner will gain not only the honor and glory of winning, but will also never need for anything for the rest of their life. Certain of the truth in this situation and of this strange man, the young girl somewhat reluctantly agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date": "1946-12-27", - "total_inventory": 7, - "available_inventory": 2 + "total_inventory": 7 }, { "title": "Soldiers Of The Outlands", "overview": "But what if this strange man is wrong about all this. Or what if all this is an elaborate trap. How could an ordinary young girl end up in a situation like this. Either way, the choice has been made.", "release_date": "1939-03-20", - "total_inventory": 6, - "available_inventory": 1 + "total_inventory": 6 }, { "title": "Leaders And Commanders", "overview": "The quiet life of a elderly man changes in an instant as a childhood friend enters his life.", "release_date": "1982-03-15", - "total_inventory": 3, - "available_inventory": 1 + "total_inventory": 3 }, { "title": "Medics And Strangers", "overview": "The childhood friend claims the elderly man is actually the rightful heir to the throne, this information has obviously been kept secret by the current holders of the throne, but once this information gets out to the public the people will surely stand behind the true heir. Skeptical of this situation and of this childhood friend, the elderly man hesitantly agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date": "2007-03-13", - "total_inventory": 6, - "available_inventory": 3 + "total_inventory": 6 }, { "title": "Beginning Of The Vacuum", "overview": "But what if this childhood friend is just a crazy person. Or what if all this is an elaborate trap. How could an ordinary elderly man be needed for a situation like this. Time will tell.", "release_date": "1943-11-11", - "total_inventory": 3, - "available_inventory": 1 + "total_inventory": 3 }, { "title": "Fate Of Alien Life", "overview": "The normal life of a girl might be changing forever as a neighbor enters her life.", "release_date": "1938-12-01", - "total_inventory": 10, - "available_inventory": 4 + "total_inventory": 10 }, { "title": "Created By Androids", "overview": "The neighbor claims the girl plays a vital role in the survival of the universe and must come along to train for battle or else the universe might be lost forever. Unsure about everything, including this neighbor, the girl hesitantly agrees to the proposal, the choice was made fast, perhaps too fast, but this situation requires quick thinking.", "release_date": "1963-04-16", - "total_inventory": 7, - "available_inventory": 1 + "total_inventory": 7 }, { "title": "Elegance Of The Machines", "overview": "But what if this neighbor is wrong about all this. Or what if the situation is worse than it appears. How could an ordinary girl be this lucky, or unlucky, depending on the turnout. We're about to find out.", "release_date": "1991-05-19", - "total_inventory": 7, - "available_inventory": 5 + "total_inventory": 7 } ] \ No newline at end of file From 6ae1e108feb97b87280ec47a1221db7cb55fb6b0 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Wed, 27 May 2020 20:04:51 -0700 Subject: [PATCH 46/56] restored available inventory functionality using model method --- app/controllers/application_controller.rb | 2 ++ app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 7 +++---- app/controllers/videos_controller.rb | 12 +++++++----- app/models/rental.rb | 1 - app/models/video.rb | 12 +++++++++++- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3f1a60270..9f6022610 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,5 @@ class ApplicationController < ActionController::API + + end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4a23f3d04..815bfafb8 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 + @customers = Customer.order(:name) render json: @customers.to_json( :only => [:id, :name, :registered_at, :postal_code, :phone], :methods => [:videos_checked_out_count]), status: :ok diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3e0a838ea..362f7aac7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,14 +7,13 @@ def check_in if rental rental.returned_on = Time.now - # rental.video.available_inventory += 1 rental.save response = { customer_id: rental.customer_id, video_id: rental.video_id, videos_checked_out_count: rental.customer.videos_checked_out_count, - # available_inventory: rental.video.available_inventory, + available_inventory: rental.video.available_inventory } render json: response, status: :ok else @@ -32,14 +31,14 @@ def check_out @rental = Rental.new(rental_params) if @rental.save - # @rental.video.available_inventory -= 1 response = { customer_id: @rental.customer_id, video_id: @rental.video_id, due_date: get_due_date(@rental), videos_checked_out_count: @rental.customer.videos_checked_out_count, - # available_inventory: @rental.video.available_inventory + available_inventory: @rental.video.available_inventory } + render json: response, status: :ok else render json: @rental.errors, status: :unprocessable_entity diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 101a7864a..df238becf 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -4,15 +4,17 @@ class VideosController < ApplicationController # GET /videos def index # TO-DO: available inventory - @videos = Video.all.as_json(only: [:id, :title, :release_date]) - render json: @videos + @videos = Video.order(:title) + + render json: @videos.to_json( + :only => [:id, :title, :release_date], :methods => [:available_inventory]), status: :ok end # GET /videos/1 def show if @video - @video = @video.as_json(only: [:title, :overview, :release_date, :total_inventory]) - render json: @video, status: :ok + render json: @video.to_json( + :only => [:title, :overview, :release_date, :total_inventory], :methods => [:available_inventory]), status: :ok else render json: { errors: ["Not Found"]}, status: :not_found end @@ -38,7 +40,7 @@ def set_video # rescue ActiveRecord::RecordNotFound => e # render json: { - # error: e.to_s + # error: e # }, status: :not_found end diff --git a/app/models/rental.rb b/app/models/rental.rb index e59b086a5..2420bf8cc 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,4 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer - end diff --git a/app/models/video.rb b/app/models/video.rb index 63b197f1f..ebe47a893 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -5,7 +5,17 @@ class Video < ApplicationRecord validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true - # To-DO: check against available + # To-DO: validate against available_inventory validates :total_inventory, presence: true, numericality: { only_integer: true } + def videos_checked_out_count + return rentals.where(returned_on: nil).count + end + + def available_inventory + return total_inventory - videos_checked_out_count + end + + + end From 2a48804cad730860b1b25bf1559badd6e4a9baf1 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 00:34:51 -0700 Subject: [PATCH 47/56] fixed bug where returned videos weren't being recorded accurately --- app/controllers/application_controller.rb | 4 +- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 103 ++++++------------ app/models/rental.rb | 5 + app/models/video.rb | 9 +- ...1243_add_default_to_new_returned_column.rb | 5 + 6 files changed, 49 insertions(+), 79 deletions(-) create mode 100644 db/migrate/20200528061243_add_default_to_new_returned_column.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9f6022610..c0c47b43b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,3 @@ class ApplicationController < ActionController::API - - - + end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 815bfafb8..30ad3c074 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index @customers = Customer.order(:name) - + render json: @customers.to_json( :only => [:id, :name, :registered_at, :postal_code, :phone], :methods => [:videos_checked_out_count]), status: :ok diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 362f7aac7..4a2a579a6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,100 +1,67 @@ class RentalsController < ApplicationController - before_action :set_rental, only: [:show, :update, :destroy] + before_action :set_active_rental, only: [:check_in] - # POST /rentals/check-in - def check_in - rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id]) - - if rental - rental.returned_on = Time.now - rental.save + def check_out + @rental = Rental.new(rental_params) - response = { - customer_id: rental.customer_id, - video_id: rental.video_id, - videos_checked_out_count: rental.customer.videos_checked_out_count, - available_inventory: rental.video.available_inventory - } - render json: response, status: :ok - else - render json: { error: rental }, status: :unprocessable_entity + if Customer.find_by(id: rental_params[:customer_id]).nil? || Video.find_by(id: rental_params[:video_id]).nil? + render json: { errors: ["Not Found"] }, status: :not_found + return end - end - - # POST /rentals/check-out - # create a new Rental record - # params: customer_id, video_id - # on success: increase customer's videos checked out +1 (done via counter cache) - # decrease video available inventory by 1 - def check_out - @rental = Rental.new(rental_params) + if @rental.video.available_inventory == 0 + render json: { errors: ["No inventory available"] }, status: :bad_request + return + end if @rental.save response = { customer_id: @rental.customer_id, video_id: @rental.video_id, - due_date: get_due_date(@rental), + due_date: @rental.due_date, videos_checked_out_count: @rental.customer.videos_checked_out_count, available_inventory: @rental.video.available_inventory } - render json: response, status: :ok else - render json: @rental.errors, status: :unprocessable_entity + render_error(@rental, :unprocessable_entity) end end - def get_due_date(rental) - return rental.created_at + 7.days - end - - # # GET /rentals - # def index - # @rentals = Rental.all - - # render json: @rentals - # end - - # # GET /rentals/1 - # def show - # render json: @rental - # end - - # # POST /rentals - # def create - # @rental = Rental.new(rental_params) + # POST /rentals/check-in + def check_in - # if @rental.save - # render json: @rental, status: :created, location: @rental - # else - # render json: @rental.errors, status: :unprocessable_entity - # end - # end + if Customer.find_by(id: rental_params[:customer_id]).nil? || Video.find_by(id: rental_params[:video_id]).nil? + render json: { errors: ["Not Found"] }, status: :not_found + return + end - # # PATCH/PUT /rentals/1 - # def update - # if @rental.update(rental_params) - # render json: @rental - # else - # render json: @rental.errors, status: :unprocessable_entity - # end - # end + if @rental + @rental.returned_on = Time.now + @rental.save! - # # DELETE /rentals/1 - # def destroy - # @rental.destroy - # end + response = { + customer_id: @rental.customer_id, + video_id: @rental.video_id, + videos_checked_out_count: @rental.customer.videos_checked_out_count, + available_inventory: @rental.video.available_inventory + } + render json: response, status: :ok + else + render json: { errors: @rental }, status: :unprocessable_entity + end + end private # Use callbacks to share common setup or constraints between actions. - def set_rental - @rental = Rental.find(params[:id]) + def set_active_rental + @rental = Rental.find_by(customer_id: rental_params[:customer_id], video_id: rental_params[:video_id], returned_on: nil) end # Only allow a trusted parameter "white list" through. def rental_params params.permit(:customer_id, :video_id) end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 2420bf8cc..99f7ace80 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,9 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer + + def due_date + return created_at + 7.days + end + end diff --git a/app/models/video.rb b/app/models/video.rb index ebe47a893..3f30e61f8 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -2,20 +2,15 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - validates :title, presence: true - validates :overview, presence: true - validates :release_date, presence: true - # To-DO: validate against available_inventory + validates :title, :overview, :release_date, presence: true validates :total_inventory, presence: true, numericality: { only_integer: true } def videos_checked_out_count - return rentals.where(returned_on: nil).count + return self.rentals.where(returned_on: nil).count end def available_inventory return total_inventory - videos_checked_out_count end - - end diff --git a/db/migrate/20200528061243_add_default_to_new_returned_column.rb b/db/migrate/20200528061243_add_default_to_new_returned_column.rb new file mode 100644 index 000000000..e7ecbfd48 --- /dev/null +++ b/db/migrate/20200528061243_add_default_to_new_returned_column.rb @@ -0,0 +1,5 @@ +class AddDefaultToNewReturnedColumn < ActiveRecord::Migration[6.0] + def change + change_column_default :rentals, :returned_on, nil + end +end From 5cf5cd304e5a95db8c5648ccd87e1df55a38adb4 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 00:35:13 -0700 Subject: [PATCH 48/56] updated schema --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index ce3af55a6..d39b2ef4b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_182514) do +ActiveRecord::Schema.define(version: 2020_05_28_061243) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 5b359f708ed79eacd9b733f336b45642260d09d6 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 21:18:36 -0700 Subject: [PATCH 49/56] modified responses to match spec --- app/controllers/customers_controller.rb | 2 -- app/controllers/rentals_controller.rb | 9 ++------- app/controllers/videos_controller.rb | 12 ++++-------- app/models/rental.rb | 10 ++++++++++ app/models/video.rb | 13 ++++++++++--- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 30ad3c074..6278e1670 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,8 @@ class CustomersController < ApplicationController def index @customers = Customer.order(:name) - render json: @customers.to_json( :only => [:id, :name, :registered_at, :postal_code, :phone], :methods => [:videos_checked_out_count]), status: :ok - end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4a2a579a6..0e6e1d44c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,11 +9,6 @@ def check_out return end - if @rental.video.available_inventory == 0 - render json: { errors: ["No inventory available"] }, status: :bad_request - return - end - if @rental.save response = { customer_id: @rental.customer_id, @@ -24,7 +19,7 @@ def check_out } render json: response, status: :ok else - render_error(@rental, :unprocessable_entity) + render json: { errors: @rental.errors[:message] }, status: :not_found end end @@ -49,7 +44,7 @@ def check_in } render json: response, status: :ok else - render json: { errors: @rental }, status: :unprocessable_entity + render json: { errors: @rental.errors }, status: :bad_request end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index df238becf..dc0fd0a8b 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,7 +3,6 @@ class VideosController < ApplicationController # GET /videos def index - # TO-DO: available inventory @videos = Video.order(:title) render json: @videos.to_json( @@ -12,11 +11,12 @@ def index # GET /videos/1 def show + if @video render json: @video.to_json( :only => [:title, :overview, :release_date, :total_inventory], :methods => [:available_inventory]), status: :ok else - render json: { errors: ["Not Found"]}, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found end end @@ -30,18 +30,14 @@ def create else render json: {errors: @video.errors }, status: :bad_request end + + end private # Use callbacks to share common setup or constraints between actions. def set_video @video = Video.find_by(id: params[:id]) - # @video = Video.find(params[:id]) - - # rescue ActiveRecord::RecordNotFound => e - # render json: { - # error: e - # }, status: :not_found end diff --git a/app/models/rental.rb b/app/models/rental.rb index 99f7ace80..b1f7415be 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,9 +1,19 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer + # validates_with AvailableInventory + + validate :inventory_available, on: :create def due_date return created_at + 7.days end + private + + def inventory_available + if video.available_inventory <= 0 + self.errors[:message] << "no inventory available" + end + end end diff --git a/app/models/video.rb b/app/models/video.rb index 3f30e61f8..8de8ec3a9 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,16 +1,23 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - validates :title, :overview, :release_date, presence: true validates :total_inventory, presence: true, numericality: { only_integer: true } + validate :valid_availability def videos_checked_out_count - return self.rentals.where(returned_on: nil).count + return rentals.where(returned_on: nil).count end def available_inventory - return total_inventory - videos_checked_out_count + available_inventory = total_inventory - videos_checked_out_count end + private + + def valid_availability + if total_inventory.nil? + errors.add(:available_inventory, "bad data error") + end + end end From 2abadce4f0fb825e1402fbc1d33fbdd16531362f Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 21:43:02 -0700 Subject: [PATCH 50/56] test support files --- db/seeds/videos.json | 2 +- test/fixtures/customers.yml | 16 ++++++++-------- test/fixtures/videos.yml | 14 +++++++++----- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/db/seeds/videos.json b/db/seeds/videos.json index 6eae14832..bee36695f 100644 --- a/db/seeds/videos.json +++ b/db/seeds/videos.json @@ -387,7 +387,7 @@ "title": "Stars And Sinners", "overview": "The strange woman claims the woman is actually the rightful heir to the throne, this information has obviously been kept secret by the current holders of the throne, but once this information gets out to the public the people will surely stand behind the true heir. Concerned of the situation and a little distrusful of this strange woman, the woman somewhat hesitantly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date": "1985-08-30", - "total_inventory": 11 + "total_inventory": 111 }, { "title": "Fungi And Amphibians", diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bc4f3d63f..5f8cc860b 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -3,14 +3,14 @@ Jane: registered_at: Wed, 29 Apr 2015 07:54:13 -0700 address: Ap 292-5216 Ipsu Rd city: Hillsboro - state: OR, - postal_code: 24300, + state: OR + postal_code: 24300 phone: (322) 510-8690 Jim: - name: Jim Doe - registered_at: Wed, 10 Apr 2015 07:54:13 -0700, - address: Ap #292-5216 Ipsum Rd., - city: Hillsboro, - state: OR, - postal_code: 24301, + name: Jim Doe, + registered_at: Wed, 10 Apr 2015 07:54:13 -0700 + address: Ap /#292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24301 phone: (322) 510-8691 diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 6be95e9e1..bddb7ca12 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,6 +1,10 @@ Jumanji: - title: Jumanji, - overview: Dark board game, - release_date: 2013-09-13, - total_inventory: 10, - available_inventory: 4, \ No newline at end of file + title: Jumanji + overview: Dark board game + release_date: 2013-09-13 + total_inventory: 10 +Underwater: + title: Underwater + overview: like a space horror except it's underwater + release_date: 2020-01-10 + total_inventory: 2 \ No newline at end of file From 47d7cf4b302158d93218094af4f9de1497acf6b5 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 21:49:29 -0700 Subject: [PATCH 51/56] validations for video model all passing --- test/models/video_test.rb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 819eadd06..9bf909b2a 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -8,9 +8,24 @@ expect(video.valid?).must_equal true end - it "is invalid with a field is missing" do + it "is invalid when title is missing" do video.title = nil expect(video.valid?).must_equal false end + + it "is invalid when overview is missing" do + video.overview = nil + expect(video.valid?).must_equal false + end + + it "is invalid when release date is missing" do + video.release_date = nil + expect(video.valid?).must_equal false + end + + it "is invalid when total inventory is missing" do + video.total_inventory = nil + expect(video.valid?).must_equal false + end end end From b375d050aff091b761f4cfcdb4b18d41a3dfd0e2 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 21:51:29 -0700 Subject: [PATCH 52/56] model validations for customer all passing --- test/models/customer_test.rb | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a6fa3e351..f7ad011b0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -8,9 +8,36 @@ expect(customer.valid?).must_equal true end - it "is invalid with a field is missing" do + it "is invalid when name is missing" do customer.name = nil expect(customer.valid?).must_equal false end + + it "is invalid when address is missing" do + customer.address = nil + expect(customer.valid?).must_equal false + end + + it "is invalid when name is missing" do + customer.city = nil + expect(customer.valid?).must_equal false + end + + it "is invalid when name is missing" do + customer.state = nil + expect(customer.valid?).must_equal false + end + + it "is invalid when name is missing" do + customer.postal_code = nil + expect(customer.valid?).must_equal false + end + + it "is invalid when name is missing" do + customer.phone = nil + expect(customer.valid?).must_equal false + end + + end end \ No newline at end of file From 727c861d0acff6890d00001d4750df9954c74188 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 22:26:42 -0700 Subject: [PATCH 53/56] model validations on rental passing --- app/models/rental.rb | 1 - test/fixtures/videos.yml | 7 ++++++- test/models/rental_test.rb | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index b1f7415be..31c8ea093 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,7 +1,6 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer - # validates_with AvailableInventory validate :inventory_available, on: :create diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index bddb7ca12..82b297cb3 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -7,4 +7,9 @@ Underwater: title: Underwater overview: like a space horror except it's underwater release_date: 2020-01-10 - total_inventory: 2 \ No newline at end of file + total_inventory: 2 +Shrek: + title: Shrek + overview: that'll do donkey, that'll do + release_date: 2001-05-18 + total_inventory: 0 \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 0bea59f1c..29a6d12e8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,5 +1,22 @@ require "test_helper" describe Rental do + let(:customer) { customers(:Jane) } + let(:video_with_stock) { videos(:Underwater) } + let(:video_with_no_stock) { videos(:Shrek) } + describe "validations" do + it "Rental is valid when created with a movie with available stock" do + rental = Rental.new( + video_id: video_with_stock.id, + customer_id: customer.id) + expect(rental.valid?).must_equal true + end + it "Rental is invalid when creating with a movie with no available stock" do + rental = Rental.new( + video_id: video_with_no_stock.id, + customer_id: customer.id) + expect(rental.valid?).must_equal false + end + end end From f5d4a5c786494b72d87897868321e4d5319e8ecc Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 22:44:35 -0700 Subject: [PATCH 54/56] video controller tests passing --- test/controllers/videos_controller_test.rb | 52 ++++++++++++++-------- test/models/rental_test.rb | 1 + 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 44cc72a67..56c226c9a 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,36 +1,50 @@ require "test_helper" describe VideosController do - let(:video) { videos(:one) } + let(:video) { videos(:Jumanji) } it "should get index" do get videos_url, as: :json must_respond_with :success end - it "should create video" do - value do - post videos_url, params: { video: { } }, as: :json - end.must_differ "Video.count" - - must_respond_with 201 - end - - it "should show video" do - get video_url(@video), as: :json + it "should show valid video" do + get video_url(video.id), as: :json must_respond_with :success end - it "should update video" do - patch video_url(@video), params: { video: { } }, as: :json - must_respond_with 200 + it "should not show video with invalid id" do + get video_url(-1), as: :json + must_respond_with :not_found end - it "should destroy video" do - value do - delete video_url(@video), as: :json - end.must_differ "Video.count", -1 + describe "create" do + let(:new_video) { + { + title: "Princess Mononoke", + overview: "feral wolf-girl and relentless curse-boy save the forest spirit", + release_date: "1997-12-12", + total_inventory: 5 + } + } + + it "should create video" do + assert_difference("Video.count") do + post videos_url, params: new_video , as: :json + end + + must_respond_with :success + end + + it "should not create movie with invalid params" do + new_video[:title] = nil + + assert_no_difference("Video.count") do + post videos_url, params: new_video , as: :json + end + must_respond_with :bad_request + end - must_respond_with 204 end + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 29a6d12e8..2fbcc7397 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -4,6 +4,7 @@ let(:customer) { customers(:Jane) } let(:video_with_stock) { videos(:Underwater) } let(:video_with_no_stock) { videos(:Shrek) } + describe "validations" do it "Rental is valid when created with a movie with available stock" do rental = Rental.new( From bc0b47d364dfa6a35649a3a39d6e84807bc39a90 Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 22:49:34 -0700 Subject: [PATCH 55/56] customers controller tests passing --- app/controllers/customers_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 19 ------------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6278e1670..b3fb808c2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,9 +1,11 @@ class CustomersController < ApplicationController + def index @customers = Customer.order(:name) render json: @customers.to_json( :only => [:id, :name, :registered_at, :postal_code, :phone], :methods => [: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 d14f800e2..da8df6237 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -11,24 +11,5 @@ must_respond_with 200 end - it "responds with customer data" do - get customers_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - body.each do |customer| - expect(customer).must_be_instance_of Hash - #expect(customer.keys.sort).must_equal CUSTOMER_FIELDS - end - end - - it "responds with an empty array when there are no customers" do - Customer.destroy_all - get customers_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - expect(body.length).must_equal 0 - expect(body).must_equal [] - - end end end From b84e3b5e76f364b589df285e2582e7f4adb3d4fc Mon Sep 17 00:00:00 2001 From: Angela Nguyen Date: Thu, 28 May 2020 23:34:12 -0700 Subject: [PATCH 56/56] rental controller tests passing --- test/controllers/rentals_controller_test.rb | 86 +++++++++++++++------ 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9155458ad..2bfff7a4e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,36 +1,76 @@ require "test_helper" describe RentalsController do - let(:rental) { rentals(:one) } + let(:customer) { customers(:Jane) } + let(:video_with_stock) { videos(:Jumanji) } + let(:video_with_no_stock) { videos(:Shrek) } + let(:rental) { {customer_id: customer.id, video_id: video_with_stock.id} } - it "should get index" do - get rentals_url, as: :json - must_respond_with :success - end + describe "check out" do + let(:bogus_customer_rental) { { customer_id: -1, video_id: video_with_stock.id } } + let(:bogus_video_rental) { {customer_id: customer.id, video_id: -1} } - it "should create rental" do - value do - post rentals_url, params: { rental: { } }, as: :json - end.must_differ "Rental.count" + it "creates a new Rental object on a successful checkout" do + assert_difference("Rental.count") do + post check_out_url, params: rental, as: :json + end + must_respond_with :success + end - must_respond_with 201 - end + it "does not create a new Rental object with an invalid customer id" do + assert_no_difference("Rental.count") do + post check_out_url, params: bogus_customer_rental, as: :json + end + must_respond_with :not_found - it "should show rental" do - get rental_url(@rental), as: :json - must_respond_with :success - end + response = JSON.parse(@response.body) + assert_equal ["Not Found"], response['errors'] + end + + it "does not create a new Rental object with an invalid video id" do + assert_no_difference("Rental.count") do + post check_out_url, params: bogus_video_rental, as: :json + end + must_respond_with :not_found + + response = JSON.parse(@response.body) + assert_equal ["Not Found"], response['errors'] + end - it "should update rental" do - patch rental_url(@rental), params: { rental: { } }, as: :json - must_respond_with 200 + it "does not create a new Rental object with a video that has no stock" do + assert_no_difference("Rental.count") do + post check_out_url, params: { video_id: video_with_no_stock.id, customer_id: customer.id }, as: :json + end + must_respond_with :not_found + + response = JSON.parse(@response.body) + assert_equal ["no inventory available"], response['errors'] + end end - it "should destroy rental" do - value do - delete rental_url(@rental), as: :json - end.must_differ "Rental.count", -1 + describe "check in" do + + before do + post check_out_url, params: rental, as: :json + @rental = Rental.last + end + + it "checks in an existing valid Rental and +1 to video inventory, -1 to customer video rentals" do + expect(@rental.customer.videos_checked_out_count).must_equal 1 + post check_in_url, params: { video_id: @rental.video.id, customer_id: @rental.customer.id }, as: :json + expect(@rental.customer.videos_checked_out_count).must_equal 0 + + must_respond_with :success + end + + it "does not check in a non-existing Rental, does not modify customer video count or video inventory count" do + assert_no_difference("customer.videos_checked_out_count") do + post check_in_url, params: { video_id: -1, customer_id: -1 }, as: :json + end + must_respond_with :not_found - must_respond_with 204 + response = JSON.parse(@response.body) + assert_equal ["Not Found"], response['errors'] + end end end