From 7d2b4cf7eacdd619953f1e4dc49f3816b116781f Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Tue, 26 May 2020 16:49:49 -0700 Subject: [PATCH 01/26] Rails set up with Models and Controllers and Database --- .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/controllers/customers_controller.rb | 2 + app/controllers/rentals_controller.rb | 2 + app/controllers/videos_controller.rb | 2 + app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/rental.rb | 2 + app/models/video.rb | 2 + app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/migrate/20200526232405_create_videos.rb | 8 + db/migrate/20200526232416_create_customers.rb | 8 + db/migrate/20200526233103_create_rentals.rb | 8 + ...20200526233325_add_attributes_to_videos.rb | 9 + ...00526233543_add_attributes_to_customers.rb | 12 + ...d_videos_checked_out_count_to_customers.rb | 5 + db/schema.rb | 46 ++++ 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/controllers/customers_controller_test.rb | 7 + test/controllers/rentals_controller_test.rb | 7 + test/controllers/videos_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 7 + test/models/rental_test.rb | 7 + test/models/video_test.rb | 7 + test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 78 files changed, 1256 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/controllers/customers_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/controllers/videos_controller.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/customer.rb create mode 100644 app/models/rental.rb create mode 100644 app/models/video.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/migrate/20200526232405_create_videos.rb create mode 100644 db/migrate/20200526232416_create_customers.rb create mode 100644 db/migrate/20200526233103_create_rentals.rb create mode 100644 db/migrate/20200526233325_add_attributes_to_videos.rb create mode 100644 db/migrate/20200526233543_add_attributes_to_customers.rb create mode 100644 db/migrate/20200526234657_add_videos_checked_out_count_to_customers.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/controllers/videos_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/rental_test.rb create mode 100644 test/models/video_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..41b7d4311 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..fcd6eefb2 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,2 @@ +class VideosController < ApplicationController +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/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..4dab07c31 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +P6MUqq7brkgiasBMzXn7TWwRoWgmHmBUw7BJ2DUEZ0Wazab5ydDnPApqeSHeHe2RPvf9tFZiKMthNdzuLlvrwO+QdS/3w+/qaP1s4MCoGxu7MdyhsmF9zn6vEM4GcxOakn1u0lwUznmGrO3DCkUoWE25Hxyb3upQGDUUAqKrZxUUjnjLCFvAQGMKhgS7izzP9uONmwuE7KD5rFO+toK7R7AkG/jlbTB+O08ZP+gde/Pu5ck2BQ9g/mUG5OiwwCCbOxI21n2iALF0ou6kssnkTT2F8CZOatsKh0NWkvX74+A5cRHK/7wEUVhLEULc4cJObp3OOSyfsJq5HHbytikrI9+Z0D09ec0HNFcsStGNOPmDGOrfErhzgr68SV5CYqt452N+bTjTR7vfxa8lSJ5j8YPA1SKviVPJh4Ha--Bfbyfo9ekvRWP0B1--7C57CwFTMge+v7/OAw2mmw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20200526232405_create_videos.rb b/db/migrate/20200526232405_create_videos.rb new file mode 100644 index 000000000..c9e399123 --- /dev/null +++ b/db/migrate/20200526232405_create_videos.rb @@ -0,0 +1,8 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20200526232416_create_customers.rb b/db/migrate/20200526232416_create_customers.rb new file mode 100644 index 000000000..3374e6e69 --- /dev/null +++ b/db/migrate/20200526232416_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20200526233103_create_rentals.rb b/db/migrate/20200526233103_create_rentals.rb new file mode 100644 index 000000000..85f45ae24 --- /dev/null +++ b/db/migrate/20200526233103_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/20200526233325_add_attributes_to_videos.rb b/db/migrate/20200526233325_add_attributes_to_videos.rb new file mode 100644 index 000000000..0cb6c2425 --- /dev/null +++ b/db/migrate/20200526233325_add_attributes_to_videos.rb @@ -0,0 +1,9 @@ +class AddAttributesToVideos < ActiveRecord::Migration[6.0] + def change + add_column :videos, :title, :string + add_column :videos, :overview, :string + add_column :videos, :release_date, :date + add_column :videos, :total_inventory, :integer + add_column :videos, :available_inventory, :integer + end +end diff --git a/db/migrate/20200526233543_add_attributes_to_customers.rb b/db/migrate/20200526233543_add_attributes_to_customers.rb new file mode 100644 index 000000000..7f17fc381 --- /dev/null +++ b/db/migrate/20200526233543_add_attributes_to_customers.rb @@ -0,0 +1,12 @@ +class AddAttributesToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :name, :string + add_column :customers, :registered_at, :date + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :state, :string + add_column :customers, :postal_code, :string + add_column :customers, :phone, :string + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/migrate/20200526234657_add_videos_checked_out_count_to_customers.rb b/db/migrate/20200526234657_add_videos_checked_out_count_to_customers.rb new file mode 100644 index 000000000..7975b96ef --- /dev/null +++ b/db/migrate/20200526234657_add_videos_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCountToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b84409b0f --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_26_234657) 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.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.string "name" + t.date "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.integer "videos_checked_out_count" + end + + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "videos", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + end + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/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/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..7f1649fd0 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VideosController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end 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 51f88f0374826eacbbbb3465e40bb76f9c2cfd89 Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Tue, 26 May 2020 17:04:10 -0700 Subject: [PATCH 02/26] Added test to render json in Video#index route --- app/controllers/videos_controller.rb | 4 ++++ config/routes.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fcd6eefb2..31bfca08e 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,2 +1,6 @@ class VideosController < ApplicationController + def index + # videos = Videos.all + render json: {message: "it works!"}, status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..9479cfcd3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + get "/zomg", to: "videos#index", as: "index" end From a7a92c74827f475628434aebe01cd8dbd43fd660 Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Wed, 27 May 2020 13:17:06 -0700 Subject: [PATCH 03/26] Added relationships --- app/models/customer.rb | 1 + app/models/rental.rb | 2 ++ app/models/video.rb | 1 + ...200527201503_relate_rentals_to_videos_and_customers.rb | 6 ++++++ db/schema.rb | 8 +++++++- 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200527201503_relate_rentals_to_videos_and_customers.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..1cc6b614f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..624b67c88 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video end diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..4a86e6861 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,3 @@ class Video < ApplicationRecord + has_many :rentals end diff --git a/db/migrate/20200527201503_relate_rentals_to_videos_and_customers.rb b/db/migrate/20200527201503_relate_rentals_to_videos_and_customers.rb new file mode 100644 index 000000000..856d40d31 --- /dev/null +++ b/db/migrate/20200527201503_relate_rentals_to_videos_and_customers.rb @@ -0,0 +1,6 @@ +class RelateRentalsToVideosAndCustomers < 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/schema.rb b/db/schema.rb index b84409b0f..970125b0a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_234657) do +ActiveRecord::Schema.define(version: 2020_05_27_201503) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -31,6 +31,10 @@ 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| @@ -43,4 +47,6 @@ t.integer "available_inventory" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" end From 04f9cd9c90cab8c3c7d63f99423e150b43be053b Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Wed, 27 May 2020 15:54:10 -0700 Subject: [PATCH 04/26] Completed actions, routes and tests for Wave 1 --- app/controllers/customers_controller.rb | 7 + app/controllers/videos_controller.rb | 33 +++- app/models/video.rb | 2 + config/routes.rb | 4 +- test/controllers/customers_controller_test.rb | 45 +++++- test/controllers/videos_controller_test.rb | 143 +++++++++++++++++- 6 files changed, 224 insertions(+), 10 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..38c7188f1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,9 @@ class CustomersController < ApplicationController + + REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checkout_out_count] + + def index + customers = Customer.all.as_json(only: REQUIRED_CUSTOMER_FIELDS) + render json: customers, status: :ok + end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 31bfca08e..2034b7318 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,6 +1,33 @@ class VideosController < ApplicationController - def index - # videos = Videos.all - render json: {message: "it works!"}, status: :ok + REQUIRED_VIDEO_FIELDS = [:id, :title, :release_date, :available_inventory] + + def index + videos = Video.all.as_json(only: REQUIRED_VIDEO_FIELDS) + render json: videos, status: :ok + end + + def show + video = Video.find_by(id: params[:id]) + if video + render json: video.as_json(only: REQUIRED_VIDEO_FIELDS), status: :ok + else + render json: { ok: false, errors: ["Not Found"] }, status: :not_found + end + end + + def create + video = Video.new(video_params) + if video.save + render json: video.as_json(only: REQUIRED_VIDEO_FIELDS), status: :created + return + else + render json: {ok: false, errors: video.errors.messages}, status: :bad_request + return + end + end + + private + def video_params + params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/app/models/video.rb b/app/models/video.rb index 4a86e6861..8b398c2a2 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,3 +1,5 @@ class Video < ApplicationRecord has_many :rentals + + validates :title, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 9479cfcd3..bd630934d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do - get "/zomg", to: "videos#index", as: "index" + # get "/zomg", to: "videos#index", as: "index" + resources :customers, only: [:index] + resources :videos, only: [:index, :show, :create] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..1f6532878 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,46 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checkout_out_count].sort + + describe "index" do + it "responds with JSON and success" do + # Act + get customers_path + + # Assert + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it "responds with an array of Customer hashes" do + # Act + get customers_path + + # Get the body of the response + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_be REQUIRED_CUSTOMER_FIELDS + end + end + + it "will respond with an empty array when there are no Customers" do + # Arrange + Customer.destroy_all + + # Act + get customers_path + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7f1649fd0..80fdff54c 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,144 @@ require "test_helper" +require "date" describe VideosController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + REQUIRED_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + + # helper method + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "responds with JSON and success" do + # Act + get videos_path + + # Assert + # expect(response.header['Content-Type']).must_include 'json' + # must_respond_with :ok + check_response(expected_type: Array) + end + + it "responds with an array of Video hashes" do + # Act + get videos_path + + # Get the body of the response + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_be REQUIRED_VIDEO_FIELDS + end + end + + it "will respond with an empty array when there are no Videos" do + # Arrange + Video.destroy_all + + # Act + get videos_path + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + + end + + + describe "show" do + before do + video = Video.new( + "title": "Joker", + "overview": "Movie about a sad clown", + "release_date": Date.today.strftime(""), + "total_inventory": 5, + "available_inventory": 1 + ) + video.save + end + + it "responds with JSON, success, and video data when looking for one existing video" do + # Arrange + existing_video = Video.first + + #Act + get video_path(existing_video.id) + body = check_response(expected_type: Hash) + + # Assert + expect(body.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + + expect(body["id"]).must_equal existing_video.id + expect(body["title"]).must_equal existing_video.title + expect(body["release_date"]).must_equal existing_video.release_date + expect(body["available_inventory"]).must_equal existing_video.available_inventory + end + + it "responds with JSON, not found, and errors when looking for non-existent video" do + get video_path(-1) + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["ok"]).must_equal false + expect(body["errors"]).must_include "Not Found" + end + end + + describe "create" do + let (:valid_video){ + { + video: { + title: "Joker", + overview: "Movie about a sad clown", + release_date: Date.today, + total_inventory: 5, + available_inventory: 1 + } + } + } + + let (:invalid_video){ + { + video: { + title: nil, + overview: "movie with no title", + release_date: Date.today, + total_inventory: 5, + available_inventory: 1 + } + } + } + + it "can create a new video" do + expect { + post videos_path, params: valid_video + }.must_differ "Video.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + end + + it "will respond with a bad request for invalid data" do + expect { + # Act + post videos_path, params: invalid_video + + # Assert + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end + end end From 2ae1fafe6d1c7624a79004abe92a1c6ab615e5e4 Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Wed, 27 May 2020 16:05:02 -0700 Subject: [PATCH 05/26] Fixed bug in Video controller test --- test/controllers/videos_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 80fdff54c..6a2b93a57 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -63,7 +63,7 @@ def check_response(expected_type:, expected_status: :success) video = Video.new( "title": "Joker", "overview": "Movie about a sad clown", - "release_date": Date.today.strftime(""), + "release_date": Date.today, "total_inventory": 5, "available_inventory": 1 ) @@ -83,7 +83,7 @@ def check_response(expected_type:, expected_status: :success) expect(body["id"]).must_equal existing_video.id expect(body["title"]).must_equal existing_video.title - expect(body["release_date"]).must_equal existing_video.release_date + expect(body["release_date"]).must_equal existing_video.release_date.strftime("%Y-%m-%d") # TODO: convert to string; .strftime("") expect(body["available_inventory"]).must_equal existing_video.available_inventory end From f07709665e3f20f3833fc718570130f67eac1df6 Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Wed, 27 May 2020 16:06:15 -0700 Subject: [PATCH 06/26] Fixed bug in Video controller test --- test/controllers/videos_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 6a2b93a57..27eedcfda 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -83,7 +83,7 @@ def check_response(expected_type:, expected_status: :success) expect(body["id"]).must_equal existing_video.id expect(body["title"]).must_equal existing_video.title - expect(body["release_date"]).must_equal existing_video.release_date.strftime("%Y-%m-%d") # TODO: convert to string; .strftime("") + expect(body["release_date"]).must_equal existing_video.release_date.strftime("%Y-%m-%d") expect(body["available_inventory"]).must_equal existing_video.available_inventory end From e9ff276f10c47cfed340fc28c9e635dbe9d245b7 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 13:17:55 -0700 Subject: [PATCH 07/26] updated customers controller --- 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 38c7188f1..121bfeec2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController - REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checkout_out_count] + REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] def index customers = Customer.all.as_json(only: REQUIRED_CUSTOMER_FIELDS) From 79d72f9632352cef19541651b3fe3d6c27aade0b Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 13:20:13 -0700 Subject: [PATCH 08/26] updated customer tests and added customer fixtures --- test/controllers/customers_controller_test.rb | 31 +++++++++++-------- test/fixtures/customers.yml | 18 +++++++++++ 2 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1f6532878..5db74e812 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,17 @@ describe CustomersController do - REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checkout_out_count].sort + REQUIRED_CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"].sort + + # helper method + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end describe "index" do it "responds with JSON and success" do @@ -10,36 +20,31 @@ get customers_path # Assert - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + check_response(expected_type: Array) end - it "responds with an array of Customer hashes" do + it "responds with an array of customer hashes" do # Act get customers_path - # Get the body of the response - body = JSON.parse(response.body) - # Assert - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_be REQUIRED_CUSTOMER_FIELDS + expect(customer.keys.sort).must_equal REQUIRED_CUSTOMER_FIELDS end end - it "will respond with an empty array when there are no Customers" do + it "will respond with an empty array when there are no customers" do # Arrange Customer.destroy_all # Act get customers_path - body = JSON.parse(response.body) - + # Assert - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) expect(body).must_equal [] end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..888d55cab --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,18 @@ +shelley: + name: Shelley Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: Ap 292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 + videos_checked_out_count: 1 +curran: + name: Curran Stout + registered_at: Wed, 16 Apr 2014 21:40:20 -0700 + address: Ap 658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: 94267 + phone: (908) 949-6758 + videos_checked_out_count: 1 \ No newline at end of file From 6bd3117b17deb78244fbad1cb801d1f60c128c86 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 13:20:45 -0700 Subject: [PATCH 09/26] updated videos controller to pass smoke tests --- app/controllers/videos_controller.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 2034b7318..1b4c5e7d3 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,33 +1,34 @@ class VideosController < ApplicationController - REQUIRED_VIDEO_FIELDS = [:id, :title, :release_date, :available_inventory] - + REQUIRED_INDEX_VIDEO_FIELDS = [:id, :title, :release_date, :available_inventory] + REQUIRED_SHOW_VIDEO_FIELDS = [:title, :overview, :release_date, :total_inventory, :available_inventory] + def index - videos = Video.all.as_json(only: REQUIRED_VIDEO_FIELDS) + videos = Video.all.as_json(only: REQUIRED_INDEX_VIDEO_FIELDS) render json: videos, status: :ok end def show video = Video.find_by(id: params[:id]) if video - render json: video.as_json(only: REQUIRED_VIDEO_FIELDS), status: :ok + render json: video.as_json(only: REQUIRED_SHOW_VIDEO_FIELDS), status: :ok else - render json: { ok: false, errors: ["Not Found"] }, status: :not_found + render json: {errors: ['Not Found'] }, status: :not_found end end def create video = Video.new(video_params) if video.save - render json: video.as_json(only: REQUIRED_VIDEO_FIELDS), status: :created + render json: video.as_json(only: [:id]), status: :created return else - render json: {ok: false, errors: video.errors.messages}, status: :bad_request + render json: {errors: video.errors.messages}, status: :bad_request return end end private def video_params - params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end From 3d7d6e8552881a275999d258d25f1c1b9baf994e Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 13:22:24 -0700 Subject: [PATCH 10/26] updated video tests to reflect new controller actions and added fixtures --- test/controllers/videos_controller_test.rb | 82 ++++++++-------------- test/fixtures/videos.yml | 12 ++++ 2 files changed, 43 insertions(+), 51 deletions(-) create mode 100644 test/fixtures/videos.yml diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 27eedcfda..d51ec5676 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,9 +1,9 @@ require "test_helper" -require "date" describe VideosController do - REQUIRED_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + REQUIRED_INDEX_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + REQUIRED_SHOW_VIDEO_FIELDS = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort # helper method def check_response(expected_type:, expected_status: :success) @@ -21,24 +21,19 @@ def check_response(expected_type:, expected_status: :success) get videos_path # Assert - # expect(response.header['Content-Type']).must_include 'json' - # must_respond_with :ok check_response(expected_type: Array) end - it "responds with an array of Video hashes" do + it "responds with an array of video hashes" do # Act get videos_path - # Get the body of the response - body = JSON.parse(response.body) - # Assert - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_be REQUIRED_VIDEO_FIELDS + expect(customer.keys.sort).must_equal REQUIRED_INDEX_VIDEO_FIELDS end end @@ -48,50 +43,35 @@ def check_response(expected_type:, expected_status: :success) # Act get videos_path - body = JSON.parse(response.body) # Assert - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) expect(body).must_equal [] end - end - describe "show" do - before do - video = Video.new( - "title": "Joker", - "overview": "Movie about a sad clown", - "release_date": Date.today, - "total_inventory": 5, - "available_inventory": 1 - ) - video.save - end - - it "responds with JSON, success, and video data when looking for one existing video" do + it "responds with JSON, success, and specific video data when looking for one existing video" do # Arrange - existing_video = Video.first + existing_video = videos(:joker) # see videos.yml - #Act + # Act get video_path(existing_video.id) - body = check_response(expected_type: Hash) - + # Assert - expect(body.keys.sort).must_equal REQUIRED_VIDEO_FIELDS - - expect(body["id"]).must_equal existing_video.id + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal REQUIRED_SHOW_VIDEO_FIELDS expect(body["title"]).must_equal existing_video.title + expect(body["overview"]).must_equal existing_video.overview expect(body["release_date"]).must_equal existing_video.release_date.strftime("%Y-%m-%d") + expect(body["total_inventory"]).must_equal existing_video.total_inventory expect(body["available_inventory"]).must_equal existing_video.available_inventory end - it "responds with JSON, not found, and errors when looking for non-existent video" do + it "responds with not found error when looking for non-existent video" do get video_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["ok"]).must_equal false expect(body["errors"]).must_include "Not Found" end end @@ -99,29 +79,25 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let (:valid_video){ { - video: { - title: "Joker", - overview: "Movie about a sad clown", - release_date: Date.today, - total_inventory: 5, - available_inventory: 1 - } + title: "A New Hope", + overview: "cool movie", + release_date: Date.today, + total_inventory: 5, + available_inventory: 1 } } let (:invalid_video){ { - video: { - title: nil, - overview: "movie with no title", - release_date: Date.today, - total_inventory: 5, - available_inventory: 1 - } + title: nil, + overview: nil, + release_date: nil, + total_inventory: nil, + available_inventory: nil } } - it "can create a new video" do + it "can create a new video that includes all valid data" do expect { post videos_path, params: valid_video }.must_differ "Video.count", 1 @@ -129,7 +105,7 @@ def check_response(expected_type:, expected_status: :success) check_response(expected_type: Hash, expected_status: :created) end - it "will respond with a bad request for invalid data" do + it "will respond with a bad request error and error message per each invalid field of an invalid video" do expect { # Act post videos_path, params: invalid_video @@ -139,6 +115,10 @@ def check_response(expected_type:, expected_status: :success) body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"].keys).must_include "title" + expect(body["errors"].keys).must_include "overview" + expect(body["errors"].keys).must_include "release_date" + expect(body["errors"].keys).must_include "total_inventory" + expect(body["errors"].keys).must_include "available_inventory" end end end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..c00d63c3e --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,12 @@ +joker: + title: Joker + overview: A sad movie about a clown + release_date: 2019-10-04 + total_inventory: 5 + available_inventory: 1 +titanic: + title: Titanic + overview: A sad movie about a boat + release_date: 1997-12-19 + total_inventory: 5 + available_inventory: 1 \ No newline at end of file From f29f9b36524d1e6ecd5ef7048b1afded233ded74 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 13:22:53 -0700 Subject: [PATCH 11/26] added new validations to video model --- app/models/video.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index 8b398c2a2..18f689d56 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -2,4 +2,8 @@ class Video < ApplicationRecord has_many :rentals validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true end From 15c40c424efed262cd076b51eb1c5b5888501828 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 14:15:54 -0700 Subject: [PATCH 12/26] added new customer model validations and tests --- app/models/customer.rb | 2 ++ test/models/customer_test.rb | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 1cc6b614f..21c829b68 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord has_many :rentals + validates :name, presence:true + validates :phone, presence:true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..c5965c821 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + it "is valid when name is present" do + # Act + result = customers(:shelley).valid? + + # Assert + expect(result).must_equal true + end + + it "is not valid when name is absent" do + # Arrange + invalid_customer = Customer.new(name: nil) + + # Act + result = invalid_customer.valid? + + # Assert + expect(result).must_equal false + expect(invalid_customer.errors.messages).must_include :name + end + + it "is not valid when phone number is absent" do + # Arrange + invalid_customer = Customer.new(name: "Tom", phone: nil) + + # Act + result = invalid_customer.valid? + + # Assert + expect(result).must_equal false + expect(invalid_customer.errors.messages).must_include :phone + end + end end From e31a493d7e71f42d1d105068ae4a8a26ba8540a9 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 14:51:01 -0700 Subject: [PATCH 13/26] added validation tests for Video model --- test/models/video_test.rb | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..f18869767 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,29 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + it "is valid when all fields are present" do + # Act + result = videos(:joker).valid? + + # Assert + expect(result).must_equal true + end + + it "is not valid when any field is absent" do + # Arrange + invalid_video = Video.new() + + # Act + result = invalid_video.valid? + + # Assert + expect(result).must_equal false + expect(invalid_video.errors.messages).must_include :title + expect(invalid_video.errors.messages).must_include :overview + expect(invalid_video.errors.messages).must_include :release_date + expect(invalid_video.errors.messages).must_include :total_inventory + expect(invalid_video.errors.messages).must_include :available_inventory + end + end end From 81f0cd00ebc034403672124df9c28d6b1cc2f0bc Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 14:54:46 -0700 Subject: [PATCH 14/26] added validation tests for Rental model --- test/models/rental_test.rb | 41 +++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..826db1e39 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,42 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe 'validations' do + it "can be created with a valid customer id and valid video id" do + # Arrange + shelley = customers(:shelley) + joker = videos(:joker) + rental = Rental.create(customer_id: shelley.id, video_id: joker.id) + + # Act + result = rental.valid? + + # Assert + expect(result).must_equal true + end + + it "cannot be created with an invalid customer id" do + # Arrange + joker = videos(:joker) + rental = Rental.create(customer_id: -1, video_id: joker.id) + + # Act + result = rental.valid? + + # Assert + expect(result).must_equal false + end + + it "cannot be created with an invalid video id" do + # Arrange + shelley = customers(:shelley) + rental = Rental.create(customer_id: shelley.id, video_id: -1) + + # Act + result = rental.valid? + + # Assert + expect(result).must_equal false + end + end end From bbcee0d6cad98fcb89f1965ce9c099dfb5530e2e Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 15:09:47 -0700 Subject: [PATCH 15/26] added routes, methods, and tests setup for new Rental actions --- app/controllers/rentals_controller.rb | 7 +++++++ config/routes.rb | 5 ++++- test/controllers/rentals_controller_test.rb | 10 +++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..35fc334dc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,9 @@ class RentalsController < ApplicationController + def checkout + + end + + def checkin + + end end diff --git a/config/routes.rb b/config/routes.rb index bd630934d..17e051dd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,8 @@ Rails.application.routes.draw do - # get "/zomg", to: "videos#index", as: "index" resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] + + #custom paths for routes + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..f7b487385 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,11 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "checkout" do + + end + + describe "checkin" do + + end end From 70dd20cc5be0e5f8db08a5f1da65bd367b0d82aa Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 15:33:58 -0700 Subject: [PATCH 16/26] specified which tests we should write for Rental controller --- test/controllers/rentals_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f7b487385..00b60e197 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,6 +6,6 @@ end describe "checkin" do - + end end From 312bf5ff1ef9d2f1515d538a9d3e7a46841c3715 Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Thu, 28 May 2020 16:32:32 -0700 Subject: [PATCH 17/26] Added rental controller checkout action with rental model methods --- app/controllers/rentals_controller.rb | 32 +++++++++++++++++++++++++++ app/models/rental.rb | 12 ++++++++++ 2 files changed, 44 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 35fc334dc..cc7efe2b0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,41 @@ class RentalsController < ApplicationController def checkout + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + # check video and customer exists + if video.nil? || customer.nil? + render json: {errors: ['Not Found'] }, status: :not_found + end + + # check video is available + if video.available_inventory > 0 + new_rental = Rental.new(rental_params) + else + render json: {errors: video.errors.messages}, status: :bad_request + end + + if new_rental.save + # call decrease_inventory + new_rental.decrease_inventory + + # call increase_videos_checked_out_count + new_rental.increase_videos_checked_out_count + + # render json object + render json: rental.as_json(only: [:video_id, :customer_id, customer.videos_checked_out_count, video.available_inventory]), status: :ok + return + end end def checkin end end + + +private + +def rental_params + params.require(:rental).permit(:video_id, :customer_id) +end \ No newline at end of file diff --git a/app/models/rental.rb b/app/models/rental.rb index 624b67c88..17c593442 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,16 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + + def self.decrease_inventory + video = Video.find_by(id: video_id) + video.available_inventory -= 1 + video.save + end + + def increase_videos_checked_out_count + customer = Customer.find_by(id: customer_id) + customer.videos_checked_out_count += 1 + customer.save + end end From d306b1f01b467e19156a9e28f0a7760c9a887a39 Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Thu, 28 May 2020 17:39:39 -0700 Subject: [PATCH 18/26] Added tests for rental controller --- app/controllers/rentals_controller.rb | 33 +++++---- app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 74 +++++++++++++++++++++ test/fixtures/videos.yml | 4 +- 4 files changed, 97 insertions(+), 16 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cc7efe2b0..983397786 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,21 +11,28 @@ def checkout # check video is available if video.available_inventory > 0 new_rental = Rental.new(rental_params) + + if new_rental.save + # call decrease_inventory + new_rental.decrease_inventory + + # call increase_videos_checked_out_count + new_rental.increase_videos_checked_out_count + + # render json object + render json: { + customer_id: customer.id, + video_id: video.id, + due_date: Date.today + 7, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory, + } , status: :ok + return + end else - render json: {errors: video.errors.messages}, status: :bad_request + render json: {errors: ["Video currently not available"]}, status: :bad_request end - if new_rental.save - # call decrease_inventory - new_rental.decrease_inventory - - # call increase_videos_checked_out_count - new_rental.increase_videos_checked_out_count - - # render json object - render json: rental.as_json(only: [:video_id, :customer_id, customer.videos_checked_out_count, video.available_inventory]), status: :ok - return - end end def checkin @@ -37,5 +44,5 @@ def checkin private def rental_params - params.require(:rental).permit(:video_id, :customer_id) + params.permit(:video_id, :customer_id) end \ No newline at end of file diff --git a/app/models/rental.rb b/app/models/rental.rb index 17c593442..a78a459c3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,7 +2,7 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - def self.decrease_inventory + def decrease_inventory video = Video.find_by(id: video_id) video.available_inventory -= 1 video.save diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 00b60e197..a9951bb83 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,8 +1,82 @@ require "test_helper" describe RentalsController do + before do + @customer = customers(:shelley) + @video = videos(:joker) + end + + let(:rental) { + { + customer_id: @customer.id + video_id: @video.id + } + } + + describe "checkout" do + # success cases + it "creates rental object and returns 200 status for request with valid params" do + expect{post checkout_path, params: rental}.must_differ "Rental.count", 1 + must_respond_with :ok + end + + it "increase the customer's videos_checked_out_count by one" do + new_rental = Rental.new(rental) + + expect(@customer.videos_checked_out_count).must_equal 2 + end + + it "decrease the video's available_inventory by one" do + new_rental = Rental.new(rental) + + expect(@video.available_inventory).must_equal 4 + end + + it "creates a due date that is the seven days from the current date." do + # Act + post checkout_path, params: rental + + # Assert + body = JSON.parse(response.body) + expect(body["due_date"]).must_equal Date.now + 7 + end + + # error cases + it "should return back detailed errors and a status 404: Not Found if the customer does not exist" do + # Arrange + invalid_customer_id = -1 + invalid_data = {customer_id: invalid_customer_id, video_id: @video.id.id} + # Act - Assert + expect{post checkout_path, params: invalid_data}.must_respond_with :not_found + + body = JSON.parse(response.body) + expect(body["errors"]).must_include "Not Found" + end + + it "should return back detailed errors and a status 404: Not Found if the video does not exist" do + # Arrange + invalid_video_id = -1 + invalid_data = {customer_id: @customer.id, video_id: invalid_video_id + + # Act - Assert + expect{post checkout_path, params: invalid_data}.must_respond_with :not_found + + body = JSON.parse(response.body) + expect(body["errors"]).must_include "Not Found" + end + + it "should return back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do + # Arrange + @video.available_inventory = 0 + + # Act - Assert + expect{post checkout_path, params: rental}.must_respond_with :bad_request + body = JSON.parse(response.body) + expect(body["errors"]).must_include "Video currently not available" + + end end describe "checkin" do diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index c00d63c3e..b994c77ee 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -3,10 +3,10 @@ joker: overview: A sad movie about a clown release_date: 2019-10-04 total_inventory: 5 - available_inventory: 1 + available_inventory: 5 titanic: title: Titanic overview: A sad movie about a boat release_date: 1997-12-19 total_inventory: 5 - available_inventory: 1 \ No newline at end of file + available_inventory: 5 From cf8b126854142be304304a5dd095c94a4e13a944 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 19:12:52 -0700 Subject: [PATCH 19/26] refactored Rental model, controller, and tests to meet wave 2 smoke test for checkout action --- app/controllers/rentals_controller.rb | 19 +++-- app/models/rental.rb | 2 + test/controllers/rentals_controller_test.rb | 81 ++++++++++++++------- 3 files changed, 69 insertions(+), 33 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 983397786..4bd4f3197 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,7 +5,8 @@ def checkout # check video and customer exists if video.nil? || customer.nil? - render json: {errors: ['Not Found'] }, status: :not_found + render json: {errors: ['Not Found']}, status: :not_found + return end # check video is available @@ -13,12 +14,14 @@ def checkout new_rental = Rental.new(rental_params) if new_rental.save - # call decrease_inventory - new_rental.decrease_inventory - - # call increase_videos_checked_out_count - new_rental.increase_videos_checked_out_count - + # new_rental.decrease_inventory + video.available_inventory -= 1 + video.save + + # new_rental.increase_videos_checked_out_count + customer.videos_checked_out_count += 1 + customer.save + # render json object render json: { customer_id: customer.id, @@ -29,10 +32,10 @@ def checkout } , status: :ok return end + else render json: {errors: ["Video currently not available"]}, status: :bad_request end - end def checkin diff --git a/app/models/rental.rb b/app/models/rental.rb index a78a459c3..2f185ee46 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,12 +2,14 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + # note: this method caused smoke tests to fail, so we opted to hardcode this logic within controller def decrease_inventory video = Video.find_by(id: video_id) video.available_inventory -= 1 video.save end + # note: this method caused smoke tests to fail, so we opted to hardcode this logic within controller def increase_videos_checked_out_count customer = Customer.find_by(id: customer_id) customer.videos_checked_out_count += 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a9951bb83..532270f40 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -8,28 +8,58 @@ let(:rental) { { - customer_id: @customer.id + customer_id: @customer.id, video_id: @video.id } } + let(:invalid_rental) { + { + customer_id: @customer.id, + video_id: videos(:avatar).id # Avatar has 0 available videos (see videos.yml) + } + } + + # helper method + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end describe "checkout" do - # success cases - it "creates rental object and returns 200 status for request with valid params" do + # Success Cases + it "returns 200 status for request with valid params" do + # Act + post checkout_path, params: rental + + # Assert + check_response(expected_type: Hash, expected_status: :ok) + end + + it "creates rental object for a request with valid params" do + # Act - Assert expect{post checkout_path, params: rental}.must_differ "Rental.count", 1 - must_respond_with :ok end it "increase the customer's videos_checked_out_count by one" do - new_rental = Rental.new(rental) + # Act + post checkout_path, params: rental + @customer.reload + # Assert expect(@customer.videos_checked_out_count).must_equal 2 end it "decrease the video's available_inventory by one" do - new_rental = Rental.new(rental) - + # Act + post checkout_path, params: rental + @video.reload + + # Assert expect(@video.available_inventory).must_equal 4 end @@ -38,44 +68,45 @@ post checkout_path, params: rental # Assert - body = JSON.parse(response.body) - expect(body["due_date"]).must_equal Date.now + 7 + body = check_response(expected_type: Hash, expected_status: :ok) + + expect(body["due_date"]).must_equal (Date.today + 7).strftime("%Y-%m-%d") end - # error cases + # Error Cases it "should return back detailed errors and a status 404: Not Found if the customer does not exist" do # Arrange invalid_customer_id = -1 - invalid_data = {customer_id: invalid_customer_id, video_id: @video.id.id} - # Act - Assert - expect{post checkout_path, params: invalid_data}.must_respond_with :not_found + invalid_data = {customer_id: invalid_customer_id, video_id: @video.id} + + # Act + post checkout_path, params: invalid_data - body = JSON.parse(response.body) + # Assert + body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"]).must_include "Not Found" end it "should return back detailed errors and a status 404: Not Found if the video does not exist" do # Arrange invalid_video_id = -1 - invalid_data = {customer_id: @customer.id, video_id: invalid_video_id + invalid_data = {customer_id: @customer.id, video_id: invalid_video_id} - # Act - Assert - expect{post checkout_path, params: invalid_data}.must_respond_with :not_found + # Act + post checkout_path, params: invalid_data - body = JSON.parse(response.body) + # Assert + body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"]).must_include "Not Found" end it "should return back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do - # Arrange - @video.available_inventory = 0 - - # Act - Assert - expect{post checkout_path, params: rental}.must_respond_with :bad_request + # Act + post checkout_path, params: invalid_rental - body = JSON.parse(response.body) + # Assert + body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"]).must_include "Video currently not available" - end end From eeaff257ae116cff0c6c57959b8687c9f597dbab Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 19:15:22 -0700 Subject: [PATCH 20/26] edited index views on customers and videos to render in order --- app/controllers/customers_controller.rb | 2 +- app/controllers/videos_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 121bfeec2..e5abe005d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ class CustomersController < ApplicationController REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] def index - customers = Customer.all.as_json(only: REQUIRED_CUSTOMER_FIELDS) + customers = Customer.order(:name).as_json(only: REQUIRED_CUSTOMER_FIELDS) render json: customers, status: :ok end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 1b4c5e7d3..bc4c37ec7 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,7 +3,7 @@ class VideosController < ApplicationController REQUIRED_SHOW_VIDEO_FIELDS = [:title, :overview, :release_date, :total_inventory, :available_inventory] def index - videos = Video.all.as_json(only: REQUIRED_INDEX_VIDEO_FIELDS) + videos = Video.order(:title).as_json(only: REQUIRED_INDEX_VIDEO_FIELDS) render json: videos, status: :ok end From 17260d9db078f8bf946970765b4e729d7842730a Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 19:25:39 -0700 Subject: [PATCH 21/26] added a video fixture with 0 inventory --- test/fixtures/videos.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index b994c77ee..caa214aa5 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -10,3 +10,9 @@ titanic: release_date: 1997-12-19 total_inventory: 5 available_inventory: 5 +avatar: + title: Avatar + overview: A sad movie about aliens + release_date: 1997-12-19 + total_inventory: 5 + available_inventory: 0 \ No newline at end of file From 0434658d76f4462f65146b5f7ae070c0e6ee37ac Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 19:26:43 -0700 Subject: [PATCH 22/26] moved business logic from rental to respective models for checkout function --- app/controllers/rentals_controller.rb | 10 +++------- app/models/customer.rb | 6 ++++++ app/models/rental.rb | 22 +++++++++++----------- app/models/video.rb | 6 ++++++ 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4bd4f3197..3b0af536f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,13 +14,9 @@ def checkout new_rental = Rental.new(rental_params) if new_rental.save - # new_rental.decrease_inventory - video.available_inventory -= 1 - video.save - - # new_rental.increase_videos_checked_out_count - customer.videos_checked_out_count += 1 - customer.save + # update video & customer + video.decrease_inventory + customer.increase_videos_checked_out_count # render json object render json: { diff --git a/app/models/customer.rb b/app/models/customer.rb index 21c829b68..e3de72efd 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,10 @@ class Customer < ApplicationRecord has_many :rentals validates :name, presence:true validates :phone, presence:true + + def increase_videos_checked_out_count + #customer = Customer.find_by(id: customer_id) + self.videos_checked_out_count += 1 + self.save + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 2f185ee46..53306e718 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,16 +3,16 @@ class Rental < ApplicationRecord belongs_to :video # note: this method caused smoke tests to fail, so we opted to hardcode this logic within controller - def decrease_inventory - video = Video.find_by(id: video_id) - video.available_inventory -= 1 - video.save - end + # def decrease_inventory + # video = Video.find_by(id: video_id) + # video.available_inventory -= 1 + # video.save + # end - # note: this method caused smoke tests to fail, so we opted to hardcode this logic within controller - def increase_videos_checked_out_count - customer = Customer.find_by(id: customer_id) - customer.videos_checked_out_count += 1 - customer.save - end + # # note: this method caused smoke tests to fail, so we opted to hardcode this logic within controller + # def increase_videos_checked_out_count + # customer = Customer.find_by(id: customer_id) + # customer.videos_checked_out_count += 1 + # customer.save + # end end diff --git a/app/models/video.rb b/app/models/video.rb index 18f689d56..99a808d1d 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -6,4 +6,10 @@ class Video < ApplicationRecord validates :release_date, presence: true validates :total_inventory, presence: true validates :available_inventory, presence: true + + def decrease_inventory + #video = Video.find_by(id: video_id) + self.available_inventory -= 1 + self.save + end end From 9dd5fd431e16106b3ac70968cae299ff54051cb3 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 19:51:59 -0700 Subject: [PATCH 23/26] added tests for checkin action, edited video fixture --- test/controllers/rentals_controller_test.rb | 54 ++++++++++++++++++++- test/fixtures/videos.yml | 2 +- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 532270f40..3e5000b58 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -60,7 +60,7 @@ def check_response(expected_type:, expected_status: :success) @video.reload # Assert - expect(@video.available_inventory).must_equal 4 + expect(@video.available_inventory).must_equal 3 end it "creates a due date that is the seven days from the current date." do @@ -111,6 +111,58 @@ def check_response(expected_type:, expected_status: :success) end describe "checkin" do + # Success Cases + it "returns 200 status for request with valid params" do + # Act + post checkin_path, params: rental + + # Assert + check_response(expected_type: Hash, expected_status: :ok) + end + + it "decreases the customer's videos_checked_out_count by one" do + # Act + post checkout_path, params: rental + @customer.reload + + # Assert + expect(@customer.videos_checked_out_count).must_equal 0 + end + + it "increases the video's available_inventory by one" do + # Act + post checkin_path, params: rental + @video.reload + + # Assert + expect(@video.available_inventory).must_equal 5 + end + + # Error Cases + it "should return back detailed errors and a status 404: Not Found if the customer does not exist" do + # Arrange + invalid_customer_id = -1 + invalid_data = {customer_id: invalid_customer_id, video_id: @video.id} + + # Act + post checkout_path, params: invalid_data + # Assert + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_include "Not Found" + end + + it "should return back detailed errors and a status 404: Not Found if the video does not exist" do + # Arrange + invalid_video_id = -1 + invalid_data = {customer_id: @customer.id, video_id: invalid_video_id} + + # Act + post checkin_path, params: invalid_data + + # Assert + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_include "Not Found" + end end end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index caa214aa5..5b11b9d8e 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -3,7 +3,7 @@ joker: overview: A sad movie about a clown release_date: 2019-10-04 total_inventory: 5 - available_inventory: 5 + available_inventory: 4 titanic: title: Titanic overview: A sad movie about a boat From dd523440ed8be1de4c0d27d094f1ace41c7e2550 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Thu, 28 May 2020 19:54:19 -0700 Subject: [PATCH 24/26] whoops typo --- test/controllers/rentals_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3e5000b58..e7e04691d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -145,13 +145,13 @@ def check_response(expected_type:, expected_status: :success) invalid_data = {customer_id: invalid_customer_id, video_id: @video.id} # Act - post checkout_path, params: invalid_data + post checkin_path, params: invalid_data # Assert body = check_response(expected_type: Hash, expected_status: :not_found) expect(body["errors"]).must_include "Not Found" end - + it "should return back detailed errors and a status 404: Not Found if the video does not exist" do # Arrange invalid_video_id = -1 From 776c5b054c8cfbc388383dfdcf13164dadb719b8 Mon Sep 17 00:00:00 2001 From: Yolotzin Dunbar Date: Thu, 28 May 2020 21:08:51 -0700 Subject: [PATCH 25/26] Added checkin action to Rental controller, with Customer and Video methods --- app/controllers/rentals_controller.rb | 29 ++++++++++++++++++--- app/models/customer.rb | 5 ++++ app/models/rental.rb | 8 ++++++ app/models/video.rb | 7 ++++- test/controllers/rentals_controller_test.rb | 6 ++--- 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3b0af536f..b2bfacdf8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,15 +1,16 @@ class RentalsController < ApplicationController + def checkout video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) - # check video and customer exists + # check that video and customer exists if video.nil? || customer.nil? render json: {errors: ['Not Found']}, status: :not_found return end - # check video is available + # check that video is available if video.available_inventory > 0 new_rental = Rental.new(rental_params) @@ -35,10 +36,32 @@ def checkout end def checkin + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + + # check that video and customer exists + if video.nil? || customer.nil? + render json: {errors: ['Not Found']}, status: :not_found + return + end + + # update video & customer + customer.decrease_videos_checked_out_count + video.increase_inventory + + # render json object + render json: { + customer_id: customer.id, + video_id: video.id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory, + } , status: :ok + # see if due_date is passed + # rental.is_overdue end -end +end private diff --git a/app/models/customer.rb b/app/models/customer.rb index e3de72efd..4959840f8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,4 +8,9 @@ def increase_videos_checked_out_count self.videos_checked_out_count += 1 self.save end + + def decrease_videos_checked_out_count + self.videos_checked_out_count -= 1 + self.save + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 53306e718..8eaabcc15 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -15,4 +15,12 @@ class Rental < ApplicationRecord # customer.videos_checked_out_count += 1 # customer.save # end + + # def is_overdue + # if Date.today > rental.due_date + # self.is_overdue = true + # self.save + # end + # end + end diff --git a/app/models/video.rb b/app/models/video.rb index 99a808d1d..2cc7cc8b0 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -11,5 +11,10 @@ def decrease_inventory #video = Video.find_by(id: video_id) self.available_inventory -= 1 self.save - end + end + + def increase_inventory + self.available_inventory += 1 + self.save + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e7e04691d..3b3e135ab 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -20,11 +20,11 @@ } } - # helper method - def check_response(expected_type:, expected_status: :success) + # helper method + def check_response(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' - + body = JSON.parse(response.body) expect(body).must_be_kind_of expected_type return body From 8ff879e8d2146c4a1d1bb58d51918d48c5f26086 Mon Sep 17 00:00:00 2001 From: Yesenia Date: Fri, 29 May 2020 10:19:31 -0700 Subject: [PATCH 26/26] cleaned up files, fixed bug on rentals controller tests --- app/controllers/customers_controller.rb | 13 ++--- app/controllers/rentals_controller.rb | 5 +- app/controllers/videos_controller.rb | 55 ++++++++++--------- app/models/customer.rb | 24 ++++---- app/models/rental.rb | 33 +++-------- app/models/video.rb | 29 +++++----- ...00526233543_add_attributes_to_customers.rb | 1 - test/controllers/rentals_controller_test.rb | 2 +- 8 files changed, 72 insertions(+), 90 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e5abe005d..2286da0c2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,9 +1,8 @@ class CustomersController < ApplicationController - - REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] - - def index - customers = Customer.order(:name).as_json(only: REQUIRED_CUSTOMER_FIELDS) - render json: customers, status: :ok - end + REQUIRED_CUSTOMER_FIELDS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] + + def index + customers = Customer.order(:name).as_json(only: REQUIRED_CUSTOMER_FIELDS) + render json: customers, status: :ok + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b2bfacdf8..94e5194c8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,4 @@ class RentalsController < ApplicationController - def checkout video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) @@ -32,6 +31,7 @@ def checkout else render json: {errors: ["Video currently not available"]}, status: :bad_request + return end end @@ -56,11 +56,10 @@ def checkin videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory, } , status: :ok + # see if due_date is passed # rental.is_overdue - end - end private diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index bc4c37ec7..fa5dc10b9 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,34 +1,35 @@ class VideosController < ApplicationController - REQUIRED_INDEX_VIDEO_FIELDS = [:id, :title, :release_date, :available_inventory] - REQUIRED_SHOW_VIDEO_FIELDS = [:title, :overview, :release_date, :total_inventory, :available_inventory] + REQUIRED_INDEX_VIDEO_FIELDS = [:id, :title, :release_date, :available_inventory] + REQUIRED_SHOW_VIDEO_FIELDS = [:title, :overview, :release_date, :total_inventory, :available_inventory] - def index - videos = Video.order(:title).as_json(only: REQUIRED_INDEX_VIDEO_FIELDS) - render json: videos, status: :ok - end - - def show - video = Video.find_by(id: params[:id]) - if video - render json: video.as_json(only: REQUIRED_SHOW_VIDEO_FIELDS), status: :ok - else - render json: {errors: ['Not Found'] }, status: :not_found - end + def index + videos = Video.order(:title).as_json(only: REQUIRED_INDEX_VIDEO_FIELDS) + render json: videos, status: :ok + end + + def show + video = Video.find_by(id: params[:id]) + if video + render json: video.as_json(only: REQUIRED_SHOW_VIDEO_FIELDS), status: :ok + else + render json: {errors: ['Not Found'] }, status: :not_found end + end - def create - video = Video.new(video_params) - if video.save - render json: video.as_json(only: [:id]), status: :created - return - else - render json: {errors: video.errors.messages}, status: :bad_request - return - end + def create + video = Video.new(video_params) + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: {errors: video.errors.messages}, status: :bad_request + return end + end - private - def video_params - params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) - end + private + + def video_params + params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 4959840f8..7d140af10 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,16 +1,16 @@ class Customer < ApplicationRecord - has_many :rentals - validates :name, presence:true - validates :phone, presence:true + has_many :rentals + + validates :name, presence:true + validates :phone, presence:true - def increase_videos_checked_out_count - #customer = Customer.find_by(id: customer_id) - self.videos_checked_out_count += 1 - self.save - end + def increase_videos_checked_out_count + self.videos_checked_out_count += 1 + self.save + end - def decrease_videos_checked_out_count - self.videos_checked_out_count -= 1 - self.save - end + def decrease_videos_checked_out_count + self.videos_checked_out_count -= 1 + self.save + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 8eaabcc15..614d254d8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,26 +1,11 @@ class Rental < ApplicationRecord - belongs_to :customer - belongs_to :video - - # note: this method caused smoke tests to fail, so we opted to hardcode this logic within controller - # def decrease_inventory - # video = Video.find_by(id: video_id) - # video.available_inventory -= 1 - # video.save - # end - - # # note: this method caused smoke tests to fail, so we opted to hardcode this logic within controller - # def increase_videos_checked_out_count - # customer = Customer.find_by(id: customer_id) - # customer.videos_checked_out_count += 1 - # customer.save - # end - - # def is_overdue - # if Date.today > rental.due_date - # self.is_overdue = true - # self.save - # end - # end - + belongs_to :customer + belongs_to :video + + # def is_overdue + # if Date.today > rental.due_date + # self.is_overdue = true + # self.save + # end + # end end diff --git a/app/models/video.rb b/app/models/video.rb index 2cc7cc8b0..a185276a1 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,20 +1,19 @@ class Video < ApplicationRecord - has_many :rentals + has_many :rentals - validates :title, presence: true - validates :overview, presence: true - validates :release_date, presence: true - validates :total_inventory, presence: true - validates :available_inventory, presence: true + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true - def decrease_inventory - #video = Video.find_by(id: video_id) - self.available_inventory -= 1 - self.save - end + def decrease_inventory + self.available_inventory -= 1 + self.save + end - def increase_inventory - self.available_inventory += 1 - self.save - end + def increase_inventory + self.available_inventory += 1 + self.save + end end diff --git a/db/migrate/20200526233543_add_attributes_to_customers.rb b/db/migrate/20200526233543_add_attributes_to_customers.rb index 7f17fc381..8dd7db493 100644 --- a/db/migrate/20200526233543_add_attributes_to_customers.rb +++ b/db/migrate/20200526233543_add_attributes_to_customers.rb @@ -7,6 +7,5 @@ def change add_column :customers, :state, :string add_column :customers, :postal_code, :string add_column :customers, :phone, :string - add_column :customers, :videos_checked_out_count, :integer end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3b3e135ab..77993a35c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -122,7 +122,7 @@ def check_response(expected_type:, expected_status: :success) it "decreases the customer's videos_checked_out_count by one" do # Act - post checkout_path, params: rental + post checkin_path, params: rental @customer.reload # Assert