From 3363513f05f2fb591de4d483f8ceebe2602339e5 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 10:41:03 -0800 Subject: [PATCH 01/40] created Rails API --- .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 +++++ .../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 | 24 +++ tmp/.keep | 0 vendor/.keep | 0 57 files changed, 934 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/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..a9f49bedc --- /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.1' +# 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..54d5ca3ed --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + 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.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + 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.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + 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.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + 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.0) + 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.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.5 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..3d9afe281 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +L3qFpMwJEOzuKm0M93500W0Px6+qAI4q7d6aGLEzYStod/uPTBoYp5jbUPGwxaYdLv2CVc5lGgXWmHE/fSrzrYaxRhp+k79AAe3cy7RajNivPlIZUSpz4w2L+3CzmpDqMYhPTxaQMaCCg+xtRmw+2YA+cCk9jyH3KwHVE61AYd6i1fLv8aGZC7Sb7QSZqWZhxXhi4W8TrnD5b89tdcb8O269FeNQUMiL1vsuqlF6Q3kaPgar1dV+L6DG8GsL95kaJ99y4juOkOg5A1pzS/N2TSCv2gdKqXi61nEcBfKfzjMnxHYVyAKHS+wPRWZ9CAH2oIYWAdajUFjZQfYR8e74A4EPDcEn0dtyhYMPeUDsej6cI/WyivBE8YvbqPrDZSfJ5jLRKBQXX/CM8Pe7LKE2swAS+k6HFMmfeu6S--VBNbcwFWJP8bJFS0--n/NybMI4R/HbxtZkpJ4i2w== \ 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/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..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +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 c5a102e598a28803e83cf02eab684f31a7659fc5 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 11:14:06 -0800 Subject: [PATCH 02/40] Set up DB and join table --- app/models/customer.rb | 3 ++ app/models/movie.rb | 3 ++ db/migrate/20181105191036_create_movies.rb | 12 +++++ db/migrate/20181105191119_create_customers.rb | 14 ++++++ db/migrate/20181105191138_join_table.rb | 6 +++ db/schema.rb | 44 +++++++++++++++++++ test/fixtures/customers.yml | 17 +++++++ test/fixtures/movies.yml | 13 ++++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ 10 files changed, 130 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105191036_create_movies.rb create mode 100644 db/migrate/20181105191119_create_customers.rb create mode 100644 db/migrate/20181105191138_join_table.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/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..4e914c16d --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_and_belongs_to_many :movies +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..ea8abd0d9 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_and_belongs_to_many :customers +end diff --git a/db/migrate/20181105191036_create_movies.rb b/db/migrate/20181105191036_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105191036_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/20181105191119_create_customers.rb b/db/migrate/20181105191119_create_customers.rb new file mode 100644 index 000000000..5927e75b6 --- /dev/null +++ b/db/migrate/20181105191119_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.integer :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20181105191138_join_table.rb b/db/migrate/20181105191138_join_table.rb new file mode 100644 index 000000000..f7805b42b --- /dev/null +++ b/db/migrate/20181105191138_join_table.rb @@ -0,0 +1,6 @@ +class JoinTable < ActiveRecord::Migration[5.2] + def change + add_reference :movies, :customer, foreign_key: true + add_reference :customers, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..197e03753 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,44 @@ +# 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: 2018_11_05_191138) 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.string "address" + t.string "city" + t.string "state" + t.integer "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.index ["movie_id"], name: "index_customers_on_movie_id" + 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 + t.bigint "customer_id" + t.index ["customer_id"], name: "index_movies_on_customer_id" + end + + add_foreign_key "customers", "movies" + add_foreign_key "movies", "customers" +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..22ac529e9 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: 1 + phone: MyString + +two: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: 1 + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..f05dd0894 --- /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: 2018-11-05 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 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 From 65a5ee2c5c8f9268c4a509e6ac288f9ecedaddbd Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 11:17:48 -0800 Subject: [PATCH 03/40] Created a migration for renaming created at to registered at --- db/migrate/20181105191516_udpdate_created_at.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181105191516_udpdate_created_at.rb diff --git a/db/migrate/20181105191516_udpdate_created_at.rb b/db/migrate/20181105191516_udpdate_created_at.rb new file mode 100644 index 000000000..7b2e3c827 --- /dev/null +++ b/db/migrate/20181105191516_udpdate_created_at.rb @@ -0,0 +1,5 @@ +class UdpdateCreatedAt < ActiveRecord::Migration[5.2] + def change + rename_column :movies, :created_at , :registered_at + end +end diff --git a/db/schema.rb b/db/schema.rb index 197e03753..8a409412d 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: 2018_11_05_191138) do +ActiveRecord::Schema.define(version: 2018_11_05_191516) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,7 +33,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" - t.datetime "created_at", null: false + t.datetime "registered_at", null: false t.datetime "updated_at", null: false t.bigint "customer_id" t.index ["customer_id"], name: "index_movies_on_customer_id" From b26a205db6a2a315a0d0e57ecfd983d29e275bc7 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 11:26:49 -0800 Subject: [PATCH 04/40] Added the registered at column to customers instead of movies --- db/migrate/20181105192528_update_customer_table.rb | 7 +++++++ db/schema.rb | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20181105192528_update_customer_table.rb diff --git a/db/migrate/20181105192528_update_customer_table.rb b/db/migrate/20181105192528_update_customer_table.rb new file mode 100644 index 000000000..658cd42aa --- /dev/null +++ b/db/migrate/20181105192528_update_customer_table.rb @@ -0,0 +1,7 @@ +class UpdateCustomerTable < ActiveRecord::Migration[5.2] + def change + rename_column :movies, :registered_at, :created_at + rename_column :customers, :created_at , :registered_at + + end +end diff --git a/db/schema.rb b/db/schema.rb index 8a409412d..a26c387f7 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: 2018_11_05_191516) do +ActiveRecord::Schema.define(version: 2018_11_05_192528) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,7 +22,7 @@ t.string "state" t.integer "postal_code" t.string "phone" - t.datetime "created_at", null: false + t.datetime "registered_at", null: false t.datetime "updated_at", null: false t.bigint "movie_id" t.index ["movie_id"], name: "index_customers_on_movie_id" @@ -33,7 +33,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" - t.datetime "registered_at", null: false + t.datetime "created_at", null: false t.datetime "updated_at", null: false t.bigint "customer_id" t.index ["customer_id"], name: "index_movies_on_customer_id" From d82d78d7284983133aeff30e3224035a9408a8a8 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 12:45:24 -0800 Subject: [PATCH 05/40] added Rental model and updated references --- app/models/rental.rb | 2 ++ db/migrate/20181105204235_create_rentals.rb | 9 +++++++++ ...181105204248_add_foregin_keys_to_rentals.rb | 9 +++++++++ db/schema.rb | 18 ++++++++++++------ test/fixtures/rentals.yml | 7 +++++++ test/models/rental_test.rb | 9 +++++++++ 6 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181105204235_create_rentals.rb create mode 100644 db/migrate/20181105204248_add_foregin_keys_to_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20181105204235_create_rentals.rb b/db/migrate/20181105204235_create_rentals.rb new file mode 100644 index 000000000..f70bb4788 --- /dev/null +++ b/db/migrate/20181105204235_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20181105204248_add_foregin_keys_to_rentals.rb b/db/migrate/20181105204248_add_foregin_keys_to_rentals.rb new file mode 100644 index 000000000..50a9d2510 --- /dev/null +++ b/db/migrate/20181105204248_add_foregin_keys_to_rentals.rb @@ -0,0 +1,9 @@ +class AddForeginKeysToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + remove_column :movies, :customer_id + remove_column :customers, :movie_id + rename_column :rentals, :created_at, :checkout_date + end +end diff --git a/db/schema.rb b/db/schema.rb index a26c387f7..e18dc3f8f 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: 2018_11_05_192528) do +ActiveRecord::Schema.define(version: 2018_11_05_204248) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,8 +24,6 @@ t.string "phone" t.datetime "registered_at", null: false t.datetime "updated_at", null: false - t.bigint "movie_id" - t.index ["movie_id"], name: "index_customers_on_movie_id" end create_table "movies", force: :cascade do |t| @@ -35,10 +33,18 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.datetime "checkout_date", null: false + t.datetime "updated_at", null: false t.bigint "customer_id" - t.index ["customer_id"], name: "index_movies_on_customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end - add_foreign_key "customers", "movies" - add_foreign_key "movies", "customers" + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..7fe00dabd --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + due_date: 2018-11-05 + +two: + due_date: 2018-11-05 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 cba7d5f5bfcddcc8756eab4ea4467755e80df743 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 12:51:12 -0800 Subject: [PATCH 06/40] added customer fixtures --- test/fixtures/customers.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 22ac529e9..7750d1f18 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,17 +1,17 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - address: MyString - city: MyString - state: MyString - postal_code: 1 - phone: MyString +Amanda: + name: Amanda + address: 123 Sesame St + city: Queens + state: NY + postal_code: 12345 + phone: 914-908-9090 -two: - name: MyString - address: MyString - city: MyString - state: MyString - postal_code: 1 - phone: MyString +Dani: + name: Dani + address: 789 ABC Ave + city: Boulder + state: Colorado + postal_code: 98765 + phone: 134-212-2312 From b79d47b2cb414de13fe1c64a8c24d240d0d3c1d8 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 12:54:00 -0800 Subject: [PATCH 07/40] customer_Test' --- test/models/customer_test.rb | 4 ++-- test/test_helper.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..a16b22eb3 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:amanda) { customers(:Amanda)} it "must be valid" do - value(customer).must_be :valid? + value(amanda).must_be :valid? end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 57b74fd413a313459f575b5af73fb9a33791a80d Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 13:22:09 -0800 Subject: [PATCH 08/40] Updated relationships in the movies,customers,rentals model --- app/models/customer.rb | 4 +++- app/models/movie.rb | 3 ++- app/models/rental.rb | 2 ++ ...ssociation_for_rentals_in_movies_customers.rb | 6 ++++++ db/migrate/20181105211823_undo_last_migration.rb | 6 ++++++ db/schema.rb | 2 +- test/fixtures/customers.yml | 2 ++ test/fixtures/movies.yml | 14 ++++++++------ test/fixtures/rentals.yml | 16 ++++++++++++++-- test/models/customer_test.rb | 1 + test/models/movie_test.rb | 15 +++++++++++++-- 11 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20181105210953_add_association_for_rentals_in_movies_customers.rb create mode 100644 db/migrate/20181105211823_undo_last_migration.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 4e914c16d..d6ff5ac29 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord - has_and_belongs_to_many :movies + + has_many :rentals + has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index ea8abd0d9..6237ce84b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,4 @@ class Movie < ApplicationRecord - has_and_belongs_to_many :customers + has_many :rentals + has_many :customers, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer end diff --git a/db/migrate/20181105210953_add_association_for_rentals_in_movies_customers.rb b/db/migrate/20181105210953_add_association_for_rentals_in_movies_customers.rb new file mode 100644 index 000000000..cb931f17a --- /dev/null +++ b/db/migrate/20181105210953_add_association_for_rentals_in_movies_customers.rb @@ -0,0 +1,6 @@ +class AddAssociationForRentalsInMoviesCustomers < ActiveRecord::Migration[5.2] + def change + add_reference :movies, :rental, foreign_key: true + add_reference :customers, :rental, foreign_key: true + end +end diff --git a/db/migrate/20181105211823_undo_last_migration.rb b/db/migrate/20181105211823_undo_last_migration.rb new file mode 100644 index 000000000..09e031010 --- /dev/null +++ b/db/migrate/20181105211823_undo_last_migration.rb @@ -0,0 +1,6 @@ +class UndoLastMigration < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :rental_id + remove_column :customers, :rental_id + end +end diff --git a/db/schema.rb b/db/schema.rb index e18dc3f8f..152d102b6 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: 2018_11_05_204248) do +ActiveRecord::Schema.define(version: 2018_11_05_211823) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 7750d1f18..c1f2ac699 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -7,6 +7,7 @@ Amanda: state: NY postal_code: 12345 phone: 914-908-9090 + registered_at: 2018-01-05 Dani: name: Dani @@ -15,3 +16,4 @@ Dani: state: Colorado postal_code: 98765 phone: 134-212-2312 + registered_at: 2018-01-05 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..d22a92f40 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString +movie1: + title: Harry Potter & the Sorcerer Stone overview: MyString release_date: 2018-11-05 inventory: 1 -two: - title: MyString + + +movie2: + title: Harry Potter and the Chamber of Secrets overview: MyString - release_date: 2018-11-05 - inventory: 1 + release_date: 2018-12-05 + inventory: 4 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 7fe00dabd..00185a4de 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,7 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +rent1: due_date: 2018-11-05 + customer_id: Amanda + movie_id: movie1 + checkout_date: 2018-11-05 -two: +rent2: due_date: 2018-11-05 + customer_id: Amanda + movie_id: movie2 + checkout_date: 2018-11-05 + +rent3: + due_date: 2018-11-05 + customer_id: Dani + movie_id: movie2 + checkout_date: 2018-11-05 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a16b22eb3..f80afd3da 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,4 +1,5 @@ require "test_helper" +#Validate only those fields that, if they are absent, will break your API. describe Customer do let(:amanda) { customers(:Amanda)} diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..f495475ba 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,20 @@ require "test_helper" - +#Validate only those fields that, if they are absent, will break your API. describe Movie do let(:movie) { Movie.new } + let(:harry) { movies(:movie2)} it "must be valid" do - value(movie).must_be :valid? + expect(movie).must_be :valid? + end + + describe "relations" do + it "has many customers" do + harry.must_respond_to :customers + harry.customers.each do |customer| + customer.must_be_kind_of Customer + end + end + end end From 6ce7c95fb724175792528b07a973a3f29b162e8d Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 13:30:19 -0800 Subject: [PATCH 09/40] Added model tests for movies --- test/fixtures/movies.yml | 6 ++++++ test/models/movie_test.rb | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d22a92f40..d4f861166 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -13,3 +13,9 @@ movie2: overview: MyString release_date: 2018-12-05 inventory: 4 + +movie3: + title: Harry Potter and the Prisoner of Azkaban + overview: MyString + release_date: 2018-12-05 + inventory: 2 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f495475ba..3be229567 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,6 +3,7 @@ describe Movie do let(:movie) { Movie.new } let(:harry) { movies(:movie2)} + let(:norents_movie) { movies(:movie3)} it "must be valid" do expect(movie).must_be :valid? @@ -16,5 +17,21 @@ end end + it "has many rentals" do + harry.must_respond_to :rentals + harry.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + + it "can have no rentals" do + norents_movie.must_respond_to :rentals + expect(norents_movie.rentals).must_equal [] + end + + it "can have no customers" do + end + + end end From cedac590b761133e84995c76f776a9df3a867c87 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 13:32:51 -0800 Subject: [PATCH 10/40] Updated more movie tests --- test/models/movie_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3be229567..31114feff 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -30,6 +30,8 @@ end it "can have no customers" do + norents_movie.must_respond_to :customers + expect(norents_movie.customers).must_equal [] end From e4b10e355ef6dbec6d29cd12a5455ad75899856e Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 13:48:12 -0800 Subject: [PATCH 11/40] Fixed yml files to have relationships --- test/fixtures/rentals.yml | 12 ++++++------ test/models/customer_test.rb | 31 +++++++++++++++++++++++++++++++ test/models/movie_test.rb | 2 ++ 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 00185a4de..037214000 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,18 +2,18 @@ rent1: due_date: 2018-11-05 - customer_id: Amanda - movie_id: movie1 + customer: Amanda + movie: movie1 checkout_date: 2018-11-05 rent2: due_date: 2018-11-05 - customer_id: Amanda - movie_id: movie2 + customer: Amanda + movie: movie2 checkout_date: 2018-11-05 rent3: due_date: 2018-11-05 - customer_id: Dani - movie_id: movie2 + customer: Dani + movie: movie2 checkout_date: 2018-11-05 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index f80afd3da..6123a9641 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -7,4 +7,35 @@ it "must be valid" do value(amanda).must_be :valid? end + + describe "relations" do + it "has many customers" do + amanda.must_respond_to :movies + binding.pry + amanda.movies.each do |movie| + movie.must_be_kind_of Movie + end + end + + it "has many rentals" do + amanda.must_respond_to :rentals + amanda.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + + it "can have no rentals" do + amanda.rentals.destroy_all + amanda.must_respond_to :rentals + expect(amanda.rentals).must_equal [] + end + + it "can have no movies" do + amanda.rentals.destroy_all + amanda.must_respond_to :movies + expect(amanda.movies).must_equal [] + end + + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 31114feff..84d22a206 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -12,9 +12,11 @@ describe "relations" do it "has many customers" do harry.must_respond_to :customers + harry.customers.each do |customer| customer.must_be_kind_of Customer end + expect(harry.customers.count).must_equal 2 end it "has many rentals" do From 39b94eaa19c060000947a1e74d859a8cff424c95 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 13:50:55 -0800 Subject: [PATCH 12/40] Updated the destroy_all in the customers test to have and ! to save amanda --- test/models/customer_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 6123a9641..a9c36c480 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -25,13 +25,13 @@ end it "can have no rentals" do - amanda.rentals.destroy_all + amanda.rentals.destroy_all! amanda.must_respond_to :rentals expect(amanda.rentals).must_equal [] end it "can have no movies" do - amanda.rentals.destroy_all + amanda.rentals.destroy_all! amanda.must_respond_to :movies expect(amanda.movies).must_equal [] end From 0e790d1c3795d9a56589fe6f5b0566a9dd44bef6 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 13:56:01 -0800 Subject: [PATCH 13/40] added rentals test --- test/models/rental_test.rb | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..68e83c93b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,35 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:rent1)} it "must be valid" do value(rental).must_be :valid? end + #can't be nil for customer_id or movie_id + + describe "relations" do + it "has a customer" do + rental.must_respond_to :customer + expect(rental.customer).must_be_kind_of Customer + expect(rental.customer.name).must_equal "Amanda" + end + + it "has one movie" do + rental.must_respond_to :movie + expect(rental.movie).must_be_kind_of Movie + end + + it "movie cannot be nil" do + rental.movie = nil + expect(rental.valid?).must_equal false + end + + it "customer cannot be nil" do + rental.customer = nil + expect(rental.valid?).must_equal false + end + + + end end From b19967ab8729c0d2a50aa2b1ba321cdc1f01b567 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 13:58:09 -0800 Subject: [PATCH 14/40] all tests pass --- test/models/customer_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a9c36c480..83b752239 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -11,7 +11,6 @@ describe "relations" do it "has many customers" do amanda.must_respond_to :movies - binding.pry amanda.movies.each do |movie| movie.must_be_kind_of Movie end @@ -25,13 +24,14 @@ end it "can have no rentals" do - amanda.rentals.destroy_all! + amanda.rentals.destroy_all amanda.must_respond_to :rentals expect(amanda.rentals).must_equal [] end it "can have no movies" do - amanda.rentals.destroy_all! + amanda.rentals.destroy_all + binding.pry amanda.must_respond_to :movies expect(amanda.movies).must_equal [] end From edd80b5e05345a3b63096815a54650e39c82d92f Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 13:58:37 -0800 Subject: [PATCH 15/40] binding.pry --- test/models/customer_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 83b752239..cb1b59ba5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -31,7 +31,6 @@ it "can have no movies" do amanda.rentals.destroy_all - binding.pry amanda.must_respond_to :movies expect(amanda.movies).must_equal [] end From c82840a01249468584e7b97ab71a6d3360349105 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 14:22:44 -0800 Subject: [PATCH 16/40] added movie show and index tests/customers index test --- app/controllers/customers_controller.rb | 7 +++++++ app/controllers/movies_controller.rb | 20 ++++++++++++++++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 15 +++++++++++++ test/controllers/movies_controller_test.rb | 21 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..472e21deb --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :movies_checked_out_count]) + end + +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b62ceb547 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,20 @@ +class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json( only: [:id, :title, :release_date]) + end + + def show + @movie = Movie.find_by(id: params[:id]) + if @movie.nil? + render json: { errors: { + title: ["Movie #{params[:id]} not found"] + } + }, + status: :not_found + else + render json: {ok: true, movie: @movie.as_json(except: [:created_at, :updated_at]) + } + end + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..b80ad94d8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do + resources :customers, only: [:index] + resources :movies, only: [:index, :show] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..2f2c8c299 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,15 @@ +require "test_helper" +# id +# name +# registered_at +# postal_code +# phone +# movies_checked_out_count +describe CustomersController do + describe "Index" do + it "Will list all customers" do + get customers_path + must_respond_with :success + end + end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..24b9c7585 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,21 @@ +require "test_helper" +# + +describe MoviesController do + let(:harry) { movies(:movie1)} + describe "Index" do + it "Will list all movies" do + get movies_path + must_respond_with :success + end + end + + describe "show" do + it "will return one movie" do + get movie_path(harry.id) + must_respond_with :success + end + end + + +end From aea096616f2d3f7991c9b3d61bfcf00f9452b398 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 15:31:32 -0800 Subject: [PATCH 17/40] Added movie validations --- app/controllers/movies_controller.rb | 21 ++++++++ app/models/movie.rb | 5 ++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 59 ++++++++++++++++++++++ test/models/movie_test.rb | 49 +++++++++++++++++- 5 files changed, 134 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b62ceb547..35cdc7a76 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,4 +17,25 @@ def show } end end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { + errors: { + title: ["Could not create Movie"] + }, + message: movie.errors.messages + }, status: :bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :inventory, :release_date) + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 6237ce84b..53aed7c02 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,9 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + validates :title, presence: true , uniqueness: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, numericality: { only_integer: true, greater_than: 0 } end diff --git a/config/routes.rb b/config/routes.rb index b80ad94d8..dacb6da61 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do resources :customers, only: [:index] - resources :movies, only: [:index, :show] + resources :movies, only: [:index, :show, :create] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 24b9c7585..bcf682d14 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -8,14 +8,73 @@ get movies_path must_respond_with :success end + + it "returns an Array" do + # Act + get movies_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_kind_of Array + end + + it "returns all of the movies" do + # Act + get movies_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body.length).must_equal Movie.count + end end describe "show" do it "will return one movie" do get movie_path(harry.id) must_respond_with :success + #maybe add checks for specific returned values end end + describe "Create" do + # let(:mock_hash) { movie: + # { + # title: "Harry Potter and the GOF", + # release_date: "1990-10-23", + # overview: "The most enchanting athletic event in history", + # inventory: 4 + # } + # } + # + # it "will create a new movie with valid data" do + # post movies_path(mock_hash) + # must_respond_with :success + # end + end + + + + + +# it "returns pets with exactly the required fields" do +# keys = %w(age human id name) +# +# # Act +# get pets_path +# +# # Convert the JSON response into a Hash +# body = JSON.parse(response.body) +# +# # Assert that each +# body.each do |pet| +# expect(pet.keys.sort).must_equal keys +# expect(pet.keys.length).must_equal keys.length +# end +# end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 84d22a206..c2b708aa8 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -6,7 +6,7 @@ let(:norents_movie) { movies(:movie3)} it "must be valid" do - expect(movie).must_be :valid? + expect(harry).must_be :valid? end describe "relations" do @@ -38,4 +38,51 @@ end + + describe "Validations" do + it 'must have title' do + harry.title = nil + harry.save + + valid = harry.valid? + + expect(valid).must_equal false + expect(harry.errors.messages[:title]).must_equal ["can't be blank"] + end + + it 'must have overview' do + harry.overview = nil + harry.save + + valid = harry.valid? + + expect(valid).must_equal false + expect(harry.errors.messages[:overview]).must_equal ["can't be blank"] + end + + it 'must have release_date' do + harry.release_date = nil + harry.save + + valid = harry.valid? + + expect(valid).must_equal false + expect(harry.errors.messages[:release_date]).must_equal ["can't be blank"] + end + + it 'must have valid inventory' do + invalid_inv = [nil, 1.0, 0, "string"] + + invalid_inv.each do |value| + harry.inventory = value + harry.save + + valid = harry.valid? + expect(valid).must_equal false + valid_errors = [["is not a number"],["must be an integer"],["must be greater than 0"]] + expect(valid_errors).must_include harry.errors.messages[:inventory] + end + end + + end end From e4066bc563ffecae5c9abd24c8f7d6e917d37617 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 15:51:45 -0800 Subject: [PATCH 18/40] updated Movie model test for validations --- app/controllers/movies_controller.rb | 2 +- test/models/movie_test.rb | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 35cdc7a76..792d4a358 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -25,7 +25,7 @@ def create else render json: { errors: { - title: ["Could not create Movie"] + title: ["Could not create '#{movie_params[:title]}' Movie"] }, message: movie.errors.messages }, status: :bad_request diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index c2b708aa8..d37773184 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,6 @@ require "test_helper" #Validate only those fields that, if they are absent, will break your API. describe Movie do - let(:movie) { Movie.new } let(:harry) { movies(:movie2)} let(:norents_movie) { movies(:movie3)} @@ -40,6 +39,21 @@ end describe "Validations" do + let(:mock_hash) { + { + movie: { + title: "Harry Potter & the Sorcerer Stone", + release_date: "1990-10-23", + overview: "The most enchanting athletic event in history", + inventory: 4 + } + } + } + it 'will save movie with valid params' do + + + end + it 'must have title' do harry.title = nil harry.save @@ -50,6 +64,17 @@ expect(harry.errors.messages[:title]).must_equal ["can't be blank"] end + it 'must have unique title' do + + norents_movie.title = harry.title + norents_movie.save + + valid = norents_movie.valid? + + expect(valid).must_equal false + expect(norents_movie.errors.messages[:title]).must_equal ["has already been taken"] + end + it 'must have overview' do harry.overview = nil harry.save From e02f475bad081ff103bd37d0856b1ac530c8cee7 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 16:33:40 -0800 Subject: [PATCH 19/40] Tested movie controller to return certain keys --- app/controllers/movies_controller.rb | 4 +- app/models/movie.rb | 3 +- test/controllers/movies_controller_test.rb | 49 +++++++++++++++------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 792d4a358..e63450bc7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,8 +13,8 @@ def show }, status: :not_found else - render json: {ok: true, movie: @movie.as_json(except: [:created_at, :updated_at]) - } + render json: @movie.as_json(except: [:created_at, :updated_at]) + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 53aed7c02..a91c9c5c3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,5 +5,4 @@ class Movie < ApplicationRecord validates :title, presence: true , uniqueness: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, numericality: { only_integer: true, greater_than: 0 } -end + validates :inventory, presence: true diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index bcf682d14..6f0db56e3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -30,6 +30,22 @@ # Assert expect(body.length).must_equal Movie.count end + + it "returns movies with exactly the required fields" do + keys = %w(id release_date title) + + # Act + get movies_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert that each + body.each do |movie| + expect(movie.keys.sort).must_equal keys + expect(movie.keys.length).must_equal keys.length + end + end end describe "show" do @@ -38,6 +54,23 @@ must_respond_with :success #maybe add checks for specific returned values end + + it "returns movies with exactly the required fields" do + keys = %w(id inventory overview release_date title) + + # Act + get movie_path(harry.id) + + # Convert the JSON response into a Hash + movie = JSON.parse(response.body) + + # Assert that each + + expect(movie.keys.sort).must_equal keys + expect(movie.keys.length).must_equal keys.length + + end + end describe "Create" do @@ -60,21 +93,7 @@ -# it "returns pets with exactly the required fields" do -# keys = %w(age human id name) -# -# # Act -# get pets_path -# -# # Convert the JSON response into a Hash -# body = JSON.parse(response.body) -# -# # Assert that each -# body.each do |pet| -# expect(pet.keys.sort).must_equal keys -# expect(pet.keys.length).must_equal keys.length -# end -# end + end From e81256074afaded99f02b79d5368533c1eaecd84 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 16:52:55 -0800 Subject: [PATCH 20/40] Added Customer Controller Tests for index --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 4 +- app/models/movie.rb | 3 +- ...520_add_movies_checked_out_count_column.rb | 5 +++ .../20181106004651_add_available_inventory.rb | 5 +++ db/schema.rb | 4 +- test/controllers/customers_controller_test.rb | 39 +++++++++++++++++++ test/controllers/movies_controller_test.rb | 4 +- 8 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20181106004520_add_movies_checked_out_count_column.rb create mode 100644 db/migrate/20181106004651_add_available_inventory.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 472e21deb..504e8cf3c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :movies_checked_out_count]) + render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :registered_at, :movies_checked_out_count]) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e63450bc7..b479e97c1 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,7 +14,7 @@ def show status: :not_found else render json: @movie.as_json(except: [:created_at, :updated_at]) - + end end @@ -35,7 +35,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :inventory, :release_date) + params.permit(:title, :overview, :inventory, :release_date) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index a91c9c5c3..53aed7c02 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,4 +5,5 @@ class Movie < ApplicationRecord validates :title, presence: true , uniqueness: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, presence: true + validates :inventory, numericality: { only_integer: true, greater_than: 0 } +end diff --git a/db/migrate/20181106004520_add_movies_checked_out_count_column.rb b/db/migrate/20181106004520_add_movies_checked_out_count_column.rb new file mode 100644 index 000000000..518d53cae --- /dev/null +++ b/db/migrate/20181106004520_add_movies_checked_out_count_column.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountColumn < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/migrate/20181106004651_add_available_inventory.rb b/db/migrate/20181106004651_add_available_inventory.rb new file mode 100644 index 000000000..31a8a7bbe --- /dev/null +++ b/db/migrate/20181106004651_add_available_inventory.rb @@ -0,0 +1,5 @@ +class AddAvailableInventory < 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 152d102b6..7d61ca6e9 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: 2018_11_05_211823) do +ActiveRecord::Schema.define(version: 2018_11_06_004651) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,6 +24,7 @@ t.string "phone" t.datetime "registered_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| @@ -33,6 +34,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| diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2f2c8c299..d0e3ec558 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -11,5 +11,44 @@ get customers_path must_respond_with :success end + + it "returns an Array" do + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_kind_of Array + end + + it "returns all of the customers" do + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body.length).must_equal Customer.count + end + + it "returns movies with exactly the required fields" do + keys = %w(id movies_checked_out_count name phone postal_code registered_at) + + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert that each + body.each do |customer| + expect(customer.keys.sort).must_equal keys + expect(customer.keys.length).must_equal keys.length + end + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 6f0db56e3..f8e224365 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -66,8 +66,8 @@ # Assert that each - expect(movie.keys.sort).must_equal keys - expect(movie.keys.length).must_equal keys.length + expect(movie.keys.sort).must_equal keys + expect(movie.keys.length).must_equal keys.length end From 0059b6e750535ba4ec1670f25b7a9d661fb98f04 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Mon, 5 Nov 2018 17:52:35 -0800 Subject: [PATCH 21/40] Added SimpleCov- 100% covered --- .gitignore | 1 + Gemfile | 3 +- Gemfile.lock | 8 +++++ test/controllers/movies_controller_test.rb | 41 ++++++++++++++-------- test/models/movie_test.rb | 9 +++-- test/test_helper.rb | 2 ++ 6 files changed, 46 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index ea4b32f59..de51608d2 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ # Ignore master key for decrypting credentials and more. /config/master.key +coverage diff --git a/Gemfile b/Gemfile index a9f49bedc..44adb30c5 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'puma', '~> 3.11' # gem 'redis', '~> 4.0' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' - +gem 'simplecov' # Use ActiveStorage variant # gem 'mini_magick', '~> 4.8' @@ -51,4 +51,5 @@ end group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 54d5ca3ed..b4342a9dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,12 +51,14 @@ GEM coderay (1.1.2) concurrent-ruby (1.1.1) crass (1.0.4) + docile (1.3.1) erubi (1.7.1) ffi (1.9.25) globalid (0.4.1) activesupport (>= 4.2.0) i18n (1.1.1) 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) @@ -125,6 +127,11 @@ GEM ffi (>= 0.5.0, < 2) 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) @@ -158,6 +165,7 @@ DEPENDENCIES pry-rails puma (~> 3.11) rails (~> 5.2.1) + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f8e224365..28eddced2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,7 +56,7 @@ end it "returns movies with exactly the required fields" do - keys = %w(id inventory overview release_date title) + keys = %w(available_inventory id inventory overview release_date title) # Act get movie_path(harry.id) @@ -71,22 +71,35 @@ end + it "will return status not_found for invalid movie" do + + get movie_path(-1) + must_respond_with :not_found + #maybe add checks for specific returned values + end + end describe "Create" do - # let(:mock_hash) { movie: - # { - # title: "Harry Potter and the GOF", - # release_date: "1990-10-23", - # overview: "The most enchanting athletic event in history", - # inventory: 4 - # } - # } - # - # it "will create a new movie with valid data" do - # post movies_path(mock_hash) - # must_respond_with :success - # end + let(:mock_hash) { + { + title: "Harry Potter and the GOF", + release_date: "1990-10-23", + overview: "The most enchanting athletic event in history", + inventory: 4 + } + } + + it "will create a new movie with valid data" do + post movies_path(mock_hash) + must_respond_with :success + end + + it "will not create a new movie with invalid params" do + mock_hash[:title] = nil + post movies_path(mock_hash) + must_respond_with :bad_request + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index d37773184..2c4d173fa 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -41,16 +41,19 @@ describe "Validations" do let(:mock_hash) { { - movie: { - title: "Harry Potter & the Sorcerer Stone", + title: "Harry Potter & the Sorcerer Stone2", release_date: "1990-10-23", overview: "The most enchanting athletic event in history", inventory: 4 - } } } it 'will save movie with valid params' do + movie = Movie.new(mock_hash) + movie.save + valid = movie.valid? + + expect(valid).must_equal true end diff --git a/test/test_helper.rb b/test/test_helper.rb index fb7dd505e..5137a83ad 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,4 +1,6 @@ ENV["RAILS_ENV"] = "test" +require 'simplecov' +SimpleCov.start require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" require "minitest/rails" From bac0c4fa27e201ab086c3aa112d1532976f8bb4c Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 18:34:08 -0800 Subject: [PATCH 22/40] pseudo code in rentals controller for check-in/check-out --- app/controllers/rentals_controller.rb | 13 +++++++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ test/models/customer_test.rb | 1 + 3 files changed, 21 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..1740440e1 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,13 @@ +class RentalsController < ApplicationController +# find customer +# find movie + def check_out + #check inventory of + #create new instance of rental + #checkout_date: Today + #The rental's check-out date should be set to today, and the due date should be set to a week from today. + end + + def check_in + 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 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index cb1b59ba5..7e23a802d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -31,6 +31,7 @@ it "can have no movies" do amanda.rentals.destroy_all + amanda.must_respond_to :movies expect(amanda.movies).must_equal [] end From e17b166348e5a3c886fb8558eed42f08f43c8fb5 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 18:36:36 -0800 Subject: [PATCH 23/40] updated db --- app/controllers/rentals_controller.rb | 23 ++++++++++++++----- ...23426_add_checkin_date_to_rentals_model.rb | 5 ++++ db/schema.rb | 3 ++- 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20181106023426_add_checkin_date_to_rentals_model.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1740440e1..4e5f587d3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,13 +1,24 @@ class RentalsController < ApplicationController -# find customer -# find movie +# find customer before check in +# find movie before check in def check_out - #check inventory of - #create new instance of rental - #checkout_date: Today - #The rental's check-out date should be set to today, and the due date should be set to a week from today. + #check inventory of movie_id + #call inventory method for checkout + #if positive + #create new instance of rental + #checkout_date: Today + #due_date: Today + 7 + #check_in: nil + #else + #sorry we're out of stock + #bad_request + #end end def check_in + #find rental isntance for customer_id and movie_id + #update rental instance + #check_in: today + #call inventory method for check in end end diff --git a/db/migrate/20181106023426_add_checkin_date_to_rentals_model.rb b/db/migrate/20181106023426_add_checkin_date_to_rentals_model.rb new file mode 100644 index 000000000..7b25987e3 --- /dev/null +++ b/db/migrate/20181106023426_add_checkin_date_to_rentals_model.rb @@ -0,0 +1,5 @@ +class AddCheckinDateToRentalsModel < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkin_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 7d61ca6e9..f9128be49 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: 2018_11_06_004651) do +ActiveRecord::Schema.define(version: 2018_11_06_023426) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.date "checkin_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From ddea75df294382585b7f4b4ce91689908bfe0b47 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 18:39:50 -0800 Subject: [PATCH 24/40] added routes for checkin/checkout for rentals controller --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index dacb6da61..220c3287f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,8 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + + post '/rentals/check_in', to: 'rentals#check_in' as: 'check_in' + post '/rentals/check_out', to: 'rentals#check_out' as: 'check_out' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 9a78d3064f3031ac69115cb30ed21beac498699b Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 19:30:24 -0800 Subject: [PATCH 25/40] added/tested checkout method for rental controller --- app/controllers/rentals_controller.rb | 49 ++++++++++++++++----- app/models/movie.rb | 15 ++++++- config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 44 ++++++++++++++++-- test/fixtures/movies.yml | 3 ++ test/models/movie_test.rb | 4 +- 6 files changed, 100 insertions(+), 19 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4e5f587d3..1cdbc9fac 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,24 +1,51 @@ class RentalsController < ApplicationController + before_action :find_movie + before_action :find_customer # find customer before check in # find movie before check in def check_out - #check inventory of movie_id - #call inventory method for checkout - #if positive - #create new instance of rental - #checkout_date: Today - #due_date: Today + 7 - #check_in: nil - #else - #sorry we're out of stock - #bad_request - #end + if @movie.available? + rental = Rental.new(rental_params) + rental.due_date = Date.today + 7 + rental.checkout_date = Date.today + rental.save + @movie.check_out_movie + @movie.save + #binding.pry + else + render json: { errors: { + title: ["Movie #{@movie.title} not available"] + } + }, + status: :bad_request + end end + + + def check_in #find rental isntance for customer_id and movie_id #update rental instance #check_in: today #call inventory method for check in end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end + + def find_movie + @movie = Movie.find_by(id: rental_params[:movie_id]) + end + + def find_customer + @customer = Customer.find_by(id: params[:id]) + end + + + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 53aed7c02..561ac9ec6 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,5 +5,18 @@ class Movie < ApplicationRecord validates :title, presence: true , uniqueness: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, numericality: { only_integer: true, greater_than: 0 } + validates :inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + + def check_out_movie + self.available_inventory -= 1 + end + + def check_in_movie + self.available_inventory += 1 + end + + def available? + return self.available_inventory > 0 + end + end diff --git a/config/routes.rb b/config/routes.rb index 220c3287f..85f85feda 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post '/rentals/check_in', to: 'rentals#check_in' as: 'check_in' - post '/rentals/check_out', to: 'rentals#check_out' as: 'check_out' + post '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' + post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..1cde6c918 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,45 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:harry){movies(:movie1)} + let(:dani){customers(:Dani)} + let(:mock_hash){ + { + customer_id: dani.id, + movie_id: harry.id + + } + } + + describe "check_out" do + it 'can create a new instance of rental' do + expect { + post check_out_path(mock_hash) + }.must_change 'Rental.count', 1 + must_respond_with :success + end + + it 'wont create a new instance of rental if theres not enough inventory' do + harry.available_inventory = 0 + harry.save + post check_out_path(mock_hash) + must_respond_with :bad_request + end + end + + describe "check_in" do + it 'can update an instance of rental' do + post check_out_path(mock_hash) + expect{ + post check_in_path(mock_hash) + }.wont_change 'Rental.count' + must_respond_with :success + end + + it 'wont update an new instance of rental if its already been checkedin' do + post check_out_path(mock_hash) + post check_out_path(mock_hash) #try checking in again + must_respond_with :bad_request + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d4f861166..ca18b012c 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,6 +5,7 @@ movie1: overview: MyString release_date: 2018-11-05 inventory: 1 + available_inventory: 1 @@ -13,9 +14,11 @@ movie2: overview: MyString release_date: 2018-12-05 inventory: 4 + available_inventory: 4 movie3: title: Harry Potter and the Prisoner of Azkaban overview: MyString release_date: 2018-12-05 inventory: 2 + available_inventory: 0 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2c4d173fa..04d3179c8 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -99,7 +99,7 @@ end it 'must have valid inventory' do - invalid_inv = [nil, 1.0, 0, "string"] + invalid_inv = [nil, 1.0, -1, "string"] invalid_inv.each do |value| harry.inventory = value @@ -107,7 +107,7 @@ valid = harry.valid? expect(valid).must_equal false - valid_errors = [["is not a number"],["must be an integer"],["must be greater than 0"]] + valid_errors = [["is not a number"],["must be an integer"],["must be greater than or equal to 0"]] expect(valid_errors).must_include harry.errors.messages[:inventory] end end From de8cc0370e182d33905880fe56322f1f7c5a31f7 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Mon, 5 Nov 2018 20:02:52 -0800 Subject: [PATCH 26/40] updated movie model to set available inventory default value --- app/controllers/rentals_controller.rb | 31 +++++++++++++------ app/models/movie.rb | 11 +++++++ ...6035639_add_default_available_inventory.rb | 4 +++ db/schema.rb | 2 +- test/controllers/rentals_controller_test.rb | 9 ++++-- 5 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 db/migrate/20181106035639_add_default_available_inventory.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1cdbc9fac..e07b2d4c6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,8 +1,8 @@ class RentalsController < ApplicationController before_action :find_movie before_action :find_customer -# find customer before check in -# find movie before check in + before_action :find_rental, only: [:check_in] + def check_out if @movie.available? rental = Rental.new(rental_params) @@ -10,8 +10,7 @@ def check_out rental.checkout_date = Date.today rental.save @movie.check_out_movie - @movie.save - #binding.pry + render json: { id: rental.id }, status: :ok else render json: { errors: { title: ["Movie #{@movie.title} not available"] @@ -25,12 +24,22 @@ def check_out def check_in - #find rental isntance for customer_id and movie_id - #update rental instance - #check_in: today - #call inventory method for check in + if @rental.nil? + render json: { errors: { + title: ["Could not find rental"] + } + }, + status: :bad_request + else + @rental.checkin_date = Date.today + @rental.save + @rental.movie.check_in_movie + end end + + + private def rental_params @@ -42,7 +51,11 @@ def find_movie end def find_customer - @customer = Customer.find_by(id: params[:id]) + @customer = Customer.find_by(id: rental_params[:customer_id]) + end + + def find_rental + @rental = Rental.find_by(customer_id: rental_params[:customer_id], movie_id: rental_params[:movie_id], checkin_date: nil) end diff --git a/app/models/movie.rb b/app/models/movie.rb index 561ac9ec6..58613e861 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,16 +7,27 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + before_create :set_available_inventory_default + + def check_out_movie self.available_inventory -= 1 + self.save end def check_in_movie self.available_inventory += 1 + self.save end def available? return self.available_inventory > 0 end + private + + def set_available_inventory_default + self.available_inventory = self.inventory + end + end diff --git a/db/migrate/20181106035639_add_default_available_inventory.rb b/db/migrate/20181106035639_add_default_available_inventory.rb new file mode 100644 index 000000000..0cf9d6348 --- /dev/null +++ b/db/migrate/20181106035639_add_default_available_inventory.rb @@ -0,0 +1,4 @@ +class AddDefaultAvailableInventory < ActiveRecord::Migration[5.2] + def change + end +end diff --git a/db/schema.rb b/db/schema.rb index f9128be49..4be49c580 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: 2018_11_06_023426) do +ActiveRecord::Schema.define(version: 2018_11_06_035639) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1cde6c918..f201a4d83 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -13,9 +13,13 @@ describe "check_out" do it 'can create a new instance of rental' do + starting_inventory = harry.available_inventory expect { post check_out_path(mock_hash) }.must_change 'Rental.count', 1 + harry.reload + expect(harry.available_inventory).must_equal starting_inventory - 1 + must_respond_with :success end @@ -33,12 +37,13 @@ expect{ post check_in_path(mock_hash) }.wont_change 'Rental.count' + expect(Rental.all.last.checkin_date).must_equal Date.today must_respond_with :success end it 'wont update an new instance of rental if its already been checkedin' do - post check_out_path(mock_hash) - post check_out_path(mock_hash) #try checking in again + post check_in_path(mock_hash) + post check_in_path(mock_hash) #try checking in again must_respond_with :bad_request end end From 826997b1adf1156d40091af3dbaadd5403252bd6 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Tue, 6 Nov 2018 09:38:35 -0800 Subject: [PATCH 27/40] Updated routes for checkin and checkout to have the '-' --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 85f85feda..a9b43a85f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' - post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' + post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 928a1aa617e7ca8d2deb1fdee8f7f58525bd5d3c Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Tue, 6 Nov 2018 12:57:48 -0800 Subject: [PATCH 28/40] Updated the rentals controller to return json --- app/controllers/movies_controller.rb | 1 + app/controllers/rentals_controller.rb | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b479e97c1..80f6b7956 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,6 +20,7 @@ def show def create movie = Movie.new(movie_params) + if movie.save render json: { id: movie.id }, status: :ok else diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e07b2d4c6..94a95d69c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,9 +8,16 @@ def check_out rental = Rental.new(rental_params) rental.due_date = Date.today + 7 rental.checkout_date = Date.today - rental.save - @movie.check_out_movie - render json: { id: rental.id }, status: :ok + if rental.save + @movie.check_out_movie + render json: { id: rental.id }, status: :ok + else + render json: { errors: { + title: ["ERROR: #{@movie.title} was not checked_out"] + } + }, + status: :bad_request + end else render json: { errors: { title: ["Movie #{@movie.title} not available"] @@ -34,7 +41,12 @@ def check_in @rental.checkin_date = Date.today @rental.save @rental.movie.check_in_movie + render json: { message: "#{@rental.movie.title} checked in", + id: @rental.id + }, + status: :ok end + end From 4dcf11f690fea806ccfe10b6a5f180fd01a515e0 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Tue, 6 Nov 2018 12:57:57 -0800 Subject: [PATCH 29/40] updated rental controller tests --- test/controllers/rentals_controller_test.rb | 46 ++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f201a4d83..565bec080 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -12,21 +12,48 @@ } describe "check_out" do - it 'can create a new instance of rental' do + it 'can create a new instance of rental given valid data' do starting_inventory = harry.available_inventory expect { post check_out_path(mock_hash) }.must_change 'Rental.count', 1 harry.reload expect(harry.available_inventory).must_equal starting_inventory - 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.movie_id).must_equal mock_hash[:movie_id] must_respond_with :success end + it "returns an error for invalid rental data" do + # arrange + mock_hash[:customer_id] = nil + + expect { + post check_out_path(mock_hash) + }.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 + it 'wont create a new instance of rental if theres not enough inventory' do harry.available_inventory = 0 harry.save post check_out_path(mock_hash) + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + + expect(body).must_include "errors" must_respond_with :bad_request end end @@ -37,6 +64,7 @@ expect{ post check_in_path(mock_hash) }.wont_change 'Rental.count' + expect(Rental.all.last.checkin_date).must_equal Date.today must_respond_with :success end @@ -46,5 +74,21 @@ post check_in_path(mock_hash) #try checking in again must_respond_with :bad_request end + + # it "returns an error for checking in an invalid rental" do + # mock_hash[:customer_id] = nil + # + # expect { + # post check_out_path(mock_hash) + # }.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 fb2d76547a0a1bfd31fa08faa0a4a2141a28dea2 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Tue, 6 Nov 2018 13:10:19 -0800 Subject: [PATCH 30/40] added check_in/checkout method to customer class --- app/controllers/rentals_controller.rb | 2 ++ app/models/customer.rb | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 94a95d69c..6029e9343 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -10,6 +10,7 @@ def check_out rental.checkout_date = Date.today if rental.save @movie.check_out_movie + @customer.check_out_movie render json: { id: rental.id }, status: :ok else render json: { errors: { @@ -41,6 +42,7 @@ def check_in @rental.checkin_date = Date.today @rental.save @rental.movie.check_in_movie + @rental.customer.check_in_movie render json: { message: "#{@rental.movie.title} checked in", id: @rental.id }, diff --git a/app/models/customer.rb b/app/models/customer.rb index d6ff5ac29..b4a461b54 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,30 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals + + before_create :set_movies_checked_out_count_default + + + def check_out_movie + if self.movies_checked_out_count == nil + self.movies_checked_out_count = 1 + self.save + else + self.movies_checked_out_count += 1 + self.save + end + end + + def check_in_movie + self.movies_checked_out_count -= 1 + self.save + end + + + private + + def set_movies_checked_out_count_default + self.movies_checked_out_count = 0 + end + end From d4da576c024ad5fae8cf0b28618934953288f4d7 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Tue, 6 Nov 2018 14:15:09 -0800 Subject: [PATCH 31/40] upated customer model and tests for custom methods --- app/models/customer.rb | 15 --------------- ...43_add_default_to_customer_movies_count.rb | 5 +++++ db/schema.rb | 4 ++-- test/fixtures/customers.yml | 2 ++ test/models/customer_test.rb | 19 ++++++++++++++++++- 5 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 db/migrate/20181106211043_add_default_to_customer_movies_count.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index b4a461b54..e9904976f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,17 +3,9 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - before_create :set_movies_checked_out_count_default - - def check_out_movie - if self.movies_checked_out_count == nil - self.movies_checked_out_count = 1 - self.save - else self.movies_checked_out_count += 1 self.save - end end def check_in_movie @@ -21,11 +13,4 @@ def check_in_movie self.save end - - private - - def set_movies_checked_out_count_default - self.movies_checked_out_count = 0 - end - end diff --git a/db/migrate/20181106211043_add_default_to_customer_movies_count.rb b/db/migrate/20181106211043_add_default_to_customer_movies_count.rb new file mode 100644 index 000000000..4753886a5 --- /dev/null +++ b/db/migrate/20181106211043_add_default_to_customer_movies_count.rb @@ -0,0 +1,5 @@ +class AddDefaultToCustomerMoviesCount < ActiveRecord::Migration[5.2] + def change + change_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 4be49c580..38117c027 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: 2018_11_06_035639) do +ActiveRecord::Schema.define(version: 2018_11_06_211043) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,7 +24,7 @@ t.string "phone" t.datetime "registered_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/test/fixtures/customers.yml b/test/fixtures/customers.yml index c1f2ac699..f609e649f 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ Amanda: postal_code: 12345 phone: 914-908-9090 registered_at: 2018-01-05 + movies_checked_out_count: 3 Dani: name: Dani @@ -17,3 +18,4 @@ Dani: postal_code: 98765 phone: 134-212-2312 registered_at: 2018-01-05 + movies_checked_out_count: 0 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7e23a802d..3f1328f90 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -31,11 +31,28 @@ it "can have no movies" do amanda.rentals.destroy_all - + amanda.must_respond_to :movies expect(amanda.movies).must_equal [] end end + + describe 'custom methods' do + it 'adds a count to a custome movies_checked_out_count when a movie is checked out' do + starting_count = amanda.movies_checked_out_count + amanda.check_out_movie + amanda.reload + expect(amanda.movies_checked_out_count).must_equal starting_count + 1 + end + + it 'removes a count from a customer movies_checked_out_count when a movie is checked in' do + starting_count = amanda.movies_checked_out_count + amanda.check_in_movie + amanda.reload + expect(amanda.movies_checked_out_count).must_equal starting_count - 1 + end + + end end From ee85167bca6c869b1dba0f9628e0947547eb51a8 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Wed, 7 Nov 2018 09:15:35 -0800 Subject: [PATCH 32/40] updated movie tests --- test/models/movie_test.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 04d3179c8..105ab94ea 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -113,4 +113,26 @@ end end + + describe "custom methods" do + it "knows when it is available" do + expect(harry.available?).must_equal true + harry.available_inventory.times do + harry.check_out_movie + end + expect(harry.available?).must_equal false + end + + it "can decrease its available inventory when it's checked out" do + starting_inventory = harry.available_inventory + harry.check_out_movie + expect(harry.available_inventory).must_equal starting_inventory - 1 + end + + it "can increases its available inventory when it's checked in" do + starting_inventory = harry.available_inventory + harry.check_in_movie + expect(harry.available_inventory).must_equal starting_inventory + 1 + end + end end From 87e28deb5f65ef426b3311ce403fb3e54e338210 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Wed, 7 Nov 2018 11:01:12 -0800 Subject: [PATCH 33/40] replaced columns in movies and customers with custom methods --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 4 +-- app/controllers/rentals_controller.rb | 4 --- app/models/customer.rb | 10 ++---- app/models/movie.rb | 33 +++++++++---------- ...181107181358_remove_column_movies_count.rb | 5 +++ ..._remove_available_inventory_from_movies.rb | 5 +++ db/schema.rb | 4 +-- test/controllers/rentals_controller_test.rb | 6 ++-- test/fixtures/customers.yml | 3 +- test/fixtures/movies.yml | 13 +++++--- test/models/customer_test.rb | 14 +------- test/models/movie_test.rb | 20 +---------- 13 files changed, 48 insertions(+), 75 deletions(-) create mode 100644 db/migrate/20181107181358_remove_column_movies_count.rb create mode 100644 db/migrate/20181107183524_remove_available_inventory_from_movies.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 504e8cf3c..04eef9751 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :registered_at, :movies_checked_out_count]) + render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :registered_at], methods: :movies_checked_out_count) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 80f6b7956..68bad7c6b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,14 +13,14 @@ def show }, status: :not_found else - render json: @movie.as_json(except: [:created_at, :updated_at]) + render json: @movie.as_json(methods: :available_inventory, except: [:created_at, :updated_at]) end end def create movie = Movie.new(movie_params) - + if movie.save render json: { id: movie.id }, status: :ok else diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6029e9343..397c7c397 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,8 +9,6 @@ def check_out rental.due_date = Date.today + 7 rental.checkout_date = Date.today if rental.save - @movie.check_out_movie - @customer.check_out_movie render json: { id: rental.id }, status: :ok else render json: { errors: { @@ -41,8 +39,6 @@ def check_in else @rental.checkin_date = Date.today @rental.save - @rental.movie.check_in_movie - @rental.customer.check_in_movie render json: { message: "#{@rental.movie.title} checked in", id: @rental.id }, diff --git a/app/models/customer.rb b/app/models/customer.rb index e9904976f..8f6abb4d6 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,14 +3,8 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - def check_out_movie - self.movies_checked_out_count += 1 - self.save - end - - def check_in_movie - self.movies_checked_out_count -= 1 - self.save + def movies_checked_out_count + return self.rentals.where(checkin_date: nil).length end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 58613e861..a993d2c1d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,27 +7,26 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - before_create :set_available_inventory_default - - - def check_out_movie - self.available_inventory -= 1 - self.save - end - - def check_in_movie - self.available_inventory += 1 - self.save + def available_inventory + return (self.inventory) - (self.rentals.where(checkin_date: nil).length) end + # # + # # def check_out_movie + # # self.available_inventory -= 1 + # # self.save + # # end + # # + # # def check_in_movie + # # self.available_inventory += 1 + # # self.save + # # if self.available_inventory > self.inventory + # # render + # # end + # + # end def available? return self.available_inventory > 0 end - private - - def set_available_inventory_default - self.available_inventory = self.inventory - end - end diff --git a/db/migrate/20181107181358_remove_column_movies_count.rb b/db/migrate/20181107181358_remove_column_movies_count.rb new file mode 100644 index 000000000..d77e0239c --- /dev/null +++ b/db/migrate/20181107181358_remove_column_movies_count.rb @@ -0,0 +1,5 @@ +class RemoveColumnMoviesCount < ActiveRecord::Migration[5.2] + def change + remove_column :customers, :movies_checked_out_count + end +end diff --git a/db/migrate/20181107183524_remove_available_inventory_from_movies.rb b/db/migrate/20181107183524_remove_available_inventory_from_movies.rb new file mode 100644 index 000000000..1e3eb0431 --- /dev/null +++ b/db/migrate/20181107183524_remove_available_inventory_from_movies.rb @@ -0,0 +1,5 @@ +class RemoveAvailableInventoryFromMovies < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :available_inventory + end +end diff --git a/db/schema.rb b/db/schema.rb index 38117c027..6d23d89e5 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: 2018_11_06_211043) do +ActiveRecord::Schema.define(version: 2018_11_07_183524) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,7 +24,6 @@ t.string "phone" t.datetime "registered_at", null: false t.datetime "updated_at", null: false - t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,7 +33,6 @@ 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| diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 565bec080..9c81171f8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,9 +14,11 @@ describe "check_out" do it 'can create a new instance of rental given valid data' do starting_inventory = harry.available_inventory + binding.pry expect { post check_out_path(mock_hash) }.must_change 'Rental.count', 1 + harry.reload expect(harry.available_inventory).must_equal starting_inventory - 1 body = JSON.parse(response.body) @@ -46,8 +48,8 @@ end it 'wont create a new instance of rental if theres not enough inventory' do - harry.available_inventory = 0 - harry.save + movie = movies(:movie4) + mock_hash[:movie_id]= movie.id post check_out_path(mock_hash) body = JSON.parse(response.body) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index f609e649f..80fbedb0f 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,7 +8,7 @@ Amanda: postal_code: 12345 phone: 914-908-9090 registered_at: 2018-01-05 - movies_checked_out_count: 3 + Dani: name: Dani @@ -18,4 +18,3 @@ Dani: postal_code: 98765 phone: 134-212-2312 registered_at: 2018-01-05 - movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ca18b012c..94bed41e0 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,8 @@ movie1: title: Harry Potter & the Sorcerer Stone overview: MyString release_date: 2018-11-05 - inventory: 1 - available_inventory: 1 + inventory: 2 + @@ -14,11 +14,16 @@ movie2: overview: MyString release_date: 2018-12-05 inventory: 4 - available_inventory: 4 + movie3: title: Harry Potter and the Prisoner of Azkaban overview: MyString release_date: 2018-12-05 inventory: 2 - available_inventory: 0 + +movie4: + title: Harry Potter and the DH + overview: MyString + release_date: 2018-12-05 + inventory: 0 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3f1328f90..96a0eca7a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -40,19 +40,7 @@ end describe 'custom methods' do - it 'adds a count to a custome movies_checked_out_count when a movie is checked out' do - starting_count = amanda.movies_checked_out_count - amanda.check_out_movie - amanda.reload - expect(amanda.movies_checked_out_count).must_equal starting_count + 1 - end - - it 'removes a count from a customer movies_checked_out_count when a movie is checked in' do - starting_count = amanda.movies_checked_out_count - amanda.check_in_movie - amanda.reload - expect(amanda.movies_checked_out_count).must_equal starting_count - 1 - end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 105ab94ea..fc1fcdfc7 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -115,24 +115,6 @@ end describe "custom methods" do - it "knows when it is available" do - expect(harry.available?).must_equal true - harry.available_inventory.times do - harry.check_out_movie - end - expect(harry.available?).must_equal false - end - - it "can decrease its available inventory when it's checked out" do - starting_inventory = harry.available_inventory - harry.check_out_movie - expect(harry.available_inventory).must_equal starting_inventory - 1 - end - - it "can increases its available inventory when it's checked in" do - starting_inventory = harry.available_inventory - harry.check_in_movie - expect(harry.available_inventory).must_equal starting_inventory + 1 - end + end end From cba73c4d33db712b2b6cf8c8629b00e03de2a260 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Wed, 7 Nov 2018 12:56:03 -0800 Subject: [PATCH 34/40] added sorting function --- app/controllers/customers_controller.rb | 21 +++++++++++++++++++++ test/controllers/rentals_controller_test.rb | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 04eef9751..c22423c60 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,28 @@ class CustomersController < ApplicationController def index customers = Customer.all + if customer_params[:sort] + if ['name', 'registered_at', 'postal_code'].include?(customer_params[:sort]) + customers = customers.sort_by{ |customer| customer[customer_params[:sort]] } + render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :registered_at], methods: :movies_checked_out_count) + + else + render json: { errors: { + title: ["Customers cannot be sorted by #{customer_params[:sort]}"] + } + }, + status: :not_found + end + else + render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :registered_at], methods: :movies_checked_out_count) end +end + +private + +def customer_params + params.permit(:sort, :n, :p) +end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9c81171f8..9dcb717b5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,7 +14,6 @@ describe "check_out" do it 'can create a new instance of rental given valid data' do starting_inventory = harry.available_inventory - binding.pry expect { post check_out_path(mock_hash) }.must_change 'Rental.count', 1 From dddb191f894e88a966efb88f6934be758b76fc6d Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Wed, 7 Nov 2018 13:19:48 -0800 Subject: [PATCH 35/40] Added sorting tests for movies and customers --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 46 ++++++++++++------- test/controllers/customers_controller_test.rb | 24 ++++++++++ test/controllers/movies_controller_test.rb | 25 ++++++++++ 4 files changed, 80 insertions(+), 17 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c22423c60..df5a6558b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -11,7 +11,7 @@ def index title: ["Customers cannot be sorted by #{customer_params[:sort]}"] } }, - status: :not_found + status: :bad_request end else diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 68bad7c6b..6d264c024 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,21 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json( only: [:id, :title, :release_date]) + if movie_params[:sort] + if ['title', 'release_date'].include?(movie_params[:sort]) + movies = movies.sort_by{ |movie| movie[movie_params[:sort]] } + render json: movies.as_json( only: [:id, :title, :release_date]) + + else + render json: { errors: { + title: ["Movies cannot be sorted by #{movie_params[:sort]}"] + } + }, + status: :bad_request + end + else + render json: movies.as_json( only: [:id, :title, :release_date]) + end end def show @@ -11,24 +25,24 @@ def show title: ["Movie #{params[:id]} not found"] } }, - status: :not_found - else - render json: @movie.as_json(methods: :available_inventory, except: [:created_at, :updated_at]) + status: :not_found + else + render json: @movie.as_json(methods: :available_inventory, except: [:created_at, :updated_at]) - end end +end - def create - movie = Movie.new(movie_params) +def create + movie = Movie.new(movie_params) - if movie.save - render json: { id: movie.id }, status: :ok - else - render json: { - errors: { - title: ["Could not create '#{movie_params[:title]}' Movie"] - }, - message: movie.errors.messages + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { + errors: { + title: ["Could not create '#{movie_params[:title]}' Movie"] + }, + message: movie.errors.messages }, status: :bad_request end end @@ -36,7 +50,7 @@ def create private def movie_params - params.permit(:title, :overview, :inventory, :release_date) + params.permit(:title, :overview, :inventory, :release_date, :sort, :n, :p) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d0e3ec558..1e7185aa9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -50,5 +50,29 @@ end end + it 'will sort with valid parameter' do + valid_sort = %w(name registered_at postal_code) + + valid_sort.each do |sortby| + get customers_path, params: { sort: sortby } + body = JSON.parse(response.body) + new_list = Customer.all.sort_by{ |customer| customer[sortby] } + expect(body[0]["id"]).must_equal new_list[0].id + expect(body[-1]["id"]).must_equal new_list[-1].id + must_respond_with :success + end + + end + + it 'will not sort for invalid parameter' do + invalid_sort = %w(city dog nil) + + invalid_sort.each do |sortby| + get customers_path, params: { sort: sortby } + body = JSON.parse(response.body) + expect(body).must_include "errors" + must_respond_with :bad_request + end + end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 28eddced2..dfbcc44e6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -46,6 +46,31 @@ expect(movie.keys.length).must_equal keys.length end end + + it 'will sort with valid parameter' do + valid_sort = %w(title release_date) + + valid_sort.each do |sortby| + get movies_path, params: { sort: sortby } + body = JSON.parse(response.body) + new_list = Movie.all.sort_by{ |movie| movie[sortby] } + expect(body[0]["id"]).must_equal new_list[0].id + expect(body[-1]["id"]).must_equal new_list[-1].id + must_respond_with :success + end + + end + + it 'will not sort for invalid parameter' do + invalid_sort = %w(city dog nil) + + invalid_sort.each do |sortby| + get movies_path, params: { sort: sortby } + body = JSON.parse(response.body) + expect(body).must_include "errors" + must_respond_with :bad_request + end + end end describe "show" do From e0d2628fa2d74960494441cbd898764c551a4564 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Wed, 7 Nov 2018 14:40:56 -0800 Subject: [PATCH 36/40] updated sorting and checkin date to 0 --- app/controllers/rentals_controller.rb | 62 ++++++++++++++------- app/models/application_record.rb | 4 ++ app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- app/models/rental.rb | 8 +++ config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 30 +++++++++- test/fixtures/rentals.yml | 1 + 8 files changed, 86 insertions(+), 24 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 397c7c397..280a8a32e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,18 +11,17 @@ def check_out if rental.save render json: { id: rental.id }, status: :ok else - render json: { errors: { + render json: { errors: + { title: ["ERROR: #{@movie.title} was not checked_out"] - } - }, - status: :bad_request + } + }, status: :bad_request end else - render json: { errors: { - title: ["Movie #{@movie.title} not available"] - } - }, - status: :bad_request + render json: { errors: { + title: ["Movie #{@movie.title} not available"] + } + }, status: :bad_request end end @@ -31,29 +30,50 @@ def check_out def check_in if @rental.nil? - render json: { errors: { - title: ["Could not find rental"] - } - }, - status: :bad_request + render json: + { errors: + { + title: ["Could not find rental"] + } + }, + status: :bad_request else @rental.checkin_date = Date.today @rental.save - render json: { message: "#{@rental.movie.title} checked in", - id: @rental.id + render json: { + message: "#{@rental.movie.title} checked in", + id: @rental.id }, - status: :ok + status: :ok end - end + def overdue + rentals = Rental.where("checkin_date = ? AND due_date < ?", Date.new(0), Date.today) + if rental_params[:sort] + if ['title', 'name', 'checkout_date','due_date'].include?(rental_params[:sort]) + rentals = rentals.sort_by{ |rental| rental[rental_params[:sort]] } + render json: rentals.as_json( except: [:updated_at]) + + else + render json: { + errors: { + title: ["Overdue rentals cannot be sorted by #{rental_params[:sort]}"] + } + }, + status: :bad_request + end + else + render json: rentals.as_json( except: [:updated_at]) + end + end - private +private def rental_params - params.permit(:customer_id, :movie_id) + params.permit(:customer_id, :movie_id, :sort, :n, :p) end def find_movie @@ -65,7 +85,7 @@ def find_customer end def find_rental - @rental = Rental.find_by(customer_id: rental_params[:customer_id], movie_id: rental_params[:movie_id], checkin_date: nil) + @rental = Rental.find_by(customer_id: rental_params[:customer_id], movie_id: rental_params[:movie_id], checkin_date: Date.new(0)) end diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84..59053ef33 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,7 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + + # def sort(param) + # + # end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 8f6abb4d6..dcba015a9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,7 +4,7 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals def movies_checked_out_count - return self.rentals.where(checkin_date: nil).length + return self.rentals.where(checkin_date: Date.new(0)).length end end diff --git a/app/models/movie.rb b/app/models/movie.rb index a993d2c1d..d7a7f9ad7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,7 +8,7 @@ class Movie < ApplicationRecord validates :inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 } def available_inventory - return (self.inventory) - (self.rentals.where(checkin_date: nil).length) + return (self.inventory) - (self.rentals.where(checkin_date: Date.new(0)).length) end # # # # def check_out_movie diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..2ba90186d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,12 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + before_create :set_default_to_checkin_date + + private + + def set_default_to_checkin_date + self.checkin_date = Date.new(0) + end end diff --git a/config/routes.rb b/config/routes.rb index a9b43a85f..78d397ff2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,6 @@ post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' + get '/rentals/overdue', to: 'rentals#overdue', as: 'overdue' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9dcb717b5..207e3c3d4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,10 +14,11 @@ describe "check_out" do it 'can create a new instance of rental given valid data' do starting_inventory = harry.available_inventory + expect { post check_out_path(mock_hash) }.must_change 'Rental.count', 1 - + binding.pry harry.reload expect(harry.available_inventory).must_equal starting_inventory - 1 body = JSON.parse(response.body) @@ -92,4 +93,31 @@ # must_respond_with :bad_request # end end + + describe "Overdue" do + it 'will sort with valid parameter' do + valid_sort = %w(title name checkout_date due_date) + + valid_sort.each do |sortby| + get overdue_path, params: { sort: sortby } + body = JSON.parse(response.body) + new_list = Rental.all.sort_by{ |movie| movie[sortby] } + expect(body[0]["id"]).must_equal new_list[0].id + expect(body[-1]["id"]).must_equal new_list[-1].id + must_respond_with :success + end + + end + + it 'will not sort for invalid parameter' do + invalid_sort = %w(city dog nil) + + invalid_sort.each do |sortby| + get overdue_path, params: { sort: sortby } + body = JSON.parse(response.body) + expect(body).must_include "errors" + must_respond_with :bad_request + end + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 037214000..8b7c12de8 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,6 +5,7 @@ rent1: customer: Amanda movie: movie1 checkout_date: 2018-11-05 + checkin_date: Thu, 01 Jan 0000 rent2: due_date: 2018-11-05 From 6c04f20afc3810b8c2a1e8563a878f1cbdef6fb9 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Wed, 7 Nov 2018 14:47:26 -0800 Subject: [PATCH 37/40] added sorting for movies, overdue rentals and customers --- app/models/movie.rb | 14 -------------- test/controllers/rentals_controller_test.rb | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index d7a7f9ad7..c23482541 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,20 +10,6 @@ class Movie < ApplicationRecord def available_inventory return (self.inventory) - (self.rentals.where(checkin_date: Date.new(0)).length) end - # # - # # def check_out_movie - # # self.available_inventory -= 1 - # # self.save - # # end - # # - # # def check_in_movie - # # self.available_inventory += 1 - # # self.save - # # if self.available_inventory > self.inventory - # # render - # # end - # - # end def available? return self.available_inventory > 0 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 207e3c3d4..aef3fb95b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -18,7 +18,6 @@ expect { post check_out_path(mock_hash) }.must_change 'Rental.count', 1 - binding.pry harry.reload expect(harry.available_inventory).must_equal starting_inventory - 1 body = JSON.parse(response.body) @@ -101,7 +100,8 @@ valid_sort.each do |sortby| get overdue_path, params: { sort: sortby } body = JSON.parse(response.body) - new_list = Rental.all.sort_by{ |movie| movie[sortby] } + rentals = Rental.where("checkin_date = ? AND due_date < ?", Date.new(0), Date.today) + new_list = rentals.sort_by{ |rental| rental[sortby] } expect(body[0]["id"]).must_equal new_list[0].id expect(body[-1]["id"]).must_equal new_list[-1].id must_respond_with :success From a669c14e4e4c1ad71874bb5d1755f62416231946 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Thu, 8 Nov 2018 10:40:24 -0800 Subject: [PATCH 38/40] Refactored and added the sort method to the application controller and called the method in the rentals, movies and customer controllers --- app/controllers/application_controller.rb | 21 +++++++++++++++++++++ app/controllers/customers_controller.rb | 21 +++++---------------- app/controllers/movies_controller.rb | 20 +++++--------------- app/controllers/rentals_controller.rb | 20 ++++---------------- 4 files changed, 35 insertions(+), 47 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..694aad82c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,23 @@ class ApplicationController < ActionController::API + + def sort(list, params, sort_params, fields, method: nil) + # if :method + + if params + if sort_params.include?(params) + list = list.order(params) + render json: list.as_json( only: fields , methods: method) + + else + render json: { errors: { + title: ["#{list.first.class}s cannot be sorted by #{params}"] + } + }, + status: :bad_request + end + else + render json: list.as_json( only: fields, methods: method) + end + # else + end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index df5a6558b..b7896212e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,22 +1,11 @@ class CustomersController < ApplicationController + @@fields = [:id, :name, :register, :postal_code, :phone, :registered_at] + @@method = :movies_checked_out_count + @@sort_params = ['name', 'registered_at', 'postal_code'] + def index customers = Customer.all - if customer_params[:sort] - if ['name', 'registered_at', 'postal_code'].include?(customer_params[:sort]) - customers = customers.sort_by{ |customer| customer[customer_params[:sort]] } - render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :registered_at], methods: :movies_checked_out_count) - - else - render json: { errors: { - title: ["Customers cannot be sorted by #{customer_params[:sort]}"] - } - }, - status: :bad_request - end - else - - render json: customers.as_json( only: [:id, :name, :register, :postal_code, :phone, :registered_at], methods: :movies_checked_out_count) - end + sort(customers, customer_params[:sort], @@sort_params, @@fields, method: @@method) end private diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6d264c024..1917431c9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,21 +1,11 @@ class MoviesController < ApplicationController + @@fields = [:id, :title, :release_date] + @@method = :available_inventory + @@sort_params = ['title', 'release_date'] + def index movies = Movie.all - if movie_params[:sort] - if ['title', 'release_date'].include?(movie_params[:sort]) - movies = movies.sort_by{ |movie| movie[movie_params[:sort]] } - render json: movies.as_json( only: [:id, :title, :release_date]) - - else - render json: { errors: { - title: ["Movies cannot be sorted by #{movie_params[:sort]}"] - } - }, - status: :bad_request - end - else - render json: movies.as_json( only: [:id, :title, :release_date]) - end + sort(movies, movie_params[:sort], @@sort_params, @@fields) end def show diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 280a8a32e..8f867efc2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,6 +3,9 @@ class RentalsController < ApplicationController before_action :find_customer before_action :find_rental, only: [:check_in] + @@fields = [:id, :due_date, :checkout_date, :customer_id, :movie_id] + @@sort_params = ['title', 'name', 'checkout_date','due_date'] + def check_out if @movie.available? rental = Rental.new(rental_params) @@ -50,22 +53,7 @@ def check_in def overdue rentals = Rental.where("checkin_date = ? AND due_date < ?", Date.new(0), Date.today) - if rental_params[:sort] - if ['title', 'name', 'checkout_date','due_date'].include?(rental_params[:sort]) - rentals = rentals.sort_by{ |rental| rental[rental_params[:sort]] } - render json: rentals.as_json( except: [:updated_at]) - - else - render json: { - errors: { - title: ["Overdue rentals cannot be sorted by #{rental_params[:sort]}"] - } - }, - status: :bad_request - end - else - render json: rentals.as_json( except: [:updated_at]) - end + sort(rentals, rental_params[:sort], @@sort_params, @@fields) end From d2106b07df5df36294457c92caa79f6d9b21bb6e Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Fri, 9 Nov 2018 09:52:58 -0800 Subject: [PATCH 39/40] Added the title and name methods to the rentals so that the overdue could be sorted by movie titles and customer names --- app/controllers/rentals_controller.rb | 5 ++--- app/models/rental.rb | 10 +++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8f867efc2..d66a65780 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,6 +5,7 @@ class RentalsController < ApplicationController @@fields = [:id, :due_date, :checkout_date, :customer_id, :movie_id] @@sort_params = ['title', 'name', 'checkout_date','due_date'] + @@method = [:title, :name] def check_out if @movie.available? @@ -29,8 +30,6 @@ def check_out end - - def check_in if @rental.nil? render json: @@ -53,7 +52,7 @@ def check_in def overdue rentals = Rental.where("checkin_date = ? AND due_date < ?", Date.new(0), Date.today) - sort(rentals, rental_params[:sort], @@sort_params, @@fields) + sort(rentals, rental_params[:sort], @@sort_params, @@fields, method: @@method) end diff --git a/app/models/rental.rb b/app/models/rental.rb index 2ba90186d..90794887d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,7 +3,15 @@ class Rental < ApplicationRecord belongs_to :customer before_create :set_default_to_checkin_date - + + def title + return self.movie.title + end + + def name + return self.customer.name + end + private def set_default_to_checkin_date From eb68b400eb4d3a941b8f2e496eccdc00e7aa6852 Mon Sep 17 00:00:00 2001 From: Danielle Metzner Date: Fri, 9 Nov 2018 10:44:38 -0800 Subject: [PATCH 40/40] Added a .send(params) so we could order our JSON by movie title and customer name in the rentals --- app/controllers/application_controller.rb | 4 +++- app/models/rental.rb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 694aad82c..b3c045c29 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,8 +4,10 @@ def sort(list, params, sort_params, fields, method: nil) # if :method if params + if sort_params.include?(params) - list = list.order(params) + #list = list.order(params) + list = list.sort_by{ |unit| unit.send(params) } render json: list.as_json( only: fields , methods: method) else diff --git a/app/models/rental.rb b/app/models/rental.rb index 90794887d..3b50eda21 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,6 +4,7 @@ class Rental < ApplicationRecord before_create :set_default_to_checkin_date + def title return self.movie.title end