From 0cf8b45588c3bbf920781f0789ce8b2c1f4e767d Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 11:05:20 -0700 Subject: [PATCH 01/37] Initial api rails application setup --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 59 files changed, 1106 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..41b7d4311 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..43301a817 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..490370cd1 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Mms1u3Og5UivPUemw1oB0FkywSAa+QkXolrLLfrV2WoL0whQYOkOYzRh2dBqX0niATEiwEdwZx6SjCwMXSJCLKbg939b508/lCdLa7yYxmCOw37N69H+X9YZsgQ/7Di1IggfLcKPQ7rQQbRoongERqLx94yhwuWl737b5iDS+oAvqvfT+BDT0xhJAl9D+tMvYNk8c4ccyOwgMtwLo6RNf3sbBp1f7TzTM6dELYPfQzIU/TFYYa+ByviFzRTxUGcAkipGpAeiisWhRP4CJ2XP3tBPSgAynGvBGtc/G2jza6EXgWn048cHs7b0eO/YiLzIFo4d/qEyjwO62iP0Ly0nXpzf1wwToA0OIj9G1RQjzpLnLTUgKYzlt8RcfUkzgiILEK/gfXFRKky9BW2sj/0TdZ7rAl7gIc6dQBR2--zsXQs1xlNhC9v9ss--SmuPHL8qMHjZaORHh582hA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 0355891b20ce887d5d28d2af3a7a461a7f80dab8 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 11:10:15 -0700 Subject: [PATCH 02/37] Add Customer and Video models --- app/models/customer.rb | 2 ++ app/models/video.rb | 2 ++ db/migrate/20200526180739_create_customers.rb | 15 +++++++++++++++ db/migrate/20200526180917_create_videos.rb | 13 +++++++++++++ test/models/customer_test.rb | 7 +++++++ test/models/video_test.rb | 7 +++++++ 6 files changed, 46 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200526180739_create_customers.rb create mode 100644 db/migrate/20200526180917_create_videos.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/video_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/db/migrate/20200526180739_create_customers.rb b/db/migrate/20200526180739_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200526180739_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20200526180917_create_videos.rb b/db/migrate/20200526180917_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200526180917_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/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 977c33a7264aebe9b5f0a88d7dd093a30dd80037 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 11:27:40 -0700 Subject: [PATCH 03/37] Change in schema, create relationships --- app/models/customer.rb | 1 + app/models/rental.rb | 4 ++ app/models/video.rb | 1 + db/migrate/20200526181232_create_rentals.rb | 8 +++ ...0526181412_create_customers_videos_join.rb | 8 +++ db/schema.rb | 52 +++++++++++++++++++ test/models/rental_test.rb | 7 +++ 7 files changed, 81 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200526181232_create_rentals.rb create mode 100644 db/migrate/20200526181412_create_customers_videos_join.rb create mode 100644 db/schema.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..635f9028b --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + has_and_belongs_to_many :customers + has_and_belongs_to_many :videos +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/20200526181232_create_rentals.rb b/db/migrate/20200526181232_create_rentals.rb new file mode 100644 index 000000000..85f45ae24 --- /dev/null +++ b/db/migrate/20200526181232_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20200526181412_create_customers_videos_join.rb b/db/migrate/20200526181412_create_customers_videos_join.rb new file mode 100644 index 000000000..56fd195be --- /dev/null +++ b/db/migrate/20200526181412_create_customers_videos_join.rb @@ -0,0 +1,8 @@ +class CreateCustomersVideosJoin < ActiveRecord::Migration[6.0] + def change + create_table :customers_videos_joins do |t| + t.belongs_to :customer, index: true + t.belongs_to :video, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..073f30215 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,52 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_26_181412) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "customers_videos_joins", force: :cascade do |t| + t.bigint "customer_id" + t.bigint "video_id" + t.index ["customer_id"], name: "index_customers_videos_joins_on_customer_id" + t.index ["video_id"], name: "index_customers_videos_joins_on_video_id" + end + + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + +end diff --git a/test/models/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 b4632a2b987bcceadc294eaa510a9990f8a9cabd Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 11:51:40 -0700 Subject: [PATCH 04/37] Add column videos_checked_out_count to customers --- ...200526184930_add_videos_checked_out_count_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200526184930_add_videos_checked_out_count_to_customers.rb diff --git a/db/migrate/20200526184930_add_videos_checked_out_count_to_customers.rb b/db/migrate/20200526184930_add_videos_checked_out_count_to_customers.rb new file mode 100644 index 000000000..7975b96ef --- /dev/null +++ b/db/migrate/20200526184930_add_videos_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCountToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 073f30215..3fe019bfb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_181412) do +ActiveRecord::Schema.define(version: 2020_05_26_184930) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" end create_table "customers_videos_joins", force: :cascade do |t| From a39eeb4999a5aadab59a51df463ab59f0aa929c3 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 12:01:49 -0700 Subject: [PATCH 05/37] Add index route for customers --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index c06383a17..96d2b4e1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :customers, only: [:index] end From b0ffd0b874c73000450cde66263239f1e29cbcbe Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 12:18:31 -0700 Subject: [PATCH 06/37] Add first index action test --- app/controllers/customers_controller.rb | 7 +++++++ test/controllers/customers_controller_test.rb | 10 ++++++++++ 2 files changed, 17 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..e96ce7e7f --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + + render json: { ok: 'success' }, status: :ok + end +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..62f7e89f5 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,10 @@ +require "test_helper" + +describe CustomersController do + it "must get index" do + get customers_path + + must_respond_with :ok + expect(response.header['Content-Type']).must_include 'json' + end +end From 649ab60fd9e141d7a9ef7d5e09c75773b471251d Mon Sep 17 00:00:00 2001 From: quinqu Date: Tue, 26 May 2020 12:25:08 -0700 Subject: [PATCH 07/37] fixtures --- app/controllers/videos_controller.rb | 12 ++++++++++++ config/routes.rb | 1 + node_modules/.yarn-integrity | 10 ++++++++++ test/controllers/videos_controller_test.rb | 20 ++++++++++++++++++++ test/fixtures/videos.yml | 18 ++++++++++++++++++ yarn.lock | 4 ++++ 6 files changed, 65 insertions(+) create mode 100644 app/controllers/videos_controller.rb create mode 100644 node_modules/.yarn-integrity create mode 100644 test/controllers/videos_controller_test.rb create mode 100644 test/fixtures/videos.yml create mode 100644 yarn.lock diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..7e58785d5 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,12 @@ +class VideosController < ApplicationController + + def index + video = Video.all + render json: video.as_json(except: [:updated_at, :created_at]), status: :ok + end + + def show + + + end +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..78267d372 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :videos, only: [:index] end diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..0f19eb7ab --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-83", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..3c07e4f2d --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,20 @@ +require "test_helper" + +describe VideoController do + it "will get all videos in json format" do + get videos_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + describe "show" do + it "will show a video" do + + end + + it "will throw an error for a non existent video" do + + end + end +end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..3e1c9d962 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,18 @@ +vid1: + title: One + overview: the first + release_date: 2018 + total_inventory: 3 + available_inventory: 2 +vid2: + title: Second + overview: the second + release_date: 2019 + total_inventory: 5 + available_inventory: 1 +vid3: + title: Third + overview: the third + release_date: 2020 + total_inventory: 3 + available_inventory: 0 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 d6ad5cacc85a3e3a5c0a7a4612af8d69defec6c9 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 12:41:25 -0700 Subject: [PATCH 08/37] Add customers fixture, tests for proper fields, empty array --- app/controllers/customers_controller.rb | 4 ++- test/controllers/customers_controller_test.rb | 32 ++++++++++++++++++- test/fixtures/customers.yml | 9 ++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e96ce7e7f..30a708d03 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,8 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: { ok: 'success' }, status: :ok + render json: customers.as_json( + only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count] + ), status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 62f7e89f5..aa9ababa7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,7 +4,37 @@ it "must get index" do get customers_path - must_respond_with :ok + must_respond_with :success expect(response.header['Content-Type']).must_include 'json' end + + it "will return all the proper fields for a list of customers" do + customer_fields = ["name", "registered_at", "address", "city", "state", "postal_code", "phone", "videos_checked_out_count"].sort + # Act + get customers_path + + # Get the body as an array or a hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal customer_fields + end + end + + it "returns an empty array if no customers exist" do + # Arrange + Customer.destroy_all + # Act + get customers_path + + # Get the body as an array or a hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..a737d8b11 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,9 @@ +shelley: + name: Shelley Rocha + registered_at: 2015-04-29T14:54:14.000Z + address: Ap 292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 + videos_checked_out_count: 1 \ No newline at end of file From a895c23bf44eb4969179566289c9f158157777c9 Mon Sep 17 00:00:00 2001 From: quinqu Date: Tue, 26 May 2020 12:48:30 -0700 Subject: [PATCH 09/37] controller tests and methods --- app/controllers/videos_controller.rb | 19 ++++++++--- config/routes.rb | 2 +- test/controllers/videos_controller_test.rb | 39 ++++++++++++++++++---- test/fixtures/videos.yml | 6 ++-- 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 7e58785d5..8f5e43958 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,12 +1,23 @@ class VideosController < ApplicationController def index - video = Video.all - render json: video.as_json(except: [:updated_at, :created_at]), status: :ok + video = Video.all.as_json(except: [:updated_at, :created_at]) + render json: video, status: :ok end - + def show + video = Video.find_by(id: params[:id]) + if video.nil? + render json: { + ok: false, + message: 'Not found' + }, status: :not_found + return + end - end + render json: video.as_json(except: [:updated_at, :created_at]) + end + + end diff --git a/config/routes.rb b/config/routes.rb index 78267d372..9c7de7066 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html - resources :videos, only: [:index] + resources :videos, only: [:index, :show] end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 3c07e4f2d..fe44012d2 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,20 +1,47 @@ require "test_helper" -describe VideoController do +describe VideosController do + VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + it "will get all videos in json format" do get videos_path expect(response.header['Content-Type']).must_include 'json' must_respond_with :ok - end + end + + it "will return an empty array if no videos" do + + + end describe "show" do - it "will show a video" do + it "will show a video hash" do - end + video = videos(:vid1) + get video_path(video.id) + must_respond_with :success + + body = JSON.parse(response.body) + + expect(response.header["Content-Type"]).must_include 'json' + expect(body.keys.sort).must_equal VIDEO_FIELDS + end + + it "will throw an error for a non existent video" do + + get video_path(-1) + + must_respond_with :not_found + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + + expect(body["ok"]).must_equal false + + end - it "will throw an error for a non existent video" do end - end end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 3e1c9d962..44ba7b391 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,18 +1,18 @@ vid1: title: One overview: the first - release_date: 2018 + release_date: <%= 54.day.ago.to_s(:db) %> total_inventory: 3 available_inventory: 2 vid2: title: Second overview: the second - release_date: 2019 + release_date: <%= 1.day.ago.to_s(:db) %> total_inventory: 5 available_inventory: 1 vid3: title: Third overview: the third - release_date: 2020 + release_date: <%= 3.day.ago.to_s(:db) %> total_inventory: 3 available_inventory: 0 From b510f0bb737c77d6e7e3bf46d4720405b4bc75d8 Mon Sep 17 00:00:00 2001 From: quinqu Date: Tue, 26 May 2020 13:12:03 -0700 Subject: [PATCH 10/37] tests --- app/controllers/videos_controller.rb | 9 +++++ app/models/video.rb | 8 +++++ config/routes.rb | 2 +- test/controllers/videos_controller_test.rb | 42 +++++++++++++++++----- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 8f5e43958..58a18b741 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -18,6 +18,15 @@ def show render json: video.as_json(except: [:updated_at, :created_at]) end + + def create + # video = Video.new + + + # return a hash with the video ID, too + + # render json: video.as_json(except: [:updated_at, :created_at]), status: :created + end end diff --git a/app/models/video.rb b/app/models/video.rb index 991014af0..8da87c94e 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,3 +1,11 @@ class Video < ApplicationRecord has_many :rentals + + # def video_available + # video = Video.find_by(id: ) + # if video.available_inventory > 0 + # return true + # end + # return false + # end end diff --git a/config/routes.rb b/config/routes.rb index 9c7de7066..dc0c9b6dc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html - resources :videos, only: [:index, :show] + resources :videos, only: [:index, :show, :create] end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index fe44012d2..b3df29807 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,19 +2,23 @@ describe VideosController do VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + describe "index" do + it "will get all videos in json format" do + get videos_path - it "will get all videos in json format" do - get videos_path + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok - end - - it "will return an empty array if no videos" do + it "will return an empty array if no videos" do + Video.destroy_all + get videos_path + body = JSON.parse(response.body) + expect(body).must_equal [] + end end - describe "show" do it "will show a video hash" do @@ -41,7 +45,29 @@ expect(body["ok"]).must_equal false end + end + describe "create" do + let (:video_data) { + { + video: { + title: "New Video", + overview: "new new new new create new new new", + release_date: DateTime.now, + total_inventory: 7, + available_inventory: 3, + + } + } + } + + it "can create a new video" do + expect { + post video_path, params :video_data + }.must_differ "Video.count", 1 + + must_respond_with :created + end end end From 1aa4d690decc86424237a8d7c9f0b0f94ab5704f Mon Sep 17 00:00:00 2001 From: quinqu Date: Tue, 26 May 2020 13:54:59 -0700 Subject: [PATCH 11/37] fixed smoke tests --- app/controllers/videos_controller.rb | 10 ++--- app/models/video.rb | 5 +++ test/controllers/videos_controller_test.rb | 46 +++++++++++----------- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 58a18b741..28e340ffd 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,22 +1,22 @@ class VideosController < ApplicationController def index - video = Video.all.as_json(except: [:updated_at, :created_at]) + video = Video.all.as_json(except: [:updated_at, :created_at, :overview, :total_inventory]) render json: video, status: :ok end def show video = Video.find_by(id: params[:id]) + if video.nil? render json: { - ok: false, - message: 'Not found' + ok: false, + message: 'Not Found', }, status: :not_found return - end - render json: video.as_json(except: [:updated_at, :created_at]) + render json: video.as_json(except: [:updated_at, :created_at, :id]) end def create diff --git a/app/models/video.rb b/app/models/video.rb index 8da87c94e..cf5155448 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,10 @@ class Video < ApplicationRecord has_many :rentals + validates :title, presence: true, uniqueness: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true + validates :overview, presence: true # def video_available # video = Video.find_by(id: ) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index b3df29807..67e8c0532 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -47,27 +47,27 @@ end end - describe "create" do - let (:video_data) { - { - video: { - title: "New Video", - overview: "new new new new create new new new", - release_date: DateTime.now, - total_inventory: 7, - available_inventory: 3, - - } - } - } - - it "can create a new video" do - expect { - post video_path, params :video_data - }.must_differ "Video.count", 1 - - must_respond_with :created - end - - end + # describe "create" do + # let (:video_data) { + # { + # video: { + # title: "New Video", + # overview: "new new new new create new new new", + # release_date: DateTime.now, + # total_inventory: 7, + # available_inventory: 3, + + # } + # } + # } + + # it "can create a new video" do + # expect { + # post video_path, params :video_data + # }.must_differ "Video.count", 1 + + # must_respond_with :created + # end + + # end end From 48206fafd4418ee6aac0321ddf3ca84f7b3fb202 Mon Sep 17 00:00:00 2001 From: quinqu Date: Tue, 26 May 2020 14:57:55 -0700 Subject: [PATCH 12/37] smoke test fix --- app/controllers/videos_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 28e340ffd..36deb43c1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -10,9 +10,10 @@ def show if video.nil? render json: { - ok: false, - message: 'Not Found', - }, status: :not_found + "errors": [ + "Not Found" + ] + }, status: :not_found return end From 5f6d7f884a2e76cc26cfdbe5040f700124265d1e Mon Sep 17 00:00:00 2001 From: quinqu Date: Tue, 26 May 2020 15:23:40 -0700 Subject: [PATCH 13/37] updated tests --- app/controllers/videos_controller.rb | 22 +++++++--- test/controllers/videos_controller_test.rb | 51 +++++++++++----------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 36deb43c1..aba6bc509 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -12,21 +12,31 @@ def show render json: { "errors": [ "Not Found" - ] + ] }, status: :not_found return end - render json: video.as_json(except: [:updated_at, :created_at, :id]) end def create - # video = Video.new - + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: { + "errors": [ "Not Found" ] + }, status: :bad_request + return + end + end - # return a hash with the video ID, too + private - # render json: video.as_json(except: [:updated_at, :created_at]), status: :created + def video_params + params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 67e8c0532..e173046c3 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,6 +2,7 @@ describe VideosController do VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + VIDEO_FIELDS_SHOW = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort describe "index" do it "will get all videos in json format" do get videos_path @@ -29,7 +30,7 @@ body = JSON.parse(response.body) expect(response.header["Content-Type"]).must_include 'json' - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal VIDEO_FIELDS_SHOW end it "will throw an error for a non existent video" do @@ -42,32 +43,32 @@ expect(body).must_be_instance_of Hash - expect(body["ok"]).must_equal false + expect(body["errors"][0]).must_equal "Not Found" end end - # describe "create" do - # let (:video_data) { - # { - # video: { - # title: "New Video", - # overview: "new new new new create new new new", - # release_date: DateTime.now, - # total_inventory: 7, - # available_inventory: 3, - - # } - # } - # } - - # it "can create a new video" do - # expect { - # post video_path, params :video_data - # }.must_differ "Video.count", 1 - - # must_respond_with :created - # end - - # end + describe "create" do + let (:video_data) { + { + video: { + title: "New Video", + overview: "new new new new create new new new", + release_date: DateTime.now, + total_inventory: 7, + available_inventory: 3, + + } + } + } + + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + must_respond_with :created + end + + end end From 5618b80a27f1338277be2f5f282eafe0444f055c Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 15:37:18 -0700 Subject: [PATCH 14/37] Made smoke tests for customers pass, created tests for customer model --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 6 ++ test/controllers/customers_controller_test.rb | 2 +- test/models/customer_test.rb | 61 ++++++++++++++++++- 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 30a708d03..74962ca49 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ def index customers = Customer.all render json: customers.as_json( - only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count] + only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] ), status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..c252f6c84 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,9 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + validates :videos_checked_out_count, presence: true + has_many :rentals end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index aa9ababa7..c6f7558e2 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -9,7 +9,7 @@ end it "will return all the proper fields for a list of customers" do - customer_fields = ["name", "registered_at", "address", "city", "state", "postal_code", "phone", "videos_checked_out_count"].sort + customer_fields = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"].sort # Act get customers_path diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..1203c07a7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,62 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @customer = customers(:shelley) + end + + it "can be instantiated" do + # Arrange + new_customer = Customer.new( + name: "Test", + registered_at: "2015-04-29T14:54:14.000Z", + address: "Ap 292", + city: "Hills", + state: "OR", + postal_code: "24309", + phone: "(322) 510-8695", + videos_checked_out_count: 1 + ) + new_customer.save + # Assert + expect(Customer.last).must_equal new_customer + end + + it "has the required fields" do + # Arrange + @customer + + # Assert + [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count].each do |f| + + # Assert + expect(@customer).must_respond_to f + end + + expect(@customer.created_at).wont_be_nil + end + + describe 'validations' do + it "is valid when all fields are filled" do + result = @customer.valid? + expect(result).must_equal true + end + + it 'fails validation when name, registered_at, postal_code, phone or check out videos are nil' do + new_customer = Customer.new( + address: "Ap 292", + city: "Hills", + state: "OR", + ) + new_customer.save + + expect(new_customer.valid?).must_equal false + + [:name, :registered_at, :postal_code, :phone, :videos_checked_out_count].each do |f| + # Assert + expect(new_customer.errors.messages.include?(f)).must_equal true + expect(new_customer.errors.messages[f].include?("can't be blank")).must_equal true + end + end + end end From 21e49b201ae82e5be4b6faa3845a7209ad36235e Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Tue, 26 May 2020 16:48:10 -0700 Subject: [PATCH 15/37] Created video model tests, fixed code to make smoke tests pass, fixed a failed video controller test --- app/controllers/videos_controller.rb | 6 +-- test/controllers/videos_controller_test.rb | 3 -- test/models/video_test.rb | 54 ++++++++++++++++++++-- 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index aba6bc509..7dace1a58 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -27,7 +27,7 @@ def create return else render json: { - "errors": [ "Not Found" ] + "errors": video.errors.messages }, status: :bad_request return end @@ -36,8 +36,6 @@ def create private def video_params - params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end - - end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e173046c3..bee119c67 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -51,14 +51,11 @@ describe "create" do let (:video_data) { { - video: { title: "New Video", overview: "new new new new create new new new", release_date: DateTime.now, total_inventory: 7, available_inventory: 3, - - } } } diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..c884f9198 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,55 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @video = videos(:vid1) + end + + it "can be instantiated" do + # Arrange + new_video = Video.new( + title: "Test video", + overview: "Test overview", + release_date: "2015-04-29T14:54:14.000Z", + total_inventory: 5, + available_inventory: 1 + ) + new_video.save + # Assert + expect(Video.last).must_equal new_video + end + + it "has the required fields" do + # Arrange + @video + + # Assert + [:title, :overview, :release_date, :total_inventory, :available_inventory].each do |f| + + # Assert + expect(@video).must_respond_to f + end + + expect(@video.created_at).wont_be_nil + end + + describe 'validations' do + it "is valid when all fields are filled" do + result = @video.valid? + expect(result).must_equal true + end + + it 'fails validation when fields are nil' do + new_video = Video.new + new_video.save + + expect(new_video.valid?).must_equal false + + [:title, :overview, :release_date, :total_inventory, :available_inventory].each do |f| + # Assert + expect(new_video.errors.messages.include?(f)).must_equal true + expect(new_video.errors.messages[f].include?("can't be blank")).must_equal true + end + end + end end From 0dd989cdb3dfb0c7f428053fb775280870f1ce77 Mon Sep 17 00:00:00 2001 From: quinqu Date: Tue, 26 May 2020 19:48:33 -0700 Subject: [PATCH 16/37] fixed schema --- app/models/customer.rb | 5 ++++- app/models/rental.rb | 4 ++-- app/models/video.rb | 2 ++ db/migrate/20200526181232_create_rentals.rb | 1 - .../20200527023234_add_due_date_to_rentals.rb | 5 +++++ .../20200527024253_add_customer_to_rentals.rb | 6 ++++++ .../20200527024302_add_video_to_rentals.rb | 6 ++++++ db/migrate/20200527024630_drop_join_table.rb | 9 +++++++++ db/schema.rb | 16 ++++++++-------- 9 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 db/migrate/20200527023234_add_due_date_to_rentals.rb create mode 100644 db/migrate/20200527024253_add_customer_to_rentals.rb create mode 100644 db/migrate/20200527024302_add_video_to_rentals.rb create mode 100644 db/migrate/20200527024630_drop_join_table.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index c252f6c84..4b8fdc1e9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,12 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :videos, :through => :rentals + validates :name, presence: true validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true validates :videos_checked_out_count, presence: true - has_many :rentals + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 635f9028b..68b5f46f0 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord - has_and_belongs_to_many :customers - has_and_belongs_to_many :videos + belongs_to :customer + belongs_to :video end diff --git a/app/models/video.rb b/app/models/video.rb index cf5155448..40067d7b0 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,7 @@ class Video < ApplicationRecord has_many :rentals + has_many :customers, :through => :rentals + validates :title, presence: true, uniqueness: true validates :release_date, presence: true validates :total_inventory, presence: true diff --git a/db/migrate/20200526181232_create_rentals.rb b/db/migrate/20200526181232_create_rentals.rb index 85f45ae24..e3d9d58a4 100644 --- a/db/migrate/20200526181232_create_rentals.rb +++ b/db/migrate/20200526181232_create_rentals.rb @@ -1,7 +1,6 @@ class CreateRentals < ActiveRecord::Migration[6.0] def change create_table :rentals do |t| - t.timestamps end end diff --git a/db/migrate/20200527023234_add_due_date_to_rentals.rb b/db/migrate/20200527023234_add_due_date_to_rentals.rb new file mode 100644 index 000000000..c2300a6cf --- /dev/null +++ b/db/migrate/20200527023234_add_due_date_to_rentals.rb @@ -0,0 +1,5 @@ +class AddDueDateToRentals < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :due_date, :datetime + end +end diff --git a/db/migrate/20200527024253_add_customer_to_rentals.rb b/db/migrate/20200527024253_add_customer_to_rentals.rb new file mode 100644 index 000000000..d3466f402 --- /dev/null +++ b/db/migrate/20200527024253_add_customer_to_rentals.rb @@ -0,0 +1,6 @@ +class AddCustomerToRentals < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, index: true + add_foreign_key :rentals, :customers + end +end diff --git a/db/migrate/20200527024302_add_video_to_rentals.rb b/db/migrate/20200527024302_add_video_to_rentals.rb new file mode 100644 index 000000000..002c4fb1f --- /dev/null +++ b/db/migrate/20200527024302_add_video_to_rentals.rb @@ -0,0 +1,6 @@ +class AddVideoToRentals < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :video, index: true + add_foreign_key :rentals, :videos + end +end diff --git a/db/migrate/20200527024630_drop_join_table.rb b/db/migrate/20200527024630_drop_join_table.rb new file mode 100644 index 000000000..f1a41c9ca --- /dev/null +++ b/db/migrate/20200527024630_drop_join_table.rb @@ -0,0 +1,9 @@ +class DropJoinTable < ActiveRecord::Migration[6.0] + def up + drop_table :customers_videos_joins + end + + def down + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/db/schema.rb b/db/schema.rb index 3fe019bfb..744b08f4e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_184930) do +ActiveRecord::Schema.define(version: 2020_05_27_024630) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,16 +28,14 @@ t.integer "videos_checked_out_count" end - create_table "customers_videos_joins", force: :cascade do |t| - t.bigint "customer_id" - t.bigint "video_id" - t.index ["customer_id"], name: "index_customers_videos_joins_on_customer_id" - t.index ["video_id"], name: "index_customers_videos_joins_on_video_id" - end - create_table "rentals", force: :cascade do |t| t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.datetime "due_date" + t.bigint "customer_id" + t.bigint "video_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" end create_table "videos", force: :cascade do |t| @@ -50,4 +48,6 @@ t.datetime "updated_at", precision: 6, null: false end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" end From 77696832f61f4987ea23582af9ea774eb1a385c7 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 08:00:20 -0700 Subject: [PATCH 17/37] routes -- checkout path --- app/models/rental.rb | 6 ++++-- config/routes.rb | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 68b5f46f0..4d330aa01 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord - belongs_to :customer - belongs_to :video + belongs_to :customer + belongs_to :video + + end diff --git a/config/routes.rb b/config/routes.rb index ce30cbb5f..bf3d0a5de 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] + + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' end From 96b181062cce160d0c036df044c84da9af29eb66 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 08:01:17 -0700 Subject: [PATCH 18/37] create rental constollers --- app/controllers/rentals_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 64cbc2dee63e54990f5df68fefed38ef82da19b3 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 08:28:34 -0700 Subject: [PATCH 19/37] rental controller --- app/controllers/rentals_controller.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..371e78d64 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,23 @@ class RentalsController < ApplicationController + + def checkout + # increase the customer's videos_checked_out_count by one + # decrease the video's available_inventory by one + # create a due date. The rental's due date is the seven days from the current date. + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + date = DateTime.now + 1.week + rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) + + if rental.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :created + return + else + render json: { + "errors": rental.errors.messages + }, status: :bad_request + return + end + + end end From 633ca6bd08028d6854c0518f07d05cd85a5e228d Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 08:32:50 -0700 Subject: [PATCH 20/37] rental check-in method --- app/controllers/rentals_controller.rb | 8 +++++++- app/models/rental.rb | 1 + config/routes.rb | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 371e78d64..7ec04d09c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,6 +1,6 @@ class RentalsController < ApplicationController - def checkout + def check_out # increase the customer's videos_checked_out_count by one # decrease the video's available_inventory by one # create a due date. The rental's due date is the seven days from the current date. @@ -18,6 +18,12 @@ def checkout }, status: :bad_request return end + end + + def check_in + end + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 4d330aa01..9115594c3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,5 +2,6 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + end diff --git a/config/routes.rb b/config/routes.rb index bf3d0a5de..2ada76b03 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,5 +2,6 @@ resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] - post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' end From a42d9a2309b2802213dd3c42842f9bbd8d1cf5b3 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 08:39:27 -0700 Subject: [PATCH 21/37] rental update inventory method in model --- app/controllers/rentals_controller.rb | 4 ++-- app/models/rental.rb | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7ec04d09c..94860a484 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,7 +9,7 @@ def check_out date = DateTime.now + 1.week rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - if rental.save + if rental.save && Rental.update_inventory render json: rental.as_json(except: [:created_at, :updated_at]), status: :created return else @@ -25,5 +25,5 @@ def check_in end - + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 9115594c3..1d01c29a8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,16 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - + def update_inventory + customer = Customer.find_by(id: self.customer_id) + video = Video.find_by(id: self.video_id) + if !customer.nil? && !video.nil? && video.available_inventory > 0 + customer.videos_checked_out += 1 + video.available_inventory -= 1 + return true + else + return false + end + end end From 2858ce83393de8da1fbe71d6b06fb4ddd6746d55 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 08:40:32 -0700 Subject: [PATCH 22/37] changed method name --- app/controllers/rentals_controller.rb | 5 +---- app/models/rental.rb | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 94860a484..5051ba76d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,15 +1,12 @@ class RentalsController < ApplicationController def check_out - # increase the customer's videos_checked_out_count by one - # decrease the video's available_inventory by one - # create a due date. The rental's due date is the seven days from the current date. video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) date = DateTime.now + 1.week rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - if rental.save && Rental.update_inventory + if rental.save && Rental.update_inventory_check_out render json: rental.as_json(except: [:created_at, :updated_at]), status: :created return else diff --git a/app/models/rental.rb b/app/models/rental.rb index 1d01c29a8..5dfb481ce 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,7 +2,7 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - def update_inventory + def update_inventory_check_out customer = Customer.find_by(id: self.customer_id) video = Video.find_by(id: self.video_id) if !customer.nil? && !video.nil? && video.available_inventory > 0 From 008c577dd6f6ab4f55327a57fe3a35016b912f5f Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 09:59:27 -0700 Subject: [PATCH 23/37] rental --- app/controllers/rentals_controller.rb | 5 +- app/models/rental.rb | 10 +-- test/controllers/rentals_controller_test.rb | 31 +++++++++- test/controllers/videos_controller_test.rb | 68 ++++++++++----------- 4 files changed, 70 insertions(+), 44 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5051ba76d..644f5c7c2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,3 +1,5 @@ +require 'date' + class RentalsController < ApplicationController def check_out @@ -6,7 +8,7 @@ def check_out date = DateTime.now + 1.week rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - if rental.save && Rental.update_inventory_check_out + if rental.save && Rental.inventory_check_out render json: rental.as_json(except: [:created_at, :updated_at]), status: :created return else @@ -18,6 +20,7 @@ def check_out end def check_in + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 5dfb481ce..1df213f9d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,16 +2,16 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - def update_inventory_check_out + def inventory_check_out customer = Customer.find_by(id: self.customer_id) video = Video.find_by(id: self.video_id) - if !customer.nil? && !video.nil? && video.available_inventory > 0 - customer.videos_checked_out += 1 - video.available_inventory -= 1 + if video.available_inventory > 0 && !customer.nil? && !video.nil? + customer.videos_checked_out += 1 + video.available_inventory -= 1 return true else return false end end - + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..1300aa7b9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,32 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + let (:rental_data) { + + + } + describe "check out" do + + it "will create a rental" do + customer = customers(:shelley) + customer.save + video = videos(:vid1) + video.save + + rental_data = { + customer_id: customer.id, + video_id: video.id + } + + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 1 + + #must_respond_with :created + + + end + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index bee119c67..022cbd518 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -3,6 +3,7 @@ describe VideosController do VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort VIDEO_FIELDS_SHOW = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort + describe "index" do it "will get all videos in json format" do get videos_path @@ -13,59 +14,56 @@ it "will return an empty array if no videos" do Video.destroy_all - get videos_path body = JSON.parse(response.body) expect(body).must_equal [] - end end - describe "show" do - it "will show a video hash" do - - video = videos(:vid1) - get video_path(video.id) - must_respond_with :success + describe "show" do + it "will show a video hash" do - body = JSON.parse(response.body) + video = videos(:vid1) + get video_path(video.id) + must_respond_with :success - expect(response.header["Content-Type"]).must_include 'json' - expect(body.keys.sort).must_equal VIDEO_FIELDS_SHOW - end + body = JSON.parse(response.body) - it "will throw an error for a non existent video" do + expect(response.header["Content-Type"]).must_include 'json' + expect(body.keys.sort).must_equal VIDEO_FIELDS_SHOW + end - get video_path(-1) + it "will throw an error for a non existent video" do - must_respond_with :not_found + get video_path(-1) - body = JSON.parse(response.body) + must_respond_with :not_found - expect(body).must_be_instance_of Hash + body = JSON.parse(response.body) - expect(body["errors"][0]).must_equal "Not Found" + expect(body).must_be_instance_of Hash + expect(body["errors"][0]).must_equal "Not Found" - end end + end - describe "create" do - let (:video_data) { - { - title: "New Video", - overview: "new new new new create new new new", - release_date: DateTime.now, - total_inventory: 7, - available_inventory: 3, - } + describe "create" do + let (:video_data) { + { + title: "New Video", + overview: "new new new new create new new new", + release_date: DateTime.now, + total_inventory: 7, + available_inventory: 3, } + } - it "can create a new video" do - expect { - post videos_path, params: video_data - }.must_differ "Video.count", 1 - - must_respond_with :created - end + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + must_respond_with :created end + end + end From 8fbfbf7ba5b5fc42e4310e93610a0d4cd45d6642 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 10:48:53 -0700 Subject: [PATCH 24/37] rentals controller testing --- app/controllers/rentals_controller.rb | 18 +++++-- app/models/rental.rb | 30 ++++++++---- test/controllers/rentals_controller_test.rb | 53 +++++++++++++++++---- 3 files changed, 78 insertions(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 644f5c7c2..b17bfe58c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,19 +8,27 @@ def check_out date = DateTime.now + 1.week rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - if rental.save && Rental.inventory_check_out - render json: rental.as_json(except: [:created_at, :updated_at]), status: :created - return + + if Rental.inventory_check_out(rental) + if rental.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :created + return + else + render json: { + "errors": "Invalid customer or video ID" + }, status: :bad_request + return + end else render json: { - "errors": rental.errors.messages + "errors": "No Inventory Available" }, status: :bad_request return end end def check_in - + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 1df213f9d..342615353 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,16 +2,30 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - def inventory_check_out - customer = Customer.find_by(id: self.customer_id) - video = Video.find_by(id: self.video_id) - if video.available_inventory > 0 && !customer.nil? && !video.nil? - customer.videos_checked_out += 1 + def self.inventory_check_out(rental) + customer = Customer.find_by(id: rental.customer_id) + video = Video.find_by(id: rental.video_id) + + if video.available_inventory > 0 && customer && video + customer.videos_checked_out_count += 1 video.available_inventory -= 1 - return true + return true else - return false + return false end end - + + def self.inventory_check_in(rental) + customer = Customer.find_by(id: rental.customer_id) + video = Video.find_by(id: rental.video_id) + + if customer && video + customer.videos_checked_out_count -= 1 + video.available_inventory += 1 + return true + else + return false + end + end + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1300aa7b9..9284294e6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,11 +1,6 @@ require "test_helper" describe RentalsController do - - let (:rental_data) { - - - } describe "check out" do it "will create a rental" do @@ -17,16 +12,54 @@ rental_data = { customer_id: customer.id, video_id: video.id - } + } + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 1 + must_respond_with :created + end + + it "will not check out if there are no available videos" do + customer = customers(:shelley) + customer.save + video = videos(:vid3) + video.save + + rental_data = { + customer_id: customer.id, + video_id: video.id + } + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :bad_request + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body["errors"]).must_equal "No Inventory Available" + end + it "will have the correct due date" do + customer = customers(:shelley) + customer.save + video = videos(:vid1) + video.save + + rental_data = { + customer_id: customer.id, + video_id: video.id + } expect { post check_out_path, params: rental_data }.must_differ "Rental.count", 1 - - #must_respond_with :created - - + rental = Rental.first + + expect(rental.due_date.to_s).must_include "2020" end end end From 46792668ea1e2bcae728c9e7239b7e86aa2d1c17 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 11:12:10 -0700 Subject: [PATCH 25/37] rental model tests --- app/models/rental.rb | 4 +- test/controllers/rentals_controller_test.rb | 4 +- test/models/rental_test.rb | 46 +++++++++++++++++++-- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 342615353..0300e0327 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -8,10 +8,12 @@ def self.inventory_check_out(rental) if video.available_inventory > 0 && customer && video customer.videos_checked_out_count += 1 + customer.save video.available_inventory -= 1 + video.save return true else - return false + return false end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9284294e6..47e13d856 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -10,8 +10,8 @@ video.save rental_data = { - customer_id: customer.id, - video_id: video.id + customer_id: customer.id, + video_id: video.id } expect { diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..80e218a56 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,47 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "will return true if valid customer and video" do + customer = customers(:shelley) + customer.save + video = videos(:vid1) + video.save + date = DateTime.now + 1.week + + rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) + + answ = Rental.inventory_check_out(rental) + + expect(answ).must_equal true + end + + it "will return flase if for invalid customer" do + video = videos(:vid1) + video.save + date = DateTime.now + 1.week + rental = Rental.new(due_date: date, customer_id: 1000, video_id: video.id) + + answ = Rental.inventory_check_out(rental) + expect(answ).must_equal false + end + + it "will decrement video availibility and will increment customer videos" do + customer = customers(:shelley) + customer.save + video = videos(:vid1) + video.save + date = DateTime.now + 1.week + + rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) + + answ = Rental.inventory_check_out(rental) + + expect(answ).must_equal true + + expect(video.available_inventory).must_equal 1 + expect(customer.videos_checked_out_count).must_equal 2 + + end + + end From 29ce167959f2a7d77d654973f80d9e96c473a7b1 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 11:58:33 -0700 Subject: [PATCH 26/37] json return rental --- app/controllers/rentals_controller.rb | 15 +++++++++++++-- app/models/rental.rb | 2 +- config/routes.rb | 2 +- test/models/rental_test.rb | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b17bfe58c..afccd2166 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,6 +2,11 @@ class RentalsController < ApplicationController + def index + rental = Rental.all + render json: rental.as_json(except: [:id, :updated_at, :created_at]), status: :ok + end + def check_out video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) @@ -11,12 +16,18 @@ def check_out if Rental.inventory_check_out(rental) if rental.save - render json: rental.as_json(except: [:created_at, :updated_at]), status: :created + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + } return else render json: { "errors": "Invalid customer or video ID" - }, status: :bad_request + }, status: :not_found return end else diff --git a/app/models/rental.rb b/app/models/rental.rb index 0300e0327..ec446a1c6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -11,7 +11,7 @@ def self.inventory_check_out(rental) customer.save video.available_inventory -= 1 video.save - return true + return true else return false end diff --git a/config/routes.rb b/config/routes.rb index 2ada76b03..0774662e3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] - + resources :rentals, only: [:index] post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 80e218a56..b46d7395b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -35,6 +35,7 @@ rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) answ = Rental.inventory_check_out(rental) + expect(answ).must_equal true From 758a3b75714397a7b986793cbe65c8dbbd6ea928 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Wed, 27 May 2020 12:34:05 -0700 Subject: [PATCH 27/37] Fixed test by reloading 2 objects --- test/models/rental_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 80e218a56..729bf06e6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -36,6 +36,8 @@ answ = Rental.inventory_check_out(rental) + video.reload + customer.reload expect(answ).must_equal true expect(video.available_inventory).must_equal 1 From 7b24373ffa77997381842b263f5c32423db3c6c1 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 12:54:19 -0700 Subject: [PATCH 28/37] checkout controller --- app/controllers/rentals_controller.rb | 53 +++++++++++++++++---------- app/models/rental.rb | 2 +- config/routes.rb | 4 +- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index afccd2166..5469f6f82 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -12,29 +12,42 @@ def check_out customer = Customer.find_by(id: params[:customer_id]) date = DateTime.now + 1.week rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) + + if customer.nil? || video.nil? + render json: { + errors: [ + "Not Found" + ] + }, status: :not_found + return + end + + video.reload + customer.reload if Rental.inventory_check_out(rental) - if rental.save - render json: { - customer_id: rental.customer_id, - video_id: rental.video_id, - due_date: rental.due_date, - videos_checked_out_count: customer.videos_checked_out_count, - available_inventory: video.available_inventory - } - return - else - render json: { - "errors": "Invalid customer or video ID" - }, status: :not_found - return - end - else - render json: { - "errors": "No Inventory Available" - }, status: :bad_request - return + if rental.save + video.reload + customer.reload + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + }, status: 200 + return + + else + render json: { + "errors": [ + "Not Found" + ] + }, status: :not_found + return + end + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index ec446a1c6..7020ef5e0 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -6,7 +6,7 @@ def self.inventory_check_out(rental) customer = Customer.find_by(id: rental.customer_id) video = Video.find_by(id: rental.video_id) - if video.available_inventory > 0 && customer && video + if video.available_inventory > 0 #&& customer && video customer.videos_checked_out_count += 1 customer.save video.available_inventory -= 1 diff --git a/config/routes.rb b/config/routes.rb index 0774662e3..e08315aa4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] resources :rentals, only: [:index] - post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' - post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' + post 'rentals/check-out', to: 'rentals#check_out', as: 'check_out' + post 'rentals/check-in', to: 'rentals#check_in', as: 'check_in' end From 1305cf080b56a46c707bb9d2628ea5ac2ff9f24e Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 13:17:49 -0700 Subject: [PATCH 29/37] check out smoke tests --- app/controllers/rentals_controller.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5469f6f82..f944996cc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,12 +8,11 @@ def index end def check_out - video = Video.find_by(id: params[:video_id]) + video = Video.find_by(id: params[:video_id] ) customer = Customer.find_by(id: params[:customer_id]) date = DateTime.now + 1.week - rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - + #puts "THIS IS CUSTIMER #{customer.id} VID: #{video.id}" if customer.nil? || video.nil? render json: { errors: [ @@ -22,14 +21,13 @@ def check_out }, status: :not_found return end - - video.reload - customer.reload - + rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) + if Rental.inventory_check_out(rental) if rental.save video.reload customer.reload + render json: { customer_id: rental.customer_id, video_id: rental.video_id, @@ -46,8 +44,7 @@ def check_out ] }, status: :not_found return - end - + end end end From 2e2e2e70abefb222def9b4ed63567f49694445b6 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 13:29:49 -0700 Subject: [PATCH 30/37] smoke tests --- app/controllers/rentals_controller.rb | 47 ++++++++++----------- app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 2 +- test/models/rental_test.rb | 1 - 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f944996cc..090104d4f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,8 +11,7 @@ def check_out video = Video.find_by(id: params[:video_id] ) customer = Customer.find_by(id: params[:customer_id]) date = DateTime.now + 1.week - - #puts "THIS IS CUSTIMER #{customer.id} VID: #{video.id}" + if customer.nil? || video.nil? render json: { errors: [ @@ -21,30 +20,30 @@ def check_out }, status: :not_found return end + rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - if Rental.inventory_check_out(rental) - if rental.save - video.reload - customer.reload - - render json: { - customer_id: rental.customer_id, - video_id: rental.video_id, - due_date: rental.due_date, - videos_checked_out_count: customer.videos_checked_out_count, - available_inventory: video.available_inventory - }, status: 200 - return - - else - render json: { - "errors": [ - "Not Found" - ] - }, status: :not_found - return - end + if Rental.inventory_check_out(rental) && rental.save + + video.reload + customer.reload + + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + }, status: :created + + return + else + render json: { + "errors": [ + "No Inventory Available" + ] + }, status: :bad_request + return end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 7020ef5e0..ec446a1c6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -6,7 +6,7 @@ def self.inventory_check_out(rental) customer = Customer.find_by(id: rental.customer_id) video = Video.find_by(id: rental.video_id) - if video.available_inventory > 0 #&& customer && video + if video.available_inventory > 0 && customer && video customer.videos_checked_out_count += 1 customer.save video.available_inventory -= 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 47e13d856..4eaec7618 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -41,7 +41,7 @@ body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body["errors"]).must_equal "No Inventory Available" + expect(body["errors"][0]).must_equal "No Inventory Available" end it "will have the correct due date" do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 066fce9c8..7a7d0052f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -20,7 +20,6 @@ video.save date = DateTime.now + 1.week rental = Rental.new(due_date: date, customer_id: 1000, video_id: video.id) - answ = Rental.inventory_check_out(rental) expect(answ).must_equal false end From 5ed1e2e6ce46521860736e1318f8755c7284e076 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Wed, 27 May 2020 13:32:09 -0700 Subject: [PATCH 31/37] Fixed the bug with being unable to find a rental through a customer_id and video_id --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 3 +++ app/controllers/videos_controller.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 74962ca49..acfc2fb48 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all + customers = Customer.all.order(:id) render json: customers.as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index afccd2166..a682e4980 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -39,6 +39,9 @@ def check_out end def check_in + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + rental = Rental.find_by(video_id: video.id, customer_id: customer.id) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 7dace1a58..283dc33d1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,7 @@ class VideosController < ApplicationController def index - video = Video.all.as_json(except: [:updated_at, :created_at, :overview, :total_inventory]) + video = Video.all.order(:id).as_json(except: [:updated_at, :created_at, :overview, :total_inventory]) render json: video, status: :ok end From ed2d3fda7059b8850f444de39b8963afd1b22aa9 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Wed, 27 May 2020 14:33:14 -0700 Subject: [PATCH 32/37] Made smoke tests wave 2 pass, added check-in functionality --- app/controllers/rentals_controller.rb | 35 ++++++++++++++++++++++++--- app/models/rental.rb | 3 ++- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e6280d2e2..3da0f9e01 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,7 +34,7 @@ def check_out due_date: rental.due_date, videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory - }, status: :created + }, status: :ok return else @@ -50,11 +50,40 @@ def check_out def check_in video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) - rental = Rental.find_by(video_id: video.id, customer_id: customer.id) + if customer.nil? || video.nil? + render json: { + errors: ["Not Found"] + }, status: :not_found + return + end + rental = Rental.find_by(video_id: video.id, customer_id: customer.id) - end + if rental.nil? + render json: { + errors: ["Not Found"] + }, status: :not_found + return + end + if Rental.inventory_check_in(rental) && rental.save + video.reload + customer.reload + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + }, status: :ok + + return + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + return + end + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index ec446a1c6..06849cc3d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -23,11 +23,12 @@ def self.inventory_check_in(rental) if customer && video customer.videos_checked_out_count -= 1 + customer.save video.available_inventory += 1 + video.save return true else return false end end - end From acd100ce4b7499696eaa4674a082af9e94b5f119 Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 15:02:14 -0700 Subject: [PATCH 33/37] fixed failing vid controller test --- app/controllers/rentals_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3da0f9e01..d4ed5b137 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,17 +34,19 @@ def check_out due_date: rental.due_date, videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory - }, status: :ok - + }, status: :created return + else + render json: { "errors": [ "No Inventory Available" ] }, status: :bad_request return - end + end + end def check_in From 87fd36f787d7c55f8b5dc89caa127aed3eb7b4ec Mon Sep 17 00:00:00 2001 From: quinqu Date: Wed, 27 May 2020 15:08:04 -0700 Subject: [PATCH 34/37] smoke tests --- app/controllers/rentals_controller.rb | 3 ++- test/controllers/rentals_controller_test.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d4ed5b137..73493ae32 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,7 +34,7 @@ def check_out due_date: rental.due_date, videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory - }, status: :created + }, status: :ok return else @@ -87,5 +87,6 @@ def check_in }, status: :bad_request return end + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4eaec7618..f0b6a120a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -18,7 +18,7 @@ post check_out_path, params: rental_data }.must_differ "Rental.count", 1 - must_respond_with :created + must_respond_with :ok end it "will not check out if there are no available videos" do From b96bc16a8f101378225d4a5dcc6dc69f331f9e5f Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Wed, 27 May 2020 16:52:25 -0700 Subject: [PATCH 35/37] Created new tests for check-in functionality --- app/controllers/rentals_controller.rb | 4 +- test/controllers/rentals_controller_test.rb | 53 ++++++++++++++++++++- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d4ed5b137..0e1fb8009 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,7 +34,7 @@ def check_out due_date: rental.due_date, videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory - }, status: :created + }, status: :ok return else @@ -69,7 +69,7 @@ def check_in return end - if Rental.inventory_check_in(rental) && rental.save + if Rental.inventory_check_in(rental) video.reload customer.reload diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4eaec7618..49aa61168 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -18,7 +18,7 @@ post check_out_path, params: rental_data }.must_differ "Rental.count", 1 - must_respond_with :created + must_respond_with :ok end it "will not check out if there are no available videos" do @@ -62,4 +62,55 @@ expect(rental.due_date.to_s).must_include "2020" end end + + describe "check in" do + before do + @customer = customers(:shelley) + @video = videos(:vid2) + @rental_data = { + customer_id: @customer.id, + video_id: @video.id + } + end + + it "does not change the Rental count" do + # Arrange, Act + post check_out_path, params: @rental_data + # # Assert + expect{ post check_in_path, params: @rental_data }.wont_change "Rental.count" + must_respond_with :ok + end + + it "updates the data in the database" do + # Arrange + post check_out_path, params: @rental_data + checked_out_count = @customer.reload.videos_checked_out_count + available_inventory = @video.reload.available_inventory + # Act + post check_in_path, params: @rental_data + # Assert + must_respond_with :ok + expect( @customer.reload.videos_checked_out_count).must_equal checked_out_count - 1 + expect(@video.reload.available_inventory).must_equal available_inventory + 1 + end + + it "returns not_found if there is no checked out rental instance" do + # Arrange, Act + post check_in_path, params: @rental_data + # Assert + must_respond_with :not_found + end + + it "returns not_found if customer id is missing" do + # Arrange, Act + post check_out_path, params: @rental_data + must_respond_with :ok + @rental_data[:customer_id] = nil + post check_in_path, params: @rental_data + body = JSON.parse(response.body) + # Assert + must_respond_with :not_found + expect(body["errors"][0]).must_equal "Not Found" + end + end end From dbfe11e12456223c46c6af521b342524878898c1 Mon Sep 17 00:00:00 2001 From: Olga Patrakova Date: Wed, 27 May 2020 17:07:40 -0700 Subject: [PATCH 36/37] Added tests for custom method inventory_check_in --- test/models/rental_test.rb | 101 ++++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 35 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 7a7d0052f..adce908e0 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,49 +1,80 @@ require "test_helper" describe Rental do - it "will return true if valid customer and video" do - customer = customers(:shelley) - customer.save - video = videos(:vid1) - video.save - date = DateTime.now + 1.week + describe "self.inventory_check_out" do + it "will return true if valid customer and video" do + customer = customers(:shelley) + customer.save + video = videos(:vid1) + video.save + date = DateTime.now + 1.week - rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) + rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - answ = Rental.inventory_check_out(rental) + answ = Rental.inventory_check_out(rental) - expect(answ).must_equal true - end + expect(answ).must_equal true + end - it "will return flase if for invalid customer" do - video = videos(:vid1) - video.save - date = DateTime.now + 1.week - rental = Rental.new(due_date: date, customer_id: 1000, video_id: video.id) - answ = Rental.inventory_check_out(rental) - expect(answ).must_equal false - end + it "will return flase if for invalid customer" do + video = videos(:vid1) + video.save + date = DateTime.now + 1.week + rental = Rental.new(due_date: date, customer_id: 1000, video_id: video.id) + answ = Rental.inventory_check_out(rental) + expect(answ).must_equal false + end + + it "will decrement video availibility and will increment customer videos" do + customer = customers(:shelley) + customer.save + video = videos(:vid1) + video.save + date = DateTime.now + 1.week - it "will decrement video availibility and will increment customer videos" do - customer = customers(:shelley) - customer.save - video = videos(:vid1) - video.save - date = DateTime.now + 1.week + rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) + + answ = Rental.inventory_check_out(rental) - rental = Rental.new(due_date: date, customer_id: customer.id, video_id: video.id) - - answ = Rental.inventory_check_out(rental) + + video.reload + customer.reload + expect(answ).must_equal true + + expect(video.available_inventory).must_equal 1 + expect(customer.videos_checked_out_count).must_equal 2 + end + end + + describe "self.inventory_check_in" do + before do + @customer = customers(:shelley) + @video = videos(:vid1) + date = DateTime.now + 1.week + @rental = Rental.new(due_date: date, customer_id: @customer.id, video_id: @video.id) + end - - video.reload - customer.reload - expect(answ).must_equal true - - expect(video.available_inventory).must_equal 1 - expect(customer.videos_checked_out_count).must_equal 2 + it "will return true for valid customer and video" do + answer = Rental.inventory_check_in(@rental) + expect(answer).must_equal true + end - end + it "will return false for invalid customer and video" do + @rental.customer = nil + answer = Rental.inventory_check_in(@rental) + expect(answer).must_equal false + @rental.video = nil + answer = Rental.inventory_check_in(@rental) + expect(answer).must_equal false + end + it "decreases the customer's videos and increases the video's available_inventory" do + videos_checked_out_count = @customer.videos_checked_out_count + available_inventory = @video.available_inventory + Rental.inventory_check_in(@rental) + expect(@customer.reload.videos_checked_out_count).must_equal videos_checked_out_count - 1 + expect(@video.reload.available_inventory).must_equal available_inventory + 1 + end + end end From aa76a4123dfe43392dc0bc0f77900711149591f5 Mon Sep 17 00:00:00 2001 From: quinqu Date: Thu, 28 May 2020 08:08:03 -0700 Subject: [PATCH 37/37] removed commented out code --- app/models/video.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/models/video.rb b/app/models/video.rb index 40067d7b0..025a95a26 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -8,11 +8,4 @@ class Video < ApplicationRecord validates :available_inventory, presence: true validates :overview, presence: true - # def video_available - # video = Video.find_by(id: ) - # if video.available_inventory > 0 - # return true - # end - # return false - # end end