From 2947d1601c23e268a6a176a5b4227f83247c9e74 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 13:19:29 -0700 Subject: [PATCH 01/35] created API --- .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 + 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 | 26 +++ tmp/.keep | 0 vendor/.keep | 0 53 files changed, 907 insertions(+) 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..a9d2ed8a6 --- /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: 21ef64489fc3a79e2f7c41ab4da1d67894a53f234c30a43d8a387a8cb860df838946dad2aeedddda31b977d97f45bf8e30eef3ae7739df94a16b64afafc0d419 + +test: + secret_key_base: d5ad303e12cb39aeef1b98f7b7f0472c38c35d2250e3b27556bcf6a7f7549268bd4d82f5d9fba6d71344b289c3dedf9a892c2b4030f66c0c126a6447730924a1 + +# 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/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..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From a02b0d28c06533c491ac06e3118fcfeb5c6e5803 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Mon, 7 May 2018 13:28:26 -0700 Subject: [PATCH 02/35] models created --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20180507202537_create_movies.rb | 12 ++++++++++++ db/migrate/20180507202707_create_customers.rb | 15 +++++++++++++++ db/migrate/20180507202813_create_rentals.rb | 9 +++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/fixtures/rentals.yml | 7 +++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 12 files changed, 108 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180507202537_create_movies.rb create mode 100644 db/migrate/20180507202707_create_customers.rb create mode 100644 db/migrate/20180507202813_create_rentals.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20180507202537_create_movies.rb b/db/migrate/20180507202537_create_movies.rb new file mode 100644 index 000000000..2706fc7a5 --- /dev/null +++ b/db/migrate/20180507202537_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.date :release_date + t.string :overview + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20180507202707_create_customers.rb b/db/migrate/20180507202707_create_customers.rb new file mode 100644 index 000000000..223559d1a --- /dev/null +++ b/db/migrate/20180507202707_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.date :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20180507202813_create_rentals.rb b/db/migrate/20180507202813_create_rentals.rb new file mode 100644 index 000000000..335207379 --- /dev/null +++ b/db/migrate/20180507202813_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.date :checkout_date + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..b40937c74 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-05-07 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..c29b4ba8a --- /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 + release_date: 2018-05-07 + overview: MyString + inventory: 1 + +two: + title: MyString + release_date: 2018-05-07 + overview: MyString + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..bc3b33293 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2018-05-07 + +two: + checkout_date: 2018-05-07 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From b1e69ca6587eb8b62c93f75cf2914bf34fc8744b Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 13:38:44 -0700 Subject: [PATCH 03/35] adds references/foreign keys to rental model --- ...0180507203423_add_customer_id_to_rental.rb | 6 +++ .../20180507203533_add_movie_id_to_rental.rb | 6 +++ db/schema.rb | 51 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 db/migrate/20180507203423_add_customer_id_to_rental.rb create mode 100644 db/migrate/20180507203533_add_movie_id_to_rental.rb create mode 100644 db/schema.rb diff --git a/db/migrate/20180507203423_add_customer_id_to_rental.rb b/db/migrate/20180507203423_add_customer_id_to_rental.rb new file mode 100644 index 000000000..30accbd9a --- /dev/null +++ b/db/migrate/20180507203423_add_customer_id_to_rental.rb @@ -0,0 +1,6 @@ +class AddCustomerIdToRental < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :customer, + foreign_key: true + end +end diff --git a/db/migrate/20180507203533_add_movie_id_to_rental.rb b/db/migrate/20180507203533_add_movie_id_to_rental.rb new file mode 100644 index 000000000..cb7f613b7 --- /dev/null +++ b/db/migrate/20180507203533_add_movie_id_to_rental.rb @@ -0,0 +1,6 @@ +class AddMovieIdToRental < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :movie, + foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..a75413f6d --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,51 @@ +# 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: 20180507203533) 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.date "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.date "release_date" + t.string "overview" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" +end From 4c42e2fe6df163a401aef12f1ab8991400c65791 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 13:53:13 -0700 Subject: [PATCH 04/35] adds relationships and validations to models --- app/models/customer.rb | 3 +++ app/models/movie.rb | 4 ++++ app/models/rental.rb | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d17adcc4d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,5 @@ class Customer < ApplicationRecord + has_many :rentals + + validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..1aeb65574 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + + validates :title, presence: true + validates_numericality_of :inventory, presence: true, greater_than_or_equal_to: 0 end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..ea74ecd5f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,10 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :checkout_date, presence: true + validate :checkout_date_is_valid_datetime + def checkout_date_is_valid_datetime + errors.add(:checkout_date, 'must be a valid datetime') if ((DateTime.parse(checkout_date) rescue ArgumentError) == ArgumentError) + end end From 64b062df5a1f01f1d40131665ee4731b6d6ca2fb Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 14:50:06 -0700 Subject: [PATCH 05/35] changed rental validation of checkout_date to a date instead of a DateTime --- app/models/rental.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index ea74ecd5f..5bd1fc19d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,8 +3,8 @@ class Rental < ApplicationRecord belongs_to :movie validates :checkout_date, presence: true - validate :checkout_date_is_valid_datetime - def checkout_date_is_valid_datetime - errors.add(:checkout_date, 'must be a valid datetime') if ((DateTime.parse(checkout_date) rescue ArgumentError) == ArgumentError) + validate :checkout_date_is_valid_date + def checkout_date_is_valid_date + errors.add(:checkout_date, 'must be a valid datetime') if ((Date.parse(checkout_date) rescue ArgumentError) == ArgumentError) end end From 1e853226564fd2877198e61056010268dfeed1d6 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Mon, 7 May 2018 15:07:35 -0700 Subject: [PATCH 06/35] basic model testing for customer, movie, rental --- app/models/rental.rb | 9 ++++--- test/models/customer_test.rb | 28 ++++++++++++++++++--- test/models/movie_test.rb | 48 +++++++++++++++++++++++++++++++++--- test/models/rental_test.rb | 26 ++++++++++++++++--- 4 files changed, 98 insertions(+), 13 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 5bd1fc19d..dd83a2e32 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,8 +3,9 @@ class Rental < ApplicationRecord belongs_to :movie validates :checkout_date, presence: true - validate :checkout_date_is_valid_date - def checkout_date_is_valid_date - errors.add(:checkout_date, 'must be a valid datetime') if ((Date.parse(checkout_date) rescue ArgumentError) == ArgumentError) - end + # validate :checkout_date_is_valid_date + # + # def checkout_date_is_valid_date + # errors.add(:checkout_date, 'must be a valid datetime') if ((Date.parse(checkout_date) rescue ArgumentError) == ArgumentError) + # end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..d30ad38bc 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,31 @@ require "test_helper" +require 'pry' describe Customer do - let(:customer) { Customer.new } + let(:customer) { Customer.new(name: "name") } - it "must be valid" do - value(customer).must_be :valid? + describe "Validations" do + it "must be valid" do + customer.must_be :valid? + end + + it "raises error if name missing" do + customer.name = nil + + customer.valid?.must_equal false + customer.errors.must_include :name + end + end + + describe "Relationships" do + it "can have a list of rentals" do + rentals(:one).customer_id = customers(:one).id + rentals(:one).movie_id = movies(:one).id + rentals(:one).save + + person.must_respond_to :rentals + person.rentals[0].must_be_kind_of Rental + end end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..14ed4573f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,51 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { Movie.new(title: "title", inventory: 4) } - it "must be valid" do - value(movie).must_be :valid? + describe "Validations" do + it "must be valid" do + movie.must_be :valid? + end + + it "must have a title" do + movie.title = nil + + movie.valid?.must_equal false + movie.errors.must_include :title + end + + it "must have an existing inventory" do + movie.inventory = nil + + movie.valid?.must_equal false + movie.errors.must_include :inventory + end + + it "must raise error for negative inventory" do + movie.inventory = -1 + + movie.valid?.must_equal false + movie.errors.must_include :inventory + end + + it "must raise error for non-integer inventory" do + movie.inventory = "two" + + movie.valid?.must_equal false + movie.errors.must_include :inventory + end + end + + describe "Relationships" do + it "can have a list of rentals" do + rentals(:one).movie_id = movies(:one).id + rentals(:one).customer_id = customers(:one).id + rentals(:one).save + + movies(:one).must_respond_to :rentals + movies(:one).rentals[0].must_be_kind_of Rental + end end + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..389b7656b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,29 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { Rental.new(checkout_date: Date.new, customer_id: customers(:one).id, movie_id: movies(:one).id) } - it "must be valid" do - value(rental).must_be :valid? + describe "Validations" do + it "must be valid" do + rental.must_be :valid? + end + + it "it have must have a checkout date" do + rental.checkout_date = nil + + rental.valid?.must_equal false + rental.errors.must_include :checkout_date + end + end + + describe "Relationships" do + it "must belong to a customer" do + rental.must_respond_to :customer + end + + it "must belong to a movie" do + rental.must_respond_to :movie + end end + end From ac4c57552f2b6caa9d42525ebd9adef6696709eb Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 15:47:47 -0700 Subject: [PATCH 07/35] adds routes and controllers for customers, movies, and rentals --- app/controllers/customers_controller.rb | 7 +++++++ app/controllers/movies_controller.rb | 7 +++++++ app/controllers/rentals_controller.rb | 10 ++++++++++ config/routes.rb | 4 ++++ test/controllers/customers_controller_test.rb | 14 ++++++++++++++ test/controllers/movies_controller_test.rb | 14 ++++++++++++++ test/controllers/rentals_controller_test.rb | 19 +++++++++++++++++++ 7 files changed, 75 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..558cf72e7 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + end + + def show + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..c68ca82d9 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,7 @@ +class MoviesController < ApplicationController + def index + end + + def show + end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..86716f2af --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,10 @@ +class RentalsController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..453cb8e52 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers, only: [:index, :show] + resources :movies, only: [:index, :show] + resources :rentals, only: [:index, :show, :create] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..ac95821cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,14 @@ +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 + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..1a5c1a576 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,14 @@ +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 + +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..a536c9deb --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe RentalsController do + it "should get index" do + get rentals_index_url + value(response).must_be :success? + end + + it "should get show" do + get rentals_show_url + value(response).must_be :success? + end + + it "should get create" do + get rentals_create_url + value(response).must_be :success? + end + +end From 8716b21da80352596e961f9e93795ad7cbd8a321 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 15:52:56 -0700 Subject: [PATCH 08/35] adds index and show actions to movie controller --- app/controllers/movies_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c68ca82d9..100f225cc 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,16 @@ class MoviesController < ApplicationController def index + movies = Movie.all + render json: movies.as_json(only: [:title, :release_date, :inventory, :overview]) end def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: [:title, :release_date, :inventory, :overview]), status: :ok + else + render json: {ok: false, errors: "Movie not found"}, status: :not_found + end end end From 01b821b497234c3ae0d30f657f214a70b2699076 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 15:53:23 -0700 Subject: [PATCH 09/35] adds index and show actions to movie controller --- app/controllers/movies_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 100f225cc..af0e7909e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,4 +13,5 @@ def show render json: {ok: false, errors: "Movie not found"}, status: :not_found end end + end From b800b31df63889f58c94232599f552a1e2c2405e Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Mon, 7 May 2018 15:57:12 -0700 Subject: [PATCH 10/35] index and show methods for customers controller --- app/controllers/customers_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 558cf72e7..a1aa9c53e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,18 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) end def show + customer = Customer.find_by(id: params[:id]) + + if customer + render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + else + render json: { ok: false, errors: "Customer not found" }, status: :not_found + end end + end From bea5ffa4561ebf7a0fcb9fad3117b4073d256a6b Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 16:06:33 -0700 Subject: [PATCH 11/35] adds index and show actions to rental controller --- app/controllers/rentals_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 86716f2af..7eeb116ac 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,8 +1,17 @@ class RentalsController < ApplicationController def index + rentals = Rental.all + render json: rentals.as_json(only: [:customer_id, :movie_id, :checkout_date]) end def show + rental = Rental.find_by(id: params[:id]) + + if rental + render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date]), status: :ok + else + render json: {ok: false, errors: "Rental not found"}, status: :not_found + end end def create From bd7994283cb1d8767a216d31ac3a8f98920435e9 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Mon, 7 May 2018 16:22:41 -0700 Subject: [PATCH 12/35] refactors controllers methods and routes --- app/controllers/customers_controller.rb | 10 ---------- app/controllers/movies_controller.rb | 7 ++++++- app/controllers/rentals_controller.rb | 6 ++++++ config/routes.rb | 6 +++--- test/controllers/customers_controller_test.rb | 5 +++-- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a1aa9c53e..eb8e0c440 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,14 +5,4 @@ def index render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) end - def show - customer = Customer.find_by(id: params[:id]) - - if customer - render json: customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok - else - render json: { ok: false, errors: "Customer not found" }, status: :not_found - end - end - end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index af0e7909e..d0a51dccf 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,5 @@ class MoviesController < ApplicationController + def index movies = Movie.all render json: movies.as_json(only: [:title, :release_date, :inventory, :overview]) @@ -13,5 +14,9 @@ def show render json: {ok: false, errors: "Movie not found"}, status: :not_found end end - + + def create + + end + end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7eeb116ac..9169b08d8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,4 +1,5 @@ class RentalsController < ApplicationController + def index rentals = Rental.all render json: rentals.as_json(only: [:customer_id, :movie_id, :checkout_date]) @@ -15,5 +16,10 @@ def show end def create + # check-out + end + + def update + #check-in end end diff --git a/config/routes.rb b/config/routes.rb index 453cb8e52..1c68a0d5e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :customers, only: [:index, :show] - resources :movies, only: [:index, :show] - resources :rentals, only: [:index, :show, :create] + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + resources :rentals, only: [:index, :show, :create, :update] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ac95821cd..2372c8bfc 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,8 +2,9 @@ describe CustomersController do it "should get index" do - get customers_index_url - value(response).must_be :success? + get customers_path + + must_respond_with :success? end it "should get show" do From e6025447c3be13aee9a771461dbd0c42a06b1a0a Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 16:25:51 -0700 Subject: [PATCH 13/35] adds checkin date column migration to rentals --- db/migrate/20180507232344_adds_checkin_date_to_rental.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180507232344_adds_checkin_date_to_rental.rb diff --git a/db/migrate/20180507232344_adds_checkin_date_to_rental.rb b/db/migrate/20180507232344_adds_checkin_date_to_rental.rb new file mode 100644 index 000000000..9cdf1cc13 --- /dev/null +++ b/db/migrate/20180507232344_adds_checkin_date_to_rental.rb @@ -0,0 +1,5 @@ +class AddsCheckinDateToRental < ActiveRecord::Migration[5.1] + def change + add_column :rentals, :checkin_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index a75413f6d..0aa3f58f0 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: 20180507203533) do +ActiveRecord::Schema.define(version: 20180507232344) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.date "checkin_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 62f916385305fb14c3583b6c6cc7022a67576b3f Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Mon, 7 May 2018 16:37:53 -0700 Subject: [PATCH 14/35] customers controller testing --- test/controllers/customers_controller_test.rb | 41 +++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2372c8bfc..270e17f01 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,15 +1,42 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_path + describe "Index" do + it "is a real working route" do + get customers_path - must_respond_with :success? - end + must_respond_with :success + end + + it "returns json" do + get customers_path + + response.header['Content-Type'].must_include 'json' + end + + it "returns an array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with all fields" do + keys = %w(address city id name phone postal_code registered_at state) + get customers_path - it "should get show" do - get customers_show_url - value(response).must_be :success? + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end end end From fd983f5336ee6b6f66e72b81cd720f440c2a51c7 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Mon, 7 May 2018 16:52:16 -0700 Subject: [PATCH 15/35] adds index and show controller tests -passing- for movies controller --- test/controllers/movies_controller_test.rb | 74 ++++++++++++++++++++-- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1a5c1a576..46e7a5a87 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,14 +1,74 @@ 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 "returns json" do + get movies_path + + response.header['Content-Type'].must_include 'json' + end + + it "returns an array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end - it "should get show" do - get movies_show_url - value(response).must_be :success? + it "returns all movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with all fields" do + keys = %w(inventory overview release_date title) + get movies_path + + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end end + describe "Show" do + it "gets a movie" do + get movie_path(movies(:one).id) + + must_respond_with :success + end + + it "returns json" do + get movie_path(movies(:one).id) + + response.header['Content-Type'].must_include 'json' + end + + it "returns a movie hash" do + get movie_path(movies(:one).id) + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns a 404 for movie not found" do + movie = movies(:one) + movie.destroy + get movie_path(movie.id) + + must_respond_with :not_found + end + + + + + end end From b1abb0e09035bf791542c1ee566c85c090aa2e14 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Mon, 7 May 2018 16:58:55 -0700 Subject: [PATCH 16/35] rentals controller basic tests index show --- app/controllers/rentals_controller.rb | 4 +- test/controllers/rentals_controller_test.rb | 73 +++++++++++++++++---- 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9169b08d8..53331ef8d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,14 +2,14 @@ class RentalsController < ApplicationController def index rentals = Rental.all - render json: rentals.as_json(only: [:customer_id, :movie_id, :checkout_date]) + render json: rentals.as_json(only: [:customer_id, :movie_id, :checkin_date, :checkout_date]) end def show rental = Rental.find_by(id: params[:id]) if rental - render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date]), status: :ok + render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin]), status: :ok else render json: {ok: false, errors: "Rental not found"}, status: :not_found end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a536c9deb..ae36a6415 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,19 +1,70 @@ require "test_helper" describe RentalsController do - it "should get index" do - get rentals_index_url - value(response).must_be :success? - end + describe "Index" do + it "is a real working route" do + get rentals_path - it "should get show" do - get rentals_show_url - value(response).must_be :success? - end + must_respond_with :success + end + + it "returns json" do + get rentals_path + + response.header['Content-Type'].must_include 'json' + end + + it "returns an array" do + get rentals_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all rentals" do + get rentals_path + + body = JSON.parse(response.body) + body.length.must_equal Rental.count + end + + it "returns rentals with all fields" do + keys = %w(checkin_date checkout_date customer_id movie_id) + get rentals_path - it "should get create" do - get rentals_create_url - value(response).must_be :success? + body = JSON.parse(response.body) + body.each do |rental| + rental.keys.sort.must_equal keys + end + end end + describe "Show" do + it "gets a rental" do + get rental_path(rentals(:one).id) + + must_respond_with :success + end + + it "returns json" do + get rental_path(rentals(:one).id) + + response.header['Content-Type'].must_include 'json' + end + + it "returns a rental hash" do + get rental_path(rentals(:one).id) + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns a 404 for rental not found" do + rental = rentals(:one) + rental.destroy + get rental_path(rental.id) + + must_respond_with :not_found + end + end end From de55664d7ce9c1f41069597982c1d145901f2290 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 10:18:56 -0700 Subject: [PATCH 17/35] create methods in movie and rental controller --- app/controllers/movies_controller.rb | 12 +++++++++++- app/controllers/rentals_controller.rb | 14 +++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d0a51dccf..c409ffa9c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -16,7 +16,17 @@ def show end def create + movie = Movie.create(movie_params) - end + if movie.valid? + render json: { id: movie.id }, status: :ok + else + render json: { ok: false, errors: movie.errors }, status: :bad_request + end + end + private + def movie_params + return params.require(:movie).permit(:title, :release_date, :inventory, :overview) + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 53331ef8d..4715d7df3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -16,10 +16,22 @@ def show end def create - # check-out + rental = Rental.create(rental_params) + + if rental.valid? + render json: { id: rental.id }, status: :ok + else + render json: { ok: false, errors: rental.errors }, status: :bad_request + end end def update #check-in end + + private + def rental_params + return params.require(:rental).permit(:customer_id, :movie_id, :checkin_date, :checkout_date) + end + end From 83ea66b62fedd9e4e252b8bc6c9146b99ee5761e Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 11:03:20 -0700 Subject: [PATCH 18/35] rentals update attempt --- app/controllers/rentals_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4715d7df3..325e9afd8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -26,7 +26,15 @@ def create end def update - #check-in + rental = Rental.find_by(id: params[:id]) + + if rental && rental.checkin_date == nil + # rental.checkin_date = Date.new + rental.update + render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin]), status: :ok + else + render json: {ok: false, errors: "Rental not found"}, status: :not_found + end end private From 5cf13337c8a78b5d40313448a181f8cd7814c093 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Tue, 8 May 2018 11:10:22 -0700 Subject: [PATCH 19/35] adds test for movie create controller action --- test/controllers/movies_controller_test.rb | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 46e7a5a87..5c7db82da 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -67,6 +67,48 @@ must_respond_with :not_found end + describe "Create" do + let(:movie_data) { + { + title: "Pirates of the Caribbean", + release_date: "2003", + inventory: 5, + overview: "Captain Jack Sparrow does some things with the Black Pearl" + } + } + + 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 "will not create a new pet with bad data" do + not_a_movie = { + release_date: "2003", + inventory: 5, + overview: "Captain Jack Sparrow does some things with the Black Pearl" + } + + proc { + post movies_path, params: {movie: not_a_movie} + }.wont_change 'Movie.count' + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_include "title" + end + + + end + From 7160f615656db39a247ab65fe35a4d3e4e071a6e Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Tue, 8 May 2018 11:21:50 -0700 Subject: [PATCH 20/35] adds tests for rental create controller action --- test/controllers/movies_controller_test.rb | 58 ++++++++++----------- test/controllers/rentals_controller_test.rb | 48 +++++++++++++++++ 2 files changed, 77 insertions(+), 29 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5c7db82da..a5bf71b83 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -69,42 +69,42 @@ describe "Create" do let(:movie_data) { - { - title: "Pirates of the Caribbean", - release_date: "2003", - inventory: 5, - overview: "Captain Jack Sparrow does some things with the Black Pearl" + { + title: "Pirates of the Caribbean", + release_date: "2003", + inventory: 5, + overview: "Captain Jack Sparrow does some things with the Black Pearl" + } } - } - it "Creates a new movie" do + it "Creates a new movie" do - proc { - post movies_path, params: {movie: movie_data} - }.must_change 'Movie.count', 1 + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 1 - must_respond_with :success - end + must_respond_with :success + end - it "will not create a new pet with bad data" do - not_a_movie = { - release_date: "2003", - inventory: 5, - overview: "Captain Jack Sparrow does some things with the Black Pearl" + it "will not create a new movie with bad data" do + not_a_movie = { + release_date: "2003", + inventory: 5, + overview: "Captain Jack Sparrow does some things with the Black Pearl" } - proc { - post movies_path, params: {movie: not_a_movie} - }.wont_change 'Movie.count' - - must_respond_with :bad_request - body = JSON.parse(response.body) - body.must_be_kind_of Hash - body.must_include "ok" - body["ok"].must_equal false - body.must_include "errors" - body["errors"].must_include "title" - end + proc { + post movies_path, params: {movie: not_a_movie} + }.wont_change 'Movie.count' + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_include "title" + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ae36a6415..b6988a4b0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -67,4 +67,52 @@ must_respond_with :not_found end end + + describe "Create" do + let(:rental_data) { + { + customer_id: customers(:one).id, + movie_id: movies(:one).id, + checkout_date: "2018-05-21", + checkin_date: nil + } + } + + it "Creates a new rental" do + + proc { + post rentals_path, params: {rental: rental_data} + }.must_change 'Rental.count', 1 + + must_respond_with :success + end + + it "will not create a new rental with bad data" do + not_a_rental = { + movie_id: movies(:one).id, + checkin_date: nil + } + + proc { + post rentals_path, params: {rental: not_a_rental} + }.wont_change 'Rental.count' + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + + end + + + end + + + + + + + end From 54c03cc95a6206717978d16e833e1db236944118 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 12:00:34 -0700 Subject: [PATCH 21/35] rental update --- app/controllers/rentals_controller.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 325e9afd8..df94051c3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,7 +9,7 @@ def show rental = Rental.find_by(id: params[:id]) if rental - render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin]), status: :ok + render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin_date]), status: :ok else render json: {ok: false, errors: "Rental not found"}, status: :not_found end @@ -28,10 +28,12 @@ def create def update rental = Rental.find_by(id: params[:id]) - if rental && rental.checkin_date == nil - # rental.checkin_date = Date.new - rental.update - render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin]), status: :ok + if rental.checkin_date != nil + render json: {ok: false, errors: "Rental already checked in."}, status: :bad_request + elsif rental + rental.update(checkin_date: params['rental'][:checkin_date]) + + render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin_date]), status: :ok else render json: {ok: false, errors: "Rental not found"}, status: :not_found end From 8fb0427a36c5085d41e294c2af99281d557eef27 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 14:17:25 -0700 Subject: [PATCH 22/35] two migrations added --- ...0180508211517_add_movies_checked_out_count_to_customer.rb | 5 +++++ .../20180508211615_add_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180508211517_add_movies_checked_out_count_to_customer.rb create mode 100644 db/migrate/20180508211615_add_available_inventory_to_movies.rb diff --git a/db/migrate/20180508211517_add_movies_checked_out_count_to_customer.rb b/db/migrate/20180508211517_add_movies_checked_out_count_to_customer.rb new file mode 100644 index 000000000..2386cebe0 --- /dev/null +++ b/db/migrate/20180508211517_add_movies_checked_out_count_to_customer.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomer < ActiveRecord::Migration[5.1] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/migrate/20180508211615_add_available_inventory_to_movies.rb b/db/migrate/20180508211615_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..8d07ed201 --- /dev/null +++ b/db/migrate/20180508211615_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 0aa3f58f0..7c035894e 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: 20180507232344) do +ActiveRecord::Schema.define(version: 20180508211615) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" 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 create_table "rentals", force: :cascade do |t| From 055f706109d99f140ba7dcefc4c8714b084d161a Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Tue, 8 May 2018 14:28:40 -0700 Subject: [PATCH 23/35] renders movies to get smoke tests to pass --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index eb8e0c440..5fa659b0f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c409ffa9c..2317e1b98 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,14 +2,14 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:title, :release_date, :inventory, :overview]) + render json: movies.as_json(only: [:id, :title, :release_date, :inventory, :overview, :available_inventory]) end def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:title, :release_date, :inventory, :overview]), status: :ok + render json: movie.as_json(only: [:title, :release_date, :inventory, :overview, :available_inventory]), status: :ok else render json: {ok: false, errors: "Movie not found"}, status: :not_found end @@ -27,6 +27,6 @@ def create private def movie_params - return params.require(:movie).permit(:title, :release_date, :inventory, :overview) - end + return params.permit(:id, :title, :release_date, :inventory, :overview, :available_inventory) + end end From 8d24e4b16bafbfe83f332eb2f78030c8f987b062 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Tue, 8 May 2018 16:59:24 -0700 Subject: [PATCH 24/35] changed rental_params --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index df94051c3..f53a0d7ce 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -41,7 +41,7 @@ def update private def rental_params - return params.require(:rental).permit(:customer_id, :movie_id, :checkin_date, :checkout_date) + return params.permit(:customer_id, :movie_id, :checkin_date, :checkout_date) end end From b09fa481d332347d5e2f1045be4d24b6126ad945 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 17:08:42 -0700 Subject: [PATCH 25/35] create rental works? --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f53a0d7ce..df94051c3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -41,7 +41,7 @@ def update private def rental_params - return params.permit(:customer_id, :movie_id, :checkin_date, :checkout_date) + return params.require(:rental).permit(:customer_id, :movie_id, :checkin_date, :checkout_date) end end From d81c22899fdea843615ac990251505c578877766 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 17:21:48 -0700 Subject: [PATCH 26/35] route for checkin and checkout --- app/controllers/rentals_controller.rb | 6 ++++-- config/routes.rb | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index df94051c3..943c107b1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -16,7 +16,9 @@ def show end def create - rental = Rental.create(rental_params) + rental = Rental.new(rental_params) + rental.checkout_date = Date.today + rental.save if rental.valid? render json: { id: rental.id }, status: :ok @@ -41,7 +43,7 @@ def update private def rental_params - return params.require(:rental).permit(:customer_id, :movie_id, :checkin_date, :checkout_date) + return params.permit(:customer_id, :movie_id) end end diff --git a/config/routes.rb b/config/routes.rb index 1c68a0d5e..90aafcf67 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,9 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - resources :rentals, only: [:index, :show, :create, :update] + resources :rentals, only: [:index, :show] + + post 'rentals/check-out', to: 'rentals#create', as: 'checkout' + post 'rentals/check-in', to: 'rentals#update', as: 'checkin' + end From 465caf90fe6997be14b28112caf284d060c4afcf Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Tue, 8 May 2018 17:35:14 -0700 Subject: [PATCH 27/35] changed rental update action to find rental by customer_id and movie_id instead if by rental.id --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 943c107b1..b7749fdf5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -28,7 +28,7 @@ def create end def update - rental = Rental.find_by(id: params[:id]) + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) if rental.checkin_date != nil render json: {ok: false, errors: "Rental already checked in."}, status: :bad_request From b8b1dafd9657587007dae6609add3c491094f4fb Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 18:04:37 -0700 Subject: [PATCH 28/35] rental controller tests pass, still need to write rental#update tests --- test/controllers/rentals_controller_test.rb | 59 +++++++++------------ 1 file changed, 24 insertions(+), 35 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b6988a4b0..3e75b07a2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -70,49 +70,38 @@ describe "Create" do let(:rental_data) { - { - customer_id: customers(:one).id, - movie_id: movies(:one).id, - checkout_date: "2018-05-21", - checkin_date: nil + { + customer_id: customers(:one).id, + movie_id: movies(:one).id, + checkout_date: Date.today + } } - } - - it "Creates a new rental" do - proc { - post rentals_path, params: {rental: rental_data} - }.must_change 'Rental.count', 1 + it "Creates a new rental" do + proc { + post checkout_path, params: rental_data + }.must_change 'Rental.count', 1 - must_respond_with :success - end + must_respond_with :success + end - it "will not create a new rental with bad data" do - not_a_rental = { - movie_id: movies(:one).id, - checkin_date: nil + it "will not create a new rental with bad data" do + not_a_rental = { + movie_id: movies(:one).id, } - proc { - post rentals_path, params: {rental: not_a_rental} - }.wont_change 'Rental.count' - - must_respond_with :bad_request - body = JSON.parse(response.body) - body.must_be_kind_of Hash - body.must_include "ok" - body["ok"].must_equal false - body.must_include "errors" - - end + proc { + post checkout_path, params: not_a_rental + }.wont_change 'Rental.count' + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + end end - - - - - - end From d0f3d7e23a9f752ca9d5aad32317f04e25a66105 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Tue, 8 May 2018 18:14:25 -0700 Subject: [PATCH 29/35] model tests pass --- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 12 +++--------- test/models/customer_test.rb | 6 +++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 270e17f01..b793491eb 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,7 +29,7 @@ end it "returns customers with all fields" do - keys = %w(address city id name phone postal_code registered_at state) + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) get customers_path body = JSON.parse(response.body) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a5bf71b83..00773852a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -29,7 +29,7 @@ end it "returns movies with all fields" do - keys = %w(inventory overview release_date title) + keys = %w(available_inventory id inventory overview release_date title) get movies_path body = JSON.parse(response.body) @@ -78,9 +78,8 @@ } 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 @@ -94,7 +93,7 @@ } proc { - post movies_path, params: {movie: not_a_movie} + post movies_path, params: not_a_movie }.wont_change 'Movie.count' must_respond_with :bad_request @@ -106,11 +105,6 @@ body["errors"].must_include "title" end - end - - - - end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index d30ad38bc..524ed665e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -23,9 +23,9 @@ rentals(:one).movie_id = movies(:one).id rentals(:one).save - person.must_respond_to :rentals - person.rentals[0].must_be_kind_of Rental + customers(:one).must_respond_to :rentals + customers(:one).rentals[0].must_be_kind_of Rental end end - + end From c04933d353ab36110456be5cf2f10bfae41177e2 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Wed, 9 May 2018 10:54:22 -0700 Subject: [PATCH 30/35] works on rental update controller tests but its not passing tests yet. --- app/controllers/rentals_controller.rb | 8 ++-- test/controllers/rentals_controller_test.rb | 49 +++++++++++++++++++++ test/fixtures/rentals.yml | 8 ++++ 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b7749fdf5..215dde068 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -30,14 +30,14 @@ def create def update rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) - if rental.checkin_date != nil + if !rental.valid? + render json: {ok: false, errors: "Rental not found"}, status: :not_found + elsif rental.checkin_date != nil render json: {ok: false, errors: "Rental already checked in."}, status: :bad_request - elsif rental + else rental.update(checkin_date: params['rental'][:checkin_date]) render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin_date]), status: :ok - else - render json: {ok: false, errors: "Rental not found"}, status: :not_found end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3e75b07a2..313824588 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require "pry" describe RentalsController do describe "Index" do @@ -100,8 +101,56 @@ body.must_include "ok" body["ok"].must_equal false body.must_include "errors" + end + end + + describe "Update" do + + it "successfully updates an existing rental" do + existing_rental = rentals(:one) + existing_rental.customer_id = customers(:two).id + existing_rental.movie_id = movies(:two).id + existing_rental.save + + + proc { + post checkin_path(existing_rental), + params: { + rental: { + checkin_date: "2018-05-09" + } + } + }.wont_change "Rental.count" + binding.pry + + must_respond_with :success + + end + + it "will not update a rental that's already been checked out" do + existing_rental = rentals(:three) + + # existing_rental.checkin_date = "2018-05-10" + # existing_rental.customer_id = customers(:two).id + # existing_rental.movie_id = movies(:two).id + # existing_rental.save + # binding.pry + + proc { + post checkin_path(existing_rental), + params: { + + checkin_date: "2018-05-09" + + } + }.wont_change "Rental.count" + + must_respond_with :bad_request end + + + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index bc3b33293..5fa472a5f 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,7 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: + customer_id: customers(:one).id + movie_id: movies(:one).id checkout_date: 2018-05-07 two: checkout_date: 2018-05-07 + +three: + customer_id: customers(:one).id + movie_id: movies(:one).id + checkout_date: 2018-05-07 + checkin_date: 2018-05-09 From 332407468a7b428f8f825c5996484778f37462ac Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Wed, 9 May 2018 11:19:30 -0700 Subject: [PATCH 31/35] update controller tests still not working --- app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 17 ++++++++--------- test/fixtures/rentals.yml | 8 ++++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 215dde068..2422960e3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -30,6 +30,8 @@ def create def update rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) + # binding.pry + if !rental.valid? render json: {ok: false, errors: "Rental not found"}, status: :not_found elsif rental.checkin_date != nil diff --git a/config/routes.rb b/config/routes.rb index 90aafcf67..d927fc179 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,6 @@ resources :rentals, only: [:index, :show] post 'rentals/check-out', to: 'rentals#create', as: 'checkout' - post 'rentals/check-in', to: 'rentals#update', as: 'checkin' + patch 'rentals/check-in', to: 'rentals#update', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 313824588..05f50dda9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -108,20 +108,19 @@ it "successfully updates an existing rental" do existing_rental = rentals(:one) - existing_rental.customer_id = customers(:two).id - existing_rental.movie_id = movies(:two).id - existing_rental.save - proc { - post checkin_path(existing_rental), + patch checkin_path(existing_rental), params: { rental: { - checkin_date: "2018-05-09" + customer_id: existing_rental.customer_id, + movie_id: existing_rental.movie_id, + checkin_date: "2018-05-09", + checkout_date: "2018-05-04" } } }.wont_change "Rental.count" - binding.pry + must_respond_with :success @@ -137,10 +136,10 @@ # binding.pry proc { - post checkin_path(existing_rental), + patch checkin_path(existing_rental), params: { - checkin_date: "2018-05-09" + checkin_date: "2018-05-09" } }.wont_change "Rental.count" diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 5fa472a5f..11eead317 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - customer_id: customers(:one).id - movie_id: movies(:one).id + customer: one + movie: one checkout_date: 2018-05-07 two: checkout_date: 2018-05-07 three: - customer_id: customers(:one).id - movie_id: movies(:one).id + customer: one + movie_id: one checkout_date: 2018-05-07 checkin_date: 2018-05-09 From 54e9834b6275e062907a1b44274d79b10e69e901 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Wed, 9 May 2018 11:22:01 -0700 Subject: [PATCH 32/35] bad rentals cont --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b7749fdf5..e97c1bfab 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,7 +31,7 @@ def update rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) if rental.checkin_date != nil - render json: {ok: false, errors: "Rental already checked in."}, status: :bad_request + render json: { ok: false, errors: "Rental already checked in." }, status: :bad_request elsif rental rental.update(checkin_date: params['rental'][:checkin_date]) From 284deae2378c2cfe1736c9143259414f16bfd2db Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Wed, 9 May 2018 13:46:06 -0700 Subject: [PATCH 33/35] updated rental controller tests finally pass --- app/controllers/rentals_controller.rb | 9 +++------ test/controllers/rentals_controller_test.rb | 9 +++++---- test/fixtures/rentals.yml | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2422960e3..4d4b7d73e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -30,14 +30,11 @@ def create def update rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) - # binding.pry - - if !rental.valid? - render json: {ok: false, errors: "Rental not found"}, status: :not_found - elsif rental.checkin_date != nil + if rental.checkin_date != nil render json: {ok: false, errors: "Rental already checked in."}, status: :bad_request else - rental.update(checkin_date: params['rental'][:checkin_date]) + + rental.checkin_date = Date.today render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin_date]), status: :ok end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 05f50dda9..926663d24 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -126,7 +126,7 @@ end - it "will not update a rental that's already been checked out" do + it "will not update a rental that's already been checked in" do existing_rental = rentals(:three) # existing_rental.checkin_date = "2018-05-10" @@ -138,9 +138,10 @@ proc { patch checkin_path(existing_rental), params: { - - checkin_date: "2018-05-09" - + customer_id: existing_rental.customer_id, + movie_id: existing_rental.movie_id, + checkin_date: "2018-05-09", + checkout_date: "2018-05-04" } }.wont_change "Rental.count" diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 11eead317..72fdba6b3 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -12,4 +12,4 @@ three: customer: one movie_id: one checkout_date: 2018-05-07 - checkin_date: 2018-05-09 + checkin_date: 2018-05-12 From b9c545bfc16b847971d2f5b126d83578580df959 Mon Sep 17 00:00:00 2001 From: AngelaPoland Date: Wed, 9 May 2018 14:24:53 -0700 Subject: [PATCH 34/35] updated movie and rental paths/routes --- app/controllers/rentals_controller.rb | 3 ++- app/models/rental.rb | 6 +----- config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 5 ++--- test/controllers/rentals_controller_test.rb | 23 ++++----------------- 5 files changed, 10 insertions(+), 29 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4d4b7d73e..52ed70d2c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -35,6 +35,7 @@ def update else rental.checkin_date = Date.today + rental.save render json: rental.as_json(only: [:customer_id, :movie_id, :checkout_date, :checkin_date]), status: :ok end @@ -42,7 +43,7 @@ def update private def rental_params - return params.permit(:customer_id, :movie_id) + return params.permit(:customer_id, :movie_id, :checkout_date, :checkin_date) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index dd83a2e32..08fce2e05 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,9 +3,5 @@ class Rental < ApplicationRecord belongs_to :movie validates :checkout_date, presence: true - # validate :checkout_date_is_valid_date - # - # def checkout_date_is_valid_date - # errors.add(:checkout_date, 'must be a valid datetime') if ((Date.parse(checkout_date) rescue ArgumentError) == ArgumentError) - # end + end diff --git a/config/routes.rb b/config/routes.rb index d927fc179..90aafcf67 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,6 @@ resources :rentals, only: [:index, :show] post 'rentals/check-out', to: 'rentals#create', as: 'checkout' - patch 'rentals/check-in', to: 'rentals#update', as: 'checkin' + post 'rentals/check-in', to: 'rentals#update', as: 'checkin' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 00773852a..91e740126 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -60,9 +60,8 @@ end it "returns a 404 for movie not found" do - movie = movies(:one) - movie.destroy - get movie_path(movie.id) + + get movie_path("not a movie") must_respond_with :not_found end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 926663d24..030e3e8f6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -61,9 +61,8 @@ end it "returns a 404 for rental not found" do - rental = rentals(:one) - rental.destroy - get rental_path(rental.id) + + get rental_path("not a rental") must_respond_with :not_found end @@ -105,12 +104,11 @@ end describe "Update" do - it "successfully updates an existing rental" do existing_rental = rentals(:one) proc { - patch checkin_path(existing_rental), + post checkin_path(existing_rental), params: { rental: { customer_id: existing_rental.customer_id, @@ -121,22 +119,14 @@ } }.wont_change "Rental.count" - must_respond_with :success - end it "will not update a rental that's already been checked in" do existing_rental = rentals(:three) - # existing_rental.checkin_date = "2018-05-10" - # existing_rental.customer_id = customers(:two).id - # existing_rental.movie_id = movies(:two).id - # existing_rental.save - # binding.pry - proc { - patch checkin_path(existing_rental), + post checkin_path(existing_rental), params: { customer_id: existing_rental.customer_id, movie_id: existing_rental.movie_id, @@ -146,11 +136,6 @@ }.wont_change "Rental.count" must_respond_with :bad_request - end - - - end - end From 771220c9f4e6c79a4481a45a5abe6f45e69b8331 Mon Sep 17 00:00:00 2001 From: Alexandria Brown Date: Wed, 9 May 2018 14:36:36 -0700 Subject: [PATCH 35/35] spacing --- app/controllers/rentals_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 52ed70d2c..c56fb9ccf 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -33,7 +33,6 @@ def update if rental.checkin_date != nil render json: {ok: false, errors: "Rental already checked in."}, status: :bad_request else - rental.checkin_date = Date.today rental.save