From dd797ee5734143facc8b189e8acaedf0c5f00be1 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Mon, 7 May 2018 13:05:21 -0700 Subject: [PATCH 01/39] set-up original rails project --- .gitignore | 16 ++ Gemfile | 50 ++++++ Gemfile.lock | 154 ++++++++++++++++++ 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 | 35 ++++ bin/spring | 17 ++ bin/update | 29 ++++ config.ru | 5 + config/application.rb | 40 +++++ config/boot.rb | 3 + config/cable.yml | 10 ++ config/database.yml | 85 ++++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 ++++++ config/environments/production.rb | 83 ++++++++++ config/environments/test.rb | 42 +++++ .../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 | 56 +++++++ config/routes.rb | 3 + config/secrets.yml | 32 ++++ config/spring.rb | 6 + db/seeds.rb | 14 +- lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + 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 | 10 ++ tmp/.keep | 0 vendor/.keep | 0 54 files changed, 898 insertions(+), 7 deletions(-) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock 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/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/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt 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..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# 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 + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..78bff8d26 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# 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 Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# 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..e547d2449 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,154 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.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.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + 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.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.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.1) + 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.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.1 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..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +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..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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..2fe7718ea --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +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.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # 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..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production 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..abc82221c --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +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. + 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.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # 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 + + + # 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..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = 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 + + # 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..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +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.seconds.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 + 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..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# 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/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..8817c9517 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: d56fa67847a627506e3970d04cbefdf6a4b162e676a8bc41f81ddb39c1aef5984feb9096497595fae754c5dc6837d9adfed24235172bafd3b524aaf9b3ec11e7 + +test: + secret_key_base: b2e330e0b9a1e53c1280591abf05324e9d4cec387e25ea535af8d126870158a595864a3f58ae6a2326d7a6001c6f1c1a364c9a0e3f145cbf1e0beddca399ff8b + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /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/db/seeds.rb b/db/seeds.rb index 5322340ba..1beea2acc 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - Customer.create!(customer) -end - -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) -end +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) 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/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..92e39b2d7 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +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 54e4095671bbd364a507e68137b9816038e5a472 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 15:32:50 -0700 Subject: [PATCH 02/39] added customer and movie models --- app/controllers/application_controller.rb | 2 + app/models/customer.rb | 2 + app/models/movie.rb | 2 + config/routes.rb | 1 + db/migrate/20180507222835_create_movies.rb | 12 ++++++ db/migrate/20180507223208_create_customers.rb | 14 +++++++ db/schema.rb | 38 +++++++++++++++++++ test/fixtures/customers.yml | 17 +++++++++ test/fixtures/movies.yml | 13 +++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 11 files changed, 119 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20180507222835_create_movies.rb create mode 100644 db/migrate/20180507223208_create_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..69ea87a39 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,4 @@ class ApplicationController < ActionController::API + + end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..bb090b9c2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/zomg', to: 'pets#zomg', as: "zomg" end diff --git a/db/migrate/20180507222835_create_movies.rb b/db/migrate/20180507222835_create_movies.rb new file mode 100644 index 000000000..84782a1b7 --- /dev/null +++ b/db/migrate/20180507222835_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20180507223208_create_customers.rb b/db/migrate/20180507223208_create_customers.rb new file mode 100644 index 000000000..4b1a8e3c7 --- /dev/null +++ b/db/migrate/20180507223208_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.string :postal_code + t.string :address + t.string :city + t.string :state + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..ced3cd694 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,38 @@ +# 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: 20180507223208) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "postal_code" + t.string "address" + t.string "city" + t.string "state" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..8bea23622 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + postal_code: MyString + address: MyString + city: MyString + state: MyString + phone: MyString + +two: + name: MyString + postal_code: MyString + address: MyString + city: MyString + state: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /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: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From c70e150c52355a454164d31dabe1f2d0bc370eb3 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 15:43:04 -0700 Subject: [PATCH 03/39] added registered_at column to customers table --- db/migrate/20180507223901_add_registered_at_to_customer.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180507223901_add_registered_at_to_customer.rb diff --git a/db/migrate/20180507223901_add_registered_at_to_customer.rb b/db/migrate/20180507223901_add_registered_at_to_customer.rb new file mode 100644 index 000000000..67bdc9a68 --- /dev/null +++ b/db/migrate/20180507223901_add_registered_at_to_customer.rb @@ -0,0 +1,5 @@ +class AddRegisteredAtToCustomer < ActiveRecord::Migration[5.1] + def change + add_column :customers, :registered_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index ced3cd694..59cce2090 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180507223208) do +ActiveRecord::Schema.define(version: 20180507223901) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,6 +24,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "registered_at" end create_table "movies", force: :cascade do |t| From ee40590dcf78b343dd13d4d8a8165d27035d9a95 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Mon, 7 May 2018 16:12:43 -0700 Subject: [PATCH 04/39] added customers and movies controllers --- app/controllers/customers_controller.rb | 22 +++++++++++ app/controllers/movies_controller.rb | 16 ++++++++ config/routes.rb | 24 ++++++++++++ test/controllers/customers_controller_test.rb | 39 +++++++++++++++++++ test/controllers/movies_controller_test.rb | 29 ++++++++++++++ 5 files changed, 130 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..14ba60d95 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,22 @@ +class CustomersController < ApplicationController + def index + end + + def show + end + + def update + end + + def create + end + + def destroy + end + + def new + end + + def edit + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..05ac614a4 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,16 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def update + end + + def create + end + + def destroy + end +end diff --git a/config/routes.rb b/config/routes.rb index bb090b9c2..5cab2cea1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,28 @@ Rails.application.routes.draw do + get 'customers/index' + + get 'customers/show' + + get 'customers/update' + + get 'customers/create' + + get 'customers/destroy' + + get 'customers/new' + + get 'customers/edit' + + get 'movies/index' + + get 'movies/show' + + get 'movies/update' + + get 'movies/create' + + get 'movies/destroy' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'pets#zomg', as: "zomg" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..6d6f4e01c --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,39 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + + it "should get show" do + get customers_show_url + value(response).must_be :success? + end + + it "should get update" do + get customers_update_url + value(response).must_be :success? + end + + it "should get create" do + get customers_create_url + value(response).must_be :success? + end + + it "should get destroy" do + get customers_destroy_url + value(response).must_be :success? + end + + it "should get new" do + get customers_new_url + value(response).must_be :success? + end + + it "should get edit" do + get customers_edit_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..e4d759744 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,29 @@ +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 update" do + get movies_update_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + + it "should get destroy" do + get movies_destroy_url + value(response).must_be :success? + end + +end From 660b65093b58557cc14da9df28247b7382834f16 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 16:13:22 -0700 Subject: [PATCH 05/39] routes --- config/routes.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index bb090b9c2..b1f418f14 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + get 'pets/index' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get '/zomg', to: 'pets#zomg', as: "zomg" + end From 32129f60c2614cf0466b03460e03a5ce705b219c Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 16:39:48 -0700 Subject: [PATCH 06/39] setup seed data --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ config/routes.rb | 24 ++---------------------- db/seeds.rb | 11 +++++++++++ 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 14ba60d95..a811c8486 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,7 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render :json => customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok end def show diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 05ac614a4..3ebd20fd1 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,7 @@ class MoviesController < ApplicationController def index + movies = Movie.all + render :json => movies.as_json(only: [:id, :title, :release_date,]), status: :ok end def show diff --git a/config/routes.rb b/config/routes.rb index 85d9ae44a..1a0fe94bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,28 +1,8 @@ Rails.application.routes.draw do - get 'customers/index' + resources :customers, only: [:index] - get 'customers/show' - - get 'customers/update' - - get 'customers/create' - - get 'customers/destroy' - - get 'customers/new' - - get 'customers/edit' - - get 'movies/index' - - get 'movies/show' - - get 'movies/update' - - get 'movies/create' - - get 'movies/destroy' + resources :movies, only: [:index] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2acc..cf17894b9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,14 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +json_customers = JSON.parse(File.read('db/seeds/customers.json')) + +json_customers.each do |customer| + Customer.create!(customer) +end + +json_movies = JSON.parse(File.read('db/seeds/movies.json')) + +json_movies.each do |movie| + Movie.create!(movie) +end From 3266fb244b3b85e6629d5d850c860c116ac9b04c Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 10:26:21 -0700 Subject: [PATCH 07/39] index customerscontroller tests --- app/controllers/customers_controller.rb | 3 + test/controllers/customers_controller_test.rb | 84 ++++++++++++------- test/test_helper.rb | 7 ++ 3 files changed, 66 insertions(+), 28 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a811c8486..9057290fd 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,10 @@ class CustomersController < ApplicationController def index customers = Customer.all + # render json: { message: "What's up yall?" } + render :json => customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + end def show diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 6d6f4e01c..5c5592a06 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,39 +1,67 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? - end - it "should get show" do - get customers_show_url - value(response).must_be :success? - end + describe "index" do + it "is a real working route" do + get customers_path + must_respond_with :success + end - it "should get update" do - get customers_update_url - value(response).must_be :success? - end + it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end - it "should get create" do - get customers_create_url - value(response).must_be :success? - end + it "returns an Array" do + get customers_path + body = JSON.parse(response.body) + body.must_be_instance_of Array + end - it "should get destroy" do - get customers_destroy_url - value(response).must_be :success? - end - - it "should get new" do - get customers_new_url - value(response).must_be :success? - end + it "returns all of the customers" do + get customers_path + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end - it "should get edit" do - get customers_edit_url - value(response).must_be :success? + it "returns customers with exactly the fields required" do + keys = %w(name registered_at postal_code phone address city state) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys.sort + end + end end + # it "should get show" do + # get customers_show_url + # value(response).must_be :success? + # end + # + # it "should get update" do + # get customers_update_url + # value(response).must_be :success? + # end + # + # it "should get create" do + # get customers_create_url + # value(response).must_be :success? + # end + # + # it "should get destroy" do + # get customers_destroy_url + # value(response).must_be :success? + # end + # + # it "should get new" do + # get customers_new_url + # value(response).must_be :success? + # end + # + # it "should get edit" do + # get customers_edit_url + # value(response).must_be :success? + # end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 92e39b2d7..bb5ba95b1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,13 @@ ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' +require "minitest/rails" + +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From a6aa7d497520566875f89770563c37f99160579e Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 10:31:37 -0700 Subject: [PATCH 08/39] changes --- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 2 ++ app/models/movie.rb | 3 +++ test/models/customer_test.rb | 3 +++ test/test_helper.rb | 20 ++++++++++++++++---- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3ebd20fd1..2aa615966 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render :json => movies.as_json(only: [:id, :title, :release_date,]), status: :ok + render :json => movies.as_json(only: [:id, :title, :release_date, :overview, :inventory]), status: :ok end def show diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..ed3993c23 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + validates :name, presence: :true, format: { with: /\A[a-zA-Z]+\z/, + message: "Only allows letters" } end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..acb76a287 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,5 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :release_date, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0 } end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..ac7aeb97d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,4 +6,7 @@ it "must be valid" do value(customer).must_be :valid? end + + it "must not save if there is no name" do + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 92e39b2d7..c87c2c0bb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,10 +1,22 @@ -ENV['RAILS_ENV'] ||= 'test' -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" + +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 From 408ad300689b6d2459e866db7307294a16e31ebe Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 10:49:33 -0700 Subject: [PATCH 09/39] added tests for index moviecontroller --- test/controllers/movies_controller_test.rb | 67 ++++++++++++++++------ 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e4d759744..e87f37d24 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,29 +1,58 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_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 "should get show" do - get movies_show_url - value(response).must_be :success? - end + it "returns json" do + get movies_path + response.header['Content-Type'].must_include 'json' + end - it "should get update" do - get movies_update_url - value(response).must_be :success? - end + it "returns an Array" do + get movies_path + body = JSON.parse(response.body) + body.must_be_instance_of Array + end - it "should get create" do - get movies_create_url - value(response).must_be :success? - 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 destroy" do - get movies_destroy_url - value(response).must_be :success? + it "returns movies with exactly the fields required" do + keys = %w(id title release_date) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys.sort + end + end end + + # it "should get show" do + # get movies_show_url + # value(response).must_be :success? + # end + # + # it "should get update" do + # get movies_update_url + # value(response).must_be :success? + # end + # + # it "should get create" do + # get movies_create_url + # value(response).must_be :success? + # end + # + # it "should get destroy" do + # get movies_destroy_url + # value(response).must_be :success? + # end + end From 754b96124f1da1843463f5f01163d52862948988 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 11:04:09 -0700 Subject: [PATCH 10/39] updated model validations --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index ed3993c23..7cddab1a6 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,4 @@ class Customer < ApplicationRecord - validates :name, presence: :true, format: { with: /\A[a-zA-Z]+\z/, + validates :name, presence: :true, format: { with: /\A[a-zA-Z]+(?: [a-zA-Z]+)?\z/, message: "Only allows letters" } end diff --git a/app/models/movie.rb b/app/models/movie.rb index acb76a287..f05bbfdad 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord validates :title, presence: true validates :release_date, presence: true - validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0 } + validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } end From a677b530adec62db3a2d28b10c04df2c3d9d0a1c Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 12:53:26 -0700 Subject: [PATCH 11/39] basic model tests --- test/models/customer_test.rb | 7 ++++++- test/models/movie_test.rb | 14 +++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ac7aeb97d..6be9a2e83 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,12 +1,17 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { Customer.new(name: "Captain Planet", registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", address: "123 Green St", city: "Tree Town", state: "HI", postal_code: "12345", phone: "(919) 434-3203") } it "must be valid" do value(customer).must_be :valid? end it "must not save if there is no name" do + proc { Customer.new(address: "1234 Candy Cane Lane") }.must_change 'Customer.count', 0 + end + + it "must not save if name data is invalid" do + proc { Customer.new(name: "1234") }.must_change 'Customer.count', 0 end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..ace61dcb0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,21 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { Movie.new(title: "Dogtoth", overview: "Weird and good", release_date: "1979-01-18", inventory: 1)} it "must be valid" do value(movie).must_be :valid? end + + it "must not create without title" do + proc { Movie.new(release_date: "2015-12-2", inventory: 2) }.must_change 'Movie.count', 0 + end + + it "must not create with invalid title data" do + proc { Movie.new(title: "123", release_date: "2015-12-2", inventory: 2) }.must_change 'Movie.count', 0 + end + + it "must not create without release date" do + proc { Movie.new(title: "Party", inventory: 2) }.must_change 'Movie.count', 0 + end end From f00ef06fc381288e5fbd6284ddff029194255f9e Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 12:57:12 -0700 Subject: [PATCH 12/39] updated schema --- db/migrate/20180508195418_add_checked_inventory.rb | 6 ++++++ db/schema.rb | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180508195418_add_checked_inventory.rb diff --git a/db/migrate/20180508195418_add_checked_inventory.rb b/db/migrate/20180508195418_add_checked_inventory.rb new file mode 100644 index 000000000..ae5d68f2f --- /dev/null +++ b/db/migrate/20180508195418_add_checked_inventory.rb @@ -0,0 +1,6 @@ +class AddCheckedInventory < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 59cce2090..d839ff2b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180507223901) do +ActiveRecord::Schema.define(version: 20180508195418) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.datetime "registered_at" + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end end From 3c19c9eae7f243c1c225e188f9e34728101e126f Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 12:58:37 -0700 Subject: [PATCH 13/39] added routes for movie controller and create method show --- app/controllers/customers_controller.rb | 4 ++-- app/controllers/movies_controller.rb | 29 ++++++++++++++++++++++--- config/routes.rb | 2 +- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 9057290fd..23b921206 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,8 +2,8 @@ class CustomersController < ApplicationController def index customers = Customer.all # render json: { message: "What's up yall?" } - - render :json => customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + + render :json => customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2aa615966..60ac8eeba 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,14 +5,37 @@ def index end def show - end + movie = Movie.find_by(id: params[:id]) - def update + if movie + show_movie_hash = { + title: movie.title, + overview: movie.overview, + release_date: movie.release_date, + inventory: movie.inventory + } + render json: show_movie_hash.as_json, status: :ok + else + render json: { ok: false }, status: :not_found + end end + + + # def update + # end + def create end - def destroy + # def destroy + # end + + + private + + def movie_params + params.permit(:title, :overview, :release_date, :inventory) end + end diff --git a/config/routes.rb b/config/routes.rb index 1a0fe94bc..43b17d761 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ resources :customers, only: [:index] - resources :movies, only: [:index] + resources :movies, only: [:index, :show, :create] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html From cb67c55f08ca136ee884ede1bc5fa3e5cca00428 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 13:21:36 -0700 Subject: [PATCH 14/39] added available_inventory parameter --- app/controllers/movies_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 60ac8eeba..8c2ee1d22 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,7 +12,8 @@ def show title: movie.title, overview: movie.overview, release_date: movie.release_date, - inventory: movie.inventory + inventory: movie.inventory, + available_inventory: movie.available_inventory, } render json: show_movie_hash.as_json, status: :ok else From a7bbef51e6f96e76f2f47ff3fe5822d8d60f1b70 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 13:22:22 -0700 Subject: [PATCH 15/39] added movies#create --- app/controllers/movies_controller.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 60ac8eeba..b6b08f328 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -26,6 +26,13 @@ def show # end def create + movie = Movie.create(movie_params) + + if movie.valid? + render json: {id: movie.id}, status: :ok + else + render json: {ok: false, errors: movie.errors}, status: :bad_request + end end # def destroy From 66a98d5d9047d896d85825e95dcb914367b09867 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 13:26:10 -0700 Subject: [PATCH 16/39] updated seed file so movies available matches inventory --- db/seeds.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index cf17894b9..6381214d3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -14,5 +14,7 @@ json_movies = JSON.parse(File.read('db/seeds/movies.json')) json_movies.each do |movie| - Movie.create!(movie) + new = Movie.create!(movie) + new.available_inventory = new.inventory + new.save end From 9737b5396e6405b14e58f918e498098b7e43cf00 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 13:56:25 -0700 Subject: [PATCH 17/39] added tests for show moviecontrollers --- test/controllers/movies_controller_test.rb | 48 ++++++++++++---------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e87f37d24..d147e020f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -25,7 +25,7 @@ end it "returns movies with exactly the fields required" do - keys = %w(id title release_date) + keys = %w(id title release_date overview inventory ) get movies_path body = JSON.parse(response.body) body.each do |movie| @@ -34,25 +34,29 @@ end end + describe "show" do + # This bit is up to you! + it "can get a movie" do + get movie_path(movies(:two).id) + must_respond_with :success + end + + it "returns a 404 for movies that are not found" do + #Arrange + movie = movies(:two) + movie.destroy + get movie_path(movie.id) + #Assert + must_respond_with :not_found + end + end - # it "should get show" do - # get movies_show_url - # value(response).must_be :success? - # end - # - # it "should get update" do - # get movies_update_url - # value(response).must_be :success? - # end - # - # it "should get create" do - # get movies_create_url - # value(response).must_be :success? - # end - # - # it "should get destroy" do - # get movies_destroy_url - # value(response).must_be :success? - # end - -end + + + # it "should get create" do + # get movies_create_url + # value(response).must_be :success? + # end + + + end From 16977fca7061855ccce075b9a0b79c7a05118983 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 15:09:55 -0700 Subject: [PATCH 18/39] added movies controller#create tests --- app/controllers/movies_controller.rb | 4 +- test/controllers/movies_controller_test.rb | 60 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7230abd02..268fc3bf5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,6 @@ class MoviesController < ApplicationController + # protect_from_forgery with: :null_session + def index movies = Movie.all render :json => movies.as_json(only: [:id, :title, :release_date, :overview, :inventory]), status: :ok @@ -43,7 +45,7 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :inventory) + params.require(:movie).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 e87f37d24..0406759dd 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -34,7 +34,67 @@ end end + describe "create" do + let(:movie_data) { + { + title: "Code Girl", + release_date: "2000-1-10", + overview: "Stellar", + inventory: 11, + available_inventory: 11 + } + } + it "Creates a new movie" do + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 1 + + must_respond_with :success + end + + it "Won't create a movie without title" do + movie_data.delete(:title) + + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "title" + end + + it "Won't create a movie without release date" do + movie_data.delete(:release_date) + + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "release_date" + end + + it "Won't create a movie without inventory" do + movie_data.delete(:inventory) + + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "inventory" + end + end # it "should get show" do # get movies_show_url # value(response).must_be :success? From cf11f32c23cc1fdab1fff996b48369a6282659d6 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 15:21:37 -0700 Subject: [PATCH 19/39] tests for show moviescontroller done --- app/controllers/movies_controller.rb | 14 ++------- test/controllers/customers_controller_test.rb | 29 ------------------- test/controllers/movies_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7230abd02..486f54a6e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,7 +6,6 @@ def index def show movie = Movie.find_by(id: params[:id]) - if movie show_movie_hash = { title: movie.title, @@ -17,15 +16,10 @@ def show } render json: show_movie_hash.as_json, status: :ok else - render json: { ok: false }, status: :not_found + render json: { ok: false, errors: {title: ["Movie not found"]} }, status: :not_found end end - - - # def update - # end - def create movie = Movie.create(movie_params) @@ -35,11 +29,7 @@ def create render json: {ok: false, errors: movie.errors}, status: :bad_request end end - - # def destroy - # end - - + private def movie_params diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5c5592a06..65f74efe6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -35,33 +35,4 @@ end end - # it "should get show" do - # get customers_show_url - # value(response).must_be :success? - # end - # - # it "should get update" do - # get customers_update_url - # value(response).must_be :success? - # end - # - # it "should get create" do - # get customers_create_url - # value(response).must_be :success? - # end - # - # it "should get destroy" do - # get customers_destroy_url - # value(response).must_be :success? - # end - # - # it "should get new" do - # get customers_new_url - # value(response).must_be :success? - # end - # - # it "should get edit" do - # get customers_edit_url - # value(response).must_be :success? - # end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d147e020f..13b3d8b7d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -37,7 +37,7 @@ describe "show" do # This bit is up to you! it "can get a movie" do - get movie_path(movies(:two).id) + get movie_path must_respond_with :success end From 62a4c94713faffa3320529e45ef2e5953e57eda1 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 16:00:18 -0700 Subject: [PATCH 20/39] updated movie_params so params are no longer nested --- app/controllers/movies_controller.rb | 4 ++-- test/controllers/movies_controller_test.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 268fc3bf5..6e65b5e22 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,7 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render :json => movies.as_json(only: [:id, :title, :release_date, :overview, :inventory]), status: :ok + render :json => movies.as_json(only: [:id, :title, :release_date, :overview, :inventory, :availa]), status: :ok end def show @@ -45,7 +45,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 90d7458fa..e21b307b9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -47,7 +47,7 @@ it "Creates a new movie" do proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count', 1 must_respond_with :success @@ -57,7 +57,7 @@ movie_data.delete(:title) proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request @@ -71,7 +71,7 @@ movie_data.delete(:release_date) proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request @@ -85,7 +85,7 @@ movie_data.delete(:inventory) proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request From a8372eca985245fc19e6343ff2e70f6d98cf210e Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 16:45:09 -0700 Subject: [PATCH 21/39] added movies_checked_out_count to customerscontroller --- app/controllers/customers_controller.rb | 2 +- db/seeds.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 23b921206..fd9cb8916 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ def index customers = Customer.all # render json: { message: "What's up yall?" } - render :json => customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + render :json => customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end diff --git a/db/seeds.rb b/db/seeds.rb index 6381214d3..42785ced5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,7 +8,9 @@ json_customers = JSON.parse(File.read('db/seeds/customers.json')) json_customers.each do |customer| - Customer.create!(customer) + new = Customer.create!(customer) + new.movies_checked_out_count = 0 + new.save end json_movies = JSON.parse(File.read('db/seeds/movies.json')) From 98bd0441ae3262b1739de3b3dbd8fc41f4804670 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Tue, 8 May 2018 17:04:45 -0700 Subject: [PATCH 22/39] created rentals model --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 7 ++++++ db/migrate/20180508235529_create_rentals.rb | 12 +++++++++ db/schema.rb | 11 +++++++- test/fixtures/customers.yml | 28 ++++++++++----------- test/fixtures/rentals.yml | 13 ++++++++++ test/models/rental_test.rb | 9 +++++++ 8 files changed, 69 insertions(+), 15 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180508235529_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 7cddab1a6..52df767a1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals + validates :name, presence: :true, format: { with: /\A[a-zA-Z]+(?: [a-zA-Z]+)?\z/, message: "Only allows letters" } end diff --git a/app/models/movie.rb b/app/models/movie.rb index f05bbfdad..43688a366 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + validates :title, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..5d16104dd --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,7 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :customer_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + validates :movie_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } +end diff --git a/db/migrate/20180508235529_create_rentals.rb b/db/migrate/20180508235529_create_rentals.rb new file mode 100644 index 000000000..6fa35710a --- /dev/null +++ b/db/migrate/20180508235529_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.integer :movie_id + t.integer :customer_id + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index d839ff2b6..5fc140658 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180508195418) do +ActiveRecord::Schema.define(version: 20180508235529) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,4 +38,13 @@ t.integer "available_inventory" end + create_table "rentals", force: :cascade do |t| + t.integer "movie_id" + t.integer "customer_id" + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 8bea23622..19cf01bd8 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,17 +1,17 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - postal_code: MyString - address: MyString - city: MyString - state: MyString - phone: MyString +ada: + name: Lovelace + postal_code: 12345 + address: 123 Olive + city: Seattle + state: WA + phone: (232) 123-1232 -two: - name: MyString - postal_code: MyString - address: MyString - city: MyString - state: MyString - phone: MyString +bob: + name: Bobby + postal_code: 33345 + address: 112123 Oliveinger + city: Columbus + state: OH + phone: (222) 222-2222 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..acb45ce34 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + movie_id: 1 + customer_id: 1 + checkout_date: 2018-05-08 + due_date: 2018-05-08 + +two: + movie_id: 1 + customer_id: 1 + checkout_date: 2018-05-08 + due_date: 2018-05-08 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 a238727a18e3e01fb84ec745c0a84a4e4e70ddc0 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 20:35:44 -0700 Subject: [PATCH 23/39] generated rental controller and methods --- app/controllers/movies_controller.rb | 4 ++-- app/controllers/rentals_controller.rb | 7 +++++++ app/models/movie.rb | 2 +- config/routes.rb | 4 ++++ test/controllers/rentals_controller_test.rb | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1681cf6ba..7e1e51567 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def show } render json: show_movie_hash.as_json, status: :ok else - render json: { ok: false, errors: {title: ["Movie not found"]} }, status: :not_found + render json: { ok: false, errors: {id: ["Movie not found"]} }, status: :not_found end end @@ -31,7 +31,7 @@ def create render json: {ok: false, errors: movie.errors}, status: :bad_request end end - + private def movie_params diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..b0dbcdebe --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,7 @@ +class RentalsController < ApplicationController + def check_in + end + + def check_out + end +end diff --git a/app/models/movie.rb b/app/models/movie.rb index 43688a366..a4259f94f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord has_many :rentals - + validates :title, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } diff --git a/config/routes.rb b/config/routes.rb index 43b17d761..fbcd6507f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Rails.application.routes.draw do + get 'rentals/check_in' + + get 'rentals/check_out' + resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f6fcc6bfb --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe RentalsController do + it "should get check_in" do + get rentals_check_in_url + value(response).must_be :success? + end + + it "should get check_out" do + get rentals_check_out_url + value(response).must_be :success? + end + +end From 6ded50d35aac3e889a4e026c51d36ddf3005a73c Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Tue, 8 May 2018 20:39:29 -0700 Subject: [PATCH 24/39] added routes to rental controller --- config/routes.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index fbcd6507f..30b36c4c6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,13 +1,12 @@ Rails.application.routes.draw do - get 'rentals/check_in' - - get 'rentals/check_out' - resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + post 'rentals/check_out', to: 'rentals#check_out', as: 'check_out' + + post 'rentals/check_in', to: 'rentals#check_in', as: 'check_in' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html From d037aa26312f470733247bd6ae3d4e7ad4f7e0ac Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Wed, 9 May 2018 10:25:00 -0700 Subject: [PATCH 25/39] added check_out method to rentals controller --- app/controllers/rentals_controller.rb | 28 ++++++++ app/models/movie.rb | 5 ++ ...62311_add_checked_out_status_to_rentals.rb | 5 ++ db/schema.rb | 3 +- test/controllers/rentals_controller_test.rb | 69 +++++++++++++++++++ 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180509162311_add_checked_out_status_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b0dbcdebe..c9d9faf5c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,35 @@ +require 'date' + class RentalsController < ApplicationController + + RENTAL_PERIOD = 7 + def check_in end def check_out + rental = Rental.create(rental_params) + rental.checkout_date = Date.today + rental.due_date = rental.checkout_date + RENTAL_PERIOD + rental.save + + movie = Movie.find_by(id: rental.movie_id) + + if movie + movie.update_available + end + + if rental.valid? + render json: {due_date: rental.due_date}, status: :ok + else + render json: {ok: false, errors: rental.errors}, status: :bad_request + end + + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index a4259f94f..248328f50 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,4 +4,9 @@ class Movie < ApplicationRecord validates :title, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + + def update_available + self.available_inventory -= 1 + self.save + end end diff --git a/db/migrate/20180509162311_add_checked_out_status_to_rentals.rb b/db/migrate/20180509162311_add_checked_out_status_to_rentals.rb new file mode 100644 index 000000000..453d360a3 --- /dev/null +++ b/db/migrate/20180509162311_add_checked_out_status_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCheckedOutStatusToRentals < ActiveRecord::Migration[5.1] + def change + add_column :rentals, :checked_out_status, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 5fc140658..552860d62 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180508235529) do +ActiveRecord::Schema.define(version: 20180509162311) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "checked_out_status" end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f6fcc6bfb..68cb35a65 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -11,4 +11,73 @@ value(response).must_be :success? end + describe "check out" do + + let(:rental_data) { + { customer_id: 1, + movie_id: 1, + checkout_date: Date.today, + due_date: Date.today + 7 + } + } + + it "doesn't create rental without customer_id" do + rental_data.delete(:customer_id) + + proc { + post check_out_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "customer_id" + end + + it "doesn't create rental without movie_id" do + rental_data.delete(:movie_id) + + proc { + post check_out_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "movie_id" + end + + it "doesn't create rental if available inventory is zero" do + movie = Movie.find_by(id: rental_data[:movie_id]) + movie.available_inventory = 0 + movie.save + + proc { + post check_out_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "None available" + end + + it "doesn't create rental if movie doesn't exist" do + movie = Movie.find_by(id: "abc") + rental_data[:movie_id] = movie.id + + proc { + post check_out_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "None available" + end + end end From 2a65a92f8c2e11e846d2ffd33297d0c432e433b8 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Wed, 9 May 2018 11:09:14 -0700 Subject: [PATCH 26/39] added checkin method for rental --- app/controllers/rentals_controller.rb | 17 +++++++++++++++-- app/models/movie.rb | 6 +++++- app/models/rental.rb | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c9d9faf5c..b99bf6bf8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,8 +5,21 @@ class RentalsController < ApplicationController RENTAL_PERIOD = 7 def check_in + rental = Rental.find_by(movie_id:rental_params["movie_id"], customer_id: rental_params["customer_id"]) + movie = Movie.find_by(id: rental.movie_id) + if movie + movie.update_checkin + end + + if rental.delete + render json: { id: movie.id }, status: :ok + else + render json: {ok: false, errors: rental.errors}, status: :bad_request + end end + + def check_out rental = Rental.create(rental_params) rental.checkout_date = Date.today @@ -14,9 +27,9 @@ def check_out rental.save movie = Movie.find_by(id: rental.movie_id) - + if movie - movie.update_available + movie.update_checkout end if rental.valid? diff --git a/app/models/movie.rb b/app/models/movie.rb index 248328f50..2758fcf41 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,8 +5,12 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - def update_available + def update_checkout self.available_inventory -= 1 self.save end + + def update_checkin + self.available_inventory +=1 + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 5d16104dd..484a3f371 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,7 +1,9 @@ +require 'date' class Rental < ApplicationRecord belongs_to :customer belongs_to :movie validates :customer_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :movie_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + end From 05b59b6993f03ea722e1e7737a0b9d3c0fc42d32 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Wed, 9 May 2018 11:14:27 -0700 Subject: [PATCH 27/39] changed routes to match postman --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 30b36c4c6..7e580b1f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,9 +4,9 @@ resources :movies, only: [:index, :show, :create] - post 'rentals/check_out', to: 'rentals#check_out', as: 'check_out' + post 'rentals/check-out', to: 'rentals#check_out', as: 'check_out' - post 'rentals/check_in', to: 'rentals#check_in', as: 'check_in' + post 'rentals/check-in', to: 'rentals#check_in', as: 'check_in' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html From 4fad254ccfcb934b2d109fab5ef34ed9a691b14f Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Wed, 9 May 2018 13:51:50 -0700 Subject: [PATCH 28/39] fixed method for checkin --- app/models/movie.rb | 3 ++- config/routes.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 2758fcf41..2c396c69b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -11,6 +11,7 @@ def update_checkout end def update_checkin - self.available_inventory +=1 + self.available_inventory += 1 + self.save end end diff --git a/config/routes.rb b/config/routes.rb index 7e580b1f7..06628ce35 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,9 +4,9 @@ resources :movies, only: [:index, :show, :create] - post 'rentals/check-out', to: 'rentals#check_out', as: 'check_out' + post 'rentals/check-out', to: 'rentals#check_out', as: 'check-out' - post 'rentals/check-in', to: 'rentals#check_in', as: 'check_in' + post 'rentals/check-in', to: 'rentals#check_in', as: 'check-in' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html From a06c188d3d6d03c8ff8871b49cf9750d8db50f72 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Wed, 9 May 2018 15:11:23 -0700 Subject: [PATCH 29/39] updated rentals controller tests and rentals model validations --- app/controllers/rentals_controller.rb | 24 +++++++++++++++------ app/models/movie.rb | 2 ++ app/models/rental.rb | 3 +-- test/controllers/rentals_controller_test.rb | 23 ++++++++++++-------- test/fixtures/movies.yml | 20 +++++++++-------- 5 files changed, 45 insertions(+), 27 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b99bf6bf8..38e432e7d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,17 +21,27 @@ def check_in def check_out - rental = Rental.create(rental_params) - rental.checkout_date = Date.today - rental.due_date = rental.checkout_date + RENTAL_PERIOD - rental.save - - movie = Movie.find_by(id: rental.movie_id) + movie = Movie.find_by(id: rental_params[:movie_id]) + rental = Rental.new(rental_params) if movie - movie.update_checkout + if movie.available_inventory > 0 + movie.update_checkout + + rental.checkout_date = Date.today + rental.due_date = rental.checkout_date + RENTAL_PERIOD + rental.save + else + render json: { + errors: ["No copies are currently available"] + }, status: :bad_request + return + end + end + + if rental.valid? render json: {due_date: rental.due_date}, status: :ok else diff --git a/app/models/movie.rb b/app/models/movie.rb index 2c396c69b..46b49ed6e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,6 +4,7 @@ class Movie < ApplicationRecord validates :title, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } def update_checkout self.available_inventory -= 1 @@ -14,4 +15,5 @@ def update_checkin self.available_inventory += 1 self.save end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 484a3f371..de38bdb9b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,9 +1,8 @@ -require 'date' class Rental < ApplicationRecord belongs_to :customer belongs_to :movie validates :customer_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :movie_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - + validates :due_date, presence: true end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 68cb35a65..14636da17 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,13 +1,13 @@ require "test_helper" describe RentalsController do - it "should get check_in" do - get rentals_check_in_url + it "should get check-in" do + post check_in_path value(response).must_be :success? end - it "should get check_out" do - get rentals_check_out_url + it "should get check-out" do + get check-out_path value(response).must_be :success? end @@ -50,19 +50,24 @@ end it "doesn't create rental if available inventory is zero" do - movie = Movie.find_by(id: rental_data[:movie_id]) - movie.available_inventory = 0 - movie.save + movie = movies(:rocket) + customer = customers(:ada) + + not_available_data = { customer_id: customer.id, + movie_id: movie.id, + checkout_date: Date.today, + due_date: Date.today + 7 + } proc { - post check_out_path, params: rental_data + post check_out_path, params: not_available_data }.must_change 'Rental.count', 0 must_respond_with :bad_request body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "errors" - body["errors"].must_include "None available" + body["errors"].must_include "No copies are currently available" end it "doesn't create rental if movie doesn't exist" do diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..6b2fc41df 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: MyString +bride: + title: "Princess Bride" + overview: "I don't know" + release_date: "2013-02-20" inventory: 1 + available_inventory: 1 -two: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 +rocket: + title: "Space Girl" + overview: "stellar" + release_date: "1999-12-31" + inventory: 0 + available_inventory: 0 From 3f6392077d20f0710f091fbe46995ccfbb5cd360 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Wed, 9 May 2018 15:25:26 -0700 Subject: [PATCH 30/39] updated checkout method --- app/controllers/rentals_controller.rb | 2 +- app/models/movie.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 38e432e7d..2bbc50646 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,7 +34,7 @@ def check_out else render json: { errors: ["No copies are currently available"] - }, status: :bad_request + }, status: :ok return end diff --git a/app/models/movie.rb b/app/models/movie.rb index 46b49ed6e..d6c80d5ff 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,6 +7,7 @@ class Movie < ApplicationRecord validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } def update_checkout + self.available_inventory -= 1 self.save end From 043c7d7de1aa3ad9da351a74df31388e5d126964 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Wed, 9 May 2018 17:24:01 -0700 Subject: [PATCH 31/39] updated rentals controller tests --- test/controllers/rentals_controller_test.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 14636da17..f781a2dd6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,15 +1,6 @@ require "test_helper" describe RentalsController do - it "should get check-in" do - post check_in_path - value(response).must_be :success? - end - - it "should get check-out" do - get check-out_path - value(response).must_be :success? - end describe "check out" do @@ -63,7 +54,6 @@ post check_out_path, params: not_available_data }.must_change 'Rental.count', 0 - must_respond_with :bad_request body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "errors" @@ -71,8 +61,7 @@ end it "doesn't create rental if movie doesn't exist" do - movie = Movie.find_by(id: "abc") - rental_data[:movie_id] = movie.id + rental_data[:movie_id] = "abc" proc { post check_out_path, params: rental_data @@ -82,7 +71,7 @@ body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "errors" - body["errors"].must_include "None available" + body["errors"]["movie"].must_equal ["must exist"] end end end From 23ebe97542d3cf563761323c8bfa34ce11aeffca Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Thu, 10 May 2018 22:40:29 -0700 Subject: [PATCH 32/39] updated rental methods --- app/controllers/rentals_controller.rb | 17 ++++++++++++++++- app/models/customer.rb | 10 +++++++++- db/seeds.rb | 2 +- test/controllers/rentals_controller_test.rb | 2 ++ test/models/customer_test.rb | 20 +++++++++++++++++++- 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2bbc50646..dea5d2502 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,8 +7,12 @@ class RentalsController < ApplicationController def check_in rental = Rental.find_by(movie_id:rental_params["movie_id"], customer_id: rental_params["customer_id"]) movie = Movie.find_by(id: rental.movie_id) + customer = Customer.find_by(id: rental_params[:custmer_id]) if movie movie.update_checkin + if customer + customer.update_count("out") + end end if rental.delete @@ -31,6 +35,18 @@ def check_out rental.checkout_date = Date.today rental.due_date = rental.checkout_date + RENTAL_PERIOD rental.save + + customer = Customer.find_by(id: rental_params[:custmer_id]) + + if customer + customer.update_count("out") + else + render json: { + errors: ["Customer not found"] + }, status: :bad_request + return + end + else render json: { errors: ["No copies are currently available"] @@ -41,7 +57,6 @@ def check_out end - if rental.valid? render json: {due_date: rental.due_date}, status: :ok else diff --git a/app/models/customer.rb b/app/models/customer.rb index 52df767a1..c6681dfeb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,14 @@ class Customer < ApplicationRecord has_many :rentals - + validates :name, presence: :true, format: { with: /\A[a-zA-Z]+(?: [a-zA-Z]+)?\z/, message: "Only allows letters" } + + def update_count(params) + if params == "in" + self.movies_checked_out_count -= 1 + elsif params == "out" + self.movies_checked_out_count += 1 + end + end end diff --git a/db/seeds.rb b/db/seeds.rb index 42785ced5..05f18d0a8 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -16,7 +16,7 @@ json_movies = JSON.parse(File.read('db/seeds/movies.json')) json_movies.each do |movie| - new = Movie.create!(movie) + new = Movie.new(movie) new.available_inventory = new.inventory new.save end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f781a2dd6..e42ec7cc3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -73,5 +73,7 @@ body.must_include "errors" body["errors"]["movie"].must_equal ["must exist"] end + + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 6be9a2e83..2378baeb0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new(name: "Captain Planet", registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", address: "123 Green St", city: "Tree Town", state: "HI", postal_code: "12345", phone: "(919) 434-3203") } + let(:customer) { Customer.new(name: "Captain Planet", registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", address: "123 Green St", city: "Tree Town", state: "HI", postal_code: "12345", phone: "(919) 434-3203", movies_checked_out_count: 0) } it "must be valid" do value(customer).must_be :valid? @@ -14,4 +14,22 @@ it "must not save if name data is invalid" do proc { Customer.new(name: "1234") }.must_change 'Customer.count', 0 end + + describe "update_count" do + it "increases the count when movie is checked out" do + count = customer.movies_checked_out_count + + customer.update_count("out") + customer.movies_checked_out_count.must_equal count + 1 + end + + it "decreases the count when movie is checked in" do + count = customer.movies_checked_out_count + + customer.update_count("in") + customer.movies_checked_out_count.must_equal count - 1 + end + + + end end From adf6ffe2f8edd41f69f12b1cb1fe91362fe6fc15 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Thu, 10 May 2018 22:55:52 -0700 Subject: [PATCH 33/39] adjusted rentals controller and customer model to check that customer movies_checked_out_count is updating. It looks like it is but smoke test is still failing --- app/controllers/rentals_controller.rb | 5 ----- app/models/customer.rb | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dea5d2502..932dd7c52 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -40,11 +40,6 @@ def check_out if customer customer.update_count("out") - else - render json: { - errors: ["Customer not found"] - }, status: :bad_request - return end else diff --git a/app/models/customer.rb b/app/models/customer.rb index c6681dfeb..d6e31c74d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,5 +10,7 @@ def update_count(params) elsif params == "out" self.movies_checked_out_count += 1 end + + self.save end end From f1fc453519e8ca371932bbe25773958a313c00a1 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Fri, 11 May 2018 13:22:16 -0700 Subject: [PATCH 34/39] updated check in and check out methods --- app/controllers/rentals_controller.rb | 16 +++++--- app/models/customer.rb | 7 ++++ test/controllers/rentals_controller_test.rb | 42 +++++++++++++++++++-- test/fixtures/customers.yml | 2 + test/fixtures/movies.yml | 4 +- test/models/customer_test.rb | 1 + 6 files changed, 61 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 932dd7c52..7540a0875 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,13 +5,15 @@ class RentalsController < ApplicationController RENTAL_PERIOD = 7 def check_in - rental = Rental.find_by(movie_id:rental_params["movie_id"], customer_id: rental_params["customer_id"]) - movie = Movie.find_by(id: rental.movie_id) - customer = Customer.find_by(id: rental_params[:custmer_id]) + movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) + if movie + rental = Rental.find_by(movie_id: movie.id, customer_id: customer.id) + movie.update_checkin if customer - customer.update_count("out") + customer.update_count("in") end end @@ -25,18 +27,22 @@ def check_in def check_out + movie = Movie.find_by(id: rental_params[:movie_id]) rental = Rental.new(rental_params) if movie + if movie.available_inventory > 0 + movie.update_checkout + rental.checkout_date = Date.today rental.due_date = rental.checkout_date + RENTAL_PERIOD rental.save - customer = Customer.find_by(id: rental_params[:custmer_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) if customer customer.update_count("out") diff --git a/app/models/customer.rb b/app/models/customer.rb index d6e31c74d..a7678f5c8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,6 +4,13 @@ class Customer < ApplicationRecord validates :name, presence: :true, format: { with: /\A[a-zA-Z]+(?: [a-zA-Z]+)?\z/, message: "Only allows letters" } + def update_checkout + self.movies_checked_out_count += 1 + self.save + end + + + def update_count(params) if params == "in" self.movies_checked_out_count -= 1 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e42ec7cc3..faa3c23e5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,9 +6,7 @@ let(:rental_data) { { customer_id: 1, - movie_id: 1, - checkout_date: Date.today, - due_date: Date.today + 7 + movie_id: 1 } } @@ -74,6 +72,42 @@ body["errors"]["movie"].must_equal ["must exist"] end - + it "updates customer movies_checked_out_count" do + movie = movies(:bride) + customer = customers(:ada) + count = customer.movies_checked_out_count + + post check_out_path, params: {movie_id: movie.id, customer_id: customer.id } + + customer = Customer.find(customer.id) + + customer.movies_checked_out_count.must_equal count + 1 + end + + end + + + describe "check in" do + + let(:rental_data) { + { customer_id: 1, + movie_id: 1 + } + } + + it "updates customer movies_checked_out_count" do + movie = movies(:bride) + customer = customers(:ada) + + post check_out_path, params: { customer_id: customer.id, movie_id: movie.id } + customer = Customer.find(customer.id) + count = customer.movies_checked_out_count + + post check_in_path, params: {movie_id: movie.id, customer_id: customer.id } + + customer = Customer.find(customer.id) + + customer.movies_checked_out_count.must_equal count - 1 + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 19cf01bd8..331819741 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -7,6 +7,7 @@ ada: city: Seattle state: WA phone: (232) 123-1232 + movies_checked_out_count: 0 bob: name: Bobby @@ -15,3 +16,4 @@ bob: city: Columbus state: OH phone: (222) 222-2222 + movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 6b2fc41df..3715ed6b0 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,8 @@ bride: title: "Princess Bride" overview: "I don't know" release_date: "2013-02-20" - inventory: 1 - available_inventory: 1 + inventory: 5 + available_inventory: 5 rocket: title: "Space Girl" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2378baeb0..50f24be00 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -28,6 +28,7 @@ customer.update_count("in") customer.movies_checked_out_count.must_equal count - 1 + end From fb8416f5c4d5277596cd55d3debb0fa3890c18d7 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Fri, 11 May 2018 13:22:54 -0700 Subject: [PATCH 35/39] deleted unsed customer model method --- app/models/customer.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index a7678f5c8..d6e31c74d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,13 +4,6 @@ class Customer < ApplicationRecord validates :name, presence: :true, format: { with: /\A[a-zA-Z]+(?: [a-zA-Z]+)?\z/, message: "Only allows letters" } - def update_checkout - self.movies_checked_out_count += 1 - self.save - end - - - def update_count(params) if params == "in" self.movies_checked_out_count -= 1 From a6504481b23ae1ef24a75cad1f99baa7140e2962 Mon Sep 17 00:00:00 2001 From: nicoletabrandolini Date: Fri, 11 May 2018 13:46:51 -0700 Subject: [PATCH 36/39] fixed test customer controller --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 65f74efe6..1975ddda8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,7 +26,7 @@ end it "returns customers with exactly the fields required" do - keys = %w(name registered_at postal_code phone address city state) + keys = %w(id name registered_at postal_code phone movies_checked_out_count) get customers_path body = JSON.parse(response.body) body.each do |customer| From a7c10991e2d8bf355ffbe1b88f8d8a3be37a9068 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Fri, 11 May 2018 13:58:56 -0700 Subject: [PATCH 37/39] updated rental model test --- app/controllers/rentals_controller.rb | 1 - app/models/rental.rb | 2 +- .../20180511202843_get_rid_of_rental_checked_out_status.rb | 5 +++++ db/migrate/20180511203405_adding_default_rental_dates.rb | 5 +++++ db/schema.rb | 5 ++--- test/controllers/movies_controller_test.rb | 4 ++-- test/fixtures/rentals.yml | 5 +---- test/models/movie_test.rb | 2 +- test/models/rental_test.rb | 2 +- 9 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20180511202843_get_rid_of_rental_checked_out_status.rb create mode 100644 db/migrate/20180511203405_adding_default_rental_dates.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7540a0875..4a01ef4ee 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -37,7 +37,6 @@ def check_out movie.update_checkout - rental.checkout_date = Date.today rental.due_date = rental.checkout_date + RENTAL_PERIOD rental.save diff --git a/app/models/rental.rb b/app/models/rental.rb index de38bdb9b..7c0eca601 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,8 +1,8 @@ class Rental < ApplicationRecord + belongs_to :customer belongs_to :movie validates :customer_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :movie_id, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } - validates :due_date, presence: true end diff --git a/db/migrate/20180511202843_get_rid_of_rental_checked_out_status.rb b/db/migrate/20180511202843_get_rid_of_rental_checked_out_status.rb new file mode 100644 index 000000000..4a27e59c9 --- /dev/null +++ b/db/migrate/20180511202843_get_rid_of_rental_checked_out_status.rb @@ -0,0 +1,5 @@ +class GetRidOfRentalCheckedOutStatus < ActiveRecord::Migration[5.1] + def change + remove_column :rentals, :checked_out_status + end +end diff --git a/db/migrate/20180511203405_adding_default_rental_dates.rb b/db/migrate/20180511203405_adding_default_rental_dates.rb new file mode 100644 index 000000000..a47ecaf6a --- /dev/null +++ b/db/migrate/20180511203405_adding_default_rental_dates.rb @@ -0,0 +1,5 @@ +class AddingDefaultRentalDates < ActiveRecord::Migration[5.1] + def change + change_column :rentals, :checkout_date, :datetime, default: -> { 'CURRENT_TIMESTAMP' } + end +end diff --git a/db/schema.rb b/db/schema.rb index 552860d62..a0d92ce53 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180509162311) do +ActiveRecord::Schema.define(version: 20180511203405) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,11 +41,10 @@ create_table "rentals", force: :cascade do |t| t.integer "movie_id" t.integer "customer_id" - t.date "checkout_date" + t.datetime "checkout_date" t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.boolean "checked_out_status" end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 356bf05a1..c16f0fef1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -99,13 +99,13 @@ describe "show" do # This bit is up to you! it "can get a movie" do - get movie_path + get movie_path(Movie.first.id) must_respond_with :success end it "returns a 404 for movies that are not found" do #Arrange - movie = movies(:two) + movie = movies(:bride) movie.destroy get movie_path(movie.id) #Assert diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index acb45ce34..410c1c2de 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,11 +3,8 @@ one: movie_id: 1 customer_id: 1 - checkout_date: 2018-05-08 - due_date: 2018-05-08 + two: movie_id: 1 customer_id: 1 - checkout_date: 2018-05-08 - due_date: 2018-05-08 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ace61dcb0..c3dd7ad3a 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -4,7 +4,7 @@ let(:movie) { Movie.new(title: "Dogtoth", overview: "Weird and good", release_date: "1979-01-18", inventory: 1)} it "must be valid" do - value(movie).must_be :valid? + value(movies(:bride)).must_be :valid? end it "must not create without title" do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..cb0761885 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { Rental.new(movie_id: movies(:bride).id, customer_id: customers(:ada).id, checkout_date: Date.today, due_date: Date.today + 7)} it "must be valid" do value(rental).must_be :valid? From f80c2e5514ee07fe20274c85cf2e0558d18f4621 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Fri, 11 May 2018 13:59:30 -0700 Subject: [PATCH 38/39] removed error migration --- db/migrate/20180511203405_adding_default_rental_dates.rb | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 db/migrate/20180511203405_adding_default_rental_dates.rb diff --git a/db/migrate/20180511203405_adding_default_rental_dates.rb b/db/migrate/20180511203405_adding_default_rental_dates.rb deleted file mode 100644 index a47ecaf6a..000000000 --- a/db/migrate/20180511203405_adding_default_rental_dates.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddingDefaultRentalDates < ActiveRecord::Migration[5.1] - def change - change_column :rentals, :checkout_date, :datetime, default: -> { 'CURRENT_TIMESTAMP' } - end -end From 7475fcc5a95e47913af24474300aee33e611c6c4 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Fri, 11 May 2018 14:48:24 -0700 Subject: [PATCH 39/39] added rentals check-in testing --- app/controllers/rentals_controller.rb | 18 ++++-- test/controllers/rentals_controller_test.rb | 62 ++++++++++++++++++--- 2 files changed, 68 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4a01ef4ee..fa07fa96b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,18 +9,26 @@ def check_in customer = Customer.find_by(id: rental_params[:customer_id]) if movie - rental = Rental.find_by(movie_id: movie.id, customer_id: customer.id) - - movie.update_checkin if customer + rental = Rental.find_by(movie_id: movie.id, customer_id: customer.id) + + movie.update_checkin + customer.update_count("in") + else + render json: {ok: false, errors: "Customer not found"}, status: :bad_request + return end + else + render json: {ok: false, errors: "Movie not found"}, status: :bad_request + return end - if rental.delete + if rental + rental.delete render json: { id: movie.id }, status: :ok else - render json: {ok: false, errors: rental.errors}, status: :bad_request + render json: {ok: false, errors: "Rental could not be found"}, status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index faa3c23e5..0108b2ae4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -88,26 +88,74 @@ describe "check in" do + before(:each) do + @customer = customers(:ada) + @movie = movies(:bride) + @test_rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id) + end let(:rental_data) { - { customer_id: 1, - movie_id: 1 + { customer_id: @customer.id, + movie_id: @movie.id } } it "updates customer movies_checked_out_count" do - movie = movies(:bride) - customer = customers(:ada) - post check_out_path, params: { customer_id: customer.id, movie_id: movie.id } - customer = Customer.find(customer.id) + post check_out_path, params: rental_data + customer = Customer.find(@customer.id) count = customer.movies_checked_out_count - post check_in_path, params: {movie_id: movie.id, customer_id: customer.id } + post check_in_path, params: rental_data customer = Customer.find(customer.id) customer.movies_checked_out_count.must_equal count - 1 end + + + it "returns an error if there is no customer" do + rental_data.delete(:customer_id) + + proc { + post check_in_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "Customer not found" + end + + it "returns an error if there is no customer" do + rental_data.delete(:movie_id) + + proc { + post check_in_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "Movie not found" + end + + it "cannot check in same rental twice" do + proc { + post check_in_path, params: rental_data + }.must_change 'Rental.count', -1 + + proc { + post check_in_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "Rental could not be found" + end end end