From 0b93d22942df572c30c9dce15daa602bf127441d Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 1 Dec 2020 16:20:06 -0800 Subject: [PATCH 01/44] created customers_controller.rb and customer.rb model --- .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 | 26 +++ 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/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 | 4 + config/spring.rb | 6 + config/storage.yml | 34 +++ .../20201202000832_customer_attributes.rb | 14 ++ db/schema.rb | 29 +++ lib/tasks/.keep | 0 log/.keep | 0 node_modules/.yarn-integrity | 10 + public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/customers_controller_test.rb | 73 ++++-- test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 7 + test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 4 + 64 files changed, 1252 insertions(+), 20 deletions(-) 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/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/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/20201202000832_customer_attributes.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 node_modules/.yarn-integrity create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/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/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..bfacd7a13 --- /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.4' +# 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..6b36539e2 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + mail (>= 2.7.1) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) + 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.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + nokogiri (>= 1.8.5) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) + globalid (>= 0.3.6) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + marcel (~> 0.3.1) + activesupport (6.0.3.4) + 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.5.1) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.3) + concurrent-ruby (1.1.7) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.11) + erubi (1.10.0) + ffi (1.13.1) + 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.5) + concurrent-ruby (~> 1.0) + listen (3.3.3) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.8.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.8) + 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.2) + 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.4) + nokogiri (1.10.10) + 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.7) + nio4r (~> 2.0) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + bundler (>= 1.3.0) + railties (= 6.0.3.4) + 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.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) + 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.1) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.8) + thread_safe (~> 0.1) + websocket-driver (0.7.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.4.2) + +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.4) + 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..bea2a8f9d --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,26 @@ +class CustomersController < ApplicationController + before_action :set_customer, only: [:show, :update, :destroy] + + # GET /customers + def index + @customers = Customer.all + + render json: @customers + end + + # GET /customers/1 + def show + render json: @customer + end + + # POST /customers + def create + @customer = Customer.new(customer_params) + + if @customer.save + render json: @customer, status: :created, location: @customer + else + render json: @customer.errors, status: :unprocessable_entity + end + end +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/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..8744b6a82 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +iuQO/VRsLMMe8OCHlK2zIfOg8Yr1hfjyOp0xqhqYev9yyQIbq3KDLoYzL5eXo/BYArMLtoyq0NnNdjQjm2JRXitgOqFQ2o4sHSGtT1IYqAAPXD1Wgy5BeDF/2zFOBhIdfKEICv9mO5o2wPIRBNjLePN7xlvmCoLapYENr5rivG4FAoQKJvJotjSjlebPzvB2hAZeqvzfvPa4Y8HMvpNXHYrmcu83+XdmI7JiAEgBlj68dftAWccW/krDmCzZL5pOvE3vSwdM1/oJ7fgTGclzVJN0LDfZFkuxV0aisLOJ/EejPDlgAqRTWHqcYoVB3i5y7dR6nOLxj3CfdfLdagthx+4ampZBTUyjwgfRP4HKjIRxnfP/FYT5sX0y6Ex5eMveujdnKXKfzDBPF3W3wPNZd0YtQHSJMULyGVVS--pWprrQpG0kv6Wo3q--7B+H2omUCDHIvBEoZ3gLMA== \ 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..cd2125daf --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,4 @@ +Rails.application.routes.draw do + resources :customers + # 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/20201202000832_customer_attributes.rb b/db/migrate/20201202000832_customer_attributes.rb new file mode 100644 index 000000000..46924bd88 --- /dev/null +++ b/db/migrate/20201202000832_customer_attributes.rb @@ -0,0 +1,14 @@ +class CustomerAttributes < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.integer :videos_checked_out_count + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..d8af96e6e --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,29 @@ +# 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_12_02_000832) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.integer "videos_checked_out_count" + 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/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..0f19eb7ab --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-83", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b0aab0b35..bd9bfdc06 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,36 +1,69 @@ + require "test_helper" describe CustomersController do - it "must get index" do - # Act - get customers_path - body = JSON.parse(response.body) + let(:customer) { customers(:one) } + describe "index" do + it "must get index" do + # Act + get customers_path + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body.length).must_equal Customer.count - # Assert - expect(body).must_be_instance_of Array - expect(body.length).must_equal Customer.count + # Check that each customer has the proper keys + fields = ["id", "name", "registered_at", "postal_code", + "phone", "videos_checked_out_count"].sort - # Check that each customer has the proper keys - fields = ["id", "name", "registered_at", "postal_code", - "phone", "videos_checked_out_count"].sort + body.each do |customer| + expect(customer.keys.sort).must_equal fields + end - body.each do |customer| - expect(customer.keys.sort).must_equal fields + must_respond_with :ok end - must_respond_with :ok + it "index works even with no customers" do + Customer.destroy_all + + get customers_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + + must_respond_with :ok + end end - it "works even with no customers" do - Customer.destroy_all + # Rails scaffold generated tests below - get customers_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - expect(body.length).must_equal 0 + it "should create customer" do + value do + post customers_url, params: { customer: { create: @customer.create, index: @customer.index, show: @customer.show } }, as: :json + end.must_differ "Customer.count" - must_respond_with :ok + must_respond_with 201 end + it "should show customer" do + get customer_url(@customer), as: :json + must_respond_with :success + end + + it "should update customer" do + patch customer_url(@customer), params: { customer: { create: @customer.create, index: @customer.index, show: @customer.show } }, as: :json + must_respond_with 200 + end + + it "should destroy customer" do + value do + delete customer_url(@customer), as: :json + end.must_differ "Customer.count", -1 + + must_respond_with 204 + end end + 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/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..fb57ccd13 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 652b4a3c49da1328a6d7e37b58bcd5e6b4d71a47 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Tue, 1 Dec 2020 16:39:37 -0800 Subject: [PATCH 02/44] Created videos controller and model, added timestamps to customer model --- app/controllers/videos_controller.rb | 51 +++++++++++++ app/models/video.rb | 2 + config/routes.rb | 1 + db/migrate/20201202003013_create_videos.rb | 13 ++++ ...01202003704_add_timestamps_to_customers.rb | 5 ++ db/schema.rb | 14 +++- test/controllers/videos_controller_test.rb | 76 ++++++++++--------- test/models/video_test.rb | 7 ++ 8 files changed, 133 insertions(+), 36 deletions(-) create mode 100644 app/controllers/videos_controller.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20201202003013_create_videos.rb create mode 100644 db/migrate/20201202003704_add_timestamps_to_customers.rb create mode 100644 test/models/video_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..79737e1bb --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,51 @@ +class VideosController < ApplicationController + before_action :set_video, only: [:show, :update, :destroy] + + # GET /videos + def index + @videos = Video.all + + render json: @videos + end + + # GET /videos/1 + def show + render json: @video + end + + # POST /videos + def create + @video = Video.new(video_params) + + if @video.save + render json: @video, status: :created, location: @video + else + render json: @video.errors, status: :unprocessable_entity + end + end + + # PATCH/PUT /videos/1 + def update + if @video.update(video_params) + render json: @video + else + render json: @video.errors, status: :unprocessable_entity + end + end + + # DELETE /videos/1 + def destroy + @video.destroy + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_video + @video = Video.find(params[:id]) + end + + # Only allow a trusted parameter "white list" through. + def video_params + params.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 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/config/routes.rb b/config/routes.rb index cd2125daf..ac84ee667 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + resources :videos resources :customers # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20201202003013_create_videos.rb b/db/migrate/20201202003013_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20201202003013_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20201202003704_add_timestamps_to_customers.rb b/db/migrate/20201202003704_add_timestamps_to_customers.rb new file mode 100644 index 000000000..e8423956d --- /dev/null +++ b/db/migrate/20201202003704_add_timestamps_to_customers.rb @@ -0,0 +1,5 @@ +class AddTimestampsToCustomers < ActiveRecord::Migration[6.0] + def change + add_timestamps :customers + end +end diff --git a/db/schema.rb b/db/schema.rb index d8af96e6e..0136831f5 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_12_02_000832) do +ActiveRecord::Schema.define(version: 2020_12_02_003704) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,6 +24,18 @@ t.string "postal_code" t.string "phone" t.integer "videos_checked_out_count" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index c1d9564b5..e074dad65 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,6 +1,9 @@ require "test_helper" describe VideosController do + let(:video1) { videos(:wonder_woman) } + let(:video2) { videos(:black_widow) } + describe "index" do it "must get index" do # Act @@ -37,38 +40,6 @@ end end - describe "show" do - it "can get a video" do - # Arrange - wonder_woman = videos(:wonder_woman) - - # Act - get video_path(wonder_woman.id) - body = JSON.parse(response.body) - - # Assert - fields = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort - expect(body.keys.sort).must_equal fields - expect(body["title"]).must_equal "Wonder Woman 2" - expect(body["release_date"]).must_equal "December 25th 2020" - expect(body["available_inventory"]).must_equal 100 - expect(body["overview"]).must_equal "Wonder Woman squares off against Maxwell Lord and the Cheetah, a villainess who possesses superhuman strength and agility." - expect(body["total_inventory"]).must_equal 100 - - must_respond_with :ok - end - - it "responds with a 404 for non-existant videos" do - # Act - get video_path(-1) - body = JSON.parse(response.body) - - # Assert - expect(body.keys).must_include "errors" - expect(body["errors"]).must_include "Not Found" - must_respond_with :not_found - end - end describe "create" do it "can create a valid video" do @@ -98,9 +69,9 @@ total_inventory: 6, available_inventory: 6 } - + video_hash[:title] = nil - + # Assert expect { post videos_path, params: video_hash @@ -110,8 +81,43 @@ expect(body.keys).must_include "errors" expect(body["errors"].keys).must_include "title" expect(body["errors"]["title"]).must_include "can't be blank" - + must_respond_with :bad_request end end + + + describe "show" do + it "can get a video" do + # Arrange + wonder_woman = videos(:wonder_woman) + + # Act + get video_path(wonder_woman.id) + body = JSON.parse(response.body) + + # Assert + fields = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort + expect(body.keys.sort).must_equal fields + expect(body["title"]).must_equal "Wonder Woman 2" + expect(body["release_date"]).must_equal "December 25th 2020" + expect(body["available_inventory"]).must_equal 100 + expect(body["overview"]).must_equal "Wonder Woman squares off against Maxwell Lord and the Cheetah, a villainess who possesses superhuman strength and agility." + expect(body["total_inventory"]).must_equal 100 + + must_respond_with :ok + end + + it "responds with a 404 for non-existant videos" do + # Act + get video_path(-1) + body = JSON.parse(response.body) + + # Assert + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "Not Found" + must_respond_with :not_found + end + end end + diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From ccc2c0fb1311b46bee87dad84dec5c3b3e310fa6 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Tue, 1 Dec 2020 16:47:29 -0800 Subject: [PATCH 03/44] rentals controller generated and routes modified --- app/controllers/rentals_controller.rb | 7 +++++++ config/routes.rb | 6 ++++-- test/controllers/rentals_controller_test.rb | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..b0dbcdebe --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,7 @@ +class RentalsController < ApplicationController + def check_in + end + + def check_out + end +end diff --git a/config/routes.rb b/config/routes.rb index ac84ee667..6e90c7ee0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do - resources :videos - resources :customers + get 'rentals/check_in', to: "rentals#check_in", as: "rentals_check_in" + get 'rentals/check_out', to: "rentals#check_out", as: "rentals_check_out" + resources :videos, only: [:index, :show, :create] + resources :customers, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..95f20b4be --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe RentalsController do + it "must get check-in" do + get rentals_check_in_path + must_respond_with :success + end + + it "must get check-out" do + get rentals_check_out_path + must_respond_with :success + end + +end From e262325e4c0563eeb4d34c1bb13693333caaeae3 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 1 Dec 2020 16:57:42 -0800 Subject: [PATCH 04/44] created rentals model and added has_many and belongs_to relationships --- app/models/customer.rb | 1 + app/models/rental.rb | 4 ++++ app/models/video.rb | 1 + db/migrate/20201202005516_create_rentals.rb | 11 +++++++++++ db/schema.rb | 10 +++++++++- test/models/rental_test.rb | 7 +++++++ 6 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20201202005516_create_rentals.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..0449e1916 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video +end diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..991014af0 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/20201202005516_create_rentals.rb b/db/migrate/20201202005516_create_rentals.rb new file mode 100644 index 000000000..f634c02aa --- /dev/null +++ b/db/migrate/20201202005516_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.integer :customer_id + t.integer :video_id + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 0136831f5..58275637f 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_12_02_003704) do +ActiveRecord::Schema.define(version: 2020_12_02_005516) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,6 +28,14 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "rentals", force: :cascade do |t| + t.integer "customer_id" + t.integer "video_id" + t.date "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 9f44715880a47a84050674d273249aaff43e1ff0 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 1 Dec 2020 17:18:54 -0800 Subject: [PATCH 05/44] fixed up status codes and strong params in videos_controller and customers_controller --- app/controllers/customers_controller.rb | 32 ++++++++++------ app/controllers/videos_controller.rb | 49 ++++++++----------------- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index bea2a8f9d..6e130b5d5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,26 +1,36 @@ class CustomersController < ApplicationController - before_action :set_customer, only: [:show, :update, :destroy] - # GET /customers def index - @customers = Customer.all + customers = Customer.all - render json: @customers + render json: customers, status: :ok end - # GET /customers/1 def show - render json: @customer + customer = Customer.find_by(id: params[:id]) + + if customer.nil? + return render json: {ok: false, message: "Customer not found"}, status: :not_found + end + + render json: customer, status: :ok end - # POST /customers + def create - @customer = Customer.new(customer_params) + customer = Customer.new(customer_params) - if @customer.save - render json: @customer, status: :created, location: @customer + if customer.save + render json: customer, status: :created, location: customer else - render json: @customer.errors, status: :unprocessable_entity + render json: customer.errors, status: :unprocessable_entity end end + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + end + end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 79737e1bb..66ada13b4 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,51 +1,34 @@ class VideosController < ApplicationController - before_action :set_video, only: [:show, :update, :destroy] - # GET /videos def index - @videos = Video.all + videos = Video.all - render json: @videos + render json: videos, status: :ok end - # GET /videos/1 def show - render json: @video - end - - # POST /videos - def create - @video = Video.new(video_params) + video = Video.find_by(id: params[:id]) - if @video.save - render json: @video, status: :created, location: @video - else - render json: @video.errors, status: :unprocessable_entity + if video.nil? + return render json: {ok: false, message: "Video not found"}, status: :not_found end + + render json: video, status: :ok end - # PATCH/PUT /videos/1 - def update - if @video.update(video_params) - render json: @video + def create + video = Video.new(video_params) + + if video.save + render json: video, status: :created, location: video else - render json: @video.errors, status: :unprocessable_entity + render json: video.errors, status: :unprocessable_entity end end - # DELETE /videos/1 - def destroy - @video.destroy - end - private - # Use callbacks to share common setup or constraints between actions. - def set_video - @video = Video.find(params[:id]) - end - # Only allow a trusted parameter "white list" through. - def video_params - params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) - end + def video_params + params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + end end From a8c81f3e27ef16169c7a15c09a6e074aa3304309 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 11:01:42 -0800 Subject: [PATCH 06/44] customer index tests modified and passing --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6e130b5d5..261cc86bb 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers, status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :ok end def show diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index bd9bfdc06..1701d132d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,4 +1,3 @@ - require "test_helper" describe CustomersController do @@ -10,12 +9,12 @@ body = JSON.parse(response.body) # Assert + expect(response.header['Content-Type']).must_include 'json' expect(body).must_be_instance_of Array expect(body.length).must_equal Customer.count # Check that each customer has the proper keys - fields = ["id", "name", "registered_at", "postal_code", - "phone", "videos_checked_out_count"].sort + fields = ["id", "name", "registered_at", "address", "city", "state","postal_code", "phone", "videos_checked_out_count"].sort body.each do |customer| expect(customer.keys.sort).must_equal fields @@ -28,8 +27,9 @@ Customer.destroy_all get customers_path - body = JSON.parse(response.body) + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) expect(body).must_be_instance_of Array expect(body.length).must_equal 0 From 1d5ecd91519556af0da6ae62046594b370c3ab56 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 11:14:19 -0800 Subject: [PATCH 07/44] customer show tests written and passing --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 58 ++++++++++++------- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 261cc86bb..1e582428c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -13,7 +13,7 @@ def show return render json: {ok: false, message: "Customer not found"}, status: :not_found end - render json: customer, status: :ok + render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :ok end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1701d132d..22e3a34c9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,9 @@ require "test_helper" describe CustomersController do - let(:customer) { customers(:one) } + let(:customer1) { customers(:customer_one) } + let(:customer2) { customers(:customer_two) } + describe "index" do it "must get index" do # Act @@ -37,33 +39,45 @@ end end - # Rails scaffold generated tests below - + describe "show" do + it "should show an existing customer" do + get customer_path(customer1.id) - it "should create customer" do - value do - post customers_url, params: { customer: { create: @customer.create, index: @customer.index, show: @customer.show } }, as: :json - end.must_differ "Customer.count" + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["name"]).must_equal "Simon Del Rosario" + expect(body["registered_at"]).must_equal "2015-04-29T14:54:14.000Z" + expect(body["postal_code"]).must_equal "75007" + expect(body["phone"]).must_equal "(469) 734-9111" + expect(body["address"]).must_equal "1314 Elm Street" + expect(body["city"]).must_equal "Seattle" + expect(body["state"]).must_equal "WA" + expect(body["videos_checked_out_count"]).must_equal 3 - must_respond_with 201 - end + must_respond_with :ok + end + it "should return a descriptive json for a nonexisting customer" do + get customer_path(-1) - it "should show customer" do - get customer_url(@customer), as: :json - must_respond_with :success - end + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal "Customer not found" - it "should update customer" do - patch customer_url(@customer), params: { customer: { create: @customer.create, index: @customer.index, show: @customer.show } }, as: :json - must_respond_with 200 + must_respond_with :not_found + end end - it "should destroy customer" do - value do - delete customer_url(@customer), as: :json - end.must_differ "Customer.count", -1 + describe "create" do + it "should create customer" do + value do + post customers_url, params: { customer: { create: @customer.create, index: @customer.index, show: @customer.show } }, as: :json + end.must_differ "Customer.count" - must_respond_with 204 + must_respond_with 201 + end end -end +end From 6af974f3d1bcba6a39350ab9c18e7841db318b80 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 11:34:23 -0800 Subject: [PATCH 08/44] customer create positive nominal test written and passing --- app/controllers/customers_controller.rb | 4 +-- test/controllers/customers_controller_test.rb | 35 ++++++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1e582428c..3c34c7cbc 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -21,7 +21,7 @@ def create customer = Customer.new(customer_params) if customer.save - render json: customer, status: :created, location: customer + render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :created else render json: customer.errors, status: :unprocessable_entity end @@ -30,7 +30,7 @@ def create private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 22e3a34c9..a40ec9d3d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -71,12 +71,39 @@ end describe "create" do + let (:customer_hash) do + { + customer: { + name: "Test Customer", + registered_at: "2020-12-02 11:23:09 -0800", + address: "123 Fake Street", + city: "Seattle", + state: "WA", + postal_code: "99999", + phone: "(123)456-7890", + videos_checked_out_count: 1 + } + } + end + it "should create customer" do - value do - post customers_url, params: { customer: { create: @customer.create, index: @customer.index, show: @customer.show } }, as: :json - end.must_differ "Customer.count" + expect { + post customers_url, params: customer_hash + }.must_differ "Customer.count" - must_respond_with 201 + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["name"]).must_equal customer_hash[:customer][:name] + expect(Time.new(body["registered_at"])).must_equal Time.new(customer_hash[:customer][:registered_at]) + expect(body["postal_code"]).must_equal customer_hash[:customer][:postal_code] + expect(body["phone"]).must_equal customer_hash[:customer][:phone] + expect(body["address"]).must_equal customer_hash[:customer][:address] + expect(body["city"]).must_equal customer_hash[:customer][:city] + expect(body["state"]).must_equal customer_hash[:customer][:state] + expect(body["videos_checked_out_count"]).must_equal customer_hash[:customer][:videos_checked_out_count] + + must_respond_with :created end end From 2ffd989be523c10c66b79c115f4be1ec4c813094 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Wed, 2 Dec 2020 12:06:32 -0800 Subject: [PATCH 09/44] video controller tests rewritten and passing --- app/controllers/customers_controller.rb | 6 ++- app/controllers/videos_controller.rb | 12 +++-- app/models/customer.rb | 3 ++ app/models/video.rb | 2 + config/routes.rb | 1 - test/controllers/customers_controller_test.rb | 16 ++++++- test/controllers/videos_controller_test.rb | 46 ++++++++++--------- 7 files changed, 57 insertions(+), 29 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3c34c7cbc..10d1305d1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -23,7 +23,11 @@ def create if customer.save render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :created else - render json: customer.errors, status: :unprocessable_entity + render json: { + ok: false, + errors: customer.errors.messages + }, status: :bad_request + return end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 66ada13b4..c026ce5ed 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,7 +3,7 @@ class VideosController < ApplicationController def index videos = Video.all - render json: videos, status: :ok + render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def show @@ -13,16 +13,20 @@ def show return render json: {ok: false, message: "Video not found"}, status: :not_found end - render json: video, status: :ok + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create video = Video.new(video_params) if video.save - render json: video, status: :created, location: video + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :created else - render json: video.errors, status: :unprocessable_entity + render json: { + ok: false, + errors: video.errors.messages + }, status: :bad_request + return end end diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..0c2791d29 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,6 @@ class Customer < ApplicationRecord has_many :rentals + + validates :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count, presence: true + end diff --git a/app/models/video.rb b/app/models/video.rb index 991014af0..3a70db0c3 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,3 +1,5 @@ class Video < ApplicationRecord has_many :rentals + + validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 6e90c7ee0..46c092172 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,4 @@ get 'rentals/check_out', to: "rentals#check_out", as: "rentals_check_out" resources :videos, only: [:index, :show, :create] resources :customers, only: [:index, :show, :create] - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index a40ec9d3d..a1a3783c6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -88,7 +88,7 @@ it "should create customer" do expect { - post customers_url, params: customer_hash + post customers_path, params: customer_hash }.must_differ "Customer.count" expect(response.header['Content-Type']).must_include 'json' @@ -105,6 +105,18 @@ must_respond_with :created end - end + it "will not create a customer with invalid params" do + + expect { + post customers_path, params: { customer: { name: "doggie" } } + }.wont_change "Customer.count" + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["errors"].keys).must_include "phone" + must_respond_with :bad_request + end + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e074dad65..42acfcb44 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -11,11 +11,12 @@ body = JSON.parse(response.body) # Assert + expect(response.header['Content-Type']).must_include 'json' expect(body).must_be_instance_of Array expect(body.length).must_equal Video.count # Check that each customer has the proper keys - fields = ["id", "title", "release_date", "available_inventory"].sort + fields = %w[id title overview release_date total_inventory available_inventory].sort body.each do |customer| expect(customer.keys.sort).must_equal fields @@ -30,6 +31,8 @@ # Act get videos_path + + expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) # Assert @@ -45,11 +48,13 @@ it "can create a valid video" do # Arrange video_hash = { - title: "Alf the movie", - overview: "The most early 90s movie of all time", - release_date: "December 16th 2025", - total_inventory: 6, - available_inventory: 6 + video: { + title: "Alf the movie", + overview: "The most early 90s movie of all time", + release_date: "December 16th 2025", + total_inventory: 6, + available_inventory: 6 + } } # Assert @@ -63,15 +68,15 @@ it "will respond with bad request and errors for an invalid movie" do # Arrange video_hash = { - title: "Alf the movie", - overview: "The most early 90s movie of all time", - release_date: "December 16th 2025", - total_inventory: 6, - available_inventory: 6 + video: { + title: nil, + overview: "The most early 90s movie of all time", + release_date: "December 16th 2025", + total_inventory: 6, + available_inventory: 6 + } } - video_hash[:title] = nil - # Assert expect { post videos_path, params: video_hash @@ -89,18 +94,16 @@ describe "show" do it "can get a video" do - # Arrange - wonder_woman = videos(:wonder_woman) # Act - get video_path(wonder_woman.id) + get video_path(video1.id) body = JSON.parse(response.body) # Assert - fields = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort + fields = %w[id title overview release_date total_inventory available_inventory].sort expect(body.keys.sort).must_equal fields expect(body["title"]).must_equal "Wonder Woman 2" - expect(body["release_date"]).must_equal "December 25th 2020" + expect(body["release_date"]).must_equal "2020-12-25" expect(body["available_inventory"]).must_equal 100 expect(body["overview"]).must_equal "Wonder Woman squares off against Maxwell Lord and the Cheetah, a villainess who possesses superhuman strength and agility." expect(body["total_inventory"]).must_equal 100 @@ -108,14 +111,15 @@ must_respond_with :ok end - it "responds with a 404 for non-existant videos" do + it "responds with a 404 for nonexistent videos" do # Act get video_path(-1) body = JSON.parse(response.body) # Assert - expect(body.keys).must_include "errors" - expect(body["errors"]).must_include "Not Found" + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body["message"]).must_equal "Video not found" must_respond_with :not_found end end From f13fb7d0ff5842eeee44565c30b2de3b4a9caf95 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 16:45:31 -0800 Subject: [PATCH 10/44] changed returned payloads to match provided smoke tests --- app/controllers/customers_controller.rb | 6 ++-- app/controllers/videos_controller.rb | 10 +++--- test/controllers/customers_controller_test.rb | 23 ++++++------- test/controllers/videos_controller_test.rb | 34 +++++++------------ 4 files changed, 31 insertions(+), 42 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 10d1305d1..72bd8db43 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,14 +3,14 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at,:postal_code, :phone, :videos_checked_out_count]), status: :ok end def show customer = Customer.find_by(id: params[:id]) if customer.nil? - return render json: {ok: false, message: "Customer not found"}, status: :not_found + return render json: {ok: false, message: "Customer not found", errors: ['Not Found']}, status: :not_found end render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :ok @@ -34,7 +34,7 @@ def create private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count) + params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count) end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index c026ce5ed..d5fb43187 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,24 +3,24 @@ class VideosController < ApplicationController def index videos = Video.all - render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok + render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok end def show video = Video.find_by(id: params[:id]) if video.nil? - return render json: {ok: false, message: "Video not found"}, status: :not_found + return render json: {ok: false, message: "Video not found", errors: ['Not Found']}, status: :not_found end - render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok + render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create video = Video.new(video_params) if video.save - render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :created + render json: video.as_json(only: [:id]), status: :created else render json: { ok: false, @@ -33,6 +33,6 @@ def create private def video_params - params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index a1a3783c6..ac810c289 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -16,7 +16,7 @@ expect(body.length).must_equal Customer.count # Check that each customer has the proper keys - fields = ["id", "name", "registered_at", "address", "city", "state","postal_code", "phone", "videos_checked_out_count"].sort + fields = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"].sort body.each do |customer| expect(customer.keys.sort).must_equal fields @@ -73,7 +73,6 @@ describe "create" do let (:customer_hash) do { - customer: { name: "Test Customer", registered_at: "2020-12-02 11:23:09 -0800", address: "123 Fake Street", @@ -82,7 +81,6 @@ postal_code: "99999", phone: "(123)456-7890", videos_checked_out_count: 1 - } } end @@ -94,22 +92,23 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body["name"]).must_equal customer_hash[:customer][:name] - expect(Time.new(body["registered_at"])).must_equal Time.new(customer_hash[:customer][:registered_at]) - expect(body["postal_code"]).must_equal customer_hash[:customer][:postal_code] - expect(body["phone"]).must_equal customer_hash[:customer][:phone] - expect(body["address"]).must_equal customer_hash[:customer][:address] - expect(body["city"]).must_equal customer_hash[:customer][:city] - expect(body["state"]).must_equal customer_hash[:customer][:state] - expect(body["videos_checked_out_count"]).must_equal customer_hash[:customer][:videos_checked_out_count] + expect(body["name"]).must_equal customer_hash[:name] + expect(Time.new(body["registered_at"])).must_equal Time.new(customer_hash[:registered_at]) + expect(body["postal_code"]).must_equal customer_hash[:postal_code] + expect(body["phone"]).must_equal customer_hash[:phone] + expect(body["address"]).must_equal customer_hash[:address] + expect(body["city"]).must_equal customer_hash[:city] + expect(body["state"]).must_equal customer_hash[:state] + expect(body["videos_checked_out_count"]).must_equal customer_hash[:videos_checked_out_count] must_respond_with :created end it "will not create a customer with invalid params" do + customer_hash[:phone] = nil expect { - post customers_path, params: { customer: { name: "doggie" } } + post customers_path, params: customer_hash }.wont_change "Customer.count" expect(response.header['Content-Type']).must_include 'json' diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 42acfcb44..29b092e28 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -16,7 +16,7 @@ expect(body.length).must_equal Video.count # Check that each customer has the proper keys - fields = %w[id title overview release_date total_inventory available_inventory].sort + fields = %w[id title release_date available_inventory].sort body.each do |customer| expect(customer.keys.sort).must_equal fields @@ -45,18 +45,16 @@ describe "create" do - it "can create a valid video" do - # Arrange - video_hash = { - video: { - title: "Alf the movie", - overview: "The most early 90s movie of all time", - release_date: "December 16th 2025", - total_inventory: 6, - available_inventory: 6 - } + let (:video_hash) do + { + title: "Alf the movie", + overview: "The most early 90s movie of all time", + release_date: "December 16th 2025", + total_inventory: 6, + available_inventory: 6 } - + end + it "can create a valid video" do # Assert expect { post videos_path, params: video_hash @@ -67,15 +65,7 @@ it "will respond with bad request and errors for an invalid movie" do # Arrange - video_hash = { - video: { - title: nil, - overview: "The most early 90s movie of all time", - release_date: "December 16th 2025", - total_inventory: 6, - available_inventory: 6 - } - } + video_hash[:title] = nil # Assert expect { @@ -100,7 +90,7 @@ body = JSON.parse(response.body) # Assert - fields = %w[id title overview release_date total_inventory available_inventory].sort + fields = %w[title overview release_date total_inventory available_inventory].sort expect(body.keys.sort).must_equal fields expect(body["title"]).must_equal "Wonder Woman 2" expect(body["release_date"]).must_equal "2020-12-25" From bfe742352f7fe8501f6025aa21a8be2024ba0f14 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 16:45:58 -0800 Subject: [PATCH 11/44] Added keys to returned payload for invalid video show --- ...ore API Wave 1- Customers and Videos.postman_collection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Video Store API Wave 1- Customers and Videos.postman_collection.json b/test/Video Store API Wave 1- Customers and Videos.postman_collection.json index 60c789228..88e36b08d 100644 --- a/test/Video Store API Wave 1- Customers and Videos.postman_collection.json +++ b/test/Video Store API Wave 1- Customers and Videos.postman_collection.json @@ -165,7 +165,7 @@ "", "pm.test(\"response should have 'errors': ['Not Found']\", () => {", " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(Object.keys(res)).to.have.members(['ok', 'message', 'errors']);", " pm.expect(res['errors']).to.have.members(['Not Found']);", "});" ], From b4848493d318a2d99c2dbd1a4f0e5a91f9f14816 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 16:49:56 -0800 Subject: [PATCH 12/44] Added key to returned payload for invalid video create --- ...ore API Wave 1- Customers and Videos.postman_collection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Video Store API Wave 1- Customers and Videos.postman_collection.json b/test/Video Store API Wave 1- Customers and Videos.postman_collection.json index 88e36b08d..552ae493d 100644 --- a/test/Video Store API Wave 1- Customers and Videos.postman_collection.json +++ b/test/Video Store API Wave 1- Customers and Videos.postman_collection.json @@ -308,7 +308,7 @@ "", "pm.test(\"response should have 'errors' with details on title, overview, release_date, total_inventory, available_inventory required\", () => {", " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(Object.keys(res)).to.have.members(['ok','errors']);", " pm.expect(Object.keys(res['errors'])).to.have.members(['title', 'overview', 'release_date', 'total_inventory', 'available_inventory']);", "});" ], From e20b6759956584ba7b7f0e4ca6f76b965d1e6845 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 17:01:53 -0800 Subject: [PATCH 13/44] Added create tests for nil parameters passed --- test/controllers/customers_controller_test.rb | 18 ++++++++++++++++++ test/controllers/videos_controller_test.rb | 13 +++++++++++++ 2 files changed, 31 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ac810c289..997feb2d6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -117,5 +117,23 @@ expect(body["errors"].keys).must_include "phone" must_respond_with :bad_request end + it "will not create a customer with nil params" do + expect { + post customers_path, params: nil + }.wont_change "Customer.count" + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["errors"].keys).must_include "name" + expect(body["errors"].keys).must_include "address" + expect(body["errors"].keys).must_include "registered_at" + expect(body["errors"].keys).must_include "city" + expect(body["errors"].keys).must_include "state" + expect(body["errors"].keys).must_include "postal_code" + expect(body["errors"].keys).must_include "phone" + expect(body["errors"].keys).must_include "videos_checked_out_count" + must_respond_with :bad_request + end end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 29b092e28..69a6cc8e5 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -77,6 +77,19 @@ expect(body["errors"].keys).must_include "title" expect(body["errors"]["title"]).must_include "can't be blank" + must_respond_with :bad_request + end + it "will respond with bad request and errors for a nil movie" do + # Assert + expect { + post videos_path, params: nil + }.wont_change "Video.count" + body = JSON.parse(response.body) + + expect(body.keys).must_include "errors" + expect(body["errors"].keys).must_include "title" + expect(body["errors"]["title"]).must_include "can't be blank" + must_respond_with :bad_request end end From f022019e7dd76d2a1633971372331e76a90bf210 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 17:10:09 -0800 Subject: [PATCH 14/44] outlined tests --- test/models/customer_test.rb | 16 ++++++++++++---- test/models/video_test.rb | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..53d484bd2 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,15 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end + describe "relationships" do + + end + + describe "validations" do + + end + + describe "custom methods" do + + end +end \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..37369ab32 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "relationships" do + it "has many rentals" do + + end + it "has many customers through rentals" do + + end + end + + describe "validations" do + it "must have a title" do + + end + it "must have a overview" do + + end + it "must have a total_inventory" do + + end + it "must have a available_inventory" do + + end + it "must have a release_date" do + + end + end + + describe "custom methods" do + + end end From b5e5a431c369402cc3b2198d635e04279aadf4a4 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Wed, 2 Dec 2020 18:24:50 -0800 Subject: [PATCH 15/44] rental/checkout ctrlr method and tests written, video availability and customer checkout count model methods --- Gemfile | 2 + Gemfile.lock | 4 ++ app/controllers/rentals_controller.rb | 31 ++++++++- app/models/customer.rb | 4 ++ app/models/rental.rb | 8 +++ app/models/video.rb | 5 +- config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 72 +++++++++++++++++++-- 8 files changed, 122 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index bfacd7a13..92334f49f 100644 --- a/Gemfile +++ b/Gemfile @@ -55,3 +55,5 @@ group :test do gem 'minitest-rails' gem 'minitest-reporters' end + +gem 'validates_timeliness', '~> 5.0.0.beta' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 6b36539e2..fd81a8292 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,8 +177,11 @@ GEM sprockets (>= 3.0.0) thor (1.0.1) thread_safe (0.3.6) + timeliness (0.4.4) tzinfo (1.2.8) thread_safe (~> 0.1) + validates_timeliness (5.0.0.beta2) + timeliness (>= 0.3.10, < 1) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -204,6 +207,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + validates_timeliness (~> 5.0.0.beta) RUBY VERSION ruby 2.6.5p114 diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b0dbcdebe..ff1a53725 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,36 @@ class RentalsController < ApplicationController + def check_out + rental = Rental.new(rental_params) + rental.due_date = Date.today + 7.days + + if rental.save + + rental.customer.increment_checkout_count + rental.video.decrement_inventory + + json_to_return = rental.as_json(only: [:customer_id, :video_id, :due_date]) + json_to_return[:videos_checked_out_count] = rental.customer.videos_checked_out_count + json_to_return[:available_inventory] = rental.video.available_inventory + + render json: json_to_return, status: :created + return + else + render json: { + ok: false, + errors: rental.errors.messages + }, status: :not_found + return + end + end + def check_in end - def check_out + private + + def rental_params + params.permit(:customer_id, :video_id, :due_date) end + + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0c2791d29..fe26a4498 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,4 +3,8 @@ class Customer < ApplicationRecord validates :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count, presence: true + def increment_checkout_count + self.videos_checked_out_count += 1 + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 0449e1916..6f802c823 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,12 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + + validates_date :due_date, on_or_after: lambda { Date.current } + + + def inventory_count + + end + end diff --git a/app/models/video.rb b/app/models/video.rb index 3a70db0c3..69ffdd244 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,8 @@ class Video < ApplicationRecord has_many :rentals - validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true + + def decrement_inventory + self.available_inventory -= 1 + end end diff --git a/config/routes.rb b/config/routes.rb index 46c092172..28cae0f0d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do - get 'rentals/check_in', to: "rentals#check_in", as: "rentals_check_in" - get 'rentals/check_out', to: "rentals#check_out", as: "rentals_check_out" + post 'rentals/check_in', to: "rentals#check_in", as: "rentals_check_in" + post 'rentals/check_out', to: "rentals#check_out", as: "rentals_check_out" resources :videos, only: [:index, :show, :create] resources :customers, only: [:index, :show, :create] end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 95f20b4be..be1dfc992 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,12 +1,76 @@ require "test_helper" describe RentalsController do - it "must get check-in" do - get rentals_check_in_path - must_respond_with :success + + describe "check-out" do + before do + @rental_hash = { + video_id: videos(:wonder_woman).id, + customer_id: customers(:customer_one).id + } + end + + it "check-out works with valid params" do + + checkout_count = Customer.find_by(id: @rental_hash[:customer_id]).videos_checked_out_count + available_inventory = Video.find_by(id: @rental_hash[:video_id]).available_inventory + + expect { + post rentals_check_out_path, params: @rental_hash + }.must_differ "Rental.count", 1 + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["customer_id"]).must_equal @rental_hash[:customer_id] + expect(body["video_id"]).must_equal @rental_hash[:video_id] + expect(body["due_date"]).wont_be_nil + expect(body["videos_checked_out_count"]).must_equal checkout_count + 1 + expect(body["available_inventory"]).must_equal available_inventory - 1 + + + must_respond_with :created + + end + + it "will not check out with invalid customer" do + @rental_hash[:customer_id] = nil + + expect { + post rentals_check_out_path, params: @rental_hash + }.wont_change "Rental.count" + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['errors']).must_include "customer" + + must_respond_with :bad_request + + end + + it "will not check out with invalid video" do + @rental_hash[:customer_id] = customers(:customer_one).id + @rental_hash[:video_id] = nil + + expect { + post rentals_check_out_path, params: @rental_hash + }.wont_change "Rental.count" + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['errors']).must_include "video" + + must_respond_with :bad_request + + end end - it "must get check-out" do + it "must get check-in" do + skip get rentals_check_out_path must_respond_with :success end From f9bba9f9ffd2765751bbd9e449fb0f7a93f2b06d Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 18:36:25 -0800 Subject: [PATCH 16/44] Added out_of_stock video fixture, added conditional and test to check video inventory before checkout --- app/controllers/rentals_controller.rb | 9 ++++++++- test/controllers/rentals_controller_test.rb | 19 ++++++++++++++++++- test/fixtures/videos.yml | 6 ++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ff1a53725..34b0dadda 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,9 +2,16 @@ class RentalsController < ApplicationController def check_out rental = Rental.new(rental_params) rental.due_date = Date.today + 7.days + + if rental.video && rental.video.available_inventory < 1 + render json: { + ok: false, + errors: ["Not enough available inventory"] + }, status: :bad_request + return + end if rental.save - rental.customer.increment_checkout_count rental.video.decrement_inventory diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index be1dfc992..1f536c86a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -46,7 +46,7 @@ expect(body['ok']).must_equal false expect(body['errors']).must_include "customer" - must_respond_with :bad_request + must_respond_with :not_found end @@ -64,6 +64,23 @@ expect(body['ok']).must_equal false expect(body['errors']).must_include "video" + must_respond_with :not_found + + end + + it "will not check out if available video inventory is < 1" do + @rental_hash[:video_id] = videos(:out_of_stock).id + + expect { + post rentals_check_out_path, params: @rental_hash + }.wont_change "Rental.count" + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['errors']).must_include "Not enough available inventory" + must_respond_with :bad_request end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index cef2102b7..1c9b61705 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -10,3 +10,9 @@ black_widow: available_inventory: 6 overview: At birth the Black Widow (aka Natasha Romanova) is given to the KGB, which grooms her to become its ultimate operative. When the U.S.S.R. breaks up, the government tries to kill her as the action moves to present-day New York, where she is a freelance operative. total_inventory: 7 +out_of_stock: + title: Black Widow + release_date: "May 7th 2021" + available_inventory: 0 + overview: At birth the Black Widow (aka Natasha Romanova) is given to the KGB, which grooms her to become its ultimate operative. When the U.S.S.R. breaks up, the government tries to kill her as the action moves to present-day New York, where she is a freelance operative. + total_inventory: 7 \ No newline at end of file From fbe90943b960004e8ab1b591f02cedcfa38e3295 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Wed, 2 Dec 2020 18:52:03 -0800 Subject: [PATCH 17/44] wrote rentals#check_in action (untested) --- app/controllers/rentals_controller.rb | 19 +++++++++++++++++++ app/models/customer.rb | 4 ++++ app/models/video.rb | 4 ++++ 3 files changed, 27 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 34b0dadda..abb9ccd0f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,6 +31,25 @@ def check_out end def check_in + rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) + + if rental.nil? + render json: { + ok: false, + errors: ["Video #{rental.video.title} not checked out by customer #{rental.customer.name}."] + }, status: :not_found + return + else + rental.customer.decrement_checkout_count + rental.video.increment_inventory + + json_to_return = rental.as_json(only: [:customer_id, :video_id]) + json_to_return[:videos_checked_out_count] = rental.customer.videos_checked_out_count + json_to_return[:available_inventory] = rental.video.available_inventory + + render json: json_to_return, status: :created + return + end end private diff --git a/app/models/customer.rb b/app/models/customer.rb index fe26a4498..4f9c3bfac 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,4 +7,8 @@ def increment_checkout_count self.videos_checked_out_count += 1 end + def decrement_checkout_count + self.videos_checked_out_count -= 1 + end + end diff --git a/app/models/video.rb b/app/models/video.rb index 69ffdd244..d48918667 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -5,4 +5,8 @@ class Video < ApplicationRecord def decrement_inventory self.available_inventory -= 1 end + + def increment_inventory + self.available_inventory += 1 + end end From df7b3d20ce766468d7a4bcd339b1c6a7e534b66a Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Thu, 3 Dec 2020 10:17:31 -0800 Subject: [PATCH 18/44] ? --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ff1a53725..20011f1c9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,7 +2,7 @@ class RentalsController < ApplicationController def check_out rental = Rental.new(rental_params) rental.due_date = Date.today + 7.days - + if rental.save rental.customer.increment_checkout_count From ff2fe3bb382a58dcda3dcbf76d51a493ed637e34 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Thu, 3 Dec 2020 11:27:02 -0800 Subject: [PATCH 19/44] rentals controller checkin tests, some tricky stuff --- app/controllers/rentals_controller.rb | 6 +- config/routes.rb | 4 +- ...n and Checking Out.postman_collection.json | 50 +++++------ test/controllers/rentals_controller_test.rb | 86 +++++++++++++++++-- 4 files changed, 108 insertions(+), 38 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index abb9ccd0f..297f7962c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -19,7 +19,7 @@ def check_out json_to_return[:videos_checked_out_count] = rental.customer.videos_checked_out_count json_to_return[:available_inventory] = rental.video.available_inventory - render json: json_to_return, status: :created + render json: json_to_return, status: :ok return else render json: { @@ -36,7 +36,7 @@ def check_in if rental.nil? render json: { ok: false, - errors: ["Video #{rental.video.title} not checked out by customer #{rental.customer.name}."] + errors: ["Invalid rental"] }, status: :not_found return else @@ -47,7 +47,7 @@ def check_in json_to_return[:videos_checked_out_count] = rental.customer.videos_checked_out_count json_to_return[:available_inventory] = rental.video.available_inventory - render json: json_to_return, status: :created + render json: json_to_return, status: :ok return end end diff --git a/config/routes.rb b/config/routes.rb index 28cae0f0d..4f180b39d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do - post 'rentals/check_in', to: "rentals#check_in", as: "rentals_check_in" - post 'rentals/check_out', to: "rentals#check_out", as: "rentals_check_out" + post 'rentals/check-in', to: "rentals#check_in", as: "rentals_check_in" + post 'rentals/check-out', to: "rentals#check_out", as: "rentals_check_out" resources :videos, only: [:index, :show, :create] resources :customers, only: [:index, :show, :create] end diff --git a/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json b/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json index f241dc5ca..2ad258d04 100644 --- a/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json +++ b/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "690f79cf-484a-4266-8d84-b668aed0c2f4", + "_postman_id": "54e41ee1-2de4-49d7-b6dd-8bf465f0e84c", "name": "Video Store API Wave 2: Making Rentals with Checking In and Checking Out", "description": "Checks the following endpoints:\n\n- POST /rentals/check-out\n- POST /rentals/check-in", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" @@ -12,7 +12,7 @@ { "listen": "prerequest", "script": { - "id": "8b2b72e6-70c5-4ce1-afae-0e0bcb21f23f", + "id": "2aad34c9-b115-4884-b409-54d0f0495258", "exec": [ "// Pre-request script:", "// 1. Find and test a video that has positive available_inventory value", @@ -71,7 +71,7 @@ { "listen": "test", "script": { - "id": "5ca8ec82-7aec-4437-a668-78b477dccc4a", + "id": "3c28d018-b7b4-493d-aba2-db12d9ca1580", "exec": [ "pm.test(\"response should be 200 and come back as a json object\", () => {", " pm.response.to.have.status(200);", @@ -137,7 +137,7 @@ { "listen": "prerequest", "script": { - "id": "34a1b6f6-3b91-448a-b396-e612025a2ee8", + "id": "d8094487-c93a-43ba-a1e9-5c6e1b51c175", "exec": [ "// Pre-request script:", "// 1. Find and test a video that has positive available_inventory value", @@ -164,17 +164,17 @@ { "listen": "test", "script": { - "id": "bf8d5d2b-8e00-42cf-9bfc-5b4b25454525", + "id": "030d8971-40a7-44dc-97e1-6d222309674b", "exec": [ "pm.test(\"response should be 404 and come back as a json object\", () => {", " pm.response.to.have.status(404);", " pm.expect(pm.response.json()).to.be.an('object');", "});", "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + "pm.test(\"response should have 'errors'\", () => {", " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", + " pm.expect(Object.keys(res)).to.have.members(['ok', 'errors']);", + " pm.expect(res['errors']).to.have.keys({ \"customer\": [\"must exist\"]});", "});" ], "type": "text/javascript" @@ -223,7 +223,7 @@ { "listen": "prerequest", "script": { - "id": "87b2c3ba-669a-41dd-8705-336afba0656a", + "id": "1252ca9c-25d4-405f-bef0-65d77735a54b", "exec": [ "// Pre-request script:", "// 1. Find and set valid existing customer ID", @@ -254,17 +254,17 @@ { "listen": "test", "script": { - "id": "3ddbeb31-c014-46e7-a0cd-86d1b575b8b1", + "id": "3be65b9c-a5b5-440b-9f1d-a510b5923355", "exec": [ "pm.test(\"response should be 404 and come back as a json object\", () => {", " pm.response.to.have.status(404);", " pm.expect(pm.response.json()).to.be.an('object');", "});", "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + "pm.test(\"response should have 'errors'\", () => {", " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", + " pm.expect(Object.keys(res)).to.have.members(['ok', 'errors']);", + " pm.expect(res['errors']).to.have.keys({ \"video\": [\"must exist\"]});", "});" ], "type": "text/javascript" @@ -313,7 +313,7 @@ { "listen": "prerequest", "script": { - "id": "4a810fea-4a54-408c-b7f7-2a68b29a6f30", + "id": "179d2aac-8865-47b9-bbde-4f276ac366ed", "exec": [ "// Pre-request script:", "// 1. Find and test a video that has positive available_inventory value", @@ -372,7 +372,7 @@ { "listen": "test", "script": { - "id": "0e14e416-60b1-4d36-8cde-5c76d2169c8f", + "id": "1912cfba-4f57-4a0d-a504-395a398c3ab5", "exec": [ "pm.test(\"response should be 200 and come back as a json object\", () => {", " pm.response.to.have.status(200);", @@ -438,7 +438,7 @@ { "listen": "prerequest", "script": { - "id": "26deee94-b703-4ef0-8d16-143b6f8b0a78", + "id": "905ba97e-8116-4aa7-a509-c7b61a4195a1", "exec": [ "// Pre-request script:", "// 1. Find and test a video that has positive available_inventory value", @@ -465,17 +465,17 @@ { "listen": "test", "script": { - "id": "611878f7-a663-47a7-afcc-04c93633f7ea", + "id": "4f6e9840-090a-42c2-b0da-f0123fbe6228", "exec": [ "pm.test(\"response should be 404 and come back as a json object\", () => {", " pm.response.to.have.status(404);", " pm.expect(pm.response.json()).to.be.an('object');", "});", "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + "pm.test(\"response should have 'errors'\", () => {", " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", + " pm.expect(Object.keys(res)).to.have.members(['ok', 'errors']);", + " pm.expect(res['errors']).to.have.members([\"Invalid rental\"]);", "});" ], "type": "text/javascript" @@ -524,7 +524,7 @@ { "listen": "prerequest", "script": { - "id": "54552b89-1abc-407f-9185-095558a230a1", + "id": "e6176253-57b1-40ef-8d42-d0f4e308a0e1", "exec": [ "// Pre-request script:", "// 1. Find and set valid existing customer ID", @@ -554,17 +554,17 @@ { "listen": "test", "script": { - "id": "fe0f2905-b489-4c12-a3e5-3be76a6fca11", + "id": "cbe7278c-7aec-4fcd-856c-923374132beb", "exec": [ "pm.test(\"response should be 404 and come back as a json object\", () => {", " pm.response.to.have.status(404);", " pm.expect(pm.response.json()).to.be.an('object');", "});", "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + "pm.test(\"response should have 'errors'\", () => {", " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", + " pm.expect(Object.keys(res)).to.have.members(['ok', 'errors']);", + " pm.expect(res['errors']).to.have.members([\"Invalid rental\"]);", "});" ], "type": "text/javascript" diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1f536c86a..0f2bc930a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,8 +1,6 @@ require "test_helper" describe RentalsController do - - describe "check-out" do before do @rental_hash = { video_id: videos(:wonder_woman).id, @@ -10,6 +8,8 @@ } end + describe "check-out" do + it "check-out works with valid params" do checkout_count = Customer.find_by(id: @rental_hash[:customer_id]).videos_checked_out_count @@ -29,7 +29,7 @@ expect(body["available_inventory"]).must_equal available_inventory - 1 - must_respond_with :created + must_respond_with :ok end @@ -86,10 +86,80 @@ end end - it "must get check-in" do - skip - get rentals_check_out_path - must_respond_with :success - end + describe "check-in" do + it "will successfully check in an existing checkout" do + + post rentals_check_out_path, params: @rental_hash + + checkout_count = Customer.find_by(id: @rental_hash[:customer_id]).videos_checked_out_count + available_inventory = Video.find_by(id: @rental_hash[:video_id]).available_inventory + + expect { + post rentals_check_in_path, params: @rental_hash + }.wont_change "Rental.count" + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body["customer_id"]).must_equal @rental_hash[:customer_id] + expect(body["video_id"]).must_equal @rental_hash[:video_id] + expect(body["videos_checked_out_count"]).must_equal checkout_count - 1 + expect(body["available_inventory"]).must_equal available_inventory + 1 + + end + + it "will not check in with invalid video_id" do + post rentals_check_out_path, params: @rental_hash + + @rental_hash[:video_id] = nil + + post rentals_check_in_path, params: @rental_hash + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['errors']).must_include "Invalid rental" + + must_respond_with :not_found + + end + + it "will not check in with invalid customer_id" do + + post rentals_check_out_path, params: @rental_hash + + @rental_hash[:customer_id] = nil + + post rentals_check_in_path, params: @rental_hash + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['errors']).must_include "Invalid rental" + + must_respond_with :not_found + + end + + it "will not check in a video that was not checked out by a customer" do + + post rentals_check_out_path, params: @rental_hash + + @rental_hash[:customer_id] = customers(:customer_two).id + + post rentals_check_in_path, params: @rental_hash + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['errors']).must_include "Invalid rental" + + must_respond_with :not_found + + end + end end From 9f54f32824dab0d1107deb3c47616ce9053fc17e Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 11:33:34 -0800 Subject: [PATCH 20/44] added model validations --- app/models/customer.rb | 3 ++- app/models/rental.rb | 5 ----- app/models/video.rb | 4 +++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 4f9c3bfac..5ef133732 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,8 @@ class Customer < ApplicationRecord has_many :rentals - validates :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count, presence: true + validates :name, :registered_at, :address, :city, :state, :phone, :postal_code, presence: true + validates :videos_checked_out_count, numericality: {only: :integer, greater_than_or_equal_to: 0 }, presence: true def increment_checkout_count self.videos_checked_out_count += 1 diff --git a/app/models/rental.rb b/app/models/rental.rb index 6f802c823..078c6e7da 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,9 +4,4 @@ class Rental < ApplicationRecord validates_date :due_date, on_or_after: lambda { Date.current } - - def inventory_count - - end - end diff --git a/app/models/video.rb b/app/models/video.rb index d48918667..2c04e6c57 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,6 +1,8 @@ class Video < ApplicationRecord has_many :rentals - validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true + validates :title, :overview, :release_date, presence: true + validates :total_inventory, numericality: {only: :integer, greater_than_or_equal_to: 0 }, presence: true + validates :available_inventory, numericality: {only: :integer, greater_than_or_equal_to: 0 }, presence: true def decrement_inventory self.available_inventory -= 1 From fdf9ecc27dff70283101919be8b089d4c97c505c Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 11:54:04 -0800 Subject: [PATCH 21/44] video model tests written --- test/fixtures/rentals.yml | 6 +++ test/fixtures/videos.yml | 2 +- test/models/video_test.rb | 108 ++++++++++++++++++++++++++++++++++---- 3 files changed, 106 insertions(+), 10 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..ceb5bab39 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,6 @@ +rental_one: + video: wonder_woman + customer: customer_one +rental_two: + video: wonder_woman + customer: customer_two \ No newline at end of file diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 1c9b61705..05962ef80 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -14,5 +14,5 @@ out_of_stock: title: Black Widow release_date: "May 7th 2021" available_inventory: 0 - overview: At birth the Black Widow (aka Natasha Romanova) is given to the KGB, which grooms her to become its ultimate operative. When the U.S.S.R. breaks up, the government tries to kill her as the action moves to present-day New York, where she is a freelance operative. + overview: Womp womp total_inventory: 7 \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 37369ab32..cd9376b42 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,34 +1,124 @@ require "test_helper" describe Video do + let (:video_one) { videos(:wonder_woman) } + describe "relationships" do it "has many rentals" do - - end - it "has many customers through rentals" do - + rentals = video_one.rentals + expect(rentals.length).must_equal 2 + rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end end end describe "validations" do - it "must have a title" do + let (:video_hash) do + { + title: "Alf the movie", + overview: "The most early 90s movie of all time", + release_date: "December 16th 2025", + total_inventory: 6, + available_inventory: 6 + } + end + it "must have a title" do + video_hash[:title] = nil + video = Video.create(video_hash) + found_video = Video.find_by(overview: video_hash[:overview]) + expect(found_video).must_be_nil + expect(video.valid?).must_equal false + expect(video.errors.keys).must_include :title end - it "must have a overview" do + it "must have a overview" do + video_hash[:overview] = nil + video = Video.create(video_hash) + found_video = Video.find_by(title: video_hash[:title]) + expect(found_video).must_be_nil + expect(video.valid?).must_equal false + expect(video.errors.keys).must_include :overview end - it "must have a total_inventory" do + it "must have a total_inventory" do + video_hash[:total_inventory] = nil + video = Video.create(video_hash) + found_video = Video.find_by(title: video_hash[:title]) + expect(found_video).must_be_nil + expect(video.valid?).must_equal false + expect(video.errors.keys).must_include :total_inventory end - it "must have a available_inventory" do + it "must have a available_inventory" do + video_hash[:available_inventory] = nil + video = Video.create(video_hash) + found_video = Video.find_by(title: video_hash[:title]) + expect(found_video).must_be_nil + expect(video.valid?).must_equal false + expect(video.errors.keys).must_include :available_inventory end it "must have a release_date" do - + video_hash[:release_date] = nil + video = Video.create(video_hash) + found_video = Video.find_by(title: video_hash[:title]) + expect(found_video).must_be_nil + expect(video.valid?).must_equal false + expect(video.errors.keys).must_include :release_date + end + it "total_inventory must be >= 0" do + video_hash[:total_inventory] = -1 + video = Video.create(video_hash) + found_video = Video.find_by(title: video_hash[:title]) + expect(found_video).must_be_nil + expect(video.valid?).must_equal false + expect(video.errors.keys).must_include :total_inventory + end + it "available_inventory must be >= 0" do + video_hash[:available_inventory] = -1 + video = Video.create(video_hash) + found_video = Video.find_by(title: video_hash[:title]) + expect(found_video).must_be_nil + expect(video.valid?).must_equal false + expect(video.errors.keys).must_include :available_inventory end end describe "custom methods" do + describe "decrement_inventory" do + it "decrements available_inventory for existing video" do + before_available = video_one.available_inventory + before_total = video_one.total_inventory + video_one.decrement_inventory + expect(video_one.available_inventory).must_equal before_available - 1 + expect(video_one.total_inventory).must_equal before_total + end + it "NoMethodError raised for call on nil video" do + video = nil + + expect { + video.decrement_inventory + }.must_raise NoMethodError + end + end + + describe "increment_inventory" do + it "decrements available_inventory for existing video" do + before_available = video_one.available_inventory + before_total = video_one.total_inventory + video_one.increment_inventory + expect(video_one.available_inventory).must_equal before_available + 1 + expect(video_one.total_inventory).must_equal before_total + end + it "NoMethodError raised for call on nil video" do + video = nil + + expect { + video.increment_inventory + }.must_raise NoMethodError + end + end end end From b800a72c256b8f838f34c793a904f09d8b259942 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Thu, 3 Dec 2020 12:21:22 -0800 Subject: [PATCH 22/44] customer model tests --- test/fixtures/rentals.yml | 5 +- test/models/customer_test.rb | 141 ++++++++++++++++++++++++++++++++++- 2 files changed, 144 insertions(+), 2 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index ceb5bab39..b71915bda 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,4 +3,7 @@ rental_one: customer: customer_one rental_two: video: wonder_woman - customer: customer_two \ No newline at end of file + customer: customer_two +rental_three: + video: black_widow + customer: customer_one diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 53d484bd2..e050f99b5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,15 +1,154 @@ require "test_helper" describe Customer do - describe "relationships" do + let (:customer_one) { customers(:customer_one) } + let (:customer_hash) do + { + name: "Sophie", + registered_at: 2020-4-4, + address: "111 S fake st", + city: "Seattle", + state: "WA", + phone: "206-666-7777", + postal_code: "99999", + videos_checked_out_count: 8 + } + end + describe "relationships" do + it "has many rentals" do + rentals = customer_one.rentals + expect(rentals.length).must_equal 2 + rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + end end describe "validations" do + it "must have a name" do + customer_hash[:name] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(phone: customer_hash[:phone]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :name + end + + it "must have a registered_at" do + customer_hash[:registered_at] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :registered_at + end + + it "must have address" do + customer_hash[:address] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :address + end + + it "must have city" do + customer_hash[:city] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :city + end + + it "must have state" do + customer_hash[:state] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :state + end + + it "must have phone" do + customer_hash[:phone] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :phone + end + + it "must have postal_code" do + customer_hash[:postal_code] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :postal_code + end + + it "must have videos_checked_out_count" do + customer_hash[:videos_checked_out_count] = nil + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :videos_checked_out_count + end + + it "videos_checked_out_count must be greater than or equal to 0" do + customer_hash[:videos_checked_out_count] = -1 + customer = Customer.create(customer_hash) + + found_customer = Customer.find_by(name: customer_hash[:name]) + expect(found_customer).must_be_nil + expect(customer.valid?).must_equal false + expect(customer.errors.keys).must_include :videos_checked_out_count + end end describe "custom methods" do + describe "increment checkout_count" do + it "increments checkout count for existing customer" do + before_checkout = customer_one.videos_checked_out_count + customer_one.increment_checkout_count + expect(customer_one.videos_checked_out_count).must_equal before_checkout + 1 + end + + it "NoMethodError raised for call on nil customer" do + customer_one = nil + + expect { + customer_one.increment_checkout_count + }.must_raise NoMethodError + end + end + + describe "decrement checkout_count" do + it "decrements checkout count for existing customer checking in" do + before_checkin = customer_one.videos_checked_out_count + customer_one.decrement_checkout_count + expect(customer_one.videos_checked_out_count).must_equal before_checkin - 1 + end + + it "NoMethodError raised for call on nil customer" do + customer_one = nil + expect { + customer_one.decrement_checkout_count + }.must_raise NoMethodError + end + end end end \ No newline at end of file From 6cd62b0c9856c2198761c8af1e926f54d3f525b5 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Thu, 3 Dec 2020 12:37:35 -0800 Subject: [PATCH 23/44] rental model tests written --- test/models/rental_test.rb | 49 +++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..23bf4e471 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,50 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let (:rental_one) { rentals(:rental_one)} + + let (:rental_hash) do { + customer_id: customers(:customer_two).id, + video_id: videos(:wonder_woman).id, + due_date: Date.today + 7.days + } + end + + describe "relationships" do + it "belongs to customer" do + customer = rental_one.customer + expect(customer).must_be_instance_of Customer + expect(customer.name).must_equal customers(:customer_one).name + end + + it "belongs to video" do + video = rental_one.video + expect(video).must_be_instance_of Video + expect(video.title).must_equal videos(:wonder_woman).title + end + end + + describe "validations" do + it "has a due date" do + rental_hash[:due_date] = nil + rental = Rental.create(rental_hash) + + found_rental = Rental.find_by(customer_id: rental_hash[:customer_id], video_id: rental_hash[:video_id]) + expect(found_rental).must_be_nil + expect(rental.valid?).must_equal false + expect(rental.errors.keys).must_include :due_date + end + + it "due date on checkout is on or after today's date" do + rental_hash[:due_date] = Date.today - 3.days + rental = Rental.create(rental_hash) + + found_rental = Rental.find_by(customer_id: rental_hash[:customer_id], video_id: rental_hash[:video_id]) + expect(found_rental).must_be_nil + expect(rental.valid?).must_equal false + expect(rental.errors.keys).must_include :due_date + end + + end + end From cde9d0eba759bda9ea93e8ef862978a2a0f90ed3 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Thu, 3 Dec 2020 12:40:57 -0800 Subject: [PATCH 24/44] tinkered with tests --- app/models/rental.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 078c6e7da..2fc4ead8b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,6 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - validates_date :due_date, on_or_after: lambda { Date.current } + validates_date :due_date, on_or_after: lambda { Date.current }, presence: true end From 2740bd788443525049965aec38e8304854b3a9cd Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 12:44:14 -0800 Subject: [PATCH 25/44] tests zapped --- test/controllers/rentals_controller_test.rb | 1 + test/models/rental_test.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0f2bc930a..12bba8d16 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -149,6 +149,7 @@ post rentals_check_out_path, params: @rental_hash @rental_hash[:customer_id] = customers(:customer_two).id + @rental_hash[:video_id] = videos(:black_widow).id post rentals_check_in_path, params: @rental_hash diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 23bf4e471..1e13ca162 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -5,7 +5,7 @@ let (:rental_hash) do { customer_id: customers(:customer_two).id, - video_id: videos(:wonder_woman).id, + video_id: videos(:black_widow).id, due_date: Date.today + 7.days } end From 8b6283000686e1a753806f21636175af290fb117 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 13:27:40 -0800 Subject: [PATCH 26/44] added will_paginate gem and implemented sort and pagination optional query params for videos#index and customers#index actions --- Gemfile | 3 ++- Gemfile.lock | 10 ++++++---- app/controllers/customers_controller.rb | 2 +- app/controllers/videos_controller.rb | 2 +- app/models/application_record.rb | 5 +++++ app/models/customer.rb | 1 - node_modules/.yarn-integrity | 6 ++++-- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 92334f49f..b9822a7d7 100644 --- a/Gemfile +++ b/Gemfile @@ -56,4 +56,5 @@ group :test do gem 'minitest-reporters' end -gem 'validates_timeliness', '~> 5.0.0.beta' \ No newline at end of file +gem 'validates_timeliness', '~> 5.0.0.beta' +gem 'will_paginate', '~> 3.1.0' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index fd81a8292..293c236e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,8 +64,8 @@ GEM coderay (1.1.3) concurrent-ruby (1.1.7) crass (1.0.6) - debase (0.2.4.1) - debase-ruby_core_source (>= 0.10.2) + debase (2.3.0) + debase-ruby_core_source (~> 0.10.10) debase-ruby_core_source (0.10.11) erubi (1.10.0) ffi (1.13.1) @@ -160,8 +160,8 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - ruby-debug-ide (0.7.2) - rake (>= 0.8.1) + ruby-debug-ide (2.3.0) + debase (~> 2.3.0) ruby-progressbar (1.10.1) shellany (0.0.1) spring (2.1.1) @@ -185,6 +185,7 @@ GEM websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + will_paginate (3.1.8) zeitwerk (2.4.2) PLATFORMS @@ -208,6 +209,7 @@ DEPENDENCIES spring-watcher-listen (~> 2.0.0) tzinfo-data validates_timeliness (~> 5.0.0.beta) + will_paginate (~> 3.1.0) RUBY VERSION ruby 2.6.5p114 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 72bd8db43..654203a68 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index - customers = Customer.all + customers = Customer.parameterized_list(params[:sort], params[:n], params[:p]) render json: customers.as_json(only: [:id, :name, :registered_at,:postal_code, :phone, :videos_checked_out_count]), status: :ok end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index d5fb43187..ccec97fb4 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,7 @@ class VideosController < ApplicationController def index - videos = Video.all + videos = Video.parameterized_list(params[:sort], params[:n], params[:p]) render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok end diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84..72d6027c4 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,8 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + + + def self.parameterized_list(sort = "id", n = 10, p = 1) + return self.all.order(sort).paginate(page: p, per_page: n) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 5ef133732..cc357e941 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -11,5 +11,4 @@ def increment_checkout_count def decrement_checkout_count self.videos_checked_out_count -= 1 end - end diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 0f19eb7ab..b18d74998 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,6 +1,8 @@ { - "systemParams": "darwin-x64-83", - "modulesFolders": [], + "systemParams": "linux-x64-64", + "modulesFolders": [ + "node_modules" + ], "flags": [], "linkedModules": [], "topLevelPatterns": [], From e0f24e2a31c5010c8737b303c7880e6f2d828114 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 13:30:01 -0800 Subject: [PATCH 27/44] added rental condition to check in the latest checkout for any customer/video combination --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 297f7962c..66d7ef31f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,7 +31,7 @@ def check_out end def check_in - rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) + rental = Rental.where(customer_id: params[:customer_id], video_id: params[:video_id]).order(:created_at).last if rental.nil? render json: { From 5f9048724b19a8d57f7e93dc7e4fa397cdb5f503 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 13:47:00 -0800 Subject: [PATCH 28/44] added rental condition to check in the latest checkout for any customer/video combination --- app/controllers/rentals_controller.rb | 2 +- ...n and Checking Out.postman_collection.json | 2 +- test/controllers/rentals_controller_test.rb | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 66d7ef31f..609f9da4f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -43,7 +43,7 @@ def check_in rental.customer.decrement_checkout_count rental.video.increment_inventory - json_to_return = rental.as_json(only: [:customer_id, :video_id]) + json_to_return = rental.as_json(only: [:id, :customer_id, :video_id]) json_to_return[:videos_checked_out_count] = rental.customer.videos_checked_out_count json_to_return[:available_inventory] = rental.video.available_inventory diff --git a/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json b/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json index 2ad258d04..69dc24fe8 100644 --- a/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json +++ b/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json @@ -381,7 +381,7 @@ "", "pm.test(\"response should give back details of the check-in: customer_id, video_id, videos_checked_out_count, available_inventory\", () => {", " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['customer_id', 'video_id', 'videos_checked_out_count', 'available_inventory']);", + " pm.expect(Object.keys(res)).to.have.members(['id','customer_id', 'video_id', 'videos_checked_out_count', 'available_inventory']);", "});", "", "pm.test(\"request should have incremented videos_checked_out_count, decremented available_inventory\", () => {", diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 12bba8d16..6dcf540e2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -162,5 +162,28 @@ must_respond_with :not_found end + + + it "will not check in an previous rental (same customer/video)" do + Rental.delete_all + @rental_hash[:due_date] = Date.today + 7.days + post rentals_check_out_path, params: @rental_hash + post rentals_check_out_path, params: @rental_hash + rentals = Rental.where(customer_id: @rental_hash[:customer_id], video_id: @rental_hash[:video_id]) + + expect { + post rentals_check_in_path, params: @rental_hash + }.wont_change "Rental.count" + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["id"]).wont_equal rentals[0].id + expect(body["id"]).must_equal rentals[1].id + expect(body["customer_id"]).must_equal rentals[1].customer_id + expect(body["video_id"]).must_equal rentals[1].video_id + + must_respond_with :ok + end end end From 3e5b1f46f023cb314ffff5c4ca7ba8c13e3e5240 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 14:51:30 -0800 Subject: [PATCH 29/44] wrote rentals#overdue action (no tests have been written) --- app/controllers/rentals_controller.rb | 6 ++++++ config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 9 +++++++++ test/models/application_record_test.rb | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 test/models/application_record_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 609f9da4f..ef39e2477 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -52,6 +52,12 @@ def check_in end end + def overdue + rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date < Date.today } + + render json: rentals.as_json(only: [:video_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date), status: :ok + end + private def rental_params diff --git a/config/routes.rb b/config/routes.rb index 4f180b39d..abc836944 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do post 'rentals/check-in', to: "rentals#check_in", as: "rentals_check_in" post 'rentals/check-out', to: "rentals#check_out", as: "rentals_check_out" + get 'rentals/overdue', to: "rentals#overdue" resources :videos, only: [:index, :show, :create] resources :customers, only: [:index, :show, :create] end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6dcf540e2..87a805791 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -186,4 +186,13 @@ must_respond_with :ok end end + + describe "overdue" do + it "returns a list of overdue rentals" do + + end + it "returns an empty array if there are no overdue rentals" do + + end + end end diff --git a/test/models/application_record_test.rb b/test/models/application_record_test.rb new file mode 100644 index 000000000..4ec8fa8c7 --- /dev/null +++ b/test/models/application_record_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe ApplicationRecord do + describe "parameterized_list" do + it "returns a sorted video list with given parameters" do + + end + it "returns a video list sorted by id if no parameters" do + + end + it "returns a sorted customer list with given parameters" do + + end + it "returns a customer list sorted by id if no parameters" do + + end + end + +end \ No newline at end of file From e3e316fd92a4285ab086bfbf7f463416f31d4f5b Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 15:06:49 -0800 Subject: [PATCH 30/44] check in method updated_at time now updates at the time of video check in --- app/controllers/rentals_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ef39e2477..833e25725 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -40,6 +40,7 @@ def check_in }, status: :not_found return else + rental.updated_at = Time.now rental.customer.decrement_checkout_count rental.video.increment_inventory From b8deac0f5581df28c730b24658710fca24f0b3b2 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 15:07:20 -0800 Subject: [PATCH 31/44] made test block titles more descriptive --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 833e25725..99fefe48d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -56,7 +56,7 @@ def check_in def overdue rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date < Date.today } - render json: rentals.as_json(only: [:video_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date), status: :ok + render json: rentals.as_json(only: [:video_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 87a805791..785c94ff3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -188,10 +188,10 @@ end describe "overdue" do - it "returns a list of overdue rentals" do + it "returns a list of overdue rentals and responds with :ok" do end - it "returns an empty array if there are no overdue rentals" do + it "returns an empty array if there are no overdue rentals and responds with :ok" do end end From d574be3bf58c6ece7a58b190024eee5dab565655 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 15:11:15 -0800 Subject: [PATCH 32/44] wrote videos#currently_checked_out_to action (no tests were written) --- app/controllers/videos_controller.rb | 8 ++++++++ app/models/video.rb | 1 + config/routes.rb | 2 ++ test/controllers/videos_controller_test.rb | 10 ++++++++++ 4 files changed, 21 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index ccec97fb4..162ac37f9 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -30,6 +30,14 @@ def create end end + def currently_checked_out_to + rentals = self.rentals.filter { |rental| rental.updated_at < rental.due_date } + customers = rentals.map { |rental| rental.customer } + return customers.as_json(only: [:customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok + end + + def + private def video_params diff --git a/app/models/video.rb b/app/models/video.rb index 2c04e6c57..e25a93038 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,6 @@ class Video < ApplicationRecord has_many :rentals + validates :title, :overview, :release_date, presence: true validates :total_inventory, numericality: {only: :integer, greater_than_or_equal_to: 0 }, presence: true validates :available_inventory, numericality: {only: :integer, greater_than_or_equal_to: 0 }, presence: true diff --git a/config/routes.rb b/config/routes.rb index abc836944..9f367d2e0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,8 @@ post 'rentals/check-in', to: "rentals#check_in", as: "rentals_check_in" post 'rentals/check-out', to: "rentals#check_out", as: "rentals_check_out" get 'rentals/overdue', to: "rentals#overdue" + get 'videos/:id/current', to: "videos#currently_checked_out" + get 'videos/:id/history', to: "videos#checkout_history" resources :videos, only: [:index, :show, :create] resources :customers, only: [:index, :show, :create] end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 69a6cc8e5..e3b6958d9 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -126,5 +126,15 @@ must_respond_with :not_found end end + + + describe "currently_checked_out_to" do + it "returns a list of customers to whom the video is currently checked out" do + + end + it "returns an empty array if the video is not currently checked out to anyone" do + + end + end end From b11700e9bb90acabe5b0e005c3aa1d1459aec3dc Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 15:43:01 -0800 Subject: [PATCH 33/44] wrote videos#currently_checked_out_to controller tests --- app/controllers/videos_controller.rb | 34 ++++++++++++------ app/models/video.rb | 4 +++ config/routes.rb | 6 ++-- test/controllers/videos_controller_test.rb | 41 ++++++++++++++++++++-- test/models/video_test.rb | 17 +++++++++ 5 files changed, 86 insertions(+), 16 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 162ac37f9..c3fd2c0d1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,4 +1,5 @@ class VideosController < ApplicationController + before_action :find_video, only: [:show, :currently_checked_out_to, :checkout_history] def index videos = Video.parameterized_list(params[:sort], params[:n], params[:p]) @@ -7,13 +8,7 @@ def index end def show - video = Video.find_by(id: params[:id]) - - if video.nil? - return render json: {ok: false, message: "Video not found", errors: ['Not Found']}, status: :not_found - end - - render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok + render json: @video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create @@ -31,16 +26,33 @@ def create end def currently_checked_out_to - rentals = self.rentals.filter { |rental| rental.updated_at < rental.due_date } - customers = rentals.map { |rental| rental.customer } - return customers.as_json(only: [:customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok + customers = @video.currently_checked_out_to + if customers.empty? + render json: { + ok: true, + message: "This video is not currently checked out to any customer", + errors: ["This video is not currently checked out to any customer"] + }, status: :ok + else + render json: customers.as_json(only: [:customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok + end end - def + def checkout_history + end private def video_params params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end + + def find_video + @video = Video.find_by(id: params[:id]) + + if @video.nil? + return render json: {ok: false, message: "Video not found", errors: ['Not Found']}, status: :not_found + end + end + end diff --git a/app/models/video.rb b/app/models/video.rb index e25a93038..cfc67c320 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -12,4 +12,8 @@ def decrement_inventory def increment_inventory self.available_inventory += 1 end + + def currently_checked_out_to + return self.rentals.filter { |rental| rental.updated_at == rental.created_at }.map { |rental| rental.customer } + end end diff --git a/config/routes.rb b/config/routes.rb index 9f367d2e0..6b201c6e0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,9 @@ Rails.application.routes.draw do post 'rentals/check-in', to: "rentals#check_in", as: "rentals_check_in" post 'rentals/check-out', to: "rentals#check_out", as: "rentals_check_out" - get 'rentals/overdue', to: "rentals#overdue" - get 'videos/:id/current', to: "videos#currently_checked_out" - get 'videos/:id/history', to: "videos#checkout_history" + get 'rentals/overdue', to: "rentals#overdue", as: "overdue_rentals" + get 'videos/:id/current', to: "videos#currently_checked_out_to", as: "video_current_customers" + get 'videos/:id/history', to: "videos#checkout_history", as: "video_checkout_history" resources :videos, only: [:index, :show, :create] resources :customers, only: [:index, :show, :create] end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e3b6958d9..b31c7b1a0 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -129,11 +129,48 @@ describe "currently_checked_out_to" do - it "returns a list of customers to whom the video is currently checked out" do + it "can get route for existing, responds with :ok" do + rentals(:rental_one) + rentals(:rental_two) + rentals(:rental_three) + get video_current_customers_path(video1.id) + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 2 + must_respond_with :ok + end + it "gets a descriptive error if video is not checked out to anyone, responds with :no_content" do + get video_current_customers_path(videos(:out_of_stock).id) + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal true + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "This video is not currently checked out to any customer" + + must_respond_with :ok + end + it "responds with a 404 for nonexistent videos" do + # Act + get video_path(-1) + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body["message"]).must_equal "Video not found" + must_respond_with :not_found end - it "returns an empty array if the video is not currently checked out to anyone" do + end + + describe "checkout_history" do + it "can get route, responds with :ok" do + get video_checkout_history_path + must_respond_with :ok end end end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index cd9376b42..2251ffd39 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -120,5 +120,22 @@ end end + describe "currently checked out to" do + it "returns a list of customers to whom the video is currently checked out" do + customers = video_one.currently_checked_out_to + expect(customers).must_be_instance_of Array + expect(customers.length).must_equal 2 + customers.each do |customer| + expect(customer).must_be_instance_of Customer + end + end + it "returns an empty array if the video is not currently checked out to anyone" do + Rental.delete_all + customers = video_one.currently_checked_out_to + expect(customers).must_be_instance_of Array + expect(customers.length).must_equal 0 + end + end + end end From f21d5842e5cbb7661caf7ab40c2ce3fd0b242ee4 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 15:55:05 -0800 Subject: [PATCH 34/44] wrote videos#currently_checked_out_to model tests and videos#previously_checked_out_to model tests --- app/controllers/videos_controller.rb | 1 + app/models/video.rb | 4 ++++ test/models/video_test.rb | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index c3fd2c0d1..8ddeef638 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -39,6 +39,7 @@ def currently_checked_out_to end def checkout_history + end private diff --git a/app/models/video.rb b/app/models/video.rb index cfc67c320..dd3db5b6a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -16,4 +16,8 @@ def increment_inventory def currently_checked_out_to return self.rentals.filter { |rental| rental.updated_at == rental.created_at }.map { |rental| rental.customer } end + + def previously_checked_out_to + return self.rentals.filter { |rental| rental.updated_at > rental.created_at }.map { |rental| rental.customer } + end end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 2251ffd39..bead220c7 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -137,5 +137,24 @@ end end + describe "checkout history" do + it "returns a list of customers to whom the video was previously checked out" do + rental_one = rentals(:rental_one) + rental_one.update!(due_date: Date.tomorrow, updated_at: Date.tomorrow) + + customers = video_one.previously_checked_out_to + expect(customers).must_be_instance_of Array + expect(customers.length).must_equal 1 + customers.each do |customer| + expect(customer).must_be_instance_of Customer + end + end + it "returns an empty array if the video is not currently checked out to anyone" do + Rental.delete_all + customers = video_one.previously_checked_out_to + expect(customers).must_be_instance_of Array + expect(customers.length).must_equal 0 + end + end end end From 18cb0e34d3d2aba93d0dcfe80096ff0fd4377c60 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 16:39:25 -0800 Subject: [PATCH 35/44] wrote videos#checkout_history controller tests (neither videos#currently_checked_out_to or videos#checkout_history accepts a query parameters for sorting/pagination) --- app/controllers/videos_controller.rb | 17 +++++++-- test/controllers/videos_controller_test.rb | 43 +++++++++++++++++----- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 8ddeef638..73435c94a 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -26,12 +26,13 @@ def create end def currently_checked_out_to + message = "#{@video.title} is not currently checked out to any customer" customers = @video.currently_checked_out_to if customers.empty? render json: { ok: true, - message: "This video is not currently checked out to any customer", - errors: ["This video is not currently checked out to any customer"] + message: message, + errors: [message] }, status: :ok else render json: customers.as_json(only: [:customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok @@ -39,7 +40,17 @@ def currently_checked_out_to end def checkout_history - + message = "#{@video.title} has not been previously checked out to any customer" + customers = @video.currently_checked_out_to + if customers.empty? + render json: { + ok: true, + message: message, + errors: [message] + }, status: :ok + else + render json: customers.as_json(only: [:customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok + end end private diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index b31c7b1a0..04b8673bc 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -129,7 +129,7 @@ describe "currently_checked_out_to" do - it "can get route for existing, responds with :ok" do + it "can get route for existing video with curren rentals, responds with :ok" do rentals(:rental_one) rentals(:rental_two) rentals(:rental_three) @@ -141,24 +141,23 @@ expect(body.length).must_equal 2 must_respond_with :ok end - it "gets a descriptive error if video is not checked out to anyone, responds with :no_content" do - get video_current_customers_path(videos(:out_of_stock).id) + it "gets a descriptive error if video is not checked out to anyone, responds with :ok" do + video = videos(:out_of_stock) + get video_current_customers_path(video.id) expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) expect(body).must_be_instance_of Hash expect(body['ok']).must_equal true expect(body.keys).must_include "errors" - expect(body["errors"]).must_include "This video is not currently checked out to any customer" + expect(body["errors"]).must_include "#{video.title} is not currently checked out to any customer" must_respond_with :ok end it "responds with a 404 for nonexistent videos" do - # Act - get video_path(-1) + get video_current_customers_path(-1) body = JSON.parse(response.body) - # Assert expect(body).must_be_instance_of Hash expect(body['ok']).must_equal false expect(body["message"]).must_equal "Video not found" @@ -167,11 +166,37 @@ end describe "checkout_history" do - it "can get route, responds with :ok" do - get video_checkout_history_path + it "can get route for existing video with a rental history, responds with :ok" do + video = videos(:wonder_woman) + get video_checkout_history_path(video.id) + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 2 + must_respond_with :ok + end + it "responds with a descriptive json for existing video with no previous rentals, responds with :ok" do + video = videos(:out_of_stock) + get video_checkout_history_path(video.id) + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal true + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "#{video.title} has not been previously checked out to any customer" must_respond_with :ok end + it "responds with a 404 for nonexistent videos" do + get video_checkout_history_path(-1) + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body["message"]).must_equal "Video not found" + must_respond_with :not_found + end end end From 9fefca918bcaea149059e5edab6d66051ad1b180 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 16:43:37 -0800 Subject: [PATCH 36/44] added conditional to check if the list of returned overdue rentals is empty and to add descriptive text if so --- app/controllers/rentals_controller.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 99fefe48d..b4d0c903f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -55,8 +55,18 @@ def check_in def overdue rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date < Date.today } + if rentals.nil? || rentals.empty? + message = "There are no overdue rentals" + render json: { + ok: false, + message: message + errors: [message] + }, status: :not_found + else + render json: rentals.as_json(only: [:video_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok + end - render json: rentals.as_json(only: [:video_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok + return end private From df4b7639fe5cda217b840d5192b7c5407877bee4 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 16:43:52 -0800 Subject: [PATCH 37/44] added conditional to check if the list of returned overdue rentals is empty and to add descriptive text if so --- app/controllers/rentals_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b4d0c903f..f52b7bc77 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -55,13 +55,14 @@ def check_in def overdue rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date < Date.today } + if rentals.nil? || rentals.empty? message = "There are no overdue rentals" render json: { - ok: false, - message: message + ok: true, + message: message, errors: [message] - }, status: :not_found + }, status: :ok else render json: rentals.as_json(only: [:video_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok end From 632860239e39e7276b2e7eabe8629b4f2d285e11 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 16:56:28 -0800 Subject: [PATCH 38/44] removed model methods and tests for videos#currently_checked_out_to and videos#checkout_history actions to allow for paramaterized listing --- app/controllers/videos_controller.rb | 6 +- app/models/video.rb | 14 ++--- test/controllers/videos_controller_test.rb | 4 +- test/models/video_test.rb | 72 +++++++++++----------- 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 73435c94a..0dc717741 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -27,7 +27,8 @@ def create def currently_checked_out_to message = "#{@video.title} is not currently checked out to any customer" - customers = @video.currently_checked_out_to + # customers = @video.currently_checked_out_to + customers = Customer.parameterized_list(params[:sort], params[:n], params[:p]).filter { |customer| customer.rentals.any? {|rental| rental.video == @video && rental.created_at == rental.updated_at} } if customers.empty? render json: { ok: true, @@ -41,7 +42,8 @@ def currently_checked_out_to def checkout_history message = "#{@video.title} has not been previously checked out to any customer" - customers = @video.currently_checked_out_to + # customers = @video.previously_checked_out_to + customers = Customer.parameterized_list(params[:sort], params[:n], params[:p]).filter { |customer| customer.rentals.any? {|rental| rental.video == @video && rental.updated_at > rental.created_at} } if customers.empty? render json: { ok: true, diff --git a/app/models/video.rb b/app/models/video.rb index dd3db5b6a..cfedcaf3d 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -13,11 +13,11 @@ def increment_inventory self.available_inventory += 1 end - def currently_checked_out_to - return self.rentals.filter { |rental| rental.updated_at == rental.created_at }.map { |rental| rental.customer } - end - - def previously_checked_out_to - return self.rentals.filter { |rental| rental.updated_at > rental.created_at }.map { |rental| rental.customer } - end + # def currently_checked_out_to + # return self.rentals.filter { |rental| rental.updated_at == rental.created_at }.map { |rental| rental.customer } + # end + # + # def previously_checked_out_to + # return self.rentals.filter { |rental| rental.updated_at > rental.created_at }.map { |rental| rental.customer } + # end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 04b8673bc..0badd5da9 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -167,12 +167,14 @@ describe "checkout_history" do it "can get route for existing video with a rental history, responds with :ok" do + rental_one = rentals(:rental_one) + rental_one.update!(due_date: Date.tomorrow, updated_at: Date.tomorrow) video = videos(:wonder_woman) get video_checkout_history_path(video.id) expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) expect(body).must_be_instance_of Array - expect(body.length).must_equal 2 + expect(body.length).must_equal 1 must_respond_with :ok end it "responds with a descriptive json for existing video with no previous rentals, responds with :ok" do diff --git a/test/models/video_test.rb b/test/models/video_test.rb index bead220c7..af99e8184 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -120,41 +120,41 @@ end end - describe "currently checked out to" do - it "returns a list of customers to whom the video is currently checked out" do - customers = video_one.currently_checked_out_to - expect(customers).must_be_instance_of Array - expect(customers.length).must_equal 2 - customers.each do |customer| - expect(customer).must_be_instance_of Customer - end - end - it "returns an empty array if the video is not currently checked out to anyone" do - Rental.delete_all - customers = video_one.currently_checked_out_to - expect(customers).must_be_instance_of Array - expect(customers.length).must_equal 0 - end - end - - describe "checkout history" do - it "returns a list of customers to whom the video was previously checked out" do - rental_one = rentals(:rental_one) - rental_one.update!(due_date: Date.tomorrow, updated_at: Date.tomorrow) - - customers = video_one.previously_checked_out_to - expect(customers).must_be_instance_of Array - expect(customers.length).must_equal 1 - customers.each do |customer| - expect(customer).must_be_instance_of Customer - end - end - it "returns an empty array if the video is not currently checked out to anyone" do - Rental.delete_all - customers = video_one.previously_checked_out_to - expect(customers).must_be_instance_of Array - expect(customers.length).must_equal 0 - end - end + # describe "currently checked out to" do + # it "returns a list of customers to whom the video is currently checked out" do + # customers = video_one.currently_checked_out_to + # expect(customers).must_be_instance_of Array + # expect(customers.length).must_equal 2 + # customers.each do |customer| + # expect(customer).must_be_instance_of Customer + # end + # end + # it "returns an empty array if the video is not currently checked out to anyone" do + # Rental.delete_all + # customers = video_one.currently_checked_out_to + # expect(customers).must_be_instance_of Array + # expect(customers.length).must_equal 0 + # end + # end + # + # describe "checkout history" do + # it "returns a list of customers to whom the video was previously checked out" do + # rental_one = rentals(:rental_one) + # rental_one.update!(due_date: Date.tomorrow, updated_at: Date.tomorrow) + # + # customers = video_one.previously_checked_out_to + # expect(customers).must_be_instance_of Array + # expect(customers.length).must_equal 1 + # customers.each do |customer| + # expect(customer).must_be_instance_of Customer + # end + # end + # it "returns an empty array if the video is not currently checked out to anyone" do + # Rental.delete_all + # customers = video_one.previously_checked_out_to + # expect(customers).must_be_instance_of Array + # expect(customers.length).must_equal 0 + # end + # end end end From 83a452d47f12727eb84d3d8cc5a20dbaf674a271 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 18:44:39 -0800 Subject: [PATCH 39/44] wrote customers#currently_checked_out and customers#checkout_history controller actions and tests --- app/controllers/customers_controller.rb | 44 ++++++++++-- config/routes.rb | 4 ++ test/controllers/customers_controller_test.rb | 71 +++++++++++++++++++ test/fixtures/customers.yml | 9 +++ 4 files changed, 121 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 654203a68..941b5ed2d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,5 @@ class CustomersController < ApplicationController + before_action :find_customer, only: [:show, :currently_checked_out, :checkout_history] def index customers = Customer.parameterized_list(params[:sort], params[:n], params[:p]) @@ -7,13 +8,7 @@ def index end def show - customer = Customer.find_by(id: params[:id]) - - if customer.nil? - return render json: {ok: false, message: "Customer not found", errors: ['Not Found']}, status: :not_found - end - - render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :ok + render json: @customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :phone, :postal_code, :videos_checked_out_count]), status: :ok end @@ -31,10 +26,45 @@ def create end end + def currently_checked_out + message = "#{@customer.name} does not currently have any checked out videos" + videos = Video.parameterized_list(params[:sort], params[:n], params[:p]).filter { |video| video.rentals.any? {|rental| rental.customer == @customer && rental.created_at == rental.updated_at} } + if videos.empty? + render json: { + ok: true, + message: message, + errors: [message] + }, status: :ok + else + render json: videos.as_json(only: [:title, :checkout_date, :due_date]), status: :ok + end + end + + def checkout_history + message = "#{@customer.name} has not previously checked out any videos" + videos = Video.parameterized_list(params[:sort], params[:n], params[:p]).filter { |video| video.rentals.any? {|rental| rental.customer == @customer && rental.created_at < rental.updated_at} } + if videos.empty? + render json: { + ok: true, + message: message, + errors: [message] + }, status: :ok + else + render json: videos.as_json(only: [:title, :checkout_date, :due_date]), status: :ok + end + end + private def customer_params params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count) end + def find_customer + @customer = Customer.find_by(id: params[:id]) + + if @customer.nil? + return render json: {ok: false, message: "Customer not found", errors: ['Not Found']}, status: :not_found + end + end end diff --git a/config/routes.rb b/config/routes.rb index 6b201c6e0..062d6a716 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,12 @@ post 'rentals/check-in', to: "rentals#check_in", as: "rentals_check_in" post 'rentals/check-out', to: "rentals#check_out", as: "rentals_check_out" get 'rentals/overdue', to: "rentals#overdue", as: "overdue_rentals" + get 'videos/:id/current', to: "videos#currently_checked_out_to", as: "video_current_customers" get 'videos/:id/history', to: "videos#checkout_history", as: "video_checkout_history" resources :videos, only: [:index, :show, :create] + + get 'customers/:id/current', to: "customers#currently_checked_out", as: "customer_current_videos" + get 'customers/:id/history', to: "customers#checkout_history", as: "customer_checkout_history" resources :customers, only: [:index, :show, :create] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 997feb2d6..df76ec78f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -136,4 +136,75 @@ must_respond_with :bad_request end end + describe "currently_checked_out" do + it "can get route for existing customer with curren rentals, responds with :ok" do + rentals(:rental_one) + rentals(:rental_two) + rentals(:rental_three) + get customer_current_videos_path(customer1.id) + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 2 + must_respond_with :ok + end + it "gets a descriptive error if customer is not checked out to anyone, responds with :ok" do + customer = customers(:no_rentals) + get customer_current_videos_path(customer.id) + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal true + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "#{customer.name} does not currently have any checked out videos" + + must_respond_with :ok + end + it "responds with a 404 for nonexistent customer" do + get customer_current_videos_path(-1) + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body["message"]).must_equal "Customer not found" + must_respond_with :not_found + end + end + + describe "checkout_history" do + it "can get route for existing customer with a rental history, responds with :ok" do + rental_one = rentals(:rental_one) + rental_one.update!(due_date: Date.tomorrow, updated_at: Date.tomorrow) + get customer_checkout_history_path(customer1.id) + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 1 + must_respond_with :ok + end + it "responds with a descriptive json for existing customer with no previous rentals, responds with :ok" do + Rental.delete_all + get customer_checkout_history_path(customer1.id) + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal true + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "#{customer1.name} has not previously checked out any videos" + + must_respond_with :ok + end + it "responds with a 404 for nonexistent customer" do + get customer_checkout_history_path(-1) + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body["message"]).must_equal "Customer not found" + must_respond_with :not_found + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 5380cf4b8..d82d30ff9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -16,3 +16,12 @@ customer_two: address: 1414 Seasame Street city: Seattle state: WA +no_rentals: + name: Test Person + registered_at: "Wed, 13 Nov 2020 07:54:14 -0700" + postal_code: 98111 + phone: (206) 734-9000 + videos_checked_out_count: 0 + address: 123 Fake Street + city: Seattle + state: WA From becd513e91e15ed9c7c2a7dff412312e99f779cb Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 19:44:04 -0800 Subject: [PATCH 40/44] added return's --- app/controllers/customers_controller.rb | 2 ++ app/controllers/videos_controller.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 941b5ed2d..a9bf7bd20 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -38,6 +38,7 @@ def currently_checked_out else render json: videos.as_json(only: [:title, :checkout_date, :due_date]), status: :ok end + return end def checkout_history @@ -52,6 +53,7 @@ def checkout_history else render json: videos.as_json(only: [:title, :checkout_date, :due_date]), status: :ok end + return end private diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 0dc717741..9890b3bd1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -38,6 +38,7 @@ def currently_checked_out_to else render json: customers.as_json(only: [:customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok end + return end def checkout_history @@ -53,6 +54,7 @@ def checkout_history else render json: customers.as_json(only: [:customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok end + return end private From 13140c3a3ebd76f98ad5b4d87a736a7dd4760890 Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Thu, 3 Dec 2020 19:48:16 -0800 Subject: [PATCH 41/44] added tests for rentals#overdue --- app/controllers/rentals_controller.rb | 18 +++++++++++++-- test/controllers/rentals_controller_test.rb | 25 +++++++++++++++++++++ test/controllers/videos_controller_test.rb | 2 +- test/fixtures/customers.yml | 9 ++++++++ test/fixtures/rentals.yml | 8 +++++++ test/models/video_test.rb | 2 +- 6 files changed, 60 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f52b7bc77..34b739e26 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -54,7 +54,7 @@ def check_in end def overdue - rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date < Date.today } + rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date && (rental.due_date < Date.today) } if rentals.nil? || rentals.empty? message = "There are no overdue rentals" @@ -64,7 +64,21 @@ def overdue errors: [message] }, status: :ok else - render json: rentals.as_json(only: [:video_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok + rentals_json = [] + + rentals.each do |rental| + rental_hash = Hash.new + rental_hash[:video_id] = rental.video.id + rental_hash[:title] = rental.video.title + rental_hash[:customer_id] = rental.customer.id + rental_hash[:name] = rental.customer.name + rental_hash[:postal_code] = rental.customer.postal_code + rental_hash[:checkout_date] = rental.created_at + + rentals_json << rental_hash + end + + render json: rentals_json.as_json, status: :ok end return diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 785c94ff3..f81a43e2e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -189,10 +189,35 @@ describe "overdue" do it "returns a list of overdue rentals and responds with :ok" do + get overdue_rentals_path + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 2 + body.each do |rental| + expect(rental).must_be_instance_of Hash + expect(rental.keys).must_include "video_id" + expect(rental.keys).must_include "title" + expect(rental.keys).must_include "customer_id" + expect(rental.keys).must_include "name" + expect(rental.keys).must_include "postal_code" + expect(rental.keys).must_include "checkout_date" + end + + must_respond_with :ok end it "returns an empty array if there are no overdue rentals and responds with :ok" do + Rental.delete_all + get overdue_rentals_path + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal true + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "There are no overdue rentals" + must_respond_with :ok end end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 0badd5da9..ca21e6fba 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -138,7 +138,7 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) expect(body).must_be_instance_of Array - expect(body.length).must_equal 2 + expect(body.length).must_equal 3 must_respond_with :ok end it "gets a descriptive error if video is not checked out to anyone, responds with :ok" do diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index d82d30ff9..8286610e2 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -25,3 +25,12 @@ no_rentals: address: 123 Fake Street city: Seattle state: WA +overdue: + name: Test Person + registered_at: "Wed, 13 Nov 2020 07:54:14 -0700" + postal_code: 98111 + phone: (206) 734-9000 + videos_checked_out_count: 0 + address: 123 Fake Street + city: Seattle + state: WA diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index b71915bda..cec139b9f 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,3 +7,11 @@ rental_two: rental_three: video: black_widow customer: customer_one +overdue_one: + video: wonder_woman + customer: overdue + due_date: "2015-04-29" +overdue_two: + video: black_widow + customer: overdue + due_date: "2019-10-31" diff --git a/test/models/video_test.rb b/test/models/video_test.rb index af99e8184..7765e5ab4 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -6,7 +6,7 @@ describe "relationships" do it "has many rentals" do rentals = video_one.rentals - expect(rentals.length).must_equal 2 + expect(rentals.length).must_equal 3 rentals.each do |rental| expect(rental).must_be_instance_of Rental end From 8ff68e25c1b5b0d69ac2b401491eed1c2c3b662a Mon Sep 17 00:00:00 2001 From: Christabel Sebastian Date: Fri, 4 Dec 2020 08:13:58 -0800 Subject: [PATCH 42/44] overcomplicated the rental search for check in... --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 34b739e26..42091ea9c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,7 +31,7 @@ def check_out end def check_in - rental = Rental.where(customer_id: params[:customer_id], video_id: params[:video_id]).order(:created_at).last + rental = Rental.where(customer_id: params[:customer_id], video_id: params[:video_id]).order(:created_at).filter { |rental| rental.created_at == rental.updated_at }.last if rental.nil? render json: { From 74bb2835112260eff30f97fcedd31ec2fb9fc027 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Fri, 4 Dec 2020 11:19:49 -0800 Subject: [PATCH 43/44] addedcurrently checked out conditional to rentals overdue --- Gemfile | 2 +- app/controllers/rentals_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index b9822a7d7..7fff98e19 100644 --- a/Gemfile +++ b/Gemfile @@ -57,4 +57,4 @@ group :test do end gem 'validates_timeliness', '~> 5.0.0.beta' -gem 'will_paginate', '~> 3.1.0' \ No newline at end of file +gem 'will_paginate' # , '~> 3.1.0' \ No newline at end of file diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 42091ea9c..2eacb8225 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -54,7 +54,7 @@ def check_in end def overdue - rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date && (rental.due_date < Date.today) } + rentals = Rental.parameterized_list(params[:sort], params[:n], params[:p]).filter { |rental| rental.due_date && (rental.due_date < Date.today) && rental.created_at == rental.updated_at } if rentals.nil? || rentals.empty? message = "There are no overdue rentals" From b5e7358efed93523a381584eccfeee0b9e328485 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Fri, 4 Dec 2020 11:27:03 -0800 Subject: [PATCH 44/44] version for pagniate --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- node_modules/.yarn-integrity | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 7fff98e19..b9822a7d7 100644 --- a/Gemfile +++ b/Gemfile @@ -57,4 +57,4 @@ group :test do end gem 'validates_timeliness', '~> 5.0.0.beta' -gem 'will_paginate' # , '~> 3.1.0' \ No newline at end of file +gem 'will_paginate', '~> 3.1.0' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 293c236e1..fc7d893ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,8 +64,8 @@ GEM coderay (1.1.3) concurrent-ruby (1.1.7) crass (1.0.6) - debase (2.3.0) - debase-ruby_core_source (~> 0.10.10) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) debase-ruby_core_source (0.10.11) erubi (1.10.0) ffi (1.13.1) @@ -160,8 +160,8 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - ruby-debug-ide (2.3.0) - debase (~> 2.3.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) ruby-progressbar (1.10.1) shellany (0.0.1) spring (2.1.1) diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index b18d74998..833cabeb5 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,5 +1,5 @@ { - "systemParams": "linux-x64-64", + "systemParams": "darwin-x64-83", "modulesFolders": [ "node_modules" ],