From 89bd6c4079b66c5b7d923d311f3e4db5efbb0682 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 13:44:38 -0700 Subject: [PATCH 01/54] added rails app --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 25 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 936 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87697ba34 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 2.0.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..775033609 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +cCZBSsGOVpJLG2pFzL8KBhnP9XK3EAoHWrros0EuZkn2nBDtLDa90Eb2RiIOUugGXOkI/wBEB5fRoaRIX6h+6QPpIH4arn3kDq+NkLJrkcosyEebpgqN4hOdS2CmW+vmF07v58mToz2adDFbPSf/2SgIi71NkWOAmBVtXyUeLvCqmE3TS5Q1usEPo4iV1XOJhtNesNw/ZKZOl+v0p9iaPx4Cq8hBW9bZGGupyk8tA8h4hgNvKS8/Tlne8amvgBMt7W31z583nYCmB0MXAU/8vwNE1J73e7Yiki4QVpdQk0FtS7o8OfwM0fFA8CU6Rc4BQiDrXKLUxjTvZfJVbsIphIWBrPuOjM0bKY6K7LbkuyC7ikoNL494JZrdpiWzZFN/oK0wxOhlj2eWSYTfUIBuO/Sw4MObjT4vAExM--bCX9+VNkTtD3ZtCa--9d87S0uZdnZWRYHXaWBeHg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..fb7dd505e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 3989bc59f22b85fcfa3002e643a4f9814b241bc5 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 14:13:49 -0700 Subject: [PATCH 02/54] added movies controller and movie model --- app/controllers/movies_controller.rb | 14 +++++++++++ app/models/movie.rb | 2 ++ db/migrate/20190514210802_create_movies.rb | 12 ++++++++++ db/schema.rb | 27 ++++++++++++++++++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++ test/models/movie_test.rb | 9 ++++++++ 7 files changed, 96 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20190514210802_create_movies.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..870f74036 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,14 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end + + def zomg + render json: {message: "it works!"} + end +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20190514210802_create_movies.rb b/db/migrate/20190514210802_create_movies.rb new file mode 100644 index 000000000..95d31e0f8 --- /dev/null +++ b/db/migrate/20190514210802_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.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..68156ec8d --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,27 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_210802) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /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: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 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 0dcc41bbaf7c52720c91ae9f5be3d4b4513122f6 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 14:14:57 -0700 Subject: [PATCH 03/54] routes for Movies controller --- config/routes.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..3670762af 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,10 @@ Rails.application.routes.draw do + resources :movies, only: [:index, :show, :create] + # get "movies/index" + # get "movies/show" + # get "movies/create" + + + get "movies/zomg" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From b16392845a70ff5c09e56f1ef50a3ff328923f34 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 14:25:13 -0700 Subject: [PATCH 04/54] added Customer to be able to use seeds --- app/controllers/customers_controller.rb | 2 ++ app/models/customer.rb | 2 ++ db/migrate/20190514212051_create_customers.rb | 15 +++++++++++++++ db/schema.rb | 14 +++++++++++++- test/controllers/customers_controller_test.rb | 7 +++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/models/customer_test.rb | 9 +++++++++ 7 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20190514212051_create_customers.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/db/migrate/20190514212051_create_customers.rb b/db/migrate/20190514212051_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514212051_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 68156ec8d..33c39aed8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,23 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_210802) do +ActiveRecord::Schema.define(version: 2019_05_14_212051) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..f2758568b --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 14:20:52 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 14:20:52 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString 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 From 211a03b5a024d85081419e02d4b486d0657d199b Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 14:30:59 -0700 Subject: [PATCH 05/54] added validations for movie --- app/models/movie.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..105b9e891 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, numericality: true end From 374b02e7ed2b8791cc488160f3d9e6946c3b94c2 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 14:37:07 -0700 Subject: [PATCH 06/54] added presence requirement for movie inventory --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 105b9e891..c70c4dbf5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,5 +2,5 @@ class Movie < ApplicationRecord validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, numericality: true + validates :inventory, presence: true, numericality: true end From abc7b019f15c1f6bedce9a4aea74f334966c3f9a Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 14:44:47 -0700 Subject: [PATCH 07/54] updated movies fixtures --- test/fixtures/movies.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..f9ce53238 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 + title: "It" + overview: "a creepy clown scares some kids" + release_date: "2017" + inventory: 5 two: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 + title: "Hot Fuzz" + overview: "a big time London police officer moves to a small town" + release_date: "2007" + inventory: 3 From e92e0009389e17eced5b7d9148c939c8b842ddcf Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 14:52:00 -0700 Subject: [PATCH 08/54] added tests for movie validations --- test/models/movie_test.rb | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..a989c10de 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,29 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:one) } - it "must be valid" do - value(movie).must_be :valid? + it "can be created" do + expect(movie.valid?).must_equal true + end + + it "requires title, overview, release_date, and inventory" do + required_fields = [:title, :overview, :release_date, :inventory] + + required_fields.each do |field| + movie[field] = nil + expect(movie.valid?).must_equal false + movie.reload + end + end + + it "accepts a numeric inventory value" do + movie.inventory = 2 + expect(movie.valid?).must_equal true + end + + it "does not accept a non-numeric inventory value" do + movie.inventory = "seven" + expect(movie.valid?).must_equal false end end From 4368f4ffcb51526946fcf8ba40558bed67560a59 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 15:24:44 -0700 Subject: [PATCH 09/54] created rental model --- app/models/rental.rb | 4 ++++ db/migrate/20190514221327_create_rentals.rb | 10 ++++++++++ .../20190514221547_add_check_in_and_out_columns.rb | 6 ++++++ db/schema.rb | 13 ++++++++++++- test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514221327_create_rentals.rb create mode 100644 db/migrate/20190514221547_add_check_in_and_out_columns.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..e001ff37c --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie +end diff --git a/db/migrate/20190514221327_create_rentals.rb b/db/migrate/20190514221327_create_rentals.rb new file mode 100644 index 000000000..bdb6e9b58 --- /dev/null +++ b/db/migrate/20190514221327_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.references :customer, foreign_key: true + t.references :movie, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20190514221547_add_check_in_and_out_columns.rb b/db/migrate/20190514221547_add_check_in_and_out_columns.rb new file mode 100644 index 000000000..aa14ba1e4 --- /dev/null +++ b/db/migrate/20190514221547_add_check_in_and_out_columns.rb @@ -0,0 +1,6 @@ +class AddCheckInAndOutColumns < ActiveRecord::Migration[5.2] + def change + add_column :check_out, :date, default: Date.today + add_column :return_date, :date, default: (Date.today + 7) + end +end diff --git a/db/schema.rb b/db/schema.rb index 33c39aed8..b148471c7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_212051) do +ActiveRecord::Schema.define(version: 2019_05_14_221327) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,15 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.bigint "customer_id" + t.bigint "movie_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + 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..4e78ae3bf --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + customer: one + movie: one + +two: + customer: two + movie: two 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 7eb6e25468fe7fbacd5de14eea0967ddd6e15fc0 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 15:28:15 -0700 Subject: [PATCH 10/54] added validations for customer --- app/models/customer.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..7e4baec43 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,9 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end From 4bd80d5bb3ad3eb7ce7f72c3a9d8b2c9262812fc Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 15:30:00 -0700 Subject: [PATCH 11/54] updated customer fixtures --- test/fixtures/customers.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index f2758568b..8fce513cd 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: "Bita" registered_at: 2019-05-14 14:20:52 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: "123 Street St" + city: "Seattle" + state: "WA" + postal_code: "98103" + phone: "206-555-5555" two: - name: MyString + name: "Alex" registered_at: 2019-05-14 14:20:52 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: "456 Street Lane" + city: "Seattle" + state: "WA" + postal_code: "98117" + phone: "415-555-5555" From b203f392bbc7def1f83590fe936d39f8bfb49cf6 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 15:34:32 -0700 Subject: [PATCH 12/54] added basic customer tests --- test/models/customer_test.rb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..147831a46 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,19 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:one) } - it "must be valid" do - value(customer).must_be :valid? + it "can be created" do + expect(customer.valid?).must_equal true + end + + it "requires name, registered_at, address, city, state, postal_code, phone" do + required_fields = [:name, :registered_at, :address, :city, :state, :postal_code, :phone] + + required_fields.each do |field| + customer[field] = nil + expect(customer.valid?).must_equal false + customer.reload + end end end From b20b62a928fdd62001ef4d862b5822b89345269b Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 15:44:41 -0700 Subject: [PATCH 13/54] deleted down migration file until we know how we want to set up rental model --- db/migrate/20190514221547_add_check_in_and_out_columns.rb | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 db/migrate/20190514221547_add_check_in_and_out_columns.rb diff --git a/db/migrate/20190514221547_add_check_in_and_out_columns.rb b/db/migrate/20190514221547_add_check_in_and_out_columns.rb deleted file mode 100644 index aa14ba1e4..000000000 --- a/db/migrate/20190514221547_add_check_in_and_out_columns.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddCheckInAndOutColumns < ActiveRecord::Migration[5.2] - def change - add_column :check_out, :date, default: Date.today - add_column :return_date, :date, default: (Date.today + 7) - end -end From c69105d62f947561da42ffc7b4f157dc048a978e Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 16:19:30 -0700 Subject: [PATCH 14/54] added initial test for rental --- app/models/movie.rb | 3 +++ test/models/movie_test.rb | 44 +++++++++++++++++++++++++++----------- test/models/rental_test.rb | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index c70c4dbf5..88c9fd66b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,7 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: true + + # has_many :rentals + # has_many :customers, through: :rentals end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a989c10de..9b439d73e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,28 +2,48 @@ describe Movie do let(:movie) { movies(:one) } + let(:customer) { customers(:one) } + let(:rental) { rentals(:one) } it "can be created" do expect(movie.valid?).must_equal true end - it "requires title, overview, release_date, and inventory" do - required_fields = [:title, :overview, :release_date, :inventory] + describe "validations" do + it "requires title, overview, release_date, and inventory" do + required_fields = [:title, :overview, :release_date, :inventory] - required_fields.each do |field| - movie[field] = nil + required_fields.each do |field| + movie[field] = nil + expect(movie.valid?).must_equal false + movie.reload + end + end + + it "accepts a numeric inventory value" do + movie.inventory = 2 + expect(movie.valid?).must_equal true + end + + it "does not accept a non-numeric inventory value" do + movie.inventory = "seven" expect(movie.valid?).must_equal false - movie.reload end end - it "accepts a numeric inventory value" do - movie.inventory = 2 - expect(movie.valid?).must_equal true - end + describe "relationships" do + # it "has many rentals" do + # rentals = Rental.where(movie_id: movie.id) + # rentals.must_respond_to :movie + # movie.must_respond_to :rentals + + # rentals.first.must_be_kind_of Rental + # end - it "does not accept a non-numeric inventory value" do - movie.inventory = "seven" - expect(movie.valid?).must_equal false + # it "has many products through order_items" do + # results = OrderItem.where(order_id: order.id) + # results.first.must_respond_to :product + # results.first.product.must_be_kind_of Product + # end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..de2006e9d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:one) } it "must be valid" do value(rental).must_be :valid? From af417bc432121ace736733d16a5a8006489926db Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 16:41:20 -0700 Subject: [PATCH 15/54] movies index action and tests --- app/controllers/movies_controller.rb | 3 ++ test/controllers/movies_controller_test.rb | 52 +++++++++++++++++----- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 870f74036..ab613a8f2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,8 @@ class MoviesController < ApplicationController def index + movies = Movie.all + + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..50c70a586 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,49 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end + describe "index" do + it "should get index" do + get movies_path + must_respond_with :success + end - it "should get show" do - get movies_show_url - value(response).must_be :success? - end + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end - it "should get create" do - get movies_create_url - value(response).must_be :success? + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + keys = %w(id release_date title) + + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end end + # it "should get show" do + # get movies_show_url + # value(response).must_be :success? + # end + + # it "should get create" do + # get movies_create_url + # value(response).must_be :success? + # end end From b3270e61967c56a9abb027e4ce669a8ac2c0c218 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 16:56:40 -0700 Subject: [PATCH 16/54] movies show action and tests --- app/controllers/movies_controller.rb | 8 +++++++- test/controllers/movies_controller_test.rb | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ab613a8f2..187356c85 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,11 +1,17 @@ class MoviesController < ApplicationController def index movies = Movie.all - + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + else + render json: {ok: false, error_message: "Movie not found."}, status: :not_found + end end def create diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 50c70a586..bba1aa147 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,6 +1,7 @@ require "test_helper" describe MoviesController do + let(:movie) { movies(:one) } describe "index" do it "should get index" do get movies_path @@ -36,11 +37,19 @@ end end end - # it "should get show" do - # get movies_show_url - # value(response).must_be :success? - # end + describe "show" do + it "should get show" do + get movie_path(movie.id) + must_respond_with :success + end + + it "returns 404:not_found for an invalid movie" do + get movie_path("invalid_id") + + must_respond_with :not_found + end + end # it "should get create" do # get movies_create_url # value(response).must_be :success? From 66ef0e2c2cb1fbacbf27f55e96d4d02b6181ca19 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Tue, 14 May 2019 17:16:02 -0700 Subject: [PATCH 17/54] added relationship to customer model --- app/models/customer.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 7e4baec43..cb0cd32a1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,6 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true + has_many :rentals + has_many :movies, through: :rentals end From a46c38d8e7c1151fd134d5c0518ac060367c51dc Mon Sep 17 00:00:00 2001 From: Bitaman Date: Tue, 14 May 2019 17:43:27 -0700 Subject: [PATCH 18/54] added the actions to the customer controller --- app/controllers/customers_controller.rb | 38 +++++++++++++++++++++++++ config/routes.rb | 1 + 2 files changed, 39 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..08f356199 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,40 @@ class CustomersController < ApplicationController + def index + customer = Customer.all + render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + end + + def show + @customer = Customer.find_by(id: params[:id]) + if @customer.nil? + render json: { errors: { + title: ["Customer #{params[:id]} not found"] + }}, + status: :not_found + else + render json: @customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + + end + end + + def create + customer = Customer.new(customer_params) + if customer.save + render json: { id: customer.id }, status: :ok + else + render json: { + errors: { + title: ["could not create '#{customer_params[:name]}' Customer"] + }, + message: customer.error.messages + }, status: :bad_request + end + end + + private + + def customer_params + params.permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + end + end diff --git a/config/routes.rb b/config/routes.rb index 3670762af..8a77f0e4b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ # get "movies/index" # get "movies/show" # get "movies/create" + resources :customer, only: [:index, :show, :create] get "movies/zomg" From 883d356dfa2602dfd36ce9a55e3e4f2420be7664 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Tue, 14 May 2019 18:38:56 -0700 Subject: [PATCH 19/54] added validation test to customer all model tests are passing --- app/controllers/customers_controller.rb | 4 ++-- config/routes.rb | 1 + test/models/customer_test.rb | 24 ++++++++++++++++++++++++ test/models/rental_test.rb | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 08f356199..05ed8fe50 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customer = Customer.all - render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + render json: customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok end def show @@ -32,7 +32,7 @@ def create end private - + def customer_params params.permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) end diff --git a/config/routes.rb b/config/routes.rb index 8a77f0e4b..3d7e53a55 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ # get "movies/show" # get "movies/create" resources :customer, only: [:index, :show, :create] + get "movies/zomg" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 147831a46..953ce57d5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -16,4 +16,28 @@ customer.reload end end + describe "validations" do + it "has many movies" do + customer.must_respond_to :movies + customer.movies.each do |movie| + movie.must_be_kind_of Movie + end + end + it "can have no movie" do + customer.rentals.destroy_all + customer.must_respond_to :movies + expect(customer.movies).must_equal [] + end + it "can have many rentals" do + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + it "can have no rental" do + customer.rentals.destroy_all + customer.must_respond_to :rentals + expect(customer.rentals).must_equal [] + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..de2006e9d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:one) } it "must be valid" do value(rental).must_be :valid? From 6e8d9d04563a7b343264037c3f0e557bc2f63d47 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Tue, 14 May 2019 18:45:12 -0700 Subject: [PATCH 20/54] changed the data required in render json for customer --- app/controllers/customers_controller.rb | 62 ++++++++++++------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 05ed8fe50..3d0203fbb 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,40 +1,38 @@ class CustomersController < ApplicationController - def index - customer = Customer.all - render json: customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok - end + def index + customer = Customer.all + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + end - def show - @customer = Customer.find_by(id: params[:id]) - if @customer.nil? - render json: { errors: { - title: ["Customer #{params[:id]} not found"] - }}, - status: :not_found - else - render json: @customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok - - end + def show + @customer = Customer.find_by(id: params[:id]) + if @customer.nil? + render json: { errors: { + title: ["Customer #{params[:id]} not found"], + } }, + status: :not_found + else + render json: @customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end + end - def create - customer = Customer.new(customer_params) - if customer.save - render json: { id: customer.id }, status: :ok - else - render json: { - errors: { - title: ["could not create '#{customer_params[:name]}' Customer"] - }, - message: customer.error.messages - }, status: :bad_request - end + def create + customer = Customer.new(customer_params) + if customer.save + render json: { id: customer.id }, status: :ok + else + render json: { + errors: { + title: ["could not create '#{customer_params[:name]}' Customer"], + }, + message: customer.error.messages, + }, status: :bad_request end - - private + end - def customer_params - params.permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) - end + private + def customer_params + params.permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + end end From 6d35b96ccadbb1284dd51f020826f6e02bee50b2 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 21:01:38 -0700 Subject: [PATCH 21/54] added tests for create action --- app/controllers/movies_controller.rb | 14 +++++++ test/controllers/movies_controller_test.rb | 45 ++++++++++++++++++++-- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 187356c85..f810fb6b3 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,9 +15,23 @@ def show end def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok + else + render json: { ok: false, errors: movie.errors.messages }, + status: :bad_request + end end def zomg render json: {message: "it works!"} end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index bba1aa147..3801cc2c9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -50,9 +50,46 @@ must_respond_with :not_found end end - # it "should get create" do - # get movies_create_url - # value(response).must_be :success? - # end + describe "create" do + let(:movie_data) { + { + title: "Titanic", + overview: "movie about a boat", + release_date: "1990s", + inventory: 3, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: {movie: movie_data} + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid pet data" do + + movie_data["title"] = nil + + expect { + post movies_path, params: {movie: movie_data} + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end From 6aaf0d7b70daba3d7c34fd19dbd1506cc0654e4e Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 21:04:49 -0700 Subject: [PATCH 22/54] strengthened test for show --- test/controllers/movies_controller_test.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3801cc2c9..b1cb4fd4f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -44,9 +44,14 @@ must_respond_with :success end - it "returns 404:not_found for an invalid movie" do + it "returns 404 and error message for an invalid movie" do get movie_path("invalid_id") + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "error_message" + must_respond_with :not_found end end @@ -77,7 +82,6 @@ end it "returns an error for invalid pet data" do - movie_data["title"] = nil expect { From 4aac60bba44376028b3ad6ccc2bb6f360e857c60 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 21:15:50 -0700 Subject: [PATCH 23/54] commented out test route and method --- app/controllers/movies_controller.rb | 6 +++--- config/routes.rb | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f810fb6b3..7dabc4998 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -25,9 +25,9 @@ def create end end - def zomg - render json: {message: "it works!"} - end + # def zomg + # render json: {message: "it works!"} + # end private diff --git a/config/routes.rb b/config/routes.rb index 3670762af..5952b7fd0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,7 @@ # get "movies/index" # get "movies/show" # get "movies/create" - - get "movies/zomg" + # get "movies/zomg" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 427c9c847b793f41c8cd0d631b7f1872b742899a Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 21:28:42 -0700 Subject: [PATCH 24/54] added relationships between models --- app/models/customer.rb | 17 ++++++++++------- app/models/movie.rb | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 7e4baec43..1bde3c0af 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,12 @@ class Customer < ApplicationRecord - validates :name, presence: true - validates :registered_at, presence: true - validates :address, presence: true - validates :city, presence: true - validates :state, presence: true - validates :postal_code, presence: true - validates :phone, presence: true + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + + has_many :rentals + has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 88c9fd66b..3fd4e5bd9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,6 +4,6 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true, numericality: true - # has_many :rentals - # has_many :customers, through: :rentals + has_many :rentals + has_many :customers, through: :rentals end From dbb67aace753e19de05df238f4c2317b9789637a Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Tue, 14 May 2019 21:39:58 -0700 Subject: [PATCH 25/54] added initial rental model test --- test/models/movie_test.rb | 22 +++++++++------------- test/models/rental_test.rb | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9b439d73e..687abee77 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -32,18 +32,14 @@ end describe "relationships" do - # it "has many rentals" do - # rentals = Rental.where(movie_id: movie.id) - # rentals.must_respond_to :movie - # movie.must_respond_to :rentals - - # rentals.first.must_be_kind_of Rental - # end - - # it "has many products through order_items" do - # results = OrderItem.where(order_id: order.id) - # results.first.must_respond_to :product - # results.first.product.must_be_kind_of Product - # end + it "has associated rentals" do + expect(movie).must_respond_to :rentals + expect(movie.rentals).must_include rental + end + + it "has associated customers through rentals" do + expect(movie).must_respond_to :customers + expect(movie.customers).must_include customer + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index de2006e9d..82fb71bd3 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -4,6 +4,6 @@ let(:rental) { rentals(:one) } it "must be valid" do - value(rental).must_be :valid? + expect(rental.valid?).must_equal true end end From be45d2ad3b41d0784ed8db0d2ed45ba75bf8b640 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 09:53:18 -0700 Subject: [PATCH 26/54] changed JSON return values for index --- app/controllers/movies_controller.rb | 4 ++-- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7dabc4998..a3898ae3c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + render json: movies.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok end def show @@ -20,7 +20,7 @@ def create if movie.save render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok else - render json: { ok: false, errors: movie.errors.messages }, + render json: {ok: false, errors: movie.errors.messages}, status: :bad_request end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b1cb4fd4f..b6c6f91a1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,7 +28,7 @@ end it "returns movies with exactly the required fields" do - keys = %w(id release_date title) + keys = %w(id inventory overview release_date title) get movies_path body = JSON.parse(response.body) From 63a2e3a01fa28a51ed8c7f7c27481787cf3bfbc1 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 09:59:20 -0700 Subject: [PATCH 27/54] changed back json returns for index --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a3898ae3c..813c5386e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b6c6f91a1..b1cb4fd4f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,7 +28,7 @@ end it "returns movies with exactly the required fields" do - keys = %w(id inventory overview release_date title) + keys = %w(id release_date title) get movies_path body = JSON.parse(response.body) From 9da7e953975a3c6d54f97dd018610768d31693e2 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 10:05:14 -0700 Subject: [PATCH 28/54] added json test for each action --- test/controllers/movies_controller_test.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b1cb4fd4f..ff380e330 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -39,6 +39,11 @@ end describe "show" do + it "returns json" do + get movie_path(movie.id) + expect(response.header["Content-Type"]).must_include "json" + end + it "should get show" do get movie_path(movie.id) must_respond_with :success @@ -65,7 +70,11 @@ inventory: 3, } } - + it "returns json" do + post movies_path, params: {movie: movie_data} + expect(response.header["Content-Type"]).must_include "json" + end + it "creates a new movie given valid data" do expect { post movies_path, params: {movie: movie_data} From 6d899c7f7a00ea6f23e324db5f7ae96e886da6b7 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 10:14:01 -0700 Subject: [PATCH 29/54] movies controller tests passing and complete --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ff380e330..f64a84ee6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -74,7 +74,7 @@ post movies_path, params: {movie: movie_data} expect(response.header["Content-Type"]).must_include "json" end - + it "creates a new movie given valid data" do expect { post movies_path, params: {movie: movie_data} From d9a8dc975e9681b392b12ac7e5081e3dfd7447ee Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 11:11:40 -0700 Subject: [PATCH 30/54] fixed movie params --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 813c5386e..7aaa41490 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -32,6 +32,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f64a84ee6..d6bb7a026 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -71,13 +71,13 @@ } } it "returns json" do - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data expect(response.header["Content-Type"]).must_include "json" end it "creates a new movie given valid data" do expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) @@ -94,7 +94,7 @@ movie_data["title"] = nil expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.wont_change "Movie.count" body = JSON.parse(response.body) From 6dce3f966ec701b460840472c2e821c427243799 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Wed, 15 May 2019 11:57:51 -0700 Subject: [PATCH 31/54] added relationship tests for rental, all passing --- test/models/rental_test.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index de2006e9d..81664dad6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,4 +6,25 @@ it "must be valid" do value(rental).must_be :valid? end + describe "relations" do + it "can have a customer" do + rental.customer.must_equal customers(:one) + end + it "can set a customer" do + customer = customers(:one) + rental = Rental.new(customer_id: customer.id, movie_id: 3 ) + + rental.customer.id.must_equal customer.id + end + it "can have a movie" do + rental.movie.must_equal movies(:one) + end + it "can set a movie" do + movie = movies(:one) + rental = Rental.new(customer_id: 5, movie_id: movie.id ) + + rental.movie.id.must_equal movie.id + end + + end end From eabe72c03838c8fd33baf67ef405d43a769f2993 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 12:54:55 -0700 Subject: [PATCH 32/54] added available_inventory model method --- app/models/movie.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index c70c4dbf5..f50ffc898 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,8 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: true + + def available_inventory + return self.inventory + end end From 9715a7ffea7608ea644cad7aa5a6f582a0c67037 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 13:05:36 -0700 Subject: [PATCH 33/54] added available_inventory method and added it to show method --- app/controllers/movies_controller.rb | 2 +- test/models/movie_test.rb | 30 +++++++++++++++------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7aaa41490..ecef35b26 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory], methods: [:available_inventory]), status: :ok else render json: {ok: false, error_message: "Movie not found."}, status: :not_found end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a989c10de..a134ac7a9 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -7,23 +7,25 @@ expect(movie.valid?).must_equal true end - it "requires title, overview, release_date, and inventory" do - required_fields = [:title, :overview, :release_date, :inventory] + describe "validations" do + it "requires title, overview, release_date, and inventory" do + required_fields = [:title, :overview, :release_date, :inventory] - required_fields.each do |field| - movie[field] = nil - expect(movie.valid?).must_equal false - movie.reload + required_fields.each do |field| + movie[field] = nil + expect(movie.valid?).must_equal false + movie.reload + end end - end - it "accepts a numeric inventory value" do - movie.inventory = 2 - expect(movie.valid?).must_equal true - end + it "accepts a numeric inventory value" do + movie.inventory = 2 + expect(movie.valid?).must_equal true + end - it "does not accept a non-numeric inventory value" do - movie.inventory = "seven" - expect(movie.valid?).must_equal false + it "does not accept a non-numeric inventory value" do + movie.inventory = "seven" + expect(movie.valid?).must_equal false + end end end From 87f3dff06ed0c19c198cbbe815dbbb3615ef9163 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 13:18:18 -0700 Subject: [PATCH 34/54] added tests for custom method available_inventory --- test/models/movie_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a134ac7a9..0e5185ae0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -28,4 +28,20 @@ expect(movie.valid?).must_equal false end end + + describe "custom methods" do + it "returns the same value as inventory" do + expect(movie.available_inventory).must_equal movie.inventory + end + + it "must return an integer" do + expect(movie.available_inventory).must_be_kind_of Integer + expect(movie.available_inventory).must_equal 5 + end + + it "can be zero" do + movie.inventory = 0 + expect(movie.available_inventory).must_equal 0 + end + end end From 3b99b0290e260a0e936914285be13ed0ea2370d6 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Wed, 15 May 2019 13:30:26 -0700 Subject: [PATCH 35/54] tests for customer controller passing --- app/controllers/customers_controller.rb | 15 +---- config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 56 ++++++++++++++++++- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3d0203fbb..aff482179 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -16,23 +16,10 @@ def show end end - def create - customer = Customer.new(customer_params) - if customer.save - render json: { id: customer.id }, status: :ok - else - render json: { - errors: { - title: ["could not create '#{customer_params[:name]}' Customer"], - }, - message: customer.error.messages, - }, status: :bad_request - end - end private def customer_params - params.permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.permit(:id, :name, :registered_at, :postal_code, :phone) end end diff --git a/config/routes.rb b/config/routes.rb index 9d33a2806..6045e0f82 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ # get "movies/index" # get "movies/show" # get "movies/create" - resources :customer, only: [:index, :show, :create] + resources :customers, only: [:index, :show, :create] # get "movies/zomg" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..6b5ee92f0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,57 @@ require "test_helper" +require "pry" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "get customer endpoint (index)" do + it "is a real working route and returns JSON" do + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + end + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + + expect(body.length).must_equal Customer.count + end + it "returns pets with exactly the required fields" do + keys = %w(id name phone postal_code registered_at) + + get customers_path + + body = JSON.parse(response.body) + + body.each do |customer| + expect(customer.keys.sort).must_equal keys + expect(customer.keys.length).must_equal keys.length + end + end + + end + describe "show" do + it "can get a customer" do + get customer_path(customers(:one).id) + must_respond_with :success + end + + it "responds with a 404 message if no pet is found" do + id = -1 + get customer_path(id) + must_respond_with :not_found + end + end + + + + + end From d12dfe5f0386becf3a7bf67c241f078c22da17dd Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 13:34:46 -0700 Subject: [PATCH 36/54] fixed test names --- test/models/customer_test.rb | 2 +- test/models/movie_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 953ce57d5..d659259b3 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -16,7 +16,7 @@ customer.reload end end - describe "validations" do + describe "relations" do it "has many movies" do customer.must_respond_to :movies customer.movies.each do |movie| diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 98adf531c..e599c75ad 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -31,7 +31,7 @@ end end - describe "relationships" do + describe "relations" do it "has associated rentals" do expect(movie).must_respond_to :rentals expect(movie.rentals).must_include rental From d7c99e65130f4d1142c9dcde6337378d663cac26 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Wed, 15 May 2019 13:35:58 -0700 Subject: [PATCH 37/54] minor change in customer test --- test/models/customer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 953ce57d5..d497abecc 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -16,7 +16,7 @@ customer.reload end end - describe "validations" do + describe "relaitions" do it "has many movies" do customer.must_respond_to :movies customer.movies.each do |movie| From b8e89b0d62ef1020a23bb1a82fdd98a1f039c73e Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Wed, 15 May 2019 13:41:34 -0700 Subject: [PATCH 38/54] edited models to have less validations --- app/models/customer.rb | 7 +------ app/models/movie.rb | 2 -- test/models/customer_test.rb | 13 +++++-------- test/models/movie_test.rb | 4 ++-- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 804270663..2e1ab6acc 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,11 +1,6 @@ class Customer < ApplicationRecord validates :name, presence: true - validates :registered_at, presence: true - validates :address, presence: true - validates :city, presence: true - validates :state, presence: true - validates :postal_code, presence: true - validates :phone, presence: true + has_many :rentals has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 39253bd32..ef3a4328e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,5 @@ class Movie < ApplicationRecord validates :title, presence: true - validates :overview, presence: true - validates :release_date, presence: true validates :inventory, presence: true, numericality: true has_many :rentals diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index d659259b3..bd1dc9280 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -7,15 +7,12 @@ expect(customer.valid?).must_equal true end - it "requires name, registered_at, address, city, state, postal_code, phone" do - required_fields = [:name, :registered_at, :address, :city, :state, :postal_code, :phone] - - required_fields.each do |field| - customer[field] = nil - expect(customer.valid?).must_equal false - customer.reload - end + it "requires name" do + customer[:name] = nil + expect(customer.valid?).must_equal false + customer.reload end + describe "relations" do it "has many movies" do customer.must_respond_to :movies diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e599c75ad..499c7da9b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -10,8 +10,8 @@ end describe "validations" do - it "requires title, overview, release_date, and inventory" do - required_fields = [:title, :overview, :release_date, :inventory] + it "requires title and inventory" do + required_fields = [:title, :inventory] required_fields.each do |field| movie[field] = nil From addde17a3465bbd5863d112035af5abfd182a6f9 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Wed, 15 May 2019 13:50:58 -0700 Subject: [PATCH 39/54] added the movies checked out method to customer model --- app/controllers/customers_controller.rb | 24 ++++++++++++------------ app/models/customer.rb | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index aff482179..914ca37af 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,20 +1,20 @@ class CustomersController < ApplicationController def index customer = Customer.all - render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone], methods: [:movies_checked_out_count]), status: :ok end - def show - @customer = Customer.find_by(id: params[:id]) - if @customer.nil? - render json: { errors: { - title: ["Customer #{params[:id]} not found"], - } }, - status: :not_found - else - render json: @customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok - end - end + # def show + # @customer = Customer.find_by(id: params[:id]) + # if @customer.nil? + # render json: { errors: { + # title: ["Customer #{params[:id]} not found"], + # } }, + # status: :not_found + # else + # render json: @customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + # end + # end private diff --git a/app/models/customer.rb b/app/models/customer.rb index 804270663..f01d13d88 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,4 +8,7 @@ class Customer < ApplicationRecord validates :phone, presence: true has_many :rentals has_many :movies, through: :rentals + def movies_checked_out_count + return 0 + end end From c619405a92e3c6ca5e571722e430e0481d027f3c Mon Sep 17 00:00:00 2001 From: Bitaman Date: Wed, 15 May 2019 13:57:58 -0700 Subject: [PATCH 40/54] fixed a test in customer --- test/controllers/customers_controller_test.rb | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 6b5ee92f0..c21f6613d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -23,8 +23,8 @@ expect(body.length).must_equal Customer.count end - it "returns pets with exactly the required fields" do - keys = %w(id name phone postal_code registered_at) + it "returns customers with exactly the required fields" do + keys = %w(id movies_checked_out_count name phone postal_code registered_at ) get customers_path @@ -37,18 +37,18 @@ end end - describe "show" do - it "can get a customer" do - get customer_path(customers(:one).id) - must_respond_with :success - end - - it "responds with a 404 message if no pet is found" do - id = -1 - get customer_path(id) - must_respond_with :not_found - end - end + # describe "show" do + # it "can get a customer" do + # get customer_path(customers(:one).id) + # must_respond_with :success + # end + + # it "responds with a 404 message if no pet is found" do + # id = -1 + # get customer_path(id) + # must_respond_with :not_found + # end + # end From a3b7bf2e6e9dcfd006bd44dbec2fe5d2a66fb8db Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 09:27:35 -0700 Subject: [PATCH 41/54] added columns to movie and customer for keeping track of check out numbers --- ...190516162256_add_available_inventory_column_to_movies.rb | 5 +++++ ...2507_add_movies_checked_out_count_column_in_customers.rb | 5 +++++ db/schema.rb | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190516162256_add_available_inventory_column_to_movies.rb create mode 100644 db/migrate/20190516162507_add_movies_checked_out_count_column_in_customers.rb diff --git a/db/migrate/20190516162256_add_available_inventory_column_to_movies.rb b/db/migrate/20190516162256_add_available_inventory_column_to_movies.rb new file mode 100644 index 000000000..94aea418f --- /dev/null +++ b/db/migrate/20190516162256_add_available_inventory_column_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryColumnToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/migrate/20190516162507_add_movies_checked_out_count_column_in_customers.rb b/db/migrate/20190516162507_add_movies_checked_out_count_column_in_customers.rb new file mode 100644 index 000000000..46423affa --- /dev/null +++ b/db/migrate/20190516162507_add_movies_checked_out_count_column_in_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountColumnInCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index b148471c7..231ad0c24 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_221327) do +ActiveRecord::Schema.define(version: 2019_05_16_162507) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", 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,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| @@ -41,6 +43,8 @@ t.bigint "movie_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "check_out" + t.datetime "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 153fb3735a27ab327a46ce1d6f054ce55c92860c Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 09:38:06 -0700 Subject: [PATCH 42/54] updated movie model and tests to reflect available_inventory --- app/controllers/customers_controller.rb | 3 +-- app/controllers/movies_controller.rb | 2 +- app/models/movie.rb | 5 +++-- test/fixtures/movies.yml | 3 +++ test/models/movie_test.rb | 15 +++++++-------- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 914ca37af..402d38ebe 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customer = Customer.all - render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone], methods: [:movies_checked_out_count]), status: :ok + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end # def show @@ -16,7 +16,6 @@ def index # end # end - private def customer_params diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ecef35b26..95e7996e4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory], methods: [:available_inventory]), status: :ok + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else render json: {ok: false, error_message: "Movie not found."}, status: :not_found end diff --git a/app/models/movie.rb b/app/models/movie.rb index ef3a4328e..3e08f021f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,11 +1,12 @@ class Movie < ApplicationRecord + before_create :set_available_inventory validates :title, presence: true validates :inventory, presence: true, numericality: true has_many :rentals has_many :customers, through: :rentals - def available_inventory - return self.inventory + def set_available_inventory + self.available_inventory = self.inventory end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f9ce53238..f2b03a90c 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,12 @@ one: overview: "a creepy clown scares some kids" release_date: "2017" inventory: 5 + available_inventory: 5 two: title: "Hot Fuzz" overview: "a big time London police officer moves to a small town" release_date: "2007" inventory: 3 + available_inventory: 3 + diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 499c7da9b..0c8740318 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,18 +44,17 @@ end describe "custom methods" do - it "returns the same value as inventory" do - expect(movie.available_inventory).must_equal movie.inventory + before do + @new_movie = Movie.create(title: "Cool Movie", inventory: 5) end - it "must return an integer" do - expect(movie.available_inventory).must_be_kind_of Integer - expect(movie.available_inventory).must_equal 5 + it "returns the same value as inventory" do + expect(@new_movie.available_inventory).must_equal movie.inventory end - it "can be zero" do - movie.inventory = 0 - expect(movie.available_inventory).must_equal 0 + it "must return an integer" do + expect(@new_movie.available_inventory).must_be_kind_of Integer + expect(@new_movie.available_inventory).must_equal 5 end end end From 095989bf2e121e8628ba23ecefb5e43a711cef03 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 09:39:35 -0700 Subject: [PATCH 43/54] removed movies_checked_out_count method from customer model --- app/models/customer.rb | 5 +---- test/fixtures/customers.yml | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 5517c2d39..0d410c766 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,6 @@ class Customer < ApplicationRecord validates :name, presence: true - + has_many :rentals has_many :movies, through: :rentals - def movies_checked_out_count - return 0 - end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 8fce513cd..014b5e06b 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ one: state: "WA" postal_code: "98103" phone: "206-555-5555" + movies_checked_out_count: 0 two: name: "Alex" @@ -17,3 +18,4 @@ two: state: "WA" postal_code: "98117" phone: "415-555-5555" + movies_checked_out_count: 0 From f3f312c946f64da2352ddc95dc21aed7bdf928c9 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 09:41:31 -0700 Subject: [PATCH 44/54] created rentals controller and added routes --- app/controllers/rentals_controller.rb | 7 +++++++ config/routes.rb | 3 +++ test/controllers/rentals_controller_test.rb | 7 +++++++ 3 files changed, 17 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..40e85fdfc --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,7 @@ +class RentalsController < ApplicationController + def check_out + end + + def check_in + end +end diff --git a/config/routes.rb b/config/routes.rb index 6045e0f82..18156cb76 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,9 @@ # get "movies/create" resources :customers, only: [:index, :show, :create] + post "/rentals/check-out", to: "rentals#check_out", as: "check_out" + post "/rentals/check-in", to: "rentals#check_in", as: "check_in" + # get "movies/zomg" # 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 new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 7e980d89e4c631dfbf86de064ad353b6df178d79 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 12:34:36 -0700 Subject: [PATCH 45/54] fixed model method to set available inventory before movie creation --- app/models/movie.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index 3e08f021f..4ef1cbc4f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,6 @@ class Movie < ApplicationRecord before_create :set_available_inventory + validates :title, presence: true validates :inventory, presence: true, numericality: true From 0b9c50e44ad497537b1a416d6dc193064df8a032 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 12:58:07 -0700 Subject: [PATCH 46/54] wrote tests for checkout method --- app/controllers/rentals_controller.rb | 26 +++++++++++ test/controllers/rentals_controller_test.rb | 51 +++++++++++++++++++-- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 40e85fdfc..8942d353c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,33 @@ class RentalsController < ApplicationController def check_out + rental = Rental.new(rental_params) + + if rental.movie.available_inventory > 0 + + if rental.save + rental.movie.available_inventory -= 1 + rental.movie.save + + rental.customer.movies_checked_out_count += 1 + rental.customer.save + rental.check_out = rental.created_at + rental.due_date = rental.created_at + 7.days + render json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]), status: :ok + else + render json: {ok: false, errors: rental.errors.messages}, + status: :bad_request + end + else + render json: {ok: false, error_message: "No available inventory"}, status: :bad_request + end end def check_in end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..aa192a191 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,52 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:customer) { customers(:two) } + let(:movie) { movies(:one) } + describe "check-out" do + let(:rental_data) { + { + customer_id: customer.id, + movie_id: movie.id, + } + } + it "should create a new rental given correct information" do + movie_inventory = movie.available_inventory + customer_checked_out_count = customer.movies_checked_out_count + + expect { + post check_out_path, params: rental_data + }.must_change "Rental.count", 1 + + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + + expect(rental.movie.available_inventory).must_equal movie_inventory - 1 + expect(rental.customer.movies_checked_out_count).must_equal customer_checked_out_count + 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + json_rental = Rental.find(body["id"].to_i) + + expect(json_rental.customer_id).must_equal rental_data[:customer_id] + expect(json_rental.movie_id).must_equal rental_data[:movie_id] + must_respond_with :success + end + + it "should send an error message if given bad information" do + rental_data[:customer_id] = nil + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer" + must_respond_with :bad_request + end + end end From 783a81ce6ffd773821cb52c3a228876dc8c1b3a5 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 13:18:27 -0700 Subject: [PATCH 47/54] added another test case for checkout method --- test/controllers/rentals_controller_test.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index aa192a191..3d4637ea4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -34,7 +34,7 @@ must_respond_with :success end - it "should send an error message if given bad information" do + it "should send a 404 if given bad information" do rental_data[:customer_id] = nil expect { @@ -48,5 +48,21 @@ expect(body["errors"]).must_include "customer" must_respond_with :bad_request end + + it "will return an error if a movie has no available_inventory" do + movie.available_inventory = 0 + movie.save + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "error_message" + expect(body["error_message"]).must_include "No available inventory" + must_respond_with :bad_request + end end end From af2640db919839178237c336ded40dad42738754 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 13:48:53 -0700 Subject: [PATCH 48/54] wrote passing nominal test for check in method --- app/controllers/rentals_controller.rb | 23 +++++++- test/controllers/rentals_controller_test.rb | 61 +++++++++++++++++++-- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8942d353c..8a464f831 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,7 +3,6 @@ def check_out rental = Rental.new(rental_params) if rental.movie.available_inventory > 0 - if rental.save rental.movie.available_inventory -= 1 rental.movie.save @@ -23,6 +22,28 @@ def check_out end def check_in + rental = Rental.find_by(rental_params) + + if rental + if rental.save + rental.movie.available_inventory += 1 + rental.movie.save + + if rental.customer.movies_checked_out_count > 0 + rental.customer.movies_checked_out_count -= 1 + else + rental.customer.movies_checked_out_count = 0 + end + rental.customer.save + + render json: rental.as_json(only: [:id, :customer_id, :movie_id]), status: :ok + else + render json: {ok: false, errors: rental.errors.messages}, + status: :bad_request + end + else + render json: {ok: false, error_message: "Could not find rental"}, status: :not_found + end end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3d4637ea4..6c4212612 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,13 +3,13 @@ describe RentalsController do let(:customer) { customers(:two) } let(:movie) { movies(:one) } - describe "check-out" do - let(:rental_data) { - { - customer_id: customer.id, - movie_id: movie.id, - } + let(:rental_data) { + { + customer_id: customer.id, + movie_id: movie.id, } + } + describe "check-out" do it "should create a new rental given correct information" do movie_inventory = movie.available_inventory customer_checked_out_count = customer.movies_checked_out_count @@ -65,4 +65,53 @@ must_respond_with :bad_request end end + + describe "check-in" do + it "will find an existing rental and update inventory counts for a valid rental" do + post check_out_path, params: rental_data + + movie.reload + customer.reload + + check_out_inventory = movie.available_inventory + check_out_customer_movies = customer.movies_checked_out_count + + expect { + post check_in_path, params: rental_data + }.wont_change "Rental.count" + + rental = Rental.find_by(rental_data) + + expect(rental.movie.available_inventory).must_equal check_out_inventory + 1 + expect(rental.customer.movies_checked_out_count).must_equal check_out_customer_movies - 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + json_rental = Rental.find(body["id"].to_i) + + expect(json_rental.customer_id).must_equal rental_data[:customer_id] + expect(json_rental.movie_id).must_equal rental_data[:movie_id] + must_respond_with :success + end + + it "will respond with a bad_request if given bad rental info" do + # body = JSON.parse(response.body) + + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # expect(body["errors"]).must_include "" + # must_respond_with :bad_request + end + + it "will respond with a not_found if no rental is found" do + # body = JSON.parse(response.body) + + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # expect(body["errors"]).must_include "" + # must_respond_with :not_found + end + end end From a9487391ec05902fec11d472037a7d1181bc04cc Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Thu, 16 May 2019 20:48:43 -0700 Subject: [PATCH 49/54] fixed typo --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d6bb7a026..c3cacce53 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -90,7 +90,7 @@ must_respond_with :success end - it "returns an error for invalid pet data" do + it "returns an error for invalid movie data" do movie_data["title"] = nil expect { From 3cb864c35448ce6b782f9ae8a23590c2338705fc Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Fri, 17 May 2019 13:31:35 -0700 Subject: [PATCH 50/54] simplified check-in method and added negative case test --- app/controllers/rentals_controller.rb | 19 ++++---------- test/controllers/rentals_controller_test.rb | 28 +++++++++++---------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8a464f831..ad6e7ec81 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -25,22 +25,13 @@ def check_in rental = Rental.find_by(rental_params) if rental - if rental.save - rental.movie.available_inventory += 1 - rental.movie.save + rental.movie.available_inventory += 1 + rental.movie.save - if rental.customer.movies_checked_out_count > 0 - rental.customer.movies_checked_out_count -= 1 - else - rental.customer.movies_checked_out_count = 0 - end - rental.customer.save + rental.customer.movies_checked_out_count -= 1 + rental.customer.save - render json: rental.as_json(only: [:id, :customer_id, :movie_id]), status: :ok - else - render json: {ok: false, errors: rental.errors.messages}, - status: :bad_request - end + render json: rental.as_json(only: [:id, :customer_id, :movie_id]), status: :ok else render json: {ok: false, error_message: "Could not find rental"}, status: :not_found end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6c4212612..b48a70d0c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -96,22 +96,24 @@ must_respond_with :success end - it "will respond with a bad_request if given bad rental info" do - # body = JSON.parse(response.body) + it "will respond with not_found if given bad rental info" do + post check_out_path, params: rental_data - # expect(body).must_be_kind_of Hash - # expect(body).must_include "errors" - # expect(body["errors"]).must_include "" - # must_respond_with :bad_request - end + movie.reload + customer.reload - it "will respond with a not_found if no rental is found" do - # body = JSON.parse(response.body) + rental_data[:customer_id] = nil - # expect(body).must_be_kind_of Hash - # expect(body).must_include "errors" - # expect(body["errors"]).must_include "" - # must_respond_with :not_found + expect { + post check_in_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "error_message" + expect(body["error_message"]).must_include "Could not find rental" + must_respond_with :not_found end end end From 78aa691fca67422030f31858e0710b7cbdf39ea0 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Fri, 17 May 2019 13:48:23 -0700 Subject: [PATCH 51/54] added test to customer --- app/controllers/customers_controller.rb | 12 +----------- app/controllers/rentals_controller.rb | 1 + app/models/customer.rb | 2 +- test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 3 +++ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 402d38ebe..f9acc3a1d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,17 +4,7 @@ def index render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end - # def show - # @customer = Customer.find_by(id: params[:id]) - # if @customer.nil? - # render json: { errors: { - # title: ["Customer #{params[:id]} not found"], - # } }, - # status: :not_found - # else - # render json: @customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok - # end - # end + private diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8a464f831..f1a0de350 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,6 +11,7 @@ def check_out rental.customer.save rental.check_out = rental.created_at rental.due_date = rental.created_at + 7.days + #rental.save render json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]), status: :ok else render json: {ok: false, errors: rental.errors.messages}, diff --git a/app/models/customer.rb b/app/models/customer.rb index 0d410c766..6be07901b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord validates :name, presence: true - has_many :rentals + has_many :rentals, dependent: :destroy has_many :movies, through: :rentals end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c21f6613d..ea270155e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -9,6 +9,13 @@ expect(response.header['Content-Type']).must_include 'json' must_respond_with :success end + it "is a real working route and returns JSON if there are no customer" do + Customer.destroy_all + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end it "returns an Array" do get customers_path diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6c4212612..44da3b6ff 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -19,9 +19,12 @@ }.must_change "Rental.count", 1 rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + #binding.pry + #date = rental.check_out expect(rental.movie.available_inventory).must_equal movie_inventory - 1 expect(rental.customer.movies_checked_out_count).must_equal customer_checked_out_count + 1 + #expect(rental.due_date).must_equal date + 7.days body = JSON.parse(response.body) expect(body).must_be_kind_of Hash From 90e29a37e377cefff322c676b9fa3ce656a2a692 Mon Sep 17 00:00:00 2001 From: Alexandria McCarthy Date: Fri, 17 May 2019 13:50:20 -0700 Subject: [PATCH 52/54] edited movies controller index test to include negative case --- app/models/movie.rb | 2 +- test/controllers/movies_controller_test.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 4ef1cbc4f..5f12cf70c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,7 +4,7 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: true - has_many :rentals + has_many :rentals, dependent: :destroy has_many :customers, through: :rentals def set_available_inventory diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c3cacce53..fba44e782 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -8,6 +8,19 @@ must_respond_with :success end + it "should get index if there are no movies" do + movies = Movie.all + + movies.each do |movie| + movie.destroy + end + + get movies_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :success + end + it "returns json" do get movies_path expect(response.header["Content-Type"]).must_include "json" From df597a8fe368d7cad08726cdb27f1d8e2a0a9ec1 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Fri, 17 May 2019 14:00:05 -0700 Subject: [PATCH 53/54] added the self method to rental --- app/controllers/rentals_controller.rb | 5 +++-- app/models/rental.rb | 8 ++++++++ test/controllers/customers_controller_test.rb | 16 ---------------- test/controllers/rentals_controller_test.rb | 6 +++--- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index edbd5ae35..fd73d2e71 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,14 +3,15 @@ def check_out rental = Rental.new(rental_params) if rental.movie.available_inventory > 0 + # rental.check_out = rental.created_at + # rental.due_date = rental.created_at + 7.days if rental.save rental.movie.available_inventory -= 1 rental.movie.save rental.customer.movies_checked_out_count += 1 rental.customer.save - rental.check_out = rental.created_at - rental.due_date = rental.created_at + 7.days + #rental.save render json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]), status: :ok else diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..6f45ecf8b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,12 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie +before_create :set_rental_dates + +def set_rental_dates + self.check_out = Date.today + self.due_date = Date.today + 7.days +end + + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ea270155e..ff109eb58 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -44,21 +44,5 @@ end end - # describe "show" do - # it "can get a customer" do - # get customer_path(customers(:one).id) - # must_respond_with :success - # end - - # it "responds with a 404 message if no pet is found" do - # id = -1 - # get customer_path(id) - # must_respond_with :not_found - # end - # end - - - - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c61f0c92a..17cea0bd9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -19,12 +19,12 @@ }.must_change "Rental.count", 1 rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) - #binding.pry - #date = rental.check_out + binding.pry + date = rental.check_out expect(rental.movie.available_inventory).must_equal movie_inventory - 1 expect(rental.customer.movies_checked_out_count).must_equal customer_checked_out_count + 1 - #expect(rental.due_date).must_equal date + 7.days + expect(rental.due_date).must_equal date + 7.days body = JSON.parse(response.body) expect(body).must_be_kind_of Hash From add374b3ed88a5a5335f440f12e34667f36274c9 Mon Sep 17 00:00:00 2001 From: Bitaman Date: Fri, 17 May 2019 14:10:23 -0700 Subject: [PATCH 54/54] added the custom method test to rental --- app/controllers/rentals_controller.rb | 4 +--- test/controllers/rentals_controller_test.rb | 2 +- test/models/rental_test.rb | 13 +++++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fd73d2e71..c0307bc91 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,8 +3,6 @@ def check_out rental = Rental.new(rental_params) if rental.movie.available_inventory > 0 - # rental.check_out = rental.created_at - # rental.due_date = rental.created_at + 7.days if rental.save rental.movie.available_inventory -= 1 rental.movie.save @@ -12,7 +10,7 @@ def check_out rental.customer.movies_checked_out_count += 1 rental.customer.save - #rental.save + render json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]), status: :ok else render json: {ok: false, errors: rental.errors.messages}, diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 17cea0bd9..d4d4513c2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -19,7 +19,7 @@ }.must_change "Rental.count", 1 rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) - binding.pry + date = rental.check_out expect(rental.movie.available_inventory).must_equal movie_inventory - 1 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 35fe11830..7cfccafe5 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -25,6 +25,19 @@ rental.movie.id.must_equal movie.id end + describe "custom method" do + it "can set the checkout and due date" do + customer = customers(:one) + movie = movies(:one) + + rental = Rental.new(customer_id: customer.id, movie_id: movie.id) + rental.save + + + expect(rental.check_out).must_equal Date.today + expect(rental.due_date).must_equal Date.today + 7.days + end + end end end