From 4cc0721a4cd58299766fd4ab71fe0efe7a8a0135 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 14:38:00 -0700 Subject: [PATCH 01/48] rails new initialization files --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 60 files changed, 1124 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..d7edb5686 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..41b7d4311 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..43301a817 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..b078af21e --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +IiyRZSfwnQ56aqtl6eS6eSHPxw4AtLXCIgkIrx/Xzt48ROzyv+RyAkl9r5JNOrmkNw/v74DEY1PK1r0deu45phBe1VxEcvQdLasxhK0BjJbZIWQwS7+NP8Z8lf1ryeh63JHWZhqmC0HEkpcWOXoBEUxraCT8dLJhYWOJ8bL8mPyvWxPT2tF0OP8bqQWERhm7OHR9HvlQrHKtnoqvrQvW0Pkr5zgmWFVZVkcMlanprJdB28HwI0iunq6nRg/lTjv3sNgYMKJVqq0mN6e9sXU0c1Pyxq3lP4VCMjVzU9el04eJkAhRbKoc6LymwqpC3PwLBaMUzlMNF4lyRUtU/FhGjUoaiffluNok0PvfDvTQOYLV6SwcHhreY+uYlE0XYmoO/r1N+r0/JSZCH5FuysbZe/AvFw91i23GJkO/--sUun2+YtmHIFsNoQ--0w66rApf6gI9Nuwx0juhVg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b10373ba6 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 361ee00f34970d42e644b3c5d4beb872b75507f3 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 14:42:09 -0700 Subject: [PATCH 02/48] create Customer model --- app/models/customer.rb | 2 ++ db/migrate/20200526214036_create_customers.rb | 14 ++++++++++++++ test/models/customer_test.rb | 7 +++++++ 3 files changed, 23 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20200526214036_create_customers.rb create mode 100644 test/models/customer_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/db/migrate/20200526214036_create_customers.rb b/db/migrate/20200526214036_create_customers.rb new file mode 100644 index 000000000..5f74d7bc5 --- /dev/null +++ b/db/migrate/20200526214036_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From b1d7614c8f6db7931b261a093cb8d6f8b30c0bc0 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 14:44:23 -0700 Subject: [PATCH 03/48] added index route --- app/controllers/customers_controller.rb | 5 +++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 9 +++++++++ 3 files changed, 16 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..aa8c17037 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,5 @@ +class CustomersController < ApplicationController + def index + + end +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..fd25a505a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do + # get 'customers/index' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :customers, only: [:index, :show] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..20069eb1a --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "must get index" do + get customers_index_url + must_respond_with :success + end + +end From 9f4d58e8779c527462fe00970264c2e5be3b6697 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:19:11 -0700 Subject: [PATCH 04/48] index action: customer.all and render json with all --- app/controllers/customers_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index aa8c17037..25dab62d2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,7 @@ class CustomersController < ApplicationController def index - + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at]), + status: :ok end end From 45646103473293a03c1730ff0621340fc8dd0686 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:19:45 -0700 Subject: [PATCH 05/48] initial routing [index,show] for customers. --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index fd25a505a..aa9276230 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,5 @@ # get 'customers/index' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] + end From eca3da7e28b017f1260fba57d9d4df750ed718e2 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:20:03 -0700 Subject: [PATCH 06/48] create schema for customers table --- db/schema.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..156a1215a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,21 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2020_05_26_220714) 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.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 + t.string "registered_at" + end + end From 1d6b9c33bb4a2fe7a484ea4dfe95a58457c4b301 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:20:39 -0700 Subject: [PATCH 07/48] add registered_at column to the schema --- db/migrate/20200526220714_add_registered_at_to_customers.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20200526220714_add_registered_at_to_customers.rb diff --git a/db/migrate/20200526220714_add_registered_at_to_customers.rb b/db/migrate/20200526220714_add_registered_at_to_customers.rb new file mode 100644 index 000000000..2daf4719a --- /dev/null +++ b/db/migrate/20200526220714_add_registered_at_to_customers.rb @@ -0,0 +1,5 @@ +class AddRegisteredAtToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :registered_at, :string + end +end From fc8f1ed883b12b735b877016f74259d05fcc0544 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:21:12 -0700 Subject: [PATCH 08/48] first test for must get index as a json response --- test/controllers/customers_controller_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 20069eb1a..7982b8318 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,8 +2,12 @@ describe CustomersController do it "must get index" do - get customers_index_url + # get customers_index_url + # must_respond_with :success + + get customers_path must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" end end From ff35844c4228626ed840b55fe3ba037d591d5bca Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:34:29 -0700 Subject: [PATCH 09/48] crerate videos controller --- app/controllers/videos_controller.rb | 4 ++++ test/controllers/videos_controller_test.rb | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..a926cb65d --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,4 @@ +class VideosController < ApplicationController + def index + end +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..6a451452f --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe VideosController do + it "must get index" do + get videos_index_url + must_respond_with :success + end + +end From 301db872363b963682f66f4080da9a67c4a0ed0d Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:34:53 -0700 Subject: [PATCH 10/48] create the videos table --- db/schema.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 156a1215a..4c831b5ce 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_220714) do +ActiveRecord::Schema.define(version: 2020_05_26_222958) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,4 +27,14 @@ t.string "registered_at" end + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "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 From 7e2cb824a14bb06c430803ee3352317206b78e03 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:35:15 -0700 Subject: [PATCH 11/48] create videos migration schema --- db/migrate/20200526222958_create_videos.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 db/migrate/20200526222958_create_videos.rb diff --git a/db/migrate/20200526222958_create_videos.rb b/db/migrate/20200526222958_create_videos.rb new file mode 100644 index 000000000..282e7354c --- /dev/null +++ b/db/migrate/20200526222958_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.string :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end From 939486333670e05eb4b81f4e0863662149ba71c6 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:35:30 -0700 Subject: [PATCH 12/48] create model video --- app/models/video.rb | 2 ++ test/models/video_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/models/video.rb create mode 100644 test/models/video_test.rb 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/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 87bab45eab0e5284dacd8352d63251810c3ebf89 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 15:35:43 -0700 Subject: [PATCH 13/48] get rid of comments --- test/controllers/customers_controller_test.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7982b8318..ad2ccba35 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,8 +2,6 @@ describe CustomersController do it "must get index" do - # get customers_index_url - # must_respond_with :success get customers_path must_respond_with :success From 0988211319c5e8fbdf1140e6acb29cabec84913c Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 16:02:09 -0700 Subject: [PATCH 14/48] index actions for videos controller --- app/controllers/videos_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index a926cb65d..e2cc26b97 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,4 +1,7 @@ class VideosController < ApplicationController def index + videos = Video.all + render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), + status: :ok end end From ba533a8465754f2477063b8bc19fea6bed268876 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 16:02:43 -0700 Subject: [PATCH 15/48] routes for videos and customers --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index aa9276230..0f921841f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,9 @@ Rails.application.routes.draw do + # get 'videos/index' + # get 'video/index' # get 'customers/index' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] + resources :videos, only: [:index, :show] end From 19de99d4e7ff9f039e025091a5acce80c220f35d Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 16:22:36 -0700 Subject: [PATCH 16/48] add test index and show actions --- test/controllers/customers_controller_test.rb | 62 ++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ad2ccba35..2a0c44352 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,11 +1,71 @@ require "test_helper" describe CustomersController do - it "must get index" do + CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"] + it "must get index" do get customers_path must_respond_with :success expect(response.header["Content-Type"]).must_include "json" end + it "responds with JSON and success" do + get customers_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :ok + end + + it "will return all proper field for all of customers " do + # Act + get customers_path + + # getting the body. JSON.parse: command take that json turn into a ruby array or hash. + body = JSON.parse(response.body) + #Assert + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "returns an empty array if not customers exist" do + Customer.destroy_all + # Act + get customers_path + + # getting the body. JSON.parse: command take that json turn into a ruby array or hash. + body = JSON.parse(response.body) + #Assert + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end + + describe "show" do + #Nominal case + it "will return a hash with the proper fields for an existing customer" do + customer = customers(:customer_1) + + get customers_path(customer.id) + #act + must_respond_with :success + + body = JSON.parse(response.body) + + expect(response.header["Content-Type"]).must_include "json" + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal CUSTOMER_FIELDS + end + + it "will return a 404 request with json for a non-existent customer" do + get customer_path(-1) + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["ok"]).must_equal false + expect(body["message"]).must_equal "Not found" + end + end end From e6839e81b36fe738d5c859282a3253157dd6eefd Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 16:22:46 -0700 Subject: [PATCH 17/48] add test for video index action --- test/controllers/videos_controller_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 6a451452f..5550994cc 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,8 +2,9 @@ describe VideosController do it "must get index" do - get videos_index_url - must_respond_with :success + get videos_path + must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" end end From 6612d4dcd41058e4b5a98e49e1d37084a48406df Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 16:23:05 -0700 Subject: [PATCH 18/48] add yml file to use it within the tests. --- test/fixtures/customers.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 test/fixtures/customers.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..00a455534 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,16 @@ +customer_1: + name: "Shelley Rocha" + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700" + address: "Ap #292-5216 Ipsum Rd." + city: "Hillsboro" + state: "OR" + postal_code: "24309" + phone: "(322) 510-8695" +customer_2: + name: "Curran Stout" + registered_at: "Wed, 16 Apr 2014 21:40:20 -0700" + address: "Ap 658-1540 Erat Rd." + city: "San Francisco" + state: "California" + postal_code: "94267" + phone: "(908) 949-6758" \ No newline at end of file From 8a359ae0e3b7b75c21acdddc6dd44bbbbf6c0592 Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Tue, 26 May 2020 18:19:33 -0700 Subject: [PATCH 19/48] added in show action for video --- app/controllers/customers_controller.rb | 2 +- app/controllers/videos_controller.rb | 26 +++++++++++++++++++++++++ app/models/customer.rb | 1 + config/routes.rb | 2 +- db/seeds.rb | 2 +- 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 25dab62d2..1df258dfa 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 - render json: customers.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at]), + render json: customers.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :videos_checked_out_count]), status: :ok end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index e2cc26b97..22b94e954 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -4,4 +4,30 @@ def index render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end + + def show + video = Video.find_by(id: params[:id]) + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), + status: :ok + end + + def create + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + errors: video.errors.messages + }, status: :bad_request + return + end + end + + private + def video_params + return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d8b2e88e7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + end diff --git a/config/routes.rb b/config/routes.rb index 0f921841f..20fc58ebd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,6 @@ # get 'customers/index' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] - resources :videos, only: [:index, :show] + resources :videos, only: [:index, :show, :create, :new] end diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..04d569b8b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 + # customer['videos_checked_out_count'] = 0 Customer.create!(customer) end From ef3575ba922fedc85f8a992f55ca8af956421184 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 18:47:33 -0700 Subject: [PATCH 20/48] Sort the fields to test --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2a0c44352..3a73819d2 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"] + CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort it "must get index" do get customers_path From 4f0d0cfc441d34653b8ff1c7cd9bf83158bbd325 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 18:48:04 -0700 Subject: [PATCH 21/48] check if the video is nil return not_found --- app/controllers/videos_controller.rb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 22b94e954..f123f318f 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -2,13 +2,24 @@ class VideosController < ApplicationController def index videos = Video.all render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), - status: :ok + status: :ok end + def show video = Video.find_by(id: params[:id]) + + if video.nil? + render json: { + ok: false, + message: "Not found", + }, status: :not_found + + return + end + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), - status: :ok + status: :ok end def create @@ -20,13 +31,14 @@ def create else render json: { ok: false, - errors: video.errors.messages + errors: video.errors.messages, }, status: :bad_request - return + return end end private + def video_params return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end From 9a84a739b678b3d74fcb3315ff6d1761dc404a1c Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 18:48:21 -0700 Subject: [PATCH 22/48] test index and show actions --- test/controllers/videos_controller_test.rb | 68 +++++++++++++++++++++- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5550994cc..c7b7b538d 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,10 +1,72 @@ require "test_helper" describe VideosController do + VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + it "must get index" do - get videos_path - must_respond_with :success - expect(response.header["Content-Type"]).must_include "json" + get videos_path + must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" + end + + it "responds with JSON and success" do + get videos_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :ok + end + + it "will return all proper field for all of videos " do + # Act + get videos_path + + # getting the body. JSON.parse: command take that json turn into a ruby array or hash. + body = JSON.parse(response.body) + #Assert + expect(body).must_be_instance_of Array + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end + + it "returns an empty array if not customers exist" do + Video.destroy_all + # Act + get videos_path + + # getting the body. JSON.parse: command take that json turn into a ruby array or hash. + body = JSON.parse(response.body) + #Assert + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 end + describe "show" do + #Nominal case + it "will return a hash with the proper fields for an existing video" do + video = videos(:video_1) + + get video_path(video.id) + #act + must_respond_with :success + + body = JSON.parse(response.body) + + expect(response.header["Content-Type"]).must_include "json" + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal VIDEO_FIELDS + end + + it "will return a 404 request with json for a non-existent video" do + get video_path(-1) + must_respond_with :not_found + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + expect(body["ok"]).must_equal false + expect(body["message"]).must_equal "Not found" + end + end end From 41c4790b2c8a10b560acb0fbab99975e5c443050 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 18:48:37 -0700 Subject: [PATCH 23/48] create videos yml file --- test/fixtures/videos.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test/fixtures/videos.yml diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..f0336997d --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,6 @@ +video_1: + title: "Blacksmith Of The Banished" + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life." + release_date: "1979-01-18" + total_inventory: 10 + available_inventory: 9 \ No newline at end of file From f3e786e0384e8ececee356d6d1ea243d2d838172 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 19:16:08 -0700 Subject: [PATCH 24/48] customer relationships has_mamy rentals and videos --- app/models/customer.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d8b2e88e7..cc7c3b425 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,12 @@ class Customer < ApplicationRecord - + # validates :name, presence: true + # validates :registered_at, presence: true + # validates :address, presence: true + # validates :city, presence: true + # validates :state, presence: true + # validates :postal_code, presence: true + # validates :phone, presence: true + + has_many :rentals, dependent: :nullify + has_many :videos, through: :rentals end From dbb17e23aad80526b1f81682a77530782418a5f2 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 19:16:21 -0700 Subject: [PATCH 25/48] rental belongs to video and customer --- app/models/rental.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 app/models/rental.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..40e967de5 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,8 @@ +class Rental < ApplicationRecord + # validates :check_out_date, presence: true + # validates :due_date, presence: true + + belongs_to :video + belongs_to :customer + +end From e45dd4f57cd9bb9baff7878b7e058fea0bf3b37f Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 19:16:44 -0700 Subject: [PATCH 26/48] video has_many rentals and customers --- app/models/video.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..4a933d28d 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,9 @@ class Video < ApplicationRecord + # validates :title, presence: true + # validates :overview, presence: true + # validates :release_date, presence: true + + + has_many :rentals, dependent: :nullify + has_many :customers, through: :rentals end From 5683216bd7362f3dbb16244aa0e4ae23d87aecef Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 19:17:04 -0700 Subject: [PATCH 27/48] create the reference customers and videos --- db/schema.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 4c831b5ce..a48bbd9ba 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_222958) do +ActiveRecord::Schema.define(version: 2020_05_27_021222) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,19 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.string "registered_at" + t.integer "movies_checked_out_count", default: 0 + end + + create_table "rentals", force: :cascade do |t| + t.date "check_in_date" + t.date "check_out_date" + t.date "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "video_id" + t.bigint "customer_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 0a9e6ea53ad38c2b24f29fea1e35a87ae2e43cd8 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 19:17:20 -0700 Subject: [PATCH 28/48] All the migrations --- ...15059_add_movies_checked_out_count_to_customers.rb | 5 +++++ db/migrate/20200527020002_create_rentals.rb | 11 +++++++++++ db/migrate/20200527021216_relate_rentals_to_videos.rb | 5 +++++ .../20200527021222_relate_rentals_to_customers.rb | 5 +++++ 4 files changed, 26 insertions(+) create mode 100644 db/migrate/20200527015059_add_movies_checked_out_count_to_customers.rb create mode 100644 db/migrate/20200527020002_create_rentals.rb create mode 100644 db/migrate/20200527021216_relate_rentals_to_videos.rb create mode 100644 db/migrate/20200527021222_relate_rentals_to_customers.rb diff --git a/db/migrate/20200527015059_add_movies_checked_out_count_to_customers.rb b/db/migrate/20200527015059_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..3b3452255 --- /dev/null +++ b/db/migrate/20200527015059_add_movies_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/migrate/20200527020002_create_rentals.rb b/db/migrate/20200527020002_create_rentals.rb new file mode 100644 index 000000000..2bf0f7687 --- /dev/null +++ b/db/migrate/20200527020002_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.date :check_in_date + t.date :check_out_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20200527021216_relate_rentals_to_videos.rb b/db/migrate/20200527021216_relate_rentals_to_videos.rb new file mode 100644 index 000000000..90f30c19e --- /dev/null +++ b/db/migrate/20200527021216_relate_rentals_to_videos.rb @@ -0,0 +1,5 @@ +class RelateRentalsToVideos < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :video, index: true + end +end diff --git a/db/migrate/20200527021222_relate_rentals_to_customers.rb b/db/migrate/20200527021222_relate_rentals_to_customers.rb new file mode 100644 index 000000000..2af652c79 --- /dev/null +++ b/db/migrate/20200527021222_relate_rentals_to_customers.rb @@ -0,0 +1,5 @@ +class RelateRentalsToCustomers < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, index: true + end +end From fd61eaa56cde443392359ee1f7e78f42bacfdef4 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 19:17:28 -0700 Subject: [PATCH 29/48] model test --- test/models/rental_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 test/models/rental_test.rb diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 437e69fc4ff4118128d7b3326ec06c9ea8e910b1 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:29:24 -0700 Subject: [PATCH 30/48] migration change name --- .../20200527041418_change_movies_checked_out_count_name.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20200527041418_change_movies_checked_out_count_name.rb diff --git a/db/migrate/20200527041418_change_movies_checked_out_count_name.rb b/db/migrate/20200527041418_change_movies_checked_out_count_name.rb new file mode 100644 index 000000000..e999366ff --- /dev/null +++ b/db/migrate/20200527041418_change_movies_checked_out_count_name.rb @@ -0,0 +1,6 @@ +class ChangeMoviesCheckedOutCountName < ActiveRecord::Migration[6.0] + def change + remove_column :customers, :movies_checked_out_count + add_column :customers, :videos_checked_out_count, :integer, default: 0 + end +end From 19cdd876f742ed30ba1df136f176e91ced7d6961 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:42:23 -0700 Subject: [PATCH 31/48] show customer action --- app/controllers/customers_controller.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1df258dfa..5f20b1ad3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,22 @@ class CustomersController < ApplicationController def index customers = Customer.all render json: customers.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :videos_checked_out_count]), - status: :ok + status: :ok + end + + def show + customer = Customer.find_by(id: params[:id]) + + if customer.nil? + render json: { + ok: false, + message: "Not found", + }, status: :not_found + + return + end + + render json: customer.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :videos_checked_out_count]), + status: :ok end end From 0737ba57335536f6c4e3fbda7f105d42e27b1374 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:42:40 -0700 Subject: [PATCH 32/48] create new method to check_out --- app/controllers/rentals_controller.rb | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 app/controllers/rentals_controller.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..e4c702c0b --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,37 @@ +class RentalsController < ApplicationController + + def check_out + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + + if video + video = video.available + end + + + if video && customer + rental = Rental.new(customer_id: customer.id, video_id: video.id) + rental.check_out_date = Date.today + rental.due_date = Date.today + 7 + + if rental.save + video.decrease_inventory + customer.add_to_checked_out + render json: rental.as_json(only: [:id, :due_date, :customer_id]), status: :ok + return + else + render json: { + ok: false, + errors: rental.errors.messages, + }, status: :bad_request + return + end + else + render json: { + ok: false, + errors: "Unable to create rental", + }, status: :bad_request + return + end + end +end From 0ed7c89b247427fae0ff8f6196faa7055d3ab7cc Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:43:05 -0700 Subject: [PATCH 33/48] check out method to increment the checkout count --- app/models/customer.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index cc7c3b425..98ee1871d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,4 +9,10 @@ class Customer < ApplicationRecord has_many :rentals, dependent: :nullify has_many :videos, through: :rentals + + def add_to_checked_out + self.videos_checked_out_count += 1 + self.save + end + end From 974f0c7d1a5564d702f0a071ce1bc464b41f8662 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:43:21 -0700 Subject: [PATCH 34/48] decrease, increase and available methods --- app/models/video.rb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/app/models/video.rb b/app/models/video.rb index 4a933d28d..08eeb9aea 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -3,7 +3,24 @@ class Video < ApplicationRecord # validates :overview, presence: true # validates :release_date, presence: true - has_many :rentals, dependent: :nullify has_many :customers, through: :rentals + + def decrease_inventory + self.available_inventory -= 1 + self.save + end + + def increase_inventory + self.available_inventory += 1 + self.save + end + + def available + if self.available_inventory == 0 + return nil + end + return self + end + end From 7f2231db2fcb76b13314b96a5820232ef006cbf8 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:43:37 -0700 Subject: [PATCH 35/48] add routes: check-in and check-out --- config/routes.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 20fc58ebd..5b183b340 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,8 @@ Rails.application.routes.draw do - # get 'videos/index' - # get 'video/index' - # get 'customers/index' - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] - resources :videos, only: [:index, :show, :create, :new] - + resources :videos, only: [:index, :show, :create, :new] + + post "/rentals/check-out", to: "rentals#check_out", as: "check_out" + post "/rentals/check-in", to: "rentals#check_in", as: "check_in" + end From c2c59ce3d19b4403f5a1798c66d36f804b26ae78 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:43:49 -0700 Subject: [PATCH 36/48] update schema with videos_checked_out_count --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index a48bbd9ba..b774f7ec2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_27_021222) do +ActiveRecord::Schema.define(version: 2020_05_27_041418) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,7 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.string "registered_at" - t.integer "movies_checked_out_count", default: 0 + t.integer "videos_checked_out_count", default: 0 end create_table "rentals", force: :cascade do |t| From 69ccfc89ae7e9d3331c99a8fb75bd82ae8d5a4b2 Mon Sep 17 00:00:00 2001 From: Vera Date: Tue, 26 May 2020 21:43:59 -0700 Subject: [PATCH 37/48] test rentals controllers --- test/controllers/rentals_controller_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 test/controllers/rentals_controller_test.rb 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 64c5674d5adbec378dc64499821d2636fc8d6204 Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 02:01:25 -0700 Subject: [PATCH 38/48] updated to allow for check-in --- app/controllers/rentals_controller.rb | 43 +++++++++++++++++++++++++++ app/models/customer.rb | 5 ++++ config/routes.rb | 2 ++ 3 files changed, 50 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e4c702c0b..1a6b8f222 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,4 +1,9 @@ class RentalsController < ApplicationController + def index + rentals = Rental.all + render json: rentals.as_json(), + status: :ok + end def check_out customer = Customer.find_by(id: params[:customer_id]) @@ -34,4 +39,42 @@ def check_out return end end + + def check_in + rental = Rental.find_by(customer_id: params[:customer_id],video_id: params[:video_id], check_in_date: nil) + + if rental.nil? + render json: { + ok: false, + errors: "Rental not found", + }, status: :bad_request + return + end + + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + + rental.check_in_date = Date.today + + if rental.save + video.increase_inventory + customer.remove_checked_out + render json: {customer_id: rental.customer_id, + video_id: rental.video_id, videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory}, status: :ok + return + else + render json: { + ok: false, + errors: rental.errors.messages, + }, status: :bad_request + return + end + end + + private + + def check_in_params + return params.require(:rental).permit(:customer_id, :video_id) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 98ee1871d..aa236f6a8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -15,4 +15,9 @@ def add_to_checked_out self.save end + def remove_checked_out + self.videos_checked_out_count -= 1 + self.save + end + end diff --git a/config/routes.rb b/config/routes.rb index 5b183b340..0d764719c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,8 @@ resources :customers, only: [:index, :show] resources :videos, only: [:index, :show, :create, :new] + resources :rentals, only: [:index] + post "/rentals/check-out", to: "rentals#check_out", as: "check_out" post "/rentals/check-in", to: "rentals#check_in", as: "check_in" From da724801a7578833c9aeb4887ce3d97fadf80c63 Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 02:02:59 -0700 Subject: [PATCH 39/48] updated so that available inventory and videos check out return as json --- app/controllers/rentals_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1a6b8f222..058e22bb0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -22,7 +22,11 @@ def check_out if rental.save video.decrease_inventory customer.add_to_checked_out - render json: rental.as_json(only: [:id, :due_date, :customer_id]), status: :ok + render json: {customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory}, status: :ok return else render json: { From 880f15c2a1573fe882a1104fcf9e31dd59d32ee6 Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 04:34:32 -0700 Subject: [PATCH 40/48] added in initial check out tests --- app/controllers/rentals_controller.rb | 5 +- test/controllers/rentals_controller_test.rb | 94 ++++++++++++++++++++- 2 files changed, 94 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 058e22bb0..31c12cb63 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,3 +1,4 @@ +require 'pry' class RentalsController < ApplicationController def index rentals = Rental.all @@ -13,13 +14,13 @@ def check_out video = video.available end - if video && customer rental = Rental.new(customer_id: customer.id, video_id: video.id) rental.check_out_date = Date.today rental.due_date = Date.today + 7 if rental.save + video.decrease_inventory customer.add_to_checked_out render json: {customer_id: rental.customer_id, @@ -39,7 +40,7 @@ def check_out render json: { ok: false, errors: "Unable to create rental", - }, status: :bad_request + }, status: :not_found return end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..269828047 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,95 @@ require "test_helper" +require "pry" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + RENTAL_FIELDS = ["id","check_in_date","check_out_date","due_date","video_id","customer_id"].sort + + it "must get index" do + get rentals_path + must_respond_with :success + expect(response.header["Content-Type"]).must_include "json" + end + + it "responds with JSON and success" do + get rentals_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :ok + end + + it "will return all proper field for all of rentals " do + # Act + get rentals_path + + # getting the body. JSON.parse: command take that json turn into a ruby array or hash. + body = JSON.parse(response.body) + #Assert + expect(body).must_be_instance_of Array + body.each do |rental| + expect(rental).must_be_instance_of Hash + expect(rental.keys.sort).must_equal RENTAL_FIELDS + end + end + + it "returns an empty array if not rentals exist" do + Rental.destroy_all + # Act + get rentals_path + + # getting the body. JSON.parse: command take that json turn into a ruby array or hash. + body = JSON.parse(response.body) + #Assert + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end + end + + describe "check out" do + let(:rental_data) { + { + video_id: videos(:video_1).id, + customer_id: customers(:customer_1).id + } + } + + it "can allow check out" do + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 1 + + must_respond_with :success + end + + it "prevents checkout if customer does not exist" do + rental_data[:customer_id] = nil + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :not_found + end + + it "prevents checkout if video does not exist" do + rental_data[:video_id] = nil + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :not_found + end + + # it "prevents checkout if video does not exist" do + # videos(:video_1).available_inventory = 0 + # binding.pry + # expect { + # post check_out_path, params: rental_data + # }.must_differ "Rental.count", 0 + # # binding.pry + # must_respond_with :bad_request + # end + end + end From 0cb1ca10f8c136520eae69def1e91fcf5d79642e Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 04:34:39 -0700 Subject: [PATCH 41/48] fixed customer test --- test/controllers/customers_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 3a73819d2..08f510b6b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone"].sort + CUSTOMER_FIELDS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone", "videos_checked_out_count"].sort it "must get index" do get customers_path @@ -51,7 +51,7 @@ #act must_respond_with :success - body = JSON.parse(response.body) + body = JSON.parse(response.body)[0] expect(response.header["Content-Type"]).must_include "json" From 26d0d1e6433e8c267fc7e7c27a3ca1a90faf9058 Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 04:53:45 -0700 Subject: [PATCH 42/48] created checkout test for if video is not available; updated model logic to check if video is available --- app/controllers/rentals_controller.rb | 54 +++++++++++---------- app/models/video.rb | 5 +- test/controllers/rentals_controller_test.rb | 18 +++---- test/fixtures/videos.yml | 8 ++- 4 files changed, 46 insertions(+), 39 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 31c12cb63..3afef7631 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,38 +9,42 @@ def index def check_out customer = Customer.find_by(id: params[:customer_id]) video = Video.find_by(id: params[:video_id]) + + if video.nil? || customer.nil? + render json: { + ok: false, + errors: "Unable to create rental", + }, status: :not_found + return + end - if video - video = video.available + if !video.available + render json: { + ok: false, + errors: "Unable to create rental", + }, status: :bad_request + return end - if video && customer - rental = Rental.new(customer_id: customer.id, video_id: video.id) - rental.check_out_date = Date.today - rental.due_date = Date.today + 7 + rental = Rental.new(customer_id: customer.id, video_id: video.id) + rental.check_out_date = Date.today + rental.due_date = Date.today + 7 - if rental.save - - video.decrease_inventory - customer.add_to_checked_out - render json: {customer_id: rental.customer_id, - video_id: rental.video_id, - due_date: rental.due_date, - videos_checked_out_count: customer.videos_checked_out_count, - available_inventory: video.available_inventory}, status: :ok - return - else - render json: { - ok: false, - errors: rental.errors.messages, - }, status: :bad_request - return - end + if rental.save + + video.decrease_inventory + customer.add_to_checked_out + render json: {customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory}, status: :ok + return else render json: { ok: false, - errors: "Unable to create rental", - }, status: :not_found + errors: rental.errors.messages, + }, status: :bad_request return end end diff --git a/app/models/video.rb b/app/models/video.rb index 08eeb9aea..c56ae4545 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -17,10 +17,7 @@ def increase_inventory end def available - if self.available_inventory == 0 - return nil - end - return self + return self.available_inventory > 0 end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 269828047..528d1d7f7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -81,15 +81,15 @@ must_respond_with :not_found end - # it "prevents checkout if video does not exist" do - # videos(:video_1).available_inventory = 0 - # binding.pry - # expect { - # post check_out_path, params: rental_data - # }.must_differ "Rental.count", 0 - # # binding.pry - # must_respond_with :bad_request - # end + it "prevents checkout if video is not available" do + rental_data[:video_id] = videos(:video_2).id + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :bad_request + end end end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index f0336997d..27f548306 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -3,4 +3,10 @@ video_1: overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life." release_date: "1979-01-18" total_inventory: 10 - available_inventory: 9 \ No newline at end of file + available_inventory: 9 +video_2: + title: "No Available Inventory" + overview: "No copies left!" + release_date: "1979-01-18" + total_inventory: 10 + available_inventory: 0 \ No newline at end of file From 183c48067602b57849f3576c5d13b31f8cacc5cb Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 05:03:12 -0700 Subject: [PATCH 43/48] completed check in tests --- app/controllers/rentals_controller.rb | 4 +- test/controllers/rentals_controller_test.rb | 42 +++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3afef7631..738f7f130 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,7 +9,7 @@ def index def check_out customer = Customer.find_by(id: params[:customer_id]) video = Video.find_by(id: params[:video_id]) - + if video.nil? || customer.nil? render json: { ok: false, @@ -56,7 +56,7 @@ def check_in render json: { ok: false, errors: "Rental not found", - }, status: :bad_request + }, status: :not_found return end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 528d1d7f7..6c2a236bc 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -91,5 +91,47 @@ must_respond_with :bad_request end end + + describe "check in" do + let(:rental_data) { + { + video_id: videos(:video_1).id, + customer_id: customers(:customer_1).id + } + } + + before do + post check_out_path, params: rental_data + end + + it "can allow check in" do + expect { + post check_in_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :success + expect(Rental.all.first.check_in_date).must_equal Date.today + end + + it "prevents check in customer has not made rental" do + rental_data[:customer_id] = nil + + expect { + post check_in_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :not_found + end + + it "prevents check in if video does not exist" do + rental_data[:video_id] = nil + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :not_found + end + end end From b0dfd00510739125310594dd6b7b18067be726fe Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 05:39:18 -0700 Subject: [PATCH 44/48] added in tests to verify that all of video data is entered for it to create a new video --- app/controllers/videos_controller.rb | 1 - app/models/video.rb | 8 ++- test/controllers/videos_controller_test.rb | 64 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f123f318f..659614cab 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -4,7 +4,6 @@ def index render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end - def show video = Video.find_by(id: params[:id]) diff --git a/app/models/video.rb b/app/models/video.rb index c56ae4545..9fef397b6 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,7 +1,9 @@ class Video < ApplicationRecord - # validates :title, presence: true - # validates :overview, presence: true - # validates :release_date, presence: true + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true has_many :rentals, dependent: :nullify has_many :customers, through: :rentals diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index c7b7b538d..22863d930 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -69,4 +69,68 @@ expect(body["message"]).must_equal "Not found" end end + + describe "create video" do + let(:video_data) { + { + video: { + title: "Some Movie", + overview: "Some Overview", + release_date: "1/1/2020", + total_inventory: 10, + available_inventory: 5 + } + } + } + + it "cannot create video if no title" do + video_data[:video][:title] = nil + + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 0 + + must_respond_with :bad_request + end + + it "cannot create video if no overview" do + video_data[:video][:overview] = nil + + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 0 + + must_respond_with :bad_request + end + + it "cannot create video if no release_date" do + video_data[:video][:release_date] = nil + + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 0 + + must_respond_with :bad_request + end + + it "cannot create video if no total_inventory" do + video_data[:video][:total_inventory] = nil + + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 0 + + must_respond_with :bad_request + end + + it "cannot create video if no available_inventory" do + video_data[:video][:available_inventory] = nil + + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 0 + + must_respond_with :bad_request + end + end end From 7b219b16222609b76d2ce51d36340b6d353318b4 Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 06:00:46 -0700 Subject: [PATCH 45/48] added in tests to confirm that video available/checked out changes with rentals --- app/controllers/rentals_controller.rb | 1 - test/controllers/rentals_controller_test.rb | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 738f7f130..f6cb78624 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,4 +1,3 @@ -require 'pry' class RentalsController < ApplicationController def index rentals = Rental.all diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6c2a236bc..8b6e2b4f1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -54,11 +54,20 @@ } it "can allow check out" do + inventory_count = videos(:video_1).available_inventory + video_count = customers(:customer_1).videos_checked_out_count + expect { post check_out_path, params: rental_data }.must_differ "Rental.count", 1 must_respond_with :success + + video = Video.find_by(id: rental_data[:video_id]) + customer = Customer.find_by(id: rental_data[:customer_id]) + + expect(video.available_inventory).must_equal inventory_count - 1 + expect(customer.videos_checked_out_count).must_equal video_count + 1 end it "prevents checkout if customer does not exist" do @@ -105,12 +114,21 @@ end it "can allow check in" do + inventory_count = videos(:video_1).available_inventory + video_count = customers(:customer_1).videos_checked_out_count + expect { post check_in_path, params: rental_data }.must_differ "Rental.count", 0 must_respond_with :success expect(Rental.all.first.check_in_date).must_equal Date.today + + video = Video.find_by(id: rental_data[:video_id]) + customer = Customer.find_by(id: rental_data[:customer_id]) + + expect(video.available_inventory).must_equal inventory_count + expect(customer.videos_checked_out_count).must_equal video_count end it "prevents check in customer has not made rental" do From cb6249b5284d2a8575e2059aaeab8af156446bc5 Mon Sep 17 00:00:00 2001 From: Jocelyn Wang Date: Wed, 27 May 2020 07:05:11 -0700 Subject: [PATCH 46/48] passing all but one controller test --- app/controllers/customers_controller.rb | 6 +-- app/controllers/rentals_controller.rb | 42 ++++++++++++++++--- app/controllers/videos_controller.rb | 19 ++++----- test/controllers/customers_controller_test.rb | 7 ++-- test/controllers/videos_controller_test.rb | 7 ++-- 5 files changed, 53 insertions(+), 28 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5f20b1ad3..296131788 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 - render json: customers.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :videos_checked_out_count]), + render json: customers.as_json(only: [:id, :name, :postal_code, :phone, :registered_at, :videos_checked_out_count]), status: :ok end @@ -10,8 +10,8 @@ def show if customer.nil? render json: { - ok: false, - message: "Not found", + # ok: false, + errors: ["Not Found"], }, status: :not_found return diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f6cb78624..ed6dc3201 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,8 +11,7 @@ def check_out if video.nil? || customer.nil? render json: { - ok: false, - errors: "Unable to create rental", + errors: ["Not Found"] }, status: :not_found return end @@ -49,12 +48,12 @@ def check_out end def check_in - rental = Rental.find_by(customer_id: params[:customer_id],video_id: params[:video_id], check_in_date: nil) + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) - if rental.nil? + if video.nil? || customer.nil? render json: { - ok: false, - errors: "Rental not found", + errors: ["Not Found"] }, status: :not_found return end @@ -62,6 +61,9 @@ def check_in video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) + rental = Rental.new(customer_id: customer.id, video_id: video.id) + rental.check_out_date = Date.today + rental.due_date = Date.today + 7 rental.check_in_date = Date.today if rental.save @@ -78,6 +80,34 @@ def check_in }, status: :bad_request return end + # rental = Rental.find_by(customer_id: params[:customer_id],video_id: params[:video_id], check_in_date: nil) + + # if rental.nil? + # render json: { + # errors: ["Not Found"] + # }, status: :not_found + # return + # end + + # video = Video.find_by(id: params[:video_id]) + # customer = Customer.find_by(id: params[:customer_id]) + + # rental.check_in_date = Date.today + + # if rental.save + # video.increase_inventory + # customer.remove_checked_out + # render json: {customer_id: rental.customer_id, + # video_id: rental.video_id, videos_checked_out_count: customer.videos_checked_out_count, + # available_inventory: video.available_inventory}, status: :ok + # return + # else + # render json: { + # ok: false, + # errors: rental.errors.messages, + # }, status: :bad_request + # return + # end end private diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 659614cab..f9793cfb4 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,7 @@ class VideosController < ApplicationController def index videos = Video.all - render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), + render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok end @@ -10,27 +10,24 @@ def show if video.nil? render json: { - ok: false, - message: "Not found", + errors: ["Not Found"], }, status: :not_found return end - render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), - status: :ok + render json: video.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]), status: :ok end def create - video = Video.new(video_params) + @video = Video.new(video_params) - if video.save - render json: video.as_json(only: [:id]), status: :created + if @video.save + render json: @video.as_json(only: [:id]), status: :created return else render json: { - ok: false, - errors: video.errors.messages, + errors: @video.errors.messages, }, status: :bad_request return end @@ -39,6 +36,6 @@ def create private def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 08f510b6b..b13a5c19a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,7 +26,7 @@ expect(body).must_be_instance_of Array body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + expect(customer.keys.sort).must_equal ["id", "name", "phone", "postal_code", "registered_at", "videos_checked_out_count"] end end @@ -56,7 +56,7 @@ expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal CUSTOMER_FIELDS + expect(body.keys.sort).must_equal ["id", "name", "phone", "postal_code", "registered_at", "videos_checked_out_count"] end it "will return a 404 request with json for a non-existent customer" do @@ -64,8 +64,7 @@ must_respond_with :not_found body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body["ok"]).must_equal false - expect(body["message"]).must_equal "Not found" + expect(body["errors"]).must_equal ["Not Found"] end end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 22863d930..0e90156e2 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -26,7 +26,7 @@ expect(body).must_be_instance_of Array body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + expect(video.keys.sort).must_equal ["available_inventory", "id", "release_date", "title"] end end @@ -56,7 +56,7 @@ expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal ["available_inventory", "overview", "release_date", "title", "total_inventory"] end it "will return a 404 request with json for a non-existent video" do @@ -65,8 +65,7 @@ body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body["ok"]).must_equal false - expect(body["message"]).must_equal "Not found" + expect(body["errors"]).must_equal ["Not Found"] end end From cb1f2ee60dcbb37e1347c0b84690d40244e36b6b Mon Sep 17 00:00:00 2001 From: Vera Date: Wed, 27 May 2020 12:15:23 -0700 Subject: [PATCH 47/48] Videos and customers ordered by id --- app/controllers/customers_controller.rb | 2 +- app/controllers/videos_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 296131788..cb9ed72c1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all + customers = Customer.all.order(:id) render json: customers.as_json(only: [:id, :name, :postal_code, :phone, :registered_at, :videos_checked_out_count]), status: :ok end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f9793cfb4..5a21fb7a3 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,6 +1,6 @@ class VideosController < ApplicationController def index - videos = Video.all + videos = Video.all.order(:id) render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok end From c9d44d75b50c9ce1f8d521f543770a2394641bf4 Mon Sep 17 00:00:00 2001 From: Vera Date: Wed, 27 May 2020 12:15:40 -0700 Subject: [PATCH 48/48] Check_in method working --- app/controllers/rentals_controller.rb | 58 ++++++--------------------- 1 file changed, 12 insertions(+), 46 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ed6dc3201..6ba5682e2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,16 +11,15 @@ def check_out if video.nil? || customer.nil? render json: { - errors: ["Not Found"] + errors: ["Not Found"], }, status: :not_found return end - if !video.available render json: { - ok: false, - errors: "Unable to create rental", - }, status: :bad_request + ok: false, + errors: "Unable to create rental", + }, status: :bad_request return end @@ -29,14 +28,13 @@ def check_out rental.due_date = Date.today + 7 if rental.save - video.decrease_inventory customer.add_to_checked_out - render json: {customer_id: rental.customer_id, - video_id: rental.video_id, - due_date: rental.due_date, - videos_checked_out_count: customer.videos_checked_out_count, - available_inventory: video.available_inventory}, status: :ok + render json: { customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory }, status: :ok return else render json: { @@ -48,10 +46,9 @@ def check_out end def check_in - customer = Customer.find_by(id: params[:customer_id]) - video = Video.find_by(id: params[:video_id]) + rental = Rental.find_by(customer_id: params[:customer_id],video_id: params[:video_id], check_in_date: nil) - if video.nil? || customer.nil? + if rental.nil? render json: { errors: ["Not Found"] }, status: :not_found @@ -61,11 +58,8 @@ def check_in video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) - rental = Rental.new(customer_id: customer.id, video_id: video.id) - rental.check_out_date = Date.today - rental.due_date = Date.today + 7 rental.check_in_date = Date.today - + if rental.save video.increase_inventory customer.remove_checked_out @@ -80,34 +74,6 @@ def check_in }, status: :bad_request return end - # rental = Rental.find_by(customer_id: params[:customer_id],video_id: params[:video_id], check_in_date: nil) - - # if rental.nil? - # render json: { - # errors: ["Not Found"] - # }, status: :not_found - # return - # end - - # video = Video.find_by(id: params[:video_id]) - # customer = Customer.find_by(id: params[:customer_id]) - - # rental.check_in_date = Date.today - - # if rental.save - # video.increase_inventory - # customer.remove_checked_out - # render json: {customer_id: rental.customer_id, - # video_id: rental.video_id, videos_checked_out_count: customer.videos_checked_out_count, - # available_inventory: video.available_inventory}, status: :ok - # return - # else - # render json: { - # ok: false, - # errors: rental.errors.messages, - # }, status: :bad_request - # return - # end end private