From bdd7d21972a6b72e9fdc4b1e5845a84f7f71ed57 Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Mon, 5 Nov 2018 11:32:23 -0800 Subject: [PATCH 01/27] initial rails setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ 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 57 files changed, 934 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 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..a9f49bedc --- /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.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..54d5ca3ed --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.5 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..411fe9dc0 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +N2w+sU7bORXroVZTnLlYff9r0M+bZe4jopjbk3gDSOqNWqwgqVkWM4Crcq/1O8hegVZiC8IMRyYgPjXAMIc3KNBG7D3TyPHvrIC+FiKdzAX3nH1TXo6CJ4sUVgjO/qT68yc94qPLhDoR2g9MdLI9422quFxLEkA+YBfh1VVHHbJfdgvOkLjm1qrxo+UpvfGN4cnoIF2QpAdVplM7bVxaQX771/uEVoadqVeJP/AT9Pe4M8Of3j5fy4jzyNBc1Vi0NjVctMClzrYzFtQLhWStOCLSSkVUSIH7HjmYGXnrsR1FpAL7p/lG7SkFFcvCQii5VipdWY4/P/LUvsvWPdhby5n95Afb+nRqvfd6Xi1VzAXoy+8gxwchPSMgxuvRXQO11Z13V3dd5bcgtba7kZ6E8iPCyqJcgDXTRUlB--yRtNI+o79mfYp9bl--sOhRIHzqQ0U4/iz7Cctvlw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/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 35e19899fc120057088a378466759abcec884809 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Mon, 5 Nov 2018 12:14:43 -0800 Subject: [PATCH 02/27] created controllers and models --- app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/controllers/rentals_controller.rb | 2 + app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/models/rental.rb | 2 + db/migrate/20181105201302_create_customers.rb | 15 ++++++ db/migrate/20181105201336_create_movies.rb | 12 +++++ db/migrate/20181105201402_create_rentals.rb | 10 ++++ db/schema.rb | 46 +++++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +++ test/controllers/movies_controller_test.rb | 7 +++ test/controllers/rentals_controller_test.rb | 7 +++ test/fixtures/customers.yml | 19 ++++++++ test/fixtures/movies.yml | 13 ++++++ test/fixtures/rentals.yml | 9 ++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 19 files changed, 184 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181105201302_create_customers.rb create mode 100644 db/migrate/20181105201336_create_movies.rb create mode 100644 db/migrate/20181105201402_create_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20181105201302_create_customers.rb b/db/migrate/20181105201302_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105201302_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20181105201336_create_movies.rb b/db/migrate/20181105201336_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105201336_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20181105201402_create_rentals.rb b/db/migrate/20181105201402_create_rentals.rb new file mode 100644 index 000000000..f497879b5 --- /dev/null +++ b/db/migrate/20181105201402_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkin_date + t.date :checkout_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..72040fda0 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# 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: 2018_11_05_201402) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "checkin_date" + t.date "checkout_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..d1faead33 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-11-05 12:13:02 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-11-05 12:13:02 + 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..f05dd0894 --- /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: 2018-11-05 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..0b21f9c5f --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkin_date: 2018-11-05 + checkout_date: 2018-11-05 + +two: + checkin_date: 2018-11-05 + checkout_date: 2018-11-05 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 20e9f2566b1aab3852378cef865e915e8dbe26fc Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Mon, 5 Nov 2018 15:01:34 -0800 Subject: [PATCH 03/27] testing for customer model --- app/models/customer.rb | 9 +++++++ app/models/movie.rb | 6 +++++ app/models/rental.rb | 5 ++++ config/routes.rb | 2 ++ test/fixtures/customers.yml | 24 +++++++++--------- test/models/customer_test.rb | 49 ++++++++++++++++++++++++++++++++++-- test/models/movie_test.rb | 4 +-- test/models/rental_test.rb | 4 +-- test/test_helper.rb | 3 ++- 9 files changed, 87 insertions(+), 19 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..ca4b8dc7a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,11 @@ class Customer < ApplicationRecord + has_many :movies + + validates :name, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + # :TODO make it 5 digit + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..444397127 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,8 @@ class Movie < ApplicationRecord + has_many :customers + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true, numericality: {greater_than: 0, only_integer: true} end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..995fedce3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,7 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :checkin_date, presence: true + validates :checkout_date, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..ad260b5b0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + # customers and movies: index, show, create + # rental: create end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index d1faead33..2c8abc585 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: Dionisia registered_at: 2018-11-05 12:13:02 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: address 1 + city: d city + state: d state + postal_code: "23454" + phone: "123-123-1234" two: - name: MyString + name: Karis registered_at: 2018-11-05 12:13:02 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: address 2 + city: k city + state: k state + postal_code: "98699" + phone: "987-987-9876" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..025ade50f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,54 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + # let(:customer) { Customer.new } it "must be valid" do - value(customer).must_be :valid? + expect(Customer.first.valid?).must_equal true + end + + it "must have a name" do + expect(customers(:one).valid?).must_equal true + customers(:one).name = "" + expect(customers(:one).valid?).must_equal false + end + + # it "must have a unique name" do + # :TODO + # end + + it "must have an address" do + expect(customers(:one).valid?).must_equal true + expect(customers(:one).address).must_equal "address 1" + customers(:one).address = "" + expect(customers(:one).valid?).must_equal false + end + + it "must have a city" do + expect(customers(:one).valid?).must_equal true + expect(customers(:one).city).must_equal "d city" + customers(:one).city = "" + expect(customers(:one).valid?).must_equal false + end + + it "must have a state" do + expect(customers(:one).valid?).must_equal true + expect(customers(:one).state).must_equal "d state" + customers(:one).state = "" + expect(customers(:one).valid?).must_equal false + end + + it "must have a postal code" do + expect(customers(:one).valid?).must_equal true + expect(customers(:one).postal_code).must_equal "23454" + customers(:one).postal_code = "" + expect(customers(:one).valid?).must_equal false + end + + it "must have a phone number" do + expect(customers(:one).valid?).must_equal true + expect(customers(:one).phone).must_equal "123-123-1234" + customers(:one).phone = "" + expect(customers(:one).valid?).must_equal false end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..bfc6e905f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + # let(:movie) { Movie.new } it "must be valid" do - value(movie).must_be :valid? + expect(Movie.first.valid?).must_equal true end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..48a544323 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + # let(:rental) { Rental.new } it "must be valid" do - value(rental).must_be :valid? + expect(Rental.first.valid?).must_equal false end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From aefce26c6a5c17f252515cb3f63ca7f62675523b Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Mon, 5 Nov 2018 15:32:24 -0800 Subject: [PATCH 04/27] created tests for movies model --- test/fixtures/movies.yml | 12 ++++++------ test/models/movie_test.rb | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..a14d741a3 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 + title: Nemo + overview: cute fish release_date: 2018-11-05 - inventory: 1 + inventory: 100 two: - title: MyString - overview: MyString + title: Up + overview: cute dog release_date: 2018-11-05 - inventory: 1 + inventory: 200 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index bfc6e905f..aa9a8e1e9 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -6,4 +6,38 @@ it "must be valid" do expect(Movie.first.valid?).must_equal true end + + it "must have a title" do + expect(movies(:one).valid?).must_equal true + movies(:one).title = "" + expect(movies(:one).valid?).must_equal false + end + + it "must have a overview" do + expect(movies(:one).valid?).must_equal true + expect(movies(:one).overview).must_equal "cute fish" + movies(:one).overview = "" + expect(movies(:one).valid?).must_equal false + end + + it "must have a release_date" do + expect(movies(:one).valid?).must_equal true + expect(movies(:one).release_date).must_be_kind_of Date + movies(:one).release_date = "" + expect(movies(:one).valid?).must_equal false + end + + it "must have an inventory" do + expect(movies(:one).valid?).must_equal true + expect(movies(:one).inventory).must_equal 100 + expect(movies(:one).inventory).must_be_kind_of Integer + movies(:one).inventory = "" + expect(movies(:one).valid?).must_equal false + end + + it "inventory cannot be negative number" do + expect(movies(:one).valid?).must_equal true + movies(:one).inventory = -1 + expect(movies(:one).valid?).must_equal false + end end From 6d489da5c21225fb18e48ad2f9e4bd2d46b1af6c Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Mon, 5 Nov 2018 15:39:06 -0800 Subject: [PATCH 05/27] added routes --- config/routes.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index ad260b5b0..de7b2a945 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # customers and movies: index, show, create - # rental: create + + resources :customers, only: [:index, :show, :create] + resources :movies, only: [:index, :show, :create] + resources :rentals, only: [:create] end From f49f078eccbc46c222cfd2973306c1fca4f92365 Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Tue, 6 Nov 2018 12:41:18 -0800 Subject: [PATCH 06/27] controller tests for index and show complete --- app/controllers/application_controller.rb | 4 ++ app/controllers/customers_controller.rb | 27 ++++++++++ test/controllers/customers_controller_test.rb | 50 +++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..24b82f146 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,6 @@ class ApplicationController < ActionController::API + + def render_error(status, errors) + render json: { errors: errors }, status: status + end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..e473f0555 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,29 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: jsonify(customers), status: :ok #response code + end + + def show + customer = Customer.find_by(id: params[:id]) + + if customer + render json: jsonify(customer), status: :ok #response code + else + # options + # head :not_found + # render json: {}, status: :not_found + render_error(:not_found, { customer_id: ["No such customer"] } ) + end + end + + private + + def customer_params + params.require(:customer).permit(:id, :name, :registered_at, :postal_code, :phone) + end + + def jsonify(customer_data) + return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..1641f89f0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,4 +4,54 @@ # it "must be a real test" do # flunk "Need real tests" # end + + CUSTOMER_FIELDS = %w(id name registered_at postal_code phone).sort + # Helper method! + def parse_json(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "is a working route" do + get customers_path + + body = parse_json(expected_type: Array) + expect(body.length).must_equal Customer.count + end + + it "returns and empty array when there are no customers" do + Customer.destroy_all + get customers_path + body = parse_json(expected_type: Array) + expect(body.length).must_equal 0 + end + end + + describe "show" do + it "returns a customer with exactly the required fields" do + customer = Customer.first + + get customer_path(customer) + # binding.pry + body = parse_json(expected_type: Hash) + expect(body.keys.sort).must_equal CUSTOMER_FIELDS + end + + it "doesn't blow up when a customer DNE" do + customer = Customer.first + customer.destroy + + get customer_path(customer) + + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(body).must_include "errors" + + end + + end end From dc32b50630593215da6bf7855bbe80f04ffbc36b Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Tue, 6 Nov 2018 14:44:07 -0800 Subject: [PATCH 07/27] customers controller and tests complete --- app/controllers/customers_controller.rb | 16 ++++++- test/controllers/customers_controller_test.rb | 42 ++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e473f0555..f839e951b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,3 +1,5 @@ +require 'date' + class CustomersController < ApplicationController def index customers = Customer.all @@ -17,13 +19,23 @@ def show end end + def create + customer = Customer.new(customer_params) + # binding.pry + if customer.save + render json: { id: customer.id }, status: :ok + else + render_error(:bad_request, customer.errors.messages) + end + end + private def customer_params - params.require(:customer).permit(:id, :name, :registered_at, :postal_code, :phone) + params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) end def jsonify(customer_data) - return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + return customer_data.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1641f89f0..7b3334bad 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,11 +1,12 @@ require "test_helper" +require 'date' describe CustomersController do # it "must be a real test" do # flunk "Need real tests" # end - CUSTOMER_FIELDS = %w(id name registered_at postal_code phone).sort + CUSTOMER_FIELDS = %w(id name registered_at address city state postal_code phone).sort # Helper method! def parse_json(expected_type:, expected_status: :success) must_respond_with expected_status @@ -47,11 +48,48 @@ def parse_json(expected_type:, expected_status: :success) customer.destroy get customer_path(customer) - + body = parse_json(expected_type: Hash, expected_status: :not_found) expect(body).must_include "errors" + end + end + + describe "create" do + before do + date = DateTime.now + @customer = { + name: "Ada", + registered_at: date, + address: "123 River Road", + city: "Seattle", + state: "WA", + postal_code: "98155", + phone: "206-421-9876" + } + end + + it "creates a new customer given valid data" do + expect{ + post customers_path, params: { customer: @customer } }.must_change "Customer.count", 1 + must_respond_with :success + body = parse_json(expected_type: Hash) + expect(body).must_include "id" end + it "returns an error for invalid data" do + @customer = { + name: nil + } + + expect{ + post customers_path, params: { customer: @customer } }.wont_change "Customer.count" + # binding.pry + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "name" + must_respond_with :bad_request + end end end From ca3515472fabcca148ef1e636ccf8eec4606c4bc Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Tue, 6 Nov 2018 15:50:57 -0800 Subject: [PATCH 08/27] movies controllers and tests passing --- app/controllers/movies_controller.rb | 37 +++++++++ app/controllers/rentals_controller.rb | 1 + test/controllers/movies_controller_test.rb | 88 +++++++++++++++++++++- 3 files changed, 123 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..650be6df6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,39 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: jsonify(movies), status: :ok #response code + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: jsonify(movie), status: :ok #response code + else + # options + # head :not_found + # render json: {}, status: :not_found + render_error(:not_found, { movie_id: ["No such movie"] } ) + end + end + + def create + movie = Movie.new(movie_params) + # binding.pry + if movie.save + render json: { id: movie.id }, status: :ok + else + render_error(:bad_request, movie.errors.messages) + end + end + + private + + def movie_params + params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) + end + + def jsonify(movie_data) + return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..5f6582744 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,3 @@ class RentalsController < ApplicationController + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..9a7bab32a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,89 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end +# it "must be a real test" do +# flunk "Need real tests" +# end +MOVIE_FIELDS = %w(id title overview release_date inventory).sort + +def parse_json(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body +end + +describe "index" do + it "is a working route" do + get movies_path + + body = parse_json(expected_type: Array) + expect(body.length).must_equal Movie.count + end + + it "returns and empty array when there are no movies" do + Movie.destroy_all + get movies_path + body = parse_json(expected_type: Array) + expect(body.length).must_equal 0 + end +end + +describe "show" do + it "returns a movie with exactly the required fields" do + movie = Movie.first + + get movie_path(movie) + # binding.pry + body = parse_json(expected_type: Hash) + expect(body.keys.sort).must_equal MOVIE_FIELDS + end + + it "doesn't blow up when a movie DNE" do + movie = Movie.first + movie.destroy + + get movie_path(movie) + + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(body).must_include "errors" + end +end + +describe "create" do + before do + @movie = { + title: "The Great Escape", + overview: "Movie about WWII", + release_date: "1965-01-18", + inventory: 10 + } + end + + it "creates a new movie given valid data" do + expect{ + post movies_path, params: { movie: @movie } }.must_change "Movie.count", 1 + must_respond_with :success + + body = parse_json(expected_type: Hash) + expect(body).must_include "id" + end + end + + it "returns an error for invalid data" do + @movie = { + title: nil + } + + expect{ + post movies_path, params: { movie: @movie } }.wont_change "Customer.count" + # binding.pry + 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 From 3b2ad232a860f696d4d168b96fec336d67feccb2 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Tue, 6 Nov 2018 16:15:58 -0800 Subject: [PATCH 09/27] a ds_store file was added? --- .DS_Store | Bin 0 -> 10244 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..165b427bc8830df2243a7bcf8e779e395be40bac GIT binary patch literal 10244 zcmeHMUu+ab82`R&X=j&0r{zyeFThEyRw&rkLW6)_|6r}s(9l9#ij=+ErL5iCt+#tE zP^wj9VhrjN3aBq)Gz6bCn)sx|7ma^Nv_{nM;Da&o&G=w^(r;$>n!9azGKwZUmz{5C z=J(Av^PAu8-0T4WcINaJfCKR0^@M4YH66c{~&Hh=C5N5azcKW;w++=tD@FR~ja$=M3n@UNJ4?RSrGmlab@L zzzCtQh0qnnXo_IbtSMHp9|#W57jUSMUyeqVrO^q77DWQVXQ4+Kp)%w#PNQ>+dzX9` zVoRt$a}hs+!!XKOv^IjpLR1+kB1a609@E8fC3l5b1_x+_6Ewml=M)p{72*}b?}ZNN zhCZ@Otd8IfSpje5;DSdCXMHA$$0Il^LYESj*aEK@C-_<#mzs7bgEv>7rY0@Z^_rW% z#aKz{va)iXPmvcL{?5HU9Yu<@ea6jlc*22A(I%FEtV|;a&V|$uu z8(HaW>IOlM44Jm>Om{jtTX$tY1AYTz3RA{-?aWMTdsAX-OMA;~Q(|Uk+xDi!j<)96 zS%uX!wCw3UmN|8L=FIHl7l>3!80?2o>6aJsi*&a@gyl|k`4f!2oS)$J`~($sdA#=_ zb>Fa=cI*N3v@ymjU7BAn75lTs6wPHQ?O3^t?T+!Pv}UDqmgX59mLyyp?fR!s1Yu0bNV@vb)d++a_ zU$L^1tJUi2p()cfQP3^k6 zcsz{G_cEMInUCd6?-Z|R%#X1#ew)JIV@GrvVV|Rm9(CCg-xzOTY*f^DWev*pdA_o8 z#hs0DbzJzP=6?_fX;YauxeuY0UhNZX+ z%diqTR^uv6;9a;Gw_rOaaWD4ZgV>7)a0o~6Fpi>*kD`Scv~e1rz$fu3d>YTQ$@PY^ZPC+SnF;X|17k#Ol>jN{nnl8E=Ee_WwNV1_o*re@l8`?xwD~8JqHh8pQ_Lh5f4 zPvL1igR`W=XYo0F9$&y0NrxBl6?_$6BOP7|sjfG#H{ashg{qqx$l8`;k5ipcX$kEj zneeY7q}{Y=4=IBw+G}k3rqS*c+HYu2EyDUiqda0DVjyB5VjyDR)-q7yhfj$2|9fx# z|NpHWWE4GOAY$MjWdKXN2f8~cME-CVjwarf_NP- m&!$utobjb!lIn&3oNwul(!c&^Ky?0(&i{Ywb=Cj>{Qnm(H(fgb literal 0 HcmV?d00001 From 4faaf7fb48ece8cbf8189537d0c43c347669dc32 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Tue, 6 Nov 2018 16:45:47 -0800 Subject: [PATCH 10/27] added movies_checked_out via migration and added more validation to customers and added tests for those validations --- app/controllers/customers_controller.rb | 4 +-- app/models/customer.rb | 5 +-- ...1107003647_add_movies_checked_out_count.rb | 5 +++ db/schema.rb | 3 +- test/fixtures/customers.yml | 2 ++ test/models/customer_test.rb | 31 ++++++++++++++++--- 6 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20181107003647_add_movies_checked_out_count.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f839e951b..3d350b8f1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -32,10 +32,10 @@ def create private def customer_params - params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) end def jsonify(customer_data) - return customer_data.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + return customer_data.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index ca4b8dc7a..f5a2e525a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,7 +5,8 @@ class Customer < ApplicationRecord validates :address, presence: true validates :city, presence: true validates :state, presence: true - validates :postal_code, presence: true + validates :postal_code, presence: true, length: {is: 5}, :format => { with: /[0-9]+/ } # :TODO make it 5 digit - validates :phone, presence: true + validates :phone, presence: true, format: { with: /\d{3}-\d{3}-\d{4}/, message: "bad format" } + validates :movies_checked_out_count, presence: true, numericality: {greater_than_equal_to: 0} end diff --git a/db/migrate/20181107003647_add_movies_checked_out_count.rb b/db/migrate/20181107003647_add_movies_checked_out_count.rb new file mode 100644 index 000000000..a817a398c --- /dev/null +++ b/db/migrate/20181107003647_add_movies_checked_out_count.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCount < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 72040fda0..b8c14c2c3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_05_201402) do +ActiveRecord::Schema.define(version: 2018_11_07_003647) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 2c8abc585..fcbf8dab5 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ one: state: d state postal_code: "23454" phone: "123-123-1234" + movies_checked_out_count: 0 two: name: Karis @@ -17,3 +18,4 @@ two: state: k state postal_code: "98699" phone: "987-987-9876" + movies_checked_out_count: 0 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 025ade50f..4604bb9c4 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -13,10 +13,6 @@ expect(customers(:one).valid?).must_equal false end - # it "must have a unique name" do - # :TODO - # end - it "must have an address" do expect(customers(:one).valid?).must_equal true expect(customers(:one).address).must_equal "address 1" @@ -45,10 +41,37 @@ expect(customers(:one).valid?).must_equal false end + it "does not accept postal code that is not 5 digits as string" do + customers(:one).postal_code = "123" + expect(customers(:one).valid?).must_equal false + customers(:one).postal_code = "123456" + expect(customers(:one).valid?).must_equal false + customers(:one).postal_code = "12345" + expect(customers(:one).valid?).must_equal true + end + it "must have a phone number" do expect(customers(:one).valid?).must_equal true expect(customers(:one).phone).must_equal "123-123-1234" customers(:one).phone = "" expect(customers(:one).valid?).must_equal false end + + it "does not accept phone number that has incorrect format" do + customers(:one).postal_code = "1" + expect(customers(:one).valid?).must_equal false + # customers(:one).postal_code = "1-1-1" + # expect(customers(:one).valid?).must_equal false + customers(:one).postal_code = "123-456-789" + expect(customers(:one).valid?).must_equal false + customers(:one).postal_code = "123-456-7890" + expect(customers(:one).valid?).must_equal true + end + + it "has movies_checked_out_count" do + expect(customers(:one).valid?).must_equal true + expect(customers(:one).movies_checked_out_count).must_equal 0 + customers(:one).movies_checked_out_count = nil + expect(customers(:one).valid?).must_equal false + end end From 5444e6cc01dd6237420b955ee9065bb70bc9c571 Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Tue, 6 Nov 2018 23:23:51 -0800 Subject: [PATCH 11/27] fixed movies controller smoke test pass except for movie has available_inventory --- app/controllers/movies_controller.rb | 9 ++++++++- app/models/movie.rb | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 650be6df6..c87b99df9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,11 @@ class MoviesController < ApplicationController def index movies = Movie.all + # if movies render json: jsonify(movies), status: :ok #response code + # else + # render_errors(:not_found, { movies: ["No movies found."]}) + # end end def show @@ -9,6 +13,7 @@ def show if movie render json: jsonify(movie), status: :ok #response code + # render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else # options # head :not_found @@ -22,6 +27,7 @@ def create # binding.pry if movie.save render json: { id: movie.id }, status: :ok + # render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else render_error(:bad_request, movie.errors.messages) end @@ -30,7 +36,8 @@ def create private def movie_params - params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) + # removed .require(:movie) and this fixed smoke tests + params.permit(:title, :overview, :release_date, :inventory) #, :available_inventory end def jsonify(movie_data) diff --git a/app/models/movie.rb b/app/models/movie.rb index 444397127..5973a2f3e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,5 +4,5 @@ class Movie < ApplicationRecord validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, presence: true, numericality: {greater_than: 0, only_integer: true} + validates :inventory, presence: true, numericality: {greater_than_equal_to: 0, only_integer: true} end From e55b123383904b37f581639508bc5435c4ebfb90 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 02:14:06 -0800 Subject: [PATCH 12/27] added migration for available inventory to movies --- app/controllers/movies_controller.rb | 4 ++-- app/models/movie.rb | 2 +- db/migrate/20181107101146_add_available_inventory.rb | 5 +++++ db/schema.rb | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20181107101146_add_available_inventory.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 650be6df6..9f09005df 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -30,10 +30,10 @@ def create private def movie_params - params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory) + params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory, :available_inventory) end def jsonify(movie_data) - return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 444397127..5973a2f3e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,5 +4,5 @@ class Movie < ApplicationRecord validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, presence: true, numericality: {greater_than: 0, only_integer: true} + validates :inventory, presence: true, numericality: {greater_than_equal_to: 0, only_integer: true} end diff --git a/db/migrate/20181107101146_add_available_inventory.rb b/db/migrate/20181107101146_add_available_inventory.rb new file mode 100644 index 000000000..65da08470 --- /dev/null +++ b/db/migrate/20181107101146_add_available_inventory.rb @@ -0,0 +1,5 @@ +class AddAvailableInventory < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index b8c14c2c3..d2467b571 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_003647) do +ActiveRecord::Schema.define(version: 2018_11_07_101146) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory", default: 0 end create_table "rentals", force: :cascade do |t| From e1df04ff67b69f53b392576d3501b51f104d2a40 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 09:35:26 -0800 Subject: [PATCH 13/27] passes all smoke tests --- app/controllers/customers_controller.rb | 1 + app/controllers/movies_controller.rb | 5 ++++- app/models/customer.rb | 6 +++--- app/models/movie.rb | 3 ++- test/fixtures/movies.yml | 2 ++ test/models/customer_test.rb | 4 ++-- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3d350b8f1..2d5e9cba1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -32,6 +32,7 @@ def create private def customer_params + # binding.pry params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9f09005df..455319484 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,9 @@ def show end def create + # binding.pry movie = Movie.new(movie_params) + # binding.pry if movie.save render json: { id: movie.id }, status: :ok @@ -30,7 +32,8 @@ def create private def movie_params - params.require(:movie).permit(:id, :title, :overview, :release_date, :inventory, :available_inventory) + # binding.pry + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end def jsonify(movie_data) diff --git a/app/models/customer.rb b/app/models/customer.rb index f5a2e525a..6a85aa904 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,7 +6,7 @@ class Customer < ApplicationRecord validates :city, presence: true validates :state, presence: true validates :postal_code, presence: true, length: {is: 5}, :format => { with: /[0-9]+/ } - # :TODO make it 5 digit - validates :phone, presence: true, format: { with: /\d{3}-\d{3}-\d{4}/, message: "bad format" } - validates :movies_checked_out_count, presence: true, numericality: {greater_than_equal_to: 0} + validates :phone, presence: true, format: { :with => /\d{3}-\d{3}-\d{4}/, + :message => "Phone number must be in xxx-xxx-xxxx format." } + validates :movies_checked_out_count, presence: true, numericality: {greater_than_or_equal_to: 0} end diff --git a/app/models/movie.rb b/app/models/movie.rb index 5973a2f3e..0828de33c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,5 +4,6 @@ class Movie < ApplicationRecord validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, presence: true, numericality: {greater_than_equal_to: 0, only_integer: true} + validates :inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} + validates :available_inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index a14d741a3..8b06b2a88 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,11 @@ one: overview: cute fish release_date: 2018-11-05 inventory: 100 + available_inventory: 20 two: title: Up overview: cute dog release_date: 2018-11-05 inventory: 200 + available_inventory: 20 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 4604bb9c4..7c7566ad1 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -60,8 +60,8 @@ it "does not accept phone number that has incorrect format" do customers(:one).postal_code = "1" expect(customers(:one).valid?).must_equal false - # customers(:one).postal_code = "1-1-1" - # expect(customers(:one).valid?).must_equal false + customers(:one).postal_code = "1-1-1" + expect(customers(:one).valid?).must_equal false customers(:one).postal_code = "123-456-789" expect(customers(:one).valid?).must_equal false customers(:one).postal_code = "123-456-7890" From 38a604b26965a49b898def032cb0728eff9a5e18 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 10:03:02 -0800 Subject: [PATCH 14/27] changed fields to return to match requirement --- app/controllers/customers_controller.rb | 45 +++---- test/controllers/customers_controller_test.rb | 116 +++++++++--------- 2 files changed, 81 insertions(+), 80 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 2d5e9cba1..c49d4c660 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,36 +4,37 @@ class CustomersController < ApplicationController def index customers = Customer.all render json: jsonify(customers), status: :ok #response code + # binding.pry end - def show - customer = Customer.find_by(id: params[:id]) - - if customer - render json: jsonify(customer), status: :ok #response code - else - # options - # head :not_found - # render json: {}, status: :not_found - render_error(:not_found, { customer_id: ["No such customer"] } ) - end - end + # def show + # customer = Customer.find_by(id: params[:id]) + # + # if customer + # render json: jsonify(customer), status: :ok #response code + # else + # # options + # # head :not_found + # # render json: {}, status: :not_found + # render_error(:not_found, { customer_id: ["No such customer"] } ) + # end + # end - def create - customer = Customer.new(customer_params) - # binding.pry - if customer.save - render json: { id: customer.id }, status: :ok - else - render_error(:bad_request, customer.errors.messages) - end - end + # def create + # customer = Customer.new(customer_params) + # # binding.pry + # if customer.save + # render json: { id: customer.id }, status: :ok + # else + # render_error(:bad_request, customer.errors.messages) + # end + # end private def customer_params # binding.pry - params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) + params.require(:customer).permit(:name, :registered_at, :postal_code, :phone, :movies_checked_out_count) end def jsonify(customer_data) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7b3334bad..0bc67d371 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -33,63 +33,63 @@ def parse_json(expected_type:, expected_status: :success) end end - describe "show" do - it "returns a customer with exactly the required fields" do - customer = Customer.first - - get customer_path(customer) - # binding.pry - body = parse_json(expected_type: Hash) - expect(body.keys.sort).must_equal CUSTOMER_FIELDS - end - - it "doesn't blow up when a customer DNE" do - customer = Customer.first - customer.destroy - - get customer_path(customer) - - body = parse_json(expected_type: Hash, expected_status: :not_found) - expect(body).must_include "errors" - end - end - - describe "create" do - before do - date = DateTime.now - @customer = { - name: "Ada", - registered_at: date, - address: "123 River Road", - city: "Seattle", - state: "WA", - postal_code: "98155", - phone: "206-421-9876" - } - end - - it "creates a new customer given valid data" do - expect{ - post customers_path, params: { customer: @customer } }.must_change "Customer.count", 1 - must_respond_with :success - - body = parse_json(expected_type: Hash) - expect(body).must_include "id" - end - - it "returns an error for invalid data" do - @customer = { - name: nil - } + # describe "show" do + # it "returns a customer with exactly the required fields" do + # customer = Customer.first + # + # get customer_path(customer) + # # binding.pry + # body = parse_json(expected_type: Hash) + # expect(body.keys.sort).must_equal CUSTOMER_FIELDS + # end + # + # it "doesn't blow up when a customer DNE" do + # customer = Customer.first + # customer.destroy + # + # get customer_path(customer) + # + # body = parse_json(expected_type: Hash, expected_status: :not_found) + # expect(body).must_include "errors" + # end + # end - expect{ - post customers_path, params: { customer: @customer } }.wont_change "Customer.count" - # binding.pry - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "name" - must_respond_with :bad_request - end - end + # describe "create" do + # before do + # date = DateTime.now + # @customer = { + # name: "Ada", + # registered_at: date, + # address: "123 River Road", + # city: "Seattle", + # state: "WA", + # postal_code: "98155", + # phone: "206-421-9876" + # } + # end + # + # it "creates a new customer given valid data" do + # expect{ + # post customers_path, params: { customer: @customer } }.must_change "Customer.count", 1 + # must_respond_with :success + # + # body = parse_json(expected_type: Hash) + # expect(body).must_include "id" + # end + # + # it "returns an error for invalid data" do + # @customer = { + # name: nil + # } + # + # expect{ + # post customers_path, params: { customer: @customer } }.wont_change "Customer.count" + # # binding.pry + # body = JSON.parse(response.body) + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # expect(body["errors"]).must_include "name" + # must_respond_with :bad_request + # end + # end end From 3553cf35026abb6eaad439abfa41a40790e52653 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 10:11:35 -0800 Subject: [PATCH 15/27] modified fields to return --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c49d4c660..5cb510d95 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -38,6 +38,6 @@ def customer_params end def jsonify(customer_data) - return customer_data.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) + return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 455319484..31c801239 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify(movies), status: :ok #response code + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok #response code end def show @@ -37,6 +37,6 @@ def movie_params end def jsonify(movie_data) - return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) end end From ff74c1f37505229d63e6409c76aae007bd8ae687 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 10:19:57 -0800 Subject: [PATCH 16/27] added foreign keys to rentals --- db/migrate/20181107181501_add_customer_id_to_movies.rb | 5 +++++ db/migrate/20181107181545_add_movie_id_to_rentals.rb | 5 +++++ db/schema.rb | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181107181501_add_customer_id_to_movies.rb create mode 100644 db/migrate/20181107181545_add_movie_id_to_rentals.rb diff --git a/db/migrate/20181107181501_add_customer_id_to_movies.rb b/db/migrate/20181107181501_add_customer_id_to_movies.rb new file mode 100644 index 000000000..827aebf4e --- /dev/null +++ b/db/migrate/20181107181501_add_customer_id_to_movies.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToMovies < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20181107181545_add_movie_id_to_rentals.rb b/db/migrate/20181107181545_add_movie_id_to_rentals.rb new file mode 100644 index 000000000..67797e6d0 --- /dev/null +++ b/db/migrate/20181107181545_add_movie_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index d2467b571..f0f19431a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_101146) do +ActiveRecord::Schema.define(version: 2018_11_07_181545) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,12 @@ t.date "checkout_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 433ebe123249695d1a1be28e0bf047d19bbb9211 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 10:50:33 -0800 Subject: [PATCH 17/27] added routes for checkin and checkout, methods work --- app/controllers/rentals_controller.rb | 38 ++++++++++++++++++++++++++- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- config/routes.rb | 3 ++- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5f6582744..3e822b2d6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,3 +1,39 @@ class RentalsController < ApplicationController - + def checkin + if params[:customer_id] + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + rental = Rental.find_by(movie_id: params[:movie_id], customer_id: params[:customer_id]) + + checkin_date = Time.now + # binding.pry + checkout_date = rental.checkout_date + + rental = Rental.new(customer_id: customer.id, movie_id: movie.id, checkin_date: checkin_date, checkout_date: checkout_date) + + if rental.save + render json: { customer_id: customer.id, movie_id: movie.id }, status: :ok + else + render_error(:bad_request, rental.errors.messages) + end + end + end + + def checkout + if params[:customer_id] + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + + checkin_date = Date.today(checkin_date) + 7 + checkout_date = Time.now + + rental = Rental.new(customer_id: customer.id, movie_id: movie.id, checkin_date: checkin_date, checkout_date: checkout_date) + + if rental.save + render json: { customer_id: customer.id, movie_id: movie.id }, status: :ok + else + render_error(:bad_request, rental.errors.messages) + end + end + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 6a85aa904..66f9b4c49 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - has_many :movies + has_many :rentals validates :name, presence: true validates :address, presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index 0828de33c..dcff650f2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - has_many :customers + has_many :rentals validates :title, presence: true validates :overview, presence: true diff --git a/config/routes.rb b/config/routes.rb index de7b2a945..937dc67ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,6 @@ resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] - resources :rentals, only: [:create] + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' end From deb1caf30098a85ddfb90c0aa12fccbfedd62dbc Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 14:30:18 -0800 Subject: [PATCH 18/27] fixed avail inventory issue --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 9 +++++++-- app/models/customer.rb | 6 ++++-- app/models/movie.rb | 11 ++++++++++- ...181107185846_remove_available_inventory_default.rb | 5 +++++ db/schema.rb | 4 ++-- 6 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20181107185846_remove_available_inventory_default.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 31c801239..6d72731ed 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -33,7 +33,7 @@ def create def movie_params # binding.pry - params.permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end def jsonify(movie_data) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3e822b2d6..bf251d5af 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -20,16 +20,21 @@ def checkin end def checkout + if params[:customer_id] customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - - checkin_date = Date.today(checkin_date) + 7 +# binding.pry checkout_date = Time.now + checkin_date = Date.today(checkout_date) + 7 + rental = Rental.new(customer_id: customer.id, movie_id: movie.id, checkin_date: checkin_date, checkout_date: checkout_date) + + if rental.save + # binding.pry render json: { customer_id: customer.id, movie_id: movie.id }, status: :ok else render_error(:bad_request, rental.errors.messages) diff --git a/app/models/customer.rb b/app/models/customer.rb index 66f9b4c49..cf407abc6 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,7 +6,9 @@ class Customer < ApplicationRecord validates :city, presence: true validates :state, presence: true validates :postal_code, presence: true, length: {is: 5}, :format => { with: /[0-9]+/ } - validates :phone, presence: true, format: { :with => /\d{3}-\d{3}-\d{4}/, - :message => "Phone number must be in xxx-xxx-xxxx format." } + validates :phone, presence: true validates :movies_checked_out_count, presence: true, numericality: {greater_than_or_equal_to: 0} + + # format: { :with => /\d{3}-\d{3}-\d{4}/, + # :message => "Phone number must be in xxx-xxx-xxxx format." } end diff --git a/app/models/movie.rb b/app/models/movie.rb index dcff650f2..b5f626434 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,9 +1,18 @@ class Movie < ApplicationRecord has_many :rentals + before_create :calibrate_inventory + validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} - validates :available_inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} + # validates :available_inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} + + + private + # https://stackoverflow.com/questions/6720597/rails-validate-product-ordered-has-the-available-quantity?rq=1 + def calibrate_inventory + self.available_inventory = self.inventory + end end diff --git a/db/migrate/20181107185846_remove_available_inventory_default.rb b/db/migrate/20181107185846_remove_available_inventory_default.rb new file mode 100644 index 000000000..602fcc1ac --- /dev/null +++ b/db/migrate/20181107185846_remove_available_inventory_default.rb @@ -0,0 +1,5 @@ +class RemoveAvailableInventoryDefault < ActiveRecord::Migration[5.2] + def change + change_column_default :movies, :available_inventory, nil + end +end diff --git a/db/schema.rb b/db/schema.rb index f0f19431a..23b3f1ac5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_181545) do +ActiveRecord::Schema.define(version: 2018_11_07_185846) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,7 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "available_inventory", default: 0 + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From b67a549fc0df44aec91e8f636a204b9134979ae9 Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Wed, 7 Nov 2018 14:40:16 -0800 Subject: [PATCH 19/27] Update movies_controller.rb --- app/controllers/movies_controller.rb | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f35d7742d..e50f37331 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,15 +1,12 @@ class MoviesController < ApplicationController def index movies = Movie.all -<<<<<<< HEAD - # if movies - render json: jsonify(movies), status: :ok #response code - # else - # render_errors(:not_found, { movies: ["No movies found."]}) - # end -======= - render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok #response code ->>>>>>> 1a51ef16ab677427f623405f48a4ff3a5e8edaab + + if movies + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok #response code + else + render_errors(:not_found, { movies: ["No movies found."]}) + end end def show @@ -42,17 +39,7 @@ def create private def movie_params -<<<<<<< HEAD - # removed .require(:movie) and this fixed smoke tests - params.permit(:title, :overview, :release_date, :inventory) #, :available_inventory -======= - # binding.pry -<<<<<<< HEAD - params.permit(:title, :overview, :release_date, :inventory, :available_inventory) ->>>>>>> fecf9952f581f0cf37ebc96a9ef6c5f6a722fc75 -======= params.permit(:title, :overview, :release_date, :inventory, :available_inventory) ->>>>>>> 1a51ef16ab677427f623405f48a4ff3a5e8edaab end def jsonify(movie_data) From b748f60da4b0f65bc51e1bbc87d90d1daf299f5d Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Wed, 7 Nov 2018 18:08:20 -0800 Subject: [PATCH 20/27] updated rental checkout --- app/controllers/movies_controller.rb | 4 ++-- app/controllers/rentals_controller.rb | 19 ++++++++++++------- app/models/movie.rb | 15 +++++++++------ 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e50f37331..73c5e7b84 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -26,7 +26,7 @@ def show def create # binding.pry movie = Movie.new(movie_params) - + movie.available_inventory = movie.inventory # binding.pry if movie.save render json: { id: movie.id }, status: :ok @@ -39,7 +39,7 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory) end def jsonify(movie_data) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index bf251d5af..b302a5524 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -20,25 +20,30 @@ def checkin end def checkout + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) - if params[:customer_id] - customer = Customer.find_by(id: params[:customer_id]) - movie = Movie.find_by(id: params[:movie_id]) + if customer && movie && movie.is_available? # binding.pry checkout_date = Time.now checkin_date = Date.today(checkout_date) + 7 - rental = Rental.new(customer_id: customer.id, movie_id: movie.id, checkin_date: checkin_date, checkout_date: checkout_date) - - if rental.save + movie.decrement_inventory! # binding.pry - render json: { customer_id: customer.id, movie_id: movie.id }, status: :ok + render json: { + customer_id: customer.id, + movie_id: movie.id, + available_inventory: movie.available_inventory, + rental_id: rental.id + }, status: :ok else render_error(:bad_request, rental.errors.messages) end + else + render_error(:bad_request, "Invalid parameters") end end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 53de73ea7..bcd1fd6ca 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,8 +1,6 @@ class Movie < ApplicationRecord has_many :rentals - before_create :calibrate_inventory - validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true @@ -10,9 +8,14 @@ class Movie < ApplicationRecord # validates :available_inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} - private - # https://stackoverflow.com/questions/6720597/rails-validate-product-ordered-has-the-available-quantity?rq=1 - def calibrate_inventory - self.available_inventory = self.inventory + # use ? for when you are returning a boolean + def is_available? + return self.available_inventory > 0 + end + + # use ! for when you are modifying the model + def decrement_inventory! + self.available_inventory = self.available_inventory - 1 + self.save end end From 6f0149b6cc56f3c8fb377eeca212af279c72e77e Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Wed, 7 Nov 2018 18:46:16 -0800 Subject: [PATCH 21/27] added checkin method to rental --- app/controllers/rentals_controller.rb | 21 ++++++++----------- app/models/movie.rb | 5 +++++ app/models/rental.rb | 5 ++++- .../20181108022706_add_due_date_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 5 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 db/migrate/20181108022706_add_due_date_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b302a5524..a7dcd947c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,21 +1,18 @@ class RentalsController < ApplicationController def checkin - if params[:customer_id] - customer = Customer.find_by(id: params[:customer_id]) - movie = Movie.find_by(id: params[:movie_id]) - rental = Rental.find_by(movie_id: params[:movie_id], customer_id: params[:customer_id]) + rental = Rental.get_rental(params[:customer_id], params[:movie_id]) - checkin_date = Time.now + if rental + rental.checkin_date = Time.now # binding.pry - checkout_date = rental.checkout_date - - rental = Rental.new(customer_id: customer.id, movie_id: movie.id, checkin_date: checkin_date, checkout_date: checkout_date) - if rental.save - render json: { customer_id: customer.id, movie_id: movie.id }, status: :ok + rental.movie.increment_inventory! + render json: { rental_id: rental.id, customer_id: rental.customer.id, movie_id: rental.movie.id }, status: :ok else render_error(:bad_request, rental.errors.messages) end + else + render_error(:bad_request, "Invalid parameters") end end @@ -26,9 +23,9 @@ def checkout if customer && movie && movie.is_available? # binding.pry checkout_date = Time.now - checkin_date = Date.today(checkout_date) + 7 + due_date = Date.today(checkout_date) + 7 - rental = Rental.new(customer_id: customer.id, movie_id: movie.id, checkin_date: checkin_date, checkout_date: checkout_date) + rental = Rental.new(customer_id: customer.id, movie_id: movie.id, due_date: due_date, checkout_date: checkout_date) if rental.save movie.decrement_inventory! diff --git a/app/models/movie.rb b/app/models/movie.rb index bcd1fd6ca..505de65ca 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -18,4 +18,9 @@ def decrement_inventory! self.available_inventory = self.available_inventory - 1 self.save end + + def increment_inventory! + self.available_inventory = self.available_inventory + 1 + self.save + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 995fedce3..7f292c4d0 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,9 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validates :checkin_date, presence: true validates :checkout_date, presence: true + + def self.get_rental(customer_id, movie_id) + return Rental.where(movie_id: movie_id, customer_id: customer_id, checkin_date: nil).order(due_date: :asc).first + end end diff --git a/db/migrate/20181108022706_add_due_date_to_rentals.rb b/db/migrate/20181108022706_add_due_date_to_rentals.rb new file mode 100644 index 000000000..61af77fc2 --- /dev/null +++ b/db/migrate/20181108022706_add_due_date_to_rentals.rb @@ -0,0 +1,5 @@ +class AddDueDateToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 23b3f1ac5..ada5ece94 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_07_185846) do +ActiveRecord::Schema.define(version: 2018_11_08_022706) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.date "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 4a75e15d465a6ebd29e5bced22656a6d3be3d61c Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Wed, 7 Nov 2018 21:36:59 -0800 Subject: [PATCH 22/27] modified seed data and validations --- app/models/movie.rb | 3 +-- db/seeds.rb | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 505de65ca..65b59e8a2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,8 +5,7 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: {greater_than_equal_to: 0, only_integer: true} - - # validates :available_inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} + validates :available_inventory, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true} # use ? for when you are returning a boolean def is_available? diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..dd99b2732 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,7 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + m = Movie.new(movie) + m.available_inventory = m.inventory + m.save end From 35609b82db41329c05973ee0cd6e30857cee88af Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Thu, 8 Nov 2018 09:39:31 -0800 Subject: [PATCH 23/27] all smoke tests passing --- app/controllers/rentals_controller.rb | 2 ++ app/models/customer.rb | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a7dcd947c..1aa3df82d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,6 +7,7 @@ def checkin # binding.pry if rental.save rental.movie.increment_inventory! + rental.customer.decrement_movies_checked_out_count! render json: { rental_id: rental.id, customer_id: rental.customer.id, movie_id: rental.movie.id }, status: :ok else render_error(:bad_request, rental.errors.messages) @@ -29,6 +30,7 @@ def checkout if rental.save movie.decrement_inventory! + customer.increment_movies_checked_out_count! # binding.pry render json: { customer_id: customer.id, diff --git a/app/models/customer.rb b/app/models/customer.rb index cf407abc6..cd1480381 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -11,4 +11,13 @@ class Customer < ApplicationRecord # format: { :with => /\d{3}-\d{3}-\d{4}/, # :message => "Phone number must be in xxx-xxx-xxxx format." } + def increment_movies_checked_out_count! + self.movies_checked_out_count = self.movies_checked_out_count + 1 + self.save + end + + def decrement_movies_checked_out_count! + self.movies_checked_out_count = self.movies_checked_out_count - 1 + self.save + end end From 9ab30232f0fc7335696a7fa4bbc9566104627dd0 Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Thu, 8 Nov 2018 21:30:47 -0800 Subject: [PATCH 24/27] smoke tests were not passing before but now they are whoo --- app/controllers/rentals_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1aa3df82d..e71df734f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,11 @@ def checkin if rental.save rental.movie.increment_inventory! rental.customer.decrement_movies_checked_out_count! - render json: { rental_id: rental.id, customer_id: rental.customer.id, movie_id: rental.movie.id }, status: :ok + render json: { + rental_id: rental.id, + customer_id: rental.customer.id, + available_inventory: rental.movie.available_inventory, + movie_id: rental.movie.id }, status: :ok else render_error(:bad_request, rental.errors.messages) end From 7d9171d3c78b3be6e5f2f290346091018f3bef37 Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Fri, 9 Nov 2018 10:18:59 -0800 Subject: [PATCH 25/27] rentals tests --- test/controllers/rentals_controller_test.rb | 43 +++++++++++++++++++++ test/fixtures/customers.yml | 4 +- test/fixtures/movies.yml | 4 +- test/fixtures/rentals.yml | 10 +++-- 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..bdc0d9121 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,4 +4,47 @@ # it "must be a real test" do # flunk "Need real tests" # end + + describe "checkin" do + it "correctly updates available inventory" do + rental = rentals(:one) + customer = rental.customer + movie = rental.movie + + expect { + post checkin_path, params: { customer_id: rental.customer_id, movie_id: rental.movie_id } + }.must_change "Movie.available_inventory", 2 + + end + + it "won't update available inventory if invalid" do + + + end + end + + describe "checkout" do + + before do + @params = {customer_id: customers(:dionisia).id, movie_id: movies(:up).id} + end + + it "successfully creates a new rental" do + + customer = rental.customer + movie = rental.movie + rental = Rental.new(customer_id: customer, movie_id: movie, due_date: due_date, checkout_date: checkout_date) + + expect { + post checkin_path, params: @params + }.must_change "Rental.count", 3 + + end + + it "won't create a rental if invalid" do + + + end + + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index fcbf8dab5..bf0c64fa7 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: +dionisia: name: Dionisia registered_at: 2018-11-05 12:13:02 address: address 1 @@ -10,7 +10,7 @@ one: phone: "123-123-1234" movies_checked_out_count: 0 -two: +dionisia: name: Karis registered_at: 2018-11-05 12:13:02 address: address 2 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 8b06b2a88..29ff076b1 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: +nemo: title: Nemo overview: cute fish release_date: 2018-11-05 inventory: 100 available_inventory: 20 -two: +up: title: Up overview: cute dog release_date: 2018-11-05 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 0b21f9c5f..c92da1b42 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - checkin_date: 2018-11-05 - checkout_date: 2018-11-05 + customer: karis + movie: nemo + due_date: "2018-11-05" two: - checkin_date: 2018-11-05 - checkout_date: 2018-11-05 + customer: dionisia + movie: up + due_date: "2018-12-15" From f3d2eedae4c16c1b7c4a1249407a054e2530d8fe Mon Sep 17 00:00:00 2001 From: Dionisia Montanez Date: Fri, 9 Nov 2018 14:43:43 -0800 Subject: [PATCH 26/27] rentals controller tests added --- app/controllers/rentals_controller.rb | 3 +- test/controllers/rentals_controller_test.rb | 57 ++++++++++++--------- test/fixtures/movies.yml | 4 +- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e71df734f..27df628c8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,7 @@ class RentalsController < ApplicationController def checkin rental = Rental.get_rental(params[:customer_id], params[:movie_id]) - + if rental rental.checkin_date = Time.now # binding.pry @@ -33,6 +33,7 @@ def checkout rental = Rental.new(customer_id: customer.id, movie_id: movie.id, due_date: due_date, checkout_date: checkout_date) if rental.save + # binding.pry movie.decrement_inventory! customer.increment_movies_checked_out_count! # binding.pry diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index bdc0d9121..35c6826c0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -7,44 +7,53 @@ describe "checkin" do it "correctly updates available inventory" do - rental = rentals(:one) + post checkout_path, params: { customer_id: customers(:dionisia).id, movie_id: movies(:up).id } + movies(:up).reload + customers(:dionisia).reload + # binding.pry + expect(movies(:up).available_inventory).must_equal 199 + expect(customers(:dionisia).movies_checked_out_count).must_equal 1 + + post checkin_path, params: { customer_id: customers(:dionisia).id, movie_id: movies(:up).id } + movies(:up).reload + customers(:dionisia).reload + expect(movies(:up).available_inventory).must_equal 200 + expect(customers(:dionisia).movies_checked_out_count).must_equal 0 + end + + it "doesn't increase available_inventory more than what is actually available" do + rental = rentals(:two) customer = rental.customer movie = rental.movie - expect { - post checkin_path, params: { customer_id: rental.customer_id, movie_id: rental.movie_id } - }.must_change "Movie.available_inventory", 2 - + post checkin_path, params: { customer_id: customers(:dionisia).id, movie_id: movies(:up).id } + movies(:up).reload + expect(movies(:up).available_inventory).must_equal 200 end it "won't update available inventory if invalid" do - - + post checkin_path, params: { customer_id: nil, movie_id: movies(:up).id } + movies(:up).reload + expect(movies(:up).available_inventory).must_equal 200 + must_respond_with :bad_request end end describe "checkout" do - - before do - @params = {customer_id: customers(:dionisia).id, movie_id: movies(:up).id} - end - it "successfully creates a new rental" do - - customer = rental.customer - movie = rental.movie - rental = Rental.new(customer_id: customer, movie_id: movie, due_date: due_date, checkout_date: checkout_date) - - expect { - post checkin_path, params: @params - }.must_change "Rental.count", 3 - + post checkout_path, params: { customer_id: customers(:dionisia).id, movie_id: movies(:up).id } + movies(:up).reload + customers(:dionisia).reload + # binding.pry + expect(movies(:up).available_inventory).must_equal 199 + expect(customers(:dionisia).movies_checked_out_count).must_equal 1 end it "won't create a rental if invalid" do - - + post checkout_path, params: { customer_id: nil, movie_id: movies(:up).id } + movies(:up).reload + expect(movies(:up).available_inventory).must_equal 200 + must_respond_with :bad_request end - end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 29ff076b1..af24935e8 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,11 +5,11 @@ nemo: overview: cute fish release_date: 2018-11-05 inventory: 100 - available_inventory: 20 + available_inventory: 100 up: title: Up overview: cute dog release_date: 2018-11-05 inventory: 200 - available_inventory: 20 + available_inventory: 200 From be43d0a06d470d7849d813024afbbfe02257711e Mon Sep 17 00:00:00 2001 From: Karis Kim Date: Fri, 9 Nov 2018 15:44:13 -0800 Subject: [PATCH 27/27] added tests for model methods --- test/fixtures/customers.yml | 2 +- test/fixtures/rentals.yml | 3 ++- test/models/customer_test.rb | 27 ++++++++++++++++++++++++++ test/models/movie_test.rb | 37 ++++++++++++++++++++++++++++++++++++ test/models/rental_test.rb | 31 +++++++++++++++++++++++++++--- 5 files changed, 95 insertions(+), 5 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bf0c64fa7..f96fdcfae 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -10,7 +10,7 @@ dionisia: phone: "123-123-1234" movies_checked_out_count: 0 -dionisia: +karis: name: Karis registered_at: 2018-11-05 12:13:02 address: address 2 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index c92da1b42..5dee6e440 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,7 +3,8 @@ one: customer: karis movie: nemo - due_date: "2018-11-05" + due_date: "2018-11-07" + checkout_date: "2018-11-01" two: customer: dionisia diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7c7566ad1..b756b5c9f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -74,4 +74,31 @@ customers(:one).movies_checked_out_count = nil expect(customers(:one).valid?).must_equal false end + + describe 'relations' do + it 'has rentals' do + rental = rentals(:one) + customer = customers(:karis) + + customer = Customer.find_by(id: rental.customer_id ) + expect(customer.rentals.first.id).must_equal rental.id + end + end + + describe "customer model methods" do + it "increments movies_checked_out_count when movie is checked out" do + customer = Customer.first + expect(customer.movies_checked_out_count).must_equal 0 + customer.increment_movies_checked_out_count! + expect(customer.movies_checked_out_count).must_equal 1 + end + + it "decrements movies_checked_out_count when movie is checked in" do + customer = Customer.first + customer.increment_movies_checked_out_count! + expect(customer.movies_checked_out_count).must_equal 1 + customer.decrement_movies_checked_out_count! + expect(customer.movies_checked_out_count).must_equal 0 + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index aa9a8e1e9..3569ac556 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -40,4 +40,41 @@ movies(:one).inventory = -1 expect(movies(:one).valid?).must_equal false end + + describe 'relations' do + it 'has rentals' do + rental = rentals(:one) + movie = movies(:nemo) + + movie = Movie.find_by(id: rental.movie_id ) + expect(movie.rentals.first.id).must_equal rental.id + end + end + + describe "movie model methods" do + it "checks movie is available" do + expect(Movie.first.is_available?).must_equal true + invalid_movie = Movie.first + invalid_movie.available_inventory = 0 + expect(invalid_movie.is_available?).must_equal false + end + + it "decrement inventory" do + movie = Movie.first + expect(movie.available_inventory).must_equal 200 + movie.decrement_inventory! + movie.reload + expect(movie.available_inventory).must_equal 199 + end + + it "increment inventory" do + movie = Movie.first + movie.decrement_inventory! + movie.reload + expect(movie.available_inventory).must_equal 199 + movie.increment_inventory! + movie.reload + expect(movie.available_inventory).must_equal 200 + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 48a544323..c82a7d431 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,34 @@ require "test_helper" describe Rental do - # let(:rental) { Rental.new } - it "must be valid" do - expect(Rental.first.valid?).must_equal false + it "must have a checkout_date" do + expect(rentals(:one).valid?).must_equal true + rentals(:one).checkout_date = "" + expect(rentals(:one).valid?).must_equal false + end + + it "gets the first rental that was checked out" do + rental = Rental.get_rental(rentals(:one).customer_id, rentals(:one).movie_id) + expect(rental).must_be_instance_of Rental + expect(rental.movie.title).must_equal "Nemo" + end + + describe 'relations' do + it 'belongs to customer' do + rental = rentals(:one) + customer = customers(:karis) + + customer_rental = Customer.find_by(id: rental.customer_id ) + expect(customer_rental.rentals.first.id).must_equal rental.id + end + + it 'belongs to movie' do + rental = rentals(:one) + movie = movies(:nemo) + + movie_rental = Movie.find_by(id: rental.movie_id ) + expect(movie_rental.rentals.first.id).must_equal rental.id + end end end