From 9c9627949300aa526bb2c50ebb7e984d534e5278 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 11:33:13 -0700 Subject: [PATCH 01/27] created rails app --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87697ba34 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 2.0.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..94fc08a2b --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +RLGzo8nS2cxCnUEsm+JH6lE4s9vu+R8I1QzPxTr6GfIatqYRZraETgHTn+OJZm6PRMLzrFG4Ryvi5u234l+s0ZlB9i8w75ro/CD65O5BokfSns/h/vBtjWkBd8UjPg34DrRoeSineNjyL+b7VPVnkGVlz0Gk2Bn+fjh90JqbPTTt7oQ64XeGUT5YxobW7KCLzsYlQw9YORQoK+wYIQDJJbrQNRS8lDqNuSAm3plIQ2ihWdG99jfR96zKgUHMoWTQBW9x7R/kHId/7Eo4BpGeMByulbgYDOn4GVOykqsK8Mwe/a0lqc7ggfIcWtA68lX9h5RwmeQSVdEY1swMhmJXViPXmKLWrKMA7FdvYKuYvKrYLmJbK1x9i3AIjvuHCCvDI3+taDzYUdDIaxDAxD+QPhK5lNXzfu9VJqcn--etwzn9qjb+QFB5up--ubcj1U5vSoSGEXx/sEGNag== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From f28ecfb1b9b9d5c80a74b5e79c0db1426222b606 Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Tue, 14 May 2019 11:45:50 -0700 Subject: [PATCH 02/27] add routes for project --- config/routes.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..0b730ee51 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,10 @@ 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 :movies, only: [:index, :show, :create] + + post "rentals/check-out", as: "checkout" + post "rentals/check-in", as: "checkin" end From 58709f8e1accc78149a2244ac16d062e17ecc8c5 Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Tue, 14 May 2019 13:37:27 -0700 Subject: [PATCH 03/27] create models and relationships --- app/models/customer.rb | 3 ++ app/models/movie.rb | 3 ++ app/models/rental.rb | 4 ++ db/migrate/20190514201814_create_movies.rb | 12 +++++ db/migrate/20190514202047_create_customers.rb | 14 +++++ db/migrate/20190514202120_create_rentals.rb | 10 ++++ ...0190514202508_add_customer_idto_rentals.rb | 5 ++ .../20190514202523_add_movie_idto_rentals.rb | 5 ++ ...514202917_add_registered_at_to_customer.rb | 5 ++ db/schema.rb | 52 +++++++++++++++++++ test/fixtures/customers.yml | 17 ++++++ test/fixtures/movies.yml | 13 +++++ test/fixtures/rentals.yml | 9 ++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 16 files changed, 179 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514201814_create_movies.rb create mode 100644 db/migrate/20190514202047_create_customers.rb create mode 100644 db/migrate/20190514202120_create_rentals.rb create mode 100644 db/migrate/20190514202508_add_customer_idto_rentals.rb create mode 100644 db/migrate/20190514202523_add_movie_idto_rentals.rb create mode 100644 db/migrate/20190514202917_add_registered_at_to_customer.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..666f87ef6 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_many :movies, through: :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..7f51a6afd --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_many :customers, through: :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20190514201814_create_movies.rb b/db/migrate/20190514201814_create_movies.rb new file mode 100644 index 000000000..5ab9bc2e2 --- /dev/null +++ b/db/migrate/20190514201814_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.datetime :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514202047_create_customers.rb b/db/migrate/20190514202047_create_customers.rb new file mode 100644 index 000000000..f6ae258aa --- /dev/null +++ b/db/migrate/20190514202047_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20190514202120_create_rentals.rb b/db/migrate/20190514202120_create_rentals.rb new file mode 100644 index 000000000..80d64aea8 --- /dev/null +++ b/db/migrate/20190514202120_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.datetime :checkout + t.datetime :due + + t.timestamps + end + end +end diff --git a/db/migrate/20190514202508_add_customer_idto_rentals.rb b/db/migrate/20190514202508_add_customer_idto_rentals.rb new file mode 100644 index 000000000..dc435d6af --- /dev/null +++ b/db/migrate/20190514202508_add_customer_idto_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdtoRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20190514202523_add_movie_idto_rentals.rb b/db/migrate/20190514202523_add_movie_idto_rentals.rb new file mode 100644 index 000000000..6b5b85c0e --- /dev/null +++ b/db/migrate/20190514202523_add_movie_idto_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIdtoRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20190514202917_add_registered_at_to_customer.rb b/db/migrate/20190514202917_add_registered_at_to_customer.rb new file mode 100644 index 000000000..7d4526ad5 --- /dev/null +++ b/db/migrate/20190514202917_add_registered_at_to_customer.rb @@ -0,0 +1,5 @@ +class AddRegisteredAtToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :registered_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..71f57cf20 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,52 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_202917) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.datetime "registered_at" + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.datetime "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 "checkout" + t.datetime "due" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..2823d1188 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..ec5db2fa1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 13:18:14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 13:18:14 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..933d895c5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout: 2019-05-14 13:21:20 + due: 2019-05-14 13:21:20 + +two: + checkout: 2019-05-14 13:21:20 + due: 2019-05-14 13:21:20 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From da782b24077da1c434909d498023e6eac44d3855 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 13:50:07 -0700 Subject: [PATCH 04/27] updated fixtures --- test/fixtures/customers.yml | 29 +++++++++++++++++------------ test/fixtures/movies.yml | 14 +++++++------- test/fixtures/rentals.yml | 11 +++++++++++ test/test_helper.rb | 4 ++-- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 2823d1188..444dd80a1 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,17 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Shelley Rocha + address: 292-5216 Ipsum Rd + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 + registered_at: 2019-05-14 13:18:14 + + two: - name: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Curran Stout + address: 658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: 94267 + phone: (908) 949-6758 + registered_at: 2019-05-14 13:18:14 + diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ec5db2fa1..5c91d5e5d 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 +test: + title: Test Movie + overview: This is a test movie release_date: 2019-05-14 13:18:14 inventory: 1 -two: - title: MyString - overview: MyString +other_test: + title: Other Test Movie + overview: This is also a test movie release_date: 2019-05-14 13:18:14 - inventory: 1 + inventory: 5 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 933d895c5..cadebb113 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,7 +3,18 @@ one: checkout: 2019-05-14 13:21:20 due: 2019-05-14 13:21:20 + customer: shelley + movie: test + two: checkout: 2019-05-14 13:21:20 due: 2019-05-14 13:21:20 + customer: curran + movie: other_test + +three: + checkout: 2019-05-14 13:21:20 + due: 2019-05-14 13:21:20 + customer: shelley + movie: other_test \ No newline at end of file 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 8a16b20eb7a25935ed6f2ab1ce75beb888c2609b Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Tue, 14 May 2019 13:54:47 -0700 Subject: [PATCH 05/27] add validation for models --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ test/test_helper.rb | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 666f87ef6..dfbd62fc7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals + + validates :name, :inventory, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 7f51a6afd..191aa58e6 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,5 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals + + validates :name, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..64bfe9b1f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + validates :checkout, :due, presence: true 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 3b7632d34e11e85f2cf58461eacbdc360cad48a0 Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Tue, 14 May 2019 13:58:41 -0700 Subject: [PATCH 06/27] fix Kasey's mix up of validations --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index dfbd62fc7..f703cc217 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals - validates :name, :inventory, presence: true + validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 191aa58e6..050d4149f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals - validates :name, presence: true + validates :title, :inventory, presence: true end From e49232881c714e88480ebcb031150551e5913f8e Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 14:19:28 -0700 Subject: [PATCH 07/27] passing validation and relation tests for customer --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + test/fixtures/customers.yml | 4 ++-- test/models/customer_test.rb | 23 ++++++++++++++++++++--- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index f703cc217..7ad158446 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord + has_many :rentals has_many :movies, through: :rentals validates :name, presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index 050d4149f..adcc14369 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,5 @@ class Movie < ApplicationRecord + has_many :rentals has_many :customers, through: :rentals validates :title, :inventory, presence: true diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 444dd80a1..1ac828968 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +shelley: name: Shelley Rocha address: 292-5216 Ipsum Rd city: Hillsboro @@ -11,7 +11,7 @@ one: -two: +curran: name: Curran Stout address: 658-1540 Erat Rd. city: San Francisco diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..55198e591 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,26 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:shelley) } - it "must be valid" do - value(customer).must_be :valid? + describe "validations" do + it "must be valid" do + value(customer).must_be :valid? + end + + it "won't be valid without a name" do + customer.name = nil + value(customer).wont_be :valid? + end + end + describe "relations" do + it "has associated rentals" do + expect(customer.rentals).must_include rentals(:one) + expect(customer.rentals).must_include rentals(:three) + end + it "has associated movies" do + expect(customer.movies).must_include movies(:test) + expect(customer.movies).must_include movies(:other_test) + end end end From ed5bf84d0f8a1dc4ee26aa4df1c2d258efd1e653 Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Tue, 14 May 2019 14:26:40 -0700 Subject: [PATCH 08/27] update movie test --- test/models/movie_test.rb | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..02dd80954 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,29 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:test) } it "must be valid" do - value(movie).must_be :valid? + expect(movie.valid?).must_equal true + end + + it "wont be valid without a title" do + movie.title = "" + expect(movie.valid?).must_equal false + end + + it "wont be valid without inventory" do + movie.inventory = "" + expect(movie.valid?).must_equal false + end + + it "canhaz an associated customer" do + expect(movie).must_respond_to :customers + expect(movie.customers).must_include customers(:shelley) + end + + it "can have an associated rental" do + expect(movie).must_respond_to :rentals + expect(movie.rentals).must_include rentals(:one) end end From c298b1925ec0e9fe7e09062fbfa2fd2ba6e248f1 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 14:29:04 -0700 Subject: [PATCH 09/27] added more validation tests --- test/models/customer_test.rb | 2 ++ test/models/rental_test.rb | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 55198e591..2d557aa12 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -15,10 +15,12 @@ end describe "relations" do it "has associated rentals" do + expect(customer).must_respond_to :rentals expect(customer.rentals).must_include rentals(:one) expect(customer.rentals).must_include rentals(:three) end it "has associated movies" do + expect(customer).must_respond_to :movies expect(customer.movies).must_include movies(:test) expect(customer.movies).must_include movies(:other_test) end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..94ba82cf9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,9 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { + rentals(:one) + } it "must be valid" do value(rental).must_be :valid? From 4322d545faa33bd7cbe9cc16643c2b36fcd558f2 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 14:55:44 -0700 Subject: [PATCH 10/27] added custom methods/validations to check availability of movie --- app/models/movie.rb | 6 ++++++ app/models/rental.rb | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index adcc14369..941439793 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,10 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals validates :title, :inventory, presence: true + + def number_available + checked_out = self.rentals.select { |rental| rental.due > DateTime.now }.count + + return inventory - checked_out + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 64bfe9b1f..9d8d8e915 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,4 +3,12 @@ class Rental < ApplicationRecord belongs_to :customer validates :checkout, :due, presence: true + + validate :availability + + def availability + if self.movie.number_available < 1 + errors.add(:inventory, "All copies of that movie are currently checked out") + end + end end From f94b5a7c3c30e0fe324fde9cd9ef5ad1b62ba9ee Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 15:11:02 -0700 Subject: [PATCH 11/27] added tests for availability --- test/models/rental_test.rb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 94ba82cf9..380f2a21b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,6 +6,21 @@ } it "must be valid" do - value(rental).must_be :valid? + expect(rental).must_be :valid? + end + + describe "availability" do + let(:rental_two) { + Rental.new( + movie_id: movies(:other_test).id, + customer_id: customers(:shelley).id, + checkout: DateTime.now, + due: DateTime.now + 7.days, + ) + } + it "won't be valid if movie is unavailable" do + rental_two.movie.inventory = 0 + value(rental_two).wont_be :valid? + end end end From 1967bf7cf8d388512b07e7238aa3974af02762eb Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 15:15:32 -0700 Subject: [PATCH 12/27] all tests for availability methods passing --- test/fixtures/rentals.yml | 2 +- test/models/movie_test.rb | 4 ++++ test/models/rental_test.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index cadebb113..0f86b1a3f 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,7 +2,7 @@ one: checkout: 2019-05-14 13:21:20 - due: 2019-05-14 13:21:20 + due: 2019-05-21 13:21:20 customer: shelley movie: test diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 02dd80954..1ea584923 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -26,4 +26,8 @@ expect(movie).must_respond_to :rentals expect(movie.rentals).must_include rentals(:one) end + + it "can return the number currently available" do + expect(movie.number_available).must_equal 0 + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 380f2a21b..c47db36a9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,7 +2,7 @@ describe Rental do let(:rental) { - rentals(:one) + rentals(:two) } it "must be valid" do From cec42ca0fd70c839023e064fb799c7a379740cee Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Tue, 14 May 2019 16:31:28 -0700 Subject: [PATCH 13/27] generate controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 6 files changed, 27 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/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/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 04b7e7dbce67ef952918c2c63b90a0e92a639fad Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 16:57:35 -0700 Subject: [PATCH 14/27] wrote controller methods --- app/controllers/customers_controller.rb | 10 +++++++++ app/controllers/movies_controller.rb | 28 +++++++++++++++++++++++++ app/controllers/rentals_controller.rb | 15 +++++++++++++ config/routes.rb | 4 ++-- 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..8ee0edad1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,12 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render status: :ok, json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + end + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..3535d09f7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,30 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) + end + + def show + movie = Movie.find_by(id: params[:id]) + if movie + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) + else + render status: :not_found, json: { errors: [id: "The movie you are looking for with id #{params[:id]} was not found"] } + end + end + + def create + movie = movie.new(movie_params) + if movie.save + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) + else + render status: :bad_request, json: { errors: movie.errors.messages } + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..934d08b72 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,17 @@ class RentalsController < ApplicationController + def checkout + rental = Rental.new(movie_id: params[:movie_id], + customer_id: params[:customer_id], + checkout: DateTime.now, + due: DateTime.now + 7.days) + + if rental.save + render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, :checkout, :due]) + else + render status: :bad_request, json: { errors: rental.errors.messages } + end + end + + def checkin + end end diff --git a/config/routes.rb b/config/routes.rb index 0b730ee51..13c29f5d9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,6 @@ resources :movies, only: [:index, :show, :create] - post "rentals/check-out", as: "checkout" - post "rentals/check-in", as: "checkin" + post "rentals/check-out", to: "rentals#checkout", as: "checkout" + post "rentals/check-in", to: "rentals#checkin", as: "checkin" end From 97caac150d64d443aeefaa37a9d492a1bb456d81 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 17:12:52 -0700 Subject: [PATCH 15/27] added method for checkin --- app/controllers/rentals_controller.rb | 14 +++++++++++++- app/models/movie.rb | 2 +- .../20190515000104_add_returned_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190515000104_add_returned_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 934d08b72..06be432ee 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,12 +6,24 @@ def checkout due: DateTime.now + 7.days) if rental.save - render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, :checkout, :due]) + render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, :checkout, :due, :returned]) else render status: :bad_request, json: { errors: rental.errors.messages } end end def checkin + rental = Rental.find_by(movie_id: params[:movie_id], + customer_id: params[:customer_id]) + unless rental + render status: :not_found, json: { errors: ["The rental you requested was not found"] } + return + end + rental.returned = true + if rental.save + render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, :checkout, :due, :returned]) + else + render status: :bad_request, json: { errors: [rental.errors.messages] } + end end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 941439793..eff19957b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,7 +5,7 @@ class Movie < ApplicationRecord validates :title, :inventory, presence: true def number_available - checked_out = self.rentals.select { |rental| rental.due > DateTime.now }.count + checked_out = self.rentals.select { |rental| (rental.due > DateTime.now) && (!rental.returned) }.count return inventory - checked_out end diff --git a/db/migrate/20190515000104_add_returned_to_rentals.rb b/db/migrate/20190515000104_add_returned_to_rentals.rb new file mode 100644 index 000000000..fc3ebd059 --- /dev/null +++ b/db/migrate/20190515000104_add_returned_to_rentals.rb @@ -0,0 +1,5 @@ +class AddReturnedToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :returned, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 71f57cf20..f1d6f04dc 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_202917) do +ActiveRecord::Schema.define(version: 2019_05_15_000104) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.boolean "returned", default: false t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 758cb4e1f25932fe32ce8a712a3952a615c49e12 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 17:15:06 -0700 Subject: [PATCH 16/27] added returned column to fixtures --- test/fixtures/rentals.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 0f86b1a3f..f4bb872f9 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,6 +5,7 @@ one: due: 2019-05-21 13:21:20 customer: shelley movie: test + returned: false two: @@ -12,9 +13,11 @@ two: due: 2019-05-14 13:21:20 customer: curran movie: other_test + returned: false three: checkout: 2019-05-14 13:21:20 due: 2019-05-14 13:21:20 customer: shelley - movie: other_test \ No newline at end of file + movie: other_test + returned: false \ No newline at end of file From 8ac2555f2b5f26751d2a4016439d6e188b0d9851 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 14 May 2019 18:57:52 -0700 Subject: [PATCH 17/27] updated movies controller --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3535d09f7..c2ef2fa5d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show if movie render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) else - render status: :not_found, json: { errors: [id: "The movie you are looking for with id #{params[:id]} was not found"] } + render status: :not_found, json: { errors: ["id": "The movie you are looking for with id #{params[:id]} was not found"] } end end From 28177ce15905b11fa1f78a20c795450723e47817 Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Wed, 15 May 2019 13:24:30 -0700 Subject: [PATCH 18/27] all tests, fix the movie test to right syntax --- app/controllers/movies_controller.rb | 10 +- test/controllers/customers_controller_test.rb | 39 +++++++- test/controllers/movies_controller_test.rb | 97 +++++++++++++++++++ 3 files changed, 138 insertions(+), 8 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3535d09f7..4a35bc9ec 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,18 +7,18 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) else - render status: :not_found, json: { errors: [id: "The movie you are looking for with id #{params[:id]} was not found"] } + render status: :not_found, json: {errors: [id: "The movie you are looking for with id #{params[:id]} was not found"]} end end def create - movie = movie.new(movie_params) + movie = Movie.new(movie_params) if movie.save - render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) else - render status: :bad_request, json: { errors: movie.errors.messages } + render status: :bad_request, json: {errors: movie.errors.messages} end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..ad7c4409e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,40 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(address city name phone postal_code registered_at state) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..1f32dd8ba 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,104 @@ require "test_helper" describe MoviesController do + let(:movie) { movies(:test) } # it "must be a real test" do # flunk "Need real tests" # end + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + keys = %w(inventory overview release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end + + describe "show" do + # This bit is up to you! + it "can get a movie" do + get movie_path(movie) + must_respond_with :success + end + + it "will error if the movie id doesn't exist" do + get movie_path(-1) + must_respond_with :not_found + + body = JSON.parse(response.body) + + expect(body).must_include "errors" + expect(body["errors"][0]["id"]).must_equal "The movie you are looking for with id -1 was not found" + end + end + + describe "create" do + let(:movie_data) { + { + title: "Babe: Pig in the City", + overview: "little pig big city", + release_date: DateTime.now, + inventory: 5, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: {movie: movie_data} + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "title" + + movie = Movie.find_by(title: body["title"]) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid movie data" do + # arrange + movie_data["title"] = nil + + expect { + post movies_path, params: {movie: movie_data} + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end From 8bad08c07150dc4d22a89a32a00f92bd90e5bbbe Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Wed, 15 May 2019 13:37:12 -0700 Subject: [PATCH 19/27] add id to customer JSON --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 8ee0edad1..1184521d6 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 status: :ok, json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) end private diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ad7c4409e..e0f43d7de 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,7 +29,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(address city name phone postal_code registered_at state) + keys = %w(address city name phone postal_code registered_at state id) get customers_path body = JSON.parse(response.body) body.each do |customer| From 864e9ad3f43c946e11c84b031389090cfec51ad8 Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Wed, 15 May 2019 13:51:12 -0700 Subject: [PATCH 20/27] add id to the JSON in other places as well --- app/controllers/movies_controller.rb | 6 +++--- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0d5c32f57..f4a647576 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,13 +1,13 @@ class MoviesController < ApplicationController def index movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) + render status: :ok, json: movies.as_json(only: [:id, :title, :overview, :release_date, :inventory]) end def show movie = Movie.find_by(id: params[:id]) if movie - render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) + render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) else render status: :not_found, json: {errors: ["id": "The movie you are looking for with id #{params[:id]} was not found"]} end @@ -16,7 +16,7 @@ def show def create movie = Movie.new(movie_params) if movie.save - render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) + render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) else render status: :bad_request, json: {errors: movie.errors.messages} end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e0f43d7de..c4e843679 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,7 +29,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(address city name phone postal_code registered_at state id) + keys = %w(address city id name phone postal_code registered_at state) get customers_path body = JSON.parse(response.body) body.each do |customer| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1f32dd8ba..3885d37ad 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -33,7 +33,7 @@ end it "returns movies with exactly the required fields" do - keys = %w(inventory overview release_date title) + keys = %w(id inventory overview release_date title) get movies_path body = JSON.parse(response.body) body.each do |movie| From bc8431fd944e6b11e55553b62c0f6e01d3ef0288 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Wed, 15 May 2019 13:51:59 -0700 Subject: [PATCH 21/27] added movies_checked_out_count to customer index json output --- app/controllers/customers_controller.rb | 4 +- app/models/customer.rb | 4 ++ app/models/movie.rb | 2 +- test/controllers/customers_controller_test.rb | 39 +++++++++++++++++-- test/models/customer_test.rb | 3 ++ 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 8ee0edad1..8e229e949 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 status: :ok, json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + customers = Customer.all.map { |customer| customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]).merge({ "movies_checked_out_count": customer.checked_out_count }) } + render status: :ok, json: customers.as_json end private diff --git a/app/models/customer.rb b/app/models/customer.rb index 7ad158446..a3d00b4c5 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,4 +3,8 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals validates :name, presence: true + + def checked_out_count + return self.rentals.select { |rental| !rental.returned }.count + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index eff19957b..7b41279b2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,7 +5,7 @@ class Movie < ApplicationRecord validates :title, :inventory, presence: true def number_available - checked_out = self.rentals.select { |rental| (rental.due > DateTime.now) && (!rental.returned) }.count + checked_out = self.rentals.select { |rental| !rental.returned }.count return inventory - checked_out end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..413eb879d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,40 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(address city movies_checked_out_count name phone postal_code registered_at state) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2d557aa12..41e08480b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -24,5 +24,8 @@ expect(customer.movies).must_include movies(:test) expect(customer.movies).must_include movies(:other_test) end + it "can return the number of movies currently checked out" do + expect(customer.checked_out_count).must_equal 2 + end end end From 38a5c83f83b8f6edfcbfc308dcf2394b7d848371 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Wed, 15 May 2019 13:53:51 -0700 Subject: [PATCH 22/27] resolved merge conflict --- test/controllers/customers_controller_test.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index dee601bca..413eb879d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,11 +29,7 @@ end it "returns customers with exactly the required fields" do -<<<<<<< HEAD keys = %w(address city movies_checked_out_count name phone postal_code registered_at state) -======= - keys = %w(address city id name phone postal_code registered_at state) ->>>>>>> 864e9ad3f43c946e11c84b031389090cfec51ad8 get customers_path body = JSON.parse(response.body) body.each do |customer| From b9c5c20c2538c833d877bcb909eef3106a374306 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Wed, 15 May 2019 13:54:22 -0700 Subject: [PATCH 23/27] resolved merge conflict --- app/controllers/customers_controller.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7a1294a51..8e229e949 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,12 +1,7 @@ class CustomersController < ApplicationController def index -<<<<<<< HEAD customers = Customer.all.map { |customer| customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]).merge({ "movies_checked_out_count": customer.checked_out_count }) } render status: :ok, json: customers.as_json -======= - customers = Customer.all - render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) ->>>>>>> 864e9ad3f43c946e11c84b031389090cfec51ad8 end private From d6fc271396e45927851c9dd8010db4d64384e12c Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Wed, 15 May 2019 14:01:05 -0700 Subject: [PATCH 24/27] DUDE WHERE DID THE ID GO --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 8e229e949..3664d194f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.map { |customer| customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]).merge({ "movies_checked_out_count": customer.checked_out_count }) } + customers = Customer.all.map { |customer| customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]).merge({"movies_checked_out_count": customer.checked_out_count}) } render status: :ok, json: customers.as_json end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 413eb879d..dbc301c05 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,7 +29,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(address city movies_checked_out_count name phone postal_code registered_at state) + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) get customers_path body = JSON.parse(response.body) body.each do |customer| From 0ea6449eea018191c264063db5017a07aa9c9a8b Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Wed, 15 May 2019 14:11:53 -0700 Subject: [PATCH 25/27] removed require from strong params --- app/controllers/customers_controller.rb | 4 ++-- app/controllers/movies_controller.rb | 10 +++++----- test/controllers/movies_controller_test.rb | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3664d194f..be8b9caa3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,12 +1,12 @@ class CustomersController < ApplicationController def index - customers = Customer.all.map { |customer| customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]).merge({"movies_checked_out_count": customer.checked_out_count}) } + customers = Customer.all.map { |customer| customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]).merge({ "movies_checked_out_count": customer.checked_out_count }) } render status: :ok, json: customers.as_json end private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f4a647576..1abb28eaa 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,24 +7,24 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) + render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) else - render status: :not_found, json: {errors: ["id": "The movie you are looking for with id #{params[:id]} was not found"]} + render status: :not_found, json: { errors: ["id": "The movie you are looking for with id #{params[:id]} was not found"] } end end def create movie = Movie.new(movie_params) if movie.save - render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) + render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) else - render status: :bad_request, json: {errors: movie.errors.messages} + render status: :bad_request, json: { errors: movie.errors.messages } end end private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3885d37ad..635b15a12 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -72,7 +72,7 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) @@ -90,7 +90,7 @@ movie_data["title"] = nil expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: { movie: movie_data } }.wont_change "Movie.count" body = JSON.parse(response.body) From edd5bd0a32449eea17865f139bacacea1fd39002 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Wed, 15 May 2019 15:08:33 -0700 Subject: [PATCH 26/27] fixed bug in checkout method to handle previous rentals of the same movie by the same user --- 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 06be432ee..4280bf2d1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,7 +14,8 @@ def checkout def checkin rental = Rental.find_by(movie_id: params[:movie_id], - customer_id: params[:customer_id]) + customer_id: params[:customer_id], + returned: false) unless rental render status: :not_found, json: { errors: ["The rental you requested was not found"] } return From f3d7fed02f343f6753592c46bf34aff6c2bf72ec Mon Sep 17 00:00:00 2001 From: K <774162+kaseea@users.noreply.github.com> Date: Wed, 15 May 2019 15:46:29 -0700 Subject: [PATCH 27/27] rental controller testing --- app/controllers/movies_controller.rb | 8 ++-- app/controllers/rentals_controller.rb | 6 +-- test/controllers/rentals_controller_test.rb | 44 +++++++++++++++++++++ test/fixtures/rentals.yml | 2 +- test/models/customer_test.rb | 2 +- 5 files changed, 53 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1abb28eaa..babaecf7c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,18 +7,18 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) + render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) else - render status: :not_found, json: { errors: ["id": "The movie you are looking for with id #{params[:id]} was not found"] } + render status: :not_found, json: {errors: ["id": "The movie you are looking for with id #{params[:id]} was not found"]} end end def create movie = Movie.new(movie_params) if movie.save - render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({ "available_inventory": movie.number_available }) + render status: :ok, json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]).merge({"available_inventory": movie.number_available}) else - render status: :bad_request, json: { errors: movie.errors.messages } + render status: :bad_request, json: {errors: movie.errors.messages} end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4280bf2d1..6a1964ebd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,7 @@ def checkout if rental.save render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, :checkout, :due, :returned]) else - render status: :bad_request, json: { errors: rental.errors.messages } + render status: :bad_request, json: {errors: rental.errors.messages} end end @@ -17,14 +17,14 @@ def checkin customer_id: params[:customer_id], returned: false) unless rental - render status: :not_found, json: { errors: ["The rental you requested was not found"] } + render status: :not_found, json: {errors: ["The rental you requested was not found"]} return end rental.returned = true if rental.save render status: :ok, json: rental.as_json(only: [:movie_id, :customer_id, :checkout, :due, :returned]) else - render status: :bad_request, json: { errors: [rental.errors.messages] } + render status: :bad_request, json: {errors: [rental.errors.messages]} end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..774d5dec6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,4 +4,48 @@ # it "must be a real test" do # flunk "Need real tests" # end + before do + @params = {customer_id: customers(:shelley).id, movie_id: movies(:other_test).id} + end + describe "checkout" do + it "customer can checkout and create a new rental" do + expect { + post checkout_path, params: @params + }.must_change "Rental.count", 1 + + expect(response.header["Content-Type"]).must_include "json" + expect(Rental.last.due - Rental.last.checkout).must_be_close_to 604800 + expect(Rental.last.returned).must_equal false + end + + it "movie availble inventory decreases" do + before = movies(:other_test).number_available + + post checkout_path, params: @params + movies(:other_test).reload + expect(movies(:other_test).number_available).must_equal before - 1 + end + end + + describe "checkin" do + it "customer can checkin a rental" do + post checkout_path, params: @params + + expect { + post checkin_path, params: @params + }.wont_change "Rental.count" + + expect(response.header["Content-Type"]).must_include "json" + expect(Rental.last.returned).must_equal true + end + + it "movie available inventory increases" do + post checkout_path, params: @params + before = movies(:other_test).number_available + + post checkin_path, params: @params + movies(:other_test).reload + expect(movies(:other_test).number_available).must_equal before + 1 + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f4bb872f9..f0cca9b25 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -20,4 +20,4 @@ three: due: 2019-05-14 13:21:20 customer: shelley movie: other_test - returned: false \ No newline at end of file + returned: true \ No newline at end of file diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 41e08480b..16172210c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -25,7 +25,7 @@ expect(customer.movies).must_include movies(:other_test) end it "can return the number of movies currently checked out" do - expect(customer.checked_out_count).must_equal 2 + expect(customer.checked_out_count).must_equal 1 end end end