From e618db20709b5d1bf73edcf1f95996f78d19333b Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 11:27:29 -0800 Subject: [PATCH 01/52] intial set up for rails new api --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..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..dfbb1d75d --- /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.17.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..7bbc2dd8a --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +/LVSmyOn6mAxtLBLVCRhzYuzadbGwhGlR+n8gBEYnwKFAcXS6FhaprmKO01rIM55NesffkBoaqNbzx2hwJdA/pbSYmOg26dTFuCXeZMdeaj6Hh4gbSYoZ/V1P8+hQFCHcjhzgAtXpNtroLKj0ej9/u4zTu2mEEAncyhY0QcPYy7eyfzloSTLdWTTdq/ic8ygIg/nQlHGKh0bodDrAgizozRVle5AAgDXdcdYm2B95MDzLfDNG8UsJsKHClwocMiSKSL8IlTslo4FksjwOROCnmQNfDvcozTssUPIE9iLe0HusdX99szqV0mhkMLSaT2pI3+8Qg/C7oHWguY7sO1fPaTw5+OThGiLCDQtYXcnu9wXBJmhGBiZsS7BkpEe4EaLRsNzzL9hPILFotirnHp4u7Q6ad8c/9N+89Zp--L4VnNJzAiQyPFlny--CC75oWRK5MgGaCZNgr8Bug== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From f1ac3c896c89fa38e29c5d571630f1b3cf8e7cea Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 11:38:54 -0800 Subject: [PATCH 02/52] create new controllers and routes for customers and movies --- app/controllers/customers_controller.rb | 6 ++++++ app/controllers/movies_controller.rb | 12 ++++++++++++ config/routes.rb | 5 ++++- test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..36be07314 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,6 @@ +class CustomersController < ApplicationController + + def index + end + +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..e9e33738a --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,12 @@ +class MoviesController < ApplicationController + + def index + end + + def show + end + + def create + end + +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..eddf26691 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + 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 From 87f1196ce2dbf3252c23dd2d23a65c4924d5ac37 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 11:45:59 -0800 Subject: [PATCH 03/52] test routes work --- app/controllers/customers_controller.rb | 1 + app/controllers/movies_controller.rb | 2 +- config/routes.rb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 36be07314..7048df296 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,7 @@ class CustomersController < ApplicationController def index + render json: "it works!" end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e9e33738a..cd59bdf2d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,5 +8,5 @@ def show def create end - + end diff --git a/config/routes.rb b/config/routes.rb index eddf26691..1cdb44b91 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,5 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + end From 32dc5e2f92b81cf2e64195c4cca4f124b2a38f6b Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 11:47:04 -0800 Subject: [PATCH 04/52] test zomg --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7048df296..e15d3ed6f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index - render json: "it works!" + render json: "it works!" end end From 045f477072d2e5c0b73b9dd6f01aea47cc18f235 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 11:50:59 -0800 Subject: [PATCH 05/52] create model for movie and customer --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + db/migrate/20181105194859_create_movies.rb | 12 ++++++ db/migrate/20181105194958_create_customers.rb | 15 +++++++ db/schema.rb | 39 +++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++++ test/fixtures/movies.yml | 13 +++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 9 files changed, 120 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105194859_create_movies.rb create mode 100644 db/migrate/20181105194958_create_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20181105194859_create_movies.rb b/db/migrate/20181105194859_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105194859_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/20181105194958_create_customers.rb b/db/migrate/20181105194958_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105194958_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/schema.rb b/db/schema.rb new file mode 100644 index 000000000..c6f9c6182 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# 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_194958) 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 + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..7d39356bb --- /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 11:49:59 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-11-05 11:49:59 + 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/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From 598c0af9ee0b468c36f029455f71b75996f2e3a0 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 11:53:50 -0800 Subject: [PATCH 06/52] add validations in models --- app/models/customer.rb | 7 +++++++ app/models/movie.rb | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..6ffdeca54 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,9 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..bc83b1ce8 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end From e11b1a503204df21e8c993e2084a1c9b4caf0a97 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 12:00:02 -0800 Subject: [PATCH 07/52] first test in customers controller, fix test helper --- app/models/customer.rb | 2 +- test/controllers/customers_controller_test.rb | 9 ++++++--- test/test_helper.rb | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 6ffdeca54..9c0035179 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,5 +5,5 @@ class Customer < ApplicationRecord validates :city, presence: true validates :state, presence: true validates :postal_code, presence: true - validates :phone, presence: true + validates :phone, presence: true end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..3f02cf17b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,10 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get customers_path + must_respond_with :success + end + end end diff --git a/test/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 c276635e4f8b5fae06e2db533569c62f51ce8f70 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 12:03:25 -0800 Subject: [PATCH 08/52] scaffolding for movie controller tests --- test/controllers/movies_controller_test.rb | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..2cc82f492 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,24 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + end + + describe "show" do + it "is a real working route" do + # get movie_path() + # must_respond_with :success + end + end + + describe "create" do + it "is a real working route" do + # get movie_path(params) + # must_respond_with :success + end + end end From d42fd3a3e0aca7da2901ed8251f5afc8f8e7cef3 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 12:13:14 -0800 Subject: [PATCH 09/52] add yml files --- test/fixtures/customers.yml | 28 ++++++++++++++-------------- test/fixtures/movies.yml | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 7d39356bb..d104f5f78 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 +goeun: + name: Goeun registered_at: 2018-11-05 11:49:59 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 2830 Roy Street + city: Seattle + state: WA + postal_code: 98010 + phone: 890 231-3212 -two: - name: MyString +semret: + name: Semret registered_at: 2018-11-05 11:49:59 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123 Main Street + city: Anchorage + state: AL + postal_code: 01010 + phone: 111 - 592 - 0000 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..4b1217b66 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2018-11-05 - inventory: 1 +titanic: + title: Titanic + overview: There was definitely room for two on this door!!!!!! + release_date: 1995-11-05 + inventory: 15 -two: - title: MyString - overview: MyString - release_date: 2018-11-05 - inventory: 1 +notebook: + title: The Notebook + overview: Ryan Gosling and Rachel McAdams make out in the rain + release_date: 2008-11-05 + inventory: 100 From 98a97fa4aa364da65e090692061d679f5e20612e Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 5 Nov 2018 12:25:27 -0800 Subject: [PATCH 10/52] add validation testing for movie model --- app/models/movie.rb | 4 ++-- test/models/customer_test.rb | 4 ---- test/models/movie_test.rb | 42 +++++++++++++++++++++++++++++++++--- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index bc83b1ce8..046f3512e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord - validates :title, presence: true + validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, presence: true + validates :inventory, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..eee222f67 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,5 @@ 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 index 34d1d30a5..7ff352723 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,45 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + describe "validations" do + + it "is valid when all fields are present" do + titanic = movies(:titanic) + titanic.valid?.must_equal true + end + + it "is invalid with a missing title" do + titanic = movies(:titanic) + titanic.title = nil + + titanic.valid?.must_equal false + end + + it "does not create movie with existing title" do + titanic = movies(:titanic) + new_movie = movies(:notebook) + + new_movie.title = titanic.title + new_movie.valid?.must_equal false + end + + it "is invalid with a missing overview" do + titanic = movies(:titanic) + titanic.overview = nil + titanic.valid?.must_equal false + end + + it "is invalid with a missing release date" do + titanic = movies(:titanic) + titanic.release_date = nil + titanic.valid?.must_equal false + end + + it "is invalid with a missing inventory" do + titanic = movies(:titanic) + titanic.inventory = nil + titanic.valid?.must_equal false + end - it "must be valid" do - value(movie).must_be :valid? end end From a80bd95437a05b082fe23238723e8eaf801565df Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 15:16:38 -0800 Subject: [PATCH 11/52] customer validations --- test/models/customer_test.rb | 56 ++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index eee222f67..cef71d491 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,5 +1,61 @@ require "test_helper" describe Customer do + describe "validations" do + it "is valid when all fields are present" do + semret = customers(:semret) + semret.valid?.must_equal true + end + + it "is invalid with a missing title" do + semret = customers(:semret) + semret.name = nil + + semret.valid?.must_equal false + end + + it "is invalid with a missing registered date" do + semret = customers(:semret) + semret.registered_at = nil + + semret.valid?.must_equal false + end + + it "is invalid with a missing address" do + semret = customers(:semret) + semret.address = nil + + semret.valid?.must_equal false + end + + it "is invalid with a missing city" do + semret = customers(:semret) + semret.city = nil + + semret.valid?.must_equal false + end + + it "is invalid with a missing state" do + semret = customers(:semret) + semret.state = nil + + semret.valid?.must_equal false + end + + it "is invalid with a missing postal code" do + semret = customers(:semret) + semret.postal_code = nil + + semret.valid?.must_equal false + end + + it "is invalid with a missing phone" do + semret = customers(:semret) + semret.phone = nil + + semret.valid?.must_equal false + end + + end end From 91c026e503f46dbbb3bebb18ad5d6a397dc01a5d Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 15:37:17 -0800 Subject: [PATCH 12/52] index and helper method for movies controller --- app/controllers/customers_controller.rb | 6 +++++- app/controllers/movies_controller.rb | 10 ++++++++++ config/routes.rb | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e15d3ed6f..9bf42e306 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,11 @@ class CustomersController < ApplicationController def index - render json: "it works!" + + customers = Customer.all + + render json: customers, status: :ok + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index cd59bdf2d..239a3b4c6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,9 @@ class MoviesController < ApplicationController def index + movies = Movie.all + + render json: jsonify(movies), status: :ok end def show @@ -9,4 +12,11 @@ def show def create end + private + + def jsonify(movie_data) + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) + + end + end diff --git a/config/routes.rb b/config/routes.rb index 1cdb44b91..55eaa4c25 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + # get '/zomg', to: 'customers#index' end From c433bbee174c43d1bbcc369d2a7a44598edced5f Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 15:39:27 -0800 Subject: [PATCH 13/52] index and helper method for customer controller --- app/controllers/customers_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 9bf42e306..bba7aab9d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,8 +4,12 @@ def index customers = Customer.all - render json: customers, status: :ok + render json: jsonify(customers), status: :ok end + private + def jsonify(customer_data) + return customer_data.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + end end From a4078c9148c8286ca0d4bc8c9c07e094a199f8dd Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 16:19:35 -0800 Subject: [PATCH 14/52] added show method in movie controller --- app/controllers/application_controller.rb | 5 +++++ app/controllers/movies_controller.rb | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..bde938a04 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::API + + def render_error(status, errors) + render json: { errors: errors}, status: status + + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 239a3b4c6..448f041b6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,9 +7,18 @@ def index end def show + movie_id = params[:id] + movie = Movie.find_by(id: movie_id) + + if movie + render json: jsonify(movie), status: :ok + else + render_error(:not_found, {id: ["Movie with id: #{movie_id} not found"]}) + end end def create + end private From 40c02635d3e9c1ba9b70863c3cf9fe539b9f380d Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 16:23:11 -0800 Subject: [PATCH 15/52] made minor changes in both movie and customer controller of things to return --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index bba7aab9d..0165e5719 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -10,6 +10,6 @@ def index private def jsonify(customer_data) - return customer_data.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 448f041b6..a83cdb2d0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,7 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify(movies), status: :ok + render json: jsonify_index(movies), status: :ok end def show @@ -11,7 +11,7 @@ def show movie = Movie.find_by(id: movie_id) if movie - render json: jsonify(movie), status: :ok + render json: jsonify_show(movie), status: :ok else render_error(:not_found, {id: ["Movie with id: #{movie_id} not found"]}) end @@ -23,7 +23,11 @@ def create private - def jsonify(movie_data) + def jsonify_index(movie_data) + return movie_data.as_json(only: [:id, :title, :release_date]) + + end + def jsonify_show(movie_data) return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) end From eba61e4f087ece3e6538c34c7cefda74d22d6147 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 16:39:44 -0800 Subject: [PATCH 16/52] added create method for movie controller --- app/controllers/movies_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a83cdb2d0..fc82166d2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,11 +18,22 @@ def show end def create + movie = Movie.new(movie_params) + + if movie.save + render json: {id: movie.id} + else + render_error(:bad_request, movie.errors.messages) + end end private + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end + def jsonify_index(movie_data) return movie_data.as_json(only: [:id, :title, :release_date]) From 21785f739f14f367cd1efc7d92ba07f1f5f7b4ef Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 16:51:05 -0800 Subject: [PATCH 17/52] added two migrations to add colums for rental wave --- .../20181106004323_add_available_inventory_to_movie.rb | 6 ++++++ db/migrate/20181106004351_add_movie_checked_out_count.rb | 6 ++++++ db/schema.rb | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181106004323_add_available_inventory_to_movie.rb create mode 100644 db/migrate/20181106004351_add_movie_checked_out_count.rb diff --git a/db/migrate/20181106004323_add_available_inventory_to_movie.rb b/db/migrate/20181106004323_add_available_inventory_to_movie.rb new file mode 100644 index 000000000..3a6f36f6e --- /dev/null +++ b/db/migrate/20181106004323_add_available_inventory_to_movie.rb @@ -0,0 +1,6 @@ +class AddAvailableInventoryToMovie < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + + end +end diff --git a/db/migrate/20181106004351_add_movie_checked_out_count.rb b/db/migrate/20181106004351_add_movie_checked_out_count.rb new file mode 100644 index 000000000..f3d194472 --- /dev/null +++ b/db/migrate/20181106004351_add_movie_checked_out_count.rb @@ -0,0 +1,6 @@ +class AddMovieCheckedOutCount < 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 c6f9c6182..e9a6d2deb 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_194958) do +ActiveRecord::Schema.define(version: 2018_11_06_004351) 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| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end end From f27fabff094f825ad1b57ba16271536c3e9593a9 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 16:54:31 -0800 Subject: [PATCH 18/52] created controller and model for rental --- app/controllers/rentals_controller.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20181106005350_create_rentals.rb | 10 ++++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 6 files changed, 39 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181106005350_create_rentals.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb 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/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/20181106005350_create_rentals.rb b/db/migrate/20181106005350_create_rentals.rb new file mode 100644 index 000000000..1ea8683e5 --- /dev/null +++ b/db/migrate/20181106005350_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.integer :customer_id + t.integer :movie_id + + t.timestamps + end + 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/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..58e481ca5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + customer_id: 1 + movie_id: 1 + +two: + customer_id: 1 + movie_id: 1 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 0d2d9246604364eb3039fd22f90c921fb88e4ba4 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 17:02:30 -0800 Subject: [PATCH 19/52] added new non-restful routes and added model validations to rentals --- app/controllers/rentals_controller.rb | 10 ++++++++++ app/models/customer.rb | 2 ++ app/models/rental.rb | 7 +++++++ config/routes.rb | 4 ++++ 4 files changed, 23 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..10f0d33c0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,12 @@ class RentalsController < ApplicationController + + def checkin + + end + + def checkout + + end + + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 9c0035179..496aa2cf3 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals + validates :name, presence: true validates :registered_at, presence: true validates :address, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..571d9b568 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,9 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :customer_id, presence: true + validates :movie_id, presence: true + + end diff --git a/config/routes.rb b/config/routes.rb index 55eaa4c25..ecb91fcbf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,10 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' + + post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' + # get '/zomg', to: 'customers#index' end From 5e16e0c79636b337aab9398ac13f11b917d57cdf Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 17:17:20 -0800 Subject: [PATCH 20/52] added another migration to add foreign key and due date col --- app/models/movie.rb | 2 ++ .../20181106011211_add_foreign_keys_remove_cols.rb | 12 ++++++++++++ db/schema.rb | 14 +++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181106011211_add_foreign_keys_remove_cols.rb diff --git a/app/models/movie.rb b/app/models/movie.rb index 046f3512e..067be145d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true diff --git a/db/migrate/20181106011211_add_foreign_keys_remove_cols.rb b/db/migrate/20181106011211_add_foreign_keys_remove_cols.rb new file mode 100644 index 000000000..5aa96c1d3 --- /dev/null +++ b/db/migrate/20181106011211_add_foreign_keys_remove_cols.rb @@ -0,0 +1,12 @@ +class AddForeignKeysRemoveCols < ActiveRecord::Migration[5.2] + def change + remove_column :rentals, :customer_id + remove_column :rentals, :movie_id + + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + + add_column :rentals, :due_date, :date + + end +end diff --git a/db/schema.rb b/db/schema.rb index e9a6d2deb..f8a79cbb3 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_06_004351) do +ActiveRecord::Schema.define(version: 2018_11_06_011211) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,4 +38,16 @@ t.integer "available_inventory" end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.date "due_date" + 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 45cb9d9828cfed17f8e5246c97a588ac63990076 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Mon, 5 Nov 2018 17:50:42 -0800 Subject: [PATCH 21/52] added another migration to add status in rental db, and psedo coded rental controller --- app/controllers/rentals_controller.rb | 15 ++++++++++++--- config/routes.rb | 4 ++-- .../20181106013330_add_status_to_rentals.rb | 6 ++++++ db/schema.rb | 3 ++- 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20181106013330_add_status_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 10f0d33c0..400e926fc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,12 +1,21 @@ class RentalsController < ApplicationController + def checkout + # creating a new instance of a rental + # while we check if the avaiable inventory of the movie is not 0 + # set the due date (this is a model logic) that will be called here + # customer checked_out_count will be increamented (model methods) + # available_inventory will be decremented (model test) + end + def checkin + # update rental instance + # change status to checkout=false + # decrement the checked_out_count for customers + # increament the available_inventory of movies end - def checkout - - end end diff --git a/config/routes.rb b/config/routes.rb index ecb91fcbf..4f14a45d9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,9 +3,9 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' + post '/rentals/checkin', to: 'rentals#checkin' - post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post '/rentals/checkout', to: 'rentals#checkout' # get '/zomg', to: 'customers#index' diff --git a/db/migrate/20181106013330_add_status_to_rentals.rb b/db/migrate/20181106013330_add_status_to_rentals.rb new file mode 100644 index 000000000..04f86f310 --- /dev/null +++ b/db/migrate/20181106013330_add_status_to_rentals.rb @@ -0,0 +1,6 @@ +class AddStatusToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkedout, :boolean, :default => true + + end +end diff --git a/db/schema.rb b/db/schema.rb index f8a79cbb3..59630f756 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_06_011211) do +ActiveRecord::Schema.define(version: 2018_11_06_013330) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,6 +44,7 @@ t.bigint "customer_id" t.bigint "movie_id" t.date "due_date" + t.boolean "checkedout", default: true t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 44af08430b8adcd2fdfbe633be8fd17a70db472d Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 07:49:11 -0800 Subject: [PATCH 22/52] take out _id in yml, validations testing for rental model green --- app/models/rental.rb | 2 -- test/fixtures/rentals.yml | 12 ++++++++---- test/models/rental_test.rb | 31 ++++++++++++++++++++++++++++--- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 571d9b568..41e46d01b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,6 +4,4 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :movie_id, presence: true - - end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 58e481ca5..e38d30421 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - customer_id: 1 - movie_id: 1 + customer: 1 + movie: 1 two: - customer_id: 1 - movie_id: 1 + customer: 2 + movie: 2 + +three: + customer: 1 + movie: 2 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..23ba40ebf 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 } + describe "validations" do + before do + @new_rental = Rental.new(customer: customers(:goeun), movie: movies(:titanic)) + end + + it "is valid when all fields are present" do + @new_rental.save + @new_rental.valid?.must_equal true + end + + it "is invalid with a missing customer id" do + @new_rental.customer = nil + @new_rental.valid?.must_equal false + end + + it "is invalid with a missing movie id" do + @new_rental.movie = nil + @new_rental.valid?.must_equal false + end + + it "is invalid with an invalid movie id" do + @new_rental.movie_id = 1 #set to likely invalid movie id + @new_rental.valid?.must_equal false + end + end + + describe "relations" do + - it "must be valid" do - value(rental).must_be :valid? end end From 95180522d6c90dba93b995ffa001774ba5c74e8b Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 07:54:21 -0800 Subject: [PATCH 23/52] added relational testing --- test/models/rental_test.rb | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 23ba40ebf..e2b85a22d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,10 +1,11 @@ require "test_helper" describe Rental do + before do + @new_rental = Rental.new(customer: customers(:goeun), movie: movies(:titanic)) + end + describe "validations" do - before do - @new_rental = Rental.new(customer: customers(:goeun), movie: movies(:titanic)) - end it "is valid when all fields are present" do @new_rental.save @@ -13,21 +14,38 @@ it "is invalid with a missing customer id" do @new_rental.customer = nil + @new_rental.save @new_rental.valid?.must_equal false end it "is invalid with a missing movie id" do @new_rental.movie = nil + @new_rental.save @new_rental.valid?.must_equal false end it "is invalid with an invalid movie id" do @new_rental.movie_id = 1 #set to likely invalid movie id + @new_rental.save @new_rental.valid?.must_equal false end end describe "relations" do + it "belongs to a customer" do + @new_rental.save + customer = @new_rental.customer + customer.must_be_instance_of Customer + + # customer = rentals(:one).customer + # customer.must_be_instance_of Customer + end + + it "belongs to a movie" do + @new_rental.save + movie = @new_rental.movie + movie.must_be_instance_of Movie + end end From f66b4c77f0a01f1e109c9098b20e47edb42b9f77 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Tue, 6 Nov 2018 11:47:55 -0800 Subject: [PATCH 24/52] added relation tests for movies and customer model testing --- test/models/customer_test.rb | 8 ++++++++ test/models/movie_test.rb | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index cef71d491..b1d349ce9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -56,6 +56,14 @@ semret.valid?.must_equal false end + end + describe 'relationship' do + it 'has many rentals' do + customer = Customer.first + customer.rentals.each do |rental| + rental.must_be_instance_of Rental + end + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 7ff352723..199094f4f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -40,6 +40,14 @@ titanic.inventory = nil titanic.valid?.must_equal false end + end + describe 'relationship' do + it 'has many rentals' do + movie = Movie.first + movie.rentals.each do |rental| + rental.must_be_instance_of Rental + end + end end end From e0ecee8e151eeff8e3ef5d2108ce4ff91309f8ee Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 11:51:15 -0800 Subject: [PATCH 25/52] fix rentals yml, refactor using let in test --- test/fixtures/rentals.yml | 14 ++++++++------ test/models/rental_test.rb | 32 ++++++++++---------------------- 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index e38d30421..4954ade94 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - customer: 1 - movie: 1 + customer: semret + movie: titanic + due_date: 2018-11-06 + checkedout: true two: - customer: 2 - movie: 2 + customer: goeun + movie: notebook three: - customer: 1 - movie: 2 + customer: semret + movie: titanic diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index e2b85a22d..a40849e21 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,52 +1,40 @@ require "test_helper" describe Rental do - before do - @new_rental = Rental.new(customer: customers(:goeun), movie: movies(:titanic)) - end + let(:rental) {rentals(:one)} describe "validations" do it "is valid when all fields are present" do - @new_rental.save - @new_rental.valid?.must_equal true + rental.valid?.must_equal true end it "is invalid with a missing customer id" do - @new_rental.customer = nil - @new_rental.save - @new_rental.valid?.must_equal false + rental.customer = nil + rental.valid?.must_equal false end it "is invalid with a missing movie id" do - @new_rental.movie = nil - @new_rental.save - @new_rental.valid?.must_equal false + rental.movie = nil + rental.valid?.must_equal false end it "is invalid with an invalid movie id" do - @new_rental.movie_id = 1 #set to likely invalid movie id - @new_rental.save - @new_rental.valid?.must_equal false + rental.movie_id = 1 #set to likely invalid movie id + rental.valid?.must_equal false end end describe "relations" do it "belongs to a customer" do - @new_rental.save - customer = @new_rental.customer + customer = rental.customer customer.must_be_instance_of Customer - - # customer = rentals(:one).customer - # customer.must_be_instance_of Customer end it "belongs to a movie" do - @new_rental.save - movie = @new_rental.movie + movie = rental.movie movie.must_be_instance_of Movie end - end end From 7d1e3b390049653004a9394430f51e0d6b646682 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 12:01:49 -0800 Subject: [PATCH 26/52] remove spaces --- app/controllers/movies_controller.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index fc82166d2..408930648 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,6 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify_index(movies), status: :ok end @@ -25,7 +24,6 @@ def create else render_error(:bad_request, movie.errors.messages) end - end private @@ -36,11 +34,10 @@ def movie_params def jsonify_index(movie_data) return movie_data.as_json(only: [:id, :title, :release_date]) - end + def jsonify_show(movie_data) return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) - end end From 4b3412813eb466efaa6654ab3c2d980a49205215 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 12:10:30 -0800 Subject: [PATCH 27/52] nullify dependent rental in movie model --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 067be145d..67c888d50 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - has_many :rentals + has_many :rentals, dependent: :nullify validates :title, presence: true, uniqueness: true validates :overview, presence: true From 90459df50816fbf2bc51572edee678b6f7cf5963 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 12:28:08 -0800 Subject: [PATCH 28/52] add helper method check_response for controller tests --- test/test_helper.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/test_helper.rb b/test/test_helper.rb index fb7dd505e..a216827ab 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -10,6 +10,14 @@ Minitest.backtrace_filter ) +def check_response(expected_status: :success, expected_type: ) + 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 # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: From 48656b602cb4a2e450786d1748cafa1877f59d0a Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 12:28:41 -0800 Subject: [PATCH 29/52] tests for index, show, create --- test/controllers/movies_controller_test.rb | 76 +++++++++++++++++++--- 1 file changed, 68 insertions(+), 8 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2cc82f492..11b54a457 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,24 +1,84 @@ require "test_helper" describe MoviesController do + + SHOW_FIELDS = %w(title overview release_date inventory).sort + INDEX_FIELDS = %w(id title release_date).sort + + describe "index" do - it "is a real working route" do + it "is a real working route and returns JSON" do get movies_path - must_respond_with :success + + body = check_response(expected_type: Array) + expect(body.length).must_equal Movie.count + + body.each do |movie| + expect(movie.keys.sort).must_equal INDEX_FIELDS + end + end + + it "returns an empty array where there are no movies" do + Movie.destroy_all + + get movies_path + body = check_response(expected_type: Array) + expect(body).must_equal [] end end describe "show" do - it "is a real working route" do - # get movie_path() - # must_respond_with :success + it "retrieves info on one movie" do + get movie_path(movies(:titanic).id) + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal SHOW_FIELDS + end + + it "returns 404 when the movie DNE" do + movie = Movie.first + movie.destroy + get movie_path(movie) + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body).must_include "errors" end end describe "create" do - it "is a real working route" do - # get movie_path(params) - # must_respond_with :success + + before do + @params = { + "movie": { + "title": "Bohemian Rhapsody", + "overview": "Bless Freddie Mercury", + "release_date": Date.parse("2018-10-10"), + "inventory": 2 + } + } + end + + it "creates a new movie given valid data" do + + post movies_path(@params) + body = check_response(expected_type: Hash) + expect(body).must_include "id" end + + it "returns error for invalid data" do + @params[:movie][:title] = nil + post movies_path(@params) + + body = check_response(expected_status: :bad_request, expected_type: Hash) + expect(body).must_include "errors" + end + end + + + # + # describe "create" do + # it "is a real working route" do + # # get movie_path(params) + # # must_respond_with :success + # end end From c4464bde68200ebb99ff6bd2982322a6e0241630 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Tue, 6 Nov 2018 12:28:50 -0800 Subject: [PATCH 30/52] customer controller tests --- app/models/customer.rb | 4 +-- test/controllers/customers_controller_test.rb | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 496aa2cf3..086387c7d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord - has_many :rentals - + has_many :rentals, dependent: :nullify + validates :name, presence: true validates :registered_at, presence: true validates :address, presence: true diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 3f02cf17b..f52e73717 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,10 +1,41 @@ require "test_helper" describe CustomersController do + + CUSTOMER_FIELDS = %w(id name registered_at postal_code phone).sort + + + # def check_response(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 real working route" do get customers_path must_respond_with :success + + + body = check_response(expected_type: Array) + expect(body.length).must_equal Customer.count + + body.each do |customer| + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end end + it 'returns an empty array when there are no customers' do + Customer.destroy_all + + get customers_path + + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end end From 5e5a3756c419109c5f7a80b7e6a5ae82ea716d1c Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Tue, 6 Nov 2018 12:31:02 -0800 Subject: [PATCH 31/52] added helper method in tests that will be used with movie and customer controllers --- test/controllers/customers_controller_test.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index f52e73717..273208a2a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -5,16 +5,6 @@ CUSTOMER_FIELDS = %w(id name registered_at postal_code phone).sort - # def check_response(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 real working route" do get customers_path From 8f7ff5483a87e5e4d99dedb2de3aa4fadcb470db Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Tue, 6 Nov 2018 14:11:23 -0800 Subject: [PATCH 32/52] created helper method to set available as inventory at initialization --- app/controllers/movies_controller.rb | 8 ++++++-- app/models/movie.rb | 5 +++++ .../20181106215642_change_available_inventory_col.rb | 8 ++++++++ db/schema.rb | 2 +- test/controllers/movies_controller_test.rb | 6 ++---- test/fixtures/movies.yml | 5 ++++- 6 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20181106215642_change_available_inventory_col.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 408930648..a87c71e28 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -29,7 +29,11 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + # 11 tests are failing and found out that we need to change the params from + # params.require(:movie) + # now 8 tests passed on postman + + params.permit(:title, :overview, :release_date, :inventory) end def jsonify_index(movie_data) @@ -37,7 +41,7 @@ def jsonify_index(movie_data) end def jsonify_show(movie_data) - return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 67c888d50..929183d0d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,8 +1,13 @@ class Movie < ApplicationRecord + before_create :set_available_inventory_default has_many :rentals, dependent: :nullify validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true + + def set_available_inventory_default + self.available_inventory = self.inventory + end end diff --git a/db/migrate/20181106215642_change_available_inventory_col.rb b/db/migrate/20181106215642_change_available_inventory_col.rb new file mode 100644 index 000000000..6c1e8916c --- /dev/null +++ b/db/migrate/20181106215642_change_available_inventory_col.rb @@ -0,0 +1,8 @@ +class ChangeAvailableInventoryCol < ActiveRecord::Migration[5.2] + def change + reversible do |dir| + dir.up{ Movie.update_all('available_inventory = inventory')} + end + + end +end diff --git a/db/schema.rb b/db/schema.rb index 59630f756..7877e096d 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_06_013330) do +ActiveRecord::Schema.define(version: 2018_11_06_215642) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 11b54a457..bae17d773 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,7 +2,7 @@ describe MoviesController do - SHOW_FIELDS = %w(title overview release_date inventory).sort + SHOW_FIELDS = %w(title overview release_date inventory available_inventory).sort INDEX_FIELDS = %w(id title release_date).sort @@ -48,12 +48,10 @@ before do @params = { - "movie": { "title": "Bohemian Rhapsody", "overview": "Bless Freddie Mercury", "release_date": Date.parse("2018-10-10"), "inventory": 2 - } } end @@ -65,7 +63,7 @@ end it "returns error for invalid data" do - @params[:movie][:title] = nil + @params[:title] = nil post movies_path(@params) body = check_response(expected_status: :bad_request, expected_type: Hash) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 4b1217b66..b22786d2e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,12 @@ titanic: overview: There was definitely room for two on this door!!!!!! release_date: 1995-11-05 inventory: 15 + available_inventory: 15 + notebook: title: The Notebook overview: Ryan Gosling and Rachel McAdams make out in the rain release_date: 2008-11-05 - inventory: 100 + inventory: 10 + available_inventory: 8 From 115ead45f5ace3b83c81ba9e57e16fba2329a516 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Tue, 6 Nov 2018 14:19:09 -0800 Subject: [PATCH 33/52] added checked out movie var for customers --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0165e5719..0187e8b39 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -10,6 +10,6 @@ def index private 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, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 086387c7d..f290488b8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,4 +8,5 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true + end From 81a8f7c277fa6de8281b65a78408a528e88b76e5 Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Tue, 6 Nov 2018 14:20:53 -0800 Subject: [PATCH 34/52] Added movie checked var to the test --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 273208a2a..4f98ab00c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,7 @@ describe CustomersController do - CUSTOMER_FIELDS = %w(id name registered_at postal_code phone).sort + CUSTOMER_FIELDS = %w(id name registered_at postal_code phone movies_checked_out_count).sort describe "index" do From 0d4ca14ba31949216f5a130f1606fe93b7f8688c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 14:23:04 -0800 Subject: [PATCH 35/52] add due_date and checkedout in yml --- test/fixtures/rentals.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 4954ade94..bab7257af 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -9,7 +9,11 @@ one: two: customer: goeun movie: notebook + due_date: 2018-11-06 + checkedout: false three: customer: semret movie: titanic + due_date: 2018-11-06 + checkedout: true From 43f857a4fd5c9e890fd740429364a2db2fce057c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 15:04:42 -0800 Subject: [PATCH 36/52] create movie yml with no available inventory --- test/fixtures/movies.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index b22786d2e..c31d28e1e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -14,3 +14,10 @@ notebook: release_date: 2008-11-05 inventory: 10 available_inventory: 8 + +moana: + title: Moana + overview: Hawai'i is gr888 + release_date: 2008-11-05 + inventory: 10 + available_inventory: 0 From 2d7b7daca06038e8489f4a314304cee4fc3dd877 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 15:05:02 -0800 Subject: [PATCH 37/52] created route shortcuts --- config/routes.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 4f14a45d9..7fb6a5531 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,9 +3,10 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post '/rentals/checkin', to: 'rentals#checkin' + post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' + + post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' - post '/rentals/checkout', to: 'rentals#checkout' # get '/zomg', to: 'customers#index' From adb36cea9326b604317962439fb4a395dc8d9fb8 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 15:05:23 -0800 Subject: [PATCH 38/52] create two tests for checkout in rentals controller --- app/controllers/rentals_controller.rb | 23 +++++++++++++- test/controllers/rentals_controller_test.rb | 34 +++++++++++++++++++-- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 400e926fc..cd84d4990 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,7 +2,23 @@ class RentalsController < ApplicationController def checkout # creating a new instance of a rental + rental = Rental.new(rental_params) + # while we check if the avaiable inventory of the movie is not 0 + movie = Movie.find_by(id: rental_params[:movie_id]) + + if movie.available_inventory > 0 + rental.due_date = Date.today + 7 + if rental.save + render json: {rental_id: rental.id} + else + render_error(:bad_request, rental.errors.messages) + end + else + render_error(:forbidden, "No movie in available inventory.") + end + + # set the due date (this is a model logic) that will be called here # customer checked_out_count will be increamented (model methods) # available_inventory will be decremented (model test) @@ -10,12 +26,17 @@ def checkout def checkin # update rental instance - # change status to checkout=false + # change status to checkout=false # decrement the checked_out_count for customers # increament the available_inventory of movies end + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..92b1b6ea6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,35 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + describe "checkout" do + before do + @params = {customer_id: customers(:goeun).id, movie_id: movies(:titanic).id} + end + + it "creates an instance of Rental with valid data" do + expect{ + post checkout_path(@params) + }.must_change "Rental.count", +1 + + body = check_response(expected_type: Hash) + expect(body).must_include "rental_id" + end + + it "returns error if no available movies to rent" do + bad_params = {customer_id: customers(:goeun).id, movie_id: movies(:moana).id} + + expect{ + post checkout_path(bad_params) + }.wont_change "Rental.count" + + body = check_response(expected_status: :forbidden, expected_type: Hash) + + expect(body["errors"]).must_include "No movie in available inventory." + end + + end + + describe "checkin" do + end end From ab4f54d6c5846b6192e6e647e47858efd8a2b609 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 15:50:48 -0800 Subject: [PATCH 39/52] increments movies checked out, decrements available inventory, tests green --- app/controllers/rentals_controller.rb | 14 +++++------ test/controllers/rentals_controller_test.rb | 26 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cd84d4990..b923294da 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,15 +1,19 @@ class RentalsController < ApplicationController def checkout - # creating a new instance of a rental rental = Rental.new(rental_params) - - # while we check if the avaiable inventory of the movie is not 0 + customer = Customer.find_by(id: rental_params[:customer_id]) movie = Movie.find_by(id: rental_params[:movie_id]) if movie.available_inventory > 0 rental.due_date = Date.today + 7 if rental.save + checked_out = customer.movies_checked_out_count + customer.update(movies_checked_out_count: checked_out +1) + + inventory = movie.available_inventory + movie.update(available_inventory: inventory - 1) + render json: {rental_id: rental.id} else render_error(:bad_request, rental.errors.messages) @@ -18,10 +22,6 @@ def checkout render_error(:forbidden, "No movie in available inventory.") end - - # set the due date (this is a model logic) that will be called here - # customer checked_out_count will be increamented (model methods) - # available_inventory will be decremented (model test) end def checkin diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 92b1b6ea6..6490a445e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -8,14 +8,39 @@ end it "creates an instance of Rental with valid data" do + + customer = customers(:goeun) + movie = movies(:titanic) + + pre_inventory = movie.available_inventory + pre_movie_count = customer.movies_checked_out_count + expect{ post checkout_path(@params) }.must_change "Rental.count", +1 + customer.reload + movie.reload + + expect(movie.available_inventory).must_equal pre_inventory -1 + + expect(customer.movies_checked_out_count).must_equal pre_movie_count +1 + body = check_response(expected_type: Hash) expect(body).must_include "rental_id" end + it "does not create Rental instance with invalid data" do + @params[:customer_id] = nil + + expect{ + post checkout_path(@params) + }.wont_change "Rental.count" + + body = check_response(expected_status: :bad_request, expected_type: Hash) + expect(body).must_include "errors" + end + it "returns error if no available movies to rent" do bad_params = {customer_id: customers(:goeun).id, movie_id: movies(:moana).id} @@ -28,6 +53,7 @@ expect(body["errors"]).must_include "No movie in available inventory." end + end describe "checkin" do From 7c3c542d6d4541fe1ef58bc5b56725ac0363c5e1 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 15:55:40 -0800 Subject: [PATCH 40/52] adjustments in routes and controllers to pass smoke tests --- app/controllers/rentals_controller.rb | 2 +- config/routes.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b923294da..45efaab3e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,7 +14,7 @@ def checkout inventory = movie.available_inventory movie.update(available_inventory: inventory - 1) - render json: {rental_id: rental.id} + render json: {rental_id: rental.id}, status: :ok else render_error(:bad_request, rental.errors.messages) end diff --git a/config/routes.rb b/config/routes.rb index 7fb6a5531..e9d7acb44 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,9 +3,9 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' + post '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' - post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' # get '/zomg', to: 'customers#index' diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 6490a445e..5b0ed04ad 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -8,7 +8,6 @@ end it "creates an instance of Rental with valid data" do - customer = customers(:goeun) movie = movies(:titanic) From 92123d6636e918013f725f71be82b466ae75bd2b Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 6 Nov 2018 16:03:13 -0800 Subject: [PATCH 41/52] remove spaces --- test/controllers/rentals_controller_test.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 5b0ed04ad..96677be6b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe RentalsController do - describe "checkout" do before do @params = {customer_id: customers(:goeun).id, movie_id: movies(:titanic).id} @@ -51,8 +50,6 @@ expect(body["errors"]).must_include "No movie in available inventory." end - - end describe "checkin" do From 45928c038a54fb9ba15993ba5b67fc2a5ccdf56c Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Wed, 7 Nov 2018 09:24:39 -0800 Subject: [PATCH 42/52] Checkin method in rental controller and checkin test for that method --- app/controllers/rentals_controller.rb | 32 +++++++++++++++--- test/controllers/rentals_controller_test.rb | 36 +++++++++++++++++---- test/fixtures/customers.yml | 9 ++++++ test/fixtures/rentals.yml | 8 ++--- 4 files changed, 71 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 45efaab3e..85b81149e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -25,11 +25,35 @@ def checkout end def checkin - # update rental instance - # change status to checkout=false - # decrement the checked_out_count for customers - # increament the available_inventory of movies + # rental = Rental.find_by(rental_params) + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) + + if rental.nil? + render_error(:not_found, {id: ["Rental info not found"]}) + else + customer = Customer.find_by(id: rental.customer_id) + movie = Movie.find_by(id: rental.movie_id) + # update rental instance + # change status to checkout=false + rental.checkedout = false + + if rental.save + # decrement the checked_out_count for customers + + checked_out = customer.movies_checked_out_count + customer.update(movies_checked_out_count: checked_out -1) + + # increament the available_inventory of movies + inventory = movie.available_inventory + movie.update(available_inventory: inventory +1) + + render json: {rental_checkedout: rental.checkedout}, status: :ok + else + render_error(:bad_request, rental.errors.messages) + + end + end end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 96677be6b..846134664 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,10 +1,10 @@ require "test_helper" describe RentalsController do + before do + @params = {customer_id: customers(:goeun).id, movie_id: movies(:titanic).id} + end describe "checkout" do - before do - @params = {customer_id: customers(:goeun).id, movie_id: movies(:titanic).id} - end it "creates an instance of Rental with valid data" do customer = customers(:goeun) @@ -14,7 +14,7 @@ pre_movie_count = customer.movies_checked_out_count expect{ - post checkout_path(@params) + post checkout_path, params: @params }.must_change "Rental.count", +1 customer.reload @@ -32,7 +32,7 @@ @params[:customer_id] = nil expect{ - post checkout_path(@params) + post checkout_path, params: @params }.wont_change "Rental.count" body = check_response(expected_status: :bad_request, expected_type: Hash) @@ -43,7 +43,7 @@ bad_params = {customer_id: customers(:goeun).id, movie_id: movies(:moana).id} expect{ - post checkout_path(bad_params) + post checkout_path, params: bad_params }.wont_change "Rental.count" body = check_response(expected_status: :forbidden, expected_type: Hash) @@ -53,5 +53,29 @@ end describe "checkin" do + it 'updates rental for valid request' do + rental = rentals(:three) + customer = rental.customer + movie = rental.movie + + pre_inventory = movie.available_inventory + pre_movie_count = customer.movies_checked_out_count + + + post checkin_path, params: { + customer_id: rental.customer_id, movie_id: rental.movie_id + } + + + customer.reload + movie.reload + + expect(movie.available_inventory).must_equal pre_inventory +1 + + expect(customer.movies_checked_out_count).must_equal pre_movie_count -1 + + body = check_response(expected_type: Hash) + expect(body).must_include "rental_checkedout" + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index d104f5f78..21f01b0ef 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -17,3 +17,12 @@ semret: state: AL postal_code: 01010 phone: 111 - 592 - 0000 + +samantha: + name: samantha + registered_at: 2018-11-06 11:49:59 + address: 123 California Street + city: Seattle + state: WA + postal_code: 98123 + phone: 206 - 592 - 3456 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index bab7257af..49b74eddd 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -10,10 +10,10 @@ two: customer: goeun movie: notebook due_date: 2018-11-06 - checkedout: false + checkedout: true three: - customer: semret - movie: titanic - due_date: 2018-11-06 + customer: samantha + movie: moana + due_date: 2018-11-15 checkedout: true From 5e0e5d79b809c41efd301e828b34c9cb8a30a8cb Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 09:36:57 -0800 Subject: [PATCH 43/52] refactor rentals controller test --- app/controllers/rentals_controller.rb | 36 +++++++++------------------ app/models/rental.rb | 19 ++++++++++++++ 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 85b81149e..9371eb98c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,18 +2,14 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) - customer = Customer.find_by(id: rental_params[:customer_id]) - movie = Movie.find_by(id: rental_params[:movie_id]) + customer = find_customer + movie = find_movie if movie.available_inventory > 0 rental.due_date = Date.today + 7 if rental.save - checked_out = customer.movies_checked_out_count - customer.update(movies_checked_out_count: checked_out +1) - - inventory = movie.available_inventory - movie.update(available_inventory: inventory - 1) + rental.rent_movie(customer, movie) render json: {rental_id: rental.id}, status: :ok else render_error(:bad_request, rental.errors.messages) @@ -21,37 +17,23 @@ def checkout else render_error(:forbidden, "No movie in available inventory.") end - end def checkin - # rental = Rental.find_by(rental_params) - rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) if rental.nil? render_error(:not_found, {id: ["Rental info not found"]}) else - customer = Customer.find_by(id: rental.customer_id) - movie = Movie.find_by(id: rental.movie_id) - # update rental instance - # change status to checkout=false + customer = find_customer + movie = find_movie rental.checkedout = false if rental.save - # decrement the checked_out_count for customers - - checked_out = customer.movies_checked_out_count - customer.update(movies_checked_out_count: checked_out -1) - - # increament the available_inventory of movies - inventory = movie.available_inventory - movie.update(available_inventory: inventory +1) - + rental.return_movie(customer, movie) render json: {rental_checkedout: rental.checkedout}, status: :ok else render_error(:bad_request, rental.errors.messages) - end end end @@ -62,5 +44,11 @@ def rental_params params.permit(:customer_id, :movie_id) end + def find_customer + return Customer.find_by(id: rental_params[:customer_id]) + end + def find_movie + return Movie.find_by(id: rental_params[:movie_id]) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 41e46d01b..71efeb21c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,4 +4,23 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :movie_id, presence: true + + + def rent_movie(customer, movie) + checked_out = customer.movies_checked_out_count + customer.update(movies_checked_out_count: checked_out +1) + + inventory = movie.available_inventory + movie.update(available_inventory: inventory - 1) + end + + + def return_movie(customer, movie) + checked_out = customer.movies_checked_out_count + customer.update(movies_checked_out_count: checked_out -1) + + inventory = movie.available_inventory + movie.update(available_inventory: inventory +1) + end + end From a35080434fee7844c6b7d8e3c7e672ed58d58ac6 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 09:47:53 -0800 Subject: [PATCH 44/52] test for returning error for rentals that DNE --- app/controllers/rentals_controller.rb | 2 -- test/controllers/rentals_controller_test.rb | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9371eb98c..295b515c6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -32,8 +32,6 @@ def checkin if rental.save rental.return_movie(customer, movie) render json: {rental_checkedout: rental.checkedout}, status: :ok - else - render_error(:bad_request, rental.errors.messages) end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 846134664..2228dfc84 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,8 +4,8 @@ before do @params = {customer_id: customers(:goeun).id, movie_id: movies(:titanic).id} end - describe "checkout" do + describe "checkout" do it "creates an instance of Rental with valid data" do customer = customers(:goeun) movie = movies(:titanic) @@ -64,7 +64,7 @@ post checkin_path, params: { customer_id: rental.customer_id, movie_id: rental.movie_id - } + } customer.reload @@ -77,5 +77,17 @@ body = check_response(expected_type: Hash) expect(body).must_include "rental_checkedout" end + + + it "returns error for rentals that do not exist" do + @params[:customer_id] = nil + @params[:movie_id] = nil + + post checkin_path, params: @params + + body = check_response(expected_status: :not_found, expected_type: Hash) + expect(body).must_include "errors" + end + end end From 11c6434075e058649ee48c4d988b7618c769b7ad Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 10:01:40 -0800 Subject: [PATCH 45/52] refactor rent_movie and return_movie to model testing --- test/controllers/rentals_controller_test.rb | 22 --------------- test/models/rental_test.rb | 31 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2228dfc84..fb1d46a69 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -10,20 +10,10 @@ customer = customers(:goeun) movie = movies(:titanic) - pre_inventory = movie.available_inventory - pre_movie_count = customer.movies_checked_out_count - expect{ post checkout_path, params: @params }.must_change "Rental.count", +1 - customer.reload - movie.reload - - expect(movie.available_inventory).must_equal pre_inventory -1 - - expect(customer.movies_checked_out_count).must_equal pre_movie_count +1 - body = check_response(expected_type: Hash) expect(body).must_include "rental_id" end @@ -58,22 +48,10 @@ customer = rental.customer movie = rental.movie - pre_inventory = movie.available_inventory - pre_movie_count = customer.movies_checked_out_count - - post checkin_path, params: { customer_id: rental.customer_id, movie_id: rental.movie_id } - - customer.reload - movie.reload - - expect(movie.available_inventory).must_equal pre_inventory +1 - - expect(customer.movies_checked_out_count).must_equal pre_movie_count -1 - body = check_response(expected_type: Hash) expect(body).must_include "rental_checkedout" end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a40849e21..a45bf20da 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -35,6 +35,37 @@ movie = rental.movie movie.must_be_instance_of Movie end + end + + describe "rent_movie" do + it "+1 checked_out_count and -1 available_inventory" do + customer = rental.customer + movie = rental.movie + + pre_inventory = movie.available_inventory + pre_movie_count = customer.movies_checked_out_count + + rental.rent_movie(customer, movie) + + expect(movie.available_inventory).must_equal pre_inventory -1 + expect(customer.movies_checked_out_count).must_equal pre_movie_count +1 + end + end + + describe "return_movie" do + it "-1 checked_out_count and +1 available_inventory" do + customer = rental.customer + movie = rental.movie + + pre_inventory = movie.available_inventory + pre_movie_count = customer.movies_checked_out_count + rental.return_movie(customer, movie) + + expect(movie.available_inventory).must_equal pre_inventory +1 + expect(customer.movies_checked_out_count).must_equal pre_movie_count -1 + end end + + end From e71b812da4d00a2256ac6cefe4564b951c6c34e5 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 10:06:38 -0800 Subject: [PATCH 46/52] spacing --- test/models/rental_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a45bf20da..15af293f5 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -56,7 +56,7 @@ it "-1 checked_out_count and +1 available_inventory" do customer = rental.customer movie = rental.movie - + pre_inventory = movie.available_inventory pre_movie_count = customer.movies_checked_out_count From 119e095a8b96a43bcc958c9997b3fe8da3f9cb7e Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 11:39:50 -0800 Subject: [PATCH 47/52] add sorting by name functionality --- app/controllers/customers_controller.rb | 9 ++++++--- test/controllers/customers_controller_test.rb | 14 ++++++++++++-- test/fixtures/customers.yml | 11 ++++++++++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0187e8b39..e72cbfcf6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,14 +1,17 @@ class CustomersController < ApplicationController def index - customers = Customer.all - + # sorting case sensitive, names must be capitalized + if params[:sort] + customers = Customer.order(params['sort']) + end render json: jsonify(customers), status: :ok - end + private + def jsonify(customer_data) return customer_data.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 4f98ab00c..57be8e84f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,13 +4,11 @@ CUSTOMER_FIELDS = %w(id name registered_at postal_code phone movies_checked_out_count).sort - describe "index" do it "is a real working route" do get customers_path must_respond_with :success - body = check_response(expected_type: Array) expect(body.length).must_equal Customer.count @@ -18,6 +16,7 @@ expect(customer.keys.sort).must_equal CUSTOMER_FIELDS end end + it 'returns an empty array when there are no customers' do Customer.destroy_all @@ -26,6 +25,17 @@ body = check_response(expected_type: Array) expect(body).must_equal [] end + end + + describe "sorting query parameter" do + it 'should sort by name' do + customer = Customer.order('name').first + + get customers_path, params: {sort: 'name'} + + body = check_response(expected_type: Array) + expect(body[0]['name']).must_equal "Amanda" + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 21f01b0ef..b2b740ac3 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -19,7 +19,16 @@ semret: phone: 111 - 592 - 0000 samantha: - name: samantha + name: Samantha + registered_at: 2018-11-06 11:49:59 + address: 123 California Street + city: Seattle + state: WA + postal_code: 98123 + phone: 206 - 592 - 3456 + +amanda: + name: Amanda registered_at: 2018-11-06 11:49:59 address: 123 California Street city: Seattle From 1a1bd5bd3c6fcf872a80d5dc6345293eab8ff81c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 11:40:46 -0800 Subject: [PATCH 48/52] take out unnecessary line --- test/controllers/customers_controller_test.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 57be8e84f..ff71669d8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,9 +29,6 @@ describe "sorting query parameter" do it 'should sort by name' do - - customer = Customer.order('name').first - get customers_path, params: {sort: 'name'} body = check_response(expected_type: Array) From 9ddb61156ff05159991f8b9a063e360b0fc32094 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 11:54:59 -0800 Subject: [PATCH 49/52] add will_paginate, create paginate conditional in index customers --- Gemfile | 2 ++ Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 6 ++++++ test/controllers/customers_controller_test.rb | 8 +++++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a9f49bedc..407b29526 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.5.1' +gem "will_paginate" + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index dfbb1d75d..7e02bb0a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,6 +144,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.0.12) PLATFORMS ruby @@ -161,6 +162,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + will_paginate RUBY VERSION ruby 2.5.1p57 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e72cbfcf6..6027f52b1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -6,6 +6,12 @@ def index if params[:sort] customers = Customer.order(params['sort']) end + + if params[:n] && params[:p] + customers = customers.paginate(:page => params[:p], :per_page => params[:n]) + + # render json: posts, meta: pagination_meta(posts), include: ['user'] + end render json: jsonify(customers), status: :ok end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ff71669d8..8c96e2751 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,12 +27,18 @@ end end - describe "sorting query parameter" do + describe "query parameters" do it 'should sort by name' do get customers_path, params: {sort: 'name'} body = check_response(expected_type: Array) expect(body[0]['name']).must_equal "Amanda" end + + it "gives pagination and number of responses query" do + get customers_path, params: {n: 1, p: 2} + end end + + end From 7b9a69126fb2f0c0f77e4da131d842c6cd46750c Mon Sep 17 00:00:00 2001 From: Semret Nicodimos Date: Wed, 7 Nov 2018 13:31:32 -0800 Subject: [PATCH 50/52] added pagination gem --- Gemfile | 2 ++ Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 407b29526..e9e12fcf6 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,8 @@ ruby '2.5.1' gem "will_paginate" +gem 'api-pagination' + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 7e02bb0a3..023f7508a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,6 +43,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) ansi (1.5.0) + api-pagination (4.8.1) arel (9.0.0) bootsnap (1.3.2) msgpack (~> 1.0) @@ -150,6 +151,7 @@ PLATFORMS ruby DEPENDENCIES + api-pagination bootsnap (>= 1.1.0) byebug listen (>= 3.0.5, < 3.2) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6027f52b1..e63675cc0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -10,9 +10,10 @@ def index if params[:n] && params[:p] customers = customers.paginate(:page => params[:p], :per_page => params[:n]) + # render json: posts, meta: pagination_meta(posts), include: ['user'] end - render json: jsonify(customers), status: :ok + paginate json: jsonify(customers), status: :ok end From 503f2b25b03715ec820c35acd9bb4fbeb7d0d32b Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 13:59:44 -0800 Subject: [PATCH 51/52] add pagination options to controller --- app/controllers/customers_controller.rb | 14 ++++++-------- test/controllers/customers_controller_test.rb | 5 ++++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e63675cc0..63594e90d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,17 +3,15 @@ class CustomersController < ApplicationController def index customers = Customer.all # sorting case sensitive, names must be capitalized - if params[:sort] + if params[:n] && params[:p] && params[:sort] + customers = Customer.paginate(:page => params[:p], :per_page => params[:n]).order(params['sort']) + elsif params[:n] && params[:p] + customers = Customer.paginate(:page => params[:p], :per_page => params[:n]) + else params[:sort] customers = Customer.order(params['sort']) end - if params[:n] && params[:p] - customers = customers.paginate(:page => params[:p], :per_page => params[:n]) - - - # render json: posts, meta: pagination_meta(posts), include: ['user'] - end - paginate json: jsonify(customers), status: :ok + render json: jsonify(customers), status: :ok end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 8c96e2751..a4cc1b191 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -36,7 +36,10 @@ end it "gives pagination and number of responses query" do - get customers_path, params: {n: 1, p: 2} + get customers_path, params: {sort: 'name', n: 1, p: 3} + + body = check_response(expected_type: Array) + expect(body[0]['name']).must_equal "Samantha" end end From 5c440ca072fd8213734236fea27946affdcc8372 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 7 Nov 2018 14:02:34 -0800 Subject: [PATCH 52/52] take out spaces --- app/controllers/customers_controller.rb | 2 -- test/controllers/customers_controller_test.rb | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 63594e90d..724b3c6c1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -10,11 +10,9 @@ def index else params[:sort] customers = Customer.order(params['sort']) end - render json: jsonify(customers), status: :ok end - private def jsonify(customer_data) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index a4cc1b191..1f9aecd9c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -42,6 +42,4 @@ expect(body[0]['name']).must_equal "Samantha" end end - - end