From 0cf71702c2764ac197dcb8f8afa4d9dd1dff3ee4 Mon Sep 17 00:00:00 2001 From: Shamira Date: Tue, 14 May 2019 14:36:25 -0700 Subject: [PATCH 01/24] rails setup --- .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/controllers/customers_controller.rb | 4 + app/controllers/movies_controller.rb | 4 + app/controllers/rentals_controller.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 4 + app/models/movie.rb | 4 + app/models/rental.rb | 4 + 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 | 5 + config/spring.rb | 6 + config/storage.yml | 34 ++++ db/migrate/20190514202320_create_customers.rb | 15 ++ db/migrate/20190514202414_create_movies.rb | 12 ++ ...514203901_customers_movies_rentals_join.rb | 10 ++ db/migrate/20190514204038_create_rentals.rb | 8 + .../20190514204415_change_date_time_type.rb | 5 + ...10545_add_customerand_movies_to_rentals.rb | 6 + db/schema.rb | 48 +++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 9 + test/controllers/movies_controller_test.rb | 9 + test/controllers/rentals_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 ++ test/fixtures/rentals.yml | 11 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/models/rental_test.rb | 9 + test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 80 files changed, 1158 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/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb 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/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb 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 db/migrate/20190514202320_create_customers.rb create mode 100644 db/migrate/20190514202414_create_movies.rb create mode 100644 db/migrate/20190514203901_customers_movies_rentals_join.rb create mode 100644 db/migrate/20190514204038_create_rentals.rb create mode 100644 db/migrate/20190514204415_change_date_time_type.rb create mode 100644 db/migrate/20190514210545_add_customerand_movies_to_rentals.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/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/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb 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/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b5ecfec7c --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,4 @@ +class MoviesController < ApplicationController + def index + end +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/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/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..1d05ffeba --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,4 @@ +class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..6237ce84b --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,4 @@ +class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..e5db47630 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movies + belongs_to :customers +end 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..96ef9ecad --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +NW8nk/IjDvAyLSql0V96SOWhuSFmEKp++mLFtlqocCv2X1UbdOz8Is+LwjLn6OwAPflrNzVCy9UOJAhmc5SS5O2ThEICuBWby/i10Qbu+80/k5lZhBX/YHAKDotpuzhHAHtY4wE4/uofG5E316WSrKSrJxAFNdk65GIkPePACQM/wN2bWKJDkgC9yln6zK5JXqOw0ektoHquQRMUiTaUnvcFPuoYHPYmBPjdiMHZ8tB73LvF82sw96MtSYo9wQuFFHx6M5sAjtOF1p1zixoDQ8HCUeYjlZFX9t8QI4rm8Ke80Lyus7Aj/Jf4w+4SvT/iHlF2en7tsCNH11PYVeQnpveFxwcEy19w5zvoVnho/Zrl+XYoKzSeNjn0yEkLGCMgcPaiYN/XYlS4gWls839teFg4NHLITEeArQNe--dEwPSQPt/fuDoRHE--dWfGGU0b875jJ2/gN63ZSw== \ 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..25c3bb41a --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,5 @@ +Rails.application.routes.draw do + get 'customers/index' + get 'movies/index' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20190514202320_create_customers.rb b/db/migrate/20190514202320_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514202320_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/20190514202414_create_movies.rb b/db/migrate/20190514202414_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514202414_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/20190514203901_customers_movies_rentals_join.rb b/db/migrate/20190514203901_customers_movies_rentals_join.rb new file mode 100644 index 000000000..047a24a1a --- /dev/null +++ b/db/migrate/20190514203901_customers_movies_rentals_join.rb @@ -0,0 +1,10 @@ +class CustomersMoviesRentalsJoin < ActiveRecord::Migration[5.2] + def change + def change + create_table :customers_movies do |t| + t.belongs_to :customer, index: true + t.belongs_to :movie, index: true + end + end + end +end diff --git a/db/migrate/20190514204038_create_rentals.rb b/db/migrate/20190514204038_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20190514204038_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20190514204415_change_date_time_type.rb b/db/migrate/20190514204415_change_date_time_type.rb new file mode 100644 index 000000000..9bc53694f --- /dev/null +++ b/db/migrate/20190514204415_change_date_time_type.rb @@ -0,0 +1,5 @@ +class ChangeDateTimeType < ActiveRecord::Migration[5.2] + def change + change_column :customers, :registered_at, :datetime + end +end diff --git a/db/migrate/20190514210545_add_customerand_movies_to_rentals.rb b/db/migrate/20190514210545_add_customerand_movies_to_rentals.rb new file mode 100644 index 000000000..a4a13c30c --- /dev/null +++ b/db/migrate/20190514210545_add_customerand_movies_to_rentals.rb @@ -0,0 +1,6 @@ +class AddCustomerandMoviesToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, index: true + add_reference :rentals, :movie, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..7fbdb0c14 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,48 @@ +# 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_210545) 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.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 + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..998bbef3f --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + 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/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..676a64036 --- /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: + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d29b955ad --- /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: + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/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/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 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 f638c22cde090b23cdf4f6e489e4d05c4d71a175 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Tue, 14 May 2019 15:31:58 -0700 Subject: [PATCH 02/24] added it works --- app/controllers/customers_controller.rb | 17 +++++++++++++++++ config/routes.rb | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..46e40a99c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,21 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: customers.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone]), status: :ok + end + + def show + customer = Customer.find_by(id: params[:id]) + if customer + render status: :ok, json: customer.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone]), status: :ok + else + render status: :not_found, json: { errors: "Customer not found " } + # there could be more than one error + end + end + + def zomg + render status: :not_found, json: { errors: "It works " } + # there could be more than one error end end diff --git a/config/routes.rb b/config/routes.rb index 25c3bb41a..f8a38c361 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Rails.application.routes.draw do - get 'customers/index' - get 'movies/index' + get "customers/index" + + get "customers/zomg" => "customers#zomg" + resources "customers" + + get "movies/index" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 930d788753b9e19e7c931b2ee75a8f7ed822a1ad Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Tue, 14 May 2019 15:44:55 -0700 Subject: [PATCH 03/24] added model validations --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 9 +++++++++ app/models/movie.rb | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 46e40a99c..dc0f13474 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -15,7 +15,7 @@ def show end def zomg - render status: :not_found, json: { errors: "It works " } + render status: :not_found, json: { message: "It works " } # there could be more than one error end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 1d05ffeba..29f1b74cc 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,13 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals + + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 6237ce84b..0533a1b45 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,9 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end From 1d66f70226608bef968d178ee6a8d971ae77a3f5 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Tue, 14 May 2019 16:10:37 -0700 Subject: [PATCH 04/24] added controllers params --- app/controllers/customers_controller.rb | 14 ++++++++++---- app/controllers/movies_controller.rb | 8 ++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dc0f13474..f59c00d1b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end def show @@ -14,8 +14,14 @@ def show end end - def zomg - render status: :not_found, json: { message: "It works " } - # there could be more than one error + # def zomg + # render status: :not_found, json: { message: "It works " } + # # there could be more than one error + # end + + private + + def params + params.require(:customer).permit(:name, :registered_at, :postal_code, :phone) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b5ecfec7c..fb5e40ea0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,12 @@ class MoviesController < ApplicationController def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end + + private + + def params + params.require(:movie).permit(:title, :release_date) end end From 343bfd9bf491502d818367f26e96382eee9057d8 Mon Sep 17 00:00:00 2001 From: Shamira Date: Tue, 14 May 2019 17:21:42 -0700 Subject: [PATCH 05/24] Passing movie model validation tests. --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 1 - test/fixtures/movies.yml | 14 +++--- test/models/customer_test.rb | 58 ++++++++++++++++++++++ test/models/movie_test.rb | 28 ++++++++++- test/test_helper.rb | 4 +- 6 files changed, 95 insertions(+), 12 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index fb5e40ea0..f9c817de4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,6 +7,6 @@ def index private def params - params.require(:movie).permit(:title, :release_date) + params.require(:movie).permit(:title, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 998bbef3f..2b0ea7ea2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -5,5 +5,4 @@ get movies_index_url value(response).must_be :success? end - end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d29b955ad..afb7d77e4 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: + title: Mulan + overview: A girl saves all of China + release_date: 1998-06-05 inventory: 1 two: - title: MyString - overview: MyString - release_date: - inventory: 1 + title: A Walk to Remember + overview: Right of passage movie. + release_date: 2002-01-25 + inventory: 2 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..f377b9721 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,4 +6,62 @@ it "must be valid" do value(customer).must_be :valid? end + describe "validations" do + let(:product2) { products(:two) } + it "description is required" do + product.description = "" + product.save + expect(product.valid?).must_equal false + product.errors.messages.must_include :description + product.errors[:description].include?("can't be blank") + end + + it "requires a photo_url" do + product.photo_url = "" + product.save + expect(product.valid?).must_equal false + product.errors.messages.must_include :photo_url + product.errors[:photo_url].include?("can't be blank") + end + + it "requires a name" do + product.name = "" + product.save + expect(product.valid?).must_equal false + product.errors.messages.must_include :name + product.errors[:name].include?("can't be blank") + end + + it "requires a unique name" do + product2.name = "manny" + product2.save + expect(product2.valid?).must_equal false + product2.errors.messages.must_include :name + product2.errors[:name].include?("has already been taken") + end + + it "requires a price" do + product.price = "" + product.save + expect(product.valid?).must_equal false + product.errors.messages.must_include :price + product.errors[:price].include?("can't be blank") + end + + it "requires a price greater than 0" do + product.price = 0 + product.save + expect(product.valid?).must_equal false + product.errors.messages.must_include :price + product.errors[:price].include?("must be greater than 0") + end + + it "requires an inventory not nil" do + product.inventory = 0 + product.save + expect(product.valid?).must_equal false + product.errors.messages.must_include :inventory + product.errors[:inventory].include?("must be greater than 0") + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..6b7218a8e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,35 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:one) } it "must be valid" do value(movie).must_be :valid? end + + describe "validations" do + it "title is required" do + movie.title = "" + movie.save + expect(movie.valid?).must_equal false + movie.errors.messages.must_include :title + movie.errors[:title].include?("can't be blank") + end + + it "overview is required" do + movie.overview = "" + movie.save + expect(movie.valid?).must_equal false + movie.errors.messages.must_include :overview + movie.errors[:overview].include?("can't be blank") + end + + it "release_date is required" do + movie.release_date = "" + movie.save + expect(movie.valid?).must_equal false + movie.errors.messages.must_include :release_date + movie.errors[:release_date].include?("can't be blank") + end + end end 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 49a5460b2e9545c0a47bf2115eeaf373c081275f Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Wed, 15 May 2019 12:24:15 -0700 Subject: [PATCH 06/24] initiated test --- test/fixtures/customers.yml | 24 ++++++----------- test/fixtures/movies.yml | 4 +-- test/fixtures/rentals.yml | 4 +-- test/models/customer_test.rb | 52 ++++++++++++++++++++++++++++++++++-- test/test_helper.rb | 4 +-- 5 files changed, 64 insertions(+), 24 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 676a64036..a1f975fb4 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - registered_at: - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +chewy: + name: Chewacca + registered_at: 2019-05-15 + address: 900 SW St + city: Edmonds + state: WA + postal_code: 98026 + phone: 1234567 -two: - name: MyString - registered_at: - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d29b955ad..cd9464440 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,8 +1,8 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString + title: Amelie + overview: French gal release_date: inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..cc77a6432 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,8 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value +one: + {} # two: {} # column: value diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..8ef2fa315 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,57 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:chewy) } - it "must be valid" do + it "must be valid with all attributes included" do value(customer).must_be :valid? end + + it "must be invalid without a name" do + customer.name = nil + value(customer).wont_be :valid? + customer.errors.messages.must_include :name + end + + it "must be invalid without a registered_at date" do + customer.registered_at = nil + value(customer).wont_be :valid? + customer.errors.messages.must_include :registered_at + end + + it "must be invalid without an address" do + customer.address = nil + value(customer).wont_be :valid? + customer.errors.messages.must_include :address + end + + it "must be invalid without a city" do + customer.city = nil + value(customer).wont_be :valid? + customer.errors.messages.must_include :city + end + + it "must be invalid without a state" do + customer.state = nil + value(customer).wont_be :valid? + customer.errors.messages.must_include :state + end + + it "must be invalid without a postal_code" do + customer.postal_code = nil + value(customer).wont_be :valid? + customer.errors.messages.must_include :postal_code + end + + it "must be invalid without a phone" do + customer.phone = nil + value(customer).wont_be :valid? + customer.errors.messages.must_include :phone + end + + describe "relations" do + it "must respond to rentals" do + customer.must_respond_to :rentals + end + end end 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 d3c3cf69edf3d0314b4e13f87d6acc3ab51c75be Mon Sep 17 00:00:00 2001 From: Shamira Date: Wed, 15 May 2019 12:46:55 -0700 Subject: [PATCH 07/24] updated branch removed typo --- test/models/customer_test.rb | 58 ------------------------------------ 1 file changed, 58 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index f377b9721..5ebc5c850 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,62 +6,4 @@ it "must be valid" do value(customer).must_be :valid? end - describe "validations" do - let(:product2) { products(:two) } - it "description is required" do - product.description = "" - product.save - expect(product.valid?).must_equal false - product.errors.messages.must_include :description - product.errors[:description].include?("can't be blank") - end - - it "requires a photo_url" do - product.photo_url = "" - product.save - expect(product.valid?).must_equal false - product.errors.messages.must_include :photo_url - product.errors[:photo_url].include?("can't be blank") - end - - it "requires a name" do - product.name = "" - product.save - expect(product.valid?).must_equal false - product.errors.messages.must_include :name - product.errors[:name].include?("can't be blank") - end - - it "requires a unique name" do - product2.name = "manny" - product2.save - expect(product2.valid?).must_equal false - product2.errors.messages.must_include :name - product2.errors[:name].include?("has already been taken") - end - - it "requires a price" do - product.price = "" - product.save - expect(product.valid?).must_equal false - product.errors.messages.must_include :price - product.errors[:price].include?("can't be blank") - end - - it "requires a price greater than 0" do - product.price = 0 - product.save - expect(product.valid?).must_equal false - product.errors.messages.must_include :price - product.errors[:price].include?("must be greater than 0") - end - - it "requires an inventory not nil" do - product.inventory = 0 - product.save - expect(product.valid?).must_equal false - product.errors.messages.must_include :inventory - product.errors[:inventory].include?("must be greater than 0") - end - end end From 0be994892c1e56d98d557bc31c6278ad81f9c295 Mon Sep 17 00:00:00 2001 From: Shamira Date: Wed, 15 May 2019 14:33:09 -0700 Subject: [PATCH 08/24] Movie controller methods and tests. --- app/controllers/customers_controller.rb | 4 +- app/controllers/movies_controller.rb | 13 +++++- config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 6 +++ test/controllers/movies_controller_test.rb | 42 ++++++++++++++++++- 5 files changed, 61 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f59c00d1b..290efb3d0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -9,7 +9,7 @@ def show if customer render status: :ok, json: customer.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone]), status: :ok else - render status: :not_found, json: { errors: "Customer not found " } + render status: :not_found, json: {errors: customer.errors.messages} # there could be more than one error end end @@ -21,7 +21,7 @@ def show private - def params + def customer_params params.require(:customer).permit(:name, :registered_at, :postal_code, :phone) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f9c817de4..39b8f55b5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,9 +4,18 @@ def index render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end + def create + movie = Movie.create(movie_params) + if movie.valid? + render json: {id: movie.id}, status: :ok + else + render json: {errors: movie.errors}, status: :bad_request + end + end + private - def params - params.require(:movie).permit(:title, :release_date, :inventory) + def movie_params + params.require(:movie).permit(:title, :release_date, :inventory, :overview) end end diff --git a/config/routes.rb b/config/routes.rb index f8a38c361..ce70d28ad 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,5 +5,6 @@ resources "customers" get "movies/index" + resources :movies, only: [:index, :show, :create] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..1f84a9fb5 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,15 @@ require "test_helper" describe CustomersController do + let(:customer) { customers(:chewy) } + it "should get index" do get customers_index_url value(response).must_be :success? end + it "can get show" do + get customer_path(customers(:chewy).id) + value(response).must_be :success? + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2b0ea7ea2..c106f77fc 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,6 +3,46 @@ describe MoviesController do it "should get index" do get movies_index_url - value(response).must_be :success? + value(response).must_be :successful? + end + + describe "create" do + let(:movie_data) { + { + title: "Friday", + release_date: "1995-04-25", + inventory: 5, + overview: "Friends have fun on Friday.", + } + } + it "should create a 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 "should error if movie cannot be created" do + movie_data["title"] = "" + + expect { + post movies_path, params: {movie: movie_data} + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end end end From 4b4291bf343a47884dfd36c9a3dd72bb57f6e8c1 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Wed, 15 May 2019 15:05:03 -0700 Subject: [PATCH 09/24] generated migration for checkout, duedate and available for rentals --- ...0515215859_add_checkout_duedate_and_checkinto_rental.rb | 7 +++++++ db/schema.rb | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190515215859_add_checkout_duedate_and_checkinto_rental.rb diff --git a/db/migrate/20190515215859_add_checkout_duedate_and_checkinto_rental.rb b/db/migrate/20190515215859_add_checkout_duedate_and_checkinto_rental.rb new file mode 100644 index 000000000..946ce4a87 --- /dev/null +++ b/db/migrate/20190515215859_add_checkout_duedate_and_checkinto_rental.rb @@ -0,0 +1,7 @@ +class AddCheckoutDuedateAndCheckintoRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :check_out, :date + add_column :rentals, :due_date, :date + add_column :rentals, :available, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 7fbdb0c14..e2ac16455 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_210545) do +ActiveRecord::Schema.define(version: 2019_05_15_215859) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,6 +41,9 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.date "check_out" + t.date "due_date" + t.boolean "available" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 25e432692ca7186ab1f7f70601956d9eb2eccc4b Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Thu, 16 May 2019 12:40:39 -0700 Subject: [PATCH 10/24] updates-testing --- app/controllers/movies_controller.rb | 13 +---- app/controllers/rentals_controller.rb | 36 +++++++++++++ app/models/customer.rb | 1 - config/routes.rb | 2 + ...90516162311_add_foreign_keys_to_rentals.rb | 6 +++ ...check_in_column_remove_available_column.rb | 6 +++ ...add_movies_check_out_count_to_customers.rb | 5 ++ db/schema.rb | 7 ++- test/controllers/rentals_controller_test.rb | 52 +++++++++++++++++-- test/fixtures/customers.yml | 9 ++++ test/fixtures/rentals.yml | 19 +++++-- 11 files changed, 135 insertions(+), 21 deletions(-) create mode 100644 db/migrate/20190516162311_add_foreign_keys_to_rentals.rb create mode 100644 db/migrate/20190516190741_add_check_in_column_remove_available_column.rb create mode 100644 db/migrate/20190516191430_add_movies_check_out_count_to_customers.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 39b8f55b5..f9c817de4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,18 +4,9 @@ def index render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end - def create - movie = Movie.create(movie_params) - if movie.valid? - render json: {id: movie.id}, status: :ok - else - render json: {errors: movie.errors}, status: :bad_request - end - end - private - def movie_params - params.require(:movie).permit(:title, :release_date, :inventory, :overview) + def params + params.require(:movie).permit(:title, :release_date, :inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..d813161ee 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,38 @@ +require "date" + class RentalsController < ApplicationController + def check_in + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + + rental = Rental.find_by(customer.id, movie.id) + if rental + movie.inventory += 1 + customer.movies_checked_out -= 1 + rental.check_in = Date.today + render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, movie.inventory]) + else + render status: :not_found, json: { ok: false, mesages: "Movie not found" } + end + end + + def check_out + rental = Rental.new(rental_params) + rental.check_out = DateTime.now.to_date + rental.due_date = rental.check_out + 7 + rental.available = false + rental.save + + if rental + render status: :ok, json: rental.as_json(only: [:id, :customer_id, :movie_id, :due_date]) + else + render status: :bad_request, json: { ok: false, errors: rental.errors } + end + end + + private + + def rental_params + params.permit(:movie_id, :customer_id, :due_date, :check_in) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 29f1b74cc..c0136d68f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,5 +9,4 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true - end diff --git a/config/routes.rb b/config/routes.rb index ce70d28ad..0c9848c13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,4 +7,6 @@ get "movies/index" resources :movies, only: [:index, :show, :create] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + post "rentals/check-out", to: "rentals#check_out", as: "check_out" + post "rentals/available", to: "rentals#available", as: "available" end diff --git a/db/migrate/20190516162311_add_foreign_keys_to_rentals.rb b/db/migrate/20190516162311_add_foreign_keys_to_rentals.rb new file mode 100644 index 000000000..11ce570ff --- /dev/null +++ b/db/migrate/20190516162311_add_foreign_keys_to_rentals.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRentals < ActiveRecord::Migration[5.2] + def change + add_foreign_key :rentals, :customers + add_foreign_key :rentals, :movies + end +end diff --git a/db/migrate/20190516190741_add_check_in_column_remove_available_column.rb b/db/migrate/20190516190741_add_check_in_column_remove_available_column.rb new file mode 100644 index 000000000..9dc5dcbbe --- /dev/null +++ b/db/migrate/20190516190741_add_check_in_column_remove_available_column.rb @@ -0,0 +1,6 @@ +class AddCheckInColumnRemoveAvailableColumn < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :check_in, :date + remove_column :rentals, :available, :boolean + end +end diff --git a/db/migrate/20190516191430_add_movies_check_out_count_to_customers.rb b/db/migrate/20190516191430_add_movies_check_out_count_to_customers.rb new file mode 100644 index 000000000..d14f52ba7 --- /dev/null +++ b/db/migrate/20190516191430_add_movies_check_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckOutCountToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index e2ac16455..885180fe1 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_15_215859) do +ActiveRecord::Schema.define(version: 2019_05_16_191430) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| @@ -43,9 +44,11 @@ t.bigint "movie_id" t.date "check_out" t.date "due_date" - t.boolean "available" + t.date "check_in" 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/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..2b4549a92 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,53 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + # let(:customer) { customers(:beyonce) } + # let(:movie) { movies(:one) } + # let(:rental) { rentals(:one) } + + describe "check_out" do + # it "creates a new rental" + let(:rental_data) { + { + customer_id: customers(:beyonce).id, + movie_id: movies(:one).id, + + } + } + + it "can create a new rental " do + expect { + post check_out_path, params: rental_data + }.must_change "Rental.count", 1 + + must_respond_with :success + end + end end + +# it "returns bad request for bad customer params data" do +# rentals.delete(:customer_id) +# proc { +# post check_out_path, params: rentals +# }.must_change "Rental.count", 0 + +# must_respond_with :bad_request +# body = JSON.parse(response.body) +# body.must_be_kind_of Hash +# body.must_include "errors" +# body["errors"].must_include "customer" +# end + +# it "returns bad request for bad movie params data" do +# rentals.delete(:movie_id) +# proc { +# post check_out_path, params: rentals +# }.must_change "Rental.count", 0 + +# must_respond_with :bad_request +# body = JSON.parse(response.body) +# body.must_be_kind_of Hash +# body.must_include "errors" +# body["errors"].must_include "movie" +# end +# end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index a1f975fb4..864616474 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -9,3 +9,12 @@ chewy: postal_code: 98026 phone: 1234567 + +beyonce: + name: Beyonce + registered_at: 2019-05-15 + address: 111 The Queen + city: Paris + state: WA + postal_code: 98034 + phone: 1234567 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index cc77a6432..4999371c4 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,7 +5,18 @@ # below each fixture, per the syntax in the comments below # one: - {} -# -two: {} -# column: value + customer_id: beyonce + movie_id: one + check_out: 2019-05-20 + due_date: 2019-01-27 + available: false + + +two: + customer_id: chewy + movie_id: two + check_out: 2019-05-20 + due_date: 2019-01-27 + available: false + + From 954c0d4b0f1dfd1b014bbf06595ab02ab9c47dbb Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Thu, 16 May 2019 12:46:56 -0700 Subject: [PATCH 11/24] updates-testing --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 0c9848c13..873bfebc9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,5 +8,5 @@ resources :movies, only: [:index, :show, :create] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html post "rentals/check-out", to: "rentals#check_out", as: "check_out" - post "rentals/available", to: "rentals#available", as: "available" + post "rentals/check_in", to: "rentals#check_in", as: "check_in" end From 3ee08dfc61120e8d29c2739f844959aaf5a68bdc Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Thu, 16 May 2019 18:24:51 -0700 Subject: [PATCH 12/24] test for postman --- app/controllers/movies_controller.rb | 26 +++++++++++++++++++++++++- config/routes.rb | 4 ++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f9c817de4..5208f5b26 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,9 +4,33 @@ def index render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end + def show + movie = Movie.find_by(id: params[:id]) + + if !movie.nil? + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), + status: :ok + else + render json: { ok: false, errors: ["Movie not found"] }, + status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), + status: :ok + else + render json: { ok: false, errors: movie.errors.messages }, + status: :bad_request + end + end + private def params - params.require(:movie).permit(:title, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/config/routes.rb b/config/routes.rb index 873bfebc9..d5c8d4420 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,8 @@ get "customers/zomg" => "customers#zomg" resources "customers" - get "movies/index" - resources :movies, only: [:index, :show, :create] + # get "movies/index" + resources :movies # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html post "rentals/check-out", to: "rentals#check_out", as: "check_out" post "rentals/check_in", to: "rentals#check_in", as: "check_in" From 5036899b1a0392a9b629b4cec73a9a7e806b9961 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Thu, 16 May 2019 23:05:54 -0700 Subject: [PATCH 13/24] movies and rentals controllers --- app/controllers/movies_controller.rb | 6 ++--- app/controllers/rentals_controller.rb | 34 +++++++++++++-------------- config/routes.rb | 12 ++++------ 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5208f5b26..ebd8e4aed 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + render json: movies.as_json(only: [:id, :available_inventory, :inventory, :overview, :release_date, :title]), status: :ok end def show @@ -20,7 +20,7 @@ def create movie = Movie.new(movie_params) if movie.save - render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else render json: { ok: false, errors: movie.errors.messages }, @@ -30,7 +30,7 @@ def create private - def params + def movie_params params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d813161ee..293945257 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,26 +1,10 @@ require "date" class RentalsController < ApplicationController - def check_in - customer = Customer.find_by(id: params[:customer_id]) - movie = Movie.find_by(id: params[:movie_id]) - - rental = Rental.find_by(customer.id, movie.id) - if rental - movie.inventory += 1 - customer.movies_checked_out -= 1 - rental.check_in = Date.today - render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, movie.inventory]) - else - render status: :not_found, json: { ok: false, mesages: "Movie not found" } - end - end - def check_out rental = Rental.new(rental_params) rental.check_out = DateTime.now.to_date rental.due_date = rental.check_out + 7 - rental.available = false rental.save if rental @@ -30,9 +14,25 @@ def check_out end end + def check_in + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + rental = Rental.find_by(customer_id: customer, movie_id: movie.id) + #binding.pry + + if rental + # movie.inventory += 1 + # customer.movies_checked_out -= 1 + # rental.check_in = Date.today + render json: { status: "Success", rental: rental }, status: :ok + else + render status: :not_found, json: { ok: false, mesages: "Movie not found" } + end + end + private def rental_params - params.permit(:movie_id, :customer_id, :due_date, :check_in) + params.permit(:movie_id, :customer_id) end end diff --git a/config/routes.rb b/config/routes.rb index d5c8d4420..1c369d696 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,8 @@ Rails.application.routes.draw do - get "customers/index" - get "customers/zomg" => "customers#zomg" - resources "customers" - - # get "movies/index" - resources :movies # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - post "rentals/check-out", to: "rentals#check_out", as: "check_out" - post "rentals/check_in", to: "rentals#check_in", as: "check_in" + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + post "rentals/check-out", to: "rentals#check_out", as: "rentals_check_out" + post "rentals/check-in", to: "rentals#check_in", as: "rentals_check_in" end From 5461cf1c46b2ba8ee313278498e7eb62cb21c546 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Thu, 16 May 2019 23:11:05 -0700 Subject: [PATCH 14/24] corrected render json --- app/controllers/rentals_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 293945257..55ee17004 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,7 +24,8 @@ def check_in # movie.inventory += 1 # customer.movies_checked_out -= 1 # rental.check_in = Date.today - render json: { status: "Success", rental: rental }, status: :ok + + render json: { id: rental.id }, status: :ok else render status: :not_found, json: { ok: false, mesages: "Movie not found" } end From 40768969baabb174058194c80084065e18105b11 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Fri, 17 May 2019 12:25:24 -0700 Subject: [PATCH 15/24] updated model relationship --- app/controllers/rentals_controller.rb | 13 ++++++++----- app/models/rental.rb | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 55ee17004..4a11d3854 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,14 +1,17 @@ require "date" +require "pry" class RentalsController < ApplicationController def check_out - rental = Rental.new(rental_params) + rental = Rental.create(rental_params) + rental.check_out = DateTime.now.to_date rental.due_date = rental.check_out + 7 rental.save + # binding.pry if rental - render status: :ok, json: rental.as_json(only: [:id, :customer_id, :movie_id, :due_date]) + render status: :ok, json: { id: rental.id } else render status: :bad_request, json: { ok: false, errors: rental.errors } end @@ -17,13 +20,13 @@ def check_out def check_in customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - rental = Rental.find_by(customer_id: customer, movie_id: movie.id) + rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) #binding.pry if rental - # movie.inventory += 1 + movie.update(available_inventory: movie.available_inventory += 1) # customer.movies_checked_out -= 1 - # rental.check_in = Date.today + rental.check_in = Date.today render json: { id: rental.id }, status: :ok else diff --git a/app/models/rental.rb b/app/models/rental.rb index e5db47630..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord - belongs_to :movies - belongs_to :customers + belongs_to :movie + belongs_to :customer end From a3f9a169fe877641562b55ade9a5e065f46e8feb Mon Sep 17 00:00:00 2001 From: Shamira Date: Fri, 17 May 2019 13:33:09 -0700 Subject: [PATCH 16/24] Added migration available_inventory to movies --- db/migrate/20190517202928_add_available_inventory_column.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190517202928_add_available_inventory_column.rb diff --git a/db/migrate/20190517202928_add_available_inventory_column.rb b/db/migrate/20190517202928_add_available_inventory_column.rb new file mode 100644 index 000000000..38809ad92 --- /dev/null +++ b/db/migrate/20190517202928_add_available_inventory_column.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryColumn < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 885180fe1..5c7fc8102 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_16_191430) do +ActiveRecord::Schema.define(version: 2019_05_17_202928) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From fedf02fd10f4d8dc0f448a945b1d2144e95e74f6 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Fri, 17 May 2019 14:02:07 -0700 Subject: [PATCH 17/24] check_out test passing --- app/controllers/customers_controller.rb | 7 +-- app/controllers/rentals_controller.rb | 3 -- test/controllers/rentals_controller_test.rb | 55 +++++---------------- test/fixtures/rentals.yml | 5 +- 4 files changed, 16 insertions(+), 54 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 290efb3d0..19740e65c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -9,16 +9,11 @@ def show if customer render status: :ok, json: customer.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone]), status: :ok else - render status: :not_found, json: {errors: customer.errors.messages} + render status: :not_found, json: { errors: customer.errors.messages } # there could be more than one error end end - # def zomg - # render status: :not_found, json: { message: "It works " } - # # there could be more than one error - # end - private def customer_params diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4a11d3854..98791fc82 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,4 @@ require "date" -require "pry" class RentalsController < ApplicationController def check_out @@ -8,7 +7,6 @@ def check_out rental.check_out = DateTime.now.to_date rental.due_date = rental.check_out + 7 rental.save - # binding.pry if rental render status: :ok, json: { id: rental.id } @@ -21,7 +19,6 @@ def check_in customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) - #binding.pry if rental movie.update(available_inventory: movie.available_inventory += 1) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2b4549a92..e02cb9bdd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,53 +1,22 @@ + require "test_helper" describe RentalsController do - # let(:customer) { customers(:beyonce) } - # let(:movie) { movies(:one) } - # let(:rental) { rentals(:one) } - - describe "check_out" do - # it "creates a new rental" - let(:rental_data) { - { - customer_id: customers(:beyonce).id, - movie_id: movies(:one).id, - - } + let(:rental_data) { + { + movie_id: movies(:one).id, + customer_id: customers(:chewy).id, + checkout_date: Date.today, + due_date: Date.today + 7, } - - it "can create a new rental " do + } + describe "checkout" do + it "creates a rental given valid data" do expect { - post check_out_path, params: rental_data - }.must_change "Rental.count", 1 + post rentals_check_out_path, params: rental_data + }.must_change "Rental.count", +1 must_respond_with :success end end end - -# it "returns bad request for bad customer params data" do -# rentals.delete(:customer_id) -# proc { -# post check_out_path, params: rentals -# }.must_change "Rental.count", 0 - -# must_respond_with :bad_request -# body = JSON.parse(response.body) -# body.must_be_kind_of Hash -# body.must_include "errors" -# body["errors"].must_include "customer" -# end - -# it "returns bad request for bad movie params data" do -# rentals.delete(:movie_id) -# proc { -# post check_out_path, params: rentals -# }.must_change "Rental.count", 0 - -# must_respond_with :bad_request -# body = JSON.parse(response.body) -# body.must_be_kind_of Hash -# body.must_include "errors" -# body["errors"].must_include "movie" -# end -# end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 4999371c4..af5e34123 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -9,7 +9,8 @@ one: movie_id: one check_out: 2019-05-20 due_date: 2019-01-27 - available: false + check_in: + two: @@ -17,6 +18,6 @@ two: movie_id: two check_out: 2019-05-20 due_date: 2019-01-27 - available: false + check_in: From a8963221d7ecd0d2e7cd44c14dd009765d3e21e2 Mon Sep 17 00:00:00 2001 From: Shamira Date: Fri, 17 May 2019 14:10:34 -0700 Subject: [PATCH 18/24] passing customer controller tests --- app/controllers/customers_controller.rb | 3 +-- app/controllers/movies_controller.rb | 6 +++--- config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 21 ++++++++++++++----- test/fixtures/rentals.yml | 2 -- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 290efb3d0..f409de59f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -9,8 +9,7 @@ def show if customer render status: :ok, json: customer.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone]), status: :ok else - render status: :not_found, json: {errors: customer.errors.messages} - # there could be more than one error + render status: :not_found, json: {ok: false, messages: "Movie was not found!"} end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ebd8e4aed..07242e99c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,7 +11,7 @@ def show render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else - render json: { ok: false, errors: ["Movie not found"] }, + render json: {ok: false, errors: ["Movie not found"]}, status: :not_found end end @@ -23,7 +23,7 @@ def create render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else - render json: { ok: false, errors: movie.errors.messages }, + render json: {ok: false, errors: movie.errors.messages}, status: :bad_request end end @@ -31,6 +31,6 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/config/routes.rb b/config/routes.rb index 1c369d696..954b46e48 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 :customers, only: [:index] + resources :customers, only: [:index, :show] resources :movies, only: [:index, :show, :create] post "rentals/check-out", to: "rentals#check_out", as: "rentals_check_out" post "rentals/check-in", to: "rentals#check_in", as: "rentals_check_in" diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1f84a9fb5..f059da750 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,12 +4,23 @@ let(:customer) { customers(:chewy) } it "should get index" do - get customers_index_url - value(response).must_be :success? + get customers_path + value(response).must_be :successful? end - it "can get show" do - get customer_path(customers(:chewy).id) - value(response).must_be :success? + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + describe "show" do + it "can get show" do + get customer_path(customers(:chewy).id) + value(response).must_be :successful? + end + + it "redirects if customer not found" do + get customer_path(-7) + must_respond_with :not_found + end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 4999371c4..7ffd7c3d4 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -9,7 +9,6 @@ one: movie_id: one check_out: 2019-05-20 due_date: 2019-01-27 - available: false two: @@ -17,6 +16,5 @@ two: movie_id: two check_out: 2019-05-20 due_date: 2019-01-27 - available: false From 7e0e75b779e2187ca1df2b05acbf63b089dce5e5 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Fri, 17 May 2019 14:16:28 -0700 Subject: [PATCH 19/24] added test for missing date for checkout --- app/controllers/rentals_controller.rb | 3 +-- test/controllers/rentals_controller_test.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 98791fc82..6c8fda827 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,9 +6,8 @@ def check_out rental.check_out = DateTime.now.to_date rental.due_date = rental.check_out + 7 - rental.save - if rental + if rental.save render status: :ok, json: { id: rental.id } else render status: :bad_request, json: { ok: false, errors: rental.errors } diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e02cb9bdd..e2e7a25f6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -19,4 +19,13 @@ must_respond_with :success end end + + it "return bad request if given invalid data" do + rental_data[:movie_id] = nil + expect { + post rentals_check_out_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + end end From 1516a8b7eb45edf7cf1e9bf156cf2175f633799f Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Fri, 17 May 2019 15:13:24 -0700 Subject: [PATCH 20/24] Fixed checkout rental controller and inventory count --- app/controllers/customers_controller.rb | 6 +++--- app/controllers/rentals_controller.rb | 19 +++++++++++++++---- db/seeds.rb | 10 ++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ef51682d5..44ca75d5b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,13 +1,13 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end def show customer = Customer.find_by(id: params[:id]) if customer - render status: :ok, json: customer.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone]), status: :ok + render status: :ok, json: customer.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone, :movies_checked_out_count]), status: :ok else render status: :not_found, json: { ok: false, messages: "Movie was not found!" } end @@ -16,6 +16,6 @@ def show private def customer_params - params.require(:customer).permit(:name, :registered_at, :postal_code, :phone) + params.require(:customer).permit(:name, :registered_at, :postal_code, :phone, :movies_checked_out_count) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6c8fda827..ec9156c44 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,12 +2,21 @@ class RentalsController < ApplicationController def check_out - rental = Rental.create(rental_params) - + rental = Rental.new(rental_params) + movie = Movie.find_by(id: params[:movie_id]) + if movie.available_inventory == 0 + render status: :not_found, json: { ok: false, mesages: "Movie not found" } + else + movie.available_inventory -= 1 + end rental.check_out = DateTime.now.to_date rental.due_date = rental.check_out + 7 if rental.save + movie.save + customer = Customer.find_by(id: rental.customer_id) + customer.movies_checked_out_count += 1 + customer.save render status: :ok, json: { id: rental.id } else render status: :bad_request, json: { ok: false, errors: rental.errors } @@ -15,13 +24,15 @@ def check_out end def check_in + rental = Rental.where(["movie_id = ? and customer_id = ? and check_in = ?", params[:rental][:movie_id], params[:rental][:customer_id]]).first customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id) + + rental.save if rental movie.update(available_inventory: movie.available_inventory += 1) - # customer.movies_checked_out -= 1 + customer.movies_checked_out -= 1 rental.check_in = Date.today render json: { id: rental.id }, status: :ok diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..3bd37da75 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,13 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| Customer.create!(customer) + current_customer = Customer.last + current_customer.movies_checked_out_count = 0 + current_customer.save end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| Movie.create!(movie) + current_movie = Movie.last + current_movie.available_inventory = current_movie.inventory + current_movie.save end From b9344c80c5a7aa70e325207027206c38bb9ae2c9 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Fri, 17 May 2019 16:04:08 -0700 Subject: [PATCH 21/24] updates to test and rental controllers --- app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 20 ++++++++++---------- test/controllers/rentals_controller_test.rb | 16 +++++++++------- test/fixtures/rentals.yml | 2 +- test/models/rental_test.rb | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 44ca75d5b..87b2d9b82 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -7,7 +7,7 @@ def index def show customer = Customer.find_by(id: params[:id]) if customer - render status: :ok, json: customer.as_json(only: [:name, :registered_at, :adress, :city, :state, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render status: :ok, json: customer.as_json(only: [:id, :name, :registered_at, :adress, :city, :state, :postal_code, :phone, :movies_checked_out_count]), status: :ok else render status: :not_found, json: { ok: false, messages: "Movie was not found!" } end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ec9156c44..8842e691c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,16 +24,16 @@ def check_out end def check_in - rental = Rental.where(["movie_id = ? and customer_id = ? and check_in = ?", params[:rental][:movie_id], params[:rental][:customer_id]]).first - customer = Customer.find_by(id: params[:customer_id]) - movie = Movie.find_by(id: params[:movie_id]) - - rental.save + rental = Rental.where(["movie_id = ? and customer_id = ?", params[:rental][:movie_id], params[:rental][:customer_id]]).first + customer = Customer.find_by(id: params[:rental][:customer_id]) + movie = Movie.find_by(id: params[:rental][:movie_id]) - if rental - movie.update(available_inventory: movie.available_inventory += 1) - customer.movies_checked_out -= 1 - rental.check_in = Date.today + rental.check_in = Date.today + if rental.save + customer.movies_checked_out_count -= 1 + customer.save + movie.available_inventory += 1 + movie.save render json: { id: rental.id }, status: :ok else @@ -44,6 +44,6 @@ def check_in private def rental_params - params.permit(:movie_id, :customer_id) + params.require(:rental).permit(:movie_id, :customer_id) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f6c89277e..7135ee93b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,10 +4,12 @@ describe RentalsController do let(:rental_data) { { - movie_id: movies(:one).id, - customer_id: customers(:chewy).id, - checkout_date: Date.today, - due_date: Date.today + 7, + rental: { + movie_id: movies(:one).id, + customer_id: customers(:chewy).id, + checkout_date: Date.today, + due_date: Date.today + 7, + }, } } describe "checkout" do @@ -21,7 +23,7 @@ end it "return bad request if given invalid data" do - rental_data[:movie_id] = nil + rental_data[:rental][:movie_id] = nil expect { post rentals_check_out_path, params: rental_data }.wont_change "Rental.count" @@ -29,6 +31,6 @@ must_respond_with :bad_request end - it "returns json" do - + it "returns json" do + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 7ffd7c3d4..8075661a1 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html # This model initially had no columns defined. If you add columns to the -# model remove the "{}" from the fixture names and add the columns immediately +# model remove the "{}" from the fixture name1`s and add the columns immediately # below each fixture, per the syntax in the comments below # one: diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..b0c472766 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { Rental.new(customer_id: customers(:chewy).id, movie_id: movies(:one).id) } it "must be valid" do value(rental).must_be :valid? From 2d0a617872e60253d207766a0dccac9b0f853e36 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Sat, 18 May 2019 21:52:06 -0700 Subject: [PATCH 22/24] checkout count working --- app/controllers/rentals_controller.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8842e691c..364277935 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,20 +3,23 @@ class RentalsController < ApplicationController def check_out rental = Rental.new(rental_params) - movie = Movie.find_by(id: params[:movie_id]) + movie = Movie.find_by(id: rental.movie_id) if movie.available_inventory == 0 render status: :not_found, json: { ok: false, mesages: "Movie not found" } - else - movie.available_inventory -= 1 end + rental.check_out = DateTime.now.to_date rental.due_date = rental.check_out + 7 if rental.save - movie.save customer = Customer.find_by(id: rental.customer_id) - customer.movies_checked_out_count += 1 - customer.save + + customer_movie_count = customer.movies_checked_out_count + customer.update(movies_checked_out_count: customer_movie_count + 1) + + movie_inventory = movie.available_inventory + movie.update(available_inventory: movie_inventory - 1) + render status: :ok, json: { id: rental.id } else render status: :bad_request, json: { ok: false, errors: rental.errors } @@ -27,8 +30,8 @@ def check_in rental = Rental.where(["movie_id = ? and customer_id = ?", params[:rental][:movie_id], params[:rental][:customer_id]]).first customer = Customer.find_by(id: params[:rental][:customer_id]) movie = Movie.find_by(id: params[:rental][:movie_id]) - rental.check_in = Date.today + if rental.save customer.movies_checked_out_count -= 1 customer.save From 73840d9153406b48511b4a53a4407b836178f8c2 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Sat, 18 May 2019 22:03:57 -0700 Subject: [PATCH 23/24] passing all smoke test, yay --- app/controllers/rentals_controller.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 364277935..784024edf 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -28,15 +28,17 @@ def check_out def check_in rental = Rental.where(["movie_id = ? and customer_id = ?", params[:rental][:movie_id], params[:rental][:customer_id]]).first - customer = Customer.find_by(id: params[:rental][:customer_id]) - movie = Movie.find_by(id: params[:rental][:movie_id]) rental.check_in = Date.today if rental.save - customer.movies_checked_out_count -= 1 - customer.save - movie.available_inventory += 1 - movie.save + customer = Customer.find_by(id: rental.customer_id) + movie = Movie.find_by(id: rental.movie_id) + + customer_movie_count = customer.movies_checked_out_count + customer.update(movies_checked_out_count: customer_movie_count - 1) + + movie_inventory = movie.available_inventory + movie.update(available_inventory: movie_inventory + 1) render json: { id: rental.id }, status: :ok else From 093779c9d8eb44ed39edc6c3f7e9522a95751289 Mon Sep 17 00:00:00 2001 From: Maria Wissler Date: Sat, 18 May 2019 23:18:31 -0700 Subject: [PATCH 24/24] update after running test again --- app/controllers/rentals_controller.rb | 19 +++++++--------- test/controllers/rentals_controller_test.rb | 25 +++++---------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 784024edf..a216a2d40 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,24 +3,23 @@ class RentalsController < ApplicationController def check_out rental = Rental.new(rental_params) + customer = Customer.find_by(id: rental.customer_id) movie = Movie.find_by(id: rental.movie_id) + if movie.available_inventory == 0 render status: :not_found, json: { ok: false, mesages: "Movie not found" } end - rental.check_out = DateTime.now.to_date + rental.check_out = Date.today rental.due_date = rental.check_out + 7 if rental.save - customer = Customer.find_by(id: rental.customer_id) - + render status: :ok, json: { id: rental.id } customer_movie_count = customer.movies_checked_out_count customer.update(movies_checked_out_count: customer_movie_count + 1) movie_inventory = movie.available_inventory movie.update(available_inventory: movie_inventory - 1) - - render status: :ok, json: { id: rental.id } else render status: :bad_request, json: { ok: false, errors: rental.errors } end @@ -29,18 +28,16 @@ def check_out def check_in rental = Rental.where(["movie_id = ? and customer_id = ?", params[:rental][:movie_id], params[:rental][:customer_id]]).first rental.check_in = Date.today + customer = Customer.find_by(id: rental.customer_id) + movie = Movie.find_by(id: rental.movie_id) if rental.save - customer = Customer.find_by(id: rental.customer_id) - movie = Movie.find_by(id: rental.movie_id) - + render json: { id: rental.id }, status: :ok customer_movie_count = customer.movies_checked_out_count customer.update(movies_checked_out_count: customer_movie_count - 1) movie_inventory = movie.available_inventory movie.update(available_inventory: movie_inventory + 1) - - render json: { id: rental.id }, status: :ok else render status: :not_found, json: { ok: false, mesages: "Movie not found" } end @@ -49,6 +46,6 @@ def check_in private def rental_params - params.require(:rental).permit(:movie_id, :customer_id) + params.permit(:movie_id, :customer_id) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7135ee93b..07979a9c9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,19 +1,16 @@ - require "test_helper" describe RentalsController do let(:rental_data) { { - rental: { - movie_id: movies(:one).id, - customer_id: customers(:chewy).id, - checkout_date: Date.today, - due_date: Date.today + 7, - }, + movie_id: movies(:one).id, + customer_id: customers(:chewy).id, + check_out: Date.today, + due_date: Date.today + 7, } } describe "checkout" do - it "creates a rental given valid data" do + it "should create a rental given valid data" do expect { post rentals_check_out_path, params: rental_data }.must_change "Rental.count", +1 @@ -21,16 +18,4 @@ must_respond_with :success end end - - it "return bad request if given invalid data" do - rental_data[:rental][:movie_id] = nil - expect { - post rentals_check_out_path, params: rental_data - }.wont_change "Rental.count" - - must_respond_with :bad_request - end - - it "returns json" do - end end