From 38dfce51ea932e23e5a83b6460adad5a4858aa37 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Tue, 1 Dec 2020 17:17:32 -0800 Subject: [PATCH 01/23] initial rais setup --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 node_modules/.yarn-integrity | 10 + public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + 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 yarn.lock | 4 + 58 files changed, 1120 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 node_modules/.yarn-integrity create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..bfacd7a13 --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.4' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..6b36539e2 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + mail (>= 2.7.1) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + nokogiri (>= 1.8.5) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) + globalid (>= 0.3.6) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + marcel (~> 0.3.1) + activesupport (6.0.3.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.5.1) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.3) + concurrent-ruby (1.1.7) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.11) + erubi (1.10.0) + ffi (1.13.1) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.5) + concurrent-ruby (~> 1.0) + listen (3.3.3) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.8.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.8) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.2) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.4) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.7) + nio4r (~> 2.0) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + bundler (>= 1.3.0) + railties (= 6.0.3.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.1) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.8) + thread_safe (~> 0.1) + websocket-driver (0.7.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.4.2) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.4) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/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..158ed5b28 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +1oMeHmhya7vlZls/OBV+Duqu+fiazodtpz1hzS7S0mZWUCWJVJICGy/vDjl0Mt23amOFH6WWzb+K8vj+5OHYhT6iK5uRJxs6C3qZHdy76qDjAkPKeg/Evv4i740V42xmd+zlkd8tkMNtKT1uSnIq5jmLLh3K1zkB+e3nojhioLNjIyeGWfRbBlbAEpYOG2zaZLKOiWTAzS4KXEaHWEVHD6TG0eI3G+iIE13BWgVg1oFu67tyOqm0t2gB7ozn85R2HYweRq4D3NFjDGcCxJmrtZpG5GcZlkVwq37ya51BGWAcw70Nf0536Y6NY4hnk7bTbQTeW3qq3gcZ25ixhCHsof4qHzLDDkxK1x7RsEAR4lwx6SF6bFXPlKXWOA68YkCfmyb7UNhbQ6j02G/rECZ8Hg3DPqPV6xGNHaAy--VB90UOrU6IAAg7L7--7ndeP28Mwn0tvvfLXuuVFA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..19c018ab8 --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-88", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/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 diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..fb57ccd13 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 8daac4b0f5f78b01b9fb544c03a6094c23424217 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Tue, 1 Dec 2020 17:26:28 -0800 Subject: [PATCH 02/23] models for rental video & cust --- .generators | 8 ++++ .rakeTasks | 7 +++ app/models/customer.rb | 2 + app/models/rental.rb | 2 + app/models/video.rb | 2 + db/migrate/20201202012204_create_customers.rb | 15 ++++++ db/migrate/20201202012347_create_videos.rb | 13 ++++++ db/migrate/20201202012433_create_rentals.rb | 9 ++++ db/schema.rb | 46 +++++++++++++++++++ test/models/customer_test.rb | 7 +++ test/models/rental_test.rb | 7 +++ test/models/video_test.rb | 7 +++ 12 files changed, 125 insertions(+) create mode 100644 .generators create mode 100644 .rakeTasks 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/20201202012204_create_customers.rb create mode 100644 db/migrate/20201202012347_create_videos.rb create mode 100644 db/migrate/20201202012433_create_rentals.rb create mode 100644 db/schema.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/.generators b/.generators new file mode 100644 index 000000000..d853eb594 --- /dev/null +++ b/.generators @@ -0,0 +1,8 @@ + + diff --git a/.rakeTasks b/.rakeTasks new file mode 100644 index 000000000..16fb1f24a --- /dev/null +++ b/.rakeTasks @@ -0,0 +1,7 @@ + + 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/20201202012204_create_customers.rb b/db/migrate/20201202012204_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20201202012204_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20201202012347_create_videos.rb b/db/migrate/20201202012347_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20201202012347_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20201202012433_create_rentals.rb b/db/migrate/20201202012433_create_rentals.rb new file mode 100644 index 000000000..98aa3c29c --- /dev/null +++ b/db/migrate/20201202012433_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..9b4e4311b --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_12_02_012433) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + +end diff --git a/test/models/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 5afc0b166cf36f9669f50808f2a3cee256708845 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Tue, 1 Dec 2020 17:29:43 -0800 Subject: [PATCH 03/23] controller setup --- app/controllers/customers_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ app/controllers/videos_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 4 files changed, 13 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/rentals_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/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..fcd6eefb2 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,2 @@ +class VideosController < ApplicationController +end diff --git a/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 08278d03448d7e5665b014462f7c0ed45dd463c6 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 1 Dec 2020 21:02:22 -0800 Subject: [PATCH 04/23] relate rentals to customer --- app/models/customer.rb | 1 + app/models/rental.rb | 1 + db/migrate/20201202050002_relate_rentals_to_customer.rb | 5 +++++ db/schema.rb | 4 +++- node_modules/.yarn-integrity | 6 ++++-- 5 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20201202050002_relate_rentals_to_customer.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..2569e47c1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,3 @@ class Rental < ApplicationRecord + belongs_to :customer end diff --git a/db/migrate/20201202050002_relate_rentals_to_customer.rb b/db/migrate/20201202050002_relate_rentals_to_customer.rb new file mode 100644 index 000000000..be64cdb19 --- /dev/null +++ b/db/migrate/20201202050002_relate_rentals_to_customer.rb @@ -0,0 +1,5 @@ +class RelateRentalsToCustomer < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 9b4e4311b..18e9d79f8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_12_02_012433) do +ActiveRecord::Schema.define(version: 2020_12_02_050002) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -31,6 +31,8 @@ t.date "due_date" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" end create_table "videos", force: :cascade do |t| diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 19c018ab8..833cabeb5 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,6 +1,8 @@ { - "systemParams": "darwin-x64-88", - "modulesFolders": [], + "systemParams": "darwin-x64-83", + "modulesFolders": [ + "node_modules" + ], "flags": [], "linkedModules": [], "topLevelPatterns": [], From b330e9eb2b4b5f5852876fd473fe8965f5d4c3a6 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 1 Dec 2020 21:06:58 -0800 Subject: [PATCH 05/23] add videos checkout count col to customers --- ...0201202050525_add_videos_checked_out_count_to_customer.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201202050525_add_videos_checked_out_count_to_customer.rb diff --git a/db/migrate/20201202050525_add_videos_checked_out_count_to_customer.rb b/db/migrate/20201202050525_add_videos_checked_out_count_to_customer.rb new file mode 100644 index 000000000..1280a012e --- /dev/null +++ b/db/migrate/20201202050525_add_videos_checked_out_count_to_customer.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCountToCustomer < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 18e9d79f8..fc9963dce 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_12_02_050002) do +ActiveRecord::Schema.define(version: 2020_12_02_050525) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" end create_table "rentals", force: :cascade do |t| From 0a776b96ac14ae03ba8f4472d4278f038fe01d6a Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 1 Dec 2020 21:37:26 -0800 Subject: [PATCH 06/23] index method for customers --- app/controllers/customers_controller.rb | 6 ++++++ config/routes.rb | 1 + 2 files changed, 7 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..3b5b2b352 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.as_json(only: [:id, :name, :registered_at, :postal_code, + :phone, :videos_checked_out_count]) + render json: customers, status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..e0f9e46c5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :customers, only: [:index] end From 3924af717185aca61497f506ea1176623c7972f9 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 1 Dec 2020 22:29:15 -0800 Subject: [PATCH 07/23] adding name validation and test --- app/models/customer.rb | 2 ++ test/models/customer_test.rb | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..f1c5834cd 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord has_many :rentals + + validates_presence_of :name end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..9a915a83a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,15 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + before do + @simon = customers(:customer_one) + end + + describe "validations" do + it "requires a name" do + @simon.name = nil + expect(@simon.valid?).must_equal false + end + end end From 55dacd79624b52edb8698ef09a2d37a13400dd02 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Tue, 1 Dec 2020 22:37:55 -0800 Subject: [PATCH 08/23] show and index for videoscontroller --- app/controllers/videos_controller.rb | 12 ++++++++++++ config/routes.rb | 1 + test/controllers/videos_controller_test.rb | 2 +- test/fixtures/videos.yml | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fcd6eefb2..465f71f76 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,2 +1,14 @@ class VideosController < ApplicationController + + def index + videos = Video.all.as_json(only: [:available_inventory, :id, :release_date, :title]) + render json: videos, status: :ok + end + + def show + video = Video.find_by(id: params[:id]) + + render json: {ok: false, errors:["Not Found"]}, status: :not_found and return if video.nil? + render json: video.as_json(except: [:created_at, :updated_at, :id]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..7386758b2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :videos, only: [:show, :index] end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index c1d9564b5..e8fe8b984 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -50,7 +50,7 @@ fields = ["title", "overview", "release_date", "total_inventory", "available_inventory"].sort expect(body.keys.sort).must_equal fields expect(body["title"]).must_equal "Wonder Woman 2" - expect(body["release_date"]).must_equal "December 25th 2020" + expect(body["release_date"]).must_equal "2020-12-25" expect(body["available_inventory"]).must_equal 100 expect(body["overview"]).must_equal "Wonder Woman squares off against Maxwell Lord and the Cheetah, a villainess who possesses superhuman strength and agility." expect(body["total_inventory"]).must_equal 100 diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index cef2102b7..2fb7ad1ad 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,12 +1,12 @@ wonder_woman: title: Wonder Woman 2 - release_date: "December 25th 2020" + release_date: "2020-12-25" available_inventory: 100 overview: Wonder Woman squares off against Maxwell Lord and the Cheetah, a villainess who possesses superhuman strength and agility. total_inventory: 100 black_widow: title: Black Widow - release_date: "May 7th 2021" + release_date: "2021-5-7" available_inventory: 6 overview: At birth the Black Widow (aka Natasha Romanova) is given to the KGB, which grooms her to become its ultimate operative. When the U.S.S.R. breaks up, the government tries to kill her as the action moves to present-day New York, where she is a freelance operative. total_inventory: 7 From eea50bf6e9472bfb523058b02bbaa41243834d30 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Wed, 2 Dec 2020 11:11:27 -0800 Subject: [PATCH 09/23] create action, edited respective tests --- app/controllers/videos_controller.rb | 13 +++++++++++++ app/models/video.rb | 2 ++ config/routes.rb | 2 +- test/controllers/videos_controller_test.rb | 7 +++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 465f71f76..b75c4b9da 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -11,4 +11,17 @@ def show render json: {ok: false, errors:["Not Found"]}, status: :not_found and return if video.nil? render json: video.as_json(except: [:created_at, :updated_at, :id]), status: :ok end + + def create + video = Video.new(video_params) + render json: video.as_json, status: :created and return if video.save + render json: {ok: false, errors: video.errors}, status: :bad_request and return + end + + private + + def video_params + params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + end + end diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..144aba3ae 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,4 @@ class Video < ApplicationRecord + + validates :title, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 7386758b2..f43707ced 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html - resources :videos, only: [:show, :index] + resources :videos, only: [:show, :index, :create] end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e8fe8b984..ae6a46d0f 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -74,11 +74,12 @@ it "can create a valid video" do # Arrange video_hash = { + video: { title: "Alf the movie", overview: "The most early 90s movie of all time", release_date: "December 16th 2025", total_inventory: 6, - available_inventory: 6 + available_inventory: 6 } } # Assert @@ -92,14 +93,16 @@ it "will respond with bad request and errors for an invalid movie" do # Arrange video_hash = { + video: { title: "Alf the movie", overview: "The most early 90s movie of all time", release_date: "December 16th 2025", total_inventory: 6, available_inventory: 6 + } } - video_hash[:title] = nil + video_hash[:video][:title] = nil # Assert expect { From 16fc8eb0a466f48e38c71ca3ac9e399db7fdcf26 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Wed, 2 Dec 2020 11:34:20 -0800 Subject: [PATCH 10/23] related rentals to video --- db/migrate/20201202193112_relate_rental_to_video.rb | 5 +++++ db/schema.rb | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201202193112_relate_rental_to_video.rb diff --git a/db/migrate/20201202193112_relate_rental_to_video.rb b/db/migrate/20201202193112_relate_rental_to_video.rb new file mode 100644 index 000000000..b938c8ce8 --- /dev/null +++ b/db/migrate/20201202193112_relate_rental_to_video.rb @@ -0,0 +1,5 @@ +class RelateRentalToVideo < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :video, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index fc9963dce..266b3a6a5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_12_02_050525) do +ActiveRecord::Schema.define(version: 2020_12_02_193112) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,7 +33,9 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "customer_id" + t.bigint "video_id" t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" end create_table "videos", force: :cascade do |t| From 5627c9c74bd1b9dd6990fc0ba3b5cc5e80d668aa Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Wed, 2 Dec 2020 20:29:29 -0800 Subject: [PATCH 11/23] validation test for video title --- test/models/video_test.rb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..e7ceb5d5a 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,23 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + before do + @video = videos(:wonder_woman) + end + describe 'validations' do + it 'id valid when all fields are present' do + expect(@video.valid?).must_equal true + end + + it 'will be invalid without title' do + + @video.title = nil + + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :title + expect(@video.errors.messages[:title][0]).must_equal "can't be blank" + + end + end end From a7839bd1a03f1e35b9cb91710856688f76ef4923 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Wed, 2 Dec 2020 21:21:33 -0800 Subject: [PATCH 12/23] related video to rentals --- app/models/rental.rb | 1 + app/models/video.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 2569e47c1..0449e1916 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,3 +1,4 @@ class Rental < ApplicationRecord belongs_to :customer + belongs_to :video end diff --git a/app/models/video.rb b/app/models/video.rb index 144aba3ae..f54bbc40a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,4 @@ class Video < ApplicationRecord - + has_many :rentals validates :title, presence: true end From 57a1497a640e4caf2513a7c6a857124d498f3450 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Wed, 2 Dec 2020 23:37:42 -0800 Subject: [PATCH 13/23] starting checkout and some tests i should write --- app/controllers/rentals_controller.rb | 30 ++++++++++++++++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 38 ++++++++++++++++++--- test/models/customer_test.rb | 4 +++ test/models/rental_test.rb | 20 +++++++++-- 5 files changed, 87 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..f98e4a574 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,32 @@ class RentalsController < ApplicationController + + def checkout +# increase the customer's videos_checked_out_count by one +# decrease the video's available_inventory by one +# create a due date. The rental's due date is the seven days from the current date. + + rental = Rental.new(rental_params) + # this due date is wrong + rental.update(due_date: Time.now.strftime("%Y-%m-%d")) + if rental.save + rental.customer.videos_checked_out_count += 1 + rental.video.available_inventory -= 1 + render json: { + "customer_id": rental.customer_id, + "video_id": rental.video_id, + "due_date": rental.due_date, + "videos_checked_out_count": rental.customer.videos_checked_out_count, + "available_inventory": rental.video.available_inventory + }, status: :ok + # The API should return back detailed errors and a status 404: Not Found if the customer does not exist + # The API should return back detailed errors and a status 404: Not Found if the video does not exist + # The API should return back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out + end + end + + private + + def rental_params + params.permit(:customer_id, :video_id) + end end diff --git a/config/routes.rb b/config/routes.rb index 4147e2bd1..c6865b461 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,6 @@ resources :customers, only: [:index] + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..20ec540ce 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end + + before do + @simon = customers(:customer_one) + @wonder_woman = videos(:wonder_woman) + end + describe "checkout" do + it "can checkout" do + checkout_params = { + customer_id: @simon.id, + video_id: @wonder_woman.id + } + + expect {post checkout_path, params: checkout_params}.must_differ "Rental.count", 1 + + body = JSON.parse(response.body) + # check stuff in the body - customer/video ids are correct - customers video checked out + 1? and video available inventory - 1? + + must_respond_with :ok + end + + it "returns back detailed errors and a status 404: Not Found if the customer does not exist" do + skip + end + + it "returns back detailed errors and a status 404: Not Found if the video does not exist" do + skip + end + + it "returns back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do + skip + end + + end +end \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 9a915a83a..7ea66f1ba 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -11,5 +11,9 @@ @simon.name = nil expect(@simon.valid?).must_equal false end + + it "fails with an invalid name" do + skip + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..127954499 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,21 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + it "requires a customer id" do + skip + end + + it "fails with an invalid customer id" do + skip + end + + it "requires a video id" do + skip + end + + it "fails with an invalid video id" do + skip + end + end end From e83fd452688cc38721d9e1c0d5ca69c40ddfe155 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 3 Dec 2020 12:09:31 -0800 Subject: [PATCH 14/23] rental checkout controller tests passsing --- app/controllers/rentals_controller.rb | 34 ++++++------- app/models/customer.rb | 6 ++- app/models/video.rb | 9 ++++ test/controllers/rentals_controller_test.rb | 55 ++++++++++++++++++--- test/models/video_test.rb | 25 +++++++++- test/test_helper.rb | 8 +++ 6 files changed, 108 insertions(+), 29 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f98e4a574..d112a2ed5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,26 +1,22 @@ class RentalsController < ApplicationController def checkout -# increase the customer's videos_checked_out_count by one -# decrease the video's available_inventory by one -# create a due date. The rental's due date is the seven days from the current date. - rental = Rental.new(rental_params) - # this due date is wrong - rental.update(due_date: Time.now.strftime("%Y-%m-%d")) - if rental.save - rental.customer.videos_checked_out_count += 1 - rental.video.available_inventory -= 1 - render json: { - "customer_id": rental.customer_id, - "video_id": rental.video_id, - "due_date": rental.due_date, - "videos_checked_out_count": rental.customer.videos_checked_out_count, - "available_inventory": rental.video.available_inventory - }, status: :ok - # The API should return back detailed errors and a status 404: Not Found if the customer does not exist - # The API should return back detailed errors and a status 404: Not Found if the video does not exist - # The API should return back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out + rental.assign_attributes(due_date: (Time.now + 7.days).strftime("%Y-%m-%d")) + if rental.valid? && rental.customer.update_video_count + if rental.video.checkout + rental.save + rental_info = rental.as_json( + only: [:customer_id, :video_id, :due_date]).merge( + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + ) + render json: rental_info, status: :ok + else + render json: {ok: false, errors: rental.video.errors.messages}, status: :bad_request + end + else + render json: {ok: false, errors: rental.errors.messages}, status: :not_found end end diff --git a/app/models/customer.rb b/app/models/customer.rb index f1c5834cd..3a8d46d2f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,9 @@ class Customer < ApplicationRecord has_many :rentals - validates_presence_of :name + + def update_video_count + self.videos_checked_out_count += 1 + self.save + end end diff --git a/app/models/video.rb b/app/models/video.rb index f54bbc40a..925a51d87 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,13 @@ class Video < ApplicationRecord has_many :rentals validates :title, presence: true + validates :available_inventory, :numericality => { :greater_than_or_equal_to => 0 } + + def checkout + # if self.available_inventory >= 0 + self.available_inventory -= 1 + self.save + # end + end + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 20ec540ce..923741dfb 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,31 +6,70 @@ @simon = customers(:customer_one) @wonder_woman = videos(:wonder_woman) end + + let(:bad_customer_id){ + -99999 + } + + let(:bad_video_id){ + -99999 + } + describe "checkout" do it "can checkout" do checkout_params = { customer_id: @simon.id, video_id: @wonder_woman.id } + + expect(@simon.videos_checked_out_count).must_equal 3 + expect(@wonder_woman.available_inventory).must_equal 100 expect {post checkout_path, params: checkout_params}.must_differ "Rental.count", 1 - - body = JSON.parse(response.body) - # check stuff in the body - customer/video ids are correct - customers video checked out + 1? and video available inventory - 1? - - must_respond_with :ok + + body = check_response(expected_type: Hash, expected_status: :ok) + fields = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort + expect(body.keys.sort).must_equal fields + expect(body["customer_id"]).must_equal @simon.id + expect(body["video_id"]).must_equal @wonder_woman.id + expect(body["due_date"]).must_equal (Time.now + 7.days).strftime("%Y-%m-%d") + expect(body["videos_checked_out_count"]).must_equal 4 + expect(body["available_inventory"]).must_equal 99 end it "returns back detailed errors and a status 404: Not Found if the customer does not exist" do - skip + checkout_params = { + customer_id: bad_customer_id, + video_id: @wonder_woman.id + } + expect {post checkout_path, params: checkout_params}.wont_change "Rental.count" + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"].keys).must_include "customer" end it "returns back detailed errors and a status 404: Not Found if the video does not exist" do - skip + checkout_params = { + customer_id: @simon.id, + video_id: bad_video_id + } + expect {post checkout_path, params: checkout_params}.wont_change "Rental.count" + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"].keys).must_include "video" end it "returns back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do - skip + @wonder_woman.available_inventory = 0 + @wonder_woman.save + + checkout_params = { + customer_id: @simon.id, + video_id: @wonder_woman.id + } + expect(@wonder_woman.available_inventory).must_equal 0 + + expect {post checkout_path, params: checkout_params}.wont_change "Rental.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "available_inventory" end end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index e7ceb5d5a..8648f0b5e 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -11,7 +11,6 @@ end it 'will be invalid without title' do - @video.title = nil expect(@video.valid?).must_equal false @@ -20,4 +19,28 @@ end end + + it "will be valid with inventory equal to 0" do + @video.available_inventory = 0 + expect(@video.valid?).must_equal true + end + + it "will be valid with inventory less than 0" do + @video.available_inventory =-1 + expect(@video.valid?).must_equal false + end + + + describe "checkout" do + + it "will checkout if there is enough inventory" do + expect(@video.available_inventory).must_equal 100 + expect(@video.checkout).must_equal true + end + + it "wont checkout if there is not enough inventory" do + @video.available_inventory = 0 + expect(@video.checkout).must_equal false + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index b19af0d5b..9c00c8a49 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -18,4 +18,12 @@ class ActiveSupport::TestCase fixtures :all # Add more helper methods to be used by all tests here... + def check_response(expected_type:, expected_status:) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end end From e4792d3cc7cdf4d9da215de74ee4111147ce604c Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 3 Dec 2020 12:22:25 -0800 Subject: [PATCH 15/23] rental model tests --- app/models/rental.rb | 3 +++ test/fixtures/rentals.yml | 3 +++ test/models/customer_test.rb | 10 +++++----- test/models/rental_test.rb | 22 +++++++++++++--------- 4 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/app/models/rental.rb b/app/models/rental.rb index 0449e1916..2e5d7d21b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +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/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..57d62a98e --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,3 @@ +rental_one: + customer: customer_one + video: wonder_woman \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7ea66f1ba..c69b544e2 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -7,13 +7,13 @@ end describe "validations" do - it "requires a name" do - @simon.name = nil - expect(@simon.valid?).must_equal false + it 'id valid when all fields are present' do + expect(@simon.valid?).must_equal true end - it "fails with an invalid name" do - skip + it "fails without a name" do + @simon.name = nil + expect(@simon.valid?).must_equal false end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 127954499..707b5c8c6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,21 +1,25 @@ require "test_helper" describe Rental do + + before do + @rental = rentals(:rental_one) + end + describe "validations" do - it "requires a customer id" do - skip - end - it "fails with an invalid customer id" do - skip + it 'id valid when all fields are present' do + expect(@rental.valid?).must_equal true end - it "requires a video id" do - skip + it "requires a customer id" do + @rental.customer_id = nil + expect(@rental.valid?).must_equal false end - it "fails with an invalid video id" do - skip + it "requires a video id" do + @rental.video_id = nil + expect(@rental.valid?).must_equal false end end end From fa5e1d434b3a2f6e98cc36897e06bd1468ff44a9 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 3 Dec 2020 12:38:37 -0800 Subject: [PATCH 16/23] remove comments --- app/models/video.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/video.rb b/app/models/video.rb index 925a51d87..13b240551 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -4,10 +4,8 @@ class Video < ApplicationRecord validates :available_inventory, :numericality => { :greater_than_or_equal_to => 0 } def checkout - # if self.available_inventory >= 0 self.available_inventory -= 1 self.save - # end end end From 5e9eebab3686a19e000349a000391e6091309374 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 3 Dec 2020 12:56:54 -0800 Subject: [PATCH 17/23] change json format when not found --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d112a2ed5..84688b974 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -16,7 +16,7 @@ def checkout render json: {ok: false, errors: rental.video.errors.messages}, status: :bad_request end else - render json: {ok: false, errors: rental.errors.messages}, status: :not_found + render json: {errors: ['Not found']}, status: :not_found end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 923741dfb..16ecc867c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -44,7 +44,7 @@ } expect {post checkout_path, params: checkout_params}.wont_change "Rental.count" body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"].keys).must_include "customer" + expect(body["errors"]).must_include "Not found" end it "returns back detailed errors and a status 404: Not Found if the video does not exist" do @@ -54,7 +54,7 @@ } expect {post checkout_path, params: checkout_params}.wont_change "Rental.count" body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"].keys).must_include "video" + expect(body["errors"]).must_include "Not found" end it "returns back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do From 0a738a00f73a532fa0ebbe454825754c80587236 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 3 Dec 2020 13:08:15 -0800 Subject: [PATCH 18/23] capitalize the f in found --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 84688b974..4868c6705 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -16,7 +16,7 @@ def checkout render json: {ok: false, errors: rental.video.errors.messages}, status: :bad_request end else - render json: {errors: ['Not found']}, status: :not_found + render json: {errors: ['Not Found']}, status: :not_found end end From 01bc05b6c4a65e0b86a17888c305ec6ea476f821 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 3 Dec 2020 13:14:08 -0800 Subject: [PATCH 19/23] capitalize f in found in tests too --- test/controllers/rentals_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 16ecc867c..73b1a8832 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -44,7 +44,7 @@ } expect {post checkout_path, params: checkout_params}.wont_change "Rental.count" body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"]).must_include "Not found" + expect(body["errors"]).must_include "Not Found" end it "returns back detailed errors and a status 404: Not Found if the video does not exist" do @@ -54,7 +54,7 @@ } expect {post checkout_path, params: checkout_params}.wont_change "Rental.count" body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["errors"]).must_include "Not found" + expect(body["errors"]).must_include "Not Found" end it "returns back detailed errors and a status 400: Bad Request if the video does not have any available inventory before check out" do From 084391eafbd57d5fd386ebc3e26d3b1b11e026a0 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Thu, 3 Dec 2020 17:07:19 -0800 Subject: [PATCH 20/23] customers is now ordered by id --- 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 3b5b2b352..99fdd39f3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, + customers = Customer.all.order(:id).as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) render json: customers, status: :ok end From 62157fd12fa0232c9fd48fb0e017272a41bee798 Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Thu, 3 Dec 2020 17:07:52 -0800 Subject: [PATCH 21/23] decrease_videos_checked_out --- app/models/customer.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 3a8d46d2f..cf44d0bbb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,9 @@ def update_video_count self.videos_checked_out_count += 1 self.save end + + def decrease_video_count + self.videos_checked_out_count -= 1 + self.save + end end From 082f47b6037a858141f2d17ed337407506ec67dc Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Thu, 3 Dec 2020 17:08:36 -0800 Subject: [PATCH 22/23] configured checkin capability and respective tests --- app/controllers/rentals_controller.rb | 26 ++++++++++++++++ app/controllers/videos_controller.rb | 2 +- app/models/video.rb | 4 +++ config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 33 +++++++++++++++++++++ 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4868c6705..a0b6f0875 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -20,6 +20,32 @@ def checkout end end + def checkin + + rental = Rental.find_by(rental_params) + + video = Video.find_by(id: params[:video_id]) + + customer = Customer.find_by(id: params[:customer_id]) + + render json: {errors: ['Not Found']}, status: :not_found and return if customer.nil? || video.nil? || rental.nil? + + render json: {ok: false, errors: customer.errors.messages}, status: :bad_request and return unless customer.decrease_video_count + + render json: {ok: false, errors: video.errors.messages}, status: :bad_request and return unless video.checkin + + rental_info = { + customer_id: customer.id, + video_id: video.id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + } + + rental.destroy + + render json: rental_info, status: :ok + end + private def rental_params diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index b75c4b9da..37274a48d 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -21,7 +21,7 @@ def create private def video_params - params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/app/models/video.rb b/app/models/video.rb index 13b240551..86ef6a7d5 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -8,4 +8,8 @@ def checkout self.save end + def checkin + self.available_inventory += 1 + self.save + end end diff --git a/config/routes.rb b/config/routes.rb index c6865b461..c37f11a1d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,5 +6,6 @@ resources :customers, only: [:index] post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 73b1a8832..0b0f650c1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -73,4 +73,37 @@ end end + + describe 'checkin' do + + before do + @checkout_params = { + customer_id: @simon.id, + video_id: @wonder_woman.id + } + + end + + it 'can checkin' do + expect {post checkout_path, params: @checkout_params}.must_differ "Rental.count", 1 + must_respond_with :success + + before_count_vid = @simon.reload.videos_checked_out_count + before_count_inv = @wonder_woman.reload.available_inventory + + deleted_rental_id = Rental.find_by(customer_id: @checkout_params[:customer_id], video_id: @checkout_params[:video_id]).id + + expect {post checkin_path, params: @checkout_params}.must_differ "Rental.count", -1 + + assert_nil(Rental.find_by(id: deleted_rental_id )) + + body = check_response(expected_type: Hash, expected_status: :ok) + + expect(body["customer_id"]).must_equal @simon.id + expect(body["video_id"]).must_equal @wonder_woman.id + expect(body["videos_checked_out_count"]).must_equal before_count_vid - 1 + expect(body["available_inventory"]).must_equal before_count_inv + 1 + + end + end end \ No newline at end of file From 4093c4630b7f333078ae484f885cd9f24ff59ebc Mon Sep 17 00:00:00 2001 From: Iris Lux Date: Thu, 3 Dec 2020 17:13:03 -0800 Subject: [PATCH 23/23] removed key from create tests --- test/controllers/videos_controller_test.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index ae6a46d0f..040f229fe 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -74,12 +74,12 @@ it "can create a valid video" do # Arrange video_hash = { - video: { + title: "Alf the movie", overview: "The most early 90s movie of all time", release_date: "December 16th 2025", total_inventory: 6, - available_inventory: 6 } + available_inventory: 6 } # Assert @@ -93,16 +93,14 @@ it "will respond with bad request and errors for an invalid movie" do # Arrange video_hash = { - video: { title: "Alf the movie", overview: "The most early 90s movie of all time", release_date: "December 16th 2025", total_inventory: 6, available_inventory: 6 - } } - video_hash[:video][:title] = nil + video_hash[:title] = nil # Assert expect {