From b1625f4087691f2ea9776b29124d0f61f8c1979b Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 11:01:33 -0800 Subject: [PATCH 01/37] Did 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 +++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 57 files changed, 934 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..a9f49bedc --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..6295b9809 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 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..3a0a12d4d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ ++2JwBK26N6PaseTxmtqWBmVJ5d6KbTPGRdqxmJVp6u9EkCOsPYq30fWt+PvVskFxuBPcelHhRgzgOQ/kCZTsXHud0Ku5nS6MSTk9Fvta84SMRBW4Lpp5WlBdcLwrN6GnplLcEOy6b5PYfrDvIN9uISkLyBQxa9l45vIQNSyplsTpRARSCBxwxDQ/FdwdqBqk781a/XsVJRrYWIFS23m5rghVZV383J8OAp4bB4bJIKh8flW6jxeOnB16KXZ6zX0ir5TZJjeF7JziwxkfZzlIH4FHthLbeV3SooTW43lwhYNrgVWMxtizHYOTCurgSfAby6dFy2btCQzPRamrbukOZiRjEtsFUXJZ9MetM8RfxWDtmJTMylUBX0uRSHIFmNIz/A5qfGyF6uyAAaxmeqJq3xYESRFabA9mT3F2--FiXSsw9pmzH2XTip--AmdxGhrlzQJbEpuCMPv1pg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 62701a7ab8d74fadcb1545ec340b6796e322c4a4 Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 11:28:46 -0800 Subject: [PATCH 02/37] Added routes for movies and customers --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..227ec2785 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 :movies, only: [:index] + resources :customers, only: [:index, :show, :create] + #resources :rentals, only: [] end From 792982ea037f21fd0f75f1dbc2254291ab4bf60a Mon Sep 17 00:00:00 2001 From: Trang Date: Mon, 5 Nov 2018 12:49:36 -0800 Subject: [PATCH 03/37] create Movie model and Movies controller --- app/controllers/movies_controller.rb | 10 ++++++++ app/models/movie.rb | 2 ++ config/routes.rb | 1 + db/migrate/20181105204336_create_movies.rb | 12 ++++++++++ db/schema.rb | 27 ++++++++++++++++++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++ test/models/movie_test.rb | 9 ++++++++ 8 files changed, 93 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105204336_create_movies.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +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/config/routes.rb b/config/routes.rb index 227ec2785..fa8d4ee13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :movies, only: [:index] resources :customers, only: [:index, :show, :create] diff --git a/db/migrate/20181105204336_create_movies.rb b/db/migrate/20181105204336_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105204336_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/schema.rb b/db/schema.rb new file mode 100644 index 000000000..c56ad6e71 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,27 @@ +# 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_204336) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + 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/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end 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/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 1bafbf42a7128a92f6f9296f875eb99b97c15d35 Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 12:52:41 -0800 Subject: [PATCH 04/37] Created Customer model & controller --- app/controllers/customers_controller.rb | 2 ++ app/models/customer.rb | 2 ++ config/routes.rb | 4 +-- db/migrate/20181105204403_create_customers.rb | 8 +++++ .../20181105204437_add_columns_to_model.rb | 11 +++++++ db/schema.rb | 30 +++++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +++++ test/fixtures/customers.yml | 11 +++++++ test/models/customer_test.rb | 9 ++++++ 9 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20181105204403_create_customers.rb create mode 100644 db/migrate/20181105204437_add_columns_to_model.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/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/config/routes.rb b/config/routes.rb index 227ec2785..7baebf975 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :movies, only: [:index] - resources :customers, only: [:index, :show, :create] + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] #resources :rentals, only: [] end diff --git a/db/migrate/20181105204403_create_customers.rb b/db/migrate/20181105204403_create_customers.rb new file mode 100644 index 000000000..21dbca0f6 --- /dev/null +++ b/db/migrate/20181105204403_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105204437_add_columns_to_model.rb b/db/migrate/20181105204437_add_columns_to_model.rb new file mode 100644 index 000000000..ad3236f10 --- /dev/null +++ b/db/migrate/20181105204437_add_columns_to_model.rb @@ -0,0 +1,11 @@ +class AddColumnsToModel < ActiveRecord::Migration[5.2] + def change + add_column(:customers, :name, :string) + add_column(:customers, :registered_at, :datetime) + add_column(:customers, :address, :string) + add_column(:customers, :city, :string) + add_column(:customers, :state, :string) + add_column(:customers, :postal_code, :string) + add_column(:customers, :phone, :string) + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..89875a2cf --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,30 @@ +# 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_204437) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + end + +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/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 From 3c388a4b99a99d5fa52c15b26bbe02adcf0ba4ff Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 13:03:08 -0800 Subject: [PATCH 05/37] Added validations for Customer model, presence:true --- app/models/customer.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d3f598bf0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,9 @@ class Customer < ApplicationRecord + validate :name, presence: true + validate :registered_at, presence: true + validate :address, presence: true + validate :city, presence: true + validate :state, presence: true + validate :postal_code, presence: true + validate :phone, presence: true end From 966f78862e7c4f4ac6a343a8b1ebc464bda51432 Mon Sep 17 00:00:00 2001 From: Trang Date: Mon, 5 Nov 2018 13:07:01 -0800 Subject: [PATCH 06/37] add Movie validations --- app/models/movie.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..350f2b13d 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, numericality: { only_integer: true, greater_than: -1 } end From 3f98d39d533133e594ce2060b2e693767cce1acb Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 13:10:10 -0800 Subject: [PATCH 07/37] Added Re3ntal model and added relationships --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 4 ++++ db/migrate/20181105210741_create_rentals.rb | 8 ++++++++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 6 files changed, 36 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181105210741_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index d3f598bf0..b3ec620d9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,6 @@ class Customer < ApplicationRecord validate :state, presence: true validate :postal_code, presence: true validate :phone, presence: true + + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 350f2b13d..db202d3ba 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,6 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than: -1 } + + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..f2d82423f --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :user +end diff --git a/db/migrate/20181105210741_create_rentals.rb b/db/migrate/20181105210741_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20181105210741_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/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 c7949a5862069d95331b7380d6e94ba9e50b4417 Mon Sep 17 00:00:00 2001 From: Trang Date: Mon, 5 Nov 2018 13:19:25 -0800 Subject: [PATCH 08/37] correct rental movie relationship add columns to rentals table --- app/models/rental.rb | 2 +- .../20181105211149_add_columns_rentals.rb | 9 +++++++++ db/schema.rb | 18 ++++++++++++++++-- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20181105211149_add_columns_rentals.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index f2d82423f..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord belongs_to :customer - belongs_to :user + belongs_to :movie end diff --git a/db/migrate/20181105211149_add_columns_rentals.rb b/db/migrate/20181105211149_add_columns_rentals.rb new file mode 100644 index 000000000..55ced3182 --- /dev/null +++ b/db/migrate/20181105211149_add_columns_rentals.rb @@ -0,0 +1,9 @@ +class AddColumnsRentals < ActiveRecord::Migration[5.2] + def change + add_reference(:rentals, :movie, foreign_key: true) + add_reference(:rentals, :customer, foreign_key: true) + add_column(:rentals, :check_out, :date) + add_column(:rentals, :due_date, :date) + add_column(:rentals, :status, :string) + end +end diff --git a/db/schema.rb b/db/schema.rb index 7eebd6ab8..ae8e7f7df 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,8 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 2018_11_05_204437) do +ActiveRecord::Schema.define(version: 2018_11_05_211149) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -26,6 +25,7 @@ t.string "state" t.string "postal_code" t.string "phone" + end create_table "movies", force: :cascade do |t| t.string "title" @@ -36,4 +36,18 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.date "check_out" + t.date "due_date" + t.string "status" + 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 e6ea62e41e44d29eb871172d20f249eabcd9f6e6 Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 13:49:55 -0800 Subject: [PATCH 09/37] Syntax error with "validates" fixed --- app/models/customer.rb | 14 +++++++------- test/fixtures/customers.yml | 22 +++++++++++++++++----- test/models/customer_test.rb | 14 +++++++++++--- test/test_helper.rb | 3 ++- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index b3ec620d9..65e5e3afd 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,11 +1,11 @@ class Customer < ApplicationRecord - validate :name, presence: true - validate :registered_at, presence: true - validate :address, presence: true - validate :city, presence: true - validate :state, presence: true - validate :postal_code, presence: true - validate :phone, presence: true + 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 has_many :rentals end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..b48e599c7 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,20 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +bob: + name: "Bob" + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: "Maple Lane" + city: "Seattle" + state: "WA" + postal_code: "98044" + phone: "4256777777" + +tim: + name: "Tim" + registered_at: Thu, 20 Apr 2017 08:54:14 -0700 + address: "Cherry Street" + city: "Astoria" + state: "NY" + postal_code: "887742" + phone: "2139993450" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..a9f983ca5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,17 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:bob) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + describe "it tests the validity" do + it "raises error is name not present" do + bob.name = nil + result = bob.valid? + result.must_equal false end + end + + describe "it tests relationships" do + + 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 3b0ebdde394e9158e965d1ca0b0a174d5e8ff1dd Mon Sep 17 00:00:00 2001 From: Trang Date: Mon, 5 Nov 2018 14:17:34 -0800 Subject: [PATCH 10/37] create tests for Movie model testing, create fixtures --- app/models/customer.rb | 14 ++++---- test/fixtures/movies.yml | 24 ++++++++----- test/fixtures/rentals.yml | 25 ++++++++++--- test/models/movie_test.rb | 74 +++++++++++++++++++++++++++++++++++++-- test/test_helper.rb | 3 +- 5 files changed, 115 insertions(+), 25 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index b3ec620d9..65e5e3afd 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,11 +1,11 @@ class Customer < ApplicationRecord - validate :name, presence: true - validate :registered_at, presence: true - validate :address, presence: true - validate :city, presence: true - validate :state, presence: true - validate :postal_code, presence: true - validate :phone, presence: true + 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 has_many :rentals end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..295264a60 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2018-11-05 +scream: + title: Scream + overview: Horror Movie + release_date: 2005-11-10 inventory: 1 -two: - title: MyString - overview: MyString - release_date: 2018-11-05 - inventory: 1 +titanic: + title: Titanic + overview: Sunken Ship Drama + release_date: 2001-11-05 + inventory: 3 + +sandlot: + title: Sandlot + overview: Summer, baseball, and friends + release_date: 1990-01-01 + inventory: 2 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..e6987217a 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,23 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +one: + movie: scream + customer: bob + check_out: 2018-11-01 + due_date: 2018-11-08 + status: "out" + +two: + movie: titanic + customer: bob + check_out: 2018-11-01 + due_date: 2018-11-08 + status: "in" + +three: + movie: scream + customer: tim + check_out: 2018-11-05 + due_date: 2018-11-12 + status: "out" diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..52796ad60 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,77 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:scream) } - it "must be valid" do - value(movie).must_be :valid? + describe 'validations' do + it 'must be valid' do + expect(movie).must_be :valid? + end + + it 'has required fields' do + fields = [:title, :overview, :release_date, :inventory] + + fields.each do |field| + expect(movie).must_respond_to field + end + end + + it 'must have a title' do + movie.title = nil + valid = movie.save + + expect(valid).must_equal false + expect(movie.errors.messages).must_include :title + end + + it 'must have an overview' do + movie.overview = nil + valid = movie.save + + expect(valid).must_equal false + expect(movie.errors.messages).must_include :overview + end + + it 'must have a release date' do + movie.release_date = nil + valid = movie.save + + expect(valid).must_equal false + expect(movie.errors.messages).must_include :release_date + end + + it 'must have an integer for inventory' do + movie.inventory = "two" + valid = movie.save + + expect(valid).must_equal false + expect(movie.errors.messages).must_include :inventory + end + + it 'must have an integer that is greater than 0' do + movie.inventory = -1 + valid = movie.save + + expect(valid).must_equal false + expect(movie.errors.messages).must_include :inventory + end + end + + describe 'relationships' do + it 'can have many rentals' do + num_rentals = movie.rentals.count + + expect(num_rentals).must_equal 2 + end + + it 'can have zero rentals' do + movie = movies(:sandlot) + num_rentals = movie.rentals.count + + expect(num_rentals).must_equal 0 + end + end + + describe 'custom methods' do 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 c58d7f8b180fd620d70a8ce23cdddcdba9566e93 Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 14:20:39 -0800 Subject: [PATCH 11/37] A few tests for Customer model --- test/models/customer_test.rb | 71 ++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a9f983ca5..d8c419aab 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,17 +1,80 @@ require "test_helper" describe Customer do - let(:bob) { Customer.new } describe "it tests the validity" do - it "raises error is name not present" do - bob.name = nil - result = bob.valid? + it "checks validity when all fields are present" do + customer = customers(:bob) + result = customer.valid? + result.must_equal true + end + + it "has many rentals" do + customer = customers(:bob) + rentals = customer.rentals.count + rentals.must_equal 2 + end + + it "raises error if name not present" do + customer = customers(:bob) + customer.name = nil + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :name + end + + it "raises error if registered date is not present" do + customer = customers(:bob) + customer.registered_at = nil + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :registered_at + end + + it "raises error if address is not present" do + customer = customers(:bob) + customer.address = nil + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :address + end + + it "raises error if city is not present" do + customer = customers(:bob) + customer.address = nil + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :address + end + + it "raises error if state is not present" do + customer = customers(:bob) + customer.state = nil + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :state + end + + it "raises error if postal_code is not present" do + customer = customers(:bob) + customer.postal_code = nil + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :postal_code + end + + it "raises error if phone is not present" do + customer = customers(:bob) + customer.phone = nil + result = customer.valid? result.must_equal false + customer.errors.messages.must_include :phone end + end describe "it tests relationships" do + end end From 2d6fff770911b8bdb6c5d202303df9b9c1c5ef12 Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 14:36:13 -0800 Subject: [PATCH 12/37] Added contoller index method for Customer --- app/controllers/customers_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..7e6cf8589 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + end end From 6766b279a96b940b8c0d4060cf289f5e5ae5511f Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 14:36:36 -0800 Subject: [PATCH 13/37] Made model tests dry --- test/models/customer_test.rb | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index d8c419aab..fc4492102 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,22 +1,15 @@ require "test_helper" describe Customer do + let(:customer) { customers(:bob) } describe "it tests the validity" do it "checks validity when all fields are present" do - customer = customers(:bob) result = customer.valid? result.must_equal true end - it "has many rentals" do - customer = customers(:bob) - rentals = customer.rentals.count - rentals.must_equal 2 - end - it "raises error if name not present" do - customer = customers(:bob) customer.name = nil result = customer.valid? result.must_equal false @@ -24,7 +17,6 @@ end it "raises error if registered date is not present" do - customer = customers(:bob) customer.registered_at = nil result = customer.valid? result.must_equal false @@ -32,7 +24,6 @@ end it "raises error if address is not present" do - customer = customers(:bob) customer.address = nil result = customer.valid? result.must_equal false @@ -40,7 +31,6 @@ end it "raises error if city is not present" do - customer = customers(:bob) customer.address = nil result = customer.valid? result.must_equal false @@ -48,7 +38,6 @@ end it "raises error if state is not present" do - customer = customers(:bob) customer.state = nil result = customer.valid? result.must_equal false @@ -56,7 +45,6 @@ end it "raises error if postal_code is not present" do - customer = customers(:bob) customer.postal_code = nil result = customer.valid? result.must_equal false @@ -64,7 +52,6 @@ end it "raises error if phone is not present" do - customer = customers(:bob) customer.phone = nil result = customer.valid? result.must_equal false @@ -74,7 +61,9 @@ end describe "it tests relationships" do - - + it "has many rentals" do + rentals = customer.rentals.count + rentals.must_equal 2 + end end end From e170cf4dd834f210d9a6dde2fa004e85a99ed866 Mon Sep 17 00:00:00 2001 From: Trang Date: Mon, 5 Nov 2018 14:38:51 -0800 Subject: [PATCH 14/37] create Movie index and show actions --- app/controllers/movies_controller.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..a752b3b73 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,8 +1,21 @@ class MoviesController < ApplicationController def index + movies = Movie.all + + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show + movie = Movie.find_by(id: params[:id]) + + if movie.nil? + render json: { + message: 'not found' + }, status: :not_found + else + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + end + end def create From 722962dc4301bf3e1563768dc3aaa2b3e8a3a827 Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 14:48:37 -0800 Subject: [PATCH 15/37] Updated parameters to be returned --- 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 7e6cf8589..1135e971b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + render json: customers.as_json(only: [:name, :registered_at, :postal_code, :phone]) end end From c2a1e860cba57bffda0c934e82fee3774bd3c890 Mon Sep 17 00:00:00 2001 From: Divya Date: Mon, 5 Nov 2018 14:50:20 -0800 Subject: [PATCH 16/37] Refactor --- 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 1135e971b..24a056cd2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:name, :registered_at, :postal_code, :phone]) + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end end From c7bd324227a6a9533704279d2e010d59ef74d263 Mon Sep 17 00:00:00 2001 From: Trang Date: Mon, 5 Nov 2018 15:10:09 -0800 Subject: [PATCH 17/37] complete Movie create action --- app/controllers/movies_controller.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a752b3b73..5d70a7358 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def show if movie.nil? render json: { - message: 'not found' + errors: "not found" }, status: :not_found else render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok @@ -19,5 +19,21 @@ def show end def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id]), status: :ok + else + render json: { + errors: movie.errors.messages + }, status: :bad_request + end + + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) end end From ce0b78bc500113a4a4ef1e6a5a8eca3b2c92ec24 Mon Sep 17 00:00:00 2001 From: Trang Date: Tue, 6 Nov 2018 11:09:59 -0800 Subject: [PATCH 18/37] complete Movie controller test for index and show --- test/controllers/movies_controller_test.rb | 66 ++++++++++++++++++---- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..a12460d64 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,63 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end - it "should get show" do - get movies_show_url - value(response).must_be :success? - end + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "returns an Array" do + get movies_path + body = JSON.parse(response.body) + + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end - it "should get create" do - get movies_create_url - value(response).must_be :success? + it "returns movies with exactly the required fields" do + fields = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + + body.each do |movie| + movie.keys.sort.must_equal fields + end + end end + describe "show" do + it "can get a movie" do + get movie_path(movies(:scream).id) + must_respond_with :success + end + + it "responds with 404 not_found for nonexisting movie" do + id = -1 + get movie_path(id) + + must_respond_with :not_found + end + + it "returns movie with the required fields" do + fields = %w(inventory overview release_date title) + + get movie_path(movies(:scream).id) + body = JSON.parse(response.body) + + expect(body.keys.sort).must_equal fields + end + end end From f46cd6b1f3a2f7fc07d921c44a6bb0cd7f63f3ad Mon Sep 17 00:00:00 2001 From: Divya Date: Tue, 6 Nov 2018 11:14:31 -0800 Subject: [PATCH 19/37] Tests for customer controller and create method in movies controller --- test/controllers/customers_controller_test.rb | 42 +++++++++++++-- test/controllers/movies_controller_test.rb | 52 ++++++++++++++----- 2 files changed, 79 insertions(+), 15 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..11cdedf3b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,43 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "tests the index method" do + it "returns an Array" do + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_kind_of Array + end + + it "returns all of the customers" do + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert + expect(body.length).must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id name phone postal_code registered_at) + + # Act + get customers_path + + # Convert the JSON response into a Hash + body = JSON.parse(response.body) + + # Assert that each + body.each do |customer| + expect(customer.keys.sort).must_equal keys + expect(customer.keys.length).must_equal keys.length + end + end +end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..8f2507944 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,47 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end - it "should get show" do - get movies_show_url - value(response).must_be :success? - end + describe "create" do + let(:movie_data) { + { + title: "The Conjuring", + overview: "Horror", + release_date: "2015-10-02", + inventory: "4" + } + } - it "should get create" do - get movies_create_url - value(response).must_be :success? - end + it "creates a new movie given valid data" do + expect { + post movies_path, params: { movie: movie_data } + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + it "returns an error for invalid movie data" do + # arrange + movie_data["title"] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + + end end From cf754e5c709a412276d22e46def513fcd64dce93 Mon Sep 17 00:00:00 2001 From: Divya Date: Tue, 6 Nov 2018 13:46:21 -0800 Subject: [PATCH 20/37] Made changes to make smoke tests pass, then to make our tests pass --- app/controllers/movies_controller.rb | 3 +- test/controllers/movies_controller_test.rb | 82 +++++++++++----------- 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5d70a7358..76b65e118 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -28,12 +28,11 @@ def create errors: movie.errors.messages }, status: :bad_request end - end private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b0646431f..7b3f7658a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,48 +1,6 @@ require "test_helper" describe MoviesController do - - describe "create" do - let(:movie_data) { - { - title: "The Conjuring", - overview: "Horror", - release_date: "2015-10-02", - inventory: "4" - } - } - - it "creates a new movie given valid data" do - expect { - post movies_path, params: { movie: movie_data } - }.must_change "Movie.count", 1 - - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "id" - - movie = Movie.find(body["id"].to_i) - - expect(movie.title).must_equal movie_data[:title] - must_respond_with :success - end - - it "returns an error for invalid movie data" do - # arrange - movie_data["title"] = nil - - expect { - post movies_path, params: { movie: movie_data } - }.wont_change "Movie.count" - - body = JSON.parse(response.body) - - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "title" - must_respond_with :bad_request - end - describe "index" do it "is a real working route" do get movies_path @@ -101,4 +59,44 @@ expect(body.keys.sort).must_equal fields end end + + describe "create" do + let(:movie_data) { + { + title: "The Conjuring", + overview: "Horror", + release_date: "2015-10-02", + inventory: "4" + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: movie_data + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid movie data" do + movie_data["title"] = nil + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end From d1827c185d29fa497d2ba5b2a32cf3b21eb05e38 Mon Sep 17 00:00:00 2001 From: Trang Date: Tue, 6 Nov 2018 13:46:48 -0800 Subject: [PATCH 21/37] pass smoke tests --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 85 +++++++++++----------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5d70a7358..9090bfeb2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -34,6 +34,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b0646431f..9c1d674a0 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,48 +1,6 @@ require "test_helper" describe MoviesController do - - describe "create" do - let(:movie_data) { - { - title: "The Conjuring", - overview: "Horror", - release_date: "2015-10-02", - inventory: "4" - } - } - - it "creates a new movie given valid data" do - expect { - post movies_path, params: { movie: movie_data } - }.must_change "Movie.count", 1 - - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "id" - - movie = Movie.find(body["id"].to_i) - - expect(movie.title).must_equal movie_data[:title] - must_respond_with :success - end - - it "returns an error for invalid movie data" do - # arrange - movie_data["title"] = nil - - expect { - post movies_path, params: { movie: movie_data } - }.wont_change "Movie.count" - - body = JSON.parse(response.body) - - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "title" - must_respond_with :bad_request - end - describe "index" do it "is a real working route" do get movies_path @@ -101,4 +59,47 @@ expect(body.keys.sort).must_equal fields end end + + describe "create" do + let(:movie_data) { + { + title: "The Conjuring", + overview: "Horror", + release_date: "2015-10-02", + inventory: "4" + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: movie_data + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid movie data" do + # arrange + movie_data["title"] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end + end From 52b022eeaf90886db79d6d39a0b84fb74dba9772 Mon Sep 17 00:00:00 2001 From: Trang Date: Tue, 6 Nov 2018 16:58:08 -0800 Subject: [PATCH 22/37] create rental checkout action --- app/controllers/rentals_controller.rb | 25 +++++++++++++++++++++ app/models/movie.rb | 15 +++++++++++++ config/routes.rb | 4 +++- test/controllers/rentals_controller_test.rb | 7 ++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..9a0ed0f15 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,25 @@ +class RentalsController < ApplicationController + def checkout + rental = Rental.new(rental_params) + rental.due_date = rental.check_out + 7 + rental.status = "out" + + if rental.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + end + end + + def checkin + end + + private + + def rental_params + params.permit(:movie_id, :customer_id, :check_out) + end + +end diff --git a/app/models/movie.rb b/app/models/movie.rb index db202d3ba..a3c17222e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,4 +5,19 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { only_integer: true, greater_than: -1 } has_many :rentals + + def available_inventory + num_out = 0 + num_in = 0 + + self.rentals.each do |rental| + if rental.status == "out" + num_out += 1 + elsif rental.status == "in" + num_in += 1 + end + end + return self.inventory - num_out + num_in + end + end diff --git a/config/routes.rb b/config/routes.rb index e5d2bf1e2..a0322a561 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,7 @@ # 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] - #resources :rentals, only: [] + + post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 7e7ed5c4a0f4602cc30826577118b339962a2861 Mon Sep 17 00:00:00 2001 From: Trang Date: Tue, 6 Nov 2018 17:00:30 -0800 Subject: [PATCH 23/37] begin checkin action --- app/controllers/rentals_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9a0ed0f15..80029a5f4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,6 +14,17 @@ def checkout end def checkin + rental = Rental.new(rental_params) + rental.due_date = nil + rental.status = "in" + + if rental.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + end end private From 90ddd41f3273eb2d47d33d806ad8c03b689b7640 Mon Sep 17 00:00:00 2001 From: Divya Date: Tue, 6 Nov 2018 21:06:39 -0800 Subject: [PATCH 24/37] Tests for Edamam wrapper method --- app/models/customer.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 65e5e3afd..de19a0dd9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,4 +8,18 @@ class Customer < ApplicationRecord validates :phone, presence: true has_many :rentals + + def movies_checked_out_count + total = 0 + num_out = 0 + num_in = 0 + self.rentals.each do |rental| + if rental.status == "out" + num_out += 1 + elsif rental.status == "in" + num_in += 1 + end + end + return (movies_count = num_out - num_in) + end end From d601e80683b2c2752c9981c62c3472fcc419b7fd Mon Sep 17 00:00:00 2001 From: Trang Date: Wed, 7 Nov 2018 09:43:05 -0800 Subject: [PATCH 25/37] add available_inventory to json --- app/controllers/movies_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 76b65e118..64b05306c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,7 +13,14 @@ def show errors: "not found" }, status: :not_found else - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + render json: { + title: movie.title, + overview: movie.overview, + release_date: movie.release_date, + inventory: movie.inventory, + available_inventory: movie.available_inventory + } + # render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok end end From d7514cf8f4fb30ceb6fd49c8e80f6fc74fdb127e Mon Sep 17 00:00:00 2001 From: Trang Date: Wed, 7 Nov 2018 10:55:15 -0800 Subject: [PATCH 26/37] create movie_avail method --- app/controllers/rentals_controller.rb | 15 +++++++++++---- app/models/rental.rb | 10 ++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 80029a5f4..b8680db3b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,14 +1,21 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) + rental.check_out = Date.today rental.due_date = rental.check_out + 7 rental.status = "out" - if rental.save - render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + if rental.movie_avail?(rental_params[:movie_id]) + if rental.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + end else render json: { - errors: rental.errors.messages + errors: "Movie not available" }, status: :bad_request end end @@ -30,7 +37,7 @@ def checkin private def rental_params - params.permit(:movie_id, :customer_id, :check_out) + params.permit(:movie_id, :customer_id) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..7e9e7741b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,14 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + def movie_avail?(movie_id) + movie = Movie.find_by(id: movie_id) + if movie.available_inventory > 0 + return true + else + return false + end + end + end From 48c436b7513561d911324b2d91c620753f177d4d Mon Sep 17 00:00:00 2001 From: Divya Date: Wed, 7 Nov 2018 11:16:20 -0800 Subject: [PATCH 27/37] Changed checkin to 'Patch' instead of post... Smoke tests passing --- app/controllers/customers_controller.rb | 15 ++++++++++++++- app/controllers/rentals_controller.rb | 5 ++--- app/models/customer.rb | 4 +--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 24a056cd2..579a38344 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,19 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + array = [] + customers.each do |customer| + hash = {} + hash = {id: customer.id, + name: customer.name, + registered_at: customer.registered_at, + postal_code: customer.postal_code, + phone: customer.phone, + movies_checked_out_count: customer.movies_checked_out_count + } + array << hash + #render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end + render json: array.as_json + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b8680db3b..878962db9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,10 +21,8 @@ def checkout end def checkin - rental = Rental.new(rental_params) - rental.due_date = nil + rental = Rental.find_by(movie_id: rental_params[:movie_id], customer_id: rental_params[:customer_id], status: "out") rental.status = "in" - if rental.save render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok else @@ -32,6 +30,7 @@ def checkin errors: rental.errors.messages }, status: :bad_request end + end private diff --git a/app/models/customer.rb b/app/models/customer.rb index de19a0dd9..a2019ef79 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -16,10 +16,8 @@ def movies_checked_out_count self.rentals.each do |rental| if rental.status == "out" num_out += 1 - elsif rental.status == "in" - num_in += 1 end end - return (movies_count = num_out - num_in) + return (movies_count = num_out) end end From e4d08bede98a71ae576dd7937d74638d87e662fd Mon Sep 17 00:00:00 2001 From: Trang Date: Wed, 7 Nov 2018 11:41:52 -0800 Subject: [PATCH 28/37] update available_inventory method and create custom method tests --- app/models/movie.rb | 5 +---- test/fixtures/rentals.yml | 2 +- test/models/movie_test.rb | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index a3c17222e..0d7e28fb0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,16 +8,13 @@ class Movie < ApplicationRecord def available_inventory num_out = 0 - num_in = 0 self.rentals.each do |rental| if rental.status == "out" num_out += 1 - elsif rental.status == "in" - num_in += 1 end end - return self.inventory - num_out + num_in + return self.inventory - num_out end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index e6987217a..c630a04ec 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -23,4 +23,4 @@ three: customer: tim check_out: 2018-11-05 due_date: 2018-11-12 - status: "out" + status: "in" diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 52796ad60..cfa83f58c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -72,6 +72,19 @@ end end - describe 'custom methods' do + describe 'available_inventory' do + it 'can calculate available_inventory for movie' do + movie = movies(:scream) + avail_inv = movie.available_inventory + + expect(avail_inv).must_equal 0 + end + + it 'can calculate available_inventory for movie that has not been rented' do + movie = movies(:sandlot) + avail_inv = movie.available_inventory + + expect(avail_inv).must_equal movie.inventory + end end end From 3c7ca0d153d00d4008d95cad11d1425bd466e032 Mon Sep 17 00:00:00 2001 From: Trang Date: Wed, 7 Nov 2018 12:50:47 -0800 Subject: [PATCH 29/37] updated routes check-out and check-in and complete movies model and controller tests --- app/controllers/movies_controller.rb | 4 ++-- config/routes.rb | 4 ++-- test/controllers/movies_controller_test.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 64b05306c..2afe86ec9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -19,8 +19,8 @@ def show release_date: movie.release_date, inventory: movie.inventory, available_inventory: movie.available_inventory - } - # render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + }, status: :ok + # render json: movie.as_json(only: [:title, :overview, :release_date, :inventory], method: :available_inventory), status: :ok end end diff --git a/config/routes.rb b/config/routes.rb index a0322a561..5aef0d9f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post '/rentals/checkout', to: 'rentals#checkout', as: 'checkout' - post '/rentals/checkin', to: 'rentals#checkin', as: 'checkin' + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 7f27488e4..51d23e536 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -51,7 +51,7 @@ end it "returns movie with the required fields" do - fields = %w(inventory overview release_date title) + fields = %w(available_inventory inventory overview release_date title) get movie_path(movies(:scream).id) body = JSON.parse(response.body) From 49df37df61d7206495d2c1b6b91612bdebef80ab Mon Sep 17 00:00:00 2001 From: Divya Date: Wed, 7 Nov 2018 12:51:34 -0800 Subject: [PATCH 30/37] Customer model and controller tests passing --- test/controllers/customers_controller_test.rb | 2 +- test/models/customer_test.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 11cdedf3b..ec0daa773 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -25,7 +25,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name phone postal_code registered_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) # Act get customers_path diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index fc4492102..4c2d8bd5c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,6 +3,14 @@ describe Customer do let(:customer) { customers(:bob) } + describe "it tests custom method" do + it "adds to count of movies checked out when status is out" do + rental = rentals(:one) + answer = customer.movies_checked_out_count + answer.must_equal 1 + end + end + describe "it tests the validity" do it "checks validity when all fields are present" do result = customer.valid? From 5c0265ee7edb470182956d3f2831115459b683c5 Mon Sep 17 00:00:00 2001 From: Trang Date: Wed, 7 Nov 2018 13:08:38 -0800 Subject: [PATCH 31/37] create Rentals tests on validations and relationships --- app/models/rental.rb | 4 +++ test/models/rental_test.rb | 56 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 7e9e7741b..9f16fd6ac 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,8 @@ class Rental < ApplicationRecord + validates :check_out, presence: true + validates :due_date, presence: true + validates :status, presence: true + belongs_to :customer belongs_to :movie diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..9a766df77 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,59 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:one) } - it "must be valid" do - value(rental).must_be :valid? + describe 'validations' do + it "must be valid" do + value(rental).must_be :valid? + end + + it 'has required fields' do + fields = [:movie_id, :customer_id, :check_out, :due_date, :status] + + fields.each do |field| + expect(rental).must_respond_to field + end + end + + it 'must have a check_out date' do + rental.check_out = nil + valid = rental.save + + expect(valid).must_equal false + expect(rental.errors.messages).must_include :check_out + end + + it 'must have a due date' do + rental.due_date = nil + valid = rental.save + + expect(valid).must_equal false + expect(rental.errors.messages).must_include :due_date + end + + it 'must have a status' do + rental.status = nil + valid = rental.save + + expect(valid).must_equal false + expect(rental.errors.messages).must_include :status + end + end + + describe 'relationships' do + it 'belongs to a movie' do + movie = rental.movie + + expect(movie).must_be_instance_of Movie + expect(movie.id).must_equal rental.movie_id + end + + it 'belongs to a customer' do + customer = rental.customer + + expect(customer).must_be_instance_of Customer + expect(customer.id).must_equal rental.customer_id + end end end From a9a8f7a9eb6d13849adc881253f895360459ab80 Mon Sep 17 00:00:00 2001 From: Divya Date: Wed, 7 Nov 2018 13:11:59 -0800 Subject: [PATCH 32/37] Tests for rentals model.. custom methods --- test/fixtures/movies.yml | 6 ++++++ test/fixtures/rentals.yml | 4 ++-- test/models/rental_test.rb | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 295264a60..2d8327811 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -17,3 +17,9 @@ sandlot: overview: Summer, baseball, and friends release_date: 1990-01-01 inventory: 2 + +beemovie: + title: Beemovie + overview: Cute bees and their journeys + release_date: 2005-10-03 + inventory: 0 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index c630a04ec..19864c5f3 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -21,6 +21,6 @@ two: three: movie: scream customer: tim - check_out: 2018-11-05 - due_date: 2018-11-12 + check_out: 2016-11-05 + due_date: 2016-11-12 status: "in" diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..8f878fe93 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,4 +6,26 @@ it "must be valid" do value(rental).must_be :valid? end + + describe "it tests the method that checks if movie is available" do + it "checks if no movie is available when all are checked out" do + movie = movies(:scream) + answer = rental.movie_avail?(movie.id) + + expect(answer).must_equal false + + end + + it "checks that movie is available when there are more in inventory than are checked out" do + movie = movies(:titanic) + answer = rental.movie_avail?(movie.id) + expect(answer).must_equal true + end + + it "checks that movie is not available when there are none in inventory" do + movie = movies(:beemovie) + answer = rental.movie_avail?(movie.id) + expect(answer).must_equal false + end + end end From 2228b59a7332cf48bb4de4161f4355684318d635 Mon Sep 17 00:00:00 2001 From: Divya Date: Wed, 7 Nov 2018 13:13:55 -0800 Subject: [PATCH 33/37] Small changes to nomenclature in model test --- 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 bb2e32185..248381dfe 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -57,7 +57,7 @@ end end - describe "it tests the method that checks if movie is available" do + describe "custom method " do it "checks if no movie is available when all are checked out" do movie = movies(:scream) answer = rental.movie_avail?(movie.id) From 50c6d4771466ebbe86c4a64bf4c87abbd702a882 Mon Sep 17 00:00:00 2001 From: Trang Date: Thu, 8 Nov 2018 20:35:52 -0800 Subject: [PATCH 34/37] add sorting parameter to movies index and pass tests --- app/controllers/movies_controller.rb | 4 ++ app/models/rental.rb | 6 ++- test/controllers/movies_controller_test.rb | 15 +++++++ test/controllers/rentals_controller_test.rb | 49 +++++++++++++++++++-- 4 files changed, 69 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2afe86ec9..8863aa155 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,6 +2,10 @@ class MoviesController < ApplicationController def index movies = Movie.all + if params[:sort] + movies = Movie.order(params[:sort]) + end + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end diff --git a/app/models/rental.rb b/app/models/rental.rb index 9f16fd6ac..266e09043 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -8,11 +8,13 @@ class Rental < ApplicationRecord def movie_avail?(movie_id) movie = Movie.find_by(id: movie_id) - if movie.available_inventory > 0 + + if movie.nil? + return false + elsif movie.available_inventory > 0 return true else return false end end - end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 51d23e536..5d34631ee 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -35,6 +35,21 @@ movie.keys.sort.must_equal fields end end + + it 'returns movies sorted by the field specified' do + + get movies_path(sort: :title) + body = JSON.parse(response.body) + + must_respond_with :success + expect(body.first["title"]).must_equal movies(:beemovie)["title"] + + get movies_path(sort: :release_date) + body = JSON.parse(response.body) + + must_respond_with :success + expect(body.first["title"]).must_equal movies(:sandlot)["title"] + end end describe "show" do diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..b05f0d22e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,50 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'checkout' do + + let(:rental_data) { + { + movie_id: movies(:titanic).id, + customer_id: customers(:tim).id + } + } + + it "creates a new rental given valid data" do + expect { + post checkout_path, params: rental_data + }.must_change "Rental.count", 1 + + rental = Rental.last + + must_respond_with :success + expect(rental.status).must_equal "out" + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "check_out" + expect(body).must_include "due_date" + expect(body).must_include "status" + end + + it 'returns bad_request for invalid customer' do + rental_data["customer_id"] = -1 + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + end + + it 'returns bad_request for invalid movie' do + rental_data["movie_id"] = -1 + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + must_respond_with :bad_request + end + end end From 60c653b3a5d9dd6f79a36c9efc63b0a4a3646405 Mon Sep 17 00:00:00 2001 From: Divya Date: Fri, 9 Nov 2018 13:28:50 -0800 Subject: [PATCH 35/37] Changes to checkin method to accomodate for invalid data --- app/controllers/rentals_controller.rb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 878962db9..32aa62cd7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -22,15 +22,21 @@ def checkout def checkin rental = Rental.find_by(movie_id: rental_params[:movie_id], customer_id: rental_params[:customer_id], status: "out") - rental.status = "in" - if rental.save - render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + if rental + rental.status = "in" + if rental.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + end else render json: { - errors: rental.errors.messages - }, status: :bad_request + errors: "Not able to find rental" + }, status: :not_found end - end private From bfdd37a375341e159ea6a0c235314d979d3074d9 Mon Sep 17 00:00:00 2001 From: Divya Date: Fri, 9 Nov 2018 13:29:01 -0800 Subject: [PATCH 36/37] Tests for checkin method --- test/controllers/rentals_controller_test.rb | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b05f0d22e..0dfcb00e9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -47,4 +47,38 @@ must_respond_with :bad_request end end + + describe 'checkin' do + + it "checks in a valid rental" do + movie = movies(:scream) + customer = customers(:bob) + expect { + post checkin_path, params: {customer_id: customer.id, movie_id: movie.id} + }.wont_change "Rental.count" + + must_respond_with :success + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "status" + end + + it "does not check in a movie if parameters are invalid" do + movie = movies(:scream) + expect { + post checkin_path, params: {customer_id: -1, movie_id: movie.id} + }.wont_change "Rental.count" + + must_respond_with :not_found + end + + it "does not check in if parameters are missing" do + movie = movies(:scream) + expect { + post checkin_path, params: {movie_id: movie.id} + }.wont_change "Rental.count" + + must_respond_with :not_found + end + end end From 9d08cc0da42fd99fb94e9d912dcc151b58102e70 Mon Sep 17 00:00:00 2001 From: Divya Date: Fri, 9 Nov 2018 13:29:49 -0800 Subject: [PATCH 37/37] Refactor and all tests passing, smoke tests passing --- test/controllers/rentals_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0dfcb00e9..68eda9295 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -63,7 +63,7 @@ expect(body).must_include "status" end - it "does not check in a movie if parameters are invalid" do + it "does not check in a movie if parameters are invalid" do movie = movies(:scream) expect { post checkin_path, params: {customer_id: -1, movie_id: movie.id} @@ -72,7 +72,7 @@ must_respond_with :not_found end - it "does not check in if parameters are missing" do + it "does not check in if parameters are missing" do movie = movies(:scream) expect { post checkin_path, params: {movie_id: movie.id}