From 7512099822c26a62df62c02180e04846494305e9 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 14:12:59 -0700 Subject: [PATCH 01/29] ran rails new . --api --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 node_modules/.yarn-integrity | 10 + public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 4 + 61 files changed, 1120 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 node_modules/.yarn-integrity create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..41b7d4311 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..43301a817 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..1707f6f15 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +oRLUR1zBcDHwqKPIwAuw5WZwX4KMMdlubPaTNyvHIHLgBkhKVdiO6fk2940w7VMQWKXzZCcnCn6yzuDP0yzdQKbREai8acvODO1dlCaEHnZGfOUDXjvGpKdp6sJOVTw3BXPV6eW1POUG2z4wKQQPG2MqVNu8PSa2apR7U0g1vKKV8TfwbkXm3RBfs1b+pPBdHjBXsVgPifmC3O52uJ26fJJ9RsQg1+dHwJYAOkHzzZnnpnwnDqp8Ymi4sXgg9rlpeGC0dxajvdpNfRIcLWF44Mdnty0XqhOIR/kaAcmS/auorUgpC9MsMX097D/f9UcSZSVtDPuyRjvOrpvzgCGtg4aRWuEoMcvUJ/HM9asqAA6KF9KU2aQSKSl3IrIpLla32A6ke97SGLKfuQgBG5wj3hdb9IhsLJJ6ckkF--aoyI0CsjIUgLNZ2l--cbmFim7OIPI4oLixc9immQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: video_store_api + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: video_store_api_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video_store_api_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..cf9b342d0 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..c06383a17 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..0f19eb7ab --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-83", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..7413fd9b6 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + require "minitest/rails" + require "minitest/reporters" # for Colorized output + # For colorful output! + Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter + ) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..fb57ccd13 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 6b69f517ca16fa350c8c9d35121fa92dc4c3967d Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 14:29:44 -0700 Subject: [PATCH 02/29] generates customer controller, index route --- app/controllers/customers_controller.rb | 11 +++++++++++ app/models/customer.rb | 2 ++ config/routes.rb | 4 +++- db/migrate/20200526212915_create_customers.rb | 8 ++++++++ test/controllers/customers_controller_test.rb | 7 +++++++ test/models/customer_test.rb | 7 +++++++ 6 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20200526212915_create_customers.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/models/customer_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..f6237f4a1 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,11 @@ +class CustomersController < ApplicationController + + def index + customers = Customer.all.order(:name) + + # render some json stuff + render json: customers.as_json(only: [:id, :name, :postal_code, :phone, :videos_checked_out_count, :registered_at]), + status: :ok + end + +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..b239d0a92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + + get '/customers', to: 'customers#index', as: 'customers' + end diff --git a/db/migrate/20200526212915_create_customers.rb b/db/migrate/20200526212915_create_customers.rb new file mode 100644 index 000000000..3374e6e69 --- /dev/null +++ b/db/migrate/20200526212915_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + + t.timestamps + end + 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/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 975f9db0c4999651bf3a9909f14ca94b7045adde Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 14:41:10 -0700 Subject: [PATCH 03/29] generates customer mode --- app/models/customer.rb | 3 ++ db/migrate/20200526212915_create_customers.rb | 9 +++++- db/schema.rb | 31 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 db/schema.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..cc513070e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,5 @@ class Customer < ApplicationRecord + #relationships + #validations + end diff --git a/db/migrate/20200526212915_create_customers.rb b/db/migrate/20200526212915_create_customers.rb index 3374e6e69..4d78f0570 100644 --- a/db/migrate/20200526212915_create_customers.rb +++ b/db/migrate/20200526212915_create_customers.rb @@ -1,7 +1,14 @@ class CreateCustomers < ActiveRecord::Migration[6.0] def change create_table :customers do |t| - + t.string :name + t.datetime :registered_at + t.string :postal_code + t.string :address + t.string :city + t.string :state + t.string :phone + t.integer :videos_checked_out_count t.timestamps end end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..9ff93ff1f --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,31 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_26_212915) 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 "postal_code" + t.string "address" + t.string "city" + t.string "state" + t.string "phone" + t.integer "videos_checked_out_count" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + +end From 8e14ebb3522fe3a1f7f7c4654cec183c42c0505c Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 14:45:52 -0700 Subject: [PATCH 04/29] adds validations for customer model --- app/models/customer.rb | 9 ++++++++- db/schema.rb | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index cc513070e..84b3b0d7e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,12 @@ class Customer < ApplicationRecord #relationships - #validations + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :phone, presence: true + validates :videos_checked_out_count, presence: true end diff --git a/db/schema.rb b/db/schema.rb index 9ff93ff1f..408b85f1b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,10 +11,10 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema.define(version: 2020_05_26_212915) 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" @@ -27,5 +27,5 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end - + end From e4718cbfe12d58df26c23aa342ff5c9798724c88 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 16:10:36 -0700 Subject: [PATCH 05/29] tests for customer controller --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 4 ++- db/schema.rb | 6 ++-- test/controllers/customers_controller_test.rb | 34 +++++++++++++++++-- test/fixtures/customers.yml | 18 ++++++++++ test/models/customer_test.rb | 9 +++-- 6 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f6237f4a1..537efd94f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,7 +5,7 @@ def index # render some json stuff render json: customers.as_json(only: [:id, :name, :postal_code, :phone, :videos_checked_out_count, :registered_at]), - status: :ok + status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 84b3b0d7e..942b9f909 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - #relationships + #TODO relationships validates :name, presence: true validates :registered_at, presence: true @@ -9,4 +9,6 @@ class Customer < ApplicationRecord validates :state, presence: true validates :phone, presence: true validates :videos_checked_out_count, presence: true + + end diff --git a/db/schema.rb b/db/schema.rb index 408b85f1b..9ff93ff1f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,10 +11,10 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema.define(version: 2020_05_26_212915) 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" @@ -27,5 +27,5 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end - + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..086408fae 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 + # CUSTOMER_FIELDS = ['id', 'name', 'postal_code', 'phone', 'videos_checked_out_count', 'registered_at'].sort + + describe 'index' do + + it 'gets the index path' do + get customers_path + + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + end + + # it 'returns correct fields for the list of customers' do + + # end + + # it 'returns an empty array if there are no customers in the database' do + + # end + + end + + # describe 'show' do + # it 'returns a hash with correct fields for an existing customer' do + + # end + + # it 'returns a 404 response with JSON for a non-existant customer' do + + # end # end + + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..9eaa9c42e --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,18 @@ +junito: + name: Junito + registered_at: 2019-12-31 + postal_code: 98168 + phone: 823-4034 + address: 1234 Main St + city: Seattle + state: WA + videos_checked_out_count: 0 +leah: + name: Leah + registered_at: 2019-07-31 + postal_code: 98166 + phone: 823-4056 + address: 1234 Any St + city: Seattle + state: WA + videos_checked_out_count: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..779444646 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,10 @@ require "test_helper" -describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 +describe 'Customer' do + + # it 'can be instantiated' do + # end + + end From a119cdf945a5d098d79d3c7ab8867c5b7b61d98a Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 16:27:27 -0700 Subject: [PATCH 06/29] adds all index tests to customer controller --- test/controllers/customers_controller_test.rb | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 086408fae..1e3eb125b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - # CUSTOMER_FIELDS = ['id', 'name', 'postal_code', 'phone', 'videos_checked_out_count', 'registered_at'].sort + CUSTOMER_FIELDS = ['id', 'name', 'postal_code', 'phone', 'videos_checked_out_count', 'registered_at'].sort describe 'index' do @@ -11,27 +11,43 @@ must_respond_with :success expect(response.header['Content-Type']).must_include 'json' + #TODO: check_response(expected_type: Array) end - # it 'returns correct fields for the list of customers' do - - # end - - # it 'returns an empty array if there are no customers in the database' do + it 'returns correct fields for the list of customers' do + get customers_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + + end - # end + it 'returns an empty array if there are no customers in the database' do + Customer.destroy_all + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + + end end - # describe 'show' do - # it 'returns a hash with correct fields for an existing customer' do - - # end - - # it 'returns a 404 response with JSON for a non-existant customer' do - - # end - # end + describe 'show' do + it 'returns a hash with correct fields for an existing customer' do + + end + + it 'returns a 404 response with JSON for a non-existant customer' do + + end + end end From 80bff93ce3dc68a744438bc729d33cb30cd223a7 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 16:35:53 -0700 Subject: [PATCH 07/29] adds tests for customer show --- app/controllers/customers_controller.rb | 19 ++++++++++++++++++- config/routes.rb | 5 +++-- test/controllers/customers_controller_test.rb | 17 +++++++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 537efd94f..7a6cadb34 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -8,4 +8,21 @@ def index status: :ok end -end + def show + customer = Customer.find_by(id: params[:id]) + + if customer.nil? + render json: { + ok: false, + message: 'Not found' + }, status: :not_found + + return + end + + render json: customer.as_json(only: [:id, :name, :postal_code, :phone, :videos_checked_out_count, :registered_at]) + + + end + + end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index b239d0a92..8c79d8bfc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do - + get '/customers', to: 'customers#index', as: 'customers' - + get '/customers/:id', to: 'customers#show', as: 'customer' + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1e3eb125b..68b711d7f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -41,11 +41,28 @@ describe 'show' do it 'returns a hash with correct fields for an existing customer' do + customer = customers(:junito) + get customer_path(customer.id) + + body = JSON.parse(response.body) + + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal CUSTOMER_FIELDS end it 'returns a 404 response with JSON for a non-existant customer' do + get customer_path('bad_id') + + must_respond_with :not_found + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Not found' end end From a3f30781fdff8f7a92fea242fa1d52f741f7fbdb Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 16:48:42 -0700 Subject: [PATCH 08/29] generates video controller and model --- app/controllers/videos_controller.rb | 10 +++ app/models/video.rb | 2 + config/routes.rb | 1 + db/migrate/20200526234806_create_videos.rb | 8 +++ test/controllers/customers_controller_test.rb | 27 +------ test/controllers/videos_controller_test.rb | 71 +++++++++++++++++++ test/models/video_test.rb | 7 ++ 7 files changed, 100 insertions(+), 26 deletions(-) create mode 100644 app/controllers/videos_controller.rb create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200526234806_create_videos.rb create mode 100644 test/controllers/videos_controller_test.rb create mode 100644 test/models/video_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..90c22d37c --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,10 @@ +class VideosController < ApplicationController + + def index + videos = Video.all.order(:title) + + + render json: vidoes.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory, :overview]), + status: :ok + end +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/config/routes.rb b/config/routes.rb index 8c79d8bfc..60501bd90 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,5 @@ get '/customers', to: 'customers#index', as: 'customers' get '/customers/:id', to: 'customers#show', as: 'customer' + get '/videos', to: 'videos#index', as: 'videos' end diff --git a/db/migrate/20200526234806_create_videos.rb b/db/migrate/20200526234806_create_videos.rb new file mode 100644 index 000000000..c9e399123 --- /dev/null +++ b/db/migrate/20200526234806_create_videos.rb @@ -0,0 +1,8 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + + t.timestamps + end + end +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 68b711d7f..c59b22724 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -39,32 +39,7 @@ end - describe 'show' do - it 'returns a hash with correct fields for an existing customer' do - customer = customers(:junito) - - get customer_path(customer.id) - - body = JSON.parse(response.body) - - must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' - expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal CUSTOMER_FIELDS - end - - it 'returns a 404 response with JSON for a non-existant customer' do - get customer_path('bad_id') - - must_respond_with :not_found - - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Hash - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Not found' - end - end + end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..5a420c867 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,71 @@ +require "test_helper" + +describe VideosController do + VIDEO_FIELDS = ['id', 'title', 'release_date', 'available_inventory', 'total_inventory', 'overview'].sort + + describe 'index' do + + it 'gets the index path' do + get videos_path + + must_respond_with :success + + expect(response.header['Content-Type']).must_include 'json' + + end + + it 'returns correct fields for the list of customers' do + # get customers_path + # body = JSON.parse(response.body) + # expect(body).must_be_instance_of Array + + # body.each do |customer| + # expect(customer).must_be_instance_of Hash + # expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + # end + + end + + it 'returns an empty array if there are no customers in the database' do + # Customer.destroy_all + # get customers_path + + # body = JSON.parse(response.body) + + # expect(body).must_be_instance_of Array + # expect(body.length).must_equal 0 + + end + + end + + describe 'show' do + it 'returns a hash with correct fields for an existing customer' do + # customer = customers(:junito) + + # get customer_path(customer.id) + + # body = JSON.parse(response.body) + + # must_respond_with :success + # expect(response.header['Content-Type']).must_include 'json' + # expect(body).must_be_instance_of Hash + # expect(body.keys.sort).must_equal CUSTOMER_FIELDS + end + + it 'returns a 404 response with JSON for a non-existant customer' do + # get customer_path('bad_id') + + # must_respond_with :not_found + + # body = JSON.parse(response.body) + + # expect(body).must_be_instance_of Hash + # expect(body['ok']).must_equal false + # expect(body['message']).must_equal 'Not found' + # end + end + + + end +end \ No newline at end of file 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 aa77a3d00101c01df839791ec8b35c2ea0117211 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 16:51:05 -0700 Subject: [PATCH 09/29] adds video model migration --- db/migrate/20200526234806_create_videos.rb | 6 +++++- db/schema.rb | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/db/migrate/20200526234806_create_videos.rb b/db/migrate/20200526234806_create_videos.rb index c9e399123..beeb53473 100644 --- a/db/migrate/20200526234806_create_videos.rb +++ b/db/migrate/20200526234806_create_videos.rb @@ -1,7 +1,11 @@ class CreateVideos < ActiveRecord::Migration[6.0] def change create_table :videos do |t| - + t.string :title + t.date :release_date + t.integer :available_inventory + t.integer :total_inventory + t.string :overview t.timestamps end end diff --git a/db/schema.rb b/db/schema.rb index 9ff93ff1f..c71886c18 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_212915) do +ActiveRecord::Schema.define(version: 2020_05_26_234806) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,4 +28,14 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "videos", force: :cascade do |t| + t.string "title" + t.date "release_date" + t.integer "available_inventory" + t.integer "total_inventory" + t.string "overview" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + end From ca8c78a987a8a8041f98582e581bcffcf0702471 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 17:03:57 -0700 Subject: [PATCH 10/29] adds index testing in Video controller --- app/controllers/videos_controller.rb | 3 +-- test/controllers/videos_controller_test.rb | 26 +++++++++++----------- test/fixtures/videos.yml | 7 ++++++ 3 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 test/fixtures/videos.yml diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 90c22d37c..9a0834097 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,8 +3,7 @@ class VideosController < ApplicationController def index videos = Video.all.order(:title) - - render json: vidoes.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory, :overview]), + render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory, :overview]), status: :ok end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5a420c867..6b9e0fa07 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -14,26 +14,26 @@ end - it 'returns correct fields for the list of customers' do - # get customers_path - # body = JSON.parse(response.body) - # expect(body).must_be_instance_of Array + it 'returns correct fields for the list of videos' do + get videos_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array - # body.each do |customer| - # expect(customer).must_be_instance_of Hash - # expect(customer.keys.sort).must_equal CUSTOMER_FIELDS - # end + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end end it 'returns an empty array if there are no customers in the database' do - # Customer.destroy_all - # get customers_path + Video.destroy_all + get videos_path - # body = JSON.parse(response.body) + body = JSON.parse(response.body) - # expect(body).must_be_instance_of Array - # expect(body.length).must_equal 0 + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..2a091fa05 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,7 @@ +brazil: + title: Brazil + release_date: 1997-12-01 + available_inventory: 2 + total_inventory: 6 + overview: A dark comedy + From 1c5a449bafac77ecf5c47e7ceff266d27050a946 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 17:11:06 -0700 Subject: [PATCH 11/29] adds video#show tests --- app/controllers/customers_controller.rb | 21 ++---------- app/controllers/videos_controller.rb | 21 +++++++++++- config/routes.rb | 1 + test/controllers/videos_controller_test.rb | 39 +++++++++++----------- 4 files changed, 43 insertions(+), 39 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7a6cadb34..5d42c3954 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -8,21 +8,6 @@ def index status: :ok end - def show - customer = Customer.find_by(id: params[:id]) - - if customer.nil? - render json: { - ok: false, - message: 'Not found' - }, status: :not_found - - return - end - - render json: customer.as_json(only: [:id, :name, :postal_code, :phone, :videos_checked_out_count, :registered_at]) - - - end - - end \ No newline at end of file + + +end \ No newline at end of file diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 9a0834097..fd0403c3e 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -6,4 +6,23 @@ def index render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory, :overview]), status: :ok end -end + + def show + video = Video.find_by(id: params[:id]) + + if video.nil? + render json: { + ok: false, + message: 'Not found' + }, status: :not_found + + return + end + + render json: video.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory, :overview]) + + end + + + end + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 60501bd90..7305b0691 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,5 @@ get '/customers/:id', to: 'customers#show', as: 'customer' get '/videos', to: 'videos#index', as: 'videos' + get '/videos/:id', to: 'videos#show', as: 'video' end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 6b9e0fa07..b2e64a834 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -26,7 +26,7 @@ end - it 'returns an empty array if there are no customers in the database' do + it 'returns an empty array if there are no videos in the database' do Video.destroy_all get videos_path @@ -40,32 +40,31 @@ end describe 'show' do - it 'returns a hash with correct fields for an existing customer' do - # customer = customers(:junito) + it 'returns a hash with correct fields for an existing video' do + video = videos(:brazil) - # get customer_path(customer.id) + get video_path(video.id) - # body = JSON.parse(response.body) + body = JSON.parse(response.body) - # must_respond_with :success - # expect(response.header['Content-Type']).must_include 'json' - # expect(body).must_be_instance_of Hash - # expect(body.keys.sort).must_equal CUSTOMER_FIELDS + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal VIDEO_FIELDS end - it 'returns a 404 response with JSON for a non-existant customer' do - # get customer_path('bad_id') + it 'returns a 404 response with JSON for a non-existant video' do + get video_path('bad_id') - # must_respond_with :not_found + must_respond_with :not_found - # body = JSON.parse(response.body) + body = JSON.parse(response.body) - # expect(body).must_be_instance_of Hash - # expect(body['ok']).must_equal false - # expect(body['message']).must_equal 'Not found' - # end + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Not found' end - - end -end \ No newline at end of file + + +end From d75ef26159b24915d222d63b7d032da3f5191a9f Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 17:53:47 -0700 Subject: [PATCH 12/29] adds video#create route, method, tests --- app/controllers/videos_controller.rb | 27 ++++++++++++++++-- app/models/video.rb | 6 ++++ config/routes.rb | 1 + test/controllers/videos_controller_test.rb | 32 +++++++++++++++++++++- 4 files changed, 62 insertions(+), 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fd0403c3e..020251d03 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -23,6 +23,27 @@ def show end - - end - \ No newline at end of file + def create + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + message: 'Did not create video' + }, status: :bad_request + return + end + end + + private + + def video_params + return params.require(:video).permit(:title, :release_date, :available_inventory, :total_inventory, :overview) + end + + + end + \ No newline at end of file diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..cc3d4cb71 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,8 @@ class Video < ApplicationRecord + validates :title, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true + validates :overview, presence: true + end diff --git a/config/routes.rb b/config/routes.rb index 7305b0691..203f32fdc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,5 @@ get '/videos', to: 'videos#index', as: 'videos' get '/videos/:id', to: 'videos#show', as: 'video' + post '/videos', to: 'videos#create' end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index b2e64a834..1e5e78014 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -66,5 +66,35 @@ end end - + describe "create" do + let(:video_data) { + { + video: { + title: "A Cool Movie", + release_date: "2020-01-02", + available_inventory: 3, + total_inventory: 3, + overview: "The best movie you've ever seen" + } + } + } + + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + must_respond_with :created + end + + it 'responds with bad request if field is empty' do + video_data[:video][:title] = nil + + expect { + post videos_path, params: video_data + }.wont_differ "Video.count" + + must_respond_with :bad_request + end + end end From f527f0ba88efb926dbc48e6d969d4c2aeb794518 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Tue, 26 May 2020 20:31:38 -0700 Subject: [PATCH 13/29] stubs validation tests for customer and video --- test/models/customer_test.rb | 38 +++++++++++++++++++++++++++++------- test/models/video_test.rb | 33 ++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 779444646..a677e49f6 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,10 +1,34 @@ require "test_helper" describe 'Customer' do - - # it 'can be instantiated' do - - # end - - -end + describe 'validations' do + it 'is invalid without a name' do + + end + + it 'is invalid without a postal code' do + + end + + it 'is invalid without an address' do + + end + + it 'is invalid without a city' do + + end + + it 'is invalid without a state' do + + end + + it 'is invalid without a phone number' do + + end + + it 'is invalid without a videos_checked_out_count' do + + end + end + +end \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..df825dbab 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe 'validations' do + it 'is invalid without title' do + + end + + it 'is invalid without release date' do + + end + + it 'is invalid without total inventory' do + + end + + it 'is invalid if total inventory is not an integer' do + + end + + it 'is invalid without available inventory' do + + end + + it 'is invalid if available inventory is not an integer' do + + end + + it 'is invalid without overview' do + + end + + end end From 7ea30260bd17fa4b9a0d603c30894ab47a2ef5c1 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Wed, 27 May 2020 08:31:04 -0700 Subject: [PATCH 14/29] adds validation tests for customer and video --- test/controllers/videos_controller_test.rb | 1 + test/fixtures/customers.yml | 10 ++-- test/fixtures/videos.yml | 3 +- test/models/customer_test.rb | 64 +++++++++++++++++----- test/models/video_test.rb | 35 ++++++++++-- 5 files changed, 87 insertions(+), 26 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 1e5e78014..0ceefc814 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -42,6 +42,7 @@ describe 'show' do it 'returns a hash with correct fields for an existing video' do video = videos(:brazil) + puts "here's your video: #{videos(:brazil)}" get video_path(video.id) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 9eaa9c42e..2d7f5572c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -5,14 +5,14 @@ junito: phone: 823-4034 address: 1234 Main St city: Seattle - state: WA + state: WA videos_checked_out_count: 0 -leah: - name: Leah +leah: + name: Leah registered_at: 2019-07-31 postal_code: 98166 phone: 823-4056 address: 1234 Any St city: Seattle - state: WA - videos_checked_out_count: 1 + state: WA + videos_checked_out_count: 1 \ No newline at end of file diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 2a091fa05..12a7ab9c5 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -3,5 +3,4 @@ brazil: release_date: 1997-12-01 available_inventory: 2 total_inventory: 6 - overview: A dark comedy - + overview: A dark comedy \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a677e49f6..142233b11 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,34 +1,68 @@ require "test_helper" -describe 'Customer' do +describe Customer do + describe 'validations' do + before do + @customer = customers(:junito) + end + it 'is invalid without a name' do - + @customer.name = '' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :name end - + it 'is invalid without a postal code' do - + @customer.postal_code = '' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :postal_code end - + it 'is invalid without an address' do - + @customer.address = '' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :address end - + it 'is invalid without a city' do - + @customer.city = '' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :city end - + it 'is invalid without a state' do - + @customer.state = '' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :state end - + it 'is invalid without a phone number' do - + @customer.phone = '' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :phone end - + it 'is invalid without a videos_checked_out_count' do - + @customer.videos_checked_out_count = '' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :videos_checked_out_count end + + #TODO: Add validation for integer - also for positive integer + # it 'is invalid if videos_checked_out_count is not an integer' do + # @customer.videos_checked_out_count = 'empanada' + + # expect(@customer.valid?).must_equal false + # expect(@customer.errors.messages).must_include :videos_checked_out_count + # end end - + end \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index df825dbab..129adc499 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -2,32 +2,59 @@ describe Video do describe 'validations' do + before do + @video = videos(:brazil) + end + it 'is invalid without title' do + @video.title = '' + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :title end it 'is invalid without release date' do + @video.release_date = '' + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :release_date end it 'is invalid without total inventory' do + @video.total_inventory = '' + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :total_inventory end - it 'is invalid if total inventory is not an integer' do + #TODO: Add validation for integer - also for positive integer + # it 'is invalid if total inventory is not an integer' do + # @video.total_inventory = 'banana' - end + # expect(@video.valid?).must_equal false + # expect(@video.errors.messages).must_include :total_inventory + # end it 'is invalid without available inventory' do + @video.available_inventory = '' + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :available_inventory end - it 'is invalid if available inventory is not an integer' do + #TODO: Add validation for integer - also for positive integer + # it 'is invalid if available inventory is not an integer' do + # @video.available_inventory = 'taco' - end + # expect(@video.valid?).must_equal false + # expect(@video.errors.messages).must_include :available_inventory + # end it 'is invalid without overview' do + @video.overview = '' + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :overview end end From a4ae6411573b32457758e301aa60b12fcb6944c5 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Wed, 27 May 2020 09:48:45 -0700 Subject: [PATCH 15/29] video controller test cleanup --- test/controllers/videos_controller_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 0ceefc814..1e5e78014 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -42,7 +42,6 @@ describe 'show' do it 'returns a hash with correct fields for an existing video' do video = videos(:brazil) - puts "here's your video: #{videos(:brazil)}" get video_path(video.id) From 1cc2a0327f06049957c831879533739b47d83b16 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Wed, 27 May 2020 10:47:38 -0700 Subject: [PATCH 16/29] added integer validation tests to cust and video --- app/models/customer.rb | 2 +- app/models/video.rb | 4 +-- test/models/customer_test.rb | 18 ++++++---- test/models/video_test.rb | 65 +++++++++++++++++++++--------------- 4 files changed, 54 insertions(+), 35 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 942b9f909..d8b2f5202 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,7 +8,7 @@ class Customer < ApplicationRecord validates :city, presence: true validates :state, presence: true validates :phone, presence: true - validates :videos_checked_out_count, presence: true + validates :videos_checked_out_count, presence: true, numericality: {only_integer: true, greater_than: -1 } end diff --git a/app/models/video.rb b/app/models/video.rb index cc3d4cb71..3467fee1f 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,8 +1,8 @@ class Video < ApplicationRecord validates :title, presence: true validates :release_date, presence: true - validates :total_inventory, presence: true - validates :available_inventory, presence: true + validates :total_inventory, presence: true, numericality: {only_integer: true, greater_than: -1 } + validates :available_inventory, presence: true, numericality: {only_integer: true, greater_than: -1 } validates :overview, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 142233b11..4084c03cd 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -56,13 +56,19 @@ expect(@customer.errors.messages).must_include :videos_checked_out_count end - #TODO: Add validation for integer - also for positive integer - # it 'is invalid if videos_checked_out_count is not an integer' do - # @customer.videos_checked_out_count = 'empanada' + it 'is invalid if videos_checked_out_count is not an integer' do + @customer.videos_checked_out_count = 'empanada' + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :videos_checked_out_count + end - # expect(@customer.valid?).must_equal false - # expect(@customer.errors.messages).must_include :videos_checked_out_count - # end + it 'is invalid if videos_checked_out_count is negative integer' do + @customer.videos_checked_out_count = -4 + + expect(@customer.valid?).must_equal false + expect(@customer.errors.messages).must_include :videos_checked_out_count + end end end \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 129adc499..a405ea680 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -8,54 +8,67 @@ it 'is invalid without title' do @video.title = '' - + expect(@video.valid?).must_equal false expect(@video.errors.messages).must_include :title end - + it 'is invalid without release date' do @video.release_date = '' - + expect(@video.valid?).must_equal false expect(@video.errors.messages).must_include :release_date end - + it 'is invalid without total inventory' do @video.total_inventory = '' - + expect(@video.valid?).must_equal false expect(@video.errors.messages).must_include :total_inventory end - - #TODO: Add validation for integer - also for positive integer - # it 'is invalid if total inventory is not an integer' do - # @video.total_inventory = 'banana' - - # expect(@video.valid?).must_equal false - # expect(@video.errors.messages).must_include :total_inventory - # end - + + it 'is invalid if total inventory is not an integer' do + @video.total_inventory = 'banana' + + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :total_inventory + end + + it 'is invalid if total inventory is a negative integer' do + @video.total_inventory = -4 + + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :total_inventory + end + it 'is invalid without available inventory' do @video.available_inventory = '' - + expect(@video.valid?).must_equal false expect(@video.errors.messages).must_include :available_inventory end - - #TODO: Add validation for integer - also for positive integer - # it 'is invalid if available inventory is not an integer' do - # @video.available_inventory = 'taco' - - # expect(@video.valid?).must_equal false - # expect(@video.errors.messages).must_include :available_inventory - # end - + + + it 'is invalid if available inventory is not an integer' do + @video.available_inventory = 'taco' + + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :available_inventory + end + + it 'is invalid if available inventory is a negative integer' do + @video.available_inventory = -4 + + expect(@video.valid?).must_equal false + expect(@video.errors.messages).must_include :available_inventory + end + it 'is invalid without overview' do @video.overview = '' - + expect(@video.valid?).must_equal false expect(@video.errors.messages).must_include :overview end - + end end From 2d895ced555abac46e2a1bb1f869197feb17d5bf Mon Sep 17 00:00:00 2001 From: Stephanie Date: Wed, 27 May 2020 11:20:50 -0700 Subject: [PATCH 17/29] added checked_out action --- app/controllers/rentals_controller.rb | 36 +++++++++++++++++++++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 28 ++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..8f2507596 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,36 @@ +class RentalsController < ApplicationController + + def check_out + # creates new instance of rental + # needs cust id + # needs video id + # increase cust checked out count + # decrease avail inventory + + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + + rental = Rental.new(customer_id: customer.id, video_id: video.id) + + if rental.save + #TODO update to show full response (customer_id, video_id, due_date, videos_checked_out_count, available_inventory) + render json: rental.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + message: 'Did not create retnal' + }, status: :bad_request + return + end + + end + + private + + def rental_params + return params.require(:rental).permit(:customer_id, :video_id) + end + + end + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 203f32fdc..729407d26 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,4 +6,6 @@ get '/videos', to: 'videos#index', as: 'videos' get '/videos/:id', to: 'videos#show', as: 'video' post '/videos', to: 'videos#create' + + post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..eade37764 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,28 @@ +require "test_helper" + +describe RentalsController do + describe "check_out" do + + let(:customer) { + customers(:junito) + } + + let(:video) { + videos(:brazil) + } + + + it "can get checkout path" do + post check_out_path(customer_id: customer.id, video_id: video.id) + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end + + + + end + + describe "check_in" do + + end +end From b2ad7053c1d4a1be4b014a127f425ebfe88438f5 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Wed, 27 May 2020 11:36:38 -0700 Subject: [PATCH 18/29] added cust and vid relationships to rental --- app/models/customer.rb | 3 ++- app/models/rental.rb | 7 +++++++ app/models/video.rb | 3 +++ db/migrate/20200527182116_create_rentals.rb | 8 ++++++++ ...20200527183219_add_cust_and_vid_id_to_rental.rb | 6 ++++++ db/schema.rb | 14 +++++++++++++- test/models/rental_test.rb | 7 +++++++ 7 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200527182116_create_rentals.rb create mode 100644 db/migrate/20200527183219_add_cust_and_vid_id_to_rental.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index d8b2f5202..511f8a190 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord - #TODO relationships + has_many :rentals + has_many :videos, through: :rentals validates :name, presence: true validates :registered_at, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..713b6d2c4 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,7 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video + + #validations + +end diff --git a/app/models/video.rb b/app/models/video.rb index 3467fee1f..24536c162 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,7 @@ class Video < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals + validates :title, presence: true validates :release_date, presence: true validates :total_inventory, presence: true, numericality: {only_integer: true, greater_than: -1 } diff --git a/db/migrate/20200527182116_create_rentals.rb b/db/migrate/20200527182116_create_rentals.rb new file mode 100644 index 000000000..c82c15be0 --- /dev/null +++ b/db/migrate/20200527182116_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.date :due_date + t.timestamps + end + end +end diff --git a/db/migrate/20200527183219_add_cust_and_vid_id_to_rental.rb b/db/migrate/20200527183219_add_cust_and_vid_id_to_rental.rb new file mode 100644 index 000000000..3bbc6c943 --- /dev/null +++ b/db/migrate/20200527183219_add_cust_and_vid_id_to_rental.rb @@ -0,0 +1,6 @@ +class AddCustAndVidIdToRental < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :video, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index c71886c18..2c178147a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_26_234806) do +ActiveRecord::Schema.define(version: 2020_05_27_183219) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,6 +28,16 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + 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.date "release_date" @@ -38,4 +48,6 @@ t.datetime "updated_at", precision: 6, null: false end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From ac5ac6fa3b4f2cfcdba23d7c2a79a000fb7da6a3 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Wed, 27 May 2020 13:51:00 -0700 Subject: [PATCH 19/29] added more rentals controller tests --- app/controllers/rentals_controller.rb | 42 +++++++----- app/controllers/videos_controller.rb | 8 +++ app/models/rental.rb | 3 +- test/controllers/rentals_controller_test.rb | 73 +++++++++++++++++++-- test/fixtures/rentals.yml | 2 + test/models/rental_test.rb | 46 ++++++++++++- 6 files changed, 147 insertions(+), 27 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8f2507596..2417c35a7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,30 +7,36 @@ def check_out # increase cust checked out count # decrease avail inventory - customer = Customer.find_by(id: params[:customer_id]) - video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) + unless customer + render json: { ok: false, message: 'Customer could not be found' }, status: :not_found + return + end + + + video = Video.find_by(id: rental_params[:video_id]) + if video.nil? + render json: { ok: false, message: 'Video could not be found' }, status: :not_found + return + end - rental = Rental.new(customer_id: customer.id, video_id: video.id) + rental = Rental.new(customer_id: customer.id, video_id: video.id, due_date: Date.today + 7) if rental.save #TODO update to show full response (customer_id, video_id, due_date, videos_checked_out_count, available_inventory) - render json: rental.as_json(only: [:id]), status: :created + render json: rental.as_json(except: [:id, :created_at, :updated_at]), status: :created return else - render json: { - ok: false, - message: 'Did not create retnal' - }, status: :bad_request - return - end - - end - - private - - def rental_params - return params.require(:rental).permit(:customer_id, :video_id) + render json: { ok: false, message: 'Did not create rental'}, status: :bad_request + return end + end + + private + + def rental_params + return params.require(:rental).permit(:customer_id, :video_id) end - \ No newline at end of file + +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 020251d03..65320aa05 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -38,6 +38,14 @@ def create end end + # TODO: add this in the else block, + # update tests with: body = JSON.parse(response.body) + # expect(body["errors"].keys).must_include "age" + # render json: { + # ok: false, + # errors: video.errors.messages + # }, status: :bad_request + private def video_params diff --git a/app/models/rental.rb b/app/models/rental.rb index 713b6d2c4..6e3f3269f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,5 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - #validations - + validates :due_date, presence: true end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index eade37764..9ec4464d8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,8 +1,12 @@ require "test_helper" describe RentalsController do + + RENTAL_FIELDS = ['customer_id', 'video_id', 'due_date'].sort + #TODO add videos_checked_out, and available_inventory + describe "check_out" do - + let(:customer) { customers(:junito) } @@ -11,13 +15,74 @@ videos(:brazil) } - - it "can get checkout path" do - post check_out_path(customer_id: customer.id, video_id: video.id) + it "can get checkout path, creates a new rental with valid information and responds with success" do + rental_info = { + rental: { + customer_id: customer.id, + video_id: video.id, + } + } + + post check_out_path(params: rental_info) + body = JSON.parse(response.body) + must_respond_with :success expect(response.header['Content-Type']).must_include 'json' + expect(body.keys.sort).must_equal RENTAL_FIELDS + expect(body["due_date"]).must_equal (Date.today + 7).to_s + expect(body["customer_id"]).must_equal customer.id + expect(body["video_id"]).must_equal video.id + #TODO add videos_checked_out, and available_inventory + end + it "responds with not_found if customer is nil" do + rental_info = { + rental: { + customer_id: 'pizza', + video_id: video.id, + } + } + + expect { + post check_out_path, params: rental_info + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + must_respond_with :not_found + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Customer could not be found' + end + + + + it "responds with not_found if video is nil" do + rental_info = { + rental: { + customer_id: customer.id, + video_id: 'sandwich', + } + } + + expect { + post check_out_path, params: rental_info + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + must_respond_with :not_found + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Video could not be found' + end + + it 'responds with bad_request if there are no videos available' do + + end + + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..2c05464b2 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,2 @@ +rental1: + due_date: 2020-03-03 \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..7e2e7fb30 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,47 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + describe 'validations' do + it 'can be created' do + customer = customers(:junito) + video = videos(:brazil) + + rental = Rental.create(customer_id: customer.id, video_id: video.id, due_date: Date.today) + + expect(rental.valid?).must_equal true + + end + + it "can't be created without customer" do + customer_id = 'taco' + video = videos(:brazil) + + rental = Rental.create(customer_id: customer_id, video_id: video.id, due_date: Date.today) + + expect(rental.valid?).must_equal false + expect(rental.errors.messages).must_include :customer + end + + it "can't be created without video" do + customer = customers(:junito) + video_id = 'apple' + + rental = Rental.create(customer_id: customer.id, video_id: video_id, due_date: Date.today) + + expect(rental.valid?).must_equal false + expect(rental.errors.messages).must_include :video + end + + it "can't be created without due_date" do + customer = customers(:junito) + video = videos(:brazil) + + rental = Rental.create(customer_id: customer.id, video_id: video.id, due_date: nil) + + expect(rental.valid?).must_equal false + expect(rental.errors.messages).must_include :due_date + end + + end end From c925780bc425d5f323daa89f3fc30149874a0437 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Wed, 27 May 2020 14:50:11 -0700 Subject: [PATCH 20/29] small changes to try and pass smoke tests --- .DS_Store | Bin 0 -> 8196 bytes app/controllers/videos_controller.rb | 10 ++++------ 2 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fb483f33ce627206dd5563dc22c5a276f71f7c7a GIT binary patch literal 8196 zcmeHMOK;Oa5T0#9YLf~D35kL@SmFSOg8G6YaS5RXA%Q?mMGrhuJ29XFs1BL;^z~8|D&TL++3Fp4NYg)sA zVc@@HfIlA`R4(he97-u39cV-f09nScDCmnH|BwzJfUM_oC?!Tvm{f(7sw_`2Se`pD zsgC>g96yv&suL44!%jXk%QF;~ryk4^aAI{SO=}o142(0tbN3Rt)T7?5P|4q~;?DV> zq6oDTc@$8jp+0J;3biSwh@JqutzsFUt7y?KV(B6!lxZ3-G>s|hkf&k3YnUqL_VED{ zakXg|mb=tZwTMUesu0~Y-Gok8_#Kk3p?Q==^o)we3?ZV%T&kXkxTt4CFN0SJyyFaw z&BS=bMU4tjU1)5>yS`?fM_$C1U@y@5;gK?{5GhB+`q~g8R8TWm!x&!r)WZC{mvL{$ ze88G2dKK)X49s&++M2(JO~G2Uj>vXl^>8i_pMtl6U!!ZZN_QY9tSWn2h;^F!l*0Q& zGN}3^VlJY~z#>9QRUBVM#p(#>4f?(Ojn@ya7Y6-we*P<)DwU5^rY-wu)vg|^+K-w$ z@t~QyY1VJJNvn3I8FYNlO*Vs0y0hU&YoWjAM|YFkZt5owICvwDLjYvo_3j7$pjA6@ zJ&sa0i2Ov@lQtf122m#-G~z7k^aVaQF8cS}bO&~7?N%j;451-%g+ zd(9*Y<7gXW9A5&RUH!4bH@HG(h4w&tgbjve(un69ptwLbJriG^Xwnx>Z1!)34Pegy z(NdX?VL)Y|Brj)q{=YW){lBVYt_%Z)fq#ktR$gtcHW1S9Q(ljb=h_bH7Ah|sHbV?Bi4hd@B0$h!8pFUJW#AV-JZYZ* literal 0 HcmV?d00001 diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 65320aa05..caa56c4d1 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,7 +3,7 @@ class VideosController < ApplicationController def index videos = Video.all.order(:title) - render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory, :overview]), + render json: videos.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok end @@ -12,15 +12,13 @@ def show if video.nil? render json: { - ok: false, - message: 'Not found' + errors: ['Not Found'] }, status: :not_found return end - render json: video.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory, :overview]) - + render json: video.as_json(only: [:overview, :title, :release_date, :available_inventory, :total_inventory]) end def create @@ -32,7 +30,7 @@ def create else render json: { ok: false, - message: 'Did not create video' + errors: video.errors.messages }, status: :bad_request return end From e5a0699010625b7b26a3d372aab1836148298d8c Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Wed, 27 May 2020 15:35:11 -0700 Subject: [PATCH 21/29] cleans up video controller test to align with expectations from smoke tests --- test/controllers/videos_controller_test.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 1e5e78014..5823bb0da 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -4,7 +4,6 @@ VIDEO_FIELDS = ['id', 'title', 'release_date', 'available_inventory', 'total_inventory', 'overview'].sort describe 'index' do - it 'gets the index path' do get videos_path @@ -15,15 +14,15 @@ end it 'returns correct fields for the list of videos' do + index_fields = ["available_inventory", "id", "release_date", "title"] get videos_path body = JSON.parse(response.body) expect(body).must_be_instance_of Array body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + expect(video.keys.sort).must_equal index_fields end - end it 'returns an empty array if there are no videos in the database' do @@ -41,6 +40,7 @@ describe 'show' do it 'returns a hash with correct fields for an existing video' do + show_fields = ["available_inventory", "overview", "release_date", "title", "total_inventory"] video = videos(:brazil) get video_path(video.id) @@ -50,7 +50,7 @@ must_respond_with :success expect(response.header['Content-Type']).must_include 'json' expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal show_fields end it 'returns a 404 response with JSON for a non-existant video' do @@ -61,8 +61,7 @@ body = JSON.parse(response.body) expect(body).must_be_instance_of Hash - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Not found' + expect(body['errors']).must_equal ['Not Found'] end end From 5ce0e54c6281d151152d97065a5a9ca65ec2f3e1 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Wed, 27 May 2020 15:55:16 -0700 Subject: [PATCH 22/29] cleans up tests and code to pass both smoke tests and controller tests --- app/controllers/videos_controller.rb | 11 +---------- test/controllers/videos_controller_test.rb | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index caa56c4d1..a82d11506 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -29,25 +29,16 @@ def create return else render json: { - ok: false, errors: video.errors.messages }, status: :bad_request return end end - # TODO: add this in the else block, - # update tests with: body = JSON.parse(response.body) - # expect(body["errors"].keys).must_include "age" - # render json: { - # ok: false, - # errors: video.errors.messages - # }, status: :bad_request - private def video_params - return params.require(:video).permit(:title, :release_date, :available_inventory, :total_inventory, :overview) + return params.permit(:title, :release_date, :available_inventory, :total_inventory, :overview) end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5823bb0da..3c8825e8a 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -10,7 +10,6 @@ must_respond_with :success expect(response.header['Content-Type']).must_include 'json' - end it 'returns correct fields for the list of videos' do @@ -33,7 +32,6 @@ expect(body).must_be_instance_of Array expect(body.length).must_equal 0 - end end From acf357074b5e9ab16a75ab1ab28415824bf3e36f Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Thu, 28 May 2020 09:16:04 -0700 Subject: [PATCH 23/29] adds logic for checking out video decreasing available inventory in video, increasing video checked out count in customer --- app/controllers/rentals_controller.rb | 9 ++++++++- app/controllers/videos_controller.rb | 4 +++- test/controllers/rentals_controller_test.rb | 14 +++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2417c35a7..150205f24 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,13 +8,14 @@ def check_out # decrease avail inventory customer = Customer.find_by(id: rental_params[:customer_id]) - unless customer + if customer.nil? render json: { ok: false, message: 'Customer could not be found' }, status: :not_found return end video = Video.find_by(id: rental_params[:video_id]) + #TODO: Check to see if there is available inventory if video.nil? render json: { ok: false, message: 'Video could not be found' }, status: :not_found return @@ -23,6 +24,12 @@ def check_out rental = Rental.new(customer_id: customer.id, video_id: video.id, due_date: Date.today + 7) if rental.save + # increase the customer's video count + customer[:videos_checked_out_count] += 1 + customer.save + # decrease the video available inventory + video[:available_inventory] -= 1 + video.save #TODO update to show full response (customer_id, video_id, due_date, videos_checked_out_count, available_inventory) render json: rental.as_json(except: [:id, :created_at, :updated_at]), status: :created return diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index a82d11506..9f8cf970c 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -22,7 +22,8 @@ def show end def create - video = Video.new(video_params) + #TODO: Fix this! + video = Video.new(title: params[:video][:title], release_date: params[:video][:release_date], available_inventory: params[:video][:available_inventory], total_inventory: params[:video][:total_inventory], overview: params[:video][:overview]) if video.save render json: video.as_json(only: [:id]), status: :created @@ -38,6 +39,7 @@ def create private def video_params + # TODO: how can we get this up in create?? return params.permit(:title, :release_date, :available_inventory, :total_inventory, :overview) end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9ec4464d8..6517cee20 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,7 +3,6 @@ describe RentalsController do RENTAL_FIELDS = ['customer_id', 'video_id', 'due_date'].sort - #TODO add videos_checked_out, and available_inventory describe "check_out" do @@ -15,7 +14,7 @@ videos(:brazil) } - it "can get checkout path, creates a new rental with valid information and responds with success" do + it "can get checkout path, creates a new rental with valid information and responds with success" do rental_info = { rental: { customer_id: customer.id, @@ -23,7 +22,11 @@ } } + count = customer.videos_checked_out_count + vid_count = video.available_inventory + post check_out_path(params: rental_info) + body = JSON.parse(response.body) must_respond_with :success @@ -32,8 +35,11 @@ expect(body["due_date"]).must_equal (Date.today + 7).to_s expect(body["customer_id"]).must_equal customer.id expect(body["video_id"]).must_equal video.id - #TODO add videos_checked_out, and available_inventory + customer.reload + video.reload + expect(customer.videos_checked_out_count).must_equal count + 1 + expect(video.available_inventory).must_equal vid_count - 1 end it "responds with not_found if customer is nil" do @@ -85,6 +91,8 @@ + + end describe "check_in" do From 8740209a9cdb3944a97456914c4b7d39fcefce13 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Thu, 28 May 2020 16:54:33 -0700 Subject: [PATCH 24/29] cleans up stuff to pass smoke tests, refactors params --- app/controllers/customers_controller.rb | 2 - app/controllers/rentals_controller.rb | 57 ++++++++++----------- app/controllers/videos_controller.rb | 6 +-- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 33 +++++------- test/controllers/videos_controller_test.rb | 17 ++++-- 6 files changed, 56 insertions(+), 61 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5d42c3954..e4778b0cc 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -8,6 +8,4 @@ def index status: :ok end - - end \ No newline at end of file diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 150205f24..5cc25eca8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,49 +1,48 @@ class RentalsController < ApplicationController - def check_out - # creates new instance of rental - # needs cust id - # needs video id - # increase cust checked out count - # decrease avail inventory - - customer = Customer.find_by(id: rental_params[:customer_id]) + def check_out + customer = Customer.find_by(id: params[:customer_id]) if customer.nil? - render json: { ok: false, message: 'Customer could not be found' }, status: :not_found + render json: { errors: ['Not Found'] }, status: :not_found return end - - video = Video.find_by(id: rental_params[:video_id]) + video = Video.find_by(id: params[:video_id]) #TODO: Check to see if there is available inventory if video.nil? - render json: { ok: false, message: 'Video could not be found' }, status: :not_found + render json: { errors: ['Not Found'] }, status: :not_found return end rental = Rental.new(customer_id: customer.id, video_id: video.id, due_date: Date.today + 7) if rental.save - # increase the customer's video count customer[:videos_checked_out_count] += 1 customer.save - # decrease the video available inventory + video[:available_inventory] -= 1 video.save - #TODO update to show full response (customer_id, video_id, due_date, videos_checked_out_count, available_inventory) - render json: rental.as_json(except: [:id, :created_at, :updated_at]), status: :created - return - else - render json: { ok: false, message: 'Did not create rental'}, status: :bad_request - return - end - - end - - private - - def rental_params - return params.require(:rental).permit(:customer_id, :video_id) + + render json: { + due_date: rental.due_date, + customer_id: customer.id, + video_id: video.id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory }, status: :ok + return + + else + render json: { errors: rental.errors.full_messages }, status: :bad_request + return + end end - + + + private + + def rental_params + return params.permit(:customer_id, :video_id) + end + end + \ No newline at end of file diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 9f8cf970c..9db96128e 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -22,8 +22,7 @@ def show end def create - #TODO: Fix this! - video = Video.new(title: params[:video][:title], release_date: params[:video][:release_date], available_inventory: params[:video][:available_inventory], total_inventory: params[:video][:total_inventory], overview: params[:video][:overview]) + video = Video.new(video_params) if video.save render json: video.as_json(only: [:id]), status: :created @@ -39,10 +38,7 @@ def create private def video_params - # TODO: how can we get this up in create?? return params.permit(:title, :release_date, :available_inventory, :total_inventory, :overview) end - - end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 729407d26..1fe13d259 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,5 +7,5 @@ get '/videos/:id', to: 'videos#show', as: 'video' post '/videos', to: 'videos#create' - post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6517cee20..79715edbf 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,7 +2,7 @@ describe RentalsController do - RENTAL_FIELDS = ['customer_id', 'video_id', 'due_date'].sort + RENTAL_FIELDS = ['available_inventory', 'videos_checked_out_count', 'customer_id', 'video_id', 'due_date'].sort describe "check_out" do @@ -16,16 +16,16 @@ it "can get checkout path, creates a new rental with valid information and responds with success" do rental_info = { - rental: { - customer_id: customer.id, - video_id: video.id, - } + customer_id: customer.id, + video_id: video.id } count = customer.videos_checked_out_count vid_count = video.available_inventory post check_out_path(params: rental_info) + customer.reload + video.reload body = JSON.parse(response.body) @@ -35,19 +35,18 @@ expect(body["due_date"]).must_equal (Date.today + 7).to_s expect(body["customer_id"]).must_equal customer.id expect(body["video_id"]).must_equal video.id + expect(body["videos_checked_out_count"]).must_equal customer.videos_checked_out_count + expect(body["available_inventory"]).must_equal video.available_inventory - customer.reload - video.reload expect(customer.videos_checked_out_count).must_equal count + 1 expect(video.available_inventory).must_equal vid_count - 1 + end it "responds with not_found if customer is nil" do rental_info = { - rental: { - customer_id: 'pizza', - video_id: video.id, - } + customer_id: 'pizza', + video_id: video.id } expect { @@ -58,18 +57,15 @@ must_respond_with :not_found expect(body).must_be_instance_of Hash - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Customer could not be found' + expect(body['errors']).must_equal ['Not Found'] end it "responds with not_found if video is nil" do rental_info = { - rental: { - customer_id: customer.id, - video_id: 'sandwich', - } + customer_id: customer.id, + video_id: 'sandwich', } expect { @@ -80,8 +76,7 @@ must_respond_with :not_found expect(body).must_be_instance_of Hash - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Video could not be found' + expect(body['errors']).must_equal ['Not Found'] end it 'responds with bad_request if there are no videos available' do diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 3c8825e8a..24356cd67 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -65,27 +65,34 @@ describe "create" do let(:video_data) { - { - video: { + { title: "A Cool Movie", release_date: "2020-01-02", available_inventory: 3, total_inventory: 3, overview: "The best movie you've ever seen" - } } } it "can create a new video" do + + data = { + title: "A Cool Movie", + release_date: "2020-01-02", + available_inventory: 3, + total_inventory: 3, + overview: "The best movie you've ever seen" + } + expect { - post videos_path, params: video_data + post videos_path, params: data }.must_differ "Video.count", 1 must_respond_with :created end it 'responds with bad request if field is empty' do - video_data[:video][:title] = nil + video_data[:title] = nil expect { post videos_path, params: video_data From 48831b0946d292e7282c3cce35d4f15f1552af59 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Thu, 28 May 2020 17:06:05 -0700 Subject: [PATCH 25/29] adds check for available inventory --- app/controllers/rentals_controller.rb | 27 ++++++++++++-------- test/controllers/rentals_controller_test.rb | 28 ++++++++++++++++++--- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5cc25eca8..3560ae044 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,6 +14,11 @@ def check_out return end + if video[:available_inventory] == 0 + render json: { errors: 'Video not available' }, status: :bad_request + return + end + rental = Rental.new(customer_id: customer.id, video_id: video.id, due_date: Date.today + 7) if rental.save @@ -34,15 +39,15 @@ def check_out else render json: { errors: rental.errors.full_messages }, status: :bad_request return - end + end + end + + + private + + def rental_params + return params.permit(:customer_id, :video_id) + end + end - - - private - - def rental_params - return params.permit(:customer_id, :video_id) - end - -end - \ No newline at end of file + \ No newline at end of file diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 79715edbf..299f6ef5c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -81,13 +81,33 @@ it 'responds with bad_request if there are no videos available' do + video = Video.create( + title: "A Cool Movie", + release_date: "2020-01-02", + available_inventory: 0, + total_inventory: 0, + overview: "The best movie you've ever seen" + ) + + rental_info = { + customer_id: customer.id, + video_id: video.id, + } + + expect { + post check_out_path, params: rental_info + }.wont_change "Rental.count" + + + body = JSON.parse(response.body) + + must_respond_with :bad_request + expect(body).must_be_instance_of Hash + expect(body['errors']).must_equal 'Video not available' + end - - - - end describe "check_in" do From 711d85c3f92151197fd64dd5853520b1e0ce5c14 Mon Sep 17 00:00:00 2001 From: Leah Hughes Date: Thu, 28 May 2020 18:12:30 -0700 Subject: [PATCH 26/29] check in method, nearly functional --- app/controllers/rentals_controller.rb | 52 ++++++++++++--- config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 72 +++++++++++++++++---- 3 files changed, 105 insertions(+), 20 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3560ae044..ca73b6710 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -42,12 +42,48 @@ def check_out end end - - private - - def rental_params - return params.permit(:customer_id, :video_id) + def check_in + #if rental does exist + + rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + + if rental.nil? + render json: { errors: rental.errors.full_messages }, status: :bad_request + return + end + + if customer.nil? || video.nil? + render json: { errors: ['Not Found']}, status: :not_found + return + end + + + if rental.destroy! + customer[:videos_checked_out_count] -= 1 + customer.save + + video[:available_inventory] += 1 + video.save + + render json: { + customer_id: customer.id, + video_id: video.id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory }, status: :ok + + puts "rental ************* #{rental}" + return + end + + end + + private + + def rental_params + return params.permit(:customer_id, :video_id) + end + end - - end - \ No newline at end of file + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 1fe13d259..f59bdfbc5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,4 +8,5 @@ post '/videos', to: 'videos#create' post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 299f6ef5c..524ad739f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,16 +4,16 @@ RENTAL_FIELDS = ['available_inventory', 'videos_checked_out_count', 'customer_id', 'video_id', 'due_date'].sort + let(:customer) { + customers(:junito) + } + + let(:video) { + videos(:brazil) + } + describe "check_out" do - let(:customer) { - customers(:junito) - } - - let(:video) { - videos(:brazil) - } - it "can get checkout path, creates a new rental with valid information and responds with success" do rental_info = { customer_id: customer.id, @@ -23,7 +23,9 @@ count = customer.videos_checked_out_count vid_count = video.available_inventory - post check_out_path(params: rental_info) + expect { + post check_out_path(params: rental_info) + }.must_differ "Rental.count", 1 customer.reload video.reload @@ -94,6 +96,7 @@ video_id: video.id, } + expect { post check_out_path, params: rental_info }.wont_change "Rental.count" @@ -107,10 +110,55 @@ end - end describe "check_in" do + it "can get check_in path and responds with success" do + + rental_info = { + customer_id: customer.id, + video_id: video.id + } + puts "Before test #{Rental.count}*********" + post check_out_path(params: rental_info) + + puts "After Checkout test #{Rental.count}*********" + cust_count = customer.videos_checked_out_count + vid_count = video.available_inventory + + # expect { + post check_in_path(params: rental_info) + # }.must_differ "Rental.count", -1 + puts "After Checkin test #{Rental.count}*********" + body = JSON.parse(response.body) + + puts "body ********** #{body}" + + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + expect(body["customer_id"]).must_equal customer.id + expect(body["video_id"]).must_equal video.id + expect(body["videos_checked_out_count"]).must_equal cust_count - 1 + expect(body["available_inventory"]).must_equal vid_count + 1 + + end - end -end + it "deletes current rental and updates cust checked out and video inventory" do + #check in will delete rental + #updated customers checked out movie count to -1 + #update video inventory +1 + #send back: + # "customer_id": 122581016, + # "video_id": 277419103, + # "videos_checked_out_count": 1, + # "available_inventory": 6 + # respond with success + end + #errors + # The API should return back detailed errors and a status 404: Not Found if the customer does not exist + # The API should return back detailed errors and a status 404: Not Found if the video does not exist + + # what happens if someone tries to check in a video multiple times - that should not increase the available_inventory + end + +end \ No newline at end of file From f716004611960fd36d5d7902b822d1e5ea6fd134 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Thu, 28 May 2020 19:01:05 -0700 Subject: [PATCH 27/29] rentals controller test updated, rental.count functional, videos checked out and inventory still not passing --- .DS_Store | Bin 8196 -> 8196 bytes app/controllers/rentals_controller.rb | 12 +++++++----- test/controllers/rentals_controller_test.rb | 12 ++++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.DS_Store b/.DS_Store index fb483f33ce627206dd5563dc22c5a276f71f7c7a..ddaf1414c5f12143849f591f11fbeeaab786d30a 100644 GIT binary patch delta 129 zcmZp1XmQvOENpl>sURn_xWvHVIwKP^3o9Et2L~4i7cWf{z-PqAo_hJeJ944@(oWru_Y1`wEh zURcSHLsH!>D6X`rZ`SN3OP4J_auh7Zz{m)p83ds;j5;=1US!VZ4>BUm6B~FovrGJC F2LL*#F*pDK diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ca73b6710..180365a05 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -43,7 +43,6 @@ def check_out end def check_in - #if rental does exist rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) @@ -72,10 +71,13 @@ def check_in video_id: video.id, videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory }, status: :ok - - puts "rental ************* #{rental}" - return - end + + rental.save + + # rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) + puts "rental ************* #{rental}" + return + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 524ad739f..6c1926a5f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -119,17 +119,20 @@ customer_id: customer.id, video_id: video.id } + puts "Before test #{Rental.count}*********" post check_out_path(params: rental_info) - puts "After Checkout test #{Rental.count}*********" + cust_count = customer.videos_checked_out_count vid_count = video.available_inventory - # expect { + expect { post check_in_path(params: rental_info) - # }.must_differ "Rental.count", -1 + }.must_differ "Rental.count", -1 + puts "After Checkin test #{Rental.count}*********" + body = JSON.parse(response.body) puts "body ********** #{body}" @@ -139,8 +142,9 @@ expect(body["customer_id"]).must_equal customer.id expect(body["video_id"]).must_equal video.id expect(body["videos_checked_out_count"]).must_equal cust_count - 1 + #expected -1 actual 0 expect(body["available_inventory"]).must_equal vid_count + 1 - + # expected 3 actual 2 end it "deletes current rental and updates cust checked out and video inventory" do From 320726dd958f3f14f5fdc4658c87b683f9ee2abb Mon Sep 17 00:00:00 2001 From: Stephanie Date: Thu, 28 May 2020 19:19:38 -0700 Subject: [PATCH 28/29] customer checked out count and available inventory test pass --- app/controllers/rentals_controller.rb | 96 ++++++++++----------- test/controllers/rentals_controller_test.rb | 38 ++++---- 2 files changed, 62 insertions(+), 72 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 180365a05..8432f8eea 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,7 @@ def check_out end video = Video.find_by(id: params[:video_id]) - #TODO: Check to see if there is available inventory + if video.nil? render json: { errors: ['Not Found'] }, status: :not_found return @@ -34,58 +34,56 @@ def check_out video_id: video.id, videos_checked_out_count: customer.videos_checked_out_count, available_inventory: video.available_inventory }, status: :ok - return - - else - render json: { errors: rental.errors.full_messages }, status: :bad_request - return - end - end + return - def check_in - - rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) - customer = Customer.find_by(id: params[:customer_id]) - video = Video.find_by(id: params[:video_id]) - - if rental.nil? - render json: { errors: rental.errors.full_messages }, status: :bad_request - return - end - - if customer.nil? || video.nil? - render json: { errors: ['Not Found']}, status: :not_found - return - end + else + render json: { errors: rental.errors.full_messages }, status: :bad_request + return + end + end + + def check_in + + rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + video = Video.find_by(id: params[:video_id]) + + if rental.nil? + render json: { errors: rental.errors.full_messages }, status: :bad_request + return + end + + if customer.nil? || video.nil? + render json: { errors: ['Not Found']}, status: :not_found + return + end + + + if rental.destroy! + customer[:videos_checked_out_count] -= 1 + customer.save + video[:available_inventory] += 1 + video.save - if rental.destroy! - customer[:videos_checked_out_count] -= 1 - customer.save - - video[:available_inventory] += 1 - video.save - - render json: { - customer_id: customer.id, - video_id: video.id, - videos_checked_out_count: customer.videos_checked_out_count, - available_inventory: video.available_inventory }, status: :ok + render json: { + customer_id: customer.id, + video_id: video.id, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory }, status: :ok - rental.save - - # rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id]) - puts "rental ************* #{rental}" - return - end + rental.save - end - - private - - def rental_params - return params.permit(:customer_id, :video_id) - end + return + end - end + end + + private + + def rental_params + return params.permit(:customer_id, :video_id) + end + +end \ No newline at end of file diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6c1926a5f..0f2ce4535 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -120,49 +120,41 @@ video_id: video.id } - puts "Before test #{Rental.count}*********" post check_out_path(params: rental_info) - puts "After Checkout test #{Rental.count}*********" - + + customer.reload + video.reload + cust_count = customer.videos_checked_out_count vid_count = video.available_inventory - + expect { post check_in_path(params: rental_info) }.must_differ "Rental.count", -1 - puts "After Checkin test #{Rental.count}*********" body = JSON.parse(response.body) - puts "body ********** #{body}" - must_respond_with :success expect(response.header['Content-Type']).must_include 'json' expect(body["customer_id"]).must_equal customer.id expect(body["video_id"]).must_equal video.id expect(body["videos_checked_out_count"]).must_equal cust_count - 1 - #expected -1 actual 0 expect(body["available_inventory"]).must_equal vid_count + 1 - # expected 3 actual 2 end - it "deletes current rental and updates cust checked out and video inventory" do - #check in will delete rental - #updated customers checked out movie count to -1 - #update video inventory +1 - #send back: - # "customer_id": 122581016, - # "video_id": 277419103, - # "videos_checked_out_count": 1, - # "available_inventory": 6 - # respond with success + it "returns detailed error and status 404 if cust does not exist" do + # The API should return back detailed errors and a status 404: Not Found if the customer does not exist + end + + it "returns detailed error and status 404 if cust does not exist" do + # The API should return back detailed errors and a status 404: Not Found if the video does not exist + end + + it "returns an error if a video is tried to check in multiple times" do + end - #errors - # The API should return back detailed errors and a status 404: Not Found if the customer does not exist - # The API should return back detailed errors and a status 404: Not Found if the video does not exist - # what happens if someone tries to check in a video multiple times - that should not increase the available_inventory end end \ No newline at end of file From fb88cb2783a4a136d158ca1a5fb07072eaf47616 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Fri, 29 May 2020 13:46:47 -0700 Subject: [PATCH 29/29] final rental tests written and smoke tests pass. --- .DS_Store | Bin 8196 -> 8196 bytes app/controllers/rentals_controller.rb | 94 +++++++++--------- test/controllers/customers_controller_test.rb | 1 - test/controllers/rentals_controller_test.rb | 74 ++++++++++++-- 4 files changed, 110 insertions(+), 59 deletions(-) diff --git a/.DS_Store b/.DS_Store index ddaf1414c5f12143849f591f11fbeeaab786d30a..551a3fdcda340c030c93acf5a486db1051ea40b7 100644 GIT binary patch delta 55 zcmV-70LcG@K!iZBQxgHolT;Ic3>kZSEip1OGb|u6G?U>I9RZq?{}Uepo0A_DoU_9m NK?9M146_Fq{RjOZ5^n$i delta 48 zcmZp1XmQvOEX;U%a)@vPuT*uluAz~Ik&c3qiRt7A!m^CBC;t