From 5a81fe85c4375a2dc96c7602df90da7184571f5d Mon Sep 17 00:00:00 2001 From: Yieni Date: Tue, 26 May 2020 17:46:51 -0700 Subject: [PATCH 01/11] create new rails api and do zomg thing' --- .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/controllers/zomgs_controller.rb | 5 + 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 | 5 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/controllers/zomgs_controller_test.rb | 7 + 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 62 files changed, 1138 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/controllers/zomgs_controller.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/controllers/zomgs_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..2714f5313 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.4 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..f05cd60c1 --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.4' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..b849770cd --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.4p104 + +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/controllers/zomgs_controller.rb b/app/controllers/zomgs_controller.rb new file mode 100644 index 000000000..88aba2a3c --- /dev/null +++ b/app/controllers/zomgs_controller.rb @@ -0,0 +1,5 @@ +class ZomgsController < ApplicationController + def index + render json: {message: "it works!"} + end +end 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..1535daf60 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +k2p5TD4JW1tE7MxOeZxhCVn1lXoWtmkJqGemsyX9TP7xAQpUdovAiLv4rtdaHNYCRtmtLTKOJGJLWLww5JJYS6OoXTcYb3nNQTrInpqnwoRBuoRUlo6KNLhk226Y9Kw6istPJJxepO0cu7dChJ8GFKmI23ccb728AHpY+tsrWXT72O6NWcpqiH/v49d3B9ssfUXk8eI0E+g/uQ+8IYN6P2AnFYacLBiXTyOK1t9LE7gwWOk337hQRuyuWT37GCmmH9PldzAbsSI6yKe95uOO8D/uJx+1q3Vtr9CrmmURDqLmXC20dZFTPyvaM07/dO3SQP2AYdZO0HOiosw6MjO8KHgXD5a1PQLbFYxR2l2M62+wNexDS7vJDVraNvTGbySFcncXTKem5/TBl7/g1ZSuoLbHwkhzlcxEwfsc--hbEpCBvmT4MMRHpf--jejRTrsOgqklQ5DRPDhOCQ== \ 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..d4201dfd6 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,5 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + root to: 'zomgs#index' + get '/zomg', to: 'zomgs#index' +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b10373ba6 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/zomgs_controller_test.rb b/test/controllers/zomgs_controller_test.rb new file mode 100644 index 000000000..aaa39baa6 --- /dev/null +++ b/test/controllers/zomgs_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe ZomgsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From a95eaf6e7d297320e26bae5bf2333d7bd04a4e6d Mon Sep 17 00:00:00 2001 From: Yieni Date: Tue, 26 May 2020 18:50:13 -0700 Subject: [PATCH 02/11] create models: video, rental, customer. create controller:video, rental, customer. relate rentals to customer and video --- app/controllers/checkouts_controller.rb | 2 + app/controllers/customers_controller.rb | 2 + app/controllers/videos_controller.rb | 7 ++++ app/controllers/zomgs_controller.rb | 5 --- app/models/checkout.rb | 5 +++ app/models/customer.rb | 5 +++ app/models/video.rb | 4 ++ config/routes.rb | 9 ++++- db/migrate/20200527005111_create_videos.rb | 13 +++++++ db/migrate/20200527005204_create_customers.rb | 15 ++++++++ db/migrate/20200527005355_create_checkouts.rb | 13 +++++++ ...d_videos_checked_out_count_to_customers.rb | 5 +++ ...00527011416_change_checkouts_to_rentals.rb | 5 +++ ...200527013646_relate_rentalsto_customers.rb | 6 +++ .../20200527013654_relate_rentalsto_videos.rb | 6 +++ db/schema.rb | 37 ++++++++++++++++++- test/controllers/checkouts_controller_test.rb | 7 ++++ test/controllers/customers_controller_test.rb | 7 ++++ test/controllers/videos_controller_test.rb | 22 +++++++++++ test/models/checkout_test.rb | 7 ++++ test/models/customer_test.rb | 7 ++++ test/models/video_test.rb | 7 ++++ 22 files changed, 188 insertions(+), 8 deletions(-) create mode 100644 app/controllers/checkouts_controller.rb create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/videos_controller.rb delete mode 100644 app/controllers/zomgs_controller.rb create mode 100644 app/models/checkout.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200527005111_create_videos.rb create mode 100644 db/migrate/20200527005204_create_customers.rb create mode 100644 db/migrate/20200527005355_create_checkouts.rb create mode 100644 db/migrate/20200527010207_add_videos_checked_out_count_to_customers.rb create mode 100644 db/migrate/20200527011416_change_checkouts_to_rentals.rb create mode 100644 db/migrate/20200527013646_relate_rentalsto_customers.rb create mode 100644 db/migrate/20200527013654_relate_rentalsto_videos.rb create mode 100644 test/controllers/checkouts_controller_test.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/videos_controller_test.rb create mode 100644 test/models/checkout_test.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/video_test.rb diff --git a/app/controllers/checkouts_controller.rb b/app/controllers/checkouts_controller.rb new file mode 100644 index 000000000..21e55b22a --- /dev/null +++ b/app/controllers/checkouts_controller.rb @@ -0,0 +1,2 @@ +class CheckoutsController < ApplicationController +end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..002c6662b --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,7 @@ +class VideosController < ApplicationController + + def index + videos = Video.all.as_json(only: [:id, :title, :release_date ]) + render json: videos, status: :ok + end +end diff --git a/app/controllers/zomgs_controller.rb b/app/controllers/zomgs_controller.rb deleted file mode 100644 index 88aba2a3c..000000000 --- a/app/controllers/zomgs_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class ZomgsController < ApplicationController - def index - render json: {message: "it works!"} - end -end diff --git a/app/models/checkout.rb b/app/models/checkout.rb new file mode 100644 index 000000000..1010ccbde --- /dev/null +++ b/app/models/checkout.rb @@ -0,0 +1,5 @@ +class Checkout < ApplicationRecord + validates :video_id, :customer_id, presence :true + belongs_to :video + belongs_to :customer +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..2bc1611b0 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,5 @@ +class Customer < ApplicationRecord + validates :name, presence: true, uniqueness:{scope: :phone, message: 'Customer already exists in database'} + validates :registered_at, :address, :city, :postal_code, :phone, presence: true + has_many :videos , dependent: :nullify +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..4fadf3c78 --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,4 @@ +class Video < ApplicationRecord + validates :title, release_date:, available_inventory:, presence: true + has_many :customers, dependent: :nullify +end diff --git a/config/routes.rb b/config/routes.rb index d4201dfd6..f3c04528d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,10 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html - root to: 'zomgs#index' - get '/zomg', to: 'zomgs#index' + + resources :videos, only:[:index, :show, :create] + resources :customers, only:[:index] + post '/rentals/check-out', to: 'rentals#create', as: 'check_out' + post '/rentals/check-in', to: 'rentals#create', as: 'check_in' + + end diff --git a/db/migrate/20200527005111_create_videos.rb b/db/migrate/20200527005111_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200527005111_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/20200527005204_create_customers.rb b/db/migrate/20200527005204_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200527005204_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/20200527005355_create_checkouts.rb b/db/migrate/20200527005355_create_checkouts.rb new file mode 100644 index 000000000..220557f19 --- /dev/null +++ b/db/migrate/20200527005355_create_checkouts.rb @@ -0,0 +1,13 @@ +class CreateCheckouts < ActiveRecord::Migration[6.0] + def change + create_table :checkouts do |t| + t.integer :customer_id + t.integer :video_id + t.date :due_date + t.integer :videos_checked_out_count + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20200527010207_add_videos_checked_out_count_to_customers.rb b/db/migrate/20200527010207_add_videos_checked_out_count_to_customers.rb new file mode 100644 index 000000000..7975b96ef --- /dev/null +++ b/db/migrate/20200527010207_add_videos_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCountToCustomers < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/migrate/20200527011416_change_checkouts_to_rentals.rb b/db/migrate/20200527011416_change_checkouts_to_rentals.rb new file mode 100644 index 000000000..4a65dc745 --- /dev/null +++ b/db/migrate/20200527011416_change_checkouts_to_rentals.rb @@ -0,0 +1,5 @@ +class ChangeCheckoutsToRentals < ActiveRecord::Migration[6.0] + def change + rename_table :checkouts, :rentals + end +end diff --git a/db/migrate/20200527013646_relate_rentalsto_customers.rb b/db/migrate/20200527013646_relate_rentalsto_customers.rb new file mode 100644 index 000000000..108374dbb --- /dev/null +++ b/db/migrate/20200527013646_relate_rentalsto_customers.rb @@ -0,0 +1,6 @@ +class RelateRentalstoCustomers < ActiveRecord::Migration[6.0] + def change + remove_column :rentals, :customer_id + add_reference :rentals, :customer, index: true + end +end diff --git a/db/migrate/20200527013654_relate_rentalsto_videos.rb b/db/migrate/20200527013654_relate_rentalsto_videos.rb new file mode 100644 index 000000000..57a3a3ac2 --- /dev/null +++ b/db/migrate/20200527013654_relate_rentalsto_videos.rb @@ -0,0 +1,6 @@ +class RelateRentalstoVideos < ActiveRecord::Migration[6.0] + def change + remove_column :rentals, :video_id + add_reference :rentals, :video, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..962f0c592 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,44 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2020_05_27_013654) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" + end + + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.integer "videos_checked_out_count" + t.integer "available_inventory" + 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 + end diff --git a/test/controllers/checkouts_controller_test.rb b/test/controllers/checkouts_controller_test.rb new file mode 100644 index 000000000..8da78c528 --- /dev/null +++ b/test/controllers/checkouts_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CheckoutsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..5453407f6 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,22 @@ +require "test_helper" + REQUIRED_VIDEO_FIELDS = ["id","name", "species", "age","owner"].sort +describe VideosController do + + 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 + + body = check_response(expected_type: Array) + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal REQUIRED_VIDEO_FIELDS +end diff --git a/test/models/checkout_test.rb b/test/models/checkout_test.rb new file mode 100644 index 000000000..9e7510fde --- /dev/null +++ b/test/models/checkout_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Checkout do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/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 8b03de234646b7373bfd09e5d580d496abaa5f9c Mon Sep 17 00:00:00 2001 From: Yieni Date: Tue, 26 May 2020 21:08:49 -0700 Subject: [PATCH 03/11] created indirect relationship, wrote index and show actions along with their tests for video and customer --- app/controllers/customers_controller.rb | 4 ++ app/controllers/videos_controller.rb | 16 ++++- app/models/checkout.rb | 5 -- app/models/customer.rb | 3 +- app/models/rental.rb | 5 ++ app/models/video.rb | 5 +- test/controllers/customers_controller_test.rb | 27 ++++++++- test/controllers/videos_controller_test.rb | 60 ++++++++++++++++++- test/controllers/zomgs_controller_test.rb | 7 --- test/fixtures/videos.yml | 20 +++++++ 10 files changed, 131 insertions(+), 21 deletions(-) delete mode 100644 app/models/checkout.rb create mode 100644 app/models/rental.rb delete mode 100644 test/controllers/zomgs_controller_test.rb create mode 100644 test/fixtures/videos.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..30895c1b4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def index + customers = Customer.all.as_json(only: [:name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) + render json: customers, status: :ok + end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 002c6662b..f3e691642 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,21 @@ class VideosController < ApplicationController def index - videos = Video.all.as_json(only: [:id, :title, :release_date ]) + videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory, :overview, :total_inventory]) render json: videos, status: :ok end + + def show + video = Video.find_by(id:params[:id]) + if video + render json: video.as_json(only: [:id, :title, :release_date, :available_inventory, :overview, :total_inventory]) + return + else + render json: {ok: false, errors: ["Not Found"]}, status: :not_found + return + end + end + + def create + end end diff --git a/app/models/checkout.rb b/app/models/checkout.rb deleted file mode 100644 index 1010ccbde..000000000 --- a/app/models/checkout.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Checkout < ApplicationRecord - validates :video_id, :customer_id, presence :true - belongs_to :video - belongs_to :customer -end diff --git a/app/models/customer.rb b/app/models/customer.rb index 2bc1611b0..75a5e1907 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord validates :name, presence: true, uniqueness:{scope: :phone, message: 'Customer already exists in database'} validates :registered_at, :address, :city, :postal_code, :phone, presence: true - has_many :videos , dependent: :nullify + has_many :rentals + has_many :videos, through: :rentals, dependent: :nullify end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..30d440f4b --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,5 @@ +class Rental < ApplicationRecord + validates :video_id, :customer_id, presence: true + belongs_to :video + belongs_to :customer +end diff --git a/app/models/video.rb b/app/models/video.rb index 4fadf3c78..e85331d60 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,5 @@ class Video < ApplicationRecord - validates :title, release_date:, available_inventory:, presence: true - has_many :customers, dependent: :nullify + validates :title, :release_date, :available_inventory, presence: true + has_many :rentals + has_many :customers, through: :rentals, dependent: :nullify end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..0c60c568e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,28 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + REQUIRED_CUSTOMERS_FIELDS = ["customer_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_kind_of expected_type + return body + end + describe "index" do + it "responds with JSON and success" do + get customers_path + + body = check_response(expected_type: Array) + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal REQUIRED_CUSTOMERS_FIELDS + end + end + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5453407f6..9742e4cd6 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,8 +1,9 @@ require "test_helper" - REQUIRED_VIDEO_FIELDS = ["id","name", "species", "age","owner"].sort + describe VideosController do + REQUIRED_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory", "overview", "total_inventory"].sort - def check_response(expected_type: expected_status: :success) + def check_response(expected_type:, expected_status: :success) must_respond_with expected_status expect(response.header['Content-Type']).must_include 'json' @@ -19,4 +20,59 @@ 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 REQUIRED_VIDEO_FIELDS + end + end + it " will response with empty array when there are no videos" do + Video.destroy_all + + get videos_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end + + describe "show" do + + it "responds to JSON and success and data if at least one exsiting video" do + existing_video = videos(:video1) + get video_path(existing_video.id) + + p existing_video.release_date + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal REQUIRED_VIDEO_FIELDS + expect(body["id"]).must_equal existing_video.id + expect(body["title"]).must_equal existing_video.title + expect(body["release_date"]).must_equal existing_video.release_date.to_s + expect(body["available_inventory"]).must_equal existing_video.available_inventory + end + it "responds with JSON, not found, and errors when looking for now existing path" do + get video_path(-1) + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["ok"]).must_equal false + expect(body["errors"]).must_include "Not Found" + end + end + + describe "create" do + let(:video_data){ + { + video: { + title: "Space Jam", + release_date: 1999, + available_inventory: 10 + } + } + } + + it "responds with JSON and created a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + end + end end diff --git a/test/controllers/zomgs_controller_test.rb b/test/controllers/zomgs_controller_test.rb deleted file mode 100644 index aaa39baa6..000000000 --- a/test/controllers/zomgs_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "test_helper" - -describe ZomgsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..97a86dc4d --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,20 @@ +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 + +video2: + title: Savior Of The Curse, + overview: The strange woman claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Unsure what to think of all this and of this strange woman, the boy hesitantly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made., + release_date: '2010-11-05' + total_inventory: 1 + available_inventory: 1 + +video3: + title: Women Of Destruction + overview: But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell. + release_date: '2006-10-01' + total_inventory: 1 + available_inventory: 1 \ No newline at end of file From 008d13efa254085c00621bcd158cd9927f2c9ad3 Mon Sep 17 00:00:00 2001 From: Yieni Date: Tue, 26 May 2020 22:52:53 -0700 Subject: [PATCH 04/11] wrote create method and test for video, renamed controller, fixed show on video controller, created customer yaml --- app/controllers/checkouts_controller.rb | 2 - app/controllers/rentals_controller.rb | 2 + app/controllers/videos_controller.rb | 17 ++++++- app/models/customer.rb | 6 +-- app/models/video.rb | 7 +-- test/controllers/checkouts_controller_test.rb | 7 --- test/controllers/customers_controller_test.rb | 10 ++++ test/controllers/rentals_controller_test.rb | 26 ++++++++++ test/controllers/videos_controller_test.rb | 20 ++++++-- test/fixtures/customers.yml | 18 +++++++ test/models/customer_test.rb | 48 ++++++++++++++++++- 11 files changed, 141 insertions(+), 22 deletions(-) delete mode 100644 app/controllers/checkouts_controller.rb create mode 100644 app/controllers/rentals_controller.rb delete mode 100644 test/controllers/checkouts_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/customers.yml diff --git a/app/controllers/checkouts_controller.rb b/app/controllers/checkouts_controller.rb deleted file mode 100644 index 21e55b22a..000000000 --- a/app/controllers/checkouts_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class CheckoutsController < ApplicationController -end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f3e691642..ffcb4a8ab 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -8,7 +8,7 @@ def index def show video = Video.find_by(id:params[:id]) if video - render json: video.as_json(only: [:id, :title, :release_date, :available_inventory, :overview, :total_inventory]) + render json: video.as_json(only: [:id, :title, :release_date, :available_inventory, :overview, :total_inventory]), status: :ok return else render json: {ok: false, errors: ["Not Found"]}, status: :not_found @@ -17,5 +17,20 @@ def show end def create + video = Video.new(video_params) + if video.save + render json: video.as_json, status: :created + return + else + render json: {ok: false, errors: video.errors.messages}, status: :bad_request + return + end end + + private + def video_params + params.require(:video).permit(:title, :release_date, :available_inventory, :overview, :total_inventory) + end end + + diff --git a/app/models/customer.rb b/app/models/customer.rb index 75a5e1907..344e718b2 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord - validates :name, presence: true, uniqueness:{scope: :phone, message: 'Customer already exists in database'} - validates :registered_at, :address, :city, :postal_code, :phone, presence: true + # validates :name, presence: true, uniqueness:{scope: :phone, message: 'Customer already exists in database'} + # validates :registered_at, :address, :city, :postal_code, :phone, presence: true has_many :rentals - has_many :videos, through: :rentals, dependent: :nullify + has_many :videos, through: :rentals end diff --git a/app/models/video.rb b/app/models/video.rb index e85331d60..1797203a2 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,6 @@ class Video < ApplicationRecord - validates :title, :release_date, :available_inventory, presence: true - has_many :rentals - has_many :customers, through: :rentals, dependent: :nullify + validates :total_inventory, :release_date, presence: true + validates :title, uniqueness:{scope: :release_date}, presence: true + has_many :rentals, dependent: :nullify + has_many :customers, through: :rentals end diff --git a/test/controllers/checkouts_controller_test.rb b/test/controllers/checkouts_controller_test.rb deleted file mode 100644 index 8da78c528..000000000 --- a/test/controllers/checkouts_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "test_helper" - -describe CheckoutsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 0c60c568e..ca7275ba6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -24,5 +24,15 @@ def check_response(expected_type:, expected_status: :success) expect(customer.keys.sort).must_equal REQUIRED_CUSTOMERS_FIELDS end end + + it " will response with empty array when there are no customers" do + Customer.destroy_all + + get customers_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..6aa2dad7f --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,26 @@ +require "test_helper" + +describe RentalsController do + let(:customer){ + customers(:customer1) + } + let(:video){ + videos(:video1) + } + let(:rental){ + { + customer_id: customer.id, + movie_id: video.id, + } + } + + describe "checkout" do + it ""do + end + it "" do + end + end + + describe "checkin" do + end +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 9742e4cd6..574a493b0 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -58,21 +58,33 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:video_data){ - { - video: { + {video: + { title: "Space Jam", - release_date: 1999, - available_inventory: 10 + release_date: Date.new(1999-06-01), + total_inventory: 10 } } } it "responds with JSON and created a new video" do + expect { post videos_path, params: video_data }.must_differ "Video.count", 1 check_response(expected_type: Hash, expected_status: :created) end + + it "will respond with bad_request for invalid" do + video_data[:video][:title] = nil + + expect { + post videos_path, params: video_data + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..7d6d7d79c --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,18 @@ +customer1: + name: Shelley Rocha, + registered_at: 2015-04-29T14:54:14.000Z, + postal_code: 24309, + phone: (322) 510-8695, + videos_checked_out_count: 1 +customer2: + name: Curran Stout, + registered_at: 2014-04-17T04:40:20.000Z, + postal_code: 94267, + phone: (908) 949-6758, + videos_checked_out_count: 1 +customer3: + name: Roanna Robinson, + registered_at: 2014-11-28T21:14:08.000Z, + postal_code: 15867, + phone: (323) 336-1841, + videos_checked_out_count: 1 \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..62abc059f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,51 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 + + before do + @customer = customers(:customer1) + @invalid_work = Customer.new(postal_code: '98102') + end + + # describe 'validations' do + + # it 'is valid when all required params are present' do + # result = @customer.valid? + # expect(result).must_equal true + # end + + # it 'is invalid when required params are not present' do + # result = @invalid_work.valid? + # @customer.title = nil + # expect(result).must_equal false + # expect(@customer.valid?).must_equal false + # end + + # it 'will not allow you to create a work in the same category with the same title' do + # expect(Customer.create(title:'Winnie the Pooh').valid?).must_equal false + # end # end + + describe 'relationships' do + before do + @work_votes = @work.votes + @work_users = @work.users + end + it 'relates to votes' do + + expect(@work_votes.count).must_equal 0 + vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) + expect(@work.votes.count).must_equal 1 + end + + it 'relates to users' do + + expect(@work_users.count).must_equal 0 + + vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) + expect(@work.users.count).must_equal 1 + end + + end + end From 7f9c6693ff8ba970b3bd96edd78945a6e3795a2d Mon Sep 17 00:00:00 2001 From: Yieni Date: Wed, 27 May 2020 01:51:55 -0700 Subject: [PATCH 05/11] created video model test. Changed routes to accomodate custom checkin and check out. updated rental validation for numercality. messed up rental controller tests --- app/controllers/rentals_controller.rb | 29 +++++ app/controllers/videos_controller.rb | 6 +- app/models/customer.rb | 1 + app/models/rental.rb | 15 +++ app/models/video.rb | 2 + config/routes.rb | 4 +- test/controllers/customers_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 46 ++++++- test/models/customer_test.rb | 32 ++--- .../{checkout_test.rb => rental_test.rb} | 2 +- test/models/video_test.rb | 117 +++++++++++++++++- 11 files changed, 225 insertions(+), 31 deletions(-) rename test/models/{checkout_test.rb => rental_test.rb} (81%) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..09e4141b4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,31 @@ class RentalsController < ApplicationController + + def checkin + video_id = params[:video_id] + customer_id = params[:customer_id] + video = Video.find_by(id: video_id) + customer = Customer.find_by(id:customer_id) + + if video != nil && customer != nil + @rental = Rental.new(customer_id: customer_id, video_id: video_id) + + Rental.checkout(customer_id: customer_id, video_id: video_id, rental: @rental) + @rental.save! + render json: @rental.as_json, status: :created + return + else + render json: {ok: false, errors: @rental.errors.messages}, status: :bad_request + return + end + + end + + + def checkout + end + + private + def rental_params + params.require(:rental).permit(:video_id, :customer_id) + end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index ffcb4a8ab..e23291623 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -28,9 +28,9 @@ def create end private - def video_params - params.require(:video).permit(:title, :release_date, :available_inventory, :overview, :total_inventory) - end + def video_params + params.require(:video).permit(:title, :release_date, :available_inventory, :overview, :total_inventory) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 344e718b2..8e5da2024 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,4 +3,5 @@ class Customer < ApplicationRecord # validates :registered_at, :address, :city, :postal_code, :phone, presence: true has_many :rentals has_many :videos, through: :rentals + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 30d440f4b..7123d8382 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,20 @@ class Rental < ApplicationRecord validates :video_id, :customer_id, presence: true + validates :available_inventory, :videos_checked_out_count, numericality: {greater_than_or_equal_to: 0, only_integer: true } belongs_to :video belongs_to :customer + + def self.checkout(customer_id: customer_id, video_id: video_id, rental: rental) + video = Video.find_by(id: video_id) + customer = Customer.find_by(id:customer_id) + if video != nil && customer != nil + if video.available_inventory > 0 + video.available_inventory -= 1 + customer.videos_checked_out_count += 1 + end + p rental + rental.available_inventory = rental.video.available_inventory + rental.videos_checked_out_count = rental.customer.videos_checked_out_count + end + end end diff --git a/app/models/video.rb b/app/models/video.rb index 1797203a2..a0d9ad661 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -3,4 +3,6 @@ class Video < ApplicationRecord validates :title, uniqueness:{scope: :release_date}, presence: true has_many :rentals, dependent: :nullify has_many :customers, through: :rentals + + end diff --git a/config/routes.rb b/config/routes.rb index f3c04528d..90c4d629a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ resources :videos, only:[:index, :show, :create] resources :customers, only:[:index] - post '/rentals/check-out', to: 'rentals#create', as: 'check_out' - post '/rentals/check-in', to: 'rentals#create', as: 'check_in' + post '/rentals/check-out', to: 'rentals#checkin', as: 'check_out' + post '/rentals/check-in', to: 'rentals#checkout', as: 'check_in' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ca7275ba6..39888ef15 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,7 @@ describe CustomersController do - REQUIRED_CUSTOMERS_FIELDS = ["customer_id","name", "registered_at", "postal_code","phone", "videos_checked_out_count"].sort + REQUIRED_CUSTOMERS_FIELDS = ["name", "registered_at", "postal_code","phone", "videos_checked_out_count"].sort def check_response(expected_type:, expected_status: :success) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6aa2dad7f..bc543d59b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -7,20 +7,54 @@ let(:video){ videos(:video1) } - let(:rental){ + let(:rental_params){ { customer_id: customer.id, - movie_id: video.id, + video_id: video.id, } } + 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 "checkout" do - it ""do + it "creates a new rental"do + expect{post check_out_path, params: rental_params}.must_differ "Rental.count", 1 + check_response(expected_type: Hash, expected_status: :ok) end - it "" do + it "returns bad request if video or customer empty" do + rental_params[:customer_id] = nil + expect{post check_out_path, params: rental_params}.wont_change "Rental.count", 1 + check_response(expected_type: Hash, expected_status: :bad_request) + end + + it "customer video checked out count changes" do + post check_out_path, params: rental_params + updated_checkout_count = Customer.find_by(id: customers(:customer1).id) + expect(updated_checkout_count.videos_checked_out_count).must_equal 2 + end + + it "available video count changes" do + post check_out_path, params: rental_params + updated_available_count = Video.find_by(id: videos(:video1).id) + expect(updated_available_count.available_inventory).must_equal 8 + end + + it "can return bad request when no video is in stock" do + video = videos(:video3) + video.available_inventory = 0 + + expect{post check_out_path, params: rental_params}.wont_change "Rental.count", 1 + check_response(expected_type: Hash, expected_status: :bad_request) end - end - describe "checkin" do end + + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 62abc059f..ecd42a6c4 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -26,26 +26,26 @@ # end # end - describe 'relationships' do - before do - @work_votes = @work.votes - @work_users = @work.users - end - it 'relates to votes' do + # describe 'relationships' do + # before do + # @work_votes = @work.votes + # @work_users = @work.users + # end + # it 'relates to votes' do - expect(@work_votes.count).must_equal 0 - vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) - expect(@work.votes.count).must_equal 1 - end + # expect(@work_votes.count).must_equal 0 + # vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) + # expect(@work.votes.count).must_equal 1 + # end - it 'relates to users' do + # it 'relates to users' do - expect(@work_users.count).must_equal 0 + # expect(@work_users.count).must_equal 0 - vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) - expect(@work.users.count).must_equal 1 - end + # vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) + # expect(@work.users.count).must_equal 1 + # end - end + # end end diff --git a/test/models/checkout_test.rb b/test/models/rental_test.rb similarity index 81% rename from test/models/checkout_test.rb rename to test/models/rental_test.rb index 9e7510fde..3e64959b4 100644 --- a/test/models/checkout_test.rb +++ b/test/models/rental_test.rb @@ -1,6 +1,6 @@ require "test_helper" -describe Checkout do +describe Rental do # it "does a thing" do # value(1+1).must_equal 2 # end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..74fd4b5b8 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,120 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 + + before do + @video = videos(:video1) + @invalid_work = Video.new(total_inventory: 5) + end + + describe 'validations' do + + it 'is valid when title, total inventory, and release date are present' do + result = @video.valid? + expect(result).must_equal true + end + + it 'is invalid when title,total inventory, and/or release date is not present' do + result = @invalid_work.valid? + @video.title = nil + expect(result).must_equal false + expect(@video.valid?).must_equal false + end + + it 'will not allow you to create a video with the same title and release date as an exisiting video' do + params = { + title: 'Blacksmith Of The Banished', + release_date: '1979-01-18' + } + + expect(Video.new(params).valid?).must_equal false + end + end + + # describe 'relationships' do + # before do + # @work_votes = @work.votes + # @work_users = @work.users + # end + # it 'relates to votes' do + + # expect(@work_votes.count).must_equal 0 + # vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) + # expect(@work.votes.count).must_equal 1 + # end + + # it 'relates to users' do + + # expect(@work_users.count).must_equal 0 + + # vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) + # expect(@work.users.count).must_equal 1 + # end + + # end + + # describe 'spotlight' do + # before do + # @vote1 = Vote.create(work_id: @work.id, user_id: users(:user1).id) + # @vote2 = Vote.create(work_id: @work.id, user_id: users(:user2).id) + # @work2 = works(:book2) + # @vote3 = Vote.create(work_id: @work2.id, user_id: users(:user1).id) + # end + + # it 'can choose the work with the most votes to spotlight' do + # spotlight = Work.spotlight + # expect(spotlight).must_equal @work + # expect(spotlight.votes.count).must_equal 2 + + # @vote4 = Vote.create(work_id: @work2.id, user_id: users(:user2).id) + # @vote3 = Vote.create(work_id: @work2.id, user_id: users(:user3).id) + # spotlight2 = Work.spotlight + # expect(spotlight2).must_equal @work2 + # expect(spotlight2.votes.count).must_equal 3 + + # end + # end + + # describe 'top-10' do + # before do + # @work2 = works(:book2) + # @work3 = works(:movie2) + # @work4 = works(:album3) + # @vote1 = Vote.create(work_id: @work.id, user_id: users(:user1).id) + # @vote2 = Vote.create(work_id: @work.id, user_id: users(:user2).id) + # @vote3 = Vote.create(work_id: @work2.id, user_id: users(:user1).id) + # @vote4 = Vote.create(work_id: @work2.id, user_id: users(:user1).id) + # @vote5 = Vote.create(work_id: @work2.id, user_id: users(:user2).id) + # @vote6 = Vote.create(work_id: @work3.id, user_id: users(:user1).id) + # @vote6 = Vote.create(work_id: @work4.id, user_id: users(:user1).id) + # end + + # it 'will select 10 works if works > 10 and all works if works < 10' do + # book_top10 = Work.top_ten(category: 'book') + # expect(Work.where(category: 'book').count).must_equal 12 + # expect(book_top10.count).must_equal 10 + + # movie_top10 = Work.top_ten(category: 'movie') + # expect(Work.where(category: 'movie').count).must_equal 2 + # expect(movie_top10.count).must_equal 2 + + # album_top10 = Work.top_ten(category: 'album') + # expect(Work.where(category: 'album').count).must_equal 3 + # expect(album_top10.count).must_equal 3 + # end + + # it 'can order the top 10 categories from most to least votes' do + # book_top10 = Work.top_ten(category: 'book') + # movie_top10 = Work.top_ten(category: 'movie') + # album_top10 = Work.top_ten(category: 'album') + + # expect(album_top10[0]).must_equal @work4 + # expect(book_top10[0]).must_equal @work2 + # expect(book_top10[1]).must_equal @work + # expect(movie_top10[0]).must_equal @work3 + + # end # end end + + From 0046f9e73251f1ce4413ae6eaab917414ec2d61c Mon Sep 17 00:00:00 2001 From: Yieni Date: Wed, 27 May 2020 13:55:16 -0700 Subject: [PATCH 06/11] finish check-out method and tests --- app/controllers/rentals_controller.rb | 21 +++++++++++++-------- app/controllers/videos_controller.rb | 2 +- app/models/customer.rb | 1 + app/models/rental.rb | 13 +++++++------ app/models/video.rb | 3 ++- config/routes.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 11 ++++++----- test/controllers/videos_controller_test.rb | 13 ++++++------- 8 files changed, 38 insertions(+), 30 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 09e4141b4..f3e90a641 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,19 +1,24 @@ class RentalsController < ApplicationController - def checkin + def checkout video_id = params[:video_id] customer_id = params[:customer_id] video = Video.find_by(id: video_id) customer = Customer.find_by(id:customer_id) - if video != nil && customer != nil - @rental = Rental.new(customer_id: customer_id, video_id: video_id) + @rental = Rental.new(customer_id: customer_id, video_id: video_id) + if video != nil && customer != nil Rental.checkout(customer_id: customer_id, video_id: video_id, rental: @rental) - @rental.save! - render json: @rental.as_json, status: :created - return + if @rental.save + render json: @rental.as_json, status: :created + return + else + render json: {ok: false, errors: @rental.errors.messages}, status: :bad_request + return + end else + render json: {ok: false, errors: @rental.errors.messages}, status: :bad_request return end @@ -21,11 +26,11 @@ def checkin end - def checkout + def checkin end private def rental_params - params.require(:rental).permit(:video_id, :customer_id) + params.permit(:video_id, :customer_id) end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index e23291623..745c1944b 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -29,7 +29,7 @@ def create private def video_params - params.require(:video).permit(:title, :release_date, :available_inventory, :overview, :total_inventory) + params.permit(:title, :release_date, :available_inventory, :overview, :total_inventory) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 8e5da2024..3181003ea 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,7 @@ class Customer < ApplicationRecord # validates :name, presence: true, uniqueness:{scope: :phone, message: 'Customer already exists in database'} # validates :registered_at, :address, :city, :postal_code, :phone, presence: true + validates :videos_checked_out_count, numericality: {greater_than_or_equal_to: 0, only_integer: true } has_many :rentals has_many :videos, through: :rentals diff --git a/app/models/rental.rb b/app/models/rental.rb index 7123d8382..b90388824 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,14 +7,15 @@ class Rental < ApplicationRecord def self.checkout(customer_id: customer_id, video_id: video_id, rental: rental) video = Video.find_by(id: video_id) customer = Customer.find_by(id:customer_id) - if video != nil && customer != nil - if video.available_inventory > 0 - video.available_inventory -= 1 - customer.videos_checked_out_count += 1 - end - p rental + p video.available_inventory + if video.available_inventory > 0 + video.available_inventory -= 1 + customer.videos_checked_out_count += 1 + video.save! + customer.save! rental.available_inventory = rental.video.available_inventory rental.videos_checked_out_count = rental.customer.videos_checked_out_count end + end end diff --git a/app/models/video.rb b/app/models/video.rb index a0d9ad661..ac296813e 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,6 +1,7 @@ class Video < ApplicationRecord - validates :total_inventory, :release_date, presence: true + validates :total_inventory, :release_date, :available_inventory, presence: true validates :title, uniqueness:{scope: :release_date}, presence: true + validates :available_inventory, numericality: {greater_than_or_equal_to: 0, only_integer: true } has_many :rentals, dependent: :nullify has_many :customers, through: :rentals diff --git a/config/routes.rb b/config/routes.rb index 90c4d629a..060aa3d90 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ resources :videos, only:[:index, :show, :create] resources :customers, only:[:index] - post '/rentals/check-out', to: 'rentals#checkin', as: 'check_out' - post '/rentals/check-in', to: 'rentals#checkout', as: 'check_in' + post '/rentals/check-in', to: 'rentals#checkin', as: 'check_in' + post '/rentals/check-out', to: 'rentals#checkout', as: 'check_out' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index bc543d59b..dae4a0ecc 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -26,7 +26,7 @@ def check_response(expected_type:, expected_status: :success) describe "checkout" do it "creates a new rental"do expect{post check_out_path, params: rental_params}.must_differ "Rental.count", 1 - check_response(expected_type: Hash, expected_status: :ok) + check_response(expected_type: Hash, expected_status: :created) end it "returns bad request if video or customer empty" do rental_params[:customer_id] = nil @@ -47,10 +47,11 @@ def check_response(expected_type:, expected_status: :success) end it "can return bad request when no video is in stock" do - video = videos(:video3) - video.available_inventory = 0 - - expect{post check_out_path, params: rental_params}.wont_change "Rental.count", 1 + video3 = videos(:video3) + video3.available_inventory = 0 + video3.save! + + expect{post check_out_path, params: {customer_id: customer.id, video_id: video3.id }}.wont_change "Rental.count", 1 check_response(expected_type: Hash, expected_status: :bad_request) end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 574a493b0..6e4eca9e4 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -58,12 +58,11 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:video_data){ - {video: - { - title: "Space Jam", - release_date: Date.new(1999-06-01), - total_inventory: 10 - } + { + title: "Space Jam", + release_date: Date.new(1999-06-01), + total_inventory: 10, + available_inventory: 9 } } @@ -77,7 +76,7 @@ def check_response(expected_type:, expected_status: :success) end it "will respond with bad_request for invalid" do - video_data[:video][:title] = nil + video_data[:title] = nil expect { post videos_path, params: video_data From 75f33bc4bcae733aedd74f83882621899b201f68 Mon Sep 17 00:00:00 2001 From: Yieni Date: Wed, 27 May 2020 14:44:37 -0700 Subject: [PATCH 07/11] fixed errors in smoke tests --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 6 +++--- app/controllers/videos_controller.rb | 10 +++++----- app/models/video.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 10 +++++----- test/controllers/videos_controller_test.rb | 12 ++++++------ 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 30895c1b4..807d2462e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) render json: customers, status: :ok end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f3e90a641..11fdc485d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,15 +11,15 @@ def checkout if video != nil && customer != nil Rental.checkout(customer_id: customer_id, video_id: video_id, rental: @rental) if @rental.save - render json: @rental.as_json, status: :created + render json: @rental.as_json(only: [:customer_id, :video_id, :due_date, :videos_checked_out_count, :available_inventory]), status: :ok return else - render json: {ok: false, errors: @rental.errors.messages}, status: :bad_request + render json: {errors: ['Not Found']}, status: :not_found return end else - render json: {ok: false, errors: @rental.errors.messages}, status: :bad_request + render json: {errors: ['Not Found']}, status: :not_found return end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 745c1944b..f803e640c 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,17 +1,17 @@ class VideosController < ApplicationController def index - videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory, :overview, :total_inventory]) + videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory]) render json: videos, status: :ok end def show video = Video.find_by(id:params[:id]) if video - render json: video.as_json(only: [:id, :title, :release_date, :available_inventory, :overview, :total_inventory]), status: :ok + render json: video.as_json(only: [:title, :release_date, :available_inventory, :total_inventory, :overview]), status: :ok return else - render json: {ok: false, errors: ["Not Found"]}, status: :not_found + render json: {errors: ["Not Found"]}, status: :not_found return end end @@ -19,10 +19,10 @@ def show def create video = Video.new(video_params) if video.save - render json: video.as_json, status: :created + render json: video.as_json(only: [:id]), status: :created return else - render json: {ok: false, errors: video.errors.messages}, status: :bad_request + render json: {errors: video.errors.messages}, status: :bad_request return end end diff --git a/app/models/video.rb b/app/models/video.rb index ac296813e..24885b69a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,5 @@ class Video < ApplicationRecord - validates :total_inventory, :release_date, :available_inventory, presence: true + validates :total_inventory, :release_date, :available_inventory, :overview, presence: true validates :title, uniqueness:{scope: :release_date}, presence: true validates :available_inventory, numericality: {greater_than_or_equal_to: 0, only_integer: true } has_many :rentals, dependent: :nullify diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 39888ef15..c2feb3c3e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,7 @@ describe CustomersController do - REQUIRED_CUSTOMERS_FIELDS = ["name", "registered_at", "postal_code","phone", "videos_checked_out_count"].sort + REQUIRED_CUSTOMERS_FIELDS = ["id", "name", "registered_at", "postal_code","phone", "videos_checked_out_count"].sort def check_response(expected_type:, expected_status: :success) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dae4a0ecc..201ef9e9b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -26,12 +26,12 @@ def check_response(expected_type:, expected_status: :success) describe "checkout" do it "creates a new rental"do expect{post check_out_path, params: rental_params}.must_differ "Rental.count", 1 - check_response(expected_type: Hash, expected_status: :created) + check_response(expected_type: Hash, expected_status: :ok) end - it "returns bad request if video or customer empty" do + it "returns not_found if video or customer empty" do rental_params[:customer_id] = nil expect{post check_out_path, params: rental_params}.wont_change "Rental.count", 1 - check_response(expected_type: Hash, expected_status: :bad_request) + check_response(expected_type: Hash, expected_status: :not_found) end it "customer video checked out count changes" do @@ -46,13 +46,13 @@ def check_response(expected_type:, expected_status: :success) expect(updated_available_count.available_inventory).must_equal 8 end - it "can return bad request when no video is in stock" do + it "can return not_found when no video is in stock" do video3 = videos(:video3) video3.available_inventory = 0 video3.save! expect{post check_out_path, params: {customer_id: customer.id, video_id: video3.id }}.wont_change "Rental.count", 1 - check_response(expected_type: Hash, expected_status: :bad_request) + check_response(expected_type: Hash, expected_status: :not_found) end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 6e4eca9e4..82176a90a 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe VideosController do - REQUIRED_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory", "overview", "total_inventory"].sort + REQUIRED_VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status @@ -41,8 +41,8 @@ def check_response(expected_type:, expected_status: :success) p existing_video.release_date body = check_response(expected_type: Hash) - expect(body.keys.sort).must_equal REQUIRED_VIDEO_FIELDS - expect(body["id"]).must_equal existing_video.id + expect(body["overview"]).must_equal existing_video.overview + expect(body["total_inventory"]).must_equal existing_video.total_inventory expect(body["title"]).must_equal existing_video.title expect(body["release_date"]).must_equal existing_video.release_date.to_s expect(body["available_inventory"]).must_equal existing_video.available_inventory @@ -51,7 +51,6 @@ def check_response(expected_type:, expected_status: :success) get video_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["ok"]).must_equal false expect(body["errors"]).must_include "Not Found" end end @@ -62,7 +61,8 @@ def check_response(expected_type:, expected_status: :success) title: "Space Jam", release_date: Date.new(1999-06-01), total_inventory: 10, - available_inventory: 9 + available_inventory: 9, + overview: "Michael Jordan goes to space to challenge aliens in basketball game to save humans" } } @@ -83,7 +83,7 @@ def check_response(expected_type:, expected_status: :success) }.wont_change "Video.count" body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body["errors"].keys).must_include "title" + expect(body["errors"]).must_include "title" end end end From e0c9ab9f05f7c7ec92b697a7210424816928464d Mon Sep 17 00:00:00 2001 From: Shonda Warren Date: Wed, 27 May 2020 16:10:36 -0700 Subject: [PATCH 08/11] Co-authored-by: yieknee <52982163+yieknee@users.noreply.github.com> --- app/models/customer.rb | 2 + app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 38 +++++++++- test/models/customer_test.rb | 36 +++++---- test/models/rental_test.rb | 83 ++++++++++++++++++++- 5 files changed, 139 insertions(+), 22 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 3181003ea..75dba707b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,8 @@ class Customer < ApplicationRecord + # we do not validate the below because we never create a customer # validates :name, presence: true, uniqueness:{scope: :phone, message: 'Customer already exists in database'} # validates :registered_at, :address, :city, :postal_code, :phone, presence: true + validates :videos_checked_out_count, numericality: {greater_than_or_equal_to: 0, only_integer: true } has_many :rentals has_many :videos, through: :rentals diff --git a/app/models/rental.rb b/app/models/rental.rb index b90388824..43e5e87e7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,7 @@ class Rental < ApplicationRecord def self.checkout(customer_id: customer_id, video_id: video_id, rental: rental) video = Video.find_by(id: video_id) customer = Customer.find_by(id:customer_id) - p video.available_inventory + if video.available_inventory > 0 video.available_inventory -= 1 customer.videos_checked_out_count += 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 201ef9e9b..e5c7d874a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -28,6 +28,7 @@ def check_response(expected_type:, expected_status: :success) expect{post check_out_path, params: rental_params}.must_differ "Rental.count", 1 check_response(expected_type: Hash, expected_status: :ok) end + it "returns not_found if video or customer empty" do rental_params[:customer_id] = nil expect{post check_out_path, params: rental_params}.wont_change "Rental.count", 1 @@ -54,8 +55,41 @@ def check_response(expected_type:, expected_status: :success) expect{post check_out_path, params: {customer_id: customer.id, video_id: video3.id }}.wont_change "Rental.count", 1 check_response(expected_type: Hash, expected_status: :not_found) end - end - + # describe "check_in" do + + # it "customer count"do + # expect{post check_in_path, params: rental_params}.must_differ "Rental.count", 1 + # check_response(expected_type: Hash, expected_status: :ok) + # end + + # it "returns not_found if video or customer empty" do + # rental_params[:customer_id] = nil + # expect{post check_in_path, params: rental_params}.wont_change "Rental.count", 1 + # check_response(expected_type: Hash, expected_status: :not_found) + # end + + # it "customer video checked in count changes" do + # post check_out_path, params: rental_params + # expect {post check_in_path, params: rental_params}.wont_change "" + # updated_checkin_count = Customer.find_by(id: customers(:customer1).id) + # expect(updated_checkin_count.videos_checkout_in_count).must_equal 1 + # end + + # it "available video count changes" do + # post check_in_path, params: rental_params + # updated_available_count = Video.find_by(id: videos(:video1).id) + # expect(updated_available_count.available_inventory).must_equal 8 + # end + + # it "can return not_found when no video is in stock" do + # video3 = videos(:video3) + # video3.available_inventory = 0 + # video3.save! + + # expect{post check_in_path, params: {customer_id: customer.id, video_id: video3.id }}.wont_change "Rental.count", 1 + # check_response(expected_type: Hash, expected_status: :not_found) + # end + # end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ecd42a6c4..570d73a4d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,27 +4,31 @@ before do @customer = customers(:customer1) - @invalid_work = Customer.new(postal_code: '98102') + @invalid_customer = Customer.new(postal_code: '98102') end - # describe 'validations' do + describe 'validations' do - # it 'is valid when all required params are present' do - # result = @customer.valid? - # expect(result).must_equal true - # end + it 'validates that videos_checked_out_count is an integer' do + expect(@customer.valid?).must_equal true + expect(@invalid_customer.valid?).must_equal false + + @customer.videos_checked_out_count = 7.5 + @customer.save + expect(@customer.valid?).must_equal false + + end - # it 'is invalid when required params are not present' do - # result = @invalid_work.valid? - # @customer.title = nil - # expect(result).must_equal false - # expect(@customer.valid?).must_equal false - # end + it 'validates that videos_checked_out_count is >= 0' do + expect(@customer.valid?).must_equal true + expect(@invalid_customer.valid?).must_equal false + + @customer.videos_checked_out_count = -6 + @customer.save + expect(@customer.valid?).must_equal false + end - # it 'will not allow you to create a work in the same category with the same title' do - # expect(Customer.create(title:'Winnie the Pooh').valid?).must_equal false - # end - # end + end # describe 'relationships' do # before do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..db59cfd3a 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,84 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @rental = Rental.new( + customer_id: customers(:customer1).id, + video_id: videos(:video1).id, + videos_checked_out_count: customers(:customer1).videos_checked_out_count, + available_inventory: videos(:video1).available_inventory + ) + @invalid_rental = Rental.new( + customer_id: customers(:customer1).id, + video_id: nil, + videos_checked_out_count: customers(:customer1).videos_checked_out_count, + available_inventory: nil + ) + end + + describe 'validations' do + + it 'is valid when video_id and customer_id are present' do + result = @rental.valid? + expect(result).must_equal true + end + + it 'is invalid when required params are not present' do + result = @invalid_rental.valid? + @rental.customer_id = nil + expect(result).must_equal false + expect(@rental.valid?).must_equal false + end + + it 'validates if available_inventory and videos_checked_out_count are integers' do + expect(@rental.valid?).must_equal true + expect(@invalid_rental.valid?).must_equal false + + + @rental.available_inventory = 1.2 + @rental.save + expect(@rental.valid?).must_equal false + + @rental.available_inventory = videos(:video1).available_inventory + @rental.videos_checked_out_count = 3.5 + @rental.save + expect(@rental.valid?).must_equal false + + + end + + it 'validates if available_inventory and videos_checked_out_count are >= 0' do + expect(@rental.valid?).must_equal true + expect(@invalid_rental.valid?).must_equal false + + + @rental.available_inventory = -1 + @rental.save + expect(@rental.valid?).must_equal false + + @rental.available_inventory = videos(:video1).available_inventory + @rental.videos_checked_out_count = -6 + @rental.save + expect(@rental.valid?).must_equal false + + end + end + + describe 'relationships' do + before do + @customer = customers(:customer1) + @video = videos(:video1) + end + it 'relates to customer' do + expect(@rental.customer.videos_checked_out_count).must_equal @customer.videos_checked_out_count + end + + it 'relates to video' do + expect(@rental.video.available_inventory).must_equal @video.available_inventory + end + end + + describe 'checkout' do + end + end From 67fbf57ce2a5d4be9f995e286d082414f1e311e0 Mon Sep 17 00:00:00 2001 From: Yieni Date: Wed, 27 May 2020 20:54:20 -0700 Subject: [PATCH 09/11] write checkin model tests and other model tests --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/rentals_controller.rb | 2 +- app/models/customer.rb | 9 ++ app/models/rental.rb | 23 ++-- app/models/video.rb | 9 ++ test/controllers/rentals_controller_test.rb | 6 +- test/models/customer_test.rb | 17 ++- test/models/rental_test.rb | 27 +++++ test/models/video_test.rb | 112 +++++++++----------- 9 files changed, 131 insertions(+), 74 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c3ac046f6c51a2cd4bc2df32c603e493458c382e GIT binary patch literal 6148 zcmeH~F^{dt=u>Bl;zddfqZjB=JE!l7EiIwCR znHYd=e=Zwf1hAw#vGy=AV?N-4FWm9?zTD5J+wJN_+D8XGrH`2G=e8gPq<|EV0#ZN< z%t(Pe#+RQndL})J6p#Y*P{6+rh3>4$))}7;h8O|Jf#oo+W0oL`7s#4yovhF-rw7Yc zi!sFO(N31Ut|nV&Z-?dZVR>isDTZdf9afmotOgXMfE1W0u;}^d=l`Dm-~2ymQ7Q$b zz?&&x!|t%#@}=@@{quTWKW5d}jZVhp3{O7+O#CQb(Zjf3d_mS^>tuzdAAyiTK?=N7 FfnTX=61e~X literal 0 HcmV?d00001 diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 11fdc485d..4e9ef79b5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,7 +9,7 @@ def checkout @rental = Rental.new(customer_id: customer_id, video_id: video_id) if video != nil && customer != nil - Rental.checkout(customer_id: customer_id, video_id: video_id, rental: @rental) + Rental.checkout(rental: @rental) if @rental.save render json: @rental.as_json(only: [:customer_id, :video_id, :due_date, :videos_checked_out_count, :available_inventory]), status: :ok return diff --git a/app/models/customer.rb b/app/models/customer.rb index 75dba707b..e85b374ef 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,4 +7,13 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals + def increase_checked_out + self.videos_checked_out_count += 1 + self.save! + end + + def decrease_checked_out + self.videos_checked_out_count -= 1 + self.save! + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 43e5e87e7..321639e7c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,18 +4,27 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer - def self.checkout(customer_id: customer_id, video_id: video_id, rental: rental) - video = Video.find_by(id: video_id) - customer = Customer.find_by(id:customer_id) + def self.checkout(rental: rental) + video = Video.find_by(id: rental.video.id) + customer = Customer.find_by(id:rental.customer.id) if video.available_inventory > 0 - video.available_inventory -= 1 - customer.videos_checked_out_count += 1 - video.save! - customer.save! + video.decrease_available_inventory + customer.increase_checked_out + rental.due_date = Date.today + 7 rental.available_inventory = rental.video.available_inventory rental.videos_checked_out_count = rental.customer.videos_checked_out_count end end + + def checkin + video = Video.find_by(id: self.video.id) + customer = Customer.find_by(id: self.customer.id) + + video.increase_available_inventory + customer.decrease_checked_out + rental.available_inventory = rental.video.available_inventory + rental.videos_checked_out_count = rental.customer.videos_checked_out_count + end end diff --git a/app/models/video.rb b/app/models/video.rb index 24885b69a..30ae60e49 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -5,5 +5,14 @@ class Video < ApplicationRecord has_many :rentals, dependent: :nullify has_many :customers, through: :rentals + def increase_available_inventory + self.available_inventory += 1 + self.save! + end + + def decrease_available_inventory + self.available_inventory -= 1 + self.save! + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e5c7d874a..3d4275d53 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -60,17 +60,17 @@ def check_response(expected_type:, expected_status: :success) # describe "check_in" do # it "customer count"do - # expect{post check_in_path, params: rental_params}.must_differ "Rental.count", 1 + # expect{post check_in_path, params: rental_params}.must_change "Rental.count", 1 # check_response(expected_type: Hash, expected_status: :ok) # end - # it "returns not_found if video or customer empty" do + # it "returns not found if video or customer nil" do # rental_params[:customer_id] = nil # expect{post check_in_path, params: rental_params}.wont_change "Rental.count", 1 # check_response(expected_type: Hash, expected_status: :not_found) # end - # it "customer video checked in count changes" do + # it "can decrease changea customers checked out rental" do # post check_out_path, params: rental_params # expect {post check_in_path, params: rental_params}.wont_change "" # updated_checkin_count = Customer.find_by(id: customers(:customer1).id) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 570d73a4d..cb88f191e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -29,7 +29,22 @@ end end - + describe "Customer custom method" do + describe "Increase Customer Video Checkout Count" do + it "will increase the customer checked out count" do + customer_video_checked = @customer.videos_checked_out_count + @customer.increase_checked_out + expect(@customer.videos_checked_out_count).must_equal 2 + end + end + describe "Decrease Customer Video Checkout Count" do + it "will decrease the video inventory" do + customer_video_checked = @customer.videos_checked_out_count + @customer.decrease_checked_out + expect(@customer.videos_checked_out_count).must_equal 0 + end + end + end # describe 'relationships' do # before do # @work_votes = @work.votes diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index db59cfd3a..39f60746d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -79,6 +79,33 @@ end describe 'checkout' do + before do + @new_rental = Rental.new( + customer_id: customers(:customer1).id, + video_id: videos(:video1).id + ) + end + it 'can add a due date to a rental' do + Rental.checkout(rental: @new_rental) + @rental.save! + + expect(@new_rental.due_date).must_be_instance_of Date + expect(@new_rental.due_date).must_equal Date.today + 7 + + end + + it 'can add videos_checked_out_count to rental' do + Rental.checkout(rental: @new_rental) + @new_rental.save! + + expect(@new_rental.videos_checked_out_count).must_equal @new_rental.customer.videos_checked_out_count + end + + it ' can add available_inventory to rental' do + Rental.checkout(rental: @new_rental) + @new_rental.save! + expect(@new_rental.available_inventory).must_equal @new_rental.video.available_inventory + end end end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 74fd4b5b8..54393377b 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -29,7 +29,57 @@ expect(Video.new(params).valid?).must_equal false end + + it 'validates if available_inventory are integers' do + expect(@video.valid?).must_equal true + expect(@invalid_work.valid?).must_equal false + + + @video.available_inventory = 1.2 + @video.save + expect(@video.valid?).must_equal false + + @video.available_inventory = videos(:video1).available_inventory + @video.available_inventory = 3.5 + @video.save + expect(@video.valid?).must_equal false + + + end + + it 'validates if available_inventory and videos_checked_out_count are >= 0' do + expect(@video.valid?).must_equal true + expect(@invalid_work.valid?).must_equal false + + + @video.available_inventory = -1 + @video.save + expect(@video.valid?).must_equal false + + @video.available_inventory = videos(:video1).available_inventory + @video.save + expect(@video.valid?).must_equal false + + end + end + describe "Video custom method" do + describe "Increase Inventory" do + it "will increase the video inventory" do + video_inventory = @video.available_inventory + @video.increase_available_inventory + expect(@video.available_inventory).must_equal video_inventory + 1 + end + end + + describe "Decrease Inventory" do + it "will decrease the video inventory" do + video_inventory = @video.available_inventory + @video.decrease_available_inventory + expect(@video.available_inventory).must_equal video_inventory - 1 + end + end end + # describe 'relationships' do # before do @@ -53,68 +103,6 @@ # end - # describe 'spotlight' do - # before do - # @vote1 = Vote.create(work_id: @work.id, user_id: users(:user1).id) - # @vote2 = Vote.create(work_id: @work.id, user_id: users(:user2).id) - # @work2 = works(:book2) - # @vote3 = Vote.create(work_id: @work2.id, user_id: users(:user1).id) - # end - - # it 'can choose the work with the most votes to spotlight' do - # spotlight = Work.spotlight - # expect(spotlight).must_equal @work - # expect(spotlight.votes.count).must_equal 2 - - # @vote4 = Vote.create(work_id: @work2.id, user_id: users(:user2).id) - # @vote3 = Vote.create(work_id: @work2.id, user_id: users(:user3).id) - # spotlight2 = Work.spotlight - # expect(spotlight2).must_equal @work2 - # expect(spotlight2.votes.count).must_equal 3 - - # end - # end - - # describe 'top-10' do - # before do - # @work2 = works(:book2) - # @work3 = works(:movie2) - # @work4 = works(:album3) - # @vote1 = Vote.create(work_id: @work.id, user_id: users(:user1).id) - # @vote2 = Vote.create(work_id: @work.id, user_id: users(:user2).id) - # @vote3 = Vote.create(work_id: @work2.id, user_id: users(:user1).id) - # @vote4 = Vote.create(work_id: @work2.id, user_id: users(:user1).id) - # @vote5 = Vote.create(work_id: @work2.id, user_id: users(:user2).id) - # @vote6 = Vote.create(work_id: @work3.id, user_id: users(:user1).id) - # @vote6 = Vote.create(work_id: @work4.id, user_id: users(:user1).id) - # end - - # it 'will select 10 works if works > 10 and all works if works < 10' do - # book_top10 = Work.top_ten(category: 'book') - # expect(Work.where(category: 'book').count).must_equal 12 - # expect(book_top10.count).must_equal 10 - - # movie_top10 = Work.top_ten(category: 'movie') - # expect(Work.where(category: 'movie').count).must_equal 2 - # expect(movie_top10.count).must_equal 2 - - # album_top10 = Work.top_ten(category: 'album') - # expect(Work.where(category: 'album').count).must_equal 3 - # expect(album_top10.count).must_equal 3 - # end - - # it 'can order the top 10 categories from most to least votes' do - # book_top10 = Work.top_ten(category: 'book') - # movie_top10 = Work.top_ten(category: 'movie') - # album_top10 = Work.top_ten(category: 'album') - - # expect(album_top10[0]).must_equal @work4 - # expect(book_top10[0]).must_equal @work2 - # expect(book_top10[1]).must_equal @work - # expect(movie_top10[0]).must_equal @work3 - - # end - # end end From 714a5084c4b7da6f227ff0c61116f4ed2094adff Mon Sep 17 00:00:00 2001 From: Yieni Date: Wed, 27 May 2020 23:07:47 -0700 Subject: [PATCH 10/11] wrote checkin model tests and fixed checkin smoke tests --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 20 +++++- app/controllers/videos_controller.rb | 2 +- app/models/customer.rb | 6 +- app/models/rental.rb | 20 +++--- app/models/video.rb | 6 +- test/controllers/rentals_controller_test.rb | 75 +++++++++++---------- test/models/rental_test.rb | 41 +++++++++-- 8 files changed, 115 insertions(+), 57 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 807d2462e..2764fb078 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) + customers = Customer.order(:name).as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) render json: customers, status: :ok end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4e9ef79b5..5ad1ae3e1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,7 +9,8 @@ def checkout @rental = Rental.new(customer_id: customer_id, video_id: video_id) if video != nil && customer != nil - Rental.checkout(rental: @rental) + @checkout = @rental.checkout + p @checkout if @rental.save render json: @rental.as_json(only: [:customer_id, :video_id, :due_date, :videos_checked_out_count, :available_inventory]), status: :ok return @@ -27,6 +28,23 @@ def checkout def checkin + video_id = params[:video_id] + customer_id = params[:customer_id] + exisiting_checkout = Rental.find_by(video_id: video_id, customer_id: customer_id) + + if exisiting_checkout + @rental = exisiting_checkout.checkin + if @rental.save + exisiting_checkout.destroy + render json: @rental.as_json(only: [:customer_id, :video_id, :videos_checked_out_count, :available_inventory]), status: :ok + return + else + render json: {errors: ['Not Found']}, status: :not_found + return + end + else + render json: {errors: ['Not Found']}, status: :not_found + end end private diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index f803e640c..7ba66f6f7 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,7 @@ class VideosController < ApplicationController def index - videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory]) + videos = Video.order(:title).as_json(only: [:id, :title, :release_date, :available_inventory]) render json: videos, status: :ok end diff --git a/app/models/customer.rb b/app/models/customer.rb index e85b374ef..9a5b018e7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,11 +9,13 @@ class Customer < ApplicationRecord def increase_checked_out self.videos_checked_out_count += 1 - self.save! + self.save + return self end def decrease_checked_out self.videos_checked_out_count -= 1 - self.save! + self.save + return self end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 321639e7c..75c7397e8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,16 +4,17 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer - def self.checkout(rental: rental) - video = Video.find_by(id: rental.video.id) - customer = Customer.find_by(id:rental.customer.id) + def checkout + video = Video.find_by(id: self.video.id) + customer = Customer.find_by(id: self.customer.id) if video.available_inventory > 0 - video.decrease_available_inventory - customer.increase_checked_out - rental.due_date = Date.today + 7 - rental.available_inventory = rental.video.available_inventory - rental.videos_checked_out_count = rental.customer.videos_checked_out_count + video.decrease_available_inventory.reload + customer.increase_checked_out.reload + self.due_date = Date.today + 7 + self.available_inventory = video.available_inventory + self.videos_checked_out_count = customer.videos_checked_out_count + return self end end @@ -24,7 +25,10 @@ def checkin video.increase_available_inventory customer.decrease_checked_out + + rental = Rental.new(video_id: video.id, customer_id: customer.id) rental.available_inventory = rental.video.available_inventory rental.videos_checked_out_count = rental.customer.videos_checked_out_count + return rental end end diff --git a/app/models/video.rb b/app/models/video.rb index 30ae60e49..133f31657 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -7,12 +7,14 @@ class Video < ApplicationRecord def increase_available_inventory self.available_inventory += 1 - self.save! + self.save + return self end def decrease_available_inventory self.available_inventory -= 1 - self.save! + self.save + return self end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3d4275d53..a1927f89f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -37,13 +37,13 @@ def check_response(expected_type:, expected_status: :success) it "customer video checked out count changes" do post check_out_path, params: rental_params - updated_checkout_count = Customer.find_by(id: customers(:customer1).id) + updated_checkout_count = Rental.find_by(customer_id: customers(:customer1).id) expect(updated_checkout_count.videos_checked_out_count).must_equal 2 end it "available video count changes" do post check_out_path, params: rental_params - updated_available_count = Video.find_by(id: videos(:video1).id) + updated_available_count = Rental.find_by(video_id: videos(:video1).id) expect(updated_available_count.available_inventory).must_equal 8 end @@ -57,39 +57,42 @@ def check_response(expected_type:, expected_status: :success) end end - # describe "check_in" do - - # it "customer count"do - # expect{post check_in_path, params: rental_params}.must_change "Rental.count", 1 - # check_response(expected_type: Hash, expected_status: :ok) - # end - - # it "returns not found if video or customer nil" do - # rental_params[:customer_id] = nil - # expect{post check_in_path, params: rental_params}.wont_change "Rental.count", 1 - # check_response(expected_type: Hash, expected_status: :not_found) - # end - - # it "can decrease changea customers checked out rental" do - # post check_out_path, params: rental_params - # expect {post check_in_path, params: rental_params}.wont_change "" - # updated_checkin_count = Customer.find_by(id: customers(:customer1).id) - # expect(updated_checkin_count.videos_checkout_in_count).must_equal 1 - # end - - # it "available video count changes" do - # post check_in_path, params: rental_params - # updated_available_count = Video.find_by(id: videos(:video1).id) - # expect(updated_available_count.available_inventory).must_equal 8 - # end - - # it "can return not_found when no video is in stock" do - # video3 = videos(:video3) - # video3.available_inventory = 0 - # video3.save! + describe "check_in" do + before do + post check_out_path, params: rental_params + end + it "can successfully check-in" do + expect{post check_in_path, params: rental_params}.wont_change "Rental.count", 1 + check_response(expected_type: Hash, expected_status: :ok) + end + + it "returns not found if video or customer nil" do + rental_params[:customer_id] = nil + expect{post check_in_path, params: rental_params}.wont_change "Rental.count", 1 + check_response(expected_type: Hash, expected_status: :not_found) + end + + it "can decrease changes customers checked out and also increase the videos inventory" do - # expect{post check_in_path, params: {customer_id: customer.id, video_id: video3.id }}.wont_change "Rental.count", 1 - # check_response(expected_type: Hash, expected_status: :not_found) - # end - # end + current_video_count = Rental.find_by(video_id: videos(:video1).id).available_inventory + current_customer_count = Rental.find_by(customer_id: customers(:customer1).id).videos_checked_out_count + + post check_in_path, params: rental_params + + updated_current_video_count = Rental.find_by(video_id: videos(:video1).id) + updated_current_customer_count = Rental.find_by(customer_id: customers(:customer1).id) + + expect(updated_current_customer_count.videos_checked_out_count).must_equal 1 + expect(updated_current_video_count.available_inventory).must_equal 9 + end + + it "can delete existing checkout" do + exisiting_rental = Rental.find_by(customer_id: customer.id) + post check_in_path, params: rental_params + + find_existing = Rental.find_by(id: exisiting_rental.id) + assert_nil(find_existing) + end + + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 39f60746d..8b8cf104f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -86,8 +86,8 @@ ) end it 'can add a due date to a rental' do - Rental.checkout(rental: @new_rental) - @rental.save! + @new_rental.checkout + @new_rental.save! expect(@new_rental.due_date).must_be_instance_of Date expect(@new_rental.due_date).must_equal Date.today + 7 @@ -95,16 +95,45 @@ end it 'can add videos_checked_out_count to rental' do - Rental.checkout(rental: @new_rental) + @new_rental.checkout @new_rental.save! - expect(@new_rental.videos_checked_out_count).must_equal @new_rental.customer.videos_checked_out_count + expect(@new_rental.videos_checked_out_count).must_equal 2 end it ' can add available_inventory to rental' do - Rental.checkout(rental: @new_rental) + @new_rental.checkout + @new_rental.save! + expect(@new_rental.available_inventory).must_equal 8 + end + end + + describe 'checkin' do + before do + @new_rental = Rental.new( + customer_id: customers(:customer1).id, + video_id: videos(:video1).id + ) + end + + it 'can decrease videos_checked_out_count ' do + @new_rental.checkout @new_rental.save! - expect(@new_rental.available_inventory).must_equal @new_rental.video.available_inventory + + @checked_in = @new_rental.checkin + @checked_in.save! + + expect(@checked_in.videos_checked_out_count).must_equal 1 + end + + it ' can increase available_inventory' do + @new_rental.checkout + @new_rental.save! + + @checked_in = @new_rental.checkin + @checked_in.save! + + expect(@checked_in.available_inventory).must_equal 9 end end From 2135ec61a83acfae6de12bda4ee002195df07eaf Mon Sep 17 00:00:00 2001 From: Yieni Date: Wed, 27 May 2020 23:41:10 -0700 Subject: [PATCH 11/11] final clean up of comments --- app/controllers/rentals_controller.rb | 2 +- test/models/video_test.rb | 22 +--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5ad1ae3e1..5a7f17f36 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -10,7 +10,7 @@ def checkout if video != nil && customer != nil @checkout = @rental.checkout - p @checkout + if @rental.save render json: @rental.as_json(only: [:customer_id, :video_id, :due_date, :videos_checked_out_count, :available_inventory]), status: :ok return diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 54393377b..a08799a6e 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -81,27 +81,7 @@ end - # describe 'relationships' do - # before do - # @work_votes = @work.votes - # @work_users = @work.users - # end - # it 'relates to votes' do - - # expect(@work_votes.count).must_equal 0 - # vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) - # expect(@work.votes.count).must_equal 1 - # end - - # it 'relates to users' do - - # expect(@work_users.count).must_equal 0 - - # vote = Vote.create(work_id: @work.id, user_id: users(:user1).id) - # expect(@work.users.count).must_equal 1 - # end - - # end + end