From 951d3d5be1ec90a84d371605672f0d2c1e00d802 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 16:21:25 -0700 Subject: [PATCH 01/30] rails new --api --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 59 files changed, 1106 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..4560fb912 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.6.3 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..fa0d82d88 --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.3' + +# 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..b70e66667 --- /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.3p62 + +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..b516ec10d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +0Q7N98hhF+7JT+KxNyg0C+YEoixvbufnA/k6bovN/y4WPNDqqwMDhud7qRCiIMtwK327Lgbi96RQgG7r7eZxbB27IFkGIkhN7hjWbRumZuduYvV4GG9whP8o5J7imfv0UdqwHV1vkrDe5g7kvmSxzxFRyvT21K+I3QVQUQde/QmgYWU4Ia4eMwc2gnzNzRcViBySfsLyh5I2wooNe1V7Uq0hMtTofv7v5OsDjXweMx7PwwRW8t7mbEHVlj+x225+R7WtEdLa0VfbiYUHhq4GWHldox8er9K6g7NM5JSeKKOAAUoWMvctxR8pxsJC6SIOjq4oGjEukpfND/H0b8vYi2mPeH17s7YbEqzMDGYAU7HW35t3QhAm85xjIfDSjXtcYVkssvSt5Ar0y896fRijsiRnAQ6fzBUX3W5b--lSqseRMbTgQSt9jW--KYy2ibt2BPIGzjmVib0E7Q== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From d3f8c5b8cdc53790eb56b39d703b6ce475b084d2 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 17:28:31 -0700 Subject: [PATCH 02/30] created models and seed db --- app/models/customer.rb | 2 + app/models/rental.rb | 2 + app/models/video.rb | 2 + db/migrate/20200527000539_create_customers.rb | 15 ++++++ db/migrate/20200527000944_create_rentals.rb | 10 ++++ db/migrate/20200527001154_create_videos.rb | 13 +++++ .../20200527002547_add_columnto_customers.rb | 5 ++ db/schema.rb | 50 +++++++++++++++++++ db/seeds.rb | 2 +- test/models/customer_test.rb | 7 +++ test/models/rental_test.rb | 7 +++ test/models/video_test.rb | 7 +++ 12 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/rental.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200527000539_create_customers.rb create mode 100644 db/migrate/20200527000944_create_rentals.rb create mode 100644 db/migrate/20200527001154_create_videos.rb create mode 100644 db/migrate/20200527002547_add_columnto_customers.rb create mode 100644 db/schema.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/rental_test.rb create mode 100644 test/models/video_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/db/migrate/20200527000539_create_customers.rb b/db/migrate/20200527000539_create_customers.rb new file mode 100644 index 000000000..d1e135bd4 --- /dev/null +++ b/db/migrate/20200527000539_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20200527000944_create_rentals.rb b/db/migrate/20200527000944_create_rentals.rb new file mode 100644 index 000000000..c0b95ab7e --- /dev/null +++ b/db/migrate/20200527000944_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.references :video, index: true + t.references :customer, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20200527001154_create_videos.rb b/db/migrate/20200527001154_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200527001154_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20200527002547_add_columnto_customers.rb b/db/migrate/20200527002547_add_columnto_customers.rb new file mode 100644 index 000000000..8863e5706 --- /dev/null +++ b/db/migrate/20200527002547_add_columnto_customers.rb @@ -0,0 +1,5 @@ +class AddColumntoCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1f1fd9084 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,50 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_27_002547) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" + end + + create_table "rentals", force: :cascade do |t| + t.bigint "video_id" + t.bigint "customer_id" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + 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| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..b9c7addf4 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 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From b3ea80a1fa3841e423eb9580a2eb5cdf6654d59c Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 17:30:33 -0700 Subject: [PATCH 03/30] generate controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ app/controllers/videos_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ test/controllers/videos_controller_test.rb | 7 +++++++ 6 files changed, 27 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..fcd6eefb2 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,2 @@ +class VideosController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end 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 diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..7f1649fd0 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VideosController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 1cb2e04ed59cad139d4bb08cc6ab3b6a87b9f6e7 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 17:46:59 -0700 Subject: [PATCH 04/30] added routes for customers / videos --- config/routes.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index c06383a17..e4c536dbc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :customers , only: [:index] + resources :videos, only: [:index, :show, :create] + + post "/rentals/check-out" + patch "/rentals/check-out" end From fde97bef231e6e116b3920e468a5386c8dffc735 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 17:55:07 -0700 Subject: [PATCH 05/30] added due date to video --- db/migrate/20200527004728_add_due_dateto_video.rb | 6 ++++++ db/schema.rb | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200527004728_add_due_dateto_video.rb diff --git a/db/migrate/20200527004728_add_due_dateto_video.rb b/db/migrate/20200527004728_add_due_dateto_video.rb new file mode 100644 index 000000000..01e4f663b --- /dev/null +++ b/db/migrate/20200527004728_add_due_dateto_video.rb @@ -0,0 +1,6 @@ +class AddDueDatetoVideo < ActiveRecord::Migration[6.0] + def change + #TODO: make sure nil is working + add_column :rentals, :due_date, :date, default: nil + end +end diff --git a/db/schema.rb b/db/schema.rb index 1f1fd9084..103b0d2f2 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_002547) do +ActiveRecord::Schema.define(version: 2020_05_27_004728) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,6 +33,7 @@ t.bigint "customer_id" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.date "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["video_id"], name: "index_rentals_on_video_id" end From 7c242ee34cc06db6920cf4f1c44772d5319332a6 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Tue, 26 May 2020 18:48:56 -0700 Subject: [PATCH 06/30] change the ruby version --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4560fb912..d7edb5686 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.3 +ruby-2.6.5 diff --git a/Gemfile b/Gemfile index fa0d82d88..b585a3d2b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.6.3' +ruby '2.6.5' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.0.3', '>= 6.0.3.1' diff --git a/Gemfile.lock b/Gemfile.lock index b70e66667..41b7d4311 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,7 +206,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 2.6.3p62 + ruby 2.6.5p114 BUNDLED WITH 2.1.4 From 975e3cdad2f67318187306dc6e3cceeda115e7cc Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 19:13:09 -0700 Subject: [PATCH 07/30] first draft - video controller tests --- app/models/video.rb | 2 + .../20200527004728_add_due_dateto_video.rb | 1 - test/controllers/videos_controller_test.rb | 75 ++++++++++++++++++- 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..8cd26aaee 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,4 @@ class Video < ApplicationRecord + has_many :rentals , dependent: :destroy + validates :title, :overview, :release_date, :total_inventory, :available_inventory, presence: true end diff --git a/db/migrate/20200527004728_add_due_dateto_video.rb b/db/migrate/20200527004728_add_due_dateto_video.rb index 01e4f663b..522b924f9 100644 --- a/db/migrate/20200527004728_add_due_dateto_video.rb +++ b/db/migrate/20200527004728_add_due_dateto_video.rb @@ -1,6 +1,5 @@ class AddDueDatetoVideo < ActiveRecord::Migration[6.0] def change - #TODO: make sure nil is working add_column :rentals, :due_date, :date, default: nil end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7f1649fd0..b011e1ac3 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,76 @@ require "test_helper" describe VideosController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + REQUIRED_VIDEO_FIELDS = ['title', 'overview', 'release_date', "total_inventory", 'available_inventory'].sort + + def check_response(expected_type: ,expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe 'index' do + it 'responds with JSON and success' do + get videos_path + + check_response(expected_type: Array) + end + + it 'responds with an array of video hashes' do + get videos_path + + body = check_response(expected_type: Array) + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + end + end + + it 'will respond with an empty array when there are no videos' do + + Video.destroy_all + + get videos_path + + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end + + describe 'create' do + let(:video_data) { + { + video: { + title: 'Harry Potter 3', + overview: 'The best movie ever!', + release_date: 2009-12-25, + total_inventory: 10, + available_inventory: 10 + } + } + } + + it 'can create a new video' do + expect { + post videos_path, params: video_data + }.must_differ 'Video.count', 1 + + check_response(expected_type: Hash, expected_status: :created) + end + + it 'will respond with bad_request for invalid data' do + video_data[:video][:overview] = nil + + expect { + post video_path, params: video_data + }.wont_change "Video.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include 'overview' + end + end + end From 58ab57fe69c7860187cb74695f10d3becfc7a476 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Tue, 26 May 2020 19:18:05 -0700 Subject: [PATCH 08/30] created controller tests for Customers (index) --- test/controllers/customers_controller_test.rb | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..27c923e69 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,44 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + CUSTOMER_FIELDS = [ + "id", + "name", + "registered_at", + "postal_code", + "phone", + "videos_checked_out_count" +].sort + + it "must get index" do + # Act + get customers_path + # Assert + must_respond_with :success + expect(response.header["Content-Type"]).must_include 'json' + end + + it "will return all the proper fields for a list of customers" do + # Act + get customers_path + # Assert + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(body.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "will return an empty array if no customer exists" do + # Act + Customer.destroy_all + get customers_path + + # Assert + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end From 91bbe2bb2c93ade4aa99fc2a125c4e5ffc400e6d Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Tue, 26 May 2020 19:18:27 -0700 Subject: [PATCH 09/30] created index action in customer controller --- app/controllers/customers_controller.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..2ac57b2d5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,14 @@ class CustomersController < ApplicationController + + def index + customers = Customer.all + render json: customers.as_json(only: [ + "id", + "name", + "registered_at", + "postal_code", + "phone", + "videos_checked_out_count" + ]), status: :ok + end end From 5e19f3c0763fadb01545a1f2a96a57e45f12e9b0 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 20:47:26 -0700 Subject: [PATCH 10/30] added video controller RESTful --- app/controllers/videos_controller.rb | 52 ++++++++++++++++++++++ test/controllers/videos_controller_test.rb | 30 ++++++++++++- test/fixtures/videos.yml | 6 +++ 3 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/videos.yml diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fcd6eefb2..0116d80b0 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,2 +1,54 @@ class VideosController < ApplicationController + def index + videos = Video.all + render json: videos.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]),status: :ok + end + + def show + video = Video.find_by(id: params[:id]) + + if video + render json: + video.as_json( + only: [ + :id, + :title, + :release_date, + :available_inventory + ] + ), + status: :ok + return + else + render json: { + ok: false, + message: 'Not found', + }, status: :not_found + return + end + 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/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index b011e1ac3..499d83c7a 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -41,13 +41,39 @@ def check_response(expected_type: ,expected_status: :success) end end + describe 'show' do + it 'will return a hash with the proper fields for an exisitng videos' do + video = videos(:frozen) + + get videos_path(video.id) + + must_respond_with :success + + body = check_response(expected_type: Hash) + #TODO: for some reason this test keeps giving back body is an array??? + expect(body.keys.sort).must_equal ['title', 'overview', 'release_date', 'total_inventory', 'available_inventory'].sort + end + + it 'will return a 404 request with json for a non-exisitent video' do + invalid_id = -1 + get video_path(invalid_id) + + 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 + describe 'create' do let(:video_data) { { video: { title: 'Harry Potter 3', overview: 'The best movie ever!', - release_date: 2009-12-25, + release_date: '2009-12-25', total_inventory: 10, available_inventory: 10 } @@ -66,7 +92,7 @@ def check_response(expected_type: ,expected_status: :success) video_data[:video][:overview] = nil expect { - post video_path, params: video_data + post videos_path, params: video_data }.wont_change "Video.count" body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"].keys).must_include 'overview' diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..95f485b7e --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,6 @@ +frozen: + title: Frozen 2 + overview: The second movie of the best children movie of all years + release_date: 2015-12-25 + total_inventory: 20 + available_inventory: 20 \ No newline at end of file From ded1416edfc1426f379899048fef603ba599a918 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 21:11:39 -0700 Subject: [PATCH 11/30] fixed bug in video controller test --- app/controllers/videos_controller.rb | 10 ++++------ test/controllers/videos_controller_test.rb | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 0116d80b0..1212c9813 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -11,10 +11,11 @@ def show render json: video.as_json( only: [ - :id, :title, + :overview, :release_date, - :available_inventory + :total_inventory, + :available_inventory, ] ), status: :ok @@ -22,7 +23,7 @@ def show else render json: { ok: false, - message: 'Not found', + errors: 'Not found', }, status: :not_found return end @@ -43,9 +44,6 @@ def create end end - - - private def video_params diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 499d83c7a..c46f15ce8 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -45,7 +45,7 @@ def check_response(expected_type: ,expected_status: :success) it 'will return a hash with the proper fields for an exisitng videos' do video = videos(:frozen) - get videos_path(video.id) + get video_path(video.id) must_respond_with :success @@ -63,7 +63,7 @@ def check_response(expected_type: ,expected_status: :success) 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 9dad3f2453248b7cef32acaae733be26b5953c51 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 21:14:43 -0700 Subject: [PATCH 12/30] fixed minor changes --- app/controllers/videos_controller.rb | 4 +++- test/controllers/videos_controller_test.rb | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 1212c9813..7f2d5e89f 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -23,7 +23,9 @@ def show else render json: { ok: false, - errors: 'Not found', + errors: [ + 'Not found' + ] }, status: :not_found return end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index c46f15ce8..e86678b88 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -50,7 +50,6 @@ def check_response(expected_type: ,expected_status: :success) must_respond_with :success body = check_response(expected_type: Hash) - #TODO: for some reason this test keeps giving back body is an array??? expect(body.keys.sort).must_equal ['title', 'overview', 'release_date', 'total_inventory', 'available_inventory'].sort end @@ -63,7 +62,7 @@ def check_response(expected_type: ,expected_status: :success) body = JSON.parse(response.body) expect(body).must_be_instance_of Hash expect(body['ok']).must_equal false - expect(body['errors']).must_equal 'Not found' + expect(body['errors']).must_equal ['Not found'] end end From 8459a342caa41fdde2d6b925fb3342d0ca8c97bc Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 21:30:42 -0700 Subject: [PATCH 13/30] fixed minor change from video index action --- app/controllers/videos_controller.rb | 11 ++++++++++- test/controllers/videos_controller_test.rb | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 7f2d5e89f..d2102c14b 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,16 @@ class VideosController < ApplicationController def index videos = Video.all - render json: videos.as_json(only: [:title, :overview, :release_date, :total_inventory, :available_inventory]),status: :ok + render json: + videos.as_json( + only: [ + :id, + :title, + :release_date, + :available_inventory + ] + ),status: :ok + return end def show diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e86678b88..8e9280cd9 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe VideosController do - REQUIRED_VIDEO_FIELDS = ['title', 'overview', 'release_date', "total_inventory", 'available_inventory'].sort + REQUIRED_VIDEO_FIELDS = ['id', 'title', 'release_date', 'available_inventory'].sort def check_response(expected_type: ,expected_status: :success) must_respond_with expected_status From c8d1d3281244e99e56a7edafacead2ce05f9388b Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Tue, 26 May 2020 22:09:54 -0700 Subject: [PATCH 14/30] added video model tests --- test/models/video_test.rb | 61 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..65744dbd7 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,62 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let (:new_video) { + Video.new( + title: 'Harry Potter 3', + overview: 'The best movie ever!', + release_date: '2009-12-25', + total_inventory: 10, + available_inventory: 10 + ) + } + + describe 'instantize' do + it 'can be instantiated' do + expect(new_video.valid?).must_equal true + end + + it 'will have the required field' do + new_video.save + video = Video.first + [:title, :overview, :release_date , :total_inventory ,:available_inventory].each do |field| + expect(video).must_respond_to field + end + end + end + + describe 'relationship' do + it 'can have many rentals' do + video = videos(:frozen) + + video.rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + # TODO: ADD rental for yml + expect(video.rentals.count).must_equal 0 + end + end + + describe 'validations' do + it 'is valid when all the required fields are provided' do + new_video = Video.new( + title: 'Passenger', + overview: 'Heartwarming movie!', + release_date: '2018-12-25', + total_inventory: 15, + available_inventory: 10) + + expect(new_video.valid?).must_equal true + end + + it 'fails validation when there is one or more required field is missing' do + new_video.title = nil + new_video.overview = nil + + expect(new_video.valid?).must_equal false + expect(new_video.errors.messages).must_include :title + expect(new_video.errors.messages).must_include :overview + end + end + end From 91b06b315201eb3f8306aebff6b59cb88af02070 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Tue, 26 May 2020 22:41:49 -0700 Subject: [PATCH 15/30] setup relationships --- app/models/customer.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..3832b84c1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals + + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true end From 1117cd20a76bd9840c06544890ff9185dbb91296 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Tue, 26 May 2020 22:43:07 -0700 Subject: [PATCH 16/30] added tests for Customers controller. --- test/fixtures/customers.yml | 9 +++++ test/models/customer_test.rb | 69 ++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 3 deletions(-) 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..18f220996 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,9 @@ +shelley: + id: 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 \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..49170d766 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,70 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "validations" do + before do + @customer = customers(:shelley) + end + + it "is valid when all the fields are present" do + result = @customer.valid? + expect(result).must_equal true + end + + it "is invalid when name is missing" do + @customer.name = nil + + result = @customer.valid? + expect(result).must_equal false + expect(@customer.errors.messages).must_include :name + end + + it "is invalid when registered_at is missing" do + @customer.registered_at = nil + + result = @customer.valid? + expect(result).must_equal false + expect(@customer.errors.messages).must_include :registered_at + end + + it "is invalid when address is missing" do + @customer.address = nil + + result = @customer.valid? + expect(result).must_equal false + expect(@customer.errors.messages).must_include :address + end + + it "is invalid when city is missing" do + @customer.city = nil + + result = @customer.valid? + expect(result).must_equal false + expect(@customer.errors.messages).must_include :city + end + + it "is invalid when state is missing" do + @customer.city = nil + + result = @customer.valid? + expect(result).must_equal false + expect(@customer.errors.messages).must_include :city + end + + it "is invalid when postal code is missing" do + @customer.postal_code = nil + + result = @customer.valid? + expect(result).must_equal false + expect(@customer.errors.messages).must_include :postal_code + end + + it "is invalid when phone is missing" do + @customer.phone = nil + + result = @customer.valid? + expect(result).must_equal false + expect(@customer.errors.messages).must_include :phone + end + end end From e69c69951fe17b85629028717c5b8d12f4814140 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Tue, 26 May 2020 22:43:36 -0700 Subject: [PATCH 17/30] fixed typo in the customers controller 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 27c923e69..560f5d1c8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ body.each do |customer| expect(customer).must_be_instance_of Hash - expect(body.keys.sort).must_equal CUSTOMER_FIELDS + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS end end From eecc99d2e6552c92b3a5e0bcb55c472dcf635418 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 09:12:28 -0700 Subject: [PATCH 18/30] added a test: make sure reture 200 if no customers --- test/controllers/customers_controller_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 560f5d1c8..a8d476817 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -38,6 +38,7 @@ # Assert body = JSON.parse(response.body) + must_respond_with :success expect(body).must_be_instance_of Array expect(body.length).must_equal 0 end From 62a48ea78ffd1f99baef0111b9ca86ba7eecaa45 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Wed, 27 May 2020 14:05:07 -0700 Subject: [PATCH 19/30] fixed nested params bug and add post checkout --- app/controllers/rentals_controller.rb | 40 +++++++++++++++++++++++++++ app/controllers/videos_controller.rb | 6 ++-- app/models/customer.rb | 2 +- app/models/rental.rb | 12 ++++++++ config/routes.rb | 5 ++-- 5 files changed, 58 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..f4ebd84f6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,42 @@ class RentalsController < ApplicationController + def checkout + new_video = Video.find_by(id: params[:video_id]) + + if new_video.nil? || new_video.available_inventory < 1 + render json: { + errors: "No available inventory" + }, status: :bad_request + return + end + + checkout = Rental.new(rental_params) + checkout.due_date = Date.today + 7.days + + + if checkout.save + render json: { + customer_id: checkout.customer_id, + video_id: checkout.video_id, + due_date: checkout.due_date, + videos_checked_out_count: checkout.customer.videos_checked_out_count, + available_inventory: checkout.video.available_inventory + }, + status: :created + return + else + render json: { + ok: false, + errors: checkout.errors.messages + }, + status: :bad_request + return + end + + end + + private + + def rental_params + return params.permit(:customer_id, :video_id) + end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index d2102c14b..b4964940f 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -31,9 +31,8 @@ def show return else render json: { - ok: false, errors: [ - 'Not found' + 'Not Found' ] }, status: :not_found return @@ -48,7 +47,6 @@ def create return else render json: { - ok: false, errors: video.errors.messages }, status: :bad_request return @@ -58,6 +56,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/app/models/customer.rb b/app/models/customer.rb index 3832b84c1..9a08b73fb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, through: :rentals + has_many :videos, through: :rentals validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..ba4430435 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,14 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video + + # def self.create_checkout + # new_checkout_params = { + # due_date: self.due_date + # } + # end + + # def self.due_date + # return Date.today + 7.days + # end end diff --git a/config/routes.rb b/config/routes.rb index e4c536dbc..901fa447d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ resources :customers , only: [:index] resources :videos, only: [:index, :show, :create] - post "/rentals/check-out" - patch "/rentals/check-out" + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + #TODO: figure out how to do two post or post + patch + patch "/rentals/check-in", to: "rentals#checkin", as: "checkin" end From 170e3eab982a99fa4d4f4e5c4221587e75676b59 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Wed, 27 May 2020 15:10:27 -0700 Subject: [PATCH 20/30] added increment/ decrement methods in rental --- app/controllers/rentals_controller.rb | 13 ++++++------- app/models/rental.rb | 13 +++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f4ebd84f6..c2c1944fc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,17 +1,17 @@ class RentalsController < ApplicationController def checkout new_video = Video.find_by(id: params[:video_id]) - - if new_video.nil? || new_video.available_inventory < 1 + new_customer = Customer.find_by(id: params[:customer_id]) + + if new_video.nil? || new_video.available_inventory < 1 || new_customer.nil? render json: { - errors: "No available inventory" - }, status: :bad_request + errors: ['Not Found'] + }, status: :not_found return end checkout = Rental.new(rental_params) checkout.due_date = Date.today + 7.days - if checkout.save render json: { @@ -21,11 +21,10 @@ def checkout videos_checked_out_count: checkout.customer.videos_checked_out_count, available_inventory: checkout.video.available_inventory }, - status: :created + status: :ok return else render json: { - ok: false, errors: checkout.errors.messages }, status: :bad_request diff --git a/app/models/rental.rb b/app/models/rental.rb index ba4430435..b4d57491f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -11,4 +11,17 @@ class Rental < ApplicationRecord # def self.due_date # return Date.today + 7.days # end + + + after_create :increment_videos_checked_out_count, :decrement_available_inventory + + private + + def increment_videos_checked_out_count + self.customer.increment(:videos_checked_out_count, 1).save + end + + def decrement_available_inventory + self.video.decrement(:available_inventory, 1).save + end end From 66c774c405f502aa4f9881d5ba8ddea351dab679 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 17:37:16 -0700 Subject: [PATCH 21/30] added fixtures file --- test/fixtures/customers.yml | 3 ++- test/fixtures/rentals.yml | 0 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/rentals.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 18f220996..16d389ff4 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,4 +6,5 @@ shelley: city: Hillsboro, state: OR, postal_code: 24309, - phone: (322) 510-8695 \ No newline at end of file + phone: (322) 510-8695 + videos_checked_out_count: 0 \ No newline at end of file diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..e69de29bb From 72b223b3f67b1f442239e9a658eb7647d54e2258 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 17:38:07 -0700 Subject: [PATCH 22/30] modify the check-in routes to be post request --- config/routes.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 901fa447d..0eb75205b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,5 @@ resources :videos, only: [:index, :show, :create] post "/rentals/check-out", to: "rentals#checkout", as: "checkout" - #TODO: figure out how to do two post or post + patch - patch "/rentals/check-in", to: "rentals#checkin", as: "checkin" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end From 23c421b1d48d0a26050e5bf4b5f696143f56d9ff Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 17:38:42 -0700 Subject: [PATCH 23/30] created checkin action in rentral controller --- app/controllers/rentals_controller.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c2c1944fc..117d5308b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -33,6 +33,29 @@ def checkout end + def checkin + new_video = Video.find_by(id: params[:video_id]) + new_customer = Customer.find_by(id: params[:customer_id]) + checkin = Rental.find_by(customer: new_customer, video: new_video) + + if checkin.nil? + render json: { + errors: ['Not Found'] + }, status: :not_found + return + else + render json: { + customer_id: checkin.customer_id, + customer_id: checkin.customer_id, + video_id: checkin.video_id, + videos_checked_out_count: checkin.decrement_videos_checked_out_count, + available_inventory: checkin.increment_available_inventory + }, + status: :ok + return + end +end + private def rental_params From d8eb8e0aaa88972b17e4ee4fc6239e2bb338a78e Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 17:39:31 -0700 Subject: [PATCH 24/30] custom methods for rental model --- app/models/rental.rb | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index b4d57491f..e357a208d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,20 +2,12 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - # def self.create_checkout - # new_checkout_params = { - # due_date: self.due_date - # } - # end + validates :due_date, presence: true - # def self.due_date - # return Date.today + 7.days - # end + after_create :increment_videos_checked_out_count, :decrement_available_inventory - after_create :increment_videos_checked_out_count, :decrement_available_inventory - private def increment_videos_checked_out_count self.customer.increment(:videos_checked_out_count, 1).save @@ -24,4 +16,17 @@ def increment_videos_checked_out_count def decrement_available_inventory self.video.decrement(:available_inventory, 1).save end + + def decrement_videos_checked_out_count + self.customer.videos_checked_out_count -= 1 + self.customer.save + return self.customer.videos_checked_out_count + end + + def increment_available_inventory + self.video.available_inventory += 1 + self.video.save + return self.video.available_inventory + end + end From d12191ed2186e6935ad0e66df44c807b4ec05651 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 17:39:47 -0700 Subject: [PATCH 25/30] initialized model tests for Rental --- test/models/rental_test.rb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..38c3a53d2 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,16 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "increment_videos_checked_out_count & decrement_available_inventory" do + # Act + customer = customers(:shelley) + video = videos(:frozen) + rental = Rental.create!(customer_id: customer.id, video_id: video.id) + # Assert + customer.reload + video.reload + expect(customer.videos_checked_out_count).must_equal 1 + expect(video.available_inventory).must_equal 19 + end + end From c55a848a0fac60a1bcf761b7dcee6b1f4660ab15 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Wed, 27 May 2020 20:24:01 -0700 Subject: [PATCH 26/30] fixed bugs in tests and added more fixtures --- test/controllers/videos_controller_test.rb | 9 +++--- test/fixtures/customers.yml | 32 +++++++++++++++++++++- test/fixtures/rentals.yml | 20 ++++++++++++++ test/fixtures/videos.yml | 20 +++++++++++++- test/models/rental_test.rb | 8 +++++- test/models/video_test.rb | 6 ++-- 6 files changed, 84 insertions(+), 11 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 8e9280cd9..c35ce9b72 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -61,21 +61,20 @@ def check_response(expected_type: ,expected_status: :success) body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body['ok']).must_equal false - expect(body['errors']).must_equal ['Not found'] + expect(body['errors']).must_equal ['Not Found'] end end describe 'create' do let(:video_data) { { - video: { + title: 'Harry Potter 3', overview: 'The best movie ever!', release_date: '2009-12-25', total_inventory: 10, available_inventory: 10 - } + } } @@ -88,7 +87,7 @@ def check_response(expected_type: ,expected_status: :success) end it 'will respond with bad_request for invalid data' do - video_data[:video][:overview] = nil + video_data[:overview] = nil expect { post videos_path, params: video_data diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 16d389ff4..c65f2fc68 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -7,4 +7,34 @@ shelley: state: OR, postal_code: 24309, phone: (322) 510-8695 - videos_checked_out_count: 0 \ No newline at end of file + videos_checked_out_count: 0 +Joseph: + id: 2 + name: Joseph Nguyen + registered_at: Wed, 29 Apr 2020 08:54:14 -0700, + address: 5000 City Lights Drive + city: Aliso Viejo + state: CA + postal_code: 24309, + phone: (626)-688-7777 + videos_checked_out_count: 2 +sharon: + id: 3 + name: Sharon Cheung + registered_at: Wed, 27 May 2020 10:54:14 -0700, + address: 1234 Main Street + city: Los Angeles + state: CA + postal_code: 90024, + phone: (310) 333-3434 + videos_checked_out_count: 1 +ross: + id: 4 + name: Ross Yu + registered_at: Wed, 27 May 2020 10:54:14 -0700, + address: 5678 Main Street + city: San Francisco + state: CA + postal_code: 90210, + phone: (925) 564-3484 + videos_checked_out_count: 1 \ No newline at end of file diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index e69de29bb..b6f54bb00 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -0,0 +1,20 @@ +# Sharon - renting lalaland +one: + customer: sharon + video: lalaland + due_date: Wed, 03 Jun 2020 +# Joseph - renting sing +two: + customer: joseph + video: sing + due_date: Mon, 01 Jun 2020 +# Ross - renting sing +three: + customer: ross + video: sing + due_date: Wed, 03 Jun 2020 +# joseph also renting lalaland +four: + customer: joseph + video: lalaland + due_date: Wed, 03 Jun 2020 diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 95f485b7e..e641e037a 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -3,4 +3,22 @@ frozen: overview: The second movie of the best children movie of all years release_date: 2015-12-25 total_inventory: 20 - available_inventory: 20 \ No newline at end of file + available_inventory: 20 +split: + title: Split + overview: Three girls are kidnapped by a man with a diagnosed 23 distinct personalities. + release_date: 2018-10-25 + total_inventory: 15 + available_inventory: 15 +sing: + title: Sing + overview: "In a city of humanoid animals, a hustling theater impresario's attempt to save his theater with a singing competition becomes grander than he anticipates even as its finalists' find that their lives will never be the same." + release_date: 2016-02-25 + total_inventory: 50 + available_inventory: 48 +lalaland: + title: La La Land + overview: A jazz pianist falls for an aspiring actress in Los Angeles. + release_date: 2019-11-25 + total_inventory: 12 + available_inventory: 11 \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 38c3a53d2..ec39ca7e8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,11 +1,17 @@ require "test_helper" describe Rental do + describe 'instantize' do + it 'can be' + end + + + it "increment_videos_checked_out_count & decrement_available_inventory" do # Act customer = customers(:shelley) video = videos(:frozen) - rental = Rental.create!(customer_id: customer.id, video_id: video.id) + rental = Rental.create!(customer_id: customer.id, video_id: video.id, due_date:'Wed, 03 Jun 2020') # Assert customer.reload video.reload diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 65744dbd7..fa11bf423 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -27,13 +27,13 @@ describe 'relationship' do it 'can have many rentals' do - video = videos(:frozen) + video = videos(:lalaland) video.rentals.each do |rental| expect(rental).must_be_instance_of Rental end - # TODO: ADD rental for yml - expect(video.rentals.count).must_equal 0 + + expect(video.rentals.count).must_equal 2 end end From ff215baf2b7b6600fe8f1079911d71fbcbce2d72 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 20:27:58 -0700 Subject: [PATCH 27/30] index actions is now sorted by id when return --- 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 2ac57b2d5..355aadb3a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index - customers = Customer.all + customers = Customer.all.order(:id) render json: customers.as_json(only: [ "id", "name", diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index b4964940f..4e1aa75bc 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: [ From 164ea6e9e3a77349e16cd52d97fc0f1d5bf2cef8 Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 20:28:47 -0700 Subject: [PATCH 28/30] created Retnals Controller tests --- test/controllers/rentals_controller_test.rb | 92 ++++++++++++++++++++- test/fixtures/videos.yml | 10 ++- 2 files changed, 98 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..68e30fe32 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,93 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + def check_response(expected_type: ,expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + before do + @customer = customers(:shelley) + @video = videos(:frozen) + @video2 = videos(:frozen10) # which has 0 inventory + end + + let(:new_checkout) { + { + customer_id: @customer.id, + video_id: @video.id, + } + } + + let(:invalid_checkout) { + { + customer_id: @customer.id, + video_id: @video2.id, + } + } + + describe "checkout action" do + + it "be able to create a checkout" do + expect{ post checkout_path, params: new_checkout}.must_differ "Rental.count", 1 + must_respond_with :success + end + + it "return no found if video id is invalid" do + new_checkout[:video_id] = nil + + expect { post checkout_path, params: new_checkout}.wont_change "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_equal ['Not Found'] + must_respond_with :not_found + end + + it "return no found if customer id is invalid" do + new_checkout[:customer_id] = nil + + expect { post checkout_path, params: new_checkout}.wont_change "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_equal ['Not Found'] + must_respond_with :not_found + end + + it "return no found if avaliable inventory < 1 " do + + expect { post checkout_path, params: invalid_checkout}.wont_change "Rental.count" + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["errors"]).must_equal ['Not Found'] + must_respond_with :not_found + end + + + end + + + + describe "checkin action" do + it "be able to edit a existing rental using checkin" do + # Act + post checkout_path, params: new_checkout + # Assert + expect { post checkin_path, params: new_checkout}.wont_change "Rental.count" + must_respond_with :success + end + + it "will return no found if the rental doesn't exist " do + # Act + post checkin_path, params: new_checkout + # Arrange + body = check_response(expected_type: Hash, expected_status: :not_found) + # Assert + expect(body["errors"]).must_equal ['Not Found'] + must_respond_with :not_found + end + end end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 95f485b7e..28c2081f7 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,6 +1,14 @@ frozen: + id: 1 title: Frozen 2 overview: The second movie of the best children movie of all years release_date: 2015-12-25 total_inventory: 20 - available_inventory: 20 \ No newline at end of file + available_inventory: 20 +frozen10: + id: 2 + title: Frozen 10 + overview: The second movie of the best children movie of all years + release_date: 2030-12-25 + total_inventory: 1 + available_inventory: 0 \ No newline at end of file From 730704ae066acaf6cfb94ff6206dd698b6632cbf Mon Sep 17 00:00:00 2001 From: Rosalyn Date: Wed, 27 May 2020 20:29:59 -0700 Subject: [PATCH 29/30] added relatiionship tests for customer & rental --- test/models/customer_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 49170d766..ea86ca359 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -67,4 +67,15 @@ expect(@customer.errors.messages).must_include :phone end end + + describe 'relationship' do + it 'one customer can have many rentals' do + customer = customers(:shelley) + + customer.rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + expect(customer.rentals.count).must_equal 0 + end + end end From c1401c8b0d8919a018c1fd5482753120cc078447 Mon Sep 17 00:00:00 2001 From: Sharon Cheung Date: Wed, 27 May 2020 21:14:41 -0700 Subject: [PATCH 30/30] finished rental model tests --- test/fixtures/customers.yml | 4 -- test/models/rental_test.rb | 115 ++++++++++++++++++++++++++++++++---- 2 files changed, 102 insertions(+), 17 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index c65f2fc68..84cb6a649 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,5 +1,4 @@ shelley: - id: 1 name: Shelley Rocha, registered_at: Wed, 29 Apr 2015 07:54:14 -0700, address: Ap 292-5216 Ipsum Rd., @@ -9,7 +8,6 @@ shelley: phone: (322) 510-8695 videos_checked_out_count: 0 Joseph: - id: 2 name: Joseph Nguyen registered_at: Wed, 29 Apr 2020 08:54:14 -0700, address: 5000 City Lights Drive @@ -19,7 +17,6 @@ Joseph: phone: (626)-688-7777 videos_checked_out_count: 2 sharon: - id: 3 name: Sharon Cheung registered_at: Wed, 27 May 2020 10:54:14 -0700, address: 1234 Main Street @@ -29,7 +26,6 @@ sharon: phone: (310) 333-3434 videos_checked_out_count: 1 ross: - id: 4 name: Ross Yu registered_at: Wed, 27 May 2020 10:54:14 -0700, address: 5678 Main Street diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index ec39ca7e8..1a39ebaca 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,22 +1,111 @@ require "test_helper" describe Rental do - describe 'instantize' do - it 'can be' - end + let(:new_customer) { + Customer.new( + name: 'Hannah Joo', + registered_at: 'Wed, 27 May 2020 11:54:14 -0700', + address: '1234 Main Street', + city: 'Seattle', + state: 'WA', + postal_code: '90818', + phone: '(333) 510-8695', + videos_checked_out_count: 0, + ) + } + let(:new_video) { + Video.new( + title: 'Hello Kitty Adventure', + overview: 'Great Movie for Hello Kitty fan', + release_date: '2008-11-28', + total_inventory: 20, + available_inventory: 20, + ) + } + let(:new_rental) { + Rental.new( + customer: new_customer, + video: new_video, + due_date: 'Wed, 03 Jun 2020' + ) + } + describe 'instantize and validations' do + it 'can be instantiated' do + expect(new_rental.valid?).must_equal true + end + + it 'cannot be instantiated with invalid customer id' do + new_rental = Rental.new(customer_id: -1 , video: videos(:sing), due_date: 'Wed, 03 Jun 2020') + expect(new_rental.valid?).must_equal false + end + + it 'cannot be instantiated with invalid video id' do + new_rental = Rental.new(customer: customers(:ross) , video_id: -1, due_date: 'Wed, 03 Jun 2020') + expect(new_rental.valid?).must_equal false + end + + it 'cannot be instantiated without a due date' do + new_rental = Rental.new(customer: customers(:ross) , video: videos(:sing), due_date: nil) + expect(new_rental.valid?).must_equal false + end + + it 'will have the required field' do + new_rental.save + rental = Rental.last + [:customer_id, :video_id, :due_date].each do |field| + expect(rental).must_respond_to field + end + end + end + + describe 'relationship' do + it 'can belongs to a customer and a video' do + rental = rentals(:one) + + expect(rental.customer).must_be_instance_of Customer + expect(rental.video).must_be_instance_of Video + expect(rental.customer.name).must_equal 'Sharon Cheung' + expect(rental.video.title).must_equal "La La Land" + end + end - it "increment_videos_checked_out_count & decrement_available_inventory" do - # Act - customer = customers(:shelley) - video = videos(:frozen) - rental = Rental.create!(customer_id: customer.id, video_id: video.id, due_date:'Wed, 03 Jun 2020') - # Assert - customer.reload - video.reload - expect(customer.videos_checked_out_count).must_equal 1 - expect(video.available_inventory).must_equal 19 + describe "increment_videos_checked_out_count & decrement_available_inventory" do + it "will increment customer checkout count by 1 and decrement vidoe avaliable inventory once a Rental is created" do + # Act + customer = customers(:shelley) + video = videos(:frozen) + rental = Rental.create!(customer_id: customer.id, video_id: video.id, due_date:'Wed, 03 Jun 2020') + + # Assert + customer.reload + video.reload + expect(customer.videos_checked_out_count).must_equal 1 + expect(video.available_inventory).must_equal 19 + end end + describe "decrement_videos_checked_out_count & increment_available_inventory" do + it "will decrease customer checkout count by 1 and increase vidoe avaliable inventory once a checkin action is called" do + # Act + customer = customers(:sharon) + video = videos(:frozen) + rental = Rental.create!(customer_id: customer.id, video_id: video.id, due_date:'Wed, 03 Jun 2020') + + # Assert + customer.reload + video.reload + expect(customer.videos_checked_out_count).must_equal 2 + expect(video.available_inventory).must_equal 19 + + rental.decrement_videos_checked_out_count + rental.increment_available_inventory + + customer.reload + video.reload + expect(customer.videos_checked_out_count).must_equal 1 + expect(video.available_inventory).must_equal 20 + end + end end