From 39e67d12a28e830a739110cda6d0d7b0ba41b6ae Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:20:30 -0700 Subject: [PATCH 01/36] Initial db 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 +++ db/schema.rb | 18 ++ 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 60 files changed, 1124 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 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..d7edb5686 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-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..12f45f3dc --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +h6MWF7o4Vyuc4Jg0/cSxDKv5qbkydY03YPE5ZGOn/fGZ0UoFxkWUzGOmUnap2BALEq1hzAgxdgF9oeBaGuCHMUFdQg9vUzMoLJEhCJ17Dub42QJI4lS7zzPYrAU3ztLiSZwyexWivB8YU0N3qWDEQiU6My131m2PZO5ewb3/x+/gjam/vZUQOAZu231ygHz++Bia0ET4AQv9/d7jGv+NcwhInKn7ZZwYvdbeuARQldvIKQLUAgIU+YsfOdIWHDaakUKMwBSwJEfiRLRXvfYYYOTIMeStzvOEwtxtHGNZU78n7HDzbBVPWJB34hGe6fgWRvUL/FNbKM2G98YRfl9BatPxtIVONKV/8tPRX4op6NzSc1IroaLMLJuytfrvzmMO7be4JzBqbVl4U/4pfhu+azhA8vMP8HlymTqz--WBHSIOBzDapy6UTS--ppcLhQ2yuWO5kF4TklCKjQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b10373ba6 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/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 64859539627d4f72b5e0fba6b6edce3e3ea439bb Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:23:45 -0700 Subject: [PATCH 02/36] Adds controller for videos. --- app/controllers/videos_controller.rb | 2 ++ db/seeds.rb | 2 +- test/controllers/videos_controller_test.rb | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..fcd6eefb2 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,2 @@ +class VideosController < ApplicationController +end diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..06003891a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 + # customer['videos_checked_out_count'] = 1 Customer.create!(customer) end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..7f1649fd0 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VideosController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From d53352493ded1e4113a735cb098ad17429f465c3 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:24:30 -0700 Subject: [PATCH 03/36] Adds controller for customers. --- app/controllers/customers_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ 2 files changed, 9 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..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 0ff35ed4a7253f3136bd241fcece648d08721492 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:25:06 -0700 Subject: [PATCH 04/36] Adds controller for rentals. --- 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 34807023483ff8792b1a6568b32da799ee0ac4bc Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:26:55 -0700 Subject: [PATCH 05/36] Adds models for customer, rental, and video. --- app/models/customer.rb | 2 ++ app/models/rental.rb | 2 ++ app/models/video.rb | 2 ++ db/migrate/20200527212537_create_videos.rb | 8 ++++++++ db/migrate/20200527212558_create_rentals.rb | 8 ++++++++ db/migrate/20200527212604_create_customers.rb | 8 ++++++++ test/models/customer_test.rb | 7 +++++++ test/models/rental_test.rb | 7 +++++++ test/models/video_test.rb | 7 +++++++ 9 files changed, 51 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/rental.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200527212537_create_videos.rb create mode 100644 db/migrate/20200527212558_create_rentals.rb create mode 100644 db/migrate/20200527212604_create_customers.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/rental_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/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/db/migrate/20200527212537_create_videos.rb b/db/migrate/20200527212537_create_videos.rb new file mode 100644 index 000000000..c9e399123 --- /dev/null +++ b/db/migrate/20200527212537_create_videos.rb @@ -0,0 +1,8 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20200527212558_create_rentals.rb b/db/migrate/20200527212558_create_rentals.rb new file mode 100644 index 000000000..85f45ae24 --- /dev/null +++ b/db/migrate/20200527212558_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/20200527212604_create_customers.rb b/db/migrate/20200527212604_create_customers.rb new file mode 100644 index 000000000..3374e6e69 --- /dev/null +++ b/db/migrate/20200527212604_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + + t.timestamps + end + end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 3b87608eb82783e2a34591a61ee3ac0d7875e7bf Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:30:15 -0700 Subject: [PATCH 06/36] Adds routes for controllers. --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index c06383a17..dac75ad75 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ 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] + resources :videos, only: [:index] + resources :rentals, only: [:index] end From e49567cfd6ccaf48c846d0590937745320500b99 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:41:07 -0700 Subject: [PATCH 07/36] Adds controller index actions for rental, video, and customer. Updates related tests. --- app/controllers/customers_controller.rb | 6 ++++++ app/controllers/rentals_controller.rb | 7 +++++++ app/controllers/videos_controller.rb | 6 ++++++ test/controllers/customers_controller_test.rb | 10 +++++++--- test/controllers/rentals_controller_test.rb | 10 +++++++--- test/controllers/videos_controller_test.rb | 9 ++++++--- 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..d9522e06f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,8 @@ class CustomersController < ApplicationController + + def index + customers = Customer.all.order(:id) + + render json: { ok: 'Yes'}, status: :ok + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..f6b27ad23 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,9 @@ class RentalsController < ApplicationController + + def index + rental = Rental.all.order(:id) + + render json: { ok: 'Yes'}, status: :ok + end + end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fcd6eefb2..9532a33f7 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,2 +1,8 @@ class VideosController < ApplicationController + + def index + videos = Video.all.order(:id) + + render json: { ok: 'Yes'}, status: :ok + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..a2770b0df 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,11 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + it "must get index" do + get customers_path + must_respond_with :ok + end + + expect(response.header['Content-Type]).must_include 'json' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..d929e27d1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,11 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + it "must get index" do + get rentals_path + must_respond_with :ok + end + + expect(response.header['Content-Type]).must_include 'json' end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7f1649fd0..c8c74e1d5 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,10 @@ require "test_helper" describe VideosController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "must get index" do + get videos_path + must_respond_with :ok + end + + expect(response.header['Content-Type]).must_include 'json' end From 79aac6e57c51656ec1e3337f5a83a760179c27ad Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 14:58:36 -0700 Subject: [PATCH 08/36] Adds fixture and updates model. --- app/models/customer.rb | 11 +++++++++++ test/fixtures/customers.yml | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 test/fixtures/customers.yml diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..37fb2851c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,13 @@ class Customer < ApplicationRecord + + has_many :rentals + + def as_json(options = {}) + options[:methods] = [:videos_checkout_count] + super + end + + def videos_checkout_count + return 0 + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..72ce8df05 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +Gloria Anzaldua: + name: Gloria Anzaldua + registered_at: Fri, 07, Jun 2018 16:36:45 -0800 + address: 634 Main St. + city: Casper + state: Wyoming + postal_code: 82501 + phone: 307.364.2354 + +Pink Panther: + name: Pink Panther + registered_at: Mon, 04, Dec 2018 14:36:45 -0800 + address: 432 Eugene Rd. + city: Portland + state: Oregon + postal_code: 98234 + phone: 987.354.2245 \ No newline at end of file From dbf7063960823692eb051fd723fcca8a744f671a Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 15:04:16 -0700 Subject: [PATCH 09/36] Adds fields to customer controller and test. --- app/controllers/customers_controller.rb | 4 +++- test/controllers/customers_controller_test.rb | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d9522e06f..a04fb3bac 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,6 +3,8 @@ class CustomersController < ApplicationController def index customers = Customer.all.order(:id) - render json: { ok: 'Yes'}, status: :ok + render json: customers.as_json( + only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), + ) status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index a2770b0df..10df3c826 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,5 +1,7 @@ require "test_helper" +CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal_code", "phone", "videos_checkout_count"].sort + describe CustomersController do it "must get index" do From 6ec09facaf6205a99362a6a7398886878bf08b38 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 15:07:52 -0700 Subject: [PATCH 10/36] Adds schema. --- db/schema.rb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..87e12d54c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,24 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2020_05_27_212604) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "videos", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + end From a2fccb25a27eacc8fa21fd0f3b2dcf9b19fc46ff Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 15:16:42 -0700 Subject: [PATCH 11/36] Updated video controller, test and model --- app/controllers/videos_controller.rb | 50 +++++++- app/models/video.rb | 7 + db/migrate/20200527212537_create_videos.rb | 1 - .../20200527220122_add_columns_to_videos.rb | 9 ++ test/controllers/videos_controller_test.rb | 121 +++++++++++++++++- test/fixtures/videos.yml | 24 ++++ 6 files changed, 204 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20200527220122_add_columns_to_videos.rb create mode 100644 test/fixtures/videos.yml diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 9532a33f7..09a061a35 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,8 +1,52 @@ class VideosController < ApplicationController - def index - videos = Video.all.order(:id) + videos = Video.all.order(:id) + + render json: videos.as_json( + only: [:id, :title, :release_date, :available_inventory]), + status: :ok + end + + def show + video = Video.find_by(id: params[:id]) + + if video.nil? + render json: { + errors: ['Not Found'], # TODO + }, status: :not_found + + return + end + + render json: video.as_json( + only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), + status: :ok + end - render json: { ok: 'Yes'}, status: :ok + def create + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + + else + render json: { + errors: video.errors.messages # important (I can check it from console) + }, status: :bad_request + + end + end + + private + # def video_params + # return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + # end + + def video_params + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end + + +# reference about params: https://edgeguides.rubyonrails.org/action_controller_overview.html \ No newline at end of file diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..215bb77ce 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,9 @@ class Video < ApplicationRecord + has_many :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true end diff --git a/db/migrate/20200527212537_create_videos.rb b/db/migrate/20200527212537_create_videos.rb index c9e399123..309ee70d4 100644 --- a/db/migrate/20200527212537_create_videos.rb +++ b/db/migrate/20200527212537_create_videos.rb @@ -1,7 +1,6 @@ class CreateVideos < ActiveRecord::Migration[6.0] def change create_table :videos do |t| - t.timestamps end end diff --git a/db/migrate/20200527220122_add_columns_to_videos.rb b/db/migrate/20200527220122_add_columns_to_videos.rb new file mode 100644 index 000000000..84945defb --- /dev/null +++ b/db/migrate/20200527220122_add_columns_to_videos.rb @@ -0,0 +1,9 @@ +class AddColumnsToVideos < ActiveRecord::Migration[6.0] + def change + add_column :videos, :title, :string + add_column :videos, :overview, :string + add_column :videos, :release_date, :string + add_column :videos, :total_inventory, :integer + add_column :videos, :available_inventory, :integer + end +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index c8c74e1d5..66dd30906 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,10 +1,123 @@ require "test_helper" describe VideosController do - it "must get index" do - get videos_path - must_respond_with :ok + VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + + describe "index" do + it "must get index" do + get videos_path + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + end + + it "will return all the proper fields for a list of videos" do + # Act + get videos_path + + # Get the body of the response + # as an array or hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end + + + it "returns an empty array if no videos exist" do + Video.destroy_all + + # Act + get videos_path + + # Get the body of the response + # as an array or hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end + end + + describe "show" do + # Nominal case + it "will return a hash with the proper fields for an existing video" do + video = videos(:parasite) + video_fileds = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort + + # Act + get video_path(video.id) + + # Assert + must_respond_with :success # :ok is fine too + + body = JSON.parse(response.body) + + expect(response.header['Content-Type']).must_include 'json' + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal video_fileds + end + + # Edge case + it "will return a 404 request with json 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 # TODO + expect(body['errors']).must_include 'Not Found' + end + end + + describe "create" do + let(:video_data) { + { + title: "Parasite", + overview: "This starts out almost like an 'Ocean's Eleven' heist film and then expands into a comedy, mystery, thriller, drama, romance, crime and even horror film.", + release_date: "2019", + total_inventory: 10, + available_inventory: 5, + } + } + + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + must_respond_with :created + + # check_response(expected_type: Hash, expected_status: :created) + end + + it "will respond with bad_request for invalid data" do + video_data[:title] = nil + video_data[:total_inventory] = nil + + expect { + # Act + post videos_path, params: video_data + + # Assert + }.wont_change "Video.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + + # body = check_response(expected_type: Hash, expected_status: :bad_request) + + expect(body["errors"].keys).must_include "title" + expect(body["errors"].keys).must_include "total_inventory" + end end - expect(response.header['Content-Type]).must_include 'json' end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..55749bf14 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,24 @@ +parasite: + title: Parasite + overview: This starts out almost like an 'Ocean's Eleven' heist film and then expands into a comedy, mystery, thriller, drama, romance, crime and even horror film. + release_date: 2019 + total_inventory: 10 + available_inventory: 5 +us: + title: Us + overview: With Jordan Peele's second inventive, ambitious horror film, we have seen how to beat the sophomore jinx, and it is Us. + release_date: 2019 + total_inventory: 2 + available_inventory: 2 +toy_story: + title: TOY STORY 4 + overview: Heartwarming, funny, and beautifully animated, Toy Story 4 manages the unlikely feat of extending -- and perhaps concluding -- a practically perfect animated saga. + release_date: 2019 + total_inventory: 2 + available_inventory: 1 +avengers: + title: Avengers + overview: Endgame does whatever it takes to deliver a satisfying finale to Marvel's epic Infinity Saga. + release_date: 2019 + total_inventory: 3 + available_inventory: 1 \ No newline at end of file From ed8fe5ed79d1c83696a6e8072be71b4a23fc43f7 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 15:51:06 -0700 Subject: [PATCH 12/36] Adds columns to customer. --- db/migrate/20200527222644_add_column_to_customers.rb | 11 +++++++++++ db/schema.rb | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200527222644_add_column_to_customers.rb diff --git a/db/migrate/20200527222644_add_column_to_customers.rb b/db/migrate/20200527222644_add_column_to_customers.rb new file mode 100644 index 000000000..675856aaf --- /dev/null +++ b/db/migrate/20200527222644_add_column_to_customers.rb @@ -0,0 +1,11 @@ +class AddColumnToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :name, :string + add_column :customers, :registered_at, :string + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :state, :string + add_column :customers, :postal_code, :string + add_column :customers, :phone, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 87e12d54c..f9f121948 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_212604) do +ActiveRecord::Schema.define(version: 2020_05_27_222644) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -18,6 +18,13 @@ create_table "customers", force: :cascade do |t| t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "name" + t.string "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" end create_table "rentals", force: :cascade do |t| From 936065d33e4edf38abd891237668e320faf64282 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 16:09:46 -0700 Subject: [PATCH 13/36] Run migration to add fields to customer --- db/schema.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/db/schema.rb b/db/schema.rb index f9f121948..27499e6ee 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -35,6 +35,11 @@ create_table "videos", force: :cascade do |t| t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "total_inventory" + t.integer "available_inventory" end end From d4fbea15765c50bcbd4ece2a187ef93da8110cbc Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 16:29:59 -0700 Subject: [PATCH 14/36] Updated routes --- config/routes.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index dac75ad75..cfce28b2b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,9 @@ # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index] - resources :videos, 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 From a6ecbc6935787c2626791bde9a769636447460d8 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 16:41:48 -0700 Subject: [PATCH 15/36] Updated rental model and controller --- app/models/rental.rb | 5 +++ .../20200527233255_add_columns_to_rentals.rb | 7 ++++ ...add_customer_id_and_video_id_to_rentals.rb | 6 ++++ test/controllers/rentals_controller_test.rb | 36 ++++++++++++++++++- 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200527233255_add_columns_to_rentals.rb create mode 100644 db/migrate/20200527233446_add_customer_id_and_video_id_to_rentals.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..83c6dca46 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,7 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video + + validates :customer_id, presence: true + validates :video_id, presence: true end diff --git a/db/migrate/20200527233255_add_columns_to_rentals.rb b/db/migrate/20200527233255_add_columns_to_rentals.rb new file mode 100644 index 000000000..735a83214 --- /dev/null +++ b/db/migrate/20200527233255_add_columns_to_rentals.rb @@ -0,0 +1,7 @@ +class AddColumnsToRentals < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :due_date, :string + add_column :rentals, :check_in_date, :string + add_column :rentals, :check_out_date, :string + end +end diff --git a/db/migrate/20200527233446_add_customer_id_and_video_id_to_rentals.rb b/db/migrate/20200527233446_add_customer_id_and_video_id_to_rentals.rb new file mode 100644 index 000000000..867ff34b7 --- /dev/null +++ b/db/migrate/20200527233446_add_customer_id_and_video_id_to_rentals.rb @@ -0,0 +1,6 @@ +class AddCustomerIdAndVideoIdToRentals < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :video, foreign_key: true + end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d929e27d1..8f9878e8c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,7 +5,41 @@ it "must get index" do get rentals_path must_respond_with :ok + expect(response.header['Content-Type']).must_include 'json' end - expect(response.header['Content-Type]).must_include 'json' + + describe "check_out" do + + let(:customer) { + customers(:pengsoo) + } + let(:video) { + videos(:parasite) + } + + let(:rental_data) { + { + customer_id: customer.id, + video_id: video.id + } + } + + it "can let a customer check out" do + inventory_nums = video.available_inventory + checked_out_video_nums = customer.videos_checked_out_count + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 1 + + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + + + expect(Video.find(video.id).available_inventory).must_equal inventory_nums - 1 + expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums + 1 + end + end end From 352b7855a735e8c12f05a103ad8c9d58e1f277d5 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 16:43:16 -0700 Subject: [PATCH 16/36] Added more customers in customers.yml --- test/fixtures/customers.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 72ce8df05..586d2e6f3 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -14,4 +14,21 @@ Pink Panther: city: Portland state: Oregon postal_code: 98234 - phone: 987.354.2245 \ No newline at end of file + phone: 987.354.2245 +pengsoo: + name: pengsoo + registered_at: Sun, 06 Apr 2014 15:46:40 -0700 + address: P.O. Box 666, 7743 Mauris Road + city: Knoxville + state: TN + postal_code: 47671 + phone: (200) 706-8284 + +goblin: + name: goblin + registered_at: Fri, 06 Feb 2015 11:31:26 -0800 + address: P.O. Box 161, 9318 Non, Ave + city: Boise + state: Idaho + postal_code: 81837 + phone: (669) 244-0896 \ No newline at end of file From 02d47af118979c62da9f13d8a7be177f7d1d4102 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 16:44:31 -0700 Subject: [PATCH 17/36] Updated shcema.rb for rental --- db/schema.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 27499e6ee..825239424 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_222644) do +ActiveRecord::Schema.define(version: 2020_05_27_233446) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -30,6 +30,13 @@ create_table "rentals", force: :cascade do |t| t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "due_date" + t.string "check_in_date" + t.string "check_out_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| @@ -42,4 +49,6 @@ t.integer "available_inventory" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" end From 656c3a338aa06ae6ce595b83f017c766de49cfcb Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 16:54:15 -0700 Subject: [PATCH 18/36] Adds test for customer controller index method. --- test/controllers/customers_controller_test.rb | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 10df3c826..b708d42ef 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -5,9 +5,34 @@ describe CustomersController do it "must get index" do + get customers_path + must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" + end + + it "must return all customer fields" do + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "responds with expected type and status" do get customers_path must_respond_with :ok + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an empty array if database has no customers" do + Customer.destroy_all + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 end - expect(response.header['Content-Type]).must_include 'json' end From 655e1e92098b4ef2afdd6747d8bab7cda6f0617c Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 17:06:36 -0700 Subject: [PATCH 19/36] Updated check_out action --- app/controllers/rentals_controller.rb | 61 +++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f6b27ad23..540604670 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,4 +6,65 @@ def index render json: { ok: 'Yes'}, status: :ok end + def check_out + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + + + if video.nil? || customer.nil? + render json: { + errors: ['Not Found'], + }, status: :not_found + + return + end + + + if video.available_inventory <= 0 + + render json: { + ok: false, + errors: "Not Available" + }, status: :bad_request + + return + end + + + rental = Rental.new(rental_params) + rental.check_out_date = Date.today + rental.due_date = Date.today + 7 + + if rental.save + video.available_inventory -= 1 + video.save + + customer.videos_checked_out_count += 1 + customer.save + + + # render json: rental.as_json( + # only: [:id, :due_date]), + # status: :ok + + 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 + }, + # only: [:id, :due_date]), + status: :ok + + return + + end + end + + private + + def rental_params + params.permit(:customer_id, :video_id) + end end From 10d5f8ba7886af2e6d02f92fd4bf8a50e45684be Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 17:08:55 -0700 Subject: [PATCH 20/36] Cleaned code in videos_controller.rb --- app/controllers/videos_controller.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 09a061a35..3ed96b3bc 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -12,7 +12,7 @@ def show if video.nil? render json: { - errors: ['Not Found'], # TODO + errors: ['Not Found'], }, status: :not_found return @@ -32,17 +32,13 @@ def create else render json: { - errors: video.errors.messages # important (I can check it from console) + errors: video.errors.messages }, status: :bad_request end end private - # def video_params - # return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) - # end - def video_params return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end From 8987a401721618d18b898d972b04f68f9e397731 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 19:23:19 -0700 Subject: [PATCH 21/36] Adds checkout_count to customers. --- db/migrate/20200528003303_add_checkout_count_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200528003303_add_checkout_count_to_customers.rb diff --git a/db/migrate/20200528003303_add_checkout_count_to_customers.rb b/db/migrate/20200528003303_add_checkout_count_to_customers.rb new file mode 100644 index 000000000..27f81a773 --- /dev/null +++ b/db/migrate/20200528003303_add_checkout_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddCheckoutCountToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :video_checkout_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 825239424..e3a2f5830 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_233446) do +ActiveRecord::Schema.define(version: 2020_05_28_003303) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "state" t.string "postal_code" t.string "phone" + t.integer "video_checkout_count", default: 0 end create_table "rentals", force: :cascade do |t| From a4705a7c1fbffa72ada8cd8bed8f43f1cf6d1ed4 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 19:43:10 -0700 Subject: [PATCH 22/36] Fixes typo on customer table, tests, etc to correlate with smoke tests. --- app/models/customer.rb | 4 ++-- db/migrate/20200528023630_rename_checkout_count_column.rb | 5 +++++ db/schema.rb | 4 ++-- test/controllers/customers_controller_test.rb | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20200528023630_rename_checkout_count_column.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 37fb2851c..c07ebc7a0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,11 +3,11 @@ class Customer < ApplicationRecord has_many :rentals def as_json(options = {}) - options[:methods] = [:videos_checkout_count] + options[:methods] = [:videos_checked_out_count] super end - def videos_checkout_count + def videos_checked_out_count return 0 end end diff --git a/db/migrate/20200528023630_rename_checkout_count_column.rb b/db/migrate/20200528023630_rename_checkout_count_column.rb new file mode 100644 index 000000000..1d77b9f9e --- /dev/null +++ b/db/migrate/20200528023630_rename_checkout_count_column.rb @@ -0,0 +1,5 @@ +class RenameCheckoutCountColumn < ActiveRecord::Migration[6.0] + def change + rename_column :customers, :video_checkout_count, :videos_checked_out_count + end +end diff --git a/db/schema.rb b/db/schema.rb index e3a2f5830..69133dfdc 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_28_003303) do +ActiveRecord::Schema.define(version: 2020_05_28_023630) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,7 @@ t.string "state" t.string "postal_code" t.string "phone" - t.integer "video_checkout_count", default: 0 + t.integer "videos_checked_out_count", default: 0 end create_table "rentals", force: :cascade do |t| diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b708d42ef..a61d8b2f9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal_code", "phone", "videos_checkout_count"].sort +CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"].sort describe CustomersController do From 7d87b942e636f4eb8ece6b555b5b5c774977174e Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 20:12:20 -0700 Subject: [PATCH 23/36] Seeded database with videos and customers. --- app/controllers/customers_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a04fb3bac..dd4850b15 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,7 @@ def index customers = Customer.all.order(:id) render json: customers.as_json( - only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), - ) status: :ok + only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count]), + status: :ok end end From 0b5e2fd970630ca9579807a4fa0d6682c7879cdb Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Wed, 27 May 2020 20:52:04 -0700 Subject: [PATCH 24/36] All wave one smoke tests passing. --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dd4850b15..283a4aa13 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,7 @@ def index customers = Customer.all.order(:id) 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 From b2d1f84db4f93f4424696becd0fe4717b669eaff Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 22:46:48 -0700 Subject: [PATCH 25/36] Updated check_in action for retals --- app/controllers/rentals_controller.rb | 74 ++++++---- app/models/rental.rb | 13 +- test/controllers/rentals_controller_test.rb | 155 +++++++++++++++++++- 3 files changed, 208 insertions(+), 34 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 540604670..067f72586 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,17 +1,9 @@ class RentalsController < ApplicationController - - def index - rental = Rental.all.order(:id) - - render json: { ok: 'Yes'}, status: :ok - end + before_action :find_video_and_customer, only: [:check_out, :check_in] def check_out - video = Video.find_by(id: params[:video_id]) - customer = Customer.find_by(id: params[:customer_id]) - - if video.nil? || customer.nil? + if @video.nil? || @customer.nil? render json: { errors: ['Not Found'], }, status: :not_found @@ -19,8 +11,7 @@ def check_out return end - - if video.available_inventory <= 0 + if @video.available_inventory <= 0 render json: { ok: false, @@ -32,29 +23,22 @@ def check_out rental = Rental.new(rental_params) - rental.check_out_date = Date.today - rental.due_date = Date.today + 7 + rental.update_check_out_dates # check_out and due_date - if rental.save - video.available_inventory -= 1 - video.save - customer.videos_checked_out_count += 1 - customer.save + if rental.save + @customer.increment_checked_out_count # for customer + @video.decrement_available_inventory # for video - - # render json: rental.as_json( - # only: [:id, :due_date]), - # status: :ok + # TODO 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 + videos_checked_out_count: @customer.videos_checked_out_count, + available_inventory: @video.available_inventory }, - # only: [:id, :due_date]), status: :ok return @@ -62,9 +46,47 @@ def check_out end end + def check_in + if @video.nil? || @customer.nil? + render json: { + errors: ['Not Found'], + }, status: :not_found + + return + end + + rental = Rental.find_by(rental_params) + rental.update_check_in_date + + + if rental.save + + @customer.decrement_checked_out_count # for customer + @video.increment_available_inventory # for video + + # TODO + 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 + + end + + end + private def rental_params params.permit(:customer_id, :video_id) end + + def find_video_and_customer + @video = Video.find_by(id: params[:video_id]) + @customer = Customer.find_by(id: params[:customer_id]) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 83c6dca46..a3fca31d9 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,4 +4,15 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :video_id, presence: true -end + + def update_check_out_dates + self.check_out_date = Date.today + self.due_date = Date.today + 7 + end + + + def update_check_in_date + self.check_in_date = Date.today + end + +end \ No newline at end of file diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8f9878e8c..d97297d18 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,13 +2,6 @@ describe RentalsController do - it "must get index" do - get rentals_path - must_respond_with :ok - expect(response.header['Content-Type']).must_include 'json' - end - - describe "check_out" do let(:customer) { @@ -26,9 +19,12 @@ } it "can let a customer check out" do + # Arrange inventory_nums = video.available_inventory checked_out_video_nums = customer.videos_checked_out_count + + # Act & Assert expect { post check_out_path, params: rental_data }.must_differ "Rental.count", 1 @@ -37,9 +33,154 @@ expect(response.header['Content-Type']).must_include 'json' + # Arrange + rental = Rental.find_by(video_id: video.id, customer_id: customer.id) + + # Act & Assert + expect(rental.check_out_date).must_equal Time.now.strftime('%Y-%m-%d') expect(Video.find(video.id).available_inventory).must_equal inventory_nums - 1 expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums + 1 end + + it "cannot checkout if given an invalid video_id" do + + rental_data[:video_id] = -1 + + checked_out_video_nums = customer.videos_checked_out_count + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :not_found + + expect(response.header['Content-Type']).must_include 'json' + + + expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums + end + + it "cannot checkout if given an invalid customer_id" do + + rental_data[:customer_id] = -1 + + inventory_nums = video.available_inventory + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :not_found + + expect(response.header['Content-Type']).must_include 'json' + + + expect(Video.find(video.id).available_inventory).must_equal inventory_nums + end + + it "cannot checkout if video inventory is 0" do + video_us = videos(:us) + + new_rental_params = { + customer_id: customer.id, + video_id: video_us.id + } + + # Arrange + inventory_nums = video_us.available_inventory + checked_out_video_nums = customer.videos_checked_out_count + + + expect { + post check_out_path, params: new_rental_params + }.wont_change "Rental.count" + + must_respond_with :bad_request + + expect(response.header['Content-Type']).must_include 'json' + + expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums + expect(Video.find(video_us.id).available_inventory).must_equal inventory_nums + end + end + + describe "check_in" do + + let(:customer) { + customers(:pengsoo) + } + let(:video) { + videos(:parasite) + } + + let(:rental_params) { + { + customer_id: customer.id, + video_id: video.id + } + } + + before do # important! + post check_out_path, params: rental_params + end + + it "can let a customer check in" do + + # Arrange + inventory_nums = video.available_inventory + checked_out_video_nums = customer.videos_checked_out_count + + + # Act & Assert + + expect { + post check_in_path, params: rental_params + }.wont_change "Rental.count" + + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + + + # Arrange + rental = Rental.find_by(video_id: video.id, customer_id: customer.id) + + # Act & Assert + expect(rental.check_in_date).must_equal Time.now.strftime('%Y-%m-%d') + + expect(Video.find(video.id).available_inventory).must_equal inventory_nums + expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums + end + + it "cannot check in if given an invalid video_id" do + + # Arrange + rental_params[:video_id] = -1 + + expect { + post check_in_path, params: rental_params + }.wont_change "Rental.count" + + must_respond_with :not_found + + expect(response.header['Content-Type']).must_include 'json' + end + + it "cannot check in if given an invalid customer_id" do + + # Arrange + rental_params[:customer_id] = -1 + + checked_out_video_nums = customer.videos_checked_out_count + + expect { + post check_in_path, params: rental_params + }.wont_change "Rental.count" + + must_respond_with :not_found + + expect(response.header['Content-Type']).must_include 'json' + end end end From 574510cc430d083b0eae8f22949e6971d342aac6 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 22:47:41 -0700 Subject: [PATCH 26/36] Updated decrement_available_inventory & increment_available_inventory custom methods --- app/models/video.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index 215bb77ce..548ad8a3b 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -6,4 +6,14 @@ class Video < ApplicationRecord validates :release_date, presence: true validates :total_inventory, presence: true validates :available_inventory, presence: true + + def decrement_available_inventory + self.available_inventory -= 1 + self.save + end + + def increment_available_inventory + self.available_inventory += 1 + self.save + end end From 5cf78116e25e96a3a6e2c254dc6acf9e695134f9 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 22:48:55 -0700 Subject: [PATCH 27/36] Modified seeds.rb --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 06003891a..2ea255387 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - # customer['videos_checked_out_count'] = 1 + customer['videos_checked_out_count'] = 1 Customer.create!(customer) end From 4b4efd44e7b1d94618b96d41fe4859edfedddabc Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 22:59:18 -0700 Subject: [PATCH 28/36] Modified route to pass smoke test --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index cfce28b2b..651d48750 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ 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 From d77f9eb30cddc2277d2f290d1f11fbeff9a8edf3 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 23:00:48 -0700 Subject: [PATCH 29/36] Updated database --- db/migrate/20200528003303_add_checkout_count_to_customers.rb | 2 +- db/migrate/20200528023630_rename_checkout_count_column.rb | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 db/migrate/20200528023630_rename_checkout_count_column.rb diff --git a/db/migrate/20200528003303_add_checkout_count_to_customers.rb b/db/migrate/20200528003303_add_checkout_count_to_customers.rb index 27f81a773..9ca0549c6 100644 --- a/db/migrate/20200528003303_add_checkout_count_to_customers.rb +++ b/db/migrate/20200528003303_add_checkout_count_to_customers.rb @@ -1,5 +1,5 @@ class AddCheckoutCountToCustomers < ActiveRecord::Migration[6.0] def change - add_column :customers, :video_checkout_count, :integer, default: 0 + add_column :customers, :videos_checked_out_count, :integer, default: 0 end end diff --git a/db/migrate/20200528023630_rename_checkout_count_column.rb b/db/migrate/20200528023630_rename_checkout_count_column.rb deleted file mode 100644 index 1d77b9f9e..000000000 --- a/db/migrate/20200528023630_rename_checkout_count_column.rb +++ /dev/null @@ -1,5 +0,0 @@ -class RenameCheckoutCountColumn < ActiveRecord::Migration[6.0] - def change - rename_column :customers, :video_checkout_count, :videos_checked_out_count - end -end From d18f4aa8292846e21cc1bdf6ee12a6cd7d4b92a3 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 23:01:41 -0700 Subject: [PATCH 30/36] Updated schema.rb --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 69133dfdc..e74cb7e7a 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_28_023630) do +ActiveRecord::Schema.define(version: 2020_05_28_003303) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 6bd3e7f4f596f6f754e518abca8271e540ca2fc2 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 23:10:56 -0700 Subject: [PATCH 31/36] Fixed a typo and added custom methods to pass smoke test --- app/controllers/customers_controller.rb | 4 ++-- app/models/customer.rb | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 283a4aa13..ea8f9bb6a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,7 @@ def index customers = Customer.all.order(:id) render json: customers.as_json( - only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), - status: :ok + only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), + status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index c07ebc7a0..5d8a649cb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,12 +2,22 @@ class Customer < ApplicationRecord has_many :rentals - def as_json(options = {}) - options[:methods] = [:videos_checked_out_count] - super + # def as_json(options = {}) + # options[:methods] = [:videos_checkout_count] + # super + # end + + # def videos_checkout_count + # return 0 + # end + + def increment_checked_out_count + self.videos_checked_out_count += 1 + self.save end - def videos_checked_out_count - return 0 - end + def decrement_checked_out_count + self.videos_checked_out_count -= 1 + self.save + end end From ec13e4c225e3f0adc53fd47bc9646b0a17d0a7fd Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 23:16:39 -0700 Subject: [PATCH 32/36] updated videos.yml --- test/fixtures/videos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 55749bf14..e25c9df3a 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -9,7 +9,7 @@ us: overview: With Jordan Peele's second inventive, ambitious horror film, we have seen how to beat the sophomore jinx, and it is Us. release_date: 2019 total_inventory: 2 - available_inventory: 2 + available_inventory: 0 toy_story: title: TOY STORY 4 overview: Heartwarming, funny, and beautifully animated, Toy Story 4 manages the unlikely feat of extending -- and perhaps concluding -- a practically perfect animated saga. From 16cccd1de8932dfe8a1c54e63e07d1f574a9ab18 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 27 May 2020 23:28:30 -0700 Subject: [PATCH 33/36] Fixed attributes to pass smoke test for rental --- app/controllers/customers_controller.rb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ea8f9bb6a..a231a29d8 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,19 @@ class CustomersController < ApplicationController def index - customers = Customer.all.order(:id) + customers = Customer.all.order(:id) render json: customers.as_json( - only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), - status: :ok - end -end + only: [ + :id, + :name, + :registered_at, + :postal_code, + :phone, + :videos_checked_out_count + ]), + status: :ok + + return + end +end \ No newline at end of file From c7906014e0161a34a507c99325139ae69f6cb8ca Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 28 May 2020 08:38:57 -0700 Subject: [PATCH 34/36] Fixed rentals_controllrer_test.rb --- config/routes.rb | 1 - test/controllers/rentals_controller_test.rb | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 651d48750..0d0b8794e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,5 @@ resources :videos, only: [:index, :show, :create] 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/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d97297d18..3f701604a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -18,7 +18,7 @@ } } - it "can let a customer check out" do + it "can enables a customer to check out" do # Arrange inventory_nums = video.available_inventory checked_out_video_nums = customer.videos_checked_out_count @@ -43,7 +43,8 @@ expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums + 1 end - it "cannot checkout if given an invalid video_id" do + + it "a customer cannot checkout if given an invalid video_id" do rental_data[:video_id] = -1 @@ -61,7 +62,7 @@ expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums end - it "cannot checkout if given an invalid customer_id" do + it "a customer cannot checkout if given an invalid customer_id" do rental_data[:customer_id] = -1 @@ -79,7 +80,7 @@ expect(Video.find(video.id).available_inventory).must_equal inventory_nums end - it "cannot checkout if video inventory is 0" do + it "a customer cannot checkout if video inventory is 0" do video_us = videos(:us) new_rental_params = { @@ -125,7 +126,7 @@ post check_out_path, params: rental_params end - it "can let a customer check in" do + it "can enables a customer to check in" do # Arrange inventory_nums = video.available_inventory @@ -153,7 +154,7 @@ expect(Customer.find(customer.id).videos_checked_out_count).must_equal checked_out_video_nums end - it "cannot check in if given an invalid video_id" do + it "a customer cannot check in if given an invalid video_id" do # Arrange rental_params[:video_id] = -1 @@ -167,7 +168,7 @@ expect(response.header['Content-Type']).must_include 'json' end - it "cannot check in if given an invalid customer_id" do + it "a customer cannot check in if given an invalid customer_id" do # Arrange rental_params[:customer_id] = -1 From d70be3fe54b812b6042d45e624c7e5c0f345f661 Mon Sep 17 00:00:00 2001 From: Alex Robertson Date: Thu, 28 May 2020 14:06:07 -0700 Subject: [PATCH 35/36] Adds customer validations. --- app/controllers/customers_controller.rb | 1 - app/models/customer.rb | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a231a29d8..e172393f0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -13,7 +13,6 @@ def index :videos_checked_out_count ]), status: :ok - return end end \ No newline at end of file diff --git a/app/models/customer.rb b/app/models/customer.rb index 5d8a649cb..1199e205f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,13 @@ class Customer < ApplicationRecord - has_many :rentals + validates :id, presence: true + 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 + # def as_json(options = {}) # options[:methods] = [:videos_checkout_count] # super From afad6924e923db018067125fc4c9b0fadc906198 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 28 May 2020 14:45:45 -0700 Subject: [PATCH 36/36] Cleaned code --- app/controllers/rentals_controller.rb | 3 --- app/models/customer.rb | 9 --------- test/controllers/videos_controller_test.rb | 12 +----------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 067f72586..007ead443 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -30,8 +30,6 @@ def check_out @customer.increment_checked_out_count # for customer @video.decrement_available_inventory # for video - - # TODO render json: { customer_id: rental.customer_id, video_id: rental.video_id, @@ -64,7 +62,6 @@ def check_in @customer.decrement_checked_out_count # for customer @video.increment_available_inventory # for video - # TODO render json: { customer_id: rental.customer_id, video_id: rental.video_id, diff --git a/app/models/customer.rb b/app/models/customer.rb index 1199e205f..f5a4767a4 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,15 +8,6 @@ class Customer < ApplicationRecord validates :phone, presence: true validates :videos_checked_out_count, presence: true - # def as_json(options = {}) - # options[:methods] = [:videos_checkout_count] - # super - # end - - # def videos_checkout_count - # return 0 - # end - def increment_checked_out_count self.videos_checked_out_count += 1 self.save diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 66dd30906..570889a8a 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -15,8 +15,6 @@ # Act get videos_path - # Get the body of the response - # as an array or hash body = JSON.parse(response.body) # Assert @@ -35,8 +33,6 @@ # Act get videos_path - # Get the body of the response - # as an array or hash body = JSON.parse(response.body) # Assert @@ -55,7 +51,7 @@ get video_path(video.id) # Assert - must_respond_with :success # :ok is fine too + must_respond_with :success body = JSON.parse(response.body) @@ -71,7 +67,6 @@ must_respond_with :not_found body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - # expect(body['ok']).must_equal false # TODO expect(body['errors']).must_include 'Not Found' end end @@ -93,8 +88,6 @@ }.must_differ "Video.count", 1 must_respond_with :created - - # check_response(expected_type: Hash, expected_status: :created) end it "will respond with bad_request for invalid data" do @@ -112,12 +105,9 @@ expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) - - # body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"].keys).must_include "title" expect(body["errors"].keys).must_include "total_inventory" end end - end