From 583c5e3a2c3fcce45c65a107c657fc0e4c476e0e Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 12:36:26 -0700 Subject: [PATCH 01/24] Initial Rails App --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87d307d81 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.17.3 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..f8551f30d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +7o77huTTVMoC6j/12XNpnargbu1KOPCpsTkoRf8j9XVTGAedTanJ0dkRY1RV+kSBkdkPehK0TVP7zJ+0YL/KLYb+w/QFtTXQDAd74kMV5E/ZpE2MRn/9fyk5XzicNForg7bcNXNtioKMPkuRmusbjzirCJz42uLs+57wclq/jlsYb8Ses8Td8zDQ6dntlFHar7E2hDWwiTUQiNG2qB9ubcHv6uTHAhVRa0vyxM1ECKC7UPYyP0s4qOn7Cmqt86zBTzi7imUz+Pia+bXlmDjX5kI2CMjaBqvVg9c3cr9OqoMODDiv49OUC4qKebZ25DZRVAVI7eWaQcsbesr2vVjSRCcPXhxeGdk7jKMfUjAi8EpjPIFEHGrlpLwsbR6JlSxp4bmxsMYPtCrg2dd78whExStRTjB1nAGCtIJu--NekPM/hH4uw0U5nj--dU2B49XU7XszFZaflUF1fA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..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 b7bad27ae386341198835ce0dc1f801d3b612329 Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 13:49:44 -0700 Subject: [PATCH 02/24] Adds customer, movie, and rental models --- app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/controllers/rentals_controller.rb | 2 + app/models/customer.rb | 3 ++ app/models/movie.rb | 3 ++ app/models/rental.rb | 4 ++ db/migrate/20190514202747_create_movies.rb | 12 +++++ db/migrate/20190514202922_create_customers.rb | 15 ++++++ db/migrate/20190514203517_create_rentals.rb | 10 ++++ ...190514204257_add_customer_id_to_rentals.rb | 5 ++ .../20190514204534_add_movie_id_to_rentals.rb | 5 ++ db/schema.rb | 52 +++++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +++ test/controllers/movies_controller_test.rb | 7 +++ test/controllers/rentals_controller_test.rb | 7 +++ test/fixtures/customers.yml | 19 +++++++ test/fixtures/movies.yml | 13 +++++ test/fixtures/rentals.yml | 9 ++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 21 files changed, 204 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514202747_create_movies.rb create mode 100644 db/migrate/20190514202922_create_customers.rb create mode 100644 db/migrate/20190514203517_create_rentals.rb create mode 100644 db/migrate/20190514204257_add_customer_id_to_rentals.rb create mode 100644 db/migrate/20190514204534_add_movie_id_to_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..d2533dbf9 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_many :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..b8b339cbc --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_many :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..e001ff37c --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie +end diff --git a/db/migrate/20190514202747_create_movies.rb b/db/migrate/20190514202747_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514202747_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514202922_create_customers.rb b/db/migrate/20190514202922_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514202922_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20190514203517_create_rentals.rb b/db/migrate/20190514203517_create_rentals.rb new file mode 100644 index 000000000..c98328095 --- /dev/null +++ b/db/migrate/20190514203517_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20190514204257_add_customer_id_to_rentals.rb b/db/migrate/20190514204257_add_customer_id_to_rentals.rb new file mode 100644 index 000000000..0c5d8d5d6 --- /dev/null +++ b/db/migrate/20190514204257_add_customer_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20190514204534_add_movie_id_to_rentals.rb b/db/migrate/20190514204534_add_movie_id_to_rentals.rb new file mode 100644 index 000000000..67797e6d0 --- /dev/null +++ b/db/migrate/20190514204534_add_movie_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..9a8e01c44 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,52 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_204534) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "due_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/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..fce1adc4a --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 13:29:22 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 13:29:22 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..27e9faff3 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2019-05-14 + due_date: 2019-05-14 + +two: + checkout_date: 2019-05-14 + due_date: 2019-05-14 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 44ae36f46bd019391fb7c6b269a3bb029bb225dd Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 14:05:52 -0700 Subject: [PATCH 03/24] adds routes --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..b438f4a07 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :movies, only:[:index, :show, :create] + resources :customer, only:[:index, :show, :create] + post 'rentals/check-out', to: 'rentals#check-out', as:'check-out' + post 'rentals/check-in', to: 'rentals#check-in', as:'check-in' end From ac5989d94d69bde87aa2d75c68c5304ff4834ece Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Tue, 14 May 2019 14:43:17 -0700 Subject: [PATCH 04/24] added 's' to customers resources --- app/controllers/customers_controller.rb | 5 +++++ config/routes.rb | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..431464055 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,7 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), + status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index b438f4a07..bc5d5e0b3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :movies, only:[:index, :show, :create] - resources :customer, only:[:index, :show, :create] - post 'rentals/check-out', to: 'rentals#check-out', as:'check-out' - post 'rentals/check-in', to: 'rentals#check-in', as:'check-in' + resources :movies, only: [:index, :show, :create] + resources :customers, only: [:index, :show, :create] + post "rentals/check-out", to: "rentals#check-out", as: "check-out" + post "rentals/check-in", to: "rentals#check-in", as: "check-in" end From e86b5a1e347fdb8f2366c9a8bf94caeb81b3d47e Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 15:05:06 -0700 Subject: [PATCH 05/24] Adds controller methods and tests --- app/controllers/movies_controller.rb | 28 +++++++ test/controllers/movies_controller_test.rb | 89 +++++++++++++++++++++- test/fixtures/movies.yml | 18 ++--- test/test_helper.rb | 3 +- 4 files changed, 125 insertions(+), 13 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..72de29aa7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,30 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + else + render json: { "errors": ["Movie was not found"]}, + status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: {id: movie.id}, status: :ok + else + render json: { errors: movie.errors.messages}, status: :bad_request + end + end + + private + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :intentory) + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..c75cd9fed 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,90 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + keys = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end + + describe "show" do + it "can get a movie" do + get movie_path(movies(:one).id) + must_respond_with :success + end + it "renders status bad request" do + get movie_path(-1) + must_respond_with :not_found + end + end + + describe "create" do + let(:movie_data) { + { + title: "Inside Out", + overview: "Lesson about your emotions", + release_date: 06-19-2015, + inventory: 23 + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: {movie: movie_data} + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "retuns an error for invalid movie data" do + movie_data["title"] = nil + + expect { + post movies_path, params: {movie: movie_data} + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..a14fee6ae 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +one : + title: Incredibles + overview: Family of superheroes. + release_date: 2018-06-15 + inventory: 10 two: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 + title: Toy Story + overview: Woody, Buzz Lightyear and the rest of the gang embark on a road trip with Bonnie and a new toy named Forky. + release_date: 2018-06-21 + inventory: 9 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 8bf35142d2f980e736ff692cee0c9c40e1d9d83d Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Tue, 14 May 2019 15:58:08 -0700 Subject: [PATCH 06/24] added movies_checkout_cout_count --- app/controllers/customers_controller.rb | 33 ++++++++++++++++++- app/models/customer.rb | 4 +++ test/controllers/customers_controller_test.rb | 9 +++-- test/fixtures/customers.yml | 24 +++++++------- test/test_helper.rb | 4 +-- 5 files changed, 56 insertions(+), 18 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 431464055..41b536076 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,38 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), + # render json: customers.as_json, + # status: :ok + + render json: customers.as_json(:methods => [:movies_checked_out_count]), status: :ok end + + # def show + # customer = Customer.find_by(id: params[:id]) + # if !customer.nil? + # render json: customer.as_json, + # status: :ok + # else + # render json: { ok: false, errors: { customer: ["Customer not found"] } }, + # status: :not_found + # end + # end + + # def create + # customer = Customer.new(customer_params) + # if customer.save + # render json: customer.as_json, + # status: :ok + # else + # render json: { ok: false, errors: customer.errors.messages }, + # status: :bad_request + # end + # end + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..96e632244 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,7 @@ class Customer < ApplicationRecord has_many :rentals + + def movies_checked_out_count + self.rentals.count + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..3f02cf17b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,10 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get customers_path + must_respond_with :success + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index fce1adc4a..bea6bf50f 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: sophie registered_at: 2019-05-14 13:29:22 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123Street + city: Bothell + state: WA + postal_code: 98002 + phone: 123-123-1234 two: - name: MyString + name: nara registered_at: 2019-05-14 13:29:22 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 456Street + city: Seattle + state: WA + postal_code: 98001 + phone: 123-123-1235 diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..3f7dc7d3e 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, @@ -9,7 +10,6 @@ Minitest.backtrace_filter ) - # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: # require "minitest/rails/capybara" From 0f2b96dc0ad26f71f8b3bb8543b035ecf1539069 Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Tue, 14 May 2019 16:00:37 -0700 Subject: [PATCH 07/24] removed comments --- app/controllers/customers_controller.rb | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 41b536076..23039bdac 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,35 +1,11 @@ class CustomersController < ApplicationController def index customers = Customer.all - # render json: customers.as_json, - # status: :ok render json: customers.as_json(:methods => [:movies_checked_out_count]), status: :ok end - # def show - # customer = Customer.find_by(id: params[:id]) - # if !customer.nil? - # render json: customer.as_json, - # status: :ok - # else - # render json: { ok: false, errors: { customer: ["Customer not found"] } }, - # status: :not_found - # end - # end - - # def create - # customer = Customer.new(customer_params) - # if customer.save - # render json: customer.as_json, - # status: :ok - # else - # render json: { ok: false, errors: customer.errors.messages }, - # status: :bad_request - # end - # end - private def customer_params From dcd97cf860b88bf1b9e9404b9c4e9e7fcd8451f2 Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Tue, 14 May 2019 16:07:34 -0700 Subject: [PATCH 08/24] fixture for rentals --- test/fixtures/rentals.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 27e9faff3..4e188f869 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,8 +2,8 @@ one: checkout_date: 2019-05-14 - due_date: 2019-05-14 + due_date: 2019-05-21 two: - checkout_date: 2019-05-14 - due_date: 2019-05-14 + checkout_date: 2019-06-14 + due_date: 2019-06-21 From 679781708dfec59b6f3c006290bdc0c64ad4f8e9 Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 16:23:01 -0700 Subject: [PATCH 09/24] Adds movies controller tests and methods --- app/controllers/movies_controller.rb | 4 ++-- app/models/movie.rb | 11 ++++++++++- test/controllers/movies_controller_test.rb | 8 ++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 72de29aa7..3d13b0146 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,7 +7,7 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + render json: movie.as_json(:methods => [:available_inventory], except: [:id,:created_at, :updated_at]), status: :ok else render json: { "errors": ["Movie was not found"]}, status: :not_found @@ -25,6 +25,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :intentory) + params.permit(:title, :overview, :release_date, :intentory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..cd657e1f8 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,12 @@ class Movie < ApplicationRecord has_many :rentals -end + validates :title, :overview, :inventory, :release_date, presence: true + + def available_inventory + if self.inventory + available_inventory = self.inventory - self.rentals.count + else + available_inventory = nil + end + end +end \ No newline at end of file diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c75cd9fed..1d1e0f71a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -48,18 +48,18 @@ end describe "create" do - let(:movie_data) { + let(:movie_data) { title: "Inside Out", overview: "Lesson about your emotions", release_date: 06-19-2015, inventory: 23 } - } + 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) @@ -76,7 +76,7 @@ movie_data["title"] = nil expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.wont_change "Movie.count" body = JSON.parse(response.body) From c52cc6c5651cd293c347cad398db3a08e96711df Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Tue, 14 May 2019 16:42:35 -0700 Subject: [PATCH 10/24] tests for customer model --- test/fixtures/customers.yml | 4 ++-- test/models/customer_test.rb | 25 ++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bea6bf50f..f1881dfa1 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +sophie: name: sophie registered_at: 2019-05-14 13:29:22 address: 123Street @@ -9,7 +9,7 @@ one: postal_code: 98002 phone: 123-123-1234 -two: +nara: name: nara registered_at: 2019-05-14 13:29:22 address: 456Street diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..1a31543c7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,28 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:sophie) } + let(:movie) { movies(:one) } + describe "validations" do + it "must be valid" do + expect(customer.valid?).must_equal true + end + end + + describe "relationships" do + it "can have 0 rentals" do + customer.rentals + expect(customer.rentals.count).must_equal 0 + end + + it "can have 1 or more rentals" do + rental = Rental.create(customer_id: customer.id, + movie_id: movie.id, + checkout_date: Date.today, + due_date: Date.today + 7) - it "must be valid" do - value(customer).must_be :valid? + customer.rentals << rental + expect(customer.rentals).must_include rental + end end end From e3c74ae09e3810b51b62ad0aa47126cda3184ef9 Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Tue, 14 May 2019 17:20:04 -0700 Subject: [PATCH 11/24] more tests for customer model --- config/routes.rb | 2 +- test/models/customer_test.rb | 30 ++++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index bc5d5e0b3..6ce254ec8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :movies, only: [:index, :show, :create] - resources :customers, only: [:index, :show, :create] + resources :customers, only: [:index] post "rentals/check-out", to: "rentals#check-out", as: "check-out" post "rentals/check-in", to: "rentals#check-in", as: "check-in" end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 1a31543c7..634827699 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -16,13 +16,31 @@ end it "can have 1 or more rentals" do - rental = Rental.create(customer_id: customer.id, - movie_id: movie.id, - checkout_date: Date.today, - due_date: Date.today + 7) + first_rental = rentals(:one) + first_rental.customer_id = customer.id + first_rental.movie_id = movies(:one).id + first_rental.save - customer.rentals << rental - expect(customer.rentals).must_include rental + second_rental = rentals(:two) + second_rental.customer_id = customer.id + second_rental.movie_id = movies(:two).id + second_rental.save + expect(customer.rentals).must_include first_rental + expect(customer.rentals).must_include second_rental + end + end + + describe "movies_checked_out_count" do + it "can get the number of movies checked out" do + first_rental = rentals(:one) + first_rental.customer_id = customer.id + first_rental.movie_id = movies(:one).id + first_rental.save + second_rental = rentals(:two) + second_rental.customer_id = customer.id + second_rental.movie_id = movies(:two).id + second_rental.save + expect(customer.movies_checked_out_count).must_equal 2 end end end From 3c6a4c4de1b5d9ff1168ebb0fe5f10146b2e857d Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Tue, 14 May 2019 17:22:55 -0700 Subject: [PATCH 12/24] added except --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 23039bdac..0914506b6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(:methods => [:movies_checked_out_count]), + render json: customers.as_json(:methods => [:movies_checked_out_count], except: [:created_at, :updated_at]), status: :ok end From 4ab0965645a058c15a7424411336dc97f2e76afa Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 19:55:32 -0700 Subject: [PATCH 13/24] Fixes the create controller test --- app/controllers/movies_controller.rb | 4 ++-- test/controllers/movies_controller_test.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3d13b0146..bb330cd21 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,7 +7,7 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(:methods => [:available_inventory], except: [:id,:created_at, :updated_at]), status: :ok + render json: movie.as_json(except: [:id,:created_at, :updated_at], :methods => [:available_inventory]), status: :ok else render json: { "errors": ["Movie was not found"]}, status: :not_found @@ -25,6 +25,6 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :intentory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1d1e0f71a..7050677b3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -48,14 +48,14 @@ end describe "create" do - let(:movie_data) + let(:movie_data) { { title: "Inside Out", overview: "Lesson about your emotions", - release_date: 06-19-2015, + release_date: "2015-06-15", inventory: 23 } - + } it "creates a new movie given valid data" do expect { From 5367e4930a1f3f241a3546566013cb07ed71d7da Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 20:06:18 -0700 Subject: [PATCH 14/24] Adds customer controller test --- test/controllers/customers_controller_test.rb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 3f02cf17b..a1742c211 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -6,5 +6,32 @@ get customers_path must_respond_with :success end + it "returns json" do + get customers_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end end end From 162b639be9238a2048c6c764f4e76c6a93dd5cad Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 20:24:11 -0700 Subject: [PATCH 15/24] Movie model tests --- test/fixtures/movies.yml | 2 +- test/fixtures/rentals.yml | 11 +++++++++++ test/models/customer_test.rb | 4 ++-- test/models/movie_test.rb | 25 +++++++++++++++++++++---- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index a14fee6ae..e42fe8512 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one : +one: title: Incredibles overview: Family of superheroes. release_date: 2018-06-15 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 4e188f869..b3214bb43 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,20 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: + customer: sophie + movie: one checkout_date: 2019-05-14 due_date: 2019-05-21 two: + customer: sophie + movie: two checkout_date: 2019-06-14 due_date: 2019-06-21 + +three: + customer: nara + movie: two + checkout_date: 2019-06-14 + due_date: 2019-06-21 + diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 634827699..c9ff33963 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -10,9 +10,9 @@ end describe "relationships" do - it "can have 0 rentals" do + it "returns all the rentals" do customer.rentals - expect(customer.rentals.count).must_equal 0 + expect(customer.rentals.count).must_equal 2 end it "can have 1 or more rentals" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..0ce7319be 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,26 @@ require "test_helper" -describe Movie do - let(:movie) { Movie.new } +class PetTest < ActiveSupport::TestCase + let(:movie) { movies(:one)} - it "must be valid" do - value(movie).must_be :valid? + it "can be created" do + value(movie.valid?).must_equal true + end + + it "requires title, overview, inventory, release date" do + required_fields = [:title, :overview, :inventory, :release_date] + + required_fields.each do |field| + movie[field] = nil + + expect(movie.valid?).must_equal false + + movie.reload + end + end + + it "returns all the rentals" do + movie.rentals + expect(movie.rentals.count).must_equal 1 end end From 0b6a6a4133b638385896083ee1d3559c0ee73c2f Mon Sep 17 00:00:00 2001 From: Nara Date: Tue, 14 May 2019 22:59:06 -0700 Subject: [PATCH 16/24] Rental controller and checkin_date column --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 30 +++++++++++++++++++ app/models/customer.rb | 2 +- app/models/movie.rb | 6 ++-- app/models/rental.rb | 7 +++++ config/routes.rb | 4 +-- .../20190515043109_add_state_to_rentals.rb | 5 ++++ db/schema.rb | 3 +- 8 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20190515043109_add_state_to_rentals.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0914506b6..9f972f98c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -9,6 +9,6 @@ def index private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..ce8363841 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,32 @@ class RentalsController < ApplicationController + def check_out + movie = Movie.find_by(id: rental_params[:movie_id]) + if movie.available_inventory > 0 + rental = Rental.new(rental_params.merge(checkout_date: Date.today, due_date: Date.today + 7)) + else + render json: { "errors": {"title": ["Movie '#{movie.title}' is not available"]}}, status: :bad_request + return + end + + if rental.save + render json: {id: rental.id}, status: :ok + else + render json: { errors: rental.errors.messages}, status: :bad_request + end + end + + def check_in + rental = Rental.where(customer_id: rental_params[:customer_id], movie_id: rental_params[:movie_id], checkin_date: nil).first + if rental + rental.check_in + render json: {id: rental.id}, status: :ok if rental.save + else + render json: { "errors": ["Rental with movie'#{rental_params[:movie_id]}' is not found"]}, status: :bad_request + end + end + + private + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 96e632244..79ddb5cff 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,6 +2,6 @@ class Customer < ApplicationRecord has_many :rentals def movies_checked_out_count - self.rentals.count + self.rentals.where(checkin_date: nil).count end end diff --git a/app/models/movie.rb b/app/models/movie.rb index cd657e1f8..23a908fd0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,10 +3,10 @@ class Movie < ApplicationRecord validates :title, :overview, :inventory, :release_date, presence: true def available_inventory - if self.inventory - available_inventory = self.inventory - self.rentals.count + if self.inventory > 0 + available_inventory = self.inventory - self.rentals.where(checkin_date: nil).count else - available_inventory = nil + available_inventory = 0 end end end \ No newline at end of file diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..92187ab7a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,11 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + def check_in + if self.checkin_date != nil + raise RuntimeError("Already checked in!") + end + self.checkin_date = Date.today + end end diff --git a/config/routes.rb b/config/routes.rb index 6ce254ec8..875761262 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - post "rentals/check-out", to: "rentals#check-out", as: "check-out" - post "rentals/check-in", to: "rentals#check-in", as: "check-in" + post "rentals/check-out", to: "rentals#check_out", as: "check-out" + post "rentals/check-in", to: "rentals#check_in", as: "check-in" end diff --git a/db/migrate/20190515043109_add_state_to_rentals.rb b/db/migrate/20190515043109_add_state_to_rentals.rb new file mode 100644 index 000000000..7897cbdc9 --- /dev/null +++ b/db/migrate/20190515043109_add_state_to_rentals.rb @@ -0,0 +1,5 @@ +class AddStateToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkin_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 9a8e01c44..08a54be63 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_204534) do +ActiveRecord::Schema.define(version: 2019_05_15_043109) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.date "checkin_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 63375afb532beae0e779d5ccbb5201e2e0b4b77c Mon Sep 17 00:00:00 2001 From: Nara Date: Wed, 15 May 2019 09:03:00 -0700 Subject: [PATCH 17/24] Updates rental model test --- app/models/rental.rb | 2 +- test/models/rental_test.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 92187ab7a..70b656b07 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,7 +4,7 @@ class Rental < ApplicationRecord def check_in if self.checkin_date != nil - raise RuntimeError("Already checked in!") + render json: { "errors": ["Already checked in"]}, status: :bad_request end self.checkin_date = Date.today end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..2ce6c9326 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? + let(:rental) { rentals(:one) } + + it "can be created" do + value(rental.valid?).must_equal true end end From 1dcd6f59407bb6f907103af8a5e8894dc874496c Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Wed, 15 May 2019 13:05:29 -0700 Subject: [PATCH 18/24] tests for rental model --- test/fixtures/rentals.yml | 1 + test/models/rental_test.rb | 39 +++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index b3214bb43..db4556ed2 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,6 +3,7 @@ one: customer: sophie movie: one + checkin_date: nil checkout_date: 2019-05-14 due_date: 2019-05-21 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 2ce6c9326..2882ed522 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,8 +2,45 @@ describe Rental do let(:rental) { rentals(:one) } - + let(:customer) { customers(:sophie) } + let(:movie) { movies(:one) } + it "can be created" do value(rental.valid?).must_equal true end + + describe "relationships" do + it "belongs to the customer" do + rental.customer = customer + + expect(rental.customer_id).must_equal customer.id + end + + it "can set the customer through the customer_id" do + rental.customer_id = customer.id + expect(rental.customer).must_equal customer + end + + it "belongs to the movie" do + rental.movie = movie + expect(rental.movie_id).must_equal movie.id + end + + it "can set the movie through through movie_id" do + rental.movie_id = movie.id + expect(rental.movie).must_equal movie + end + end + + describe "check_in" do + it "can check in with today's date" do + rental = Rental.new(customer: customer, + movie: movie, + checkout_date: Date.today - 14, + due_date: Date.today - 7, + checkin_date: nil) + rental.check_in + expect(rental.checkin_date).must_equal Date.today + end + end end From f0f7112284b39ca44a9f651d011e9fed1771946f Mon Sep 17 00:00:00 2001 From: Nara Date: Wed, 15 May 2019 13:26:29 -0700 Subject: [PATCH 19/24] Rental controller tests --- app/controllers/rentals_controller.rb | 26 +++--- app/models/rental.rb | 7 -- config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 95 ++++++++++++++++++++- 4 files changed, 109 insertions(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ce8363841..6af813fc3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,24 +1,28 @@ class RentalsController < ApplicationController def check_out movie = Movie.find_by(id: rental_params[:movie_id]) - if movie.available_inventory > 0 - rental = Rental.new(rental_params.merge(checkout_date: Date.today, due_date: Date.today + 7)) + if movie + if movie.available_inventory > 0 + rental = Rental.new(rental_params.merge(checkout_date: Date.today, due_date: Date.today + 7)) + else + render json: { "errors": {"title": ["Movie '#{movie.title}' is not available"]}}, status: :bad_request + return + end + + if rental.save + render json: {id: rental.id}, status: :ok + else + render json: { errors: rental.errors.messages}, status: :bad_request + end else - render json: { "errors": {"title": ["Movie '#{movie.title}' is not available"]}}, status: :bad_request - return + render json: { "errors": ["Movie with id #{rental_params[:movie_id]} is not found"] }, status: :not_found end - - if rental.save - render json: {id: rental.id}, status: :ok - else - render json: { errors: rental.errors.messages}, status: :bad_request - end end def check_in rental = Rental.where(customer_id: rental_params[:customer_id], movie_id: rental_params[:movie_id], checkin_date: nil).first if rental - rental.check_in + rental.checkin_date = Date.today render json: {id: rental.id}, status: :ok if rental.save else render json: { "errors": ["Rental with movie'#{rental_params[:movie_id]}' is not found"]}, status: :bad_request diff --git a/app/models/rental.rb b/app/models/rental.rb index 70b656b07..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,11 +1,4 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - - def check_in - if self.checkin_date != nil - render json: { "errors": ["Already checked in"]}, status: :bad_request - end - self.checkin_date = Date.today - end end diff --git a/config/routes.rb b/config/routes.rb index 875761262..0f3040866 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - post "rentals/check-out", to: "rentals#check_out", as: "check-out" - post "rentals/check-in", to: "rentals#check_in", as: "check-in" + post "rentals/check-out", to: "rentals#check_out", as: "check_out" + post "rentals/check-in", to: "rentals#check_in", as: "check_in" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..5eefbcb55 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,96 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'checkout' do + let(:rental_data) { + { + customer_id: customers(:nara).id, + movie_id: movies(:one).id + } + } + it "can checkout given valid data" do + expect { + post check_out_path, params: rental_data + }.must_change "Rental.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.movie.id).must_equal rental_data[:movie_id] + must_respond_with :success + end + + it "retuns an error for rental data with invalid customer" do + rental_data["customer_id"] = nil + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer" + must_respond_with :bad_request + end + + it "retuns an error for rental data with invalid movie" do + rental_data["movie_id"] = -1 + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + must_respond_with :not_found + end + end + + describe "checkin" do + let(:rental_data) { + { + customer_id: customers(:nara).id, + movie_id: movies(:one).id + } + } + it "cannot checkin when there is no rental " do + + post check_in_path, params: rental_data + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + must_respond_with :bad_request + end + + it "can checkin checked out rental" do + post check_out_path, params: rental_data + + post check_in_path, params: rental_data + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.checkin_date).wont_equal nil + must_respond_with :success + end + + it "cannot checkin already checked in rental" do + post check_out_path, params: rental_data + post check_in_path, params: rental_data + post check_in_path, params: rental_data + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + must_respond_with :bad_request + end + end end From 771d8745af9d3926a2da16f103103262330a11b1 Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Wed, 15 May 2019 13:27:32 -0700 Subject: [PATCH 20/24] added another test to customer model --- test/models/customer_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index c9ff33963..a1d668ca8 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -42,5 +42,12 @@ second_rental.save expect(customer.movies_checked_out_count).must_equal 2 end + + it "returns 0 if there's no movie checked out" do + rentals.each do |rental| + rental.destroy + end + expect(customer.movies_checked_out_count).must_equal 0 + end end end From 4d1e320b54b2ec88d4a813e99f150b54950ee678 Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Wed, 15 May 2019 13:45:50 -0700 Subject: [PATCH 21/24] more tests for customer model --- test/fixtures/rentals.yml | 12 +++++++++++- test/models/customer_test.rb | 16 ++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index db4556ed2..72d01f94f 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,14 +3,15 @@ one: customer: sophie movie: one - checkin_date: nil checkout_date: 2019-05-14 + checkin_date: nil due_date: 2019-05-21 two: customer: sophie movie: two checkout_date: 2019-06-14 + checkin_date: 2019-06-17 due_date: 2019-06-21 three: @@ -19,3 +20,12 @@ three: checkout_date: 2019-06-14 due_date: 2019-06-21 +four: + customer: sophie + movie: one + checkout_date: 2019-03-14 + checkin_date: 2019-03-17 + due_date: 2019-03-21 + + + diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a1d668ca8..3c23d52b6 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -12,7 +12,7 @@ describe "relationships" do it "returns all the rentals" do customer.rentals - expect(customer.rentals.count).must_equal 2 + expect(customer.rentals.count).must_equal 3 end it "can have 1 or more rentals" do @@ -32,15 +32,7 @@ describe "movies_checked_out_count" do it "can get the number of movies checked out" do - first_rental = rentals(:one) - first_rental.customer_id = customer.id - first_rental.movie_id = movies(:one).id - first_rental.save - second_rental = rentals(:two) - second_rental.customer_id = customer.id - second_rental.movie_id = movies(:two).id - second_rental.save - expect(customer.movies_checked_out_count).must_equal 2 + expect(customer.movies_checked_out_count).must_equal 1 end it "returns 0 if there's no movie checked out" do @@ -49,5 +41,9 @@ end expect(customer.movies_checked_out_count).must_equal 0 end + + it "does not count the movies that have been checked in" do + expect(customers(:sophie).movies_checked_out_count).must_equal 1 + end end end From f71677aa44587f1954886fb7f7f51af54770c646 Mon Sep 17 00:00:00 2001 From: Sophearychiv Date: Wed, 15 May 2019 13:52:40 -0700 Subject: [PATCH 22/24] fixed errors and failures in tests --- test/models/movie_test.rb | 6 +++--- test/models/rental_test.rb | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0ce7319be..401b637f2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,13 +1,13 @@ require "test_helper" class PetTest < ActiveSupport::TestCase - let(:movie) { movies(:one)} + let(:movie) { movies(:one) } it "can be created" do value(movie.valid?).must_equal true end - it "requires title, overview, inventory, release date" do + it "requires title, overview, inventory, release date" do required_fields = [:title, :overview, :inventory, :release_date] required_fields.each do |field| @@ -21,6 +21,6 @@ class PetTest < ActiveSupport::TestCase it "returns all the rentals" do movie.rentals - expect(movie.rentals.count).must_equal 1 + expect(movie.rentals.count).must_equal 2 end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 2882ed522..a7fea8de6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -31,16 +31,4 @@ expect(rental.movie).must_equal movie end end - - describe "check_in" do - it "can check in with today's date" do - rental = Rental.new(customer: customer, - movie: movie, - checkout_date: Date.today - 14, - due_date: Date.today - 7, - checkin_date: nil) - rental.check_in - expect(rental.checkin_date).must_equal Date.today - end - end end From 2e1103ace97241bed8afd11de479043ba17013f2 Mon Sep 17 00:00:00 2001 From: Nara Date: Wed, 15 May 2019 13:53:23 -0700 Subject: [PATCH 23/24] Adds available inventory test --- test/models/movie_test.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0ce7319be..ca86e76e4 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class PetTest < ActiveSupport::TestCase +class MovieTest < ActiveSupport::TestCase let(:movie) { movies(:one)} it "can be created" do @@ -20,7 +20,15 @@ class PetTest < ActiveSupport::TestCase end it "returns all the rentals" do - movie.rentals - expect(movie.rentals.count).must_equal 1 + expect(movie.rentals.count).must_equal 2 + end + + it "returns available inventory" do + expect(movie.available_inventory).must_equal 8 + end + + it "returns 0 when there are no available inventory" do + movie.inventory = 0 + expect(movie.available_inventory).must_equal 0 end end From 532887ed0f161a8501fa711724f600756bcec085 Mon Sep 17 00:00:00 2001 From: Nara Date: Wed, 15 May 2019 14:01:16 -0700 Subject: [PATCH 24/24] Format update --- app/controllers/movies_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index bb330cd21..9d66933a3 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,8 +9,7 @@ def show if movie render json: movie.as_json(except: [:id,:created_at, :updated_at], :methods => [:available_inventory]), status: :ok else - render json: { "errors": ["Movie was not found"]}, - status: :not_found + render json: { "errors": ["Movie was not found"]}, status: :not_found end end