From fb8a002fd64dd7ba568646a9583f396cc8486423 Mon Sep 17 00:00:00 2001 From: Kay Date: Mon, 5 Nov 2018 11:33:07 -0800 Subject: [PATCH 01/37] created rails new api app --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ .../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/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 952 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/schema.rb 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..e54d447e8 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.4.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..1d10e5eb5 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.4.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..1daa1bf2e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.4.1p111 + +BUNDLED WITH + 1.16.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..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..0018f0205 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +qywBZzoJIc23R7aVOpeZsgtNLaBpiy0SyBoGZU8XFdUUbzoUqeAkHt5ZUPL3tkoT7+9s05wNTNQQnbeYBsDdsYgkg1p93qk73iVwhL8qBGpIOOaT5NfhC8pEU54j7SiO3KyA0C9eitfMxwF/2Px4IV3bML6k3sES5k9tBCZcbpZhBloSARFT8y5ZTUEboSAX7LmZYPj8CmD0ntI2JSlwXqapHUuAMX/dWLstN1NnEk1NIZUVtiekEHY1nN5FJ/NGGrPC2yoS8Og31Y3ls8Rd9cq+JTiadHRYBLUycKljTEWG/dtH5tovyca+wE4nLPMVMFcyC5jn9lezrLijckxhyDUBKNPX34JU+FyN4QZmTwPvOXtZ9xUzJbLrVTYgmn1Dt09o9fuOBAKnRPWUGZfbFx2+V8ZTQ3UAlVQV--dBEAr5lH+FV1LdON--pp0kKPBW4Kg+tWrO1UacfQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/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/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From f4ca883b571353e4a6e0622b06c7dd0ce3634025 Mon Sep 17 00:00:00 2001 From: Kay Date: Mon, 5 Nov 2018 12:39:44 -0800 Subject: [PATCH 02/37] pseudocoded routes --- config/routes.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..fb7ba0f83 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,16 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + # Read the API Requirements below and create a pseudo-code "routes" file that specifies + # The endpoints your API will need + # The HTTP verbs each endpoint will use + # Any data that must be provided to the endpoint in order for it to do its work + + #get customers -> returns id, name registered_at, postal_code, phone + #get movies + #get movies/:id + #post movies -> returns id of the new movie just created + #post /rentals/check-out + #post /rentals/check-in + end From 1f75aaf1679a3f12c86d77e32b3937e100bd097a Mon Sep 17 00:00:00 2001 From: Kay Date: Mon, 5 Nov 2018 12:46:07 -0800 Subject: [PATCH 03/37] added sample route --- config/routes.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index fb7ba0f83..fd3451125 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,10 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # Read the API Requirements below and create a pseudo-code "routes" file that specifies - # The endpoints your API will need - # The HTTP verbs each endpoint will use - # Any data that must be provided to the endpoint in order for it to do its work + get '/customers', to: 'customers#index' #get customers -> returns id, name registered_at, postal_code, phone #get movies From 45b4b8d804e83ea6434bb45b9f3cf738fcd51924 Mon Sep 17 00:00:00 2001 From: Jazz Date: Mon, 5 Nov 2018 13:18:51 -0800 Subject: [PATCH 04/37] added schema customer and movies --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ db/migrate/20181105204947_create_customers.rb | 14 +++++++++++ db/migrate/20181105205217_create_movies.rb | 12 ++++++++++ ...20181105211142_add_registered_at_column.rb | 5 ++++ db/schema.rb | 23 ++++++++++++++++++- test/fixtures/customers.yml | 17 ++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++ test/models/customer_test.rb | 9 ++++++++ test/models/movie_test.rb | 9 ++++++++ 10 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105204947_create_customers.rb create mode 100644 db/migrate/20181105205217_create_movies.rb create mode 100644 db/migrate/20181105211142_add_registered_at_column.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..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20181105204947_create_customers.rb b/db/migrate/20181105204947_create_customers.rb new file mode 100644 index 000000000..f6ae258aa --- /dev/null +++ b/db/migrate/20181105204947_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20181105205217_create_movies.rb b/db/migrate/20181105205217_create_movies.rb new file mode 100644 index 000000000..95d31e0f8 --- /dev/null +++ b/db/migrate/20181105205217_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20181105211142_add_registered_at_column.rb b/db/migrate/20181105211142_add_registered_at_column.rb new file mode 100644 index 000000000..e10ec08f3 --- /dev/null +++ b/db/migrate/20181105211142_add_registered_at_column.rb @@ -0,0 +1,5 @@ +class AddRegisteredAtColumn < ActiveRecord::Migration[5.2] + def change + add_column :customers, :registered_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..85dacd301 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: 2018_11_05_211142) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.datetime "registered_at" + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..2823d1188 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + 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..d774de5f1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/models/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 9288e1f219e656f4ef63490eddef859450825530 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Mon, 5 Nov 2018 14:02:28 -0800 Subject: [PATCH 05/37] added model validations and realtionships --- Gemfile | 2 +- Gemfile.lock | 2 +- app/models/customer.rb | 11 +++++++++++ app/models/movie.rb | 5 +++++ app/models/rental.rb | 4 ++++ db/migrate/20181105213606_create_rentals.rb | 10 ++++++++++ db/migrate/20181105213745_add_fkey_to_rental.rb | 6 ++++++ .../20181105215113_add_column_to_customer.rb | 5 +++++ db/schema.rb | 16 +++++++++++++++- test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 11 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181105213606_create_rentals.rb create mode 100644 db/migrate/20181105213745_add_fkey_to_rental.rb create mode 100644 db/migrate/20181105215113_add_column_to_customer.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/Gemfile b/Gemfile index 1d10e5eb5..a9f49bedc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.4.1' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 1daa1bf2e..255775413 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 2.4.1p111 + ruby 2.5.1p57 BUNDLED WITH 1.16.4 diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..85dab6d56 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,13 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals + validates :id, presence: true + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + validates :movies_checked_out_count, presence: true + + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..8564348f5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,7 @@ class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals + validates :id, presence: true + validates :title, presence: true + validates :release_date, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20181105213606_create_rentals.rb b/db/migrate/20181105213606_create_rentals.rb new file mode 100644 index 000000000..2ed943727 --- /dev/null +++ b/db/migrate/20181105213606_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :due_date + t.date :checkout_date + + t.timestamps + end + end +end diff --git a/db/migrate/20181105213745_add_fkey_to_rental.rb b/db/migrate/20181105213745_add_fkey_to_rental.rb new file mode 100644 index 000000000..6bea48097 --- /dev/null +++ b/db/migrate/20181105213745_add_fkey_to_rental.rb @@ -0,0 +1,6 @@ +class AddFkeyToRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20181105215113_add_column_to_customer.rb b/db/migrate/20181105215113_add_column_to_customer.rb new file mode 100644 index 000000000..9dc148d21 --- /dev/null +++ b/db/migrate/20181105215113_add_column_to_customer.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 85dacd301..6d9d352ff 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_05_211142) do +ActiveRecord::Schema.define(version: 2018_11_05_215113) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.datetime "registered_at" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -36,4 +37,17 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.date "checkout_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..f2e07ba5f --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + due_date: 2018-11-05 + checkout_date: 2018-11-05 + +two: + due_date: 2018-11-05 + checkout_date: 2018-11-05 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 3f1c652fe1fcf4c60954b22802a6f9a2902dfa12 Mon Sep 17 00:00:00 2001 From: Kay Date: Mon, 5 Nov 2018 14:47:27 -0800 Subject: [PATCH 06/37] added validattions and set up yml file for customer model tests --- Gemfile | 2 +- Gemfile.lock | 2 +- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- test/fixtures/customers.yml | 26 ++++++------- test/models/customer_test.rb | 71 +++++++++++++++++++++++++++++++++++- test/models/movie_test.rb | 14 +++---- test/models/rental_test.rb | 14 +++---- test/test_helper.rb | 3 +- 9 files changed, 101 insertions(+), 35 deletions(-) diff --git a/Gemfile b/Gemfile index a9f49bedc..1d10e5eb5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.1' +ruby '2.4.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 255775413..1daa1bf2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 2.5.1p57 + ruby 2.4.1p111 BUNDLED WITH 1.16.4 diff --git a/app/models/customer.rb b/app/models/customer.rb index 85dab6d56..35802034d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,7 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - validates :id, presence: true + # validates :id, presence: true validates :name, presence: true validates :registered_at, presence: true validates :postal_code, presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index 8564348f5..ac1c685e0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,7 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - validates :id, presence: true + # validates :id, presence: true validates :title, presence: true validates :release_date, presence: true end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 2823d1188..b41a2e3dd 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,17 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +customer1: + name: customer1 + registered_at: + postal_code: postalcode1 + phone: phone1 + movies_checked_out_count: 0 -two: - name: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +customer2: + name: customer1 + registered_at: + postal_code: postalcode1 + phone: phone1 + movies_checked_out_count: 0 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..397ec560c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,76 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:customer1) } it "must be valid" do - value(customer).must_be :valid? + expect(customer).must_be :valid? end + + it "must have required fields" do + fields = [:name, :registered_at, :postal_code, :phone, :movies_checked_out_count] + + fields.each do |field| + expect(customer).must_respond_to field + end + end + + describe 'Validations' do + it 'must have name' do + customer.name = nil + + valid = customer.save + expect(valid).must_equal false + expect(customer.errors.messages).must_include :name + end + + it 'must have registered_at ' do + customer.registered_at = nil + + valid = customer.save + expect(valid).must_equal false + expect(customer.errors.messages).must_include :registered_at + end + + it 'must have postal_code ' do + customer.postal_code = nil + + valid = customer.save + expect(valid).must_equal false + expect(customer.errors.messages).must_include :postal_code + end + + it 'must have phone ' do + customer.phone = nil + + valid = customer.save + expect(valid).must_equal false + expect(customer.errors.messages).must_include :phone + end + + it 'must have movies_checked_out_count ' do + customer.movies_checked_out_count = nil + + valid = customer.save + expect(valid).must_equal false + expect(customer.errors.messages).must_include :movies_checked_out_count + end + + end + end + + +# describe 'Validations' do +# +# end + + + +# +# validates :id, presence: true +# validates :name, presence: true +# validates :registered_at, presence: true +# validates :postal_code, presence: true +# validates :phone, presence: true +# validates :movies_checked_out_count, presence: true diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..40cd72026 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Movie do - let(:movie) { Movie.new } - - it "must be valid" do - value(movie).must_be :valid? - end -end +# describe Movie do +# let(:movie) { Movie.new } +# +# it "must be valid" do +# value(movie).must_be :valid? +# end +# end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..97dcc8fcf 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Rental do - let(:rental) { Rental.new } - - it "must be valid" do - value(rental).must_be :valid? - end -end +# describe Rental do +# let(:rental) { Rental.new } +# +# it "must be valid" do +# value(rental).must_be :valid? +# end +# end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 405bcee53ef849ebd46022bf1d8c8f43aa307e7c Mon Sep 17 00:00:00 2001 From: Kay Date: Mon, 5 Nov 2018 15:08:24 -0800 Subject: [PATCH 07/37] set up some ymls and tests for customer relationship tests --- test/fixtures/movies.yml | 27 ++++++++++++++++----------- test/fixtures/rentals.yml | 14 +++++++++----- test/models/customer_test.rb | 28 ++++++++++++++-------------- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..8508a0149 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,18 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 - -two: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 +movie1: + title: title1 + release_date: releasedate1 + + +movie2: + title: title2 + release_date: releasedate2 + + + + # has_many :rentals + # has_many :customers, through: :rentals + # # validates :id, presence: true + # validates :title, presence: true + # validates :release_date, presence: true diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f2e07ba5f..730838f1e 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - due_date: 2018-11-05 +rental1: + due_date: 2018-11-12 checkout_date: 2018-11-05 + customer: customer1 + movie: movie1 -two: - due_date: 2018-11-05 - checkout_date: 2018-11-05 +rental2: + due_date: 2018-11-13 + checkout_date: 2018-11-06 + customer: customer2 + movie: movie2 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 397ec560c..20e262996 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -55,22 +55,22 @@ expect(valid).must_equal false expect(customer.errors.messages).must_include :movies_checked_out_count end - end -end - - -# describe 'Validations' do -# -# end + describe 'Relationships' do + # has_many :rentals + # has_many :movies, through: :rentals + it 'can have many rentals' do + customer.rentals << rentals(:rental1) + customer.rentals << rentals(:rental2) + rentals = customer.rentals + expect(rentals.length).must_be :>=, 2 + rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + end + end -# -# validates :id, presence: true -# validates :name, presence: true -# validates :registered_at, presence: true -# validates :postal_code, presence: true -# validates :phone, presence: true -# validates :movies_checked_out_count, presence: true +end From 9c1a44fe0f96620141c4bda99568e6d245a3fb26 Mon Sep 17 00:00:00 2001 From: Kay Date: Mon, 5 Nov 2018 15:31:24 -0800 Subject: [PATCH 08/37] added have many movies thru rentals relationship test to customer --- test/models/customer_test.rb | 21 +++++++++++++++++++-- test/models/movie_test.rb | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 20e262996..7dc729947 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -59,7 +59,6 @@ describe 'Relationships' do # has_many :rentals - # has_many :movies, through: :rentals it 'can have many rentals' do customer.rentals << rentals(:rental1) customer.rentals << rentals(:rental2) @@ -68,7 +67,25 @@ expect(rentals.length).must_be :>=, 2 rentals.each do |rental| expect(rental).must_be_instance_of Rental - end + end + + end + + it 'can have many movies through rentals' do + # has_many :movies, through: :rentals + customer.rentals << rentals(:rental1) + customer.rentals << rentals(:rental2) + rentals = customer.rentals + + customer_movies = [] + rentals.each do |rental| + customer_movies << rental.movie + end + + expect(customer_movies.length).must_be :>=, 2 + customer_movies.each do |movie| + expect(movie).must_be_instance_of Movie + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 40cd72026..262bc40f4 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,27 @@ require "test_helper" # describe Movie do -# let(:movie) { Movie.new } +# let(:movie) { movies(:movie1) } # # it "must be valid" do # value(movie).must_be :valid? # end +# +# describe 'Relationships' do +# # has_many :rentals +# # has_many :customers, through: :rentals +# it 'can have many rentals' do +# movie.customers << rentals(:rental1) +# movie.customers << rentals(:rental2) +# rentals = movie.rentals +# +# expect(rentals.length).must_be :>=, 2 +# rentals.each do |rental| +# expect(rental).must_be_instance_of Rental +# end +# +# end +# end +# +# # end From 2d43ebd7b392be1c679ceb184285b641d264c147 Mon Sep 17 00:00:00 2001 From: Jazz Date: Mon, 5 Nov 2018 15:32:12 -0800 Subject: [PATCH 09/37] add movie model test --- test/models/movie_test.rb | 64 ++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 40cd72026..966325260 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,59 @@ require "test_helper" -# describe Movie do -# let(:movie) { Movie.new } -# -# it "must be valid" do -# value(movie).must_be :valid? -# end -# end + +# has_many :rentals +# has_many :customers, through: :rentals + +describe Movie do + let(:movie) { movies(:movie1) } + + it "must be valid" do + value(movie).must_be :valid? + end + + it "must have required fields" do + fields = [:title, :release_date] + + fields.each do |field| + expect(movie).must_respond_to field + end + end + + describe 'Validations' do + it 'must have a movie title' do + movie.title = nil + + valid = movie.save + expect(valid).must_equal false + expect(movie.errors.messages).must_include :title + end + + it 'must have registered_at ' do + movie.release_date = nil + + valid = movie.save + expect(valid).must_equal false + expect(movie.errors.messages).must_include :release_date + end + + end #end of validations block + + + describe 'Relationships' do + # has_many :rentals + # has_many :customers, through: :rentals + it 'can have many customers' do + movie.rentals << rentals(:rental1) + movie.rentals << rentals(:rental2) + rentals = movie.rentals + + expect(rentals.length).must_be :>=, 2 + rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + + end + end + + +end From 242a4c138e2d5e5e44559a4f3001d872d38a0fec Mon Sep 17 00:00:00 2001 From: Jazz Date: Mon, 5 Nov 2018 15:53:17 -0800 Subject: [PATCH 10/37] movie model testing --- test/models/movie_test.rb | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9b8bef760..ef055071e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,6 +1,5 @@ require "test_helper" -<<<<<<< HEAD # has_many :rentals # has_many :customers, through: :rentals @@ -52,36 +51,14 @@ rentals.each do |rental| expect(rental).must_be_instance_of Rental end + end + it 'can has a customer through rentals' do + rental = rentals(:rental2) + expect(rental.customer).must_be_instance_of Customer + expect(rental.customer).must_respond_to :name end end end -======= -# describe Movie do -# let(:movie) { movies(:movie1) } -# -# it "must be valid" do -# value(movie).must_be :valid? -# end -# -# describe 'Relationships' do -# # has_many :rentals -# # has_many :customers, through: :rentals -# it 'can have many rentals' do -# movie.customers << rentals(:rental1) -# movie.customers << rentals(:rental2) -# rentals = movie.rentals -# -# expect(rentals.length).must_be :>=, 2 -# rentals.each do |rental| -# expect(rental).must_be_instance_of Rental -# end -# -# end -# end -# -# -# end ->>>>>>> 9c1a44fe0f96620141c4bda99568e6d245a3fb26 From fc4a53378b1189e6256197f76d5b12a9caecd051 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Mon, 5 Nov 2018 16:11:22 -0800 Subject: [PATCH 11/37] did rental model relationship tests --- Gemfile | 2 +- test/models/rental_test.rb | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 1d10e5eb5..628e2b103 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'puma', '~> 3.11' # gem 'bcrypt', '~> 3.1.7' # Use ActiveStorage variant -# gem 'mini_magick', '~> 4.8' +# gem 'mini_magick'x, '~> 4.8' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 97dcc8fcf..688e2977e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,25 @@ require "test_helper" -# describe Rental do -# let(:rental) { Rental.new } -# -# it "must be valid" do -# value(rental).must_be :valid? -# end -# end +describe Rental do + let(:rental1) {rentals(:rental1)} + + it "must be valid" do + value(rental1).must_be :valid? + end + + describe "Relationships" do + it "has a movie" do + rental1 = rentals(:rental1) + rental1.must_respond_to :movie + rental1.movie.must_be_kind_of Movie + end + it "has a customer" do + rental1 = rentals(:rental1) + rental1.must_respond_to :customer + rental1.customer.must_be_kind_of Customer + end + + end + + +end From d33b7e07df496012169d0cdf05c00b2d8d58e8c9 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Mon, 5 Nov 2018 16:56:54 -0800 Subject: [PATCH 12/37] added movie model validations and --- app/models/movie.rb | 4 +++- test/fixtures/movies.yml | 10 +++++----- test/models/movie_test.rb | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index ac1c685e0..1702dbb4f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,9 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - # validates :id, presence: true validates :title, presence: true validates :release_date, presence: true + validates :overview, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 8508a0149..eb4e4f6ae 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -3,16 +3,16 @@ movie1: title: title1 release_date: releasedate1 + overview: so great + inventory: 10 movie2: title: title2 release_date: releasedate2 + overview: so background + inventory: 2 - # has_many :rentals - # has_many :customers, through: :rentals - # # validates :id, presence: true - # validates :title, presence: true - # validates :release_date, presence: true + diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ef055071e..8096ce8fb 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -28,7 +28,7 @@ expect(movie.errors.messages).must_include :title end - it 'must have registered_at ' do + it 'must have release_date ' do movie.release_date = nil valid = movie.save @@ -36,6 +36,41 @@ expect(movie.errors.messages).must_include :release_date end + it 'must have overview' do + movie.overview = nil + + valid = movie.save + expect(valid).must_equal false + expect(movie.errors.messages).must_include :overview + end + + it 'must have inventory' do + movie.inventory = nil + + valid = movie.save + expect(valid).must_equal false + expect(movie.errors.messages).must_include :inventory + + end + + it 'requires inventory to be an integer' do + movie.inventory = "string" + + valid = movie.save + expect(valid).must_equal false + expect(movie.errors.messages).must_include :inventory + + end + + it 'requires an integer that is greater than 0' do + movie.inventory = -2 + + valid = movie.save + expect(valid).must_equal false + expect(movie.errors.messages).must_include :inventory + + end + end #end of validations block From 29ef3c86fccb34d105f9e479be72ba39b4d5949b Mon Sep 17 00:00:00 2001 From: Jazz Date: Mon, 5 Nov 2018 17:01:08 -0800 Subject: [PATCH 13/37] add controller methods to movies and customers --- app/controllers/customers_controller.rb | 8 ++++ app/controllers/movies_controller.rb | 43 +++++++++++++++++++ app/models/movie.rb | 5 +++ config/routes.rb | 8 +++- test/controllers/customers_controller_test.rb | 9 ++++ test/controllers/movies_controller_test.rb | 14 ++++++ 6 files changed, 86 insertions(+), 1 deletion(-) 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..ebb6c9f79 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,8 @@ +class CustomersController < ApplicationController + def index + customer = Customer.all + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), + status: :ok + end + +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6927db92c --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,43 @@ +class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), + status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie.nil? + render json: { ok: false, message: "not found"}, + status: :not_found + else + render json: { + ok: true, + movie: movie.as_json(only: [:title, :overview, :inventory, :available_inventory => 1]) + }, status: :ok + end + end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { ok: true, + movie: movie.as_json(only: [:id]) + }, status: :ok + else + render json: { + ok: false, + message: movie.errors.messages + }, status: :bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :inventory, :release_date) + end + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index ac1c685e0..eb18d74e4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,4 +4,9 @@ class Movie < ApplicationRecord # validates :id, presence: true validates :title, presence: true validates :release_date, presence: true + + #create method to subtract current inventory for each rental + + + end diff --git a/config/routes.rb b/config/routes.rb index fd3451125..583c84c29 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,13 @@ Rails.application.routes.draw do + + get '/movies', to: 'movies#index' + post '/movies', to: 'movies#create' + get 'movies/:id', to: 'movies#show' + + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get '/customers', to: 'customers#index' + get '/customers', to: 'customers#index' #get customers -> returns id, name registered_at, postal_code, phone #get movies diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..b05e35a17 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe MoviesController do + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + +end From d0421f6d35ab2d2e12385fbdfbbea598a12fd109 Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 11:20:20 -0800 Subject: [PATCH 14/37] added API test to customer and movie --- config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 52 +++++++- test/controllers/movies_controller_test.rb | 123 +++++++++++++++++- 3 files changed, 170 insertions(+), 7 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 583c84c29..68205dd78 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ get '/movies', to: 'movies#index' post '/movies', to: 'movies#create' - get 'movies/:id', to: 'movies#show' + get 'movies/:id', to: 'movies#show', as: "movie" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..ed3547228 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,59 @@ require "test_helper" describe CustomersController do + it "should get index" do - get customers_index_url + get customers_path value(response).must_be :success? end + describe "API Testing" do + it "is a real working route and returns JSON" do + # Act + get customers_path + + # Assert + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "returns an Array" do + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_kind_of Array + end + + it "returns all of the customers" do + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body.length).must_equal Customer.count + end + + it "returns movies with exactly the required fields" do + fields = %w(id movies_checked_out_count name phone postal_code registered_at) + + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert that each + body.each do |customer| + expect(customer.keys.sort).must_equal fields + expect(customer.keys.length).must_equal fields.length + end + end + + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b05e35a17..89efa3b4c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,14 +1,127 @@ require "test_helper" describe MoviesController do - it "should get show" do - get movies_show_url - value(response).must_be :success? - end it "should get index" do - get movies_index_url + get movies_path value(response).must_be :success? end + + describe "API Testing" do + + it "is a real working route and returns JSON" do + # Act + get movies_path + + # Assert + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + + end + + it "returns an Array" do + # Act + get movies_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_kind_of Array + end + + it "returns all of the movies" do + # Act + get movies_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body.length).must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + fields = %w(id release_date title) + + # Act + get movies_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert that each + body.each do |movie| + expect(movie.keys.sort).must_equal fields + expect(movie.keys.length).must_equal fields.length + end + end + + describe "show api testing" do + + it "returns movies with exactly the required fields" do + id = movies(:movie1).id + + get movie_path(id) + must_respond_with :success + + end + + it "returns a 404 not found page for invalid movie" do + fields = %w(id release_date title) + + # Act + get movie_path(-1) + + must_respond_with :not_found + end + end + + describe "create" do + let(:movie_data) { + { + title: "Jack the Movie", + overview: "A cool movie", + release_date: "Oct 23 2018", + inventory: 10 + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: { movie: movie_data } + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body["movie"]).must_include "id" + + movie = Movie.find(body["movie"]["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + + end + + it "returns an error for invalid movie data" do + # arrange + movie_data["title"] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "title" + must_respond_with :bad_request + end + + end + + end end From 2c47a94355a79b82334c64e51bdd4091deddeebc Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Tue, 6 Nov 2018 12:59:00 -0800 Subject: [PATCH 15/37] added column to movies model --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/movies_controller.rb | 13 +- app/models/movie.rb | 1 + ...06192647_add_column_available_inventory.rb | 5 + db/schema.rb | 3 +- db/seeds/movies.json | 272 ++++++++++++------ test/controllers/movies_controller_test.rb | 3 +- test/fixtures/movies.yml | 6 +- 8 files changed, 199 insertions(+), 104 deletions(-) create mode 100644 .DS_Store create mode 100644 db/migrate/20181106192647_add_column_available_inventory.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c3ac046f6c51a2cd4bc2df32c603e493458c382e GIT binary patch literal 6148 zcmeH~F^{dt=u>Bl;zddfqZjB=JE!l7EiIwCR znHYd=e=Zwf1hAw#vGy=AV?N-4FWm9?zTD5J+wJN_+D8XGrH`2G=e8gPq<|EV0#ZN< z%t(Pe#+RQndL})J6p#Y*P{6+rh3>4$))}7;h8O|Jf#oo+W0oL`7s#4yovhF-rw7Yc zi!sFO(N31Ut|nV&Z-?dZVR>isDTZdf9afmotOgXMfE1W0u;}^d=l`Dm-~2ymQ7Q$b zz?&&x!|t%#@}=@@{quTWKW5d}jZVhp3{O7+O#CQb(Zjf3d_mS^>tuzdAAyiTK?=N7 FfnTX=61e~X literal 0 HcmV?d00001 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6927db92c..943c4175e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,19 +13,16 @@ def show render json: { ok: false, message: "not found"}, status: :not_found else - render json: { - ok: true, - movie: movie.as_json(only: [:title, :overview, :inventory, :available_inventory => 1]) - }, status: :ok + render json: movie.as_json(only: [:title, :overview, :inventory,:release_date, :available_inventory]), + status: :ok end end def create movie = Movie.new(movie_params) if movie.save - render json: { ok: true, - movie: movie.as_json(only: [:id]) - }, status: :ok + render json: movie.as_json(only: [:id]), + status: :ok else render json: { ok: false, @@ -37,7 +34,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :inventory, :release_date) + params.require(:movie).permit(:title, :overview, :inventory, :release_date, :available_inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 1702dbb4f..b69a0d4c5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,5 +5,6 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :overview, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } end diff --git a/db/migrate/20181106192647_add_column_available_inventory.rb b/db/migrate/20181106192647_add_column_available_inventory.rb new file mode 100644 index 000000000..d2e73510a --- /dev/null +++ b/db/migrate/20181106192647_add_column_available_inventory.rb @@ -0,0 +1,5 @@ +class AddColumnAvailableInventory < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 6d9d352ff..3e4783cff 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_05_215113) do +ActiveRecord::Schema.define(version: 2018_11_06_192647) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/db/seeds/movies.json b/db/seeds/movies.json index de0db0c5e..486c850f3 100644 --- a/db/seeds/movies.json +++ b/db/seeds/movies.json @@ -3,540 +3,632 @@ "title":"Blacksmith Of The Banished", "overview":"The unexciting life of a boy will be permanently altered as a strange woman enters his life.", "release_date":"1979-01-18", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Savior Of The Curse", "overview":"The strange woman claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Unsure what to think of all this and of this strange woman, the boy hesitantly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date":"2010-11-05", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Women Of Destruction", "overview":"But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell.", "release_date":"2006-10-01", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Robots Of Eternity", "overview":"The laid-back life of a woman is going in a different direction as a childhood friend enters her life.", "release_date":"2007-10-10", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Rats And Strangers", "overview":"The childhood friend claims the woman is heir to an incredible fortune, all paperwork has been taken care of already, all there's left to do is sign them. Distrustful of both this situation and of this childhood friend, the woman somewhat gladly agrees to the proposal, but there's no time to waste, a decision had to be made quickly.", "release_date":"2012-09-25", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Soldiers And Gangsters", "overview":"But what if this childhood friend is just a crazy person. Or what if the complete opposite is true. How could an ordinary woman be relied upon in something this big. No turning back now though.", "release_date":"1948-03-31", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Body Of Utopia", "overview":"The peaceful life of a teenage girl is going the complete opposite way as a stranger enters her life.", "release_date":"1967-10-25", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Faith Of The Ancestors", "overview":"The stranger claims the teenage girl is now part of a murder investigation and might be the number one suspect, no arrest will be made in front of possible friends and neighbors if there's no resistance. Concerned of the situation and a little distrustful of this stranger, the teenage girl tentatively agrees to the proposal, no matter what, something has to be done in this situation, hopefully this was the right choice.", "release_date":"1953-10-05", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Traces In The Leaders", "overview":"But what if this stranger cannot be relied upon. Or what if somebody is orchestrating all of this. How could an ordinary teenage girl figure out the truth in all of this. Either way, the choice has been made.", "release_date":"1970-11-03", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Bathing In The Void", "overview":"The stressful life of a girl changes for better or worse as a stranger enters her life.", "release_date":"2013-09-13", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Mouse Of My House", "overview":"The stranger claims the girl is now cursed along with everybody else in this town. Why? By whom? What kind of curse exactly? Nobody seems to know, but the person supposedly responsible for this curse will explain everything at the town hall this afternoon, everybody should come. Unsure what to think of all this and of this stranger, the girl cautiously agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date":"1993-12-27", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Baby Of Tomorrow", "overview":"But what if this stranger is trying be misleading. Or what if the complete opposite is true. How could an ordinary girl find out what's happening without help. Only one way to find out.", "release_date":"1977-03-23", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Cats Of Wonder", "overview":"The carefree life of a young girl will change forever as a neighbor enters her life.", "release_date":"1939-03-13", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Kittens Of Excelsior", "overview":"The neighbor claims the young girl better leave the city now. The rivaling gangs have spiraled into an all out war, soon the entire city will be a battleground and the government apparently plans to surround the city and let the gangs fight it out, better to let them kill each other than risk soldier lives they say. Unsure what to think of all this and of this neighbor, the young girl oddly willingly agrees to the proposal, the situation is all too strange, it's best to get more information as soon as possible.", "release_date":"1965-06-10", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Dinos And Boys", "overview":"But what if this neighbor can't be trusted. Or what if all this is an elaborate trap. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. No turning back now though.", "release_date":"1973-10-20", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Tigers And Kids", "overview":"The secluded life of a elderly woman is going in a different direction as a friendly acquaintance enters her life.", "release_date":"2007-03-17", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Wand Of My Country", "overview":"The friendly acquaintance claims the elderly woman is needed, all capable hands are needed. The dam is breaking and if we don't get every person working on repairing it the entire town might be destroyed by the following flood. Concerned of the situation and a little distrustful of this friendly acquaintance, the elderly woman oddly enthusiastically agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date":"1960-06-26", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Tales Of My Imagination", "overview":"But what if this friendly acquaintance is pulling a prank. Or what if the wrong person was picked for this. How could an ordinary elderly woman play a part in all this. No turning back now though.", "release_date":"1985-09-21", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Learning With My Home", "overview":"The calm life of a elderly man is going the complete opposite way as a strange boy enters his life.", "release_date":"1939-09-01", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Fearless With My Home", "overview":"The strange boy claims the elderly man is one of the rare few people in possession of a guardian animal spirit. It's widely known these exist and rituals are held on a near weekly basis to connect with these guardian spirits, now its time to be the center of that ritual. Unconvinced of the situation, but trusting of this strange boy, the elderly man hesitantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date":"1965-03-28", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Thief Without A Conscience", "overview":"But what if this strange boy can't be trusted. Or what if there's a change of mind. How could an ordinary elderly man be this important to the situation. Time to find out.", "release_date":"1982-11-14", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Knight Of Last Rites", "overview":"The normal life of a girl will be changed completely as a strange man enters her life.", "release_date":"1973-12-16", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Horses With Hoods", "overview":"The strange man claims the girl plays a vital role in the future, but that this version of the future cannot be allowed to be. The only way to prevent it is by traveling in time with this supposed time traveler. Sure of the truth in this situation, but somewhat distrustful of this strange man, the girl somewhat hesitantly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1965-09-16", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Heirs With Gold", "overview":"But what if this strange man cannot be relied upon. Or what if all this is an elaborate trap. How could an ordinary girl be relied upon in something this big. Only one way to find out.", "release_date":"1949-10-03", - "inventory":1 + "inventory":1, + "available_inventory":1 + }, { "title":"Scientists And Rats", "overview":"The ordinary life of a young guy take a sharp turn as a childhood friend enters his life.", "release_date":"1973-11-07", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Invaders And Guardians", "overview":"The childhood friend claims the young guy is in possession of a powerful artifact, an artifact which looks like any ordinary object, but an artifact which is of the utmost importance to this person, who will offer a reward for it. Sure of the truth in this situation, but somewhat distrustful of this childhood friend, the young guy oddly willingly agrees to the proposal, if all this turns out to be false, this choice will seem foolish, but it's still worth checking out.", "release_date":"1990-06-04", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Accidents Of Hell", "overview":"But what if this childhood friend is a con artist. Or what if everything told is completely true. How could an ordinary young guy be relied upon in something this big. We're about to find out.", "release_date":"1944-03-24", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Confinement Of War", "overview":"The fast-paced life of a teenage girl changes in an instant as a friendly acquaintance enters her life.", "release_date":"1959-04-06", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Breath Of The Apocalypse", "overview":"The friendly acquaintance claims the teenage girl is actually already dead, a spirit trapped in a state of denial, not ready to move on yet. The person claims there's proof of this elsewhere. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the teenage girl oddly willingly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date":"1965-06-10", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Force Of A Storm", "overview":"But what if this friendly acquaintance cannot be relied upon. Or what if there's a change of mind. How could an ordinary teenage girl find out what's happening without help. Time to find out.", "release_date":"1972-03-25", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Officer Without Fear", "overview":"The ordinary life of a woman changes for better or worse as a strange woman enters her life.", "release_date":"1987-03-06", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Spider Of The Gods", "overview":"The strange woman claims the woman was a witness of a horrific crime, a crime for which an innocent person is in jail for. Due to the horrific nature of the crime the memory was likely blocked, but there's a way to unblock it and save an innocent life. Unconvinced of the situation, but trusting of this strange woman, the woman somewhat keenly agrees to the proposal, the situation is all too strange, it's best to get more information as soon as possible.", "release_date":"2010-01-16", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Women Of Insanity", "overview":"But what if this strange woman can't be trusted. Or what if the complete opposite is true. How could an ordinary woman end up in a situation like this. Only one way to find out.", "release_date":"1997-10-03", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Doctors Of Water", "overview":"The stable life of a teenage girl changes for better or worse as a stranger enters her life.", "release_date":"1953-04-03", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Snakes And Turtles", "overview":"The stranger claims the teenage girl better leave the city now. The rivaling gangs have spiraled into an all out war, soon the entire city will be a battleground and the government apparently plans to surround the city and let the gangs fight it out, better to let them kill each other than risk soldier lives they say. Suspicious of this situation, but somewhat trusting of this stranger, the teenage girl unusually eagerly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1992-12-14", - "inventory":11 + "inventory":11, + "available_inventory":11 + }, { "title":"Rogues And Boys", "overview":"But what if this stranger is pulling a prank. Or what if all this is an elaborate trap. How could an ordinary teenage girl find out what's happening without help. We're about to find out.", "release_date":"1979-12-30", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Loss Of The Sea", "overview":"The relaxed life of a boy will change forever as a lost friend enters his life.", "release_date":"1976-07-16", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Annihilation Of Autumn", "overview":"The lost friend claims the boy is in possession of a powerful artifact, one which looks like any other object, but one which could bring total destruction if fallen in the wrong hands. The person wishes to destroy it, with or without help. Unconvinced of the situation, but trusting of this lost friend, the boy oddly enthusiastically agrees to the proposal, it might be a mistake, but both options could've been the mistake, one had to be chosen.", "release_date":"2016-11-09", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Searching At The Leaders", "overview":"But what if this lost friend is trying be misleading. Or what if the situation has changed or will change. How could an ordinary boy be this important to the situation. We're about to find out.", "release_date":"1995-12-21", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Taste Of The Immortals", "overview":"The rough life of a young girl might turn out differently as a strange woman enters her life.", "release_date":"1948-02-12", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Criminal Arrangement", "overview":"The strange woman claims the young girl is now cursed along with everybody else in this town. Why? By whom? What kind of curse exactly? Nobody seems to know, but the person supposedly responsible for this curse will explain everything at the town hall this afternoon, everybody should come. Unsure what to think of all this and of this strange woman, the young girl somewhat grudgingly agrees to the proposal, it's probably best to get to the bottom of this as soon as possible.", "release_date":"1939-04-23", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Spider In The Window", "overview":"But what if this strange woman is a con artist. Or what if the complete opposite is true. How could an ordinary young girl find out what's happening without help. Either way, the choice has been made.", "release_date":"2007-06-29", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Comedian Makeover", "overview":"The laid-back life of a young girl changes in an instant as a childhood friend enters her life.", "release_date":"1944-06-14", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Baker On A Day Out", "overview":"The childhood friend claims the young girl is in for a fun day. A new casino opened up in town and is giving everybody a free roll on their slot machine, with a little luck who knows what could happen. Skeptical of this situation and of this childhood friend, the young girl cautiously agrees to the proposal, if anything this will at least speed things up, for better and for worse.", "release_date":"1948-07-26", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Spider And Thief", "overview":"But what if this childhood friend is just a crazy person. Or what if everything told is completely true. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. No turning back now though.", "release_date":"1950-05-07", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Rat And Chicken", "overview":"The carefree life of a elderly man will change forever as a strange woman enters his life.", "release_date":"1993-10-05", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Laughing Stalks Me", "overview":"The strange woman claims the elderly man is now the citizen of a different country. The old country has just been taken over by an enemy force, everybody who wishes to leave this new nation has 3 days to do so. Distrustful of both this situation and of this strange woman, the elderly man tentatively agrees to the proposal, this whole situation is both exciting and terrifying at the same time, but surely the right choice was made.", "release_date":"1946-09-06", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Fools Can Cook", "overview":"But what if this strange woman is a con artist. Or what if this proposal is wrong or missing important details. How could an ordinary elderly man be this important to the situation. Only one way to find out.", "release_date":"2013-11-20", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Power Of The Project", "overview":"The unexciting life of a teenage boy is going in a different direction as a lost friend enters his life.", "release_date":"1982-02-19", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Intelligence Of My Teacher", "overview":"The lost friend claims the teenage boy is in possession of a powerful artifact, one which looks like any other object, but one which could bring total destruction if fallen in the wrong hands. The person wishes to destroy it, with or without help. Unsure what to think of all this and of this lost friend, the teenage boy somewhat hesitantly agrees to the proposal, this whole situation is both exciting and terrifying at the same time, but surely the right choice was made.", "release_date":"2017-02-18", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Priest Of Outer Space", "overview":"But what if this lost friend speaks only lies. Or what if the situation has changed or will change. How could an ordinary teenage boy come out of this situation in a better way. No turning back now though.", "release_date":"1975-12-06", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Spy Of A Dog", "overview":"The secluded life of a teenage girl take a sharp turn as a stranger enters her life.", "release_date":"1972-11-18", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Enemies Of The Mountain", "overview":"The stranger claims the teenage girl is in for a treat this afternoon. Supposedly this strange person has discovered a way to unlock the hidden potentials of the brain and will show the whole town this afternoon, it's not an event you want to miss. Concerned of the situation and a little distrusful of this stranger, the teenage girl tentatively agrees to the proposal, if anything this will at least speed things up, for better and for worse.", "release_date":"1956-10-16", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Lions Of Tomorrow", "overview":"But what if this stranger is wrong about all this. Or what if this proposal is wrong or missing important details. How could an ordinary teenage girl be helpful at all in this situation. Either way, the choice has been made.", "release_date":"1983-07-03", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Serpents And Kings", "overview":"The stable life of a elderly man might be changing forever as a friendly acquaintance enters his life.", "release_date":"2016-09-08", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Agents And Robots", "overview":"The friendly acquaintance claims the elderly man plays a vital role in the future, but that this version of the future cannot be allowed to be. The only way to prevent it is by traveling in time with this supposed time traveler. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the elderly man oddly enthusiastically agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1964-06-19", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Death Of The Mountain", "overview":"But what if this friendly acquaintance is trying be misleading. Or what if the complete opposite is true. How could an ordinary elderly man be needed for a situation like this. Time will tell.", "release_date":"1973-07-22", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Picture Of The Lake", "overview":"The casual life of a woman will change forever as a friendly acquaintance enters her life.", "release_date":"2014-10-19", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Muted By The River", "overview":"The friendly acquaintance claims the woman is actually already dead, a spirit trapped in a state of denial, not ready to move on yet. The person claims there's proof of this elsewhere. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the woman hastily agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date":"1992-10-23", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Young In The Chasm", "overview":"But what if this friendly acquaintance cannot be relied upon. Or what if the complete opposite is true. How could an ordinary woman be this important to the situation. Time to find out.", "release_date":"1948-05-21", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Politicians Of The East", "overview":"The normal life of a girl might be changing forever as a new friend enters her life.", "release_date":"2010-11-30", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Women Of Science", "overview":"The new friend claims the girl is the 'chosen one' according to an ancient prophecy. The prophecy states the chosen one will save the world, but only if properly trained. There is no time to waste. Distrustful of both this situation and of this new friend, the girl somewhat reluctantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date":"1956-04-02", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Preys Of The North", "overview":"But what if this new friend is trying to manipulate the situation. Or what if everything told is completely true. How could an ordinary girl come out of this situation in a better way. No turning back now though.", "release_date":"1957-07-12", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Kings Of Medicine", "overview":"The nonchalant life of a woman might turn out differently as a strange woman enters her life.", "release_date":"1966-12-22", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Stars And Sinners", "overview":"The strange woman claims the woman is actually the rightful heir to the throne, this information has obviously been kept secret by the current holders of the throne, but once this information gets out to the public the people will surely stand behind the true heir. Concerned of the situation and a little distrusful of this strange woman, the woman somewhat hesitantly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1985-08-30", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Fungi And Amphibians", "overview":"But what if this strange woman is trying to manipulate the situation. Or what if the wrong person was picked for this. How could an ordinary woman be this lucky, or unlucky, depending on the turnout. Either way, the choice has been made.", "release_date":"1971-02-07", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Wonders Of The Hunt", "overview":"The laid-back life of a young guy has a chance to change, for better or worse, as a strange girl enters his life.", "release_date":"1978-04-01", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Crimes Of The Mountains", "overview":"The strange girl claims the young guy is now part of a murder investigation and might be the number one suspect, no arrest will be made in front of possible friends and neighbors if there's no resistance. Suspicious of this situation, but somewhat trusting of this strange girl, the young guy oddly willingly agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date":"1959-01-29", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Hidden The Swamps", "overview":"But what if this strange girl is wrong about all this. Or what if all this is an elaborate trap. How could an ordinary young guy be needed for a situation like this. We're about to find out.", "release_date":"1951-02-19", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Love For Women", "overview":"The carefree life of a boy changes for better or worse as a friendly acquaintance enters his life.", "release_date":"1952-02-24", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Boyfriend Of The Evening", "overview":"The friendly acquaintance claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Skeptical of this situation and of this friendly acquaintance, the boy oddly willingly agrees to the proposal, it was probably a good idea to make a quick decision anyway.", "release_date":"1973-02-27", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Man Of Dawn", "overview":"But what if this friendly acquaintance is a con artist. Or what if somebody is orchestrating all of this. How could an ordinary boy play a part in all this. Either way, the choice has been made.", "release_date":"1960-07-16", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Trueloves With Freckles", "overview":"The fast-paced life of a elderly man will be permanently altered as a strange girl enters his life.", "release_date":"1977-11-06", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Girlfriends In The Forest", "overview":"The strange girl claims the elderly man will need to find a new home as this current house will be demolished by the government in order to make room for a highway. A large sum of money will be paid if the house is left within a week. Distrustful of both this situation and of this strange girl, the elderly man somewhat keenly agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date":"2009-05-03", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Queens And Trueloves", "overview":"But what if this strange girl is pulling a prank. Or what if everything told is completely true. How could an ordinary elderly man be helpful at all in this situation. Time to find out.", "release_date":"1962-06-22", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Foreigners And Neighbors", "overview":"The calm life of a young girl might turn out differently as a strange boy enters her life.", "release_date":"2005-02-28", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Name Of Fortune", "overview":"The strange boy claims the young girl was a witness of a horrific crime, a crime for which an innocent person is in jail for. Due to the horrific nature of the crime the memory was likely blocked, but there's a way to unblock it and save an innocent life. Suspicious of this situation, but somewhat trusting of this strange boy, the young girl somewhat reluctantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date":"1953-04-19", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Edge Of Tomorrow", "overview":"But what if this strange boy can't be trusted. Or what if the wrong person was picked for this. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. Time to find out.", "release_date":"2008-03-12", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Punished By The Stars", "overview":"The secluded life of a elderly woman is going in a different direction as a childhood friend enters her life.", "release_date":"2004-09-13", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Guarded By My Dreams", "overview":"The childhood friend claims the elderly woman is actually part of a 'sub-species' of humans with hidden powers and wants to show what these hidden powers can do. Unsure about everything, including this childhood friend, the elderly woman somewhat gladly agrees to the proposal, but something does feel very wrong about this whole situation, hopefully the right choice was made.", "release_date":"1986-04-26", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Man Of Exploration", "overview":"But what if this childhood friend is a con artist. Or what if this proposal is wrong or missing important details. How could an ordinary elderly woman figure out the truth in all of this. Only one way to find out.", "release_date":"2011-04-28", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Leader Of New Earth", "overview":"The normal life of a young girl changes for better or worse as a strange man enters her life.", "release_date":"1955-10-14", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Guardians Of Eternity", "overview":"The strange man claims the young girl has been chosen to compete against others of other regions in a 'competition'. The winner will gain not only the honor and glory of winning, but will also never need for anything for the rest of their life. Certain of the truth in this situation and of this strange man, the young girl somewhat reluctantly agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date":"1946-12-27", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Soldiers Of The Outlands", "overview":"But what if this strange man is wrong about all this. Or what if all this is an elaborate trap. How could an ordinary young girl end up in a situation like this. Either way, the choice has been made.", "release_date":"1939-03-20", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Leaders And Commanders", "overview":"The quiet life of a elderly man changes in an instant as a childhood friend enters his life.", "release_date":"1982-03-15", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Medics And Strangers", "overview":"The childhood friend claims the elderly man is actually the rightful heir to the throne, this information has obviously been kept secret by the current holders of the throne, but once this information gets out to the public the people will surely stand behind the true heir. Skeptical of this situation and of this childhood friend, the elderly man hesitantly agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date":"2007-03-13", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Beginning Of The Vacuum", "overview":"But what if this childhood friend is just a crazy person. Or what if all this is an elaborate trap. How could an ordinary elderly man be needed for a situation like this. Time will tell.", "release_date":"1943-11-11", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Fate Of Alien Life", "overview":"The normal life of a girl might be changing forever as a neighbor enters her life.", "release_date":"1938-12-01", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Created By Androids", "overview":"The neighbor claims the girl plays a vital role in the survival of the universe and must come along to train for battle or else the universe might be lost forever. Unsure about everything, including this neighbor, the girl hesitantly agrees to the proposal, the choice was made fast, perhaps too fast, but this situation requires quick thinking.", "release_date":"1963-04-16", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Elegance Of The Machines", "overview":"But what if this neighbor is wrong about all this. Or what if the situation is worse than it appears. How could an ordinary girl be this lucky, or unlucky, depending on the turnout. We're about to find out.", "release_date":"1991-05-19", - "inventory":7 + "inventory":7, + "available_inventory":7 } ] diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 89efa3b4c..f071fea4c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -84,7 +84,8 @@ title: "Jack the Movie", overview: "A cool movie", release_date: "Oct 23 2018", - inventory: 10 + inventory: 10, + available_inventory: 10 } } diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index eb4e4f6ae..a9822a7bc 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,6 +5,7 @@ movie1: release_date: releasedate1 overview: so great inventory: 10 + available_inventory: 10 movie2: @@ -12,7 +13,4 @@ movie2: release_date: releasedate2 overview: so background inventory: 2 - - - - + available_inventory: 2 From d6562eefa8cc3afeb1d4a183a62c52037749bdc5 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Tue, 6 Nov 2018 13:33:17 -0800 Subject: [PATCH 16/37] adjusted strong params --- app/controllers/movies_controller.rb | 3 ++- app/models/movie.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 943c4175e..e10ff448a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,6 +20,7 @@ def show def create movie = Movie.new(movie_params) + if movie.save render json: movie.as_json(only: [:id]), status: :ok @@ -34,7 +35,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :inventory, :release_date, :available_inventory) + params.permit(:title, :overview, :inventory, :release_date, :available_inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index b69a0d4c5..1bac7040b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,6 +5,6 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :overview, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + # validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } end From 25e463fcea4fac234eece6140b5f2a3198bd0ecb Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 13:42:52 -0800 Subject: [PATCH 17/37] pulling master --- app/controllers/movies_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e10ff448a..51aab1747 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,17 +13,16 @@ def show render json: { ok: false, message: "not found"}, status: :not_found else - render json: movie.as_json(only: [:title, :overview, :inventory,:release_date, :available_inventory]), - status: :ok + render json: movie.as_json(only: [:title, :overview, :inventory]), + status: :ok end end def create movie = Movie.new(movie_params) - if movie.save render json: movie.as_json(only: [:id]), - status: :ok + status: :ok else render json: { ok: false, From fa264244f5423dc711124e91b2f6047dba652323 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Tue, 6 Nov 2018 13:43:36 -0800 Subject: [PATCH 18/37] added comment --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e10ff448a..1a4e7c624 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -37,5 +37,5 @@ def create def movie_params params.permit(:title, :overview, :inventory, :release_date, :available_inventory) end - +#comment end From ea0501be1528824c579af2c56002e2279e5731c1 Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 13:48:56 -0800 Subject: [PATCH 19/37] fixed bug --- app/controllers/movies_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3ca6e43e9..4f6ce4efa 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,7 +13,7 @@ def show render json: { ok: false, message: "not found"}, status: :not_found else - render json: movie.as_json(only: [:title, :overview, :inventory]), + render json: movie.as_json(only: [:title, :overview, :inventory, :release_date, :available_inventory]), status: :ok end end @@ -36,5 +36,5 @@ def create def movie_params params.permit(:title, :overview, :inventory, :release_date, :available_inventory) end -#comment + end From bb64be5ab05caa6f9ad67e0147b7acee816639a6 Mon Sep 17 00:00:00 2001 From: Kay Date: Tue, 6 Nov 2018 15:12:58 -0800 Subject: [PATCH 20/37] created rental controller with checkout and checkin methods --- app/controllers/rentals_controller.rb | 34 +++++++++++ app/models/rental.rb | 1 + config/routes.rb | 13 +--- test/controllers/rentals_controller_test.rb | 68 +++++++++++++++++++++ 4 files changed, 106 insertions(+), 10 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..9ba23f45a --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,34 @@ +class RentalsController < ApplicationController + def checkout + + rental = Rental.new(rental_params) + customer = Customer.find_by(id: params[:id]) + movie = Movie.find_by(id: params[:id]) + rental.customer_id = customer.id + rental.movie_id = movie.id + + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 + + if rental.save + render json: rental.as_json(only: [:customer_id, :movie_id]), + status: :ok + else + render json: { + ok: false, + message: rental.errors.messages + }, status: :bad_request + end + end + + def checkin + end + + + private + + def rental_params + params.permit(:customer_id, :movie_id, :checkout_date, :due_date ) + end + +end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..09e05ad13 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,5 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + end diff --git a/config/routes.rb b/config/routes.rb index 68205dd78..a18284e23 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,19 +1,12 @@ Rails.application.routes.draw do + post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post 'rentals/checkin', to: 'rentals#checkin', as: 'checkin' + get '/movies', to: 'movies#index' post '/movies', to: 'movies#create' get 'movies/:id', to: 'movies#show', as: "movie" - - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get '/customers', to: 'customers#index' - #get customers -> returns id, name registered_at, postal_code, phone - #get movies - #get movies/:id - #post movies -> returns id of the new movie just created - #post /rentals/check-out - #post /rentals/check-in - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..888e60669 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,68 @@ +require "test_helper" + +describe RentalsController do + + # it "should get checkout" do + # post checkout_path + # value(response).must_be :success? + # end + + # it "should get checkin" do + # post checkin_path + # value(response).must_be :success? + # end + + + + + + describe "create (checkout)" do + let(:rental_data) { + { + customer_id: 1, + movie_id: 2, + checkout_date: Date.today, + due_date: 10 + } + } + + it "creates a new rental given valid data" do + expect { + post checkout_path, params: { rental: rental_data } + }.must_change "Rental.count", 1 + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body["rental"]).must_include "id" + + rental = Rental.find(body["rental"]["id"].to_i) + + expect(rental.customer_id).must_equal rental_data[:customer_id] + must_respond_with :success + + end + + # it "returns an error for invalid movie data" do + # # arrange + # movie_data["title"] = nil + # + # expect { + # post movies_path, params: { movie: movie_data } + # }.wont_change "Movie.count" + # + # body = JSON.parse(response.body) + # + # expect(body).must_be_kind_of Hash + # expect(body).must_include "message" + # expect(body["message"]).must_include "title" + # must_respond_with :bad_request + # end + + end + + + + + +end From 5368ffa12d76e576597fd09aebe278a98b3aa8c4 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Tue, 6 Nov 2018 15:25:45 -0800 Subject: [PATCH 21/37] added checkout method --- app/controllers/rentals_controller.rb | 24 ++++++++++++++------- test/controllers/rentals_controller_test.rb | 5 ++--- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9ba23f45a..f7edc66c8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,15 +1,23 @@ class RentalsController < ApplicationController def checkout - rental = Rental.new(rental_params) - customer = Customer.find_by(id: params[:id]) - movie = Movie.find_by(id: params[:id]) - rental.customer_id = customer.id - rental.movie_id = movie.id - - rental.checkout_date = Date.today - rental.due_date = Date.today + 7 + movie = Movie.find_by(id: params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) + rental = Rental.new(customer: customer, movie: movie, + checkout_date: Date.today, due_date: Date.today + 7) + + + + # rental = Rental.new(rental_params) + # customer = Customer.find_by(id: params[:id]) + # movie = Movie.find_by(id: params[:id]) + # rental.customer_id = customer.id + # rental.movie_id = movie.id + # + # rental.checkout_date = Date.today + # rental.due_date = Date.today + 7 + # if rental.save render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 888e60669..9042c7b6a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -20,9 +20,8 @@ let(:rental_data) { { customer_id: 1, - movie_id: 2, - checkout_date: Date.today, - due_date: 10 + movie_id: 2 + } } From 0308959e0ae22d88cd4135249dbaf2c1e7a5c4d8 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Tue, 6 Nov 2018 16:06:11 -0800 Subject: [PATCH 22/37] rental controller --- app/controllers/rentals_controller.rb | 10 +++++++--- test/controllers/rentals_controller_test.rb | 13 +++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f7edc66c8..f988c4b8d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,15 @@ + + class RentalsController < ApplicationController def checkout - movie = Movie.find_by(id: params[:movie_id]) - customer = Customer.find_by(id: params[:customer_id]) + @movie = Movie.find_by(id: rental_params[:movie_id]) + @customer = Customer.find_by(id: rental_params[:customer_id]) - rental = Rental.new(customer: customer, movie: movie, + rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, checkout_date: Date.today, due_date: Date.today + 7) + binding.pry + rental.save diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9042c7b6a..9cf8bde5c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -17,23 +17,20 @@ describe "create (checkout)" do - let(:rental_data) { - { - customer_id: 1, - movie_id: 2 + let(:customer1) {customers(:customer1)} + let(:movie1) {movies(:movie1)} - } - } it "creates a new rental given valid data" do + expect { - post checkout_path, params: { rental: rental_data } + post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } }.must_change "Rental.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body["rental"]).must_include "id" + # expect(body["rental"]).must_include "id" rental = Rental.find(body["rental"]["id"].to_i) From 6fc37bb360aa1d8628d7bb4880497f0b366ad28b Mon Sep 17 00:00:00 2001 From: Kay Date: Tue, 6 Nov 2018 16:19:28 -0800 Subject: [PATCH 23/37] can create rentla with valid input --- app/controllers/rentals_controller.rb | 1 - test/controllers/rentals_controller_test.rb | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f988c4b8d..141ca195b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,6 @@ def checkout rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, checkout_date: Date.today, due_date: Date.today + 7) - binding.pry rental.save diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9cf8bde5c..cd66bcbb8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -31,10 +31,8 @@ expect(body).must_be_kind_of Hash # expect(body["rental"]).must_include "id" - - rental = Rental.find(body["rental"]["id"].to_i) - - expect(rental.customer_id).must_equal rental_data[:customer_id] + expect(Rental.last.customer_id).must_equal body["customer_id"] + expect(Rental.last.movie_id).must_equal body["movie_id"] must_respond_with :success end From 2031d5eae127f51544e7ecff38404bd3abe16e58 Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 17:02:05 -0800 Subject: [PATCH 24/37] checkout test in progress --- app/controllers/rentals_controller.rb | 38 ++++++++------------- config/routes.rb | 4 +-- test/controllers/rentals_controller_test.rb | 29 +++++++++------- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f988c4b8d..1b7d6a822 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,34 +2,26 @@ class RentalsController < ApplicationController def checkout - @movie = Movie.find_by(id: rental_params[:movie_id]) @customer = Customer.find_by(id: rental_params[:customer_id]) - rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, - checkout_date: Date.today, due_date: Date.today + 7) - binding.pry - rental.save - - - - # rental = Rental.new(rental_params) - # customer = Customer.find_by(id: params[:id]) - # movie = Movie.find_by(id: params[:id]) - # rental.customer_id = customer.id - # rental.movie_id = movie.id - # - # rental.checkout_date = Date.today - # rental.due_date = Date.today + 7 - # - if rental.save - render json: rental.as_json(only: [:customer_id, :movie_id]), - status: :ok - else + if @movie.nil? || @customer.nil? render json: { - ok: false, - message: rental.errors.messages + ok: false, message: "not found" }, status: :bad_request + else + rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, + checkout_date: Date.today, due_date: Date.today + 7) + rental.save + if rental + render json: rental.as_json(only: [:customer_id, :movie_id]), + status: :ok + else + render json: { + ok: false, + message: "not found" + }, status: :bad_request + end end end diff --git a/config/routes.rb b/config/routes.rb index a18284e23..a1ccf65bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do - post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' - post 'rentals/checkin', to: 'rentals#checkin', as: 'checkin' + post 'rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' get '/movies', to: 'movies#index' post '/movies', to: 'movies#create' diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9cf8bde5c..921a17476 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,31 +14,36 @@ - - - describe "create (checkout)" do + describe "Checkout Testing" do let(:customer1) {customers(:customer1)} let(:movie1) {movies(:movie1)} - - it "creates a new rental given valid data" do + it "creates a rental with all valid params" do expect { - post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } - }.must_change "Rental.count", 1 + post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } + }.must_change "Rental.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - # expect(body["rental"]).must_include "id" + # expect(body[“rental”]).must_include “id” + expect(Rental.last.customer_id).must_equal body["customer_id"] + expect(Rental.last.movie_id).must_equal body["movie_id"] + must_respond_with :success - rental = Rental.find(body["rental"]["id"].to_i) + end - expect(rental.customer_id).must_equal rental_data[:customer_id] - must_respond_with :success + it "is invalid with a missing param" do + expect { + post checkout_path, params: { customer_id: customer1.id, movie_id: -1 } + }.wont_change "Rental.count" + must_respond_with :bad_request end + end + # it "returns an error for invalid movie data" do # # arrange # movie_data["title"] = nil @@ -55,8 +60,6 @@ # must_respond_with :bad_request # end - end - From 34a4b2eac43a9f48e2f7f3bd9228664bc1290969 Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 17:17:31 -0800 Subject: [PATCH 25/37] fixed bugged --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4f6ce4efa..78ddf0c87 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -34,7 +34,7 @@ def create private def movie_params - params.permit(:title, :overview, :inventory, :release_date, :available_inventory) + params.permit(:movie, :title, :overview, :inventory, :release_date, :available_inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f071fea4c..88916b916 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -91,16 +91,15 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body["movie"]).must_include "id" - - movie = Movie.find(body["movie"]["id"].to_i) + expect(body).must_include "id" + movie = Movie.find(body["id"].to_i) expect(movie.title).must_equal movie_data[:title] must_respond_with :success From 828d8506f9fe9c88a957a21b6264012d515a9c43 Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 17:24:44 -0800 Subject: [PATCH 26/37] merge --- app/controllers/rentals_controller.rb | 16 +--------------- test/controllers/rentals_controller_test.rb | 14 -------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4891287bc..07038b412 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,29 +5,15 @@ def checkout @movie = Movie.find_by(id: rental_params[:movie_id]) @customer = Customer.find_by(id: rental_params[:customer_id]) -<<<<<<< HEAD - if @movie.nil? || @customer.nil? -======= + if @movie.nil? rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, checkout_date: Date.today, due_date: Date.today + 7) rental.save - - - # rental = Rental.new(rental_params) - # customer = Customer.find_by(id: params[:id]) - # movie = Movie.find_by(id: params[:id]) - # rental.customer_id = customer.id - # rental.movie_id = movie.id - # - # rental.checkout_date = Date.today - # rental.due_date = Date.today + 7 - # if rental.save render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok else ->>>>>>> 6fc37bb360aa1d8628d7bb4880497f0b366ad28b render json: { ok: false, message: "not found" }, status: :bad_request diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 43a54d8d2..c261647df 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -27,24 +27,10 @@ body = JSON.parse(response.body) expect(body).must_be_kind_of Hash -<<<<<<< HEAD - # expect(body[“rental”]).must_include “id” - expect(Rental.last.customer_id).must_equal body["customer_id"] - expect(Rental.last.movie_id).must_equal body["movie_id"] - must_respond_with :success - - end - - it "is invalid with a missing param" do - expect { - post checkout_path, params: { customer_id: customer1.id, movie_id: -1 } - }.wont_change "Rental.count" -======= # expect(body["rental"]).must_include "id" expect(Rental.last.customer_id).must_equal body["customer_id"] expect(Rental.last.movie_id).must_equal body["movie_id"] must_respond_with :success ->>>>>>> 6fc37bb360aa1d8628d7bb4880497f0b366ad28b must_respond_with :bad_request end From 63f99eab5df7cf9f350d9ea22034f11d64ec5c9c Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 17:28:12 -0800 Subject: [PATCH 27/37] fixing bugs --- app/controllers/rentals_controller.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 07038b412..1b7d6a822 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,15 +5,7 @@ def checkout @movie = Movie.find_by(id: rental_params[:movie_id]) @customer = Customer.find_by(id: rental_params[:customer_id]) - if @movie.nil? - rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, - checkout_date: Date.today, due_date: Date.today + 7) - rental.save - - if rental.save - render json: rental.as_json(only: [:customer_id, :movie_id]), - status: :ok - else + if @movie.nil? || @customer.nil? render json: { ok: false, message: "not found" }, status: :bad_request From d7ad5f4d3448606635196a26f941b6db3dee98d1 Mon Sep 17 00:00:00 2001 From: Jazz Date: Tue, 6 Nov 2018 17:31:09 -0800 Subject: [PATCH 28/37] bugs fixed --- test/controllers/movies_controller_test.rb | 1 + test/controllers/rentals_controller_test.rb | 34 +++++++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 88916b916..9d476089f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -105,6 +105,7 @@ end + it "returns an error for invalid movie data" do # arrange movie_data["title"] = nil diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c261647df..caf9217c8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -16,24 +16,32 @@ describe "Checkout Testing" do let(:customer1) {customers(:customer1)} - let(:movie1) {movies(:movie1)} + let(:movie1) {movies(:movie1)} - it "creates a rental with all valid params" do + it "creates a rental with all valid params" do - expect { - post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } - }.must_change "Rental.count", 1 + expect { + post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } + }.must_change "Rental.count", 1 - body = JSON.parse(response.body) + body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - # expect(body["rental"]).must_include "id" - expect(Rental.last.customer_id).must_equal body["customer_id"] - expect(Rental.last.movie_id).must_equal body["movie_id"] - must_respond_with :success + expect(body).must_be_kind_of Hash + # expect(body[“rental”]).must_include “id” + expect(Rental.last.customer_id).must_equal body["customer_id"] + expect(Rental.last.movie_id).must_equal body["movie_id"] + must_respond_with :success + + end + + it "is invalid with a missing param" do + expect { + post checkout_path, params: { customer_id: customer1.id, movie_id: -1 } + }.wont_change "Rental.count" + + must_respond_with :bad_request + end - must_respond_with :bad_request - end end From 5a4fd6e8bf6b06870141bbe7d9172beb389125c4 Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Wed, 7 Nov 2018 10:27:08 -0800 Subject: [PATCH 29/37] added movies checked out to customer/checkout --- app/controllers/rentals_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1b7d6a822..a5e53fded 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,8 @@ def checkout rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, checkout_date: Date.today, due_date: Date.today + 7) rental.save + @customer.movies_checked_out_count += 1 + @customer.save if rental render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index caf9217c8..a4c1f8f45 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -24,12 +24,14 @@ post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } }.must_change "Rental.count", 1 + body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - # expect(body[“rental”]).must_include “id” + expect(Rental.last.customer.movies_checked_out_count).must_equal 1 expect(Rental.last.customer_id).must_equal body["customer_id"] expect(Rental.last.movie_id).must_equal body["movie_id"] + must_respond_with :success end @@ -38,7 +40,7 @@ expect { post checkout_path, params: { customer_id: customer1.id, movie_id: -1 } }.wont_change "Rental.count" - + expect(Rental.last.customer.movies_checked_out_count).must_equal 0 must_respond_with :bad_request end From 500b2dee74fc3d3c0b8d8f1367f19a7a6df087d5 Mon Sep 17 00:00:00 2001 From: Jazz Date: Wed, 7 Nov 2018 10:54:48 -0800 Subject: [PATCH 30/37] debugging --- app/controllers/rentals_controller.rb | 17 +++++++++++++++-- test/controllers/rentals_controller_test.rb | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1b7d6a822..463ba6b60 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,13 @@ def checkout rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, checkout_date: Date.today, due_date: Date.today + 7) rental.save + @customer.movies_checked_out_count += 1 + @customer.save + + @movie.available_inventory -= 1 + @movie.save + binding.pry + if rental render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok @@ -25,8 +32,14 @@ def checkout end end - def checkin - end + # def checkin + # @customer.movies_checked_out_count -= 1 + # @customer.save + # @movies.inventory += 1 + # + # + # + # end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index caf9217c8..a84bde722 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -30,6 +30,9 @@ # expect(body[“rental”]).must_include “id” expect(Rental.last.customer_id).must_equal body["customer_id"] expect(Rental.last.movie_id).must_equal body["movie_id"] + expect(Rental.last.customer.movies_checked_out_count).must_equal 1 + expect(Rental.last.movie.available_inventory).must_equal 9 + must_respond_with :success end From df152a2793df1022f2f6c8d4e33ca80b23b2ba7b Mon Sep 17 00:00:00 2001 From: Katie Jahanmir Date: Wed, 7 Nov 2018 10:54:58 -0800 Subject: [PATCH 31/37] completed check out method --- app/controllers/rentals_controller.rb | 3 +++ test/controllers/rentals_controller_test.rb | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a5e53fded..52dd5f477 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,6 +15,9 @@ def checkout rental.save @customer.movies_checked_out_count += 1 @customer.save + @movie.available_inventory -= 1 + @movie.save + if rental render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a4c1f8f45..258662d08 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -28,19 +28,29 @@ body = JSON.parse(response.body) expect(body).must_be_kind_of Hash + expect(Rental.last.movie.available_inventory).must_equal 9 expect(Rental.last.customer.movies_checked_out_count).must_equal 1 expect(Rental.last.customer_id).must_equal body["customer_id"] expect(Rental.last.movie_id).must_equal body["movie_id"] + must_respond_with :success end - it "is invalid with a missing param" do + it "won't create a rental and won't increase customer movie count for invalid params" do expect { post checkout_path, params: { customer_id: customer1.id, movie_id: -1 } }.wont_change "Rental.count" - expect(Rental.last.customer.movies_checked_out_count).must_equal 0 + expect(customer1.movies_checked_out_count).must_equal 0 + must_respond_with :bad_request + end + + it "won't create a rental and won't decrease movie available inventory for invalid params" do + expect { + post checkout_path, params: { customer_id: -1, movie_id: movie1.id } + }.wont_change "Rental.count" + expect(movie1.available_inventory).must_equal 10 must_respond_with :bad_request end From bd2652fbffbce12ed7d6997975de092d4bb4e7e0 Mon Sep 17 00:00:00 2001 From: Jazz Date: Wed, 7 Nov 2018 13:12:54 -0800 Subject: [PATCH 32/37] add checkin method --- app/controllers/rentals_controller.rb | 35 ++++++++++++--------- test/controllers/rentals_controller_test.rb | 24 ++++++++++++++ 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 08ddc95c8..9d0b0e2cd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,25 +34,30 @@ def checkout def checkin @movie = Movie.find_by(id: rental_params[:movie_id]) @customer = Customer.find_by(id: rental_params[:customer_id]) - @rental = Rental.find_by(customer_id: @customer.id, movie_id: @movie.id) - @customer.movies_checked_out_count -= 1 - @customer.save - - @movie.available_inventory += 1 - @movie.save - - if @rental - render json: @rental.as_json(only: [:customer_id, :movie_id]), - status: :ok - else + if @movie.nil? || @customer.nil? render json: { - ok: false, - message: "not found" + ok: false, message: "not found" }, status: :bad_request + else + @rental = Rental.find_by(customer_id: @customer.id, movie_id: @movie.id) + + @customer.movies_checked_out_count -= 1 + @customer.save + + @movie.available_inventory += 1 + @movie.save + + if @rental + render json: @rental.as_json(only: [:customer_id, :movie_id]), + status: :ok + else + render json: { + ok: false, + message: "not found" + }, status: :bad_request end - - + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 79209c56c..21380ce97 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -70,6 +70,30 @@ expect(Rental.last.customer.movies_checked_out_count).must_equal 0 end + it "won't checkin a rental and change movie inventory stays the same for invalid params" do + post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } + expect(Rental.last.movie.available_inventory).must_equal 9 + + expect { + post checkin_path, params: { customer_id: -1, movie_id: movie1.id } + }.wont_change "Rental.count" + + expect(Rental.last.movie.available_inventory).must_equal 9 + must_respond_with :bad_request + end + + it "won't checkin a rental and change movie inventory stays the same for invalid params" do + post checkout_path, params: { customer_id: customer1.id, movie_id: movie1.id } + expect(Rental.last.movie.available_inventory).must_equal 9 + + expect { + post checkin_path, params: { customer_id: customer1.id, movie_id: -1 } + }.wont_change "Rental.count" + + expect(Rental.last.movie.available_inventory).must_equal 9 + must_respond_with :bad_request + end + end From 53b09a3fa66936d1ca079b0a245bb524c8b5de1c Mon Sep 17 00:00:00 2001 From: Kay Date: Wed, 7 Nov 2018 13:33:08 -0800 Subject: [PATCH 33/37] added more specific error messages to rental and movies controllers --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 78ddf0c87..9e690dc4b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie.nil? - render json: { ok: false, message: "not found"}, + render json: { ok: false, message: "Movie with id '#{params[:id]}' not found"}, status: :not_found else render json: movie.as_json(only: [:title, :overview, :inventory, :release_date, :available_inventory]), diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9d0b0e2cd..0a2d809dc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,7 +7,7 @@ def checkout if @movie.nil? || @customer.nil? render json: { - ok: false, message: "not found" + ok: false, message: "Movie with id '#{rental_params[:movie_id]}' or customer with id '#{rental_params[:customer_id]}' not found" }, status: :bad_request else rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, From 902194ba62228877dd347c992d564bf400b39eba Mon Sep 17 00:00:00 2001 From: Jazz Date: Wed, 7 Nov 2018 13:42:22 -0800 Subject: [PATCH 34/37] fixed validation --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 6 +++--- app/models/movie.rb | 2 +- test/controllers/rentals_controller_test.rb | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 78ddf0c87..1a68420c4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie.nil? - render json: { ok: false, message: "not found"}, + render json: { ok: false, message: "Please enter a valid movie"}, status: :not_found else render json: movie.as_json(only: [:title, :overview, :inventory, :release_date, :available_inventory]), diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9d0b0e2cd..f1d5a118a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,7 +7,7 @@ def checkout if @movie.nil? || @customer.nil? render json: { - ok: false, message: "not found" + ok: false, message: "The movie or customer you entered is not valid" }, status: :bad_request else rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, @@ -25,7 +25,7 @@ def checkout else render json: { ok: false, - message: "not found" + message: "Your movie was not saved, please make sure you enter a valid movie or customer" }, status: :bad_request end end @@ -54,7 +54,7 @@ def checkin else render json: { ok: false, - message: "not found" + message: "Your rental was not returned please make sure your movie and customer are correct" }, status: :bad_request end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 1bac7040b..6576f4453 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,6 +5,6 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :overview, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - # validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, on: :show end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 21380ce97..63919b3f4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -68,6 +68,8 @@ expect(Rental.last.movie.available_inventory).must_equal 10 expect(Rental.last.customer.movies_checked_out_count).must_equal 0 + + must_respond_with :success end it "won't checkin a rental and change movie inventory stays the same for invalid params" do From 47fb968c5531856645ba0835e9e66f2fa6ca504a Mon Sep 17 00:00:00 2001 From: Jazz Date: Wed, 7 Nov 2018 17:33:43 -0800 Subject: [PATCH 35/37] added sort by name params --- app/controllers/customers_controller.rb | 19 ++++++++++++++++--- app/controllers/movies_controller.rb | 1 + app/models/customer.rb | 2 -- app/models/movie.rb | 1 - config/routes.rb | 1 + 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ebb6c9f79..43e1331a4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,21 @@ class CustomersController < ApplicationController def index - customer = Customer.all - render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), - status: :ok + customers = Customer.all + + if !customer_params["sort"].nil? + customers = Customer.order(customer_params["sort"]) + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), + status: :ok + else + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), + status: :ok + end + end + + private + + def customer_params + params.permit(:sort, :n, :p) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9e690dc4b..2a2e313bc 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -35,6 +35,7 @@ def create def movie_params params.permit(:movie, :title, :overview, :inventory, :release_date, :available_inventory) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 35802034d..4d710fd8f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,6 +8,4 @@ class Customer < ApplicationRecord validates :phone, presence: true validates :movies_checked_out_count, presence: true - - end diff --git a/app/models/movie.rb b/app/models/movie.rb index 6576f4453..1702dbb4f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,6 +5,5 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :overview, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, on: :show end diff --git a/config/routes.rb b/config/routes.rb index a1ccf65bc..df0da91d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ post 'rentals/check-out', to: 'rentals#checkout', as: 'checkout' post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' + get '/movies', to: 'movies#index' post '/movies', to: 'movies#create' get 'movies/:id', to: 'movies#show', as: "movie" From 987608d8f91b91e9ab86ecb15f2dcce6d4647c61 Mon Sep 17 00:00:00 2001 From: Jazz Date: Thu, 8 Nov 2018 12:02:32 -0800 Subject: [PATCH 36/37] added query to project --- app/controllers/customers_controller.rb | 28 ++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 43e1331a4..f560ee184 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,21 +1,25 @@ class CustomersController < ApplicationController + + SORTABLE_ATTRIBUTES = [:name, :registered_at, :postal_code] + def index customers = Customer.all - if !customer_params["sort"].nil? - customers = Customer.order(customer_params["sort"]) - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), - status: :ok - else - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), - status: :ok + if params[:sort].present? && SORTABLE_ATTRIBUTES.include?(params[:sort].to_sym) + customers = customers.order(params[:sort].to_sym => :asc) + end + + if params[:n].present? + customers = customers.limit(params[:n].to_i) + end + + if params[:p].present? + customers = customers.offset((params[:p].to_i - 1) * (params[:n].to_i)) end - end - private + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), + status: :ok - def customer_params - params.permit(:sort, :n, :p) end - + end From ee49d4a574cef4c2bac9c9f2c308876c9d72b3b2 Mon Sep 17 00:00:00 2001 From: Kay Date: Fri, 9 Nov 2018 13:03:35 -0800 Subject: [PATCH 37/37] added test for optional params =sort in cutomers controller test --- app/controllers/customers_controller.rb | 3 +- test/controllers/customers_controller_test.rb | 30 +++++++++++++++++++ test/fixtures/customers.yml | 25 ++++++++++++++-- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f560ee184..9b98b1a0e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,3 +1,4 @@ +require 'pry' class CustomersController < ApplicationController SORTABLE_ATTRIBUTES = [:name, :registered_at, :postal_code] @@ -21,5 +22,5 @@ def index status: :ok end - + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ed3547228..90d6c210d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,6 +27,36 @@ # Assert expect(body).must_be_kind_of Array end + # if params[:sort].present? && SORTABLE_ATTRIBUTES.include?(params[:sort].to_sym) + # customers = customers.order(params[:sort].to_sym => :asc) + # end + + + it "returns an Array of customers' names in ascending order given valid optional param" do + # Act + # get customers_path + # expect(Customer.last.id).must_equal 344919985 + + get customers_path({"sort" => "name"}) + body = JSON.parse(response.body) + + last_id = body[2]["id"] + + expect(Customer.last.id).must_equal last_id + + # Assert + expect(body).must_be_kind_of Array + end + + it "(still)returns an Array of customers when passed invalid optional param" do + # Act + get customers_path({"sort" => "bogus"}) + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_kind_of Array + end + it "returns all of the customers" do # Act diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index b41a2e3dd..554f52499 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,15 +1,36 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html customer1: - name: customer1 + name: Zberry registered_at: postal_code: postalcode1 phone: phone1 movies_checked_out_count: 0 customer2: - name: customer1 + name: Aberry registered_at: postal_code: postalcode1 phone: phone1 movies_checked_out_count: 0 + +customer3: + name: Corange + registered_at: + postal_code: postalcode1 + phone: phone1 + movies_checked_out_count: 0 + +# customer4: +# name: Apple +# registered_at: +# postal_code: postalcode1 +# phone: phone1 +# movies_checked_out_count: 0 +# +# customer5: +# name: Cranberry +# registered_at: +# postal_code: postalcode1 +# phone: phone1 +# movies_checked_out_count: 0