From dcd0e0c69745eabfdd0039ab38d1184515487c6b Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 14:14:44 -0700 Subject: [PATCH 01/33] Environment setup --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 node_modules/.yarn-integrity | 10 + public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/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 yarn.lock | 4 + 61 files changed, 1120 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 node_modules/.yarn-integrity create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/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 create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..95c25b78d --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3' +# 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..7f91bc2cb --- /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) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..43301a817 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..2d26d7b4d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +84MbRi5O+2Hp0Shj2bjOGl50RBwc4ql78IeAkPcbnmTH8nFTdwaZ8jF1rP5r/MqPSMinQMTHV0U1WnTaCh6CmKyr9F/UFKCJ2mAZe9tqwVeHLwQZyNIzS/DsZie8qaQ5WpUx8+NFYJn9HwP04J7ceeiX9CyUAmKKvGjqclnkr3CpQuu0l0XM1iGg1ZZU0eWoF+WCqKQbp83QIeDrOOmI3t6mLb0j4UF/lZPSen2Fj4QTmJzHEH/aWRFVGYZ7/JqJWkFdw7R3lF1sXcT+zknkZ7JDPo+nJkUArci8/Oyn3H4bIa5HO/woeJXp0mzN5gO4n8x6bCBJEEyGFw+oNhdeFDQsmNCBSq4phtyT/QHsFQb+V6uY7WIxo/+8A24OCjKbWd2P623Swdu9G1L5xcuWBkAB8yIY35qsmKH5--eOXnteI9SB7ULXOp--JA15DUSExl42XFWSIf0Lew== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..0f19eb7ab --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-83", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/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 diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..fb57ccd13 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From bf3536b91143a7d1c41032decf425c154122f6ad Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 14:51:30 -0700 Subject: [PATCH 02/33] created customer video rental model and related customer and video --- app/models/customer.rb | 4 ++ app/models/rental.rb | 4 ++ app/models/video.rb | 4 ++ config/routes.rb | 2 + db/migrate/20200526213321_create_videos.rb | 13 +++++ db/migrate/20200526213452_create_customers.rb | 15 ++++++ db/migrate/20200526213629_create_rentals.rb | 8 +++ .../20200526213826_ralate_customer_video.rb | 6 +++ db/schema.rb | 51 +++++++++++++++++++ test/models/customer_test.rb | 7 +++ test/models/rental_test.rb | 7 +++ test/models/video_test.rb | 7 +++ 12 files changed, 128 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/rental.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200526213321_create_videos.rb create mode 100644 db/migrate/20200526213452_create_customers.rb create mode 100644 db/migrate/20200526213629_create_rentals.rb create mode 100644 db/migrate/20200526213826_ralate_customer_video.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..116e7ab96 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,4 @@ +class Customer < ApplicationRecord + has_many :rentals + has_many :vidoes, through: :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..0449e1916 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..c40a47c30 --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,4 @@ +class Video < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..f232e777a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ 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/db/migrate/20200526213321_create_videos.rb b/db/migrate/20200526213321_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200526213321_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/20200526213452_create_customers.rb b/db/migrate/20200526213452_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200526213452_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/20200526213629_create_rentals.rb b/db/migrate/20200526213629_create_rentals.rb new file mode 100644 index 000000000..85f45ae24 --- /dev/null +++ b/db/migrate/20200526213629_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20200526213826_ralate_customer_video.rb b/db/migrate/20200526213826_ralate_customer_video.rb new file mode 100644 index 000000000..3adfb5fe1 --- /dev/null +++ b/db/migrate/20200526213826_ralate_customer_video.rb @@ -0,0 +1,6 @@ +class RalateCustomerVideo < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :video, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..a588ea0ed --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,51 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_26_213826) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "customer_id" + t.bigint "video_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" + end + + create_table "videos", force: :cascade do |t| + 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 + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" +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 db26646429e2a295d67f79455a885fc8e643b650 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 15:06:12 -0700 Subject: [PATCH 03/33] Added videos_checked_out_count column for customer table --- .../20200526220206_add_videos_checked_out_count_column.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200526220206_add_videos_checked_out_count_column.rb diff --git a/db/migrate/20200526220206_add_videos_checked_out_count_column.rb b/db/migrate/20200526220206_add_videos_checked_out_count_column.rb new file mode 100644 index 000000000..0c18a8790 --- /dev/null +++ b/db/migrate/20200526220206_add_videos_checked_out_count_column.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCountColumn < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index a588ea0ed..5cce4383f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_213826) do +ActiveRecord::Schema.define(version: 2020_05_26_220206) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" end create_table "rentals", force: :cascade do |t| From fb5cb39b328017acc44659b34d90b589a13d5753 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 15:23:40 -0700 Subject: [PATCH 04/33] Added routes from customer and video --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index f232e777a..c32b65668 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Rails.application.routes.draw do + resources :customers, only:[:index, :show] + + resources :videos, only:[:index, :show, :create] + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 6cafd8b36a80e77d9fba6a5be5c0928fbe0f0a59 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 15:46:41 -0700 Subject: [PATCH 05/33] Created customers videos and rentals controllers --- app/controllers/customers_controller.rb | 7 +++++++ app/controllers/rentals_controller.rb | 2 ++ app/controllers/videos_controller.rb | 10 ++++++++++ app/models/video.rb | 2 ++ config/routes.rb | 5 +++++ test/controllers/customers_controller_test.rb | 14 ++++++++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ test/controllers/videos_controller_test.rb | 19 +++++++++++++++++++ 8 files changed, 66 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..558cf72e7 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + end + + def show + end +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..8c63e1d04 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,10 @@ +class VideosController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/app/models/video.rb b/app/models/video.rb index c40a47c30..bc5a73adc 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,6 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + end diff --git a/config/routes.rb b/config/routes.rb index c32b65668..04b6dad38 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,10 @@ Rails.application.routes.draw do + get 'videos/index' + get 'videos/show' + get 'videos/create' + get 'customers/index' + get 'customers/show' resources :customers, only:[:index, :show] resources :videos, only:[:index, :show, :create] diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..3665e1fdd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe CustomersController do + it "must get index" do + get customers_index_url + must_respond_with :success + end + + it "must get show" do + get customers_show_url + must_respond_with :success + 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..fe6ee33c3 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe VideosController do + it "must get index" do + get videos_index_url + must_respond_with :success + end + + it "must get show" do + get videos_show_url + must_respond_with :success + end + + it "must get create" do + get videos_create_url + must_respond_with :success + end + +end From 20dab0d7167e059c451dc2d2418b899bc704c933 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 15:49:45 -0700 Subject: [PATCH 06/33] Added validations for Video model. --- app/models/video.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/video.rb b/app/models/video.rb index bc5a73adc..abcba2035 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -2,5 +2,10 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - + validates :title, presence: true, uniqueness:true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true + end From 5b660a786dc8e6fdf0a8dd0a3024ec8543ff7a44 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 16:38:56 -0700 Subject: [PATCH 07/33] Added index action and passed all the test --- app/controllers/videos_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 8c63e1d04..2308ea6b1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,5 +1,7 @@ class VideosController < ApplicationController def index + videos = Video.all.as_json(only: ["id", "title", "release_date", "available_inventory"]) + render json: videos, status: :ok end def show From b4f43f2976ec459389f04fb4c5c09950986d108e Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 16:39:30 -0700 Subject: [PATCH 08/33] Wrote index action tests for both nominal and edge cases --- test/controllers/videos_controller_test.rb | 48 ++++++++++++++++------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index fe6ee33c3..33ddb57e2 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,19 +1,43 @@ require "test_helper" describe VideosController do - it "must get index" do - get videos_index_url - must_respond_with :success - end + VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + describe "index" do + it "responds with JSON and success" do + get videos_path - it "must get show" do - get videos_show_url - must_respond_with :success - end + expect(response.header["Content-Type"]).must_include 'json' + must_respond_with :ok + end - it "must get create" do - get videos_create_url - must_respond_with :success - end + it "returns all the proper fields for a list of videos" do + # Act + get videos_path + + # Get the body of the response as an array of hash + body = JSON.parse(response.body) + # Assert + expect(body).must_be_instance_of Array + + body.each do |video| + expect(video).must_be_instance_of hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end + + it "return an empty array if there is no video exists" do + Video.destroy_all + # Act + get videos_path + + # Get the body of the response as an array of hash + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + + # + end + end end From 174c10e8a8dbdfaa3b646609c2dee0cb7c3251ac Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 17:09:11 -0700 Subject: [PATCH 09/33] Added show action and passed all the tests --- app/controllers/videos_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 2308ea6b1..831f8f8ef 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -5,6 +5,17 @@ def index end def show + video = Video.find_by(id: params[:id]) + + if video.nil? + render json: { + ok: false, + message: 'Not found', + }, status: :not_found + return + end + render json: video.as_json(only: ["id", "title", "release_date", "available_inventory"]), + status: :ok end def create From dc6755c225e35914a7c04390b07c560b72435cf8 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 17:09:41 -0700 Subject: [PATCH 10/33] Added tests for show action for both nominal and edge cases --- test/controllers/videos_controller_test.rb | 33 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 33ddb57e2..cb981a300 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -21,7 +21,7 @@ expect(body).must_be_instance_of Array body.each do |video| - expect(video).must_be_instance_of hash + expect(video).must_be_instance_of Hash expect(video.keys.sort).must_equal VIDEO_FIELDS end end @@ -37,7 +37,36 @@ expect(body).must_be_instance_of Array expect(body.length).must_equal 0 - # + end + end + + describe "show" do + it "returns a hash with the proper fields for an existing video" do + video = videos(:video1) + + # Act + get video_path(video.id) + + # Assert + must_respond_with :success + + body = JSON.parse(response.body) + + expect(response.header["Content-Type"]).must_include 'json' + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal VIDEO_FIELDS + end + + # Edge case + it "returns a 404 response with joson for non-existent video" do + get video_path(-1) + + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Not found' end end end From f1dbebd655d9adc24975ceb98f20498a7d4bb231 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 17:10:13 -0700 Subject: [PATCH 11/33] Added the a videos.yml file for the test --- test/fixtures/videos.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 test/fixtures/videos.yml diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..b7f12e576 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,8 @@ +video1: + title: Blacksmith Of The Banished + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. + release_date: 1979-01-18 + total_inventory: 10 + available_inventory: 9 + + \ No newline at end of file From c11831348756eb054353aa8e8a81661d314348e4 Mon Sep 17 00:00:00 2001 From: Nikki Vaughan Date: Tue, 26 May 2020 17:17:56 -0700 Subject: [PATCH 12/33] tests and controller actions for Customer index and show --- app/controllers/customers_controller.rb | 16 +++++ config/routes.rb | 6 -- test/controllers/customers_controller_test.rb | 60 +++++++++++++++++-- test/fixtures/customers.yml | 12 ++++ 4 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 558cf72e7..2002e7d1c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,23 @@ 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 def show + customer = Customer.find_by(id: params[:id]) + + if customer.nil? + render json: { + success: false, + message: "Not found" + }, status: :not_found + + return + end + + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), + status: :ok end end diff --git a/config/routes.rb b/config/routes.rb index 04b6dad38..41e5fd1a5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,10 +1,4 @@ Rails.application.routes.draw do - - get 'videos/index' - get 'videos/show' - get 'videos/create' - get 'customers/index' - get 'customers/show' resources :customers, only:[:index, :show] resources :videos, only:[:index, :show, :create] diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 3665e1fdd..af0f4a224 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,14 +1,62 @@ require "test_helper" describe CustomersController do - it "must get index" do - get customers_index_url - must_respond_with :success + CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"].sort + + describe 'index' do + it 'responds with JSON and success' do + get customers_path + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it 'will return all the proper fields for a list of customers' do + get customers_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it 'returns an empty array if no customers exist' do + Customer.destroy_all + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end - it "must get show" do - get customers_show_url - must_respond_with :success + describe 'show' do + before do + @customer = customers(:customer1) + end + it 'responds with JSON and success' do + get customer_path(@customer.id) + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it 'will return a hash with all proper fields for an existing customer' do + get customer_path(@customer.id) + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal CUSTOMER_FIELDS + end + + it 'will return a 404 request with json for a non-existant customer' do + get customer_path(-1) + + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['success']).must_equal false + expect(body['message']).must_equal 'Not found' + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..d427446bd --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,12 @@ +customer1: + name: customer1 + registered_at: 2015-04-29T14:54:14.000Z + postal_code: 24309 + phone: (322) 510-8695 + videos_checked_out_count: 1 +customer2: + name: customer2 + registered_at: 2016-04-29T14:54:14.000Z + postal_code: 24310 + phone: (322) 510-8695 + videos_checked_out_count: 1 \ No newline at end of file From 66923025065220c1146687ccadf22c590b26be56 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Tue, 26 May 2020 17:17:59 -0700 Subject: [PATCH 13/33] Trying to add test for create action --- test/controllers/videos_controller_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index cb981a300..f590f3564 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -69,4 +69,10 @@ expect(body['message']).must_equal 'Not found' end end + + # describe 'create' do + # it "return the status 200 when the video is created successfully" do + + # end + # end end From 2f0a64b0cc7fd2d15d27674113dd9302c27a0c89 Mon Sep 17 00:00:00 2001 From: Nikki Vaughan Date: Wed, 27 May 2020 11:31:08 -0700 Subject: [PATCH 14/33] dryed up tests for customer_controller --- test/controllers/customers_controller_test.rb | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index af0f4a224..b249f6c3f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -3,18 +3,24 @@ describe CustomersController do CUSTOMER_FIELDS = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"].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_instance_of expected_type + return body + end + describe 'index' do - it 'responds with JSON and success' do + it 'responds with success and must be JSON in an Array' do get customers_path - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + check_response(expected_type: Array) end it 'will return all the proper fields for a list of customers' do get customers_path - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) body.each do |customer| expect(customer).must_be_instance_of Hash @@ -25,9 +31,8 @@ it 'returns an empty array if no customers exist' do Customer.destroy_all get customers_path - body = JSON.parse(response.body) - expect(body).must_be_instance_of Array - expect(body.length).must_equal 0 + body = check_response(expected_type: Array) + expect(body).must_equal [] end end @@ -35,25 +40,22 @@ before do @customer = customers(:customer1) end - it 'responds with JSON and success' do + + it 'responds with success and JSON in a Hash' do get customer_path(@customer.id) - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :success + check_response(expected_type: Hash) end it 'will return a hash with all proper fields for an existing customer' do get customer_path(@customer.id) - body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash + body = check_response(expected_type: Hash) expect(body.keys.sort).must_equal CUSTOMER_FIELDS end - it 'will return a 404 request with json for a non-existant customer' do + it 'will return a 404 request with JSON for a non-existant customer' do get customer_path(-1) - must_respond_with :not_found - body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash + body = check_response(expected_type: Hash, expected_status: :not_found) expect(body['success']).must_equal false expect(body['message']).must_equal 'Not found' end From 252d543000ebd90e5ddcaa57c0af1cd245ac93b4 Mon Sep 17 00:00:00 2001 From: Nikki Vaughan Date: Wed, 27 May 2020 12:00:45 -0700 Subject: [PATCH 15/33] updated video controller to pass postman tests --- app/controllers/videos_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 831f8f8ef..895667923 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -9,12 +9,11 @@ def show if video.nil? render json: { - ok: false, - message: 'Not found', + errors: ['Not Found'], }, status: :not_found return end - render json: video.as_json(only: ["id", "title", "release_date", "available_inventory"]), + render json: video.as_json(only: ["title", 'overview', "release_date", 'total_inventory', "available_inventory"]), status: :ok end From 38f5d821821582d23a4909403245ca0606539e22 Mon Sep 17 00:00:00 2001 From: Nikki Vaughan Date: Wed, 27 May 2020 12:07:31 -0700 Subject: [PATCH 16/33] updated video controller tests to pass --- app/controllers/videos_controller.rb | 2 +- test/controllers/videos_controller_test.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 895667923..2ad07fb8f 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.as_json(only: ["id", "title", "release_date", "available_inventory"]) + videos = Video.all.as_json(only: ["title", 'overview', "release_date", 'total_inventory', "available_inventory"]) render json: videos, status: :ok end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index f590f3564..9f6bd1272 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 - VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + VIDEO_FIELDS = ["title", 'overview', "release_date", 'total_inventory', "available_inventory"].sort describe "index" do it "responds with JSON and success" do get videos_path @@ -65,8 +65,7 @@ must_respond_with :not_found body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Not found' + expect(body['errors']).must_equal ['Not Found'] end end From 6398488eadc598b61ee63793e7b992abbd56f9a5 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Wed, 27 May 2020 13:05:17 -0700 Subject: [PATCH 17/33] Updated the index and show tests to dry up the codes. --- test/controllers/videos_controller_test.rb | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 9f6bd1272..d576c2c22 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,23 +2,29 @@ describe VideosController do 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 - expect(response.header["Content-Type"]).must_include 'json' - must_respond_with :ok + check_response(expected_type: Array) end it "returns all the proper fields for a list of videos" do # Act get videos_path - # Get the body of the response as an array of hash - body = JSON.parse(response.body) - # Assert - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) body.each do |video| expect(video).must_be_instance_of Hash @@ -31,10 +37,8 @@ # Act get videos_path - # Get the body of the response as an array of hash - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + # Assert + body = check_response(expected_type: Array) expect(body.length).must_equal 0 end @@ -48,11 +52,7 @@ get video_path(video.id) # Assert - must_respond_with :success - - body = JSON.parse(response.body) - - expect(response.header["Content-Type"]).must_include 'json' + body = check_response(expected_type: Hash) expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal VIDEO_FIELDS @@ -63,8 +63,7 @@ get video_path(-1) must_respond_with :not_found - body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash + body = check_response(expected_type: Hash, expected_status: :not_found) expect(body['errors']).must_equal ['Not Found'] end end From 888276d94330739cf1c4fb9da8bf2e25981e0f69 Mon Sep 17 00:00:00 2001 From: Nikki Vaughan Date: Wed, 27 May 2020 13:24:30 -0700 Subject: [PATCH 18/33] tests are writen for creating a video --- test/controllers/videos_controller_test.rb | 31 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index d576c2c22..2785d4d5c 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -68,9 +68,30 @@ def check_response(expected_type:, expected_status: :success) end end - # describe 'create' do - # it "return the status 200 when the video is created successfully" do - - # end - # end + describe 'create' do + let(:video_params) { + { + video: { + title: "test", + overview: 'this is a test', + release_date: 1979-01-18, + total_inventory: 10, + available_inventory: 10 + } + } + } + + it "return the created status when the video is created successfully" do + expect{ post videos_path, params: video_params }.must_differ "Video.count", 1 + check_response(expected_type: Hash, expected_status: :created) + end + + it 'returns bad_request status when user gives bad data' do + video_params[:video][:title] = nil + + expect{ post video_path, params: video_params }.wont_change "Video.count" + body = check_response(expected_type: Array, expected_status: :bad_request) + expect{ body['errors'].keys }.must_include 'title' + end + end end From af7abbca3f0f30f0135b90d40552b4d88b2ec74c Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Wed, 27 May 2020 13:27:28 -0700 Subject: [PATCH 19/33] Added create action in Video controller --- app/controllers/customers_controller.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 2002e7d1c..d28f72920 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -20,4 +20,25 @@ def show render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]), status: :ok end + + def create + video = Video.new(pet_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 From 88e354ac0bd50ecff047f6e4ecd43dedac3b9996 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Wed, 27 May 2020 14:24:51 -0700 Subject: [PATCH 20/33] working on creating video but still have issues --- app/controllers/customers_controller.rb | 20 -------------------- app/controllers/videos_controller.rb | 18 ++++++++++++++++++ test/controllers/videos_controller_test.rb | 6 +++--- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d28f72920..df95afad3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -21,24 +21,4 @@ def show status: :ok end - def create - video = Video.new(pet_params) - - if video.save - render json: video.as_json(only: [:id]), status: :created - return - else - render json: { - ok: false, - errors: video.errors.messages - }, status: :bad_request - return - end - end - - private - - def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) - end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 2ad07fb8f..07c4f5133 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -18,5 +18,23 @@ def show end def create + video = Video.new(params: params[:title, :overview, :release_date, :total_inventory, :available_inventory]) + byebug + 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 2785d4d5c..dc2385c4e 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -74,7 +74,7 @@ def check_response(expected_type:, expected_status: :success) video: { title: "test", overview: 'this is a test', - release_date: 1979-01-18, + release_date: "1979-01-18", total_inventory: 10, available_inventory: 10 } @@ -89,8 +89,8 @@ def check_response(expected_type:, expected_status: :success) it 'returns bad_request status when user gives bad data' do video_params[:video][:title] = nil - expect{ post video_path, params: video_params }.wont_change "Video.count" - body = check_response(expected_type: Array, expected_status: :bad_request) + expect{ post videos_path, params: video_params }.wont_change "Video.count" + body = check_response(expected_type: Hash, expected_status: :bad_request) expect{ body['errors'].keys }.must_include 'title' end end From b37f2d767925edbed90d6ad1759407c10eb65ccc Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Wed, 27 May 2020 14:57:42 -0700 Subject: [PATCH 21/33] Upated the create action and also the video params for the API in order to pass the smoke test --- app/controllers/videos_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 07c4f5133..d908d0baa 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -18,8 +18,8 @@ def show end def create - video = Video.new(params: params[:title, :overview, :release_date, :total_inventory, :available_inventory]) - byebug + video = Video.new(video_params) + if video.save render json: video.as_json(only: [:id]), status: :created return @@ -35,6 +35,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 From d245ba95cc9c0cbdd5aa4e081abb02758f88134a Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Wed, 27 May 2020 14:58:21 -0700 Subject: [PATCH 22/33] Got rid of the nested curly braces to pass to the test --- test/controllers/videos_controller_test.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index dc2385c4e..007f78306 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -71,13 +71,11 @@ def check_response(expected_type:, expected_status: :success) describe 'create' do let(:video_params) { { - video: { - title: "test", - overview: 'this is a test', - release_date: "1979-01-18", - total_inventory: 10, - available_inventory: 10 - } + title: "test", + overview: 'this is a test', + release_date: "1979-01-18", + total_inventory: 10, + available_inventory: 10 } } @@ -87,11 +85,11 @@ def check_response(expected_type:, expected_status: :success) end it 'returns bad_request status when user gives bad data' do - video_params[:video][:title] = nil + video_params[:title] = nil expect{ post videos_path, params: video_params }.wont_change "Video.count" body = check_response(expected_type: Hash, expected_status: :bad_request) - expect{ body['errors'].keys }.must_include 'title' + expect( body['errors'].keys ).must_include 'title' end end end From cd6152b3fa824be96c82575bf57c8b1d174be5ca Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Wed, 27 May 2020 15:10:10 -0700 Subject: [PATCH 23/33] Fixed the tests in videos to pass the smoke tests --- app/controllers/videos_controller.rb | 3 +-- test/controllers/videos_controller_test.rb | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index d908d0baa..d0272265b 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.as_json(only: ["title", 'overview', "release_date", 'total_inventory', "available_inventory"]) + videos = Video.all.as_json(only: ["id", "title", "release_date", "available_inventory"]) render json: videos, status: :ok end @@ -25,7 +25,6 @@ def create return else render json: { - ok: false, errors: video.errors.messages }, status: :bad_request return diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 007f78306..1dc035ba4 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe VideosController do - VIDEO_FIELDS = ["title", 'overview', "release_date", 'total_inventory', "available_inventory"].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status @@ -28,7 +27,7 @@ def check_response(expected_type:, expected_status: :success) body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + expect(video.keys.sort).must_equal ["id", "title", "release_date", "available_inventory"].sort end end @@ -55,7 +54,7 @@ def check_response(expected_type:, expected_status: :success) body = check_response(expected_type: Hash) expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal ["title", 'overview', "release_date", 'total_inventory', "available_inventory"].sort end # Edge case From 1acf2c232d367b20d417360e896610b0b8337fca Mon Sep 17 00:00:00 2001 From: Nikki Vaughan Date: Wed, 27 May 2020 15:29:40 -0700 Subject: [PATCH 24/33] video validation tests --- test/models/video_test.rb | 58 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..223d0e6ef 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,59 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe 'validations' do + before do + @video = videos(:video1) + end + + it 'is valid when all fields are present' do + result = @video.valid? + expect(result).must_equal true + end + + it 'is invalid without a title' do + @video.title = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :title + expect(@video.errors.messages[:title]).must_include "can't be blank" + end + + it 'is invalid without a overview' do + @video.overview = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :overview + expect(@video.errors.messages[:overview]).must_include "can't be blank" + end + + it 'is invalid without a release_date' do + @video.release_date = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :release_date + expect(@video.errors.messages[:release_date]).must_include "can't be blank" + end + + it 'is invalid without a total_inventory' do + @video.total_inventory = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :total_inventory + expect(@video.errors.messages[:total_inventory]).must_include "can't be blank" + end + + it 'is invalid without a available_inventory' do + @video.available_inventory = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :available_inventory + expect(@video.errors.messages[:available_inventory]).must_include "can't be blank" + end + end end From 0802e52635a99109487256567728ddeb69c8179e Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:17:47 -0700 Subject: [PATCH 25/33] Createad check_out and check_in actions and passed all the tests --- app/controllers/rentals_controller.rb | 84 +++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..d37991fbf 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,86 @@ class RentalsController < ApplicationController + + def check_out + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + + if customer.nil? || video.nil? + render json: { + errors: ["Not Found"] + }, status: :not_found + return + end + + if video.available_inventory == 0 + render json: { + errors: ["Bad Request. There is no video available."] + }, status: :bad_request + return + end + + rental = Rental.new( + customer_id: customer.id, + video_id: video.id, + due_date: Date.today + 7 + ) + + if rental.save + + customer.videos_checked_out_count += 1 + customer.save + video.available_inventory -= 1 + video.save + + render json: { + customer_id: customer.id, + video_id: video.id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + },status: :ok + # include: [customer: { only: [:videos_checked_out_count]}, + # video: { only: [:available_inventory]}]),status: :ok + + return + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + return + end + end + + def check_in + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + p customer + p video + if customer.nil? || video.nil? + render json: { + errors: ["Not Found"] + }, status: :not_found + return + else + customer.videos_checked_out_count -= 1 + customer.save + video.available_inventory += 1 + video.save + # rental.save + + render json: { + customer_id: customer.id, + video_id: video.id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + }, status: :ok + + return + end + end + + private + def rental_params + return params.permit(:customer_id, :video_id, :due_date) + end + end From d10639f6b9b58d8c3258faefd5f8f9e86e40670f Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:18:07 -0700 Subject: [PATCH 26/33] Added more field validations --- app/models/video.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/video.rb b/app/models/video.rb index abcba2035..b80c7a495 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -2,7 +2,7 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - validates :title, presence: true, uniqueness:true + validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true validates :total_inventory, presence: true From 27aa674ba83977e5483c004320f13a961a63e5a1 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:18:22 -0700 Subject: [PATCH 27/33] Added routes for check_out and check_in --- config/routes.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 41e5fd1a5..5d349b4be 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,8 @@ resources :videos, only:[:index, :show, :create] - + post '/rentals/check-out', to: 'rentals#check_out', as: "checkout" + post '/rentals/check-in', to: 'rentals#check_in', as: "checkin" + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 3cdb6a92dcc8173bf5fd621f81fd070238b848a4 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:19:03 -0700 Subject: [PATCH 28/33] Added the due_date column to the Rental model --- db/schema.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 5cce4383f..dcb89ae42 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_220206) do +ActiveRecord::Schema.define(version: 2020_05_27_221313) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,6 +33,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "customer_id" t.bigint "video_id" + 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 2a657c30a2c188783bce63480fa098d42a9fdecf Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:19:26 -0700 Subject: [PATCH 29/33] Added the due_date column to the Rental model --- db/migrate/20200527221313_add_due_date_column_in_rental.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20200527221313_add_due_date_column_in_rental.rb diff --git a/db/migrate/20200527221313_add_due_date_column_in_rental.rb b/db/migrate/20200527221313_add_due_date_column_in_rental.rb new file mode 100644 index 000000000..708c927d9 --- /dev/null +++ b/db/migrate/20200527221313_add_due_date_column_in_rental.rb @@ -0,0 +1,5 @@ +class AddDueDateColumnInRental < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :due_date, :date + end +end From 2893d7c6b471b245230c25b7b9865c036c534dce Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:19:57 -0700 Subject: [PATCH 30/33] Wrote tests for check_in and check_out and passed all the tests --- test/controllers/rentals_controller_test.rb | 145 +++++++++++++++++++- 1 file changed, 141 insertions(+), 4 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..00972f018 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,144 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -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_instance_of expected_type + return body + end + + describe 'check_out' do + before do + @customer = customers(:customer1) + @video = videos(:video1) + end + + let(:rental_params) { + { + customer_id: @customer.id, + video_id: @video.id, + due_date: Date.today + } + } + + it 'should respond with success' do + expect{ post checkout_path, params: rental_params }.must_differ "Rental.count", 1 + + check_response(expected_type: Hash) + end + + it "should increase the customer's videos_checked_out_count by one" do + post checkout_path, params: rental_params + customer = Customer.find_by(id: @customer.id) + check_response(expected_type: Hash) + expect(customer.videos_checked_out_count).must_equal 2 + end + + it "should decrease the video's available_inventory by one" do + # decrease the video's available_inventory by one + post checkout_path, params: rental_params + video= Video.find_by(id: @video.id) + check_response(expected_type: Hash) + expect(video.available_inventory).must_equal 8 + end + + it 'should create a due date' do + # create a due date. The rental's due date is the seven days from the current date + post checkout_path, params: rental_params + rental = Rental.first + check_response(expected_type: Hash) + expect(rental.due_date).must_equal Date.today + 7 + end + + # # edge case + it "should responde with 404 if customer does not exist" do + rental_params[:customer_id] = -1 + post checkout_path, params: rental_params + must_respond_with :not_found + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body['errors']).must_equal ['Not Found'] + expect{ post checkout_path, params: rental_params }.wont_differ ("Rental.count") + + end + + it "should responde with 404 if video does not exist" do + rental_params[:video_id] = -1 + post checkout_path, params: rental_params + must_respond_with :not_found + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body['errors']).must_equal ['Not Found'] + expect{ post checkout_path, params: rental_params }.wont_differ ("Rental.count") + end + + it "should not create a check_out if the customer wants to rental a video where its available_inventory is 0 " do + @video.available_inventory = 0 + @video.save + post checkout_path, params: rental_params + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body['errors']).must_equal ["Bad Request. There is no video available."] + expect{post checkout_path, params: rental_params}.wont_differ 'Rental.count' + end + end + + describe 'check_in' do + before do + @customer = customers(:customer1) + @video = videos(:video1) + end + + let(:rental_params) { + { + customer_id: @customer.id, + video_id: @video.id + } + } + + it 'should respond with success' do + + expect{ post checkin_path, params: rental_params }.wont_differ "Rental.count" + + check_response(expected_type: Hash) + end + + it "should decrease the customer's videos_checked_in_count by one" do + post checkin_path, params: rental_params + customer = Customer.find_by(id: @customer.id) + check_response(expected_type: Hash) + expect(customer.videos_checked_out_count).must_equal 0 + end + + it "should increase the video's available_inventory by one" do + post checkin_path, params: rental_params + video = Video.find_by(id: @video.id) + check_response(expected_type: Hash) + expect(video.available_inventory).must_equal 10 + end + + # # # edge case + it "should responde with 404 if customer does not exist" do + rental_params[:customer_id] = -1 + post checkin_path, params: rental_params + must_respond_with :not_found + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body['errors']).must_equal ['Not Found'] + expect{ post checkin_path, params: rental_params }.wont_differ ("Rental.count") + + end + + it "should responde with 404 if video does not exist" do + rental_params[:video_id] = -1 + post checkin_path, params: rental_params + must_respond_with :not_found + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body['errors']).must_equal ['Not Found'] + expect{ post checkin_path, params: rental_params }.wont_differ ("Rental.count") + end + end +end \ No newline at end of file From 9b78d772defe12428657bf972a4793c0d1ce5f98 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:20:14 -0700 Subject: [PATCH 31/33] Added rental.yml --- test/fixtures/rentals.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 test/fixtures/rentals.yml diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..83a7ade60 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,5 @@ +# rental1: +# customer: customer1 +# video: video1 +# due_date: Date.today + 7 + From 132bdffdfbe9f5c0b44d76f383ca0701d08777e2 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:20:41 -0700 Subject: [PATCH 32/33] Added validation tests for Video model --- test/models/video_test.rb | 59 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..e17dcc831 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,60 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe 'validations' do + before do + @video = videos(:video1) + end + + it 'is valid when all fields are present' do + result = @video.valid? + expect(result).must_equal true + end + + it 'is invalid without a title' do + @video.title = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :title + expect(@video.errors.messages[:title]).must_include "can't be blank" + end + + it 'is invalid without a overview' do + @video.overview = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :overview + expect(@video.errors.messages[:overview]).must_include "can't be blank" + end + + it 'is invalid without a release_date' do + @video.release_date = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :release_date + expect(@video.errors.messages[:release_date]).must_include "can't be blank" + end + + it 'is invalid without a total_inventory' do + @video.total_inventory = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :total_inventory + expect(@video.errors.messages[:total_inventory]).must_include "can't be blank" + end + + it 'is invalid without a available_inventory' do + @video.available_inventory = nil + result = @video.valid? + + expect(result).must_equal false + expect(@video.errors.messages).must_include :available_inventory + expect(@video.errors.messages[:available_inventory]).must_include "can't be blank" + end + end end + From 752022687bedbeb003fb93b3143a581601ad1996 Mon Sep 17 00:00:00 2001 From: Tithvorlak Mok Date: Thu, 28 May 2020 17:26:07 -0700 Subject: [PATCH 33/33] Final cleanup --- app/controllers/rentals_controller.rb | 5 ----- test/fixtures/rentals.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d37991fbf..43ff938aa 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -38,8 +38,6 @@ def check_out videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory },status: :ok - # include: [customer: { only: [:videos_checked_out_count]}, - # video: { only: [:available_inventory]}]),status: :ok return else @@ -53,8 +51,6 @@ def check_out def check_in customer = Customer.find_by(id: params[:customer_id]) video = Video.find_by(id: params[:video_id]) - p customer - p video if customer.nil? || video.nil? render json: { errors: ["Not Found"] @@ -65,7 +61,6 @@ def check_in customer.save video.available_inventory += 1 video.save - # rental.save render json: { customer_id: customer.id, diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 83a7ade60..e69de29bb 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,5 +0,0 @@ -# rental1: -# customer: customer1 -# video: video1 -# due_date: Date.today + 7 -