From 0a495793b44baed5669acce2cfeaee5a5d58355d Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 11:46:51 -0700 Subject: [PATCH 01/36] initial rails setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ 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 | 2 + 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 | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ 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 | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ 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 | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 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 | 25 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 936 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 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/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 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# 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 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..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', 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.0.5', '< 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 :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87697ba34 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 2.0.1 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..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +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..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') 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..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # 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') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + 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..fb2ec2ebb --- /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/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + 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/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..641b5d08c --- /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_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 + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # 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..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..01d36f620 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Die/vzOGJyMUq3MN04OlbHXdISivlODrKv9kVyNSAeG78WdivfF0FQObJNhnCMBlsyMYJ4c0cpEbuOoZxhvKUURQ9XFnwDY3HZatNdIR1RWzIdaWLOQJSTviL8w5P0N8p5a753C1CtVVlyZVcBkJtMK6qlBmCHGuxGxBqUPqRAvdCFt2cQR/z+QbfV8Le5Ta9mGowxzc+QPNsqv/bHFKKj+6+h+wUQwdNamqXQ4VDueRCLLqDVgN1zcgE+vZDRQVqm3P558YTbUUS0P8veu22FFDy41S6jrNZwtreWC+rr3Ve/BG5Qo0cW7rFzupCx8agSFa8dSf/CPllnbzpu22SGywJcUKBoXGxPC5flI8s4soiENGf7yc6DAj13lSCgC6DsZBXIfBK+2MvMsBRLX96+XKaEE7NclZVyYs--23F1ntWDYnWajOFA--zzFvHfjXMQd4vPax/L+mBw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X 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 + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_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: VideoStoreAPI + + # 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: VideoStoreAPI_test + +# As with config/secrets.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 http://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: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_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..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +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.action_controller.perform_caching = true + + 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..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +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 + config.action_controller.perform_caching = true + + # 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 = "VideoStoreAPI_#{Rails.env}" + + 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 +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # 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! + config.cache_classes = 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 + + # 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..decc5a857 --- /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 http://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..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# 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. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, 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 number of `workers` to boot in clustered mode. +# Workers are forked webserver 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..787824f88 --- /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 http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://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/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..fb7dd505e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +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 +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # 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/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 8bf4ae52271a514861c2a6b3b5ef18dfae500d9d Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 12:02:35 -0700 Subject: [PATCH 02/36] customers controller --- app/controllers/customers_controller.rb | 5 +++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ 3 files changed, 14 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..6690f4627 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,5 @@ +class CustomersController < ApplicationController + def zomg + render json: {text: "It works"} + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..7c1473a24 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 http://guides.rubyonrails.org/routing.html + + get "/customers/zomg", to: "customers#zomg" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 814ed0bcf5721ce018a6ce5d15fa66eaa2715ab3 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 13:00:55 -0700 Subject: [PATCH 03/36] added models and validations --- app/models/customer.rb | 3 ++ app/models/movie.rb | 6 +++ app/models/rental.rb | 9 ++++ db/migrate/20190514194932_create_movies.rb | 12 +++++ db/migrate/20190514195105_create_customers.rb | 15 ++++++ db/migrate/20190514195148_create_rentals.rb | 12 +++++ db/schema.rb | 48 +++++++++++++++++++ test/fixtures/customers.yml | 19 ++++++++ test/fixtures/movies.yml | 13 +++++ test/fixtures/rentals.yml | 13 +++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 13 files changed, 177 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514194932_create_movies.rb create mode 100644 db/migrate/20190514195105_create_customers.rb create mode 100644 db/migrate/20190514195148_create_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..d2533dbf9 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_many :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..60f64666d --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,6 @@ +class Movie < ApplicationRecord + validates :inventory, presence: true + validates :inventory, numericality: true + + has_many :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..58860b2af --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,9 @@ +class Rental < ApplicationRecord + validates :customer_id, presence: true + validates :movie_id, presence: true + validates :checkout_date, presence: true + validates :due_date, presence: true + + belongs_to :customers + belongs_to :movies +end diff --git a/db/migrate/20190514194932_create_movies.rb b/db/migrate/20190514194932_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514194932_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514195105_create_customers.rb b/db/migrate/20190514195105_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514195105_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20190514195148_create_rentals.rb b/db/migrate/20190514195148_create_rentals.rb new file mode 100644 index 000000000..7a8a77515 --- /dev/null +++ b/db/migrate/20190514195148_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.integer :customer_id + t.integer :movie_id + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..99dc8f796 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,48 @@ +# 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. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_195148) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.integer "customer_id" + t.integer "movie_id" + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..95d04ae12 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 12:51:05 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 12:51:05 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d29b955ad --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..272ecf53d --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + customer_id: 1 + movie_id: 1 + checkout_date: 2019-05-14 + due_date: 2019-05-14 + +two: + customer_id: 1 + movie_id: 1 + checkout_date: 2019-05-14 + due_date: 2019-05-14 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 99ec6297a4152996b8db2071df8df9032eceb9e7 Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 13:18:32 -0700 Subject: [PATCH 04/36] test fixtures --- test/fixtures/customers.yml | 24 ++++++++++++------------ test/fixtures/movies.yml | 16 ++++++++-------- test/models/movie_test.rb | 12 ++++++++---- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 95d04ae12..369d90e54 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: Tim Riggin registered_at: 2019-05-14 12:51:05 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 1758 Juniper Road + city: Dillon + state: Texas + postal_code: 10128 + phone: (484)-453-3434 two: - name: MyString + name: Matt Saracen registered_at: 2019-05-14 12:51:05 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 456 Football Lane + city: Dillon + state: Texas + postal_code: 10128 + phone: (456)-454-3435 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d29b955ad..ea6d28132 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString - release_date: - inventory: 1 + title: Good Will Hunting + overview: Matt Damon and Robin Williams in Boston. + release_date: 1997 + inventory: 3 two: - title: MyString - overview: MyString - release_date: - inventory: 1 + title: 21 Jump Street + overview: Jonah Hill and Channing Tatum go undercover as high school students. + release_date: 2012 + inventory: 2 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..eea6f7921 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,13 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - - it "must be valid" do - value(movie).must_be :valid? + describe "relations" do + it "has rentals" do + movie = movies(:one) + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end end end From 30381b465ed9494b88521dcc5b3bff370956aef2 Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 13:27:33 -0700 Subject: [PATCH 05/36] changed data type i yml file --- test/fixtures/movies.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ea6d28132..0769a3806 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -3,11 +3,11 @@ one: title: Good Will Hunting overview: Matt Damon and Robin Williams in Boston. - release_date: 1997 + release_date: 1997-08-10 inventory: 3 two: title: 21 Jump Street overview: Jonah Hill and Channing Tatum go undercover as high school students. - release_date: 2012 + release_date: 2012-11-09 inventory: 2 From a2f1fc186bdd95b405b296e740851b2c5d5eb250 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 13:28:48 -0700 Subject: [PATCH 06/36] fixed due date for rentals fixtures --- test/fixtures/rentals.yml | 4 ++-- test/models/rental_test.rb | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 272ecf53d..1900d02f3 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,10 +4,10 @@ one: customer_id: 1 movie_id: 1 checkout_date: 2019-05-14 - due_date: 2019-05-14 + due_date: 2019-05-21 two: customer_id: 1 movie_id: 1 checkout_date: 2019-05-14 - due_date: 2019-05-14 + due_date: 2019-05-21 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..3ae7e387f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,25 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + describe "relations" do + it "has a customer" do + end - it "must be valid" do - value(rental).must_be :valid? + it "has a movie" do + end + end + + describe "validations" do + it "requires a customer_id" do + end + + it "requires a movie_id" do + end + + it "requires a checkout date" do + end + + it "requires a due date" do + end end end From f7cc8e256535cfc8c36248b083a4843e823f6f2d Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 14:14:01 -0700 Subject: [PATCH 07/36] changing name of yml file fixtures --- app/models/rental.rb | 4 ++-- test/fixtures/customers.yml | 6 +++--- test/fixtures/movies.yml | 4 ++-- test/models/customer_test.rb | 12 ++++++++---- test/models/movie_test.rb | 21 ++++++++++++++++++++- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 58860b2af..526dd88b4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,6 +4,6 @@ class Rental < ApplicationRecord validates :checkout_date, presence: true validates :due_date, presence: true - belongs_to :customers - belongs_to :movies + belongs_to :customer + belongs_to :movie end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 369d90e54..6be4cb8c8 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: Tim Riggin +customer_one: + name: Tim Riggins registered_at: 2019-05-14 12:51:05 address: 1758 Juniper Road city: Dillon @@ -9,7 +9,7 @@ one: postal_code: 10128 phone: (484)-453-3434 -two: +customer_two: name: Matt Saracen registered_at: 2019-05-14 12:51:05 address: 456 Football Lane diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 0769a3806..e0c196ddb 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,12 +1,12 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +movie_one: title: Good Will Hunting overview: Matt Damon and Robin Williams in Boston. release_date: 1997-08-10 inventory: 3 -two: +movie_two: title: 21 Jump Street overview: Jonah Hill and Channing Tatum go undercover as high school students. release_date: 2012-11-09 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..540c39be0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,13 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - - it "must be valid" do - value(customer).must_be :valid? + describe "relations" do + it "has rentals" do + customer = customers(:customer_one) + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index eea6f7921..fda5efa26 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,11 +3,30 @@ describe Movie do describe "relations" do it "has rentals" do - movie = movies(:one) + movie = movies(:movie_one) movie.must_respond_to :rentals movie.rentals.each do |rental| rental.must_be_kind_of Rental end end end + + describe "validations" do + it "requires inventory" do + movie = Movie.new(title: "The Departed") + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "requires inventory to be an integer" do + movie = Movie.new(inventory: "five") + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "accepts valid a new movie including an inventory" do + movie = Movie.new(inventory: 5) + movie.valid?.must_equal true + end + end end From 92585c82e9dae679b2f3626db384f2b3e53c114d Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 14:14:03 -0700 Subject: [PATCH 08/36] updated fixtures and created rental model tests --- app/models/rental.rb | 4 ++-- test/fixtures/customers.yml | 4 ++-- test/fixtures/movies.yml | 4 ++-- test/fixtures/rentals.yml | 12 ++++++------ test/models/rental_test.rb | 19 +++++++++++++++++++ 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 58860b2af..526dd88b4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,6 +4,6 @@ class Rental < ApplicationRecord validates :checkout_date, presence: true validates :due_date, presence: true - belongs_to :customers - belongs_to :movies + belongs_to :customer + belongs_to :movie end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 369d90e54..e78393adf 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +customer_one: name: Tim Riggin registered_at: 2019-05-14 12:51:05 address: 1758 Juniper Road @@ -9,7 +9,7 @@ one: postal_code: 10128 phone: (484)-453-3434 -two: +customer_two: name: Matt Saracen registered_at: 2019-05-14 12:51:05 address: 456 Football Lane diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 0769a3806..e0c196ddb 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,12 +1,12 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +movie_one: title: Good Will Hunting overview: Matt Damon and Robin Williams in Boston. release_date: 1997-08-10 inventory: 3 -two: +movie_two: title: 21 Jump Street overview: Jonah Hill and Channing Tatum go undercover as high school students. release_date: 2012-11-09 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 1900d02f3..27fd9f6f0 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - customer_id: 1 - movie_id: 1 +rental_one: + customer: customer_one + movie: movie_one checkout_date: 2019-05-14 due_date: 2019-05-21 -two: - customer_id: 1 - movie_id: 1 +rental_two: + customer: customer_one + movie: movie_two checkout_date: 2019-05-14 due_date: 2019-05-21 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3ae7e387f..39516ad97 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,25 +1,44 @@ require "test_helper" +require "pry" describe Rental do describe "relations" do it "has a customer" do + rental = rentals(:rental_one) + rental.must_respond_to :customer + rental.customer.must_be_kind_of Customer end it "has a movie" do + rental = rentals(:rental_one) + rental.must_respond_to :movie + rental.movie.must_be_kind_of Movie end end describe "validations" do it "requires a customer_id" do + rental = Rental.new(movie_id: movies(:movie_one).id, checkout_date: 2019 - 05 - 14, due_date: 2019 - 05 - 21) + rental.valid?.must_equal false + rental.errors.messages.must_include :customer_id end it "requires a movie_id" do + rental = Rental.new(customer_id: customers(:customer_one).id, checkout_date: 2019 - 05 - 14, due_date: 2019 - 05 - 21) + rental.valid?.must_equal false + rental.errors.messages.must_include :movie_id end it "requires a checkout date" do + rental = Rental.new(movie_id: movies(:movie_one).id, customer_id: customers(:customer_one).id, due_date: 2019 - 05 - 21) + rental.valid?.must_equal false + rental.errors.messages.must_include :checkout_date end it "requires a due date" do + rental = Rental.new(movie_id: movies(:movie_one).id, customer_id: customers(:customer_one).id, checkout_date: 2019 - 05 - 14) + rental.valid?.must_equal false + rental.errors.messages.must_include :due_date end end end From f801f40f66d5153fb785eea1041a6017c82fe1df Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 14:42:31 -0700 Subject: [PATCH 09/36] added routes for customers and movies --- config/routes.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 7c1473a24..a12d9d0cc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - - get "/customers/zomg", to: "customers#zomg" + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + + # get "/customers/zomg", to: "customers#zomg" end From a4a8dbac3ec6225341ec647ec4cbd6855ccc2f5d Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 14:43:39 -0700 Subject: [PATCH 10/36] created movies and rentals controllers, started movies controller test --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/movies_controller.rb | 12 +++++++ app/controllers/rentals_controller.rb | 2 ++ test/controllers/movies_controller_test.rb | 38 ++++++++++++++++++++ test/controllers/rentals_controller_test.rb | 7 ++++ 5 files changed, 59 insertions(+) create mode 100644 .DS_Store create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ddcf24dd852fae87128d89a1b315d985c7f9e596 GIT binary patch literal 6148 zcmeHK!AiqG5Z!H~CWx4WV2`!G#9dJ#gc2X8_|4=Qa!f(^u^G^s^nB)_45GRAm!;x`#H8DlyqV#R>w3&C;JC8;P6BF8zrX*%+v z#Do6ZQZzaKA_MsCG?uY|r7ZjW{k%~Wrdgx$&MQ@IZGA&G4Bgl=Zk%B zg}pO38+yt>SB=%D=k0S@fLVdHA z=j~RbZngFgi@KF}I$*b32Ss7%yL-)})4|=tWByb;zerX&{D4BX70%!ljQIxdopBr` z@h$jf@v}HWVt^PR23Cjxbp-00E3{|YDltF|{EPuSA1qKrTVW|t939Z$^%2K4L=>>` zErDn$v=x>TVFZNBR6v=^)f0oubnsg$&Q@4Tl;J>CBhlEB~nWa z5Ce-0RAtx1`hW8M`+qTsdc*)R@UIx)TF>cqVN0sEE^Q8Ltpz#&MZvgI;yeWmQHmiJ eOK}ZU2>2~D0Bwb(MDT#nML^I%4KeVm41564{7}*W literal 0 HcmV?d00001 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..d38f8a022 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,12 @@ +class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..69b99f1f7 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,38 @@ +require "test_helper" + +describe MoviesController do + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns pets with exactly the required fields" do + keys = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From c3455a1f788a0e1fe6bf5325a88af770d26549cb Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 15:04:42 -0700 Subject: [PATCH 11/36] customers controller and tests --- Gemfile | 1 + Gemfile.lock | 2 + app/controllers/customers_controller.rb | 11 ++++- test/controllers/customers_controller_test.rb | 40 +++++++++++++++++-- 4 files changed, 49 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 687a6f632..a5b09eb98 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,7 @@ group :development do # 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' + gem 'rb-readline' end diff --git a/Gemfile.lock b/Gemfile.lock index 87697ba34..b0a65800a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,6 +123,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) + rb-readline (0.5.5) ruby-progressbar (1.10.0) ruby_dep (1.5.0) spring (2.0.2) @@ -158,6 +159,7 @@ DEPENDENCIES pry-rails puma (~> 3.11) rails (~> 5.2.3) + rb-readline spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6690f4627..e4f10fdb7 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,12 @@ class CustomersController < ApplicationController - def zomg - render json: {text: "It works"} + def index + customers = Customer.all + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + end + + + private + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..fe3e0c9e4 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,41 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id name phone postal_code registered_at) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end + + From 737a3efb33f9b42d7fba187995707b69aa786d4e Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 15:04:45 -0700 Subject: [PATCH 12/36] finished controller tests and actions for movies --- app/controllers/movies_controller.rb | 20 ++++++++++ test/controllers/movies_controller_test.rb | 43 +++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d38f8a022..13e68b53e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,6 +4,26 @@ def index render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end + def show + movie = Movie.find_by(id: params[:id]) + + if movie #if movie is not nil + render json: movie.as_json(only: [:id, :inventory, :overview, :title, :release_date]), status: :ok + else + render json: {ok: false, errors: "Movie not found"}, status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save #is successful + render json: movie.as_json(only: [:id, :overview, :title, :release_date]), status: :ok #include id so they can find pet later if they want to + else + render json: {ok: false, errors: movie.errors.messages}, status: :bad_request + end + end + private def movie_params diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 69b99f1f7..407a7d7f1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -26,7 +26,7 @@ body.length.must_equal Movie.count end - it "returns pets with exactly the required fields" do + it "returns movies with exactly the required fields" do keys = %w(id release_date title) get movies_path body = JSON.parse(response.body) @@ -35,4 +35,45 @@ end end end + + describe "show" do + it "can get a movie" do + get movie_path(movies(:movie_one).id) + must_respond_with :success + end + + it "responds with not found and errors hash if movie is not found" do + get movie_path(-1) + must_respond_with :not_found + body = JSON.parse(response.body) + body["ok"].must_equal false + body["errors"].must_equal "Movie not found" + end + end + + describe "create" do + let(:movie_data) { + { + title: "Titanic", + overview: "Romantic & sad", + release_date: 1997 - 12 - 19, + inventory: 10, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: {movie: movie_data} + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + end end From b4343155148fc0f1ac2214afcb32f39a9a65a7f7 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 15:09:56 -0700 Subject: [PATCH 13/36] added columns to movies and customers regarding aviailability --- ...0190514220618_add_movies_checked_out_count_to_customer.rb | 5 +++++ .../20190514220814_add_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190514220618_add_movies_checked_out_count_to_customer.rb create mode 100644 db/migrate/20190514220814_add_available_inventory_to_movies.rb diff --git a/db/migrate/20190514220618_add_movies_checked_out_count_to_customer.rb b/db/migrate/20190514220618_add_movies_checked_out_count_to_customer.rb new file mode 100644 index 000000000..61d0b94bd --- /dev/null +++ b/db/migrate/20190514220618_add_movies_checked_out_count_to_customer.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/migrate/20190514220814_add_available_inventory_to_movies.rb b/db/migrate/20190514220814_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..04f5b5a84 --- /dev/null +++ b/db/migrate/20190514220814_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :customers, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 99dc8f796..946ba7d17 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: 2019_05_14_195148) do +ActiveRecord::Schema.define(version: 2019_05_14_220814) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,8 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" + t.integer "available_inventory" end create_table "movies", force: :cascade do |t| From 70ddb2568b1daee45509534dd8b5a900933916e2 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 15:14:36 -0700 Subject: [PATCH 14/36] fixed migration error --- ...190514221138_delete_available_inventory_from_customers.rb | 5 +++++ ...90514221319_add_available_inventory_column_to_movies_2.rb | 5 +++++ db/schema.rb | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20190514221138_delete_available_inventory_from_customers.rb create mode 100644 db/migrate/20190514221319_add_available_inventory_column_to_movies_2.rb diff --git a/db/migrate/20190514221138_delete_available_inventory_from_customers.rb b/db/migrate/20190514221138_delete_available_inventory_from_customers.rb new file mode 100644 index 000000000..fd3421e72 --- /dev/null +++ b/db/migrate/20190514221138_delete_available_inventory_from_customers.rb @@ -0,0 +1,5 @@ +class DeleteAvailableInventoryFromCustomers < ActiveRecord::Migration[5.2] + def change + remove_column :customers, :available_inventory + end +end diff --git a/db/migrate/20190514221319_add_available_inventory_column_to_movies_2.rb b/db/migrate/20190514221319_add_available_inventory_column_to_movies_2.rb new file mode 100644 index 000000000..b20dbf7b5 --- /dev/null +++ b/db/migrate/20190514221319_add_available_inventory_column_to_movies_2.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryColumnToMovies2 < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 946ba7d17..fa4ce5423 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: 2019_05_14_220814) do +ActiveRecord::Schema.define(version: 2019_05_14_221319) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -26,7 +26,6 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "movies_checked_out_count" - t.integer "available_inventory" end create_table "movies", force: :cascade do |t| @@ -36,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From f932c4e510e88ca40f9469efc01fb6081b2296f4 Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 15:18:15 -0700 Subject: [PATCH 15/36] added new columns to movie and customer controllers and tests --- app/controllers/customers_controller.rb | 4 ++-- app/controllers/movies_controller.rb | 4 ++-- test/controllers/customers_controller_test.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e4f10fdb7..2224c0f84 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,12 +1,12 @@ class CustomersController < ApplicationController def index customers = Customer.all - render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 13e68b53e..99cd1a585 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie #if movie is not nil - render json: movie.as_json(only: [:id, :inventory, :overview, :title, :release_date]), status: :ok + render json: movie.as_json(only: [:id, :inventory, :overview, :title, :release_date, :available_inventory]), status: :ok else render json: {ok: false, errors: "Movie not found"}, status: :not_found end @@ -27,6 +27,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index fe3e0c9e4..fd76dd918 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -28,7 +28,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name phone postal_code registered_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at ) get customers_path body = JSON.parse(response.body) body.each do |customer| From 0560f794330171921fe40dc095a3375c86c50d20 Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 16:41:21 -0700 Subject: [PATCH 16/36] checkout controller action and tests --- app/controllers/movies_controller.rb | 4 +- app/controllers/rentals_controller.rb | 14 +++++++ config/routes.rb | 2 + test/controllers/movies_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 43 +++++++++++++++++++-- 5 files changed, 59 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 99cd1a585..95f68e4e5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def create movie = Movie.new(movie_params) if movie.save #is successful - render json: movie.as_json(only: [:id, :overview, :title, :release_date]), status: :ok #include id so they can find pet later if they want to + render json: movie.as_json(only: [:id, :overview, :title, :release_date, :inventory]), status: :ok #include id so they can find pet later if they want to else render json: {ok: false, errors: movie.errors.messages}, status: :bad_request end @@ -27,6 +27,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..71acc22ad 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,16 @@ class RentalsController < ApplicationController + def checkout + rental = Rental.new(customer_id: params[:customer_id], movie_id: params[:movie_id]) + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 + if rental.save + render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :due_date, :id]), status: :ok + else + render json: {ok: false, errors: rental.errors.messages}, status: :bad_request + end + end + + def checkin + # rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:mov]]) + end end diff --git a/config/routes.rb b/config/routes.rb index a12d9d0cc..fb8862ac8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,7 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + post "/rentals/checkout", to: "rentals#checkout", as: "checkout" + post "/rentals/checkin", to: "rentals#checkin", as: "checkin" # get "/customers/zomg", to: "customers#zomg" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 407a7d7f1..a9c6c90de 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -63,7 +63,7 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..d79bbf8b3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,44 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + describe "checkout" do + let(:rental_data) { + { + customer_id: customers(:customer_one).id, + movie_id: movies(:movie_one).id, + } + } + + it "creates a new rental given valid data" do + expect { + post checkout_path, params: rental_data + }.must_change "Rental.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.customer_id).must_equal rental_data[:customer_id] + must_respond_with :success + end + + it "returns an error for invalid rental data" do + # arrange + rental_data["customer_id"] = nil + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer_id" + must_respond_with :bad_request + end + end end From 307702de06a7abc08f480a71eae5e5a5ea052eb2 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 16:44:44 -0700 Subject: [PATCH 17/36] updated movies controller and test --- app/controllers/movies_controller.rb | 5 +++-- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 99cd1a585..fdc3d8f70 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,3 +1,4 @@ + class MoviesController < ApplicationController def index movies = Movie.all @@ -18,7 +19,7 @@ def create movie = Movie.new(movie_params) if movie.save #is successful - render json: movie.as_json(only: [:id, :overview, :title, :release_date]), status: :ok #include id so they can find pet later if they want to + render json: movie.as_json(only: [:overview, :title, :release_date, :inventory, :id]), status: :ok #include id so they can find pet later if they want to else render json: {ok: false, errors: movie.errors.messages}, status: :bad_request end @@ -27,6 +28,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 407a7d7f1..87b378eaf 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -63,7 +63,7 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) From 3ff6512d58bcd6a9b542201660a85e526eb17500 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Tue, 14 May 2019 17:00:35 -0700 Subject: [PATCH 18/36] rentals checkin action and controller tests complete --- app/controllers/rentals_controller.rb | 34 ++++++++++++--------- test/controllers/rentals_controller_test.rb | 33 ++++++++++++++++++-- 2 files changed, 50 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 71acc22ad..3ca809c8e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,16 +1,22 @@ class RentalsController < ApplicationController - def checkout - rental = Rental.new(customer_id: params[:customer_id], movie_id: params[:movie_id]) - rental.checkout_date = Date.today - rental.due_date = Date.today + 7 - if rental.save - render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :due_date, :id]), status: :ok - else - render json: {ok: false, errors: rental.errors.messages}, status: :bad_request - end - end - - def checkin - # rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:mov]]) - end + def checkout + rental = Rental.new(customer_id: params[:customer_id], movie_id: params[:movie_id]) + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 + if rental.save + render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :due_date, :id]), status: :ok + else + render json: {ok: false, errors: rental.errors.messages}, status: :bad_request + end + end + + def checkin + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) + if rental + rental.destroy + render json: {ok: true, messages: "Rental checked in successfully"}, status: :success + else + render json: {ok: false, errors: "Rental not found"}, status: :bad_request + end + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d79bbf8b3..72aa39ec4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe RentalsController do - describe "checkout" do let(:rental_data) { { @@ -30,8 +29,8 @@ rental_data["customer_id"] = nil expect { - post checkout_path, params: rental_data - }.wont_change "Rental.count" + post checkout_path, params: rental_data + }.wont_change "Rental.count" body = JSON.parse(response.body) @@ -41,4 +40,32 @@ must_respond_with :bad_request end end + + describe "checkin" do + let(:rental_data) { + { + customer_id: customers(:customer_one).id, + movie_id: movies(:movie_one).id, + } + } + it "destroys checkout when given valid data" do + expect { + post checkin_path, params: rental_data + }.must_change "Rental.count", -1 + end + + it "it returns an error if rental is not found" do + rental_data["customer_id"] = customers(:customer_two).id + expect { + post checkin_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "Rental not found" + must_respond_with :bad_request + end + end end From ee1c179d876187b20c84eae0ebd2c5f2adc6484b Mon Sep 17 00:00:00 2001 From: Riyo Date: Tue, 14 May 2019 17:08:43 -0700 Subject: [PATCH 19/36] changed status from success to ok in checkin action --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3ca809c8e..950b8b9be 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,7 +14,7 @@ def checkin rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) if rental rental.destroy - render json: {ok: true, messages: "Rental checked in successfully"}, status: :success + render json: {ok: true, messages: "Rental checked in successfully"}, status: :ok else render json: {ok: false, errors: "Rental not found"}, status: :bad_request end From 8391e50f7454677eae330018da4549d6fcb06ab8 Mon Sep 17 00:00:00 2001 From: Riyo Date: Wed, 15 May 2019 11:15:17 -0700 Subject: [PATCH 20/36] added some tests to movies show controller --- test/controllers/movies_controller_test.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 87b378eaf..0eff39cd4 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -48,6 +48,12 @@ body = JSON.parse(response.body) body["ok"].must_equal false body["errors"].must_equal "Movie not found" + expect(response.header["Content-Type"]).must_include "json" + end + + it "still returns JSON if the request is bogus" do + get movie_path("bogus") + expect(response.header["Content-Type"]).must_include "json" end end @@ -75,5 +81,20 @@ expect(movie.title).must_equal movie_data[:title] must_respond_with :success end + + it "returns an error for invalid movie data" do + movie_data["inventory"] = nil + + expect { + post movies_path, params: { movie:movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "inventory" + must_respond_with :bad_request + end end end From 658481be088e5f2836dcfc3a8722a82a38b21c95 Mon Sep 17 00:00:00 2001 From: Riyo Date: Wed, 15 May 2019 11:30:57 -0700 Subject: [PATCH 21/36] changed route to include dash --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index fb8862ac8..f92c68939 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post "/rentals/checkout", to: "rentals#checkout", as: "checkout" - post "/rentals/checkin", to: "rentals#checkin", as: "checkin" + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" # get "/customers/zomg", to: "customers#zomg" end From af6a109f02f90d335d91117de3f9effe1478c892 Mon Sep 17 00:00:00 2001 From: Riyo Date: Wed, 15 May 2019 13:24:10 -0700 Subject: [PATCH 22/36] added to checkout and checkin methods and controller tests --- app/controllers/movies_controller.rb | 5 ++++- app/controllers/rentals_controller.rb | 6 ++++++ ...0515190212_defaultcheckedoutcounttozero.rb | 5 +++++ ...5191254_defaultavailableinventorytozero.rb | 5 +++++ ..._changedefaultofavailableinventorytonil.rb | 5 +++++ db/schema.rb | 4 ++-- db/seeds.rb | 4 +++- test/controllers/rentals_controller_test.rb | 21 +++++++++++++++++++ test/fixtures/movies.yml | 3 +++ 9 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20190515190212_defaultcheckedoutcounttozero.rb create mode 100644 db/migrate/20190515191254_defaultavailableinventorytozero.rb create mode 100644 db/migrate/20190515193814_changedefaultofavailableinventorytonil.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 77e8f230d..92ba3fe31 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,6 @@ class MoviesController < ApplicationController + def index movies = Movie.all render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok @@ -19,7 +20,9 @@ def create movie = Movie.new(movie_params) if movie.save #is successful - render json: movie.as_json(only: [:id, :overview, :title, :release_date, :inventory]), status: :ok #include id so they can find pet later if they want to + movie.available_inventory = movie.inventory + movie.save + render json: movie.as_json(only: [:id, :overview, :title, :release_date, :inventory, :available_inventory]), status: :ok #include id so they can find pet later if they want to else render json: {ok: false, errors: movie.errors.messages}, status: :bad_request end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 950b8b9be..35cfbd50e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,6 +4,12 @@ def checkout rental.checkout_date = Date.today rental.due_date = Date.today + 7 if rental.save + customer = Customer.find_by(id: params[:customer_id]) + customer.movies_checked_out_count += 1 + customer.save + movie = Movie.find_by(id: params[:movie_id]) + movie.available_inventory -= 1 + movie.save render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :due_date, :id]), status: :ok else render json: {ok: false, errors: rental.errors.messages}, status: :bad_request diff --git a/db/migrate/20190515190212_defaultcheckedoutcounttozero.rb b/db/migrate/20190515190212_defaultcheckedoutcounttozero.rb new file mode 100644 index 000000000..43b2da3d5 --- /dev/null +++ b/db/migrate/20190515190212_defaultcheckedoutcounttozero.rb @@ -0,0 +1,5 @@ +class Defaultcheckedoutcounttozero < ActiveRecord::Migration[5.2] + def change + change_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/migrate/20190515191254_defaultavailableinventorytozero.rb b/db/migrate/20190515191254_defaultavailableinventorytozero.rb new file mode 100644 index 000000000..23b2e8413 --- /dev/null +++ b/db/migrate/20190515191254_defaultavailableinventorytozero.rb @@ -0,0 +1,5 @@ +class Defaultavailableinventorytozero < ActiveRecord::Migration[5.2] + def change + change_column :movies, :available_inventory, :integer, :default => 0 + end +end diff --git a/db/migrate/20190515193814_changedefaultofavailableinventorytonil.rb b/db/migrate/20190515193814_changedefaultofavailableinventorytonil.rb new file mode 100644 index 000000000..38b8d0e64 --- /dev/null +++ b/db/migrate/20190515193814_changedefaultofavailableinventorytonil.rb @@ -0,0 +1,5 @@ +class Changedefaultofavailableinventorytonil < ActiveRecord::Migration[5.2] + def change + change_column :movies, :available_inventory, :integer, :default => nil + end +end diff --git a/db/schema.rb b/db/schema.rb index fa4ce5423..516d7f263 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: 2019_05_14_221319) do +ActiveRecord::Schema.define(version: 2019_05_15_193814) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "movies_checked_out_count" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..5a3e20519 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,7 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + movie = Movie.create!(movie) + movie.available_inventory = movie.inventory + movie.save end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 72aa39ec4..8bb32ee2d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -39,6 +39,27 @@ expect(body["errors"]).must_include "customer_id" must_respond_with :bad_request end + + it "increases customers movies_checked_out_count by 1" do + # rental_data2 = { + rental = { + customer_id: customers(:customer_two).id, + movie_id: movies(:movie_one).id, + } + # } + + customer = customers(:customer_one) + # customer_checkout_count = customer.movies_checked_out_count + + post checkout_path, params: rental + + expect(customer.movies_checked_out_count).must_equal 1 + + end + + it "decreases movie available inventory count by 1" do + + end end describe "checkin" do diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e0c196ddb..a30fc6fa1 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,12 @@ movie_one: overview: Matt Damon and Robin Williams in Boston. release_date: 1997-08-10 inventory: 3 + available_inventory: 3 movie_two: title: 21 Jump Street overview: Jonah Hill and Channing Tatum go undercover as high school students. release_date: 2012-11-09 inventory: 2 + available_inventory: 2 + From 078b6e72e72681c9d8f568e89fd0ea80c164c031 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Wed, 15 May 2019 13:45:51 -0700 Subject: [PATCH 23/36] updated checkin action and wrote tests for checkin action --- app/controllers/rentals_controller.rb | 6 ++ test/controllers/rentals_controller_test.rb | 66 +++++++++++++++------ test/fixtures/customers.yml | 2 + 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 35cfbd50e..98f9ed8db 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -19,6 +19,12 @@ def checkout def checkin rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) if rental + customer = Customer.find_by(id: params[:customer_id]) + customer.movies_checked_out_count -= 1 + customer.save + movie = Movie.find_by(id: params[:movie_id]) + movie.available_inventory += 1 + movie.save rental.destroy render json: {ok: true, messages: "Rental checked in successfully"}, status: :ok else diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8bb32ee2d..894b89af1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,7 +4,7 @@ describe "checkout" do let(:rental_data) { { - customer_id: customers(:customer_one).id, + customer_id: customers(:customer_two).id, movie_id: movies(:movie_one).id, } } @@ -40,25 +40,47 @@ must_respond_with :bad_request end - it "increases customers movies_checked_out_count by 1" do - # rental_data2 = { - rental = { - customer_id: customers(:customer_two).id, - movie_id: movies(:movie_one).id, - } - # } - - customer = customers(:customer_one) - # customer_checkout_count = customer.movies_checked_out_count - - post checkout_path, params: rental - - expect(customer.movies_checked_out_count).must_equal 1 - + it "increases customers movies_checked_out_count by 1 when given valid data" do + customer = customers(:customer_two) + + post checkout_path, params: rental_data + + customer.reload + + expect(customer.movies_checked_out_count).must_equal 1 + end + + it "does not increase customers movies_checked_out_count by 1 when given invalid data" do + rental_data["customer_id"] = nil + + customer = customers(:customer_two) + + post checkout_path, params: rental_data + + customer.reload + + expect(customer.movies_checked_out_count).must_equal 0 + end + + it "decreases movie available inventory count by 1 when given valid data" do + movie = movies(:movie_one) + + post checkout_path, params: rental_data + + movie.reload + + expect(movie.available_inventory).must_equal 2 end - it "decreases movie available inventory count by 1" do + it "won't decrease movie available inventory count by 1 when given invalid data" do + rental_data["customer_id"] = nil + movie = movies(:movie_one) + + post checkout_path, params: rental_data + + movie.reload + expect(movie.available_inventory).must_equal 3 end end @@ -88,5 +110,15 @@ expect(body["errors"]).must_include "Rental not found" must_respond_with :bad_request end + + it "decreases customers movies_checked_out_count by 1 when given valid data" do + customer = customers(:customer_one) + + post checkin_path, params: rental_data + + customer.reload + + expect(customer.movies_checked_out_count).must_equal 1 + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 6be4cb8c8..cb56e008c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ customer_one: state: Texas postal_code: 10128 phone: (484)-453-3434 + movies_checked_out_count: 2 customer_two: name: Matt Saracen @@ -17,3 +18,4 @@ customer_two: state: Texas postal_code: 10128 phone: (456)-454-3435 + movies_checked_out_count: 0 From 4146657b3cad85e250def7166477ec51860c2a34 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Wed, 15 May 2019 13:54:57 -0700 Subject: [PATCH 24/36] added functionality so user cannot checkout movie that has a available stock of 0 --- app/controllers/rentals_controller.rb | 5 ++++- test/controllers/rentals_controller_test.rb | 8 ++++++++ test/fixtures/movies.yml | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 98f9ed8db..efcefe2ae 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,12 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(customer_id: params[:customer_id], movie_id: params[:movie_id]) + movie = Movie.find_by(id: params[:movie_id]) rental.checkout_date = Date.today rental.due_date = Date.today + 7 - if rental.save + if movie.available_inventory == 0 + render json: {ok: false, errors: "Movie is out of stock"}, status: :bad_request + elsif rental.save customer = Customer.find_by(id: params[:customer_id]) customer.movies_checked_out_count += 1 customer.save diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 894b89af1..56f09e3f1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -82,6 +82,14 @@ expect(movie.available_inventory).must_equal 3 end + + it "won't allow a checkout if movie stock is 0 " do + rental_data["movie_id"] = movies(:movie_three).id + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + end end describe "checkin" do diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index a30fc6fa1..9ca5623f3 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -14,3 +14,9 @@ movie_two: inventory: 2 available_inventory: 2 +movie_three: + title: Revolutionary Road + overview: Good and sad + release_date: 2005-10-01 + inventory: 2 + available_inventory: 0 \ No newline at end of file From 015740273319a1c5675ac62c6d13519f9ba5f8fb Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Wed, 15 May 2019 13:58:58 -0700 Subject: [PATCH 25/36] added validation for title to movie model and corresponding tests --- app/models/movie.rb | 1 + test/models/movie_test.rb | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 60f64666d..8601be63c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,7 @@ class Movie < ApplicationRecord validates :inventory, presence: true validates :inventory, numericality: true + validates :title, presence: true has_many :rentals end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index fda5efa26..4fdec77a5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -6,7 +6,7 @@ movie = movies(:movie_one) movie.must_respond_to :rentals movie.rentals.each do |rental| - rental.must_be_kind_of Rental + rental.must_be_kind_of Rental end end end @@ -24,8 +24,14 @@ movie.errors.messages.must_include :inventory end - it "accepts valid a new movie including an inventory" do + it "requires title" do movie = Movie.new(inventory: 5) + movie.valid?.must_equal false + movie.errors.messages.must_include :title + end + + it "is valid if movie includes an inventory and title" do + movie = Movie.new(title: "The Departed", inventory: 5) movie.valid?.must_equal true end end From ebb8ab0f0163a56ac8f3eef96256355af2503c38 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Wed, 15 May 2019 14:04:48 -0700 Subject: [PATCH 26/36] added simplecov and delted unused customer strong params --- .gitignore | 4 +++- Gemfile | 2 ++ Gemfile.lock | 8 ++++++++ app/controllers/customers_controller.rb | 16 ++++++++-------- test/test_helper.rb | 3 ++- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ea4b32f59..47caf3f3f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ # 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' - +/coverage/ # Ignore bundler config. /.bundle @@ -21,3 +21,5 @@ # Ignore master key for decrypting credentials and more. /config/master.key + + diff --git a/Gemfile b/Gemfile index a5b09eb98..29ae6e4ea 100644 --- a/Gemfile +++ b/Gemfile @@ -53,3 +53,5 @@ group :test do gem 'minitest-rails' gem 'minitest-reporters' end + +gem 'simplecov', require: false, group: :test diff --git a/Gemfile.lock b/Gemfile.lock index b0a65800a..c28072581 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,12 +51,14 @@ GEM coderay (1.1.2) concurrent-ruby (1.1.5) crass (1.0.4) + docile (1.3.1) erubi (1.8.0) ffi (1.10.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.6.0) concurrent-ruby (~> 1.0) + json (2.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -126,6 +128,11 @@ GEM rb-readline (0.5.5) ruby-progressbar (1.10.0) ruby_dep (1.5.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -160,6 +167,7 @@ DEPENDENCIES puma (~> 3.11) rails (~> 5.2.3) rb-readline + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 2224c0f84..6a9b43539 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,12 +1,12 @@ class CustomersController < ApplicationController - def index - customers = Customer.all - render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) - end + def index + customers = Customer.all + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) + end + private - private - def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) - end + # def customer_params + # params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) + # end end diff --git a/test/test_helper.rb b/test/test_helper.rb index fb7dd505e..6faf3ca4e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,5 @@ +require "simplecov" +SimpleCov.start "rails" ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" @@ -10,7 +12,6 @@ Minitest.backtrace_filter ) - # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: # require "minitest/rails/capybara" From 20e598ecd7aa9ec7f4f34f8a4823fb65b55dd487 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Wed, 15 May 2019 14:27:04 -0700 Subject: [PATCH 27/36] added query params for sorting by name or id --- app/controllers/customers_controller.rb | 10 +++++++++- app/controllers/rentals_controller.rb | 1 - test/controllers/rentals_controller_test.rb | 7 +------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6a9b43539..aee8618d4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,14 @@ class CustomersController < ApplicationController def index - customers = Customer.all + # customers = Customer.all.order(:name) + if params[:sort] == "id" + customers = Customer.all.order(:id) + elsif params[:sort] == "name" + customers = Customer.all.order(:name) + else + customers = Customer.all.order(:id) + end + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index efcefe2ae..34a5f7dcc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -28,7 +28,6 @@ def checkin movie = Movie.find_by(id: params[:movie_id]) movie.available_inventory += 1 movie.save - rental.destroy render json: {ok: true, messages: "Rental checked in successfully"}, status: :ok else render json: {ok: false, errors: "Rental not found"}, status: :bad_request diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 56f09e3f1..8ae483975 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -99,12 +99,7 @@ movie_id: movies(:movie_one).id, } } - it "destroys checkout when given valid data" do - expect { - post checkin_path, params: rental_data - }.must_change "Rental.count", -1 - end - + it "it returns an error if rental is not found" do rental_data["customer_id"] = customers(:customer_two).id expect { From e2579f3da9566a789b5e36ff15a7e82799bd5b0b Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Wed, 15 May 2019 14:48:27 -0700 Subject: [PATCH 28/36] refactored customer index action, added tests for query params, added validation and test to customer model for name --- app/controllers/customers_controller.rb | 11 ++----- app/models/customer.rb | 2 ++ test/controllers/customers_controller_test.rb | 32 +++++++++++++++---- test/models/customer_test.rb | 15 ++++++++- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index aee8618d4..033a235ac 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,7 @@ class CustomersController < ApplicationController def index - # customers = Customer.all.order(:name) - if params[:sort] == "id" - customers = Customer.all.order(:id) - elsif params[:sort] == "name" - customers = Customer.all.order(:name) + if params[:sort] + customers = Customer.all.order(params[:sort]) else customers = Customer.all.order(:id) end @@ -13,8 +10,4 @@ def index end private - - # def customer_params - # params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) - # end end diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..68e735ecb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord has_many :rentals + + validates :name, presence: true end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index fd76dd918..f6881728d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,15 +2,14 @@ describe CustomersController do describe "index" do - it "is a real working route" do get customers_path must_respond_with :success end - + it "returns json" do get customers_path - expect(response.header['Content-Type']).must_include 'json' + expect(response.header["Content-Type"]).must_include "json" end it "returns an Array" do @@ -28,14 +27,35 @@ end it "returns customers with exactly the required fields" do - keys = %w(id movies_checked_out_count name phone postal_code registered_at ) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_path body = JSON.parse(response.body) body.each do |customer| customer.keys.sort.must_equal keys end end - end -end + it "sorts by name when given sort name query params" do + get "/customers?sort=name" + + body = JSON.parse(response.body) + body.first["name"].must_equal "Matt Saracen" + end + + it "sorts by id when given sort id query params" do + Customer.destroy_all + customer1 = Customer.create(name: "Test 1") + customer1.id = 1 + customer1.save + customer2 = Customer.create(name: "Test 2") + customer2.id = 2 + customer2.save + + get "/customers?sort=id" + body = JSON.parse(response.body) + expect(body.first["name"]).must_equal "Test 1" + expect(body.first["id"]).must_equal 1 + end + end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 540c39be0..618409ced 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,8 +6,21 @@ customer = customers(:customer_one) customer.must_respond_to :rentals customer.rentals.each do |rental| - rental.must_be_kind_of Rental + rental.must_be_kind_of Rental end end end + + describe "validations" do + it "is valid if it has a name" do + customer = Customer.new(name: "Test") + customer.valid?.must_equal true + end + + it "is not valid without a name" do + customer = Customer.new + customer.valid?.must_equal false + customer.errors.messages.must_include :name + end + end end From 9d259a020f15751202548f24ac8fd0c9728b7bc1 Mon Sep 17 00:00:00 2001 From: Riyo Date: Wed, 15 May 2019 15:21:46 -0700 Subject: [PATCH 29/36] added paginate to customers controller index and tests --- Gemfile | 1 + Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 11 ++++++--- test/controllers/customers_controller_test.rb | 24 +++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 29ae6e4ea..967b27263 100644 --- a/Gemfile +++ b/Gemfile @@ -55,3 +55,4 @@ group :test do end gem 'simplecov', require: false, group: :test +gem 'will_paginate', '~> 3.1.6' diff --git a/Gemfile.lock b/Gemfile.lock index c28072581..cb4282452 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -152,6 +152,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.1.7) PLATFORMS ruby @@ -171,6 +172,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + will_paginate (~> 3.1.6) RUBY VERSION ruby 2.5.1p57 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 033a235ac..bd70ac911 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,9 +1,14 @@ class CustomersController < ApplicationController def index - if params[:sort] - customers = Customer.all.order(params[:sort]) + + if params[:sort] && params[:n] + customers = Customer.all.order(params[:sort]).paginate(page: params[:p], per_page: params[:n]) + elsif params[:sort] + customers = Customer.all.order(params[:sort]) + elsif params[:n] && params[:p] + customers = Customer.all.paginate(page: params[:p], per_page: params[:n]) else - customers = Customer.all.order(:id) + customers = Customer.all end render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index f6881728d..c77572186 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -57,5 +57,29 @@ expect(body.first["name"]).must_equal "Test 1" expect(body.first["id"]).must_equal 1 end + + it "paginates the customer index" do + Customer.destroy_all + customer1 = Customer.create(name: "Test 1") + customer1.id = 1 + customer1.save + customer2 = Customer.create(name: "Test 2") + customer2.id = 2 + customer2.save + + get "/customers?n=1&p=2" + + body = JSON.parse(response.body) + expect(body.first["name"]).must_equal "Test 2" + expect(body.first["id"]).must_equal 2 + end + + it "paginates and sorts by name" do + + get "/customers?sort=name&n=1&p=2" + + body = JSON.parse(response.body) + expect(body.first["name"]).must_equal "Tim Riggins" + end end end From 38d4c16b54fc05dc42f604fb99a665528f11fc8a Mon Sep 17 00:00:00 2001 From: Riyo Date: Wed, 15 May 2019 15:30:48 -0700 Subject: [PATCH 30/36] limited sortable fields for customers controller index --- app/controllers/customers_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index bd70ac911..4460d5f3d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,9 +1,9 @@ class CustomersController < ApplicationController def index - if params[:sort] && params[:n] + if params[:sort]== "name" || params[:sort]== "registered_at" || params[:sort] == "postal_code" && params[:n] customers = Customer.all.order(params[:sort]).paginate(page: params[:p], per_page: params[:n]) - elsif params[:sort] + elsif params[:sort] == "name" || params[:sort]== "registered_at" || params[:sort] == "postal_code" customers = Customer.all.order(params[:sort]) elsif params[:n] && params[:p] customers = Customer.all.paginate(page: params[:p], per_page: params[:n]) From 26ab04f29b90861c8f2a904aa4c119e6c9070517 Mon Sep 17 00:00:00 2001 From: Riyo Date: Wed, 15 May 2019 15:36:40 -0700 Subject: [PATCH 31/36] added edges cases for customer controller test --- test/controllers/customers_controller_test.rb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c77572186..02348b3e4 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -81,5 +81,30 @@ body = JSON.parse(response.body) expect(body.first["name"]).must_equal "Tim Riggins" end + + it "returns an empty array if page in query is beyond content pages" do + get "/customers?n=1&p=3" + + body = JSON.parse(response.body) + expect(body).must_equal [] + body.must_be_kind_of Array + end + + it "sorts by id if given invalid sort param" do + + Customer.destroy_all + customer1 = Customer.create(name: "Test 1") + customer1.id = 1 + customer1.save + customer2 = Customer.create(name: "Test 2") + customer2.id = 2 + customer2.save + + get "/customers?sort=cat" + + body = JSON.parse(response.body) + expect(body.first["name"]).must_equal "Test 1" + expect(body.first["id"]).must_equal 1 + end end end From 2febcf7482f53336e4420e32f1f37752509e16d2 Mon Sep 17 00:00:00 2001 From: Riyo Date: Thu, 16 May 2019 10:09:43 -0700 Subject: [PATCH 32/36] added sort and paginate to movies and controller tests --- app/controllers/movies_controller.rb | 10 ++- app/controllers/rentals_controller.rb | 18 ++++++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 71 ++++++++++++++++++++++ test/fixtures/movies.yml | 6 +- 5 files changed, 102 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 92ba3fe31..2de742dc7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,15 @@ class MoviesController < ApplicationController def index - movies = Movie.all + if params[:sort]== "title" || params[:sort]== "release_date" && params[:n] + movies = Movie.all.order(params[:sort]).paginate(page: params[:p], per_page: params[:n]) + elsif params[:sort] == "title" || params[:sort]== "release_date" + movies = Movie.all.order(params[:sort]) + elsif params[:n] && params[:p] + movies = Movie.all.paginate(page: params[:p], per_page: params[:n]) + else + movies = Movie.all + end render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 34a5f7dcc..ffd77c7ee 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -33,4 +33,22 @@ def checkin render json: {ok: false, errors: "Rental not found"}, status: :bad_request end end + + def overdue + rentals = Rental.all + overdue_rentals = [] + + rentals.each do |rental| + if rental.due_date < Date.today + movie = Movie.find_by(id: rental.movie_id) + customer = Customer.find_by(id: rental.customer_id) + postal_code = customer.postal_code + title = movie.title + name = customer.name + response = {:title => title, :name => name, :postal_code => postal_code} + render json: rental.as_json(only: [:response, :movie_id, :customer_id, :checkout_date, :due_date]) + end + end + # render status: :ok, json: overdue_rentals.as_json(only: [:movie_id, :title, :customer_id, :postal_code, :name, :checkout_date, :due_date]) + end end diff --git a/config/routes.rb b/config/routes.rb index f92c68939..79ba66f1f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,5 +5,6 @@ post "/rentals/check-out", to: "rentals#checkout", as: "checkout" post "/rentals/check-in", to: "rentals#checkin", as: "checkin" + get "/rentals/overdue", to: "rentals#overdue", as: "overdue" # get "/customers/zomg", to: "customers#zomg" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 0eff39cd4..f2f6091f6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -34,6 +34,77 @@ movie.keys.sort.must_equal keys end end + it "sorts by name when given sort title query params" do + get "/movies?sort=title" + + body = JSON.parse(response.body) + body.first["title"].must_equal "Good Will Hunting" + end + + it "sorts by id when not given sort query params" do + Movie.destroy_all + movie1 = Movie.create(title: "Test 1", inventory: 1) + movie1.id = 1 + movie1.save + movie2 = Movie.create(title: "Test 2", inventory: 2) + movie2.id = 2 + movie2.save + + get "/movies" + + body = JSON.parse(response.body) + expect(body.first["title"]).must_equal "Test 1" + expect(body.first["id"]).must_equal 1 + end + + it "paginates the movie index" do + Movie.destroy_all + movie1 = Movie.create(title: "Test 1", inventory: 1) + movie1.id = 1 + movie1.save + movie2 = Movie.create(title: "Test 2", inventory: 1) + movie2.id = 2 + movie2.save + + get "/movies?n=1&p=2" + + body = JSON.parse(response.body) + expect(body.first["title"]).must_equal "Test 2" + expect(body.first["id"]).must_equal 2 + end + + it "paginates and sorts by title" do + + get "/movies?sort=title&n=1&p=2" + + body = JSON.parse(response.body) + expect(body.first["title"]).must_equal "Revolutionary Road" + end + + it "returns an empty array if page in query is beyond content pages" do + get "/movies?n=1&p=4" + + body = JSON.parse(response.body) + expect(body).must_equal [] + body.must_be_kind_of Array + end + + it "sorts by id if given invalid sort param" do + + Movie.destroy_all + movie1 = Movie.create(title: "Test 1", inventory: 1) + movie1.id = 1 + movie1.save + movie2 = Movie.create(title: "Test 2", inventory: 1) + movie2.id = 2 + movie2.save + + get "/movies?sort=cat" + + body = JSON.parse(response.body) + expect(body.first["title"]).must_equal "Test 1" + expect(body.first["id"]).must_equal 1 + end end describe "show" do diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 9ca5623f3..88a6cf962 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -8,9 +8,9 @@ movie_one: available_inventory: 3 movie_two: - title: 21 Jump Street - overview: Jonah Hill and Channing Tatum go undercover as high school students. - release_date: 2012-11-09 + title: Saving Private Ryan + overview: Military movie. + release_date: 1998-11-09 inventory: 2 available_inventory: 2 From df8c508c555f8acfe81a843ae8bb0153aa43a925 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Thu, 16 May 2019 10:20:40 -0700 Subject: [PATCH 33/36] added migratin to add columns to rentals, created overdues action --- app/controllers/rentals_controller.rb | 16 +++++++--------- .../20190516171045_add_columns_to_rentals.rb | 7 +++++++ db/schema.rb | 5 ++++- 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 db/migrate/20190516171045_add_columns_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ffd77c7ee..dc9f72121 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,8 +2,12 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(customer_id: params[:customer_id], movie_id: params[:movie_id]) movie = Movie.find_by(id: params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) rental.checkout_date = Date.today rental.due_date = Date.today + 7 + rental.title = movie.title + rental.name = customer.name + postal_code = customer.postal_code if movie.available_inventory == 0 render json: {ok: false, errors: "Movie is out of stock"}, status: :bad_request elsif rental.save @@ -39,15 +43,9 @@ def overdue overdue_rentals = [] rentals.each do |rental| - if rental.due_date < Date.today - movie = Movie.find_by(id: rental.movie_id) - customer = Customer.find_by(id: rental.customer_id) - postal_code = customer.postal_code - title = movie.title - name = customer.name - response = {:title => title, :name => name, :postal_code => postal_code} - render json: rental.as_json(only: [:response, :movie_id, :customer_id, :checkout_date, :due_date]) - end + if rental.due_date < Date.today + render json: rental.as_json(only: [:customer_id, :name, :postal_code, :movie_id, :title, :checkout_date, :due_date]) + end end # render status: :ok, json: overdue_rentals.as_json(only: [:movie_id, :title, :customer_id, :postal_code, :name, :checkout_date, :due_date]) end diff --git a/db/migrate/20190516171045_add_columns_to_rentals.rb b/db/migrate/20190516171045_add_columns_to_rentals.rb new file mode 100644 index 000000000..1ee90e6d4 --- /dev/null +++ b/db/migrate/20190516171045_add_columns_to_rentals.rb @@ -0,0 +1,7 @@ +class AddColumnsToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :title, :string + add_column :rentals, :name, :string + add_column :rentals, :postal_code, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 516d7f263..512023fff 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: 2019_05_15_193814) do +ActiveRecord::Schema.define(version: 2019_05_16_171045) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,9 @@ t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "title" + t.string "name" + t.string "postal_code" end end From 3c5a0783092a486391a8e85beb1e6acab13312c7 Mon Sep 17 00:00:00 2001 From: Margaret Finnan Date: Fri, 17 May 2019 14:00:43 -0700 Subject: [PATCH 34/36] updated overdue action, finished tests for overdue action --- app/controllers/rentals_controller.rb | 21 ++++++------ test/controllers/rentals_controller_test.rb | 36 ++++++++++++++++++++- test/fixtures/rentals.yml | 4 +-- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dc9f72121..98a065a80 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,22 +1,19 @@ class RentalsController < ApplicationController def checkout - rental = Rental.new(customer_id: params[:customer_id], movie_id: params[:movie_id]) movie = Movie.find_by(id: params[:movie_id]) customer = Customer.find_by(id: params[:customer_id]) - rental.checkout_date = Date.today - rental.due_date = Date.today + 7 - rental.title = movie.title - rental.name = customer.name - postal_code = customer.postal_code + rental = Rental.new(customer_id: params[:customer_id], movie_id: params[:movie_id], checkout_date: Date.today, due_date: Date.today + 7) + if movie.available_inventory == 0 render json: {ok: false, errors: "Movie is out of stock"}, status: :bad_request elsif rental.save - customer = Customer.find_by(id: params[:customer_id]) customer.movies_checked_out_count += 1 customer.save - movie = Movie.find_by(id: params[:movie_id]) movie.available_inventory -= 1 movie.save + rental.title = movie.title + rental.name = customer.name + rental.postal_code = customer.postal_code render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :due_date, :id]), status: :ok else render json: {ok: false, errors: rental.errors.messages}, status: :bad_request @@ -42,11 +39,15 @@ def overdue rentals = Rental.all overdue_rentals = [] + if rentals == [] + return render json: {ok: false, errors: "No rentals"}, status: :bad_request + end + rentals.each do |rental| if rental.due_date < Date.today - render json: rental.as_json(only: [:customer_id, :name, :postal_code, :movie_id, :title, :checkout_date, :due_date]) + overdue_rentals << rental end end - # render status: :ok, json: overdue_rentals.as_json(only: [:movie_id, :title, :customer_id, :postal_code, :name, :checkout_date, :due_date]) + render json: overdue_rentals.as_json(only: [:customer_id, :name, :postal_code, :movie_id, :title, :checkout_date, :due_date]) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8ae483975..1649b752f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,6 +6,9 @@ { customer_id: customers(:customer_two).id, movie_id: movies(:movie_one).id, + name: customers(:customer_two).name, + title: movies(:movie_one).title, + postal_code: customers(:customer_two).postal_code, } } @@ -99,7 +102,7 @@ movie_id: movies(:movie_one).id, } } - + it "it returns an error if rental is not found" do rental_data["customer_id"] = customers(:customer_two).id expect { @@ -124,4 +127,35 @@ expect(customer.movies_checked_out_count).must_equal 1 end end + + describe "overdue" do + it "finds movies that are overdue" do + rental = rentals(:rental_one) + get overdue_path + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + expect(body[0]["customer_id"]).must_equal rental.customer_id + end + + it "returns an array if there are rentals, but no overdues" do + rental = rentals(:rental_one) + rental.destroy + + get overdue_path + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + end + + it "returns a hash if there are no renals (and no overdues)" do + Rental.destroy_all + + get overdue_path + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 27fd9f6f0..5ea11bf16 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,8 +3,8 @@ rental_one: customer: customer_one movie: movie_one - checkout_date: 2019-05-14 - due_date: 2019-05-21 + checkout_date: 2019-05-09 + due_date: 2019-05-16 rental_two: customer: customer_one From a16ad55b828ba1fbbae7bac77f3877b58efc2baf Mon Sep 17 00:00:00 2001 From: Riyo Date: Fri, 17 May 2019 14:01:22 -0700 Subject: [PATCH 35/36] changed fixture --- test/fixtures/rentals.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 27fd9f6f0..5ea11bf16 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,8 +3,8 @@ rental_one: customer: customer_one movie: movie_one - checkout_date: 2019-05-14 - due_date: 2019-05-21 + checkout_date: 2019-05-09 + due_date: 2019-05-16 rental_two: customer: customer_one From 6c115a0e14ead38e5e6095fd34f66ab69185fac4 Mon Sep 17 00:00:00 2001 From: Riyo Date: Fri, 24 May 2019 10:48:36 -0700 Subject: [PATCH 36/36] changed date object in test --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f2f6091f6..3dead57a5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -133,7 +133,7 @@ { title: "Titanic", overview: "Romantic & sad", - release_date: 1997 - 12 - 19, + release_date: 1997-12-19, inventory: 10, } }