From 998a6253dec3ab1f5d2c33a8d24fb3dc14ee8663 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Tue, 14 May 2019 13:44:21 -0700 Subject: [PATCH 01/34] new api project with movie and customer models --- .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 ++++ db/seeds.rb | 4 +- 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 | 10 ++ tmp/.keep | 0 vendor/.keep | 0 59 files changed, 923 insertions(+), 2 deletions(-) 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..63c84bc56 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +mAkTkw6VWNki1wiWY8ZKeDrpmRo9rAi8y+5FT3i12fJTgKJDPo5CdKcue2eMVIEH1VY/2mZsc23cNF6hrjtXUuBLgFl+HHVlFitQhybWKNoG9gdvHe/2UrZZWkKnfGlxRO8imC7/hEwpuKmm+/mflyWLG/MK7m8NcoMdYmJxnjB3NLE3NuVaZacIV2FbMKHhJtHJ4wTdyU8DsX+K8OpOq8Ht6IaB29e4Vch8GxREExZ+3jftS5FgueXP818ZJNVvi9LyDjr52GhzrleZJCbGXXaXuX6EIvQgb9SbbLtmSrKC5XDF64WOE3AeiRaRI6+8i17tqwR2NZypK6+mWHJAzbQrsKIG6X2kev2oo/KZVNnkW+qGoGgl6btNDBOwlLlrM6G/rQBhEt7ytnbJ2tAsimeRZFu/xrWJKypu--KsIlRnih98IdS01m--Vpo+Igq7nk4uCbCNHVb0Pg== \ 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/db/seeds.rb b/db/seeds.rb index 5322340ba..7bf2fbee1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| Movie.create!(movie) end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..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..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +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 737f5fecc088dc24de72f2be35348387ceb2ccfb Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Tue, 14 May 2019 13:51:15 -0700 Subject: [PATCH 02/34] relationship in models --- app/models/customer.rb | 3 +++ app/models/movie.rb | 3 +++ db/migrate/20190514204915_create_customers.rb | 15 +++++++++++++++ db/migrate/20190514204927_create_movies.rb | 12 ++++++++++++ db/schema.rb | 18 ++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ 9 files changed, 101 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20190514204915_create_customers.rb create mode 100644 db/migrate/20190514204927_create_movies.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..4e914c16d --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_and_belongs_to_many :movies +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..ea8abd0d9 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_and_belongs_to_many :customers +end diff --git a/db/migrate/20190514204915_create_customers.rb b/db/migrate/20190514204915_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514204915_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20190514204927_create_movies.rb b/db/migrate/20190514204927_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514204927_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..b65564908 --- /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 13:49:15 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 13:49:15 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /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: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From 5e8b7c64a42b6bdef9339ca899eb93ece43ad8c9 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Tue, 14 May 2019 13:52:22 -0700 Subject: [PATCH 03/34] migrations --- db/schema.rb | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..178dbac12 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,30 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2019_05_14_204927) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end From 82bc010068c36438462067c5d0dff1bec27de75d Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Tue, 14 May 2019 14:08:42 -0700 Subject: [PATCH 04/34] added validations - test running --- app/models/customer.rb | 1 + app/models/movie.rb | 2 ++ test/models/customer_test.rb | 2 +- test/test_helper.rb | 14 +++++++++++--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 4e914c16d..e41bdedf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord has_and_belongs_to_many :movies + validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index ea8abd0d9..9f0905332 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,5 @@ class Movie < ApplicationRecord has_and_belongs_to_many :customers + validates :title, presence: true + validates :inventory, presence: true, numericality: {greater_than: 0} end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..83fdbd7b9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,4 +1,4 @@ -require "test_helper" +require_relative "../test_helper" describe Customer do let(:customer) { Customer.new } diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..70cf74618 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,14 @@ -ENV['RAILS_ENV'] ||= 'test' -require_relative '../config/environment' -require 'rails/test_help' +ENV["RAILS_ENV"] ||= "test" +require_relative "../config/environment" +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" + +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From e9579eb45d030a822612f058b682cc3811fd7b9c Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 14:38:04 -0700 Subject: [PATCH 05/34] changed inventory validation to be greater than -1 --- 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 9f0905332..7670e4f68 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord has_and_belongs_to_many :customers validates :title, presence: true - validates :inventory, presence: true, numericality: {greater_than: 0} + validates :inventory, presence: true, numericality: {greater_than: -1} end From e19ceea417f2945f0de6bc4f64db645c26f5fe8b Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 14:48:01 -0700 Subject: [PATCH 06/34] validation tests for movie model --- test/fixtures/customers.yml | 28 ++++++++++++++-------------- test/fixtures/movies.yml | 16 ++++++++-------- test/models/movie_test.rb | 26 +++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index b65564908..972418306 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 +myriam: + name: Myriam registered_at: 2019-05-14 13:49:15 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123 Ada St + city: Seattle + state: WA + postal_code: 55555 + phone: 555 -two: - name: MyString +evelynn: + name: Evelynn registered_at: 2019-05-14 13:49:15 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123 Lovelace St + city: Seattle + state: WA + postal_code: 55555 + phone: 123 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..5baa14a85 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 +lucky: + title: Lucky Number Sleven + overview: Great movie release_date: 2019-05-14 - inventory: 1 + inventory: 5 -two: - title: MyString - overview: MyString +lion_king: + title: The Lion King + overview: Everything the light touches shall be yours. release_date: 2019-05-14 - inventory: 1 + inventory: 10 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..9db3941fc 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,33 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:lucky) } it "must be valid" do value(movie).must_be :valid? end + + it "will save with a title and inventory" do + new_movie = Movie.new(title: "Lucky", inventory: 11) + + expect { + new_movie.save + }.must_change "Movie.count", 1 + end + + it "won't save without a title" do + new_movie = Movie.new(inventory: 11) + + expect { + new_movie.save + }.wont_change "Movie.count" + end + + it "won't save without an inventory" do + new_movie = Movie.new(title: "Lucky") + + expect { + new_movie.save + }.wont_change "Movie.count" + end end From f4449de4a54899d1d746a4d704ce2a85e482bd11 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 14:52:04 -0700 Subject: [PATCH 07/34] added error message testing to movie model tests --- test/models/movie_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9db3941fc..fdb534def 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -21,6 +21,8 @@ expect { new_movie.save }.wont_change "Movie.count" + + expect(new_movie.errors.messages).must_include :title end it "won't save without an inventory" do @@ -29,5 +31,7 @@ expect { new_movie.save }.wont_change "Movie.count" + + expect(new_movie.errors.messages).must_include :inventory end end From 68236e318b6844d1515309e75fe2844a6a81a069 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 14:55:30 -0700 Subject: [PATCH 08/34] wrote validation tests for customer model --- test/models/customer_test.rb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 83fdbd7b9..cf85a87af 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,27 @@ require_relative "../test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:myriam) } it "must be valid" do value(customer).must_be :valid? end + + it "will save with a name" do + new_cust = Customer.new(name: "Sarah") + + expect { + new_cust.save + }.must_change "Customer.count", 1 + end + + it "won't save without a name" do + new_cust = Customer.new + + expect { + new_cust.save + }.wont_change "Customer.count" + + expect(new_cust.errors.messages).must_include :name + end end From cf4ebdc3c2b741b073a1c0782368df1bcdd46148 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 15:07:52 -0700 Subject: [PATCH 09/34] create customermovie join table --- ...0514215849_create_customers_movies_join.rb | 10 +++++ db/schema.rb | 11 +++++- test/models/customer_test.rb | 38 +++++++++++-------- 3 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20190514215849_create_customers_movies_join.rb diff --git a/db/migrate/20190514215849_create_customers_movies_join.rb b/db/migrate/20190514215849_create_customers_movies_join.rb new file mode 100644 index 000000000..b8a7161ec --- /dev/null +++ b/db/migrate/20190514215849_create_customers_movies_join.rb @@ -0,0 +1,10 @@ +class CreateCustomersMoviesJoin < ActiveRecord::Migration[5.2] + def change + create_table :customers_movies do |t| + t.belongs_to :customer, index: true + t.belongs_to :movie, index: true + t.date :checkout_date + t.date :due_date + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 178dbac12..548351e31 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_204927) do +ActiveRecord::Schema.define(version: 2019_05_14_215849) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,6 +27,15 @@ t.datetime "updated_at", null: false end + create_table "customers_movies", force: :cascade do |t| + t.bigint "customer_id" + t.bigint "movie_id" + t.date "checkout_date" + t.date "due_date" + t.index ["customer_id"], name: "index_customers_movies_on_customer_id" + t.index ["movie_id"], name: "index_customers_movies_on_movie_id" + end + create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index cf85a87af..1fabcb8e2 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,27 +1,33 @@ require_relative "../test_helper" describe Customer do - let(:customer) { customers(:myriam) } + let(:customer) { customers(:myriam) } - it "must be valid" do - value(customer).must_be :valid? - end + describe "validations" do + it "must be valid" do + value(customer).must_be :valid? + end - it "will save with a name" do - new_cust = Customer.new(name: "Sarah") + it "will save with a name" do + new_cust = Customer.new(name: "Sarah") - expect { - new_cust.save - }.must_change "Customer.count", 1 - end + expect { + new_cust.save + }.must_change "Customer.count", 1 + end - it "won't save without a name" do - new_cust = Customer.new + it "won't save without a name" do + new_cust = Customer.new - expect { - new_cust.save - }.wont_change "Customer.count" + expect { + new_cust.save + }.wont_change "Customer.count" + + expect(new_cust.errors.messages).must_include :name + end + end - expect(new_cust.errors.messages).must_include :name + describe "relations" do + end end From 073d02695659e36ac938939d5d8b16a35e5898cc Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 15:26:32 -0700 Subject: [PATCH 10/34] relationship testing for customer model --- test/models/customer_test.rb | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 1fabcb8e2..145dd922b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,7 @@ require_relative "../test_helper" describe Customer do - let(:customer) { customers(:myriam) } + let(:customer) { customers(:myriam) } describe "validations" do it "must be valid" do @@ -28,6 +28,25 @@ end describe "relations" do - + it "can add a customer/movie relationship" do + customer = customers(:myriam) + movie = movies(:lucky) + + customer.movies << movie + + expect(customer.movies).must_include movie + expect(movie.customers).must_include customer + end + + # it "bad test" do + # customer = customers(:myriam) + # movie = Movie.new(title: "new", inventory: 1) + + # customer.movies << movie + # # customer.save + + # expect(customer.movies).wont_include movie + # # expect(customer.movies.errors.messages).must_include :title + # end end end From 173e017db126f7105faa624396a16d2b8fa639b9 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 15:34:39 -0700 Subject: [PATCH 11/34] generated customermovie model --- app/models/customer_movie.rb | 4 ++++ db/migrate/20190514223335_create_customer_movies.rb | 8 ++++++++ test/fixtures/customer_movies.yml | 11 +++++++++++ test/models/customer_movie_test.rb | 9 +++++++++ 4 files changed, 32 insertions(+) create mode 100644 app/models/customer_movie.rb create mode 100644 db/migrate/20190514223335_create_customer_movies.rb create mode 100644 test/fixtures/customer_movies.yml create mode 100644 test/models/customer_movie_test.rb diff --git a/app/models/customer_movie.rb b/app/models/customer_movie.rb new file mode 100644 index 000000000..c7299710e --- /dev/null +++ b/app/models/customer_movie.rb @@ -0,0 +1,4 @@ +class CustomerMovie < ApplicationRecord + belongs_to :customer + belongs_to :movie +end diff --git a/db/migrate/20190514223335_create_customer_movies.rb b/db/migrate/20190514223335_create_customer_movies.rb new file mode 100644 index 000000000..0dd1bd727 --- /dev/null +++ b/db/migrate/20190514223335_create_customer_movies.rb @@ -0,0 +1,8 @@ +class CreateCustomerMovies < ActiveRecord::Migration[5.2] + def change + create_table :customer_movies do |t| + + t.timestamps + end + end +end diff --git a/test/fixtures/customer_movies.yml b/test/fixtures/customer_movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customer_movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/customer_movie_test.rb b/test/models/customer_movie_test.rb new file mode 100644 index 000000000..765ebb133 --- /dev/null +++ b/test/models/customer_movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomerMovie do + let(:customer_movie) { CustomerMovie.new } + + it "must be valid" do + value(customer_movie).must_be :valid? + end +end From 034c38b2cf2e667087fdfb72be997b139faeba46 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Tue, 14 May 2019 15:44:35 -0700 Subject: [PATCH 12/34] migration to add columns to Customer Movie table --- .../20190514223335_create_customer_movies.rb | 2 +- ...0190514224118_add_columns_to_customer_movie.rb | 8 ++++++++ db/schema.rb | 15 ++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20190514224118_add_columns_to_customer_movie.rb diff --git a/db/migrate/20190514223335_create_customer_movies.rb b/db/migrate/20190514223335_create_customer_movies.rb index 0dd1bd727..8aa42be6a 100644 --- a/db/migrate/20190514223335_create_customer_movies.rb +++ b/db/migrate/20190514223335_create_customer_movies.rb @@ -1,7 +1,7 @@ class CreateCustomerMovies < ActiveRecord::Migration[5.2] def change create_table :customer_movies do |t| - + t.timestamps end end diff --git a/db/migrate/20190514224118_add_columns_to_customer_movie.rb b/db/migrate/20190514224118_add_columns_to_customer_movie.rb new file mode 100644 index 000000000..bce6c4aa8 --- /dev/null +++ b/db/migrate/20190514224118_add_columns_to_customer_movie.rb @@ -0,0 +1,8 @@ +class AddColumnsToCustomerMovie < ActiveRecord::Migration[5.2] + def change + add_reference :customer_movies, :customer, foreign_key: true + add_reference :customer_movies, :movie, foreign_key: true + add_column :customer_movies, :checkout_date, :date + add_column :customer_movies, :due_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 548351e31..881608a00 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,22 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_215849) do +ActiveRecord::Schema.define(version: 2019_05_14_224118) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customer_movies", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.date "checkout_date" + t.date "due_date" + t.index ["customer_id"], name: "index_customer_movies_on_customer_id" + t.index ["movie_id"], name: "index_customer_movies_on_movie_id" + end + create_table "customers", force: :cascade do |t| t.string "name" t.datetime "registered_at" @@ -45,4 +56,6 @@ t.datetime "updated_at", null: false end + add_foreign_key "customer_movies", "customers" + add_foreign_key "customer_movies", "movies" end From ac19d58b414c72aae227ef934ddf1095f1311c2b Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Tue, 14 May 2019 15:48:38 -0700 Subject: [PATCH 13/34] eliminated extra customers_movies join table --- .../20190514224719_eliminate_customers_movies.rb | 5 +++++ db/schema.rb | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 db/migrate/20190514224719_eliminate_customers_movies.rb diff --git a/db/migrate/20190514224719_eliminate_customers_movies.rb b/db/migrate/20190514224719_eliminate_customers_movies.rb new file mode 100644 index 000000000..5a0cf30a7 --- /dev/null +++ b/db/migrate/20190514224719_eliminate_customers_movies.rb @@ -0,0 +1,5 @@ +class EliminateCustomersMovies < ActiveRecord::Migration[5.2] + def change + drop_table :customers_movies + end +end diff --git a/db/schema.rb b/db/schema.rb index 881608a00..2b027269f 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_224118) do +ActiveRecord::Schema.define(version: 2019_05_14_224719) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,15 +38,6 @@ t.datetime "updated_at", null: false end - create_table "customers_movies", force: :cascade do |t| - t.bigint "customer_id" - t.bigint "movie_id" - t.date "checkout_date" - t.date "due_date" - t.index ["customer_id"], name: "index_customers_movies_on_customer_id" - t.index ["movie_id"], name: "index_customers_movies_on_movie_id" - end - create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" From 94a904b4dc7b8262674304fd0f17003febf9996e Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Tue, 14 May 2019 16:43:05 -0700 Subject: [PATCH 14/34] tests for customer movies join table and customer test --- app/models/customer.rb | 3 ++- app/models/movie.rb | 3 ++- test/models/customer_movie_test.rb | 38 +++++++++++++++++++++++++++++- test/models/customer_test.rb | 23 ------------------ 4 files changed, 41 insertions(+), 26 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index e41bdedf9..8b257f994 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord - has_and_belongs_to_many :movies + has_many :customer_movies + has_many :movies, through: :customer_movies validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 7670e4f68..58fd952e7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,6 @@ class Movie < ApplicationRecord - has_and_belongs_to_many :customers + has_many :customer_movies + has_many :customers, through: :customer_movies validates :title, presence: true validates :inventory, presence: true, numericality: {greater_than: -1} end diff --git a/test/models/customer_movie_test.rb b/test/models/customer_movie_test.rb index 765ebb133..2512693c8 100644 --- a/test/models/customer_movie_test.rb +++ b/test/models/customer_movie_test.rb @@ -1,9 +1,45 @@ require "test_helper" describe CustomerMovie do - let(:customer_movie) { CustomerMovie.new } + let(:customer_movie) { CustomerMovie.new(customer: Customer.first, movie: Movie.first) } it "must be valid" do + # customer = customers(:evelynn) + # movie = movies(:lion_king) + # customer.customer_movie = customer + # # customer_movie.movie = movie + value(customer_movie).must_be :valid? end + + describe "relations" do + it "can add a customer/movie relationship" do + customer = customers(:myriam) + movie = movies(:lucky) + + relationship = CustomerMovie.new(customer: customer, movie: movie) + + expect { relationship.save }.must_change "CustomerMovie.count", 1 + expect(relationship.customer_id).must_equal customer.id + expect(relationship.movie_id).must_equal movie.id + end + + it "can't add a customer/movie relationship if there is not a customer" do + movie = movies(:lucky) + + relationship = CustomerMovie.new(movie: movie) + + expect { relationship.save }.wont_change "CustomerMovie.count" + expect(relationship.errors.messages).must_include :customer + end + + it "can't add a customer/movie relationship if there is not a movie" do + customer = customers(:evelynn) + + relationship = CustomerMovie.new(customer: customer) + + expect { relationship.save }.wont_change "CustomerMovie.count" + expect(relationship.errors.messages).must_include :movie + end + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 145dd922b..05f0cfa4c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -26,27 +26,4 @@ expect(new_cust.errors.messages).must_include :name end end - - describe "relations" do - it "can add a customer/movie relationship" do - customer = customers(:myriam) - movie = movies(:lucky) - - customer.movies << movie - - expect(customer.movies).must_include movie - expect(movie.customers).must_include customer - end - - # it "bad test" do - # customer = customers(:myriam) - # movie = Movie.new(title: "new", inventory: 1) - - # customer.movies << movie - # # customer.save - - # expect(customer.movies).wont_include movie - # # expect(customer.movies.errors.messages).must_include :title - # end - end end From 5a83492fbfb27aed65f606df5d93f6bb6190352a Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Wed, 15 May 2019 12:53:34 -0700 Subject: [PATCH 15/34] generated movies and customers controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 18 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 8e88d9f9d40a3115cf0ead369fddfd91ee15c93a Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Wed, 15 May 2019 13:08:59 -0700 Subject: [PATCH 16/34] Customers#index action and tests pass --- app/controllers/customers_controller.rb | 4 ++ config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 37 +++++++++++++++++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..6116c28ef 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..91e1dd703 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers, except: [:edit, :new] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..ac980e6dc 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a 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) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "gets a list of customers with all the fields in the body" do + keys = ["id", "name", "registered_at", "postal_code", "phone"].sort + + get customers_path + + body = JSON.parse(response.body) + + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end From a61f315c77c1db24c2efc33f9cdf6a74b277779b Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Wed, 15 May 2019 13:15:04 -0700 Subject: [PATCH 17/34] wrote Movies#index action and tests to pass --- app/controllers/movies_controller.rb | 4 +++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 37 ++++++++++++++++++++-- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..9571afdec 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,6 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index 91e1dd703..efc0a2a51 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do resources :customers, except: [:edit, :new] + resources :movies, except: [:edit, :new] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..c98eda8f1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a working route and returns JSON" do + get movies_path + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :success + end + + it "returns an array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "gets a list of movies with all the fields in the body" do + keys = ["id", "title", "release_date"].sort + + get movies_path + + body = JSON.parse(response.body) + + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end end From e823963e30900410853182139cc39bd117cc3e03 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Wed, 15 May 2019 13:48:59 -0700 Subject: [PATCH 18/34] create show action --- app/controllers/movies_controller.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9571afdec..182ded561 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,4 +3,16 @@ 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.nil? + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok + else + render json: {ok: false, message: ["Movie not found"]}, status: :not_found + end + end + + def movie_params + end end From 375ec6afc80ffd723573c7df6e432cbb0eba8bb2 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Wed, 15 May 2019 13:49:29 -0700 Subject: [PATCH 19/34] tests for movie show action --- test/controllers/movies_controller_test.rb | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c98eda8f1..c5340051a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -35,4 +35,41 @@ end end end + + describe "show" do + it "is a working route and returns JSON" do + movie = movies(:lucky) + get movie_path(movie) + + expect(response.header["Content-Type"]).must_include "json" + must_respond_with :success + end + + it "returns a hash" do + movie = movies(:lucky) + get movie_path(movie) + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns an error when looking for a non existing movie" do + get movie_path(-1) + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + + must_respond_with :not_found + end + + it "gets a movie with all the fields in the body" do + keys = ["id", "title", "overview", "release_date", "inventory"].sort + + movie = movies(:lucky) + get movie_path(movie) + + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end + end end From fd01f223104d152e5b4e01671776321d31acba70 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Wed, 15 May 2019 14:21:10 -0700 Subject: [PATCH 20/34] started create action and tests --- app/controllers/movies_controller.rb | 15 +++++++++++++ test/controllers/movies_controller_test.rb | 26 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 182ded561..760f26afd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,6 +13,21 @@ def show end end + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id]), + status: :ok + else + render json: {ok: false, errors: movie.errors.messages}, + status: :bad_request + end + 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 c5340051a..cfab50d39 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -72,4 +72,30 @@ body.keys.sort.must_equal keys end end + + describe "create" do + let (:movie_data) { + { + title: "Lucky Number Sleven", + overview: "Starts and ends at a bus stop", + release_date: 2019-05-14, + inventory: 1, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: {movie: movie_data} + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + end end From edc3398bd11fc0fdb29a2eb17fed42cfc58f1a62 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Wed, 15 May 2019 14:58:12 -0700 Subject: [PATCH 21/34] tests pass --- 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 cfab50d39..3816acb7f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -78,7 +78,7 @@ { title: "Lucky Number Sleven", overview: "Starts and ends at a bus stop", - release_date: 2019-05-14, + release_date: "2019-05-14", inventory: 1, } } From c2436dafd36b9a8974b96972a35197c5936fdefb Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Wed, 15 May 2019 15:00:41 -0700 Subject: [PATCH 22/34] wrote failure case test for Movie#create --- test/controllers/movies_controller_test.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3816acb7f..1a054a581 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -97,5 +97,20 @@ expect(movie.title).must_equal movie_data[:title] must_respond_with :success end + + it "returns an error for invalid 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.keys).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end end end From c682eec8a0ea718810f39464c015e72130c7f984 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Wed, 15 May 2019 15:28:56 -0700 Subject: [PATCH 23/34] test for checkout method in customer movies controller --- app/controllers/customer_movies_controller.rb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/controllers/customer_movies_controller.rb diff --git a/app/controllers/customer_movies_controller.rb b/app/controllers/customer_movies_controller.rb new file mode 100644 index 000000000..e692deec0 --- /dev/null +++ b/app/controllers/customer_movies_controller.rb @@ -0,0 +1,3 @@ +class CustomerMoviesController < ApplicationController + +end From 1f374b8b54f47ed9c83bc20e502e875db987ee72 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Wed, 15 May 2019 15:29:13 -0700 Subject: [PATCH 24/34] test for checkout method in customer movies controller --- .../customer_movies_controller_test.rb | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 test/controllers/customer_movies_controller_test.rb diff --git a/test/controllers/customer_movies_controller_test.rb b/test/controllers/customer_movies_controller_test.rb new file mode 100644 index 000000000..788beaa54 --- /dev/null +++ b/test/controllers/customer_movies_controller_test.rb @@ -0,0 +1,39 @@ +require "test_helper" + +describe CustomerMoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end + + describe "checkout" do + it "creates a new instance of customer movie" do + # increases count of CustomerMovies + # decrease inventory of associated movie + # set's checkout date to today + # calculates due date to 7 days from today - model method + + customer = customers(:evelynn) + movie = movies(:lion_king) + movie_inventory = movie.inventory + checkout_data = { + customer: customer, + movie: movie, + } + expect { post checkout_path, params: {checkout: checkout_data} }.must_change "CustomerMovie.count", 1 + expect(movie.inventory).must_equal movie_inventory - 1 + expect(CustomerMovie.last.checkout_date).must_equal Date.today + expect(CustomerMovie.last.due_date).must_equal Date.today.next_week + end + + it "returns an error for invalid data" do + checkout_data = { + customer: customer, + } + expect { post checkout_path, params: {checkout: checkout_data} }.wont_change "CustomerMovie.count" + expect(body).must_be_kind_of Hash + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "movie" + must_respond_with :bad_request + end + end +end From bc76feeaa06cdd3a8b1676292f2fdfc2f1f2eb26 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Wed, 15 May 2019 15:57:38 -0700 Subject: [PATCH 25/34] added checkout method --- app/controllers/customer_movies_controller.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/controllers/customer_movies_controller.rb b/app/controllers/customer_movies_controller.rb index e692deec0..18dd66952 100644 --- a/app/controllers/customer_movies_controller.rb +++ b/app/controllers/customer_movies_controller.rb @@ -1,3 +1,20 @@ class CustomerMoviesController < ApplicationController + def checkout + customer_movie = CustomerMovie.new(customer_movie_params) + if customer_movie.save + customer_movie.checkout_date = Date.today + customer_movie.due_date = Date.today.next_week + customer_movie.save + checkout_movie = customer_movie.movie.title + render json: {movie: checkout_movie, checkout_date: customer_movie.checkout_date, due_date: customer_movie.due_date}, + status: :ok + end + end + + private + + def customer_movie_params + params.require(:customer_movie).permit(:customer_id, :movie_id) + end end From ab8cd503c98dae200cd3f6dcbe25c3a56d98a99f Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Wed, 15 May 2019 15:58:08 -0700 Subject: [PATCH 26/34] created tests for checkout method --- test/controllers/customer_movies_controller_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/controllers/customer_movies_controller_test.rb b/test/controllers/customer_movies_controller_test.rb index 788beaa54..305df5cfd 100644 --- a/test/controllers/customer_movies_controller_test.rb +++ b/test/controllers/customer_movies_controller_test.rb @@ -16,16 +16,17 @@ movie = movies(:lion_king) movie_inventory = movie.inventory checkout_data = { - customer: customer, - movie: movie, + customer_id: customer.id, + movie_id: movie.id, } - expect { post checkout_path, params: {checkout: checkout_data} }.must_change "CustomerMovie.count", 1 + expect { post checkout_path, params: {customer_movie: checkout_data} }.must_change "CustomerMovie.count", 1 expect(movie.inventory).must_equal movie_inventory - 1 expect(CustomerMovie.last.checkout_date).must_equal Date.today expect(CustomerMovie.last.due_date).must_equal Date.today.next_week end it "returns an error for invalid data" do + customer = customers(:evelynn) checkout_data = { customer: customer, } From 032d96e6a804eff8831f8d84b6380a819d9fee33 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Wed, 15 May 2019 15:58:39 -0700 Subject: [PATCH 27/34] added route for checkout method --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index efc0a2a51..aaab1fb92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do resources :customers, except: [:edit, :new] resources :movies, except: [:edit, :new] + post "/rentals/check-out", to: "customer_movies#checkout", as: "checkout" end From b752132e83f73cd0b568b2a10826fd3252ad6da6 Mon Sep 17 00:00:00 2001 From: Evelynn Kaplan Date: Thu, 16 May 2019 09:50:31 -0700 Subject: [PATCH 28/34] fixed failing CustomerMovie controller tests --- app/controllers/customer_movies_controller.rb | 7 ++++++- test/controllers/customer_movies_controller_test.rb | 13 ++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/controllers/customer_movies_controller.rb b/app/controllers/customer_movies_controller.rb index 18dd66952..3088ba889 100644 --- a/app/controllers/customer_movies_controller.rb +++ b/app/controllers/customer_movies_controller.rb @@ -2,13 +2,18 @@ class CustomerMoviesController < ApplicationController def checkout customer_movie = CustomerMovie.new(customer_movie_params) if customer_movie.save + checkout_movie = customer_movie.movie.title customer_movie.checkout_date = Date.today customer_movie.due_date = Date.today.next_week + customer_movie.movie.inventory -= 1 customer_movie.save - checkout_movie = customer_movie.movie.title + customer_movie.movie.save render json: {movie: checkout_movie, checkout_date: customer_movie.checkout_date, due_date: customer_movie.due_date}, status: :ok + else + render json: {ok: false, errors: customer_movie.errors.messages}, + status: :bad_request end end diff --git a/test/controllers/customer_movies_controller_test.rb b/test/controllers/customer_movies_controller_test.rb index 305df5cfd..cb4c3586a 100644 --- a/test/controllers/customer_movies_controller_test.rb +++ b/test/controllers/customer_movies_controller_test.rb @@ -13,14 +13,18 @@ # calculates due date to 7 days from today - model method customer = customers(:evelynn) - movie = movies(:lion_king) + movie = Movie.create(title: "Wow", overview: "Amazing!", release_date: "2019-05-14", inventory: 5) movie_inventory = movie.inventory checkout_data = { customer_id: customer.id, movie_id: movie.id, } + expect { post checkout_path, params: {customer_movie: checkout_data} }.must_change "CustomerMovie.count", 1 - expect(movie.inventory).must_equal movie_inventory - 1 + + after_checkout = Movie.find_by(id: CustomerMovie.last.movie.id) + + expect(after_checkout.inventory).must_equal movie_inventory - 1 expect(CustomerMovie.last.checkout_date).must_equal Date.today expect(CustomerMovie.last.due_date).must_equal Date.today.next_week end @@ -30,7 +34,10 @@ checkout_data = { customer: customer, } - expect { post checkout_path, params: {checkout: checkout_data} }.wont_change "CustomerMovie.count" + + expect { post checkout_path, params: {customer_movie: checkout_data} }.wont_change "CustomerMovie.count" + + body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body.keys).must_include "errors" expect(body["errors"]).must_include "movie" From 23327640cc489aec0667a61dc49b5522f04e8f2f Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Thu, 16 May 2019 10:23:57 -0700 Subject: [PATCH 29/34] tests for checkin action --- .../customer_movies_controller_test.rb | 52 +++++++++++++++---- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/test/controllers/customer_movies_controller_test.rb b/test/controllers/customer_movies_controller_test.rb index cb4c3586a..bee296cf9 100644 --- a/test/controllers/customer_movies_controller_test.rb +++ b/test/controllers/customer_movies_controller_test.rb @@ -1,17 +1,8 @@ require "test_helper" describe CustomerMoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end - describe "checkout" do it "creates a new instance of customer movie" do - # increases count of CustomerMovies - # decrease inventory of associated movie - # set's checkout date to today - # calculates due date to 7 days from today - model method - customer = customers(:evelynn) movie = Movie.create(title: "Wow", overview: "Amazing!", release_date: "2019-05-14", inventory: 5) movie_inventory = movie.inventory @@ -44,4 +35,47 @@ must_respond_with :bad_request end end + + describe "check-in" do + it "find the customer movie entry and return the inventory to the movie" do + customer = customers(:evelynn) + movie = Movie.create(title: "Wow", overview: "Amazing!", release_date: "2019-05-14", inventory: 5) + movie_inventory = movie.inventory + checkout_data = { + customer_id: customer.id, + movie_id: movie.id, + } + + post checkout_path, params: {customer_movie: checkout_data} + + after_checkout = Movie.find_by(id: CustomerMovie.last.movie.id) + + checkin_data = { + customer_id: customer.id, + movie_id: movie.id, + } + + post checkin_path, params: {customer_movie: checkin_data} + + after_checkin = Movie.find_by(id: CustomerMovie.last.movie.id) + + expect(after_checkin.inventory).must_equal after_checkout.inventory + 1 + expect(CustomerMovie.last.status).must_equal "returned" + end + + it "returns an error for invalid data at checkin" do + customer = customers(:evelynn) + checkin_data = { + customer: customer, + } + + post checkin_path, params: {customer_movie: checkin_data} + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body.keys).must_include "errors" + expect(body["errors"]).must_include "movie" + must_respond_with :bad_request + end + end end From 119dae57f90eb65c808f82e715d1324b2d38132f Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Thu, 16 May 2019 10:24:18 -0700 Subject: [PATCH 30/34] added checkin action --- app/controllers/customer_movies_controller.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/controllers/customer_movies_controller.rb b/app/controllers/customer_movies_controller.rb index 3088ba889..6eabafce3 100644 --- a/app/controllers/customer_movies_controller.rb +++ b/app/controllers/customer_movies_controller.rb @@ -17,6 +17,22 @@ def checkout end end + def checkin + customer_movie = CustomerMovie.where(customer_id: customer_movie_params[:customer_id], movie_id: customer_movie_params[:movie_id]) + + if customer_movie != [] + customer_movie.movie.inventory += 1 + customer_movie.movie.status = "returned" + customer_movie.movie.save + + render json: {movie: customer_movie.movie.title, checkin_status: customer_movie.status}, + status: :ok + else + render json: {ok: false, errors: customer_movie.errors.messages}, + status: :bad_request + end + end + private def customer_movie_params From 9791d3cb6b79748d963201affde787ad17317ac9 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Thu, 16 May 2019 10:24:39 -0700 Subject: [PATCH 31/34] checkin route' --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index aaab1fb92..dcf32e66e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,5 @@ resources :customers, except: [:edit, :new] resources :movies, except: [:edit, :new] post "/rentals/check-out", to: "customer_movies#checkout", as: "checkout" + post "/rentals/check-in", to: "customer_movies#checkin", as: "checkin" end From c0c0d3a8536eacde07c93a8e65cb8e297ecfbb99 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Fri, 17 May 2019 13:59:34 -0700 Subject: [PATCH 32/34] checkin testing --- app/controllers/customer_movies_controller.rb | 11 +++++------ test/controllers/customer_movies_controller_test.rb | 3 +-- test/fixtures/customer_movies.yml | 8 ++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/controllers/customer_movies_controller.rb b/app/controllers/customer_movies_controller.rb index 6eabafce3..4bc6270bb 100644 --- a/app/controllers/customer_movies_controller.rb +++ b/app/controllers/customer_movies_controller.rb @@ -19,16 +19,15 @@ def checkout def checkin customer_movie = CustomerMovie.where(customer_id: customer_movie_params[:customer_id], movie_id: customer_movie_params[:movie_id]) - if customer_movie != [] - customer_movie.movie.inventory += 1 - customer_movie.movie.status = "returned" - customer_movie.movie.save + customer_movie[0].movie.inventory += 1 # look for the movie id in the array + customer_movie[0].movie.status = "returned" + customer_movie[0].movie.save - render json: {movie: customer_movie.movie.title, checkin_status: customer_movie.status}, + render json: {movie: customer_movie[0].movie.title, checkin_status: customer_movie[0].status}, status: :ok else - render json: {ok: false, errors: customer_movie.errors.messages}, + render json: {ok: false, errors: ["Customer has not checked out this movie"]}, status: :bad_request end end diff --git a/test/controllers/customer_movies_controller_test.rb b/test/controllers/customer_movies_controller_test.rb index bee296cf9..b9052b394 100644 --- a/test/controllers/customer_movies_controller_test.rb +++ b/test/controllers/customer_movies_controller_test.rb @@ -45,7 +45,6 @@ customer_id: customer.id, movie_id: movie.id, } - post checkout_path, params: {customer_movie: checkout_data} after_checkout = Movie.find_by(id: CustomerMovie.last.movie.id) @@ -74,7 +73,7 @@ body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body.keys).must_include "errors" - expect(body["errors"]).must_include "movie" + expect(body["errors"]).must_include "Customer has not checked out this movie" must_respond_with :bad_request end end diff --git a/test/fixtures/customer_movies.yml b/test/fixtures/customer_movies.yml index dc3ee79b5..a4423244f 100644 --- a/test/fixtures/customer_movies.yml +++ b/test/fixtures/customer_movies.yml @@ -4,8 +4,12 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +one: + customer_id: 3 + movie_id: 123 # column: value # -two: {} +two: + customer_id: 4 + movie_id: 1234 # column: value From 81672a7a4f9aafc5478307fd02015dc4ff8295b2 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Fri, 17 May 2019 14:07:04 -0700 Subject: [PATCH 33/34] migration to add status to CustomerMovie --- app/controllers/customer_movies_controller.rb | 3 ++- db/migrate/20190517210425_add_status_to_customer_movies.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20190517210425_add_status_to_customer_movies.rb diff --git a/app/controllers/customer_movies_controller.rb b/app/controllers/customer_movies_controller.rb index 4bc6270bb..79f93ae38 100644 --- a/app/controllers/customer_movies_controller.rb +++ b/app/controllers/customer_movies_controller.rb @@ -21,8 +21,9 @@ def checkin customer_movie = CustomerMovie.where(customer_id: customer_movie_params[:customer_id], movie_id: customer_movie_params[:movie_id]) if customer_movie != [] customer_movie[0].movie.inventory += 1 # look for the movie id in the array - customer_movie[0].movie.status = "returned" + customer_movie[0].status = "returned" customer_movie[0].movie.save + customer_movie[0].save render json: {movie: customer_movie[0].movie.title, checkin_status: customer_movie[0].status}, status: :ok diff --git a/db/migrate/20190517210425_add_status_to_customer_movies.rb b/db/migrate/20190517210425_add_status_to_customer_movies.rb new file mode 100644 index 000000000..be74fb934 --- /dev/null +++ b/db/migrate/20190517210425_add_status_to_customer_movies.rb @@ -0,0 +1,5 @@ +class AddStatusToCustomerMovies < ActiveRecord::Migration[5.2] + def change + add_column :customer_movies, :status, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 2b027269f..84e8e5363 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_224719) do +ActiveRecord::Schema.define(version: 2019_05_17_210425) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,6 +22,7 @@ t.bigint "movie_id" t.date "checkout_date" t.date "due_date" + t.string "status" t.index ["customer_id"], name: "index_customer_movies_on_customer_id" t.index ["movie_id"], name: "index_customer_movies_on_movie_id" end From d52d497120c748d002079a3896b2426f497f4ac3 Mon Sep 17 00:00:00 2001 From: MyriamWD Date: Fri, 17 May 2019 14:09:33 -0700 Subject: [PATCH 34/34] smoke tests wave 2 and 3 passing --- app/controllers/customer_movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customer_movies_controller.rb b/app/controllers/customer_movies_controller.rb index 79f93ae38..c6ed16b91 100644 --- a/app/controllers/customer_movies_controller.rb +++ b/app/controllers/customer_movies_controller.rb @@ -20,7 +20,7 @@ def checkout def checkin customer_movie = CustomerMovie.where(customer_id: customer_movie_params[:customer_id], movie_id: customer_movie_params[:movie_id]) if customer_movie != [] - customer_movie[0].movie.inventory += 1 # look for the movie id in the array + customer_movie[0].movie.inventory += 1 customer_movie[0].status = "returned" customer_movie[0].movie.save customer_movie[0].save