From 764a82752418f9faf846bd143bf6c6939d3d8b7f Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 11:20:30 -0800 Subject: [PATCH 01/32] Initialize Rails app --- .gitignore | 16 ++ Gemfile | 53 ++++++ Gemfile.lock | 170 ++++++++++++++++++ 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, 926 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..4ae55c93d --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +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.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# 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', '~> 3.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] + +gem 'jquery-turbolinks' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +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..4a738acb5 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,170 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.7.3) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + ffi (1.9.18) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.2.1) + rb-fsevent (0.10.2) + 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) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.4) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.0.pre.3 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..7d3c866ff --- /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..b34dbba63 --- /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: a7642ba48e93e950e3fab2ffb2f5f3b352d6241c2eb412dec8bf82636af4bf26992396107e0de3557a776df93d529393ab8757d3d236e70de45ea03bf09e7d25 + +test: + secret_key_base: 586f3ea35446d31efb3a2f9daa6a1cdc5eb83fc99a12a5fade15e484f2b51425ef7ad7cb928620e99b95652f52f3847be5d9608a20d581ecf22374232dc22429 + +# 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 ef4d1ddfede1609d43b87b9d64c47a8de08c0887 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 11:24:23 -0800 Subject: [PATCH 02/32] Remove comments in routes file --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..38bce54db 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/zomg', to: 'application#zomg' end From 6bdb0214c876118db6aef646256af5d09f2947e2 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 12:46:39 -0800 Subject: [PATCH 03/32] made customer model --- app/models/customer.rb | 2 ++ db/migrate/20171106204537_create_customers.rb | 15 +++++++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/models/customer_test.rb | 9 +++++++++ 4 files changed, 45 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20171106204537_create_customers.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_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/db/migrate/20171106204537_create_customers.rb b/db/migrate/20171106204537_create_customers.rb new file mode 100644 index 000000000..0a05c4bad --- /dev/null +++ b/db/migrate/20171106204537_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.string :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/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..bf442fa90 --- /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: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end From 530d6eb84dad517eba2f13c31c582b77f18d1da3 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 13:01:43 -0800 Subject: [PATCH 04/32] added customer controller, created migration to add account_credit to customer model --- app/controllers/customers_controller.rb | 6 ++++ config/routes.rb | 4 ++- ...06205827_add_account_credit_to_customer.rb | 5 +++ db/schema.rb | 31 +++++++++++++++++++ db/seeds.rb | 7 +++-- test/controllers/customers_controller_test.rb | 7 +++++ test/fixtures/customers.yml | 28 ++++++++--------- test/models/customer_test.rb | 6 ++-- 8 files changed, 73 insertions(+), 21 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 db/migrate/20171106205827_add_account_credit_to_customer.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..eb0a9ed50 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,6 @@ +class CustomersController < ApplicationController + + def index + + end +end diff --git a/config/routes.rb b/config/routes.rb index 38bce54db..981a02fa2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do - get '/zomg', to: 'application#zomg' + + get '/customers', to: "customers#index", as: "customers" + end diff --git a/db/migrate/20171106205827_add_account_credit_to_customer.rb b/db/migrate/20171106205827_add_account_credit_to_customer.rb new file mode 100644 index 000000000..4631a9d7e --- /dev/null +++ b/db/migrate/20171106205827_add_account_credit_to_customer.rb @@ -0,0 +1,5 @@ +class AddAccountCreditToCustomer < ActiveRecord::Migration[5.1] + def change + add_column :customers, :account_credit, :float + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..5723eff48 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,31 @@ +# 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: 20171106205827) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "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 + t.float "account_credit" + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..55860b1e4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -2,6 +2,7 @@ Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) -end +#TODO - come back to this +# JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +# Movie.create!(movie) +# end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bf442fa90..f908d104d 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Victoria + registered_at: 11/6/17 + address: 123 Here St. + city: Seattle + state: WA + postal_code: 98101 + phone: 222-333-4444 two: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Julia + registered_at: Wed, 29 April 2015 + address: 444 Yesler Way + city: New York + state: NY + postal_code: 10001 + phone: 111-111-1111 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..3db70295e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + it "a customer object can be saved to the database" do + customer = Customer.new + customer.save.must_equal true end end From a23f981cda5cced5431da0b1040630205da370b9 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 13:14:48 -0800 Subject: [PATCH 05/32] Add customer controller tests, begin index action --- app/controllers/customers_controller.rb | 6 ++++- test/controllers/customers_controller_test.rb | 25 ++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index eb0a9ed50..b81952df2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,10 @@ class CustomersController < ApplicationController def index - + customers = Customer.all + + render( + json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + ) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..522fa0422 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,26 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "#index" do + it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + + it "must return an empty arry if no customers exist" do + Customer.destroy_all + get customer_path + must_respond_with :success + body = JSON.parse(response.body) + body.must_equal [] + end + + it "will return an array of all customers if they exist" do + get customer_path + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_instance_of Array + body.length.must_equal Customer.count + end + end end From 1971f04020bb71abb6e04b5bdf38605565e80827 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 13:26:51 -0800 Subject: [PATCH 06/32] Passing customer controller tests for index action --- app/controllers/customers_controller.rb | 4 ++-- app/models/customer.rb | 8 ++++++++ test/controllers/customers_controller_test.rb | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index b81952df2..3c12bf964 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,10 @@ class CustomersController < ApplicationController def index - customers = Customer.all + customers = Customer.customer_with_movie_count(Customer.all) render( - json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + json: customers.to_json(only: [:id, :name, :registered_at, :postal_code, :phone]) ) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..14ef100c3 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,10 @@ class Customer < ApplicationRecord + attr_accessor :movies_checked_out_count + + def self.customer_with_movie_count(array_of_customers) + array_of_customers.each do |customer| + customer.movies_checked_out_count = 0 + end + return array_of_customers + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 522fa0422..7e40dddc7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -9,14 +9,14 @@ it "must return an empty arry if no customers exist" do Customer.destroy_all - get customer_path + get customers_path must_respond_with :success body = JSON.parse(response.body) body.must_equal [] end it "will return an array of all customers if they exist" do - get customer_path + get customers_path must_respond_with :success body = JSON.parse(response.body) body.must_be_instance_of Array From fb55a3eb817f8dbc00e04755e089af2e79a30263 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 13:29:46 -0800 Subject: [PATCH 07/32] Add customer controller test for required fields on index action --- test/controllers/customers_controller_test.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7e40dddc7..c0a46e0a9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,6 +7,15 @@ response.header['Content-Type'].must_include 'json' end + it "returns only the required fields" do + keys = %w(id name phone postal_code registered_at) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + it "must return an empty arry if no customers exist" do Customer.destroy_all get customers_path From dc25d9fffccf4820a19b6f773020f81544d82e1c Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 14:13:54 -0800 Subject: [PATCH 08/32] modified index method to include the movies_checked_out_count in the customer hash --- Gemfile | 2 +- Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 9 +++++++-- app/models/customer.rb | 7 ------- test/controllers/customers_controller_test.rb | 2 +- test/models/customer_test.rb | 2 ++ 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 4ae55c93d..a13d9c318 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - +gem "awesome_print" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 4a738acb5..6ef6ed101 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,7 @@ GEM tzinfo (~> 1.1) ansi (1.5.0) arel (8.0.0) + awesome_print (1.8.0) better_errors (2.4.0) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -151,6 +152,7 @@ PLATFORMS ruby DEPENDENCIES + awesome_print better_errors binding_of_caller byebug diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3c12bf964..44ddc8666 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,15 @@ class CustomersController < ApplicationController def index - customers = Customer.customer_with_movie_count(Customer.all) + customers = Customer.all + customers_array = [] + customers.each do |customer| + customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => 0) + customers_array << customer_hash + end render( - json: customers.to_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + json: customers_array.to_json ) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 14ef100c3..b2cffd7e7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,10 +1,3 @@ class Customer < ApplicationRecord - attr_accessor :movies_checked_out_count - def self.customer_with_movie_count(array_of_customers) - array_of_customers.each do |customer| - customer.movies_checked_out_count = 0 - end - return array_of_customers - end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c0a46e0a9..f203c5676 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -8,7 +8,7 @@ end it "returns only the required fields" do - keys = %w(id name phone postal_code registered_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_path body = JSON.parse(response.body) body.each do |customer| diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3db70295e..1952ac60d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require "awesome_print" describe Customer do @@ -6,4 +7,5 @@ customer = Customer.new customer.save.must_equal true end + end From ffd2b2b406d69e072adfecc7afbacf351b56e62a Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 14:25:46 -0800 Subject: [PATCH 09/32] Refactor index action on customers controller to a method action for setting movies_checked_out_count --- app/controllers/customers_controller.rb | 9 ++------- app/models/customer.rb | 10 ++++++++++ test/models/customer_test.rb | 24 ++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 44ddc8666..e04aad616 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,15 +1,10 @@ class CustomersController < ApplicationController def index - customers = Customer.all - customers_array = [] - customers.each do |customer| - customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => 0) - customers_array << customer_hash - end + customers = Customer.index_customers render( - json: customers_array.to_json + json: customers.to_json ) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index b2cffd7e7..0311ef9d9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,13 @@ class Customer < ApplicationRecord + def self.index_customers + customers = Customer.all + customers_array = [] + customers.each do |customer| + customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => 0) + customers_array << customer_hash + end + return customers_array + end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 1952ac60d..066d0e796 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -8,4 +8,28 @@ customer.save.must_equal true end + describe "self.index_customers" do + before do + @customers = Customer.index_customers + end + it "returns an array of hashes" do + @customers.must_be_instance_of Array + @customers.length.must_equal Customer.count + @customers.each do |customer| + customer.must_be_instance_of Hash + end + end + + it "contains appropriate customer information" do + @customers.each do |customer| + customer.keys.must_include "id" + customer.keys.must_include "name" + customer.keys.must_include "registered_at" + customer.keys.must_include "postal_code" + customer.keys.must_include "phone" + customer.keys.must_include "movies_checked_out_count" + end + end + end + end From 0e10415acacf09c2f751623915c58d28f4f31aeb Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 14:33:53 -0800 Subject: [PATCH 10/32] created movies model and seeded database --- app/controllers/customers_controller.rb | 9 +++++++-- app/models/movie.rb | 2 ++ db/migrate/20171106223220_create_movies.rb | 12 ++++++++++++ db/schema.rb | 11 ++++++++++- db/seeds.rb | 7 +++---- test/fixtures/movies.yml | 13 +++++++++++++ test/models/movie_test.rb | 9 +++++++++ 7 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20171106223220_create_movies.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e04aad616..44ddc8666 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,15 @@ class CustomersController < ApplicationController def index - customers = Customer.index_customers + customers = Customer.all + customers_array = [] + customers.each do |customer| + customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => 0) + customers_array << customer_hash + end render( - json: customers.to_json + json: customers_array.to_json ) end end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20171106223220_create_movies.rb b/db/migrate/20171106223220_create_movies.rb new file mode 100644 index 000000000..84782a1b7 --- /dev/null +++ b/db/migrate/20171106223220_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 5723eff48..4e61d0601 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: 20171106205827) do +ActiveRecord::Schema.define(version: 20171106223220) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,4 +28,13 @@ t.float "account_credit" end + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/db/seeds.rb b/db/seeds.rb index 55860b1e4..5322340ba 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -2,7 +2,6 @@ Customer.create!(customer) end -#TODO - come back to this -# JSON.parse(File.read('db/seeds/movies.json')).each do |movie| -# Movie.create!(movie) -# end +JSON.parse(File.read('db/seeds/movies.json')).each do |movie| + Movie.create!(movie) +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From 6e1707b2eb562500f288d4b983a52cc20e495eae Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 14:48:30 -0800 Subject: [PATCH 11/32] added the get movies model, routes, and controllers and associated tests. passes smoke tests in postman --- app/controllers/movies_controller.rb | 10 ++++++ config/routes.rb | 4 ++- test/controllers/movies_controller_test.rb | 36 ++++++++++++++++++++++ test/fixtures/movies.yml | 14 ++++----- test/models/movie_test.rb | 8 +++-- 5 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..5acd0532e --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + + def index + movies = Movie.all + render( + json: movies.to_json(only: [:id, :title, :release_date]) + ) + end + +end diff --git a/config/routes.rb b/config/routes.rb index 981a02fa2..314dc0bf6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do get '/customers', to: "customers#index", as: "customers" - + +get '/movies', to: "movies#index", as: "movies" + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..d064d2074 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,36 @@ +require "test_helper" + +describe MoviesController do + describe "#index" do + it "returns json" do + get movies_path + response.header['Content-Type'].must_include 'json' + end + + it "returns only the required fields" do + keys = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + + it "must return an empty arry if no movies exist" do + Movie.destroy_all + get movies_path + must_respond_with :success + body = JSON.parse(response.body) + body.must_equal [] + end + + it "will return an array of all movies if they exist" do + get movies_path + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_instance_of Array + body.length.must_equal Movie.count + end + end + +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..91c857c21 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 + title: "La La Land" + overview: "Two beautiful people in LA dancing." + release_date: "2017-01-01" + inventory: 5 two: - title: MyString - overview: MyString - release_date: MyString + title: "The Room" + overview: "A successful banker's fiancee tempts and manipulates his best friend." + release_date: "2003-06-27" inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..83676c2d3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,11 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? + it "a movie object can be saved to the database" do + movie = Movie.new + movie.save.must_equal true end + + end From 0f60ea529710b09a8ebf8a7482352c70c0253f4f Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 15:17:52 -0800 Subject: [PATCH 12/32] Functionality complete for show individual movie --- app/controllers/movies_controller.rb | 17 ++++++++++- config/routes.rb | 3 +- test/controllers/movies_controller_test.rb | 34 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5acd0532e..6bde7d26b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,8 +3,23 @@ class MoviesController < ApplicationController def index movies = Movie.all render( - json: movies.to_json(only: [:id, :title, :release_date]) + json: movies.to_json(only: [:id, :title, :release_date]), + status: :ok ) end + def show + movie = Movie.find_by(id: params[:id]) + if movie + render( + json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge("available_inventory" => movie.inventory), + status: :ok + ) + else + render( + json: {"ok" => false}, status: :not_found + ) + end + end + end diff --git a/config/routes.rb b/config/routes.rb index 314dc0bf6..72f962992 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ get '/customers', to: "customers#index", as: "customers" -get '/movies', to: "movies#index", as: "movies" + get '/movies', to: "movies#index", as: "movies" + get '/movies/:id', to: 'movies#show', as: 'movie' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d064d2074..13b1fc04d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -33,4 +33,38 @@ end end + describe '#show' do + before do + valid_movie = movies(:one) + @valid_id = Movie.find_by(title: valid_movie.title).id + end + + it "returns json" do + get movie_path(@valid_id) + response.header['Content-Type'].must_include 'json' + end + + it "returns only the required fields" do + keys = %w(available_inventory inventory overview release_date title) + get movie_path(@valid_id) + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end + + it "finds a movie with a valid id" do + get movie_path(@valid_id) + must_respond_with :success + body = JSON.parse(response.body) + body["title"].must_equal Movie.find_by(id: @valid_id).title + end + + it "returns status not_found with an invalid id" do + invalid_id = -1 + get movie_path(invalid_id) + must_respond_with :not_found + body = JSON.parse(response.body) + body["ok"].must_equal false + end + end + end From a3142ebaac7c32bf26c3054341b9787411491449 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Mon, 6 Nov 2017 15:43:03 -0800 Subject: [PATCH 13/32] Handle errors from movies show action --- app/controllers/movies_controller.rb | 8 +++++++- test/controllers/movies_controller_test.rb | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6bde7d26b..b9a1b0fc5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,7 +17,13 @@ def show ) else render( - json: {"ok" => false}, status: :not_found + json: { + "ok" => false, + "errors" => { + "id": ["Could not find movie with id: #{params[:id]}"] + } + }, + status: :not_found ) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 13b1fc04d..4189a5d05 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -64,6 +64,8 @@ must_respond_with :not_found body = JSON.parse(response.body) body["ok"].must_equal false + body["errors"].keys.must_include "id" + body["errors"]["id"].must_include "Could not find movie with id: #{invalid_id}" end end From 0db8183daf2dcd16b4155be894c24f6dfe97b732 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 16:22:25 -0800 Subject: [PATCH 14/32] created post movies route and method. tested for positive cases --- app/controllers/movies_controller.rb | 18 ++++++++++++++++++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b9a1b0fc5..b7349e3af 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -28,4 +28,22 @@ def show end end + def create + movie = Movie.new(movie_params) + if movie.save + render( + json: movie.as_json(only: [:id]), + status: :ok + ) + else + + end + end + + private + + def movie_params + params.permit(:title, :overview, :release_date) + end + end diff --git a/config/routes.rb b/config/routes.rb index 72f962992..c07655701 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,6 @@ get '/movies', to: "movies#index", as: "movies" get '/movies/:id', to: 'movies#show', as: 'movie' + post '/movies', to: 'movies#create', as: 'create_movie' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 4189a5d05..1bc8475b9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -69,4 +69,22 @@ end end + describe "create" do + it "must respond with JSON" do + post create_movie_path, params: {title: "Raiders of the Lost Ark"} + response.header['Content-Type'].must_include 'json' + end + + it "returns only the required fields" do + key = ['id'] + post create_movie_path, params: {title: "Raiders of the Lost Ark"} + body = JSON.parse(response.body) + body.keys.sort.must_equal key + end + + it "can create a new movie" do + proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 1 + end + end + end From 52902d986a3964b6489d803f768aef4998bb8508 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 16:48:11 -0800 Subject: [PATCH 15/32] created error codes and messages for invalid movie --- app/controllers/movies_controller.rb | 9 +++++++-- app/models/movie.rb | 1 + test/controllers/movies_controller_test.rb | 13 +++++++++++++ test/models/movie_test.rb | 4 ++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b7349e3af..0d1e22671 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -33,10 +33,15 @@ def create if movie.save render( json: movie.as_json(only: [:id]), - status: :ok + status: :created #201 response code ) else - + render( + json: { + "ok" => false, + "errors" => movie.errors.messages + }, + status: :bad_request) #400 response code end end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..7918827d5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + validates :title, presence: { message: "Movie title is required." }, uniqueness: { message: "Movie title must be unique." } end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1bc8475b9..f6aee297d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -84,6 +84,19 @@ it "can create a new movie" do proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 1 + must_respond_with :created + body = JSON.parse(response.body) + body["id"].must_be_instance_of Integer + end + + it "cannot save a duplicate movie (same title)" do + proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 1 + proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 0 + must_respond_with :bad_request + body = JSON.parse(response.body) + body["ok"].must_equal false + body["errors"].keys.must_include "title" + body["errors"]["title"].must_include "Movie title must be unique." end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 83676c2d3..f5a0cc59e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,9 +3,9 @@ describe Movie do it "a movie object can be saved to the database" do - movie = Movie.new + movie = Movie.new(title: "Title") movie.save.must_equal true end - + end From 309143d49973e92b59a7dab9985d934a2b3a9d70 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 6 Nov 2017 16:50:41 -0800 Subject: [PATCH 16/32] changed response code from 201 to 200 so that postman tests would pass --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0d1e22671..34504bc47 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -33,7 +33,7 @@ def create if movie.save render( json: movie.as_json(only: [:id]), - status: :created #201 response code + status: :ok ) else render( diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f6aee297d..b2c07b43d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -84,7 +84,7 @@ it "can create a new movie" do proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 1 - must_respond_with :created + must_respond_with :ok body = JSON.parse(response.body) body["id"].must_be_instance_of Integer end @@ -96,7 +96,7 @@ body = JSON.parse(response.body) body["ok"].must_equal false body["errors"].keys.must_include "title" - body["errors"]["title"].must_include "Movie title must be unique." + body["errors"]["title"].must_include "Movie title must be unique." end end From a5daa4d396ec532d4914429c4cc2334dcfb507c0 Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 7 Nov 2017 09:58:04 -0800 Subject: [PATCH 17/32] created rentals model. added validates and relationships to all three classes --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 21 +++++++++++++++++++++ config/routes.rb | 1 + db/migrate/20171107174531_create_rentals.rb | 12 ++++++++++++ db/schema.rb | 11 ++++++++++- test/fixtures/rentals.yml | 13 +++++++++++++ test/models/rental_test.rb | 9 +++++++++ 8 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20171107174531_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0311ef9d9..cc2cf9012 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord + has_many :rentals def self.index_customers customers = Customer.all diff --git a/app/models/movie.rb b/app/models/movie.rb index 7918827d5..d99c3a74e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,4 @@ class Movie < ApplicationRecord + has_many :rentals validates :title, presence: { message: "Movie title is required." }, uniqueness: { message: "Movie title must be unique." } end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..6861a0397 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,21 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :customer_id, + presence: + { message: "Customer ID is required." }, + numericality: + {only_integer: true, message: "Customer ID must be an integer."} + validates movie_id, + presence: + { message: "Movie ID is required."}, + numericality: + {only_integer: true, message: "Movie ID must be an integer."} + validates :due_date, + presence: + { message: "Due date is required." } + validates :checkout_date, + presence: + { message: "Checkout date is required." } +end diff --git a/config/routes.rb b/config/routes.rb index c07655701..935e524ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,5 +5,6 @@ get '/movies', to: "movies#index", as: "movies" get '/movies/:id', to: 'movies#show', as: 'movie' post '/movies', to: 'movies#create', as: 'create_movie' + #post '/rentals/checkout' end diff --git a/db/migrate/20171107174531_create_rentals.rb b/db/migrate/20171107174531_create_rentals.rb new file mode 100644 index 000000000..390177bb0 --- /dev/null +++ b/db/migrate/20171107174531_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.integer :customer_id, null: false + t.integer :movie_id, null: false + t.date :due_date, null: false + t.date :checkout_date, null: false + end + add_foreign_key :rentals, :customers + add_foreign_key :rentals, :movies + end +end diff --git a/db/schema.rb b/db/schema.rb index 4e61d0601..5eb6f783f 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: 20171106223220) do +ActiveRecord::Schema.define(version: 20171107174531) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,4 +37,13 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.integer "customer_id", null: false + t.integer "movie_id", null: false + t.date "due_date", null: false + t.date "checkout_date", null: false + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..6a33bec5b --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + customer_id: 1 + movie_id: 1 + due_date: 2017-11-07 + checkout_date: 2017-11-07 + +two: + customer_id: 1 + movie_id: 1 + due_date: 2017-11-07 + checkout_date: 2017-11-07 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 360d29490223582c30ac9a00da761be204455d8b Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 7 Nov 2017 10:13:11 -0800 Subject: [PATCH 18/32] started rental model testing --- app/models/rental.rb | 2 +- test/fixtures/rentals.yml | 12 ++++++------ test/models/rental_test.rb | 16 +++++++++++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 6861a0397..8d38773eb 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,7 @@ class Rental < ApplicationRecord { message: "Customer ID is required." }, numericality: {only_integer: true, message: "Customer ID must be an integer."} - validates movie_id, + validates :movie_id, presence: { message: "Movie ID is required."}, numericality: diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 6a33bec5b..c84394e83 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - customer_id: 1 - movie_id: 1 - due_date: 2017-11-07 + customer_id: one + movie_id: one + due_date: 2017-11-10 checkout_date: 2017-11-07 two: - customer_id: 1 - movie_id: 1 - due_date: 2017-11-07 + customer_id: two + movie_id: two + due_date: 2017-11-15 checkout_date: 2017-11-07 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..fb3a4293d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,19 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:valid_rental) {rentals(:one)} + let(:valid_customer) {customers(:one)} + let(:valid_movie) {movies(:one)} - it "must be valid" do - value(rental).must_be :valid? + it "a rental can be saved to the database" do + movie_id = Movie.find_by(title: valid_movie.title).id + customer_id = Customer.find_by(name: valid_customer.name).id + rental = Rental.new( + movie_id: movie_id, + customer_id: customer_id, + due_date: Date.today + 5, + checkout_date: Date.today + ) + rental.save.must_equal true end end From f567fcb7d468bb5768af266001374180fbfdc763 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 7 Nov 2017 10:24:03 -0800 Subject: [PATCH 19/32] Add rental script seed --- db/seeds.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..47ee877fb 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,23 @@ JSON.parse(File.read('db/seeds/movies.json')).each do |movie| Movie.create!(movie) end + +i = 0 +JSON.parse(File.read('db/seeds/customers.json')).each do |customer| + customer_id = Customer.find_by(name: customer["name"]).id + movie = JSON.parse(File.read('db/seeds/movies.json'))[i] + movie_id = Movie.find_by(title: movie["title"]).id + rental = Rental.new( + customer_id: customer_id, + movie_id: movie_id, + checkout_date: Date.today, + due_date: (Date.today + 5) + ) + if rental.save + puts "Created rental with customer_id: #{customer_id} and movie_id: #{movie_id}" + else + puts "Error could not create rental!!!!!!!!!!!!!!!!!!!!!!" + end + i += 1 + break if i == 100 +end From dc24bea946adce786aadb1ec64d015ce3f6aaa3f Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 7 Nov 2017 10:30:59 -0800 Subject: [PATCH 20/32] Rental model validation testing --- test/models/rental_test.rb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index fb3a4293d..5e9982553 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -16,4 +16,33 @@ ) rental.save.must_equal true end + + describe "won't create invalid rental" do + before do + @invalid_rental = Rental.new() + @invalid_rental.save + end + + it "requires a valid customer_id" do + @invalid_rental.errors.messages.must_include :customer_id + @invalid_rental.errors.messages[:customer_id].must_include "Customer ID is required." + @invalid_rental.errors.messages[:customer_id].must_include "Customer ID must be an integer." + end + + it "requires a valid movie_id" do + @invalid_rental.errors.messages.must_include :movie_id + @invalid_rental.errors.messages[:movie_id].must_include "Movie ID is required." + @invalid_rental.errors.messages[:movie_id].must_include "Movie ID must be an integer." + end + + it "requires a due_date" do + @invalid_rental.errors.messages.must_include :due_date + @invalid_rental.errors.messages[:due_date].must_include "Due date is required." + end + + it "requires a checkout_date" do + @invalid_rental.errors.messages.must_include :checkout_date + @invalid_rental.errors.messages[:checkout_date].must_include "Checkout date is required." + end + end end From c0954d9c9ef8f40eed1e47c02aa712eabf9e833f Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 7 Nov 2017 10:57:42 -0800 Subject: [PATCH 21/32] Begin rental checkout functionality in rentalscontroller --- app/controllers/rentals_controller.rb | 29 +++++++++++++++++++++ config/routes.rb | 3 ++- test/controllers/rentals_controller_test.rb | 9 +++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..8eb36f579 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,29 @@ +class RentalsController < ApplicationController + def create + puts "======================" + puts "in controller" + puts "======================" + due_date_string = params[:due_date] + due_date_var = Date.parse(due_date_string) + rental = Rental.new(rental_params.merge(checkout_date: Date.today, due_date: due_date_var)) + if rental.save + render( + json: rental.as_json(only: [:id]), + status: :ok + ) + else + render( + json: { + "ok" => false, + "errors" => rental.errors.messages + }, + status: :bad_request) + end + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end +end diff --git a/config/routes.rb b/config/routes.rb index 935e524ab..af1c17a36 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,7 @@ get '/movies', to: "movies#index", as: "movies" get '/movies/:id', to: 'movies#show', as: 'movie' post '/movies', to: 'movies#create', as: 'create_movie' - #post '/rentals/checkout' + + post '/rentals/check-out', to: 'rentals#create', as: 'create_rental' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..3e24a26ab --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe RentalsController do + it "should get create" do + get rentals_create_url + value(response).must_be :success? + end + +end From 0e8ac18c08c79c843e92a27db4e14df242fd78cc Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 7 Nov 2017 11:28:57 -0800 Subject: [PATCH 22/32] rentals controller testing --- app/controllers/rentals_controller.rb | 3 -- test/controllers/movies_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 42 +++++++++++++++++++-- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8eb36f579..e5af2e149 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,8 +1,5 @@ class RentalsController < ApplicationController def create - puts "======================" - puts "in controller" - puts "======================" due_date_string = params[:due_date] due_date_var = Date.parse(due_date_string) rental = Rental.new(rental_params.merge(checkout_date: Date.today, due_date: due_date_var)) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b2c07b43d..ad930ce27 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -16,7 +16,7 @@ end end - it "must return an empty arry if no movies exist" do + it "must return an empty array if no movies exist" do Movie.destroy_all get movies_path must_respond_with :success diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3e24a26ab..1d1728170 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,9 +1,43 @@ require "test_helper" describe RentalsController do - it "should get create" do - get rentals_create_url - value(response).must_be :success? - end + describe "create" do + let(:create_rental) { + post create_rental_path, + params: { + movie_id: movies(:one).id, + customer_id: customers(:one).id, + due_date: "2017-12-15" + } + } + + it "must respond with JSON" do + create_rental + response.header['Content-Type'].must_include 'json' + end + + it "returns only the required fields" do + create_rental + key = ['id'] + body = JSON.parse(response.body) + body.keys.sort.must_equal key + end + it "can create a new rental" do + proc {create_rental}.must_change "Rental.count", 1 + must_respond_with :ok + body = JSON.parse(response.body) + body["id"].must_be_instance_of Integer + end + + # it "cannot save a duplicate movie (same title)" do + # proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 1 + # proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 0 + # must_respond_with :bad_request + # body = JSON.parse(response.body) + # body["ok"].must_equal false + # body["errors"].keys.must_include "title" + # body["errors"]["title"].must_include "Movie title must be unique." + # end + end end From 29770fd9fd7de253fbc322ddb1a227fe5f73cfd6 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 7 Nov 2017 13:20:35 -0800 Subject: [PATCH 23/32] Implement inventory controls on rental create method and relevant testing --- app/controllers/rentals_controller.rb | 21 ++++++-- app/models/rental.rb | 8 +++ test/controllers/rentals_controller_test.rb | 58 ++++++++++++++++----- test/test_helper.rb | 1 + 4 files changed, 70 insertions(+), 18 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e5af2e149..6759fe165 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,11 +3,21 @@ def create due_date_string = params[:due_date] due_date_var = Date.parse(due_date_string) rental = Rental.new(rental_params.merge(checkout_date: Date.today, due_date: due_date_var)) - if rental.save - render( - json: rental.as_json(only: [:id]), - status: :ok - ) + if rental.valid? + if Rental.available?(params[:movie_id]) + rental.save + render( + json: rental.as_json(only: [:id]), + status: :ok + ) + else + render( + json: { + "ok" => false, + "errors" => ["Requested movie is not in stock."] + }, + status: :bad_request) + end else render( json: { @@ -23,4 +33,5 @@ def create def rental_params params.permit(:customer_id, :movie_id) end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 8d38773eb..fe0e6d2eb 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -18,4 +18,12 @@ class Rental < ApplicationRecord validates :checkout_date, presence: { message: "Checkout date is required." } + + + def self.available?(movie_id) + inventory = Movie.find_by(id: movie_id.to_i).inventory + currently_rented = Rental.where(movie_id: movie_id.to_i).where('checkout_date <= ?', Date.today).where('due_date >= ?', Date.today) + return true if currently_rented.length < inventory + return false + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1d1728170..323d4efa6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,14 +2,16 @@ describe RentalsController do describe "create" do - let(:create_rental) { + let(:movie_one) {movies(:one)} + let(:customer_one) {customers(:one)} + def create_rental post create_rental_path, params: { - movie_id: movies(:one).id, - customer_id: customers(:one).id, + movie_id: movie_one.id, + customer_id: customer_one.id, due_date: "2017-12-15" } - } + end it "must respond with JSON" do create_rental @@ -30,14 +32,44 @@ body["id"].must_be_instance_of Integer end - # it "cannot save a duplicate movie (same title)" do - # proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 1 - # proc {post create_movie_path, params: {title: "Raiders of the Lost Ark"}}.must_change "Movie.count", 0 - # must_respond_with :bad_request - # body = JSON.parse(response.body) - # body["ok"].must_equal false - # body["errors"].keys.must_include "title" - # body["errors"]["title"].must_include "Movie title must be unique." - # end + it "cannot check out more movies than inventory allows" do + movie_one.inventory = 1 + movie_one.save.must_equal true + create_rental + must_respond_with :ok + create_rental + must_respond_with :bad_request + end + + it "cannot check out a movie for either an invalid customer id" do + invalid_customer_id = -1 + post create_rental_path, + params: { + movie_id: movie_one.id, + customer_id: invalid_customer_id, + due_date: "2017-12-15" + } + must_respond_with :bad_request + body = JSON.parse(response.body) + body["ok"].must_equal false + body["errors"].must_include "customer" + body["errors"]["customer"].must_include "must exist" + end + + it "cannot check out a movie for either an invalid movie id" do + invalid_movie_id = -1 + post create_rental_path, + params: { + movie_id: invalid_movie_id, + customer_id: customer_one.id, + due_date: "2017-12-15" + } + must_respond_with :bad_request + body = JSON.parse(response.body) + body["ok"].must_equal false + print body + body["errors"].must_include "movie" + body["errors"]["movie"].must_include "must exist" + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..2d09aede1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -3,6 +3,7 @@ require "rails/test_help" require "minitest/rails" require "minitest/reporters" # for Colorized output +require 'pry' # For colorful output! Minitest::Reporters.use!( From 290219ae3b6f1b452d7cb5c6d8aa9bfe6da237a9 Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 7 Nov 2017 14:38:37 -0800 Subject: [PATCH 24/32] added checkin date column to rentals --- db/migrate/20171107222927_add_checkin_date.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20171107222927_add_checkin_date.rb diff --git a/db/migrate/20171107222927_add_checkin_date.rb b/db/migrate/20171107222927_add_checkin_date.rb new file mode 100644 index 000000000..5226c8e4f --- /dev/null +++ b/db/migrate/20171107222927_add_checkin_date.rb @@ -0,0 +1,5 @@ +class AddCheckinDate < 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 5eb6f783f..653e83ca6 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: 20171107174531) do +ActiveRecord::Schema.define(version: 20171107222927) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,7 @@ t.integer "movie_id", null: false t.date "due_date", null: false t.date "checkout_date", null: false + t.date "checkin_date" end add_foreign_key "rentals", "customers" From 8cd10aaf36727559b24ac5a29e1b0c5b62270679 Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 7 Nov 2017 15:06:22 -0800 Subject: [PATCH 25/32] created update method and testing --- app/controllers/rentals_controller.rb | 19 +++++ config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 77 +++++++++++++++++---- test/fixtures/rentals.yml | 2 + 4 files changed, 87 insertions(+), 13 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6759fe165..e14fd6b09 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -28,6 +28,25 @@ def create end end + def update + rental = Rental.find_by(movie_id: params[:movie_id], customer_id: params[:customer_id]) + if rental + rental.checkin_date = Date.today + rental.save + render( + json: rental.as_json(only: [:id]), + status: :ok + ) + else + render( + json: { + "ok" => false, + "errors" => ["Rental does not exist."] + }, + status: :bad_request) + end + end + private def rental_params diff --git a/config/routes.rb b/config/routes.rb index af1c17a36..24e964a6f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,5 +7,5 @@ post '/movies', to: 'movies#create', as: 'create_movie' post '/rentals/check-out', to: 'rentals#create', as: 'create_rental' - + post '/rentals/check-in', to: 'rentals#update', as: 'update_rental' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 323d4efa6..1447a9da0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,18 +1,19 @@ require "test_helper" describe RentalsController do - describe "create" do - let(:movie_one) {movies(:one)} - let(:customer_one) {customers(:one)} - def create_rental - post create_rental_path, - params: { - movie_id: movie_one.id, - customer_id: customer_one.id, - due_date: "2017-12-15" - } - end + let(:movie_one) {movies(:one)} + let(:customer_one) {customers(:one)} + def create_rental + post create_rental_path, + params: { + movie_id: movie_one.id, + customer_id: customer_one.id, + due_date: "2017-12-15" + } + end + + describe "create" do it "must respond with JSON" do create_rental response.header['Content-Type'].must_include 'json' @@ -67,9 +68,61 @@ def create_rental must_respond_with :bad_request body = JSON.parse(response.body) body["ok"].must_equal false - print body body["errors"].must_include "movie" body["errors"]["movie"].must_include "must exist" end end + + describe "update" do + def update_rental + post update_rental_path, + params: { + movie_id: movie_one.id, + customer_id: customer_one.id + } + end + + before do + create_rental + end + + it "must respond with JSON" do + update_rental + response.header['Content-Type'].must_include 'json' + end + + it "returns only the required fields" do + update_rental + key = ['id'] + body = JSON.parse(response.body) + body.keys.sort.must_equal key + end + + it "can update a rental" do + rental = Rental.find_by(customer_id: customer_one.id, movie_id: movie_one.id) + before_return = rental.checkin_date + before_return.must_equal nil + update_rental + rental = Rental.find_by(customer_id: customer_one.id, movie_id: movie_one.id) + after_rental = rental.checkin_date + after_rental.must_equal Date.today + + must_respond_with :ok + body = JSON.parse(response.body) + body["id"].must_be_instance_of Integer + end + + it "returns proper errors when the rental is invalid" do + invalid_customer_id = -1 + post update_rental_path, + params: { + movie_id: movie_one.id, + customer_id: invalid_customer_id + } + must_respond_with :bad_request + body = JSON.parse(response.body) + body["ok"].must_equal false + body["errors"].must_include "Rental does not exist." + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index c84394e83..b28c2181a 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,9 +5,11 @@ one: movie_id: one due_date: 2017-11-10 checkout_date: 2017-11-07 + checkin_date: two: customer_id: two movie_id: two due_date: 2017-11-15 checkout_date: 2017-11-07 + checkin_date: From c63878fb0b7d7281844238d48bc7237044313ff3 Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 7 Nov 2017 16:04:52 -0800 Subject: [PATCH 26/32] added available_inventory method. this broke some previous tests that need to be fixed --- app/controllers/movies_controller.rb | 2 +- app/models/movie.rb | 10 +++++++++- app/models/rental.rb | 7 ++++++- test/controllers/rentals_controller_test.rb | 2 ++ test/fixtures/rentals.yml | 8 ++++---- test/models/movie_test.rb | 4 ++++ 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 34504bc47..99c4b8e19 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,7 +12,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie render( - json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge("available_inventory" => movie.inventory), + json: movie.as_json(only: [:title, :overview, :release_date, :inventory]).merge("available_inventory" => movie.available_inventory), status: :ok ) else diff --git a/app/models/movie.rb b/app/models/movie.rb index d99c3a74e..2f80642e2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,12 @@ class Movie < ApplicationRecord has_many :rentals - validates :title, presence: { message: "Movie title is required." }, uniqueness: { message: "Movie title must be unique." } + validates :title, + presence: { message: "Movie title is required." }, + uniqueness: { message: "Movie title must be unique."} + + def available_inventory + currently_rented = Rental.currently_rented(self.id) + available_inventory = self.inventory - currently_rented.length + return available_inventory + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index fe0e6d2eb..951af035f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -22,8 +22,13 @@ class Rental < ApplicationRecord def self.available?(movie_id) inventory = Movie.find_by(id: movie_id.to_i).inventory - currently_rented = Rental.where(movie_id: movie_id.to_i).where('checkout_date <= ?', Date.today).where('due_date >= ?', Date.today) + currently_rented = Rental.currently_rented(movie_id.to_i) return true if currently_rented.length < inventory return false end + + def self.currently_rented(movie_id) + return Rental.where(movie_id: movie_id.to_i).where('checkout_date <= ?', Date.today).where('due_date >= ?', Date.today) + + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1447a9da0..c96affc60 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -125,4 +125,6 @@ def update_rental body["errors"].must_include "Rental does not exist." end end + + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index b28c2181a..3b8ebe352 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: one - movie_id: one + customer: one + movie: one due_date: 2017-11-10 checkout_date: 2017-11-07 checkin_date: two: - customer_id: two - movie_id: two + customer: two + movie: two due_date: 2017-11-15 checkout_date: 2017-11-07 checkin_date: diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f5a0cc59e..571a56897 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -7,5 +7,9 @@ movie.save.must_equal true end + it "can return the available inventory for a given movie" do + movies(:one).available_inventory.must_equal 4 + + end end From bc50b317530308df122d280e84b2b592a1b107fe Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 7 Nov 2017 16:15:58 -0800 Subject: [PATCH 27/32] Fix failing tests, mostly foreign key constraints --- test/controllers/customers_controller_test.rb | 5 ++++- test/controllers/movies_controller_test.rb | 3 +++ test/controllers/rentals_controller_test.rb | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index f203c5676..90561d77d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -16,7 +16,10 @@ end end - it "must return an empty arry if no customers exist" do + it "must return an empty array if no customers exist" do + #avoid foreign key constraint + Rental.destroy_all + #test Customer.destroy_all get customers_path must_respond_with :success diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ad930ce27..e7e1516c5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -17,6 +17,9 @@ end it "must return an empty array if no movies exist" do + #avoid foreign key constraint + Rental.destroy_all + #test Movie.destroy_all get movies_path must_respond_with :success diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c96affc60..27153287e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -34,6 +34,7 @@ def create_rental end it "cannot check out more movies than inventory allows" do + Rental.destroy_all movie_one.inventory = 1 movie_one.save.must_equal true create_rental @@ -103,8 +104,8 @@ def update_rental before_return = rental.checkin_date before_return.must_equal nil update_rental - rental = Rental.find_by(customer_id: customer_one.id, movie_id: movie_one.id) - after_rental = rental.checkin_date + updated_rental = Rental.find_by(id: rental.id) + after_rental = updated_rental.checkin_date after_rental.must_equal Date.today must_respond_with :ok @@ -126,5 +127,5 @@ def update_rental end end - + end From fb8437ce40395554112ae5cec1e580371dc00e57 Mon Sep 17 00:00:00 2001 From: Julia Date: Wed, 8 Nov 2017 10:05:06 -0800 Subject: [PATCH 28/32] created checkout_count method in the customer model and modified the index method in customers controller to use this method --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 5 +++++ app/models/rental.rb | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 44ddc8666..edb935923 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,7 @@ def index customers = Customer.all customers_array = [] customers.each do |customer| - customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => 0) + customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => customer.checkout_count) customers_array << customer_hash end diff --git a/app/models/customer.rb b/app/models/customer.rb index cc2cf9012..2c08c7030 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -11,4 +11,9 @@ def self.index_customers return customers_array end + def checkout_count + rentals = Rental.where(customer_id: self.id, checkin_date: nil) + return rentals.length + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 951af035f..db50339dd 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -28,7 +28,6 @@ def self.available?(movie_id) end def self.currently_rented(movie_id) - return Rental.where(movie_id: movie_id.to_i).where('checkout_date <= ?', Date.today).where('due_date >= ?', Date.today) - + return Rental.where(movie_id: movie_id.to_i, checkin_date: nil) end end From 30745a00364535e07f923624ffd5f58adb119b20 Mon Sep 17 00:00:00 2001 From: Julia Date: Wed, 8 Nov 2017 10:39:00 -0800 Subject: [PATCH 29/32] created overdue method in rental model and associated testing --- app/models/rental.rb | 15 +++++++++++++++ test/fixtures/rentals.yml | 15 +++++++++++---- test/models/rental_test.rb | 25 +++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index db50339dd..63c99f3c3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -30,4 +30,19 @@ def self.available?(movie_id) def self.currently_rented(movie_id) return Rental.where(movie_id: movie_id.to_i, checkin_date: nil) end + + def self.overdue + overdue_rentals = Rental.where(checkin_date: nil).where('due_date < ?', Date.today) + overdue = overdue_rentals.map { |rental| + { + "title" => rental.movie.title, + "customer_id" => rental.customer_id, + "name" => rental.customer.name, + "postal_code" => rental.customer.postal_code, + "checkout_date" => rental.checkout_date, + "due_date" => rental.due_date + } + } + return overdue + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 3b8ebe352..72db69663 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,13 +3,20 @@ one: customer: one movie: one - due_date: 2017-11-10 - checkout_date: 2017-11-07 + due_date: <%= (Date.today - 2).to_s %> + checkout_date: <%= (Date.today - 9).to_s %> checkin_date: two: customer: two movie: two - due_date: 2017-11-15 - checkout_date: 2017-11-07 + due_date: <%= (Date.today + 7).to_s %> + checkout_date: <%= (Date.today).to_s %> checkin_date: + +checked_in: + customer: one + movie: one + due_date: <%= (Date.today - 2).to_s %> + checkout_date: <%= (Date.today - 9).to_s %> + checkin_date: <%= (Date.today - 2).to_s %> diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 5e9982553..a74ff8fa5 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -45,4 +45,29 @@ @invalid_rental.errors.messages[:checkout_date].must_include "Checkout date is required." end end + + describe 'overdue' do + it "returns an array of hashes" do + overdue_rentals = Rental.overdue + overdue_rentals.must_be_instance_of Array + overdue_rentals.each do |rental| + rental.must_be_instance_of Hash + end + end + + it "returns an empty array if no rentals are overdue" do + rentals(:one).destroy + overdue_rentals = Rental.overdue + overdue_rentals.must_equal [] + end + + it "provides the requested rental data" do + keys = ["title", "customer_id", "name", "postal_code", "checkout_date", "due_date"].sort + overdue_rentals = Rental.overdue + overdue_rentals.each do |rental| + rental.keys.sort.must_equal keys + end + + end + end end From 4ca4330c4f84528d9c37a2e1890d96717931289d Mon Sep 17 00:00:00 2001 From: Julia Date: Wed, 8 Nov 2017 10:40:54 -0800 Subject: [PATCH 30/32] created overdue route --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 24e964a6f..16d5fecf8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,7 @@ get '/movies/:id', to: 'movies#show', as: 'movie' post '/movies', to: 'movies#create', as: 'create_movie' + get '/rentals/overdue', to: 'rentals#overdue', as: 'overdue_rentals' post '/rentals/check-out', to: 'rentals#create', as: 'create_rental' post '/rentals/check-in', to: 'rentals#update', as: 'update_rental' end From 4441043948e67c8accce3cb9afc3b83a4dfec00f Mon Sep 17 00:00:00 2001 From: Julia Date: Wed, 8 Nov 2017 10:51:59 -0800 Subject: [PATCH 31/32] created overdue method in rentals_controller and associated testing --- app/controllers/rentals_controller.rb | 8 ++++++++ test/controllers/rentals_controller_test.rb | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e14fd6b09..7a0352f06 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -47,6 +47,14 @@ def update end end + def overdue + overdue_rentals = Rental.overdue + render( + json: overdue_rentals.as_json, + status: :ok + ) + end + private def rental_params diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 27153287e..9150a484a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -127,5 +127,23 @@ def update_rental end end + describe 'overdue' do + it "must respond with JSON" do + get overdue_rentals_path + response.header['Content-Type'].must_include 'json' + end + + it "returns only the required fields" do + get overdue_rentals_path + body = JSON.parse(response.body) + body.must_be_instance_of Array + keys = ["title", "customer_id", "name", "postal_code", "checkout_date", "due_date"].sort + body.each do |hash| + hash.must_be_instance_of Hash + hash.keys.sort.must_equal keys + end + end + end + end From 787d8ba203f46175b19b88e1f45d21bca21571d4 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Wed, 8 Nov 2017 11:38:57 -0800 Subject: [PATCH 32/32] Remove duplication of index customers method --- app/controllers/customers_controller.rb | 9 ++------- app/models/customer.rb | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index edb935923..e04aad616 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,15 +1,10 @@ class CustomersController < ApplicationController def index - customers = Customer.all - customers_array = [] - customers.each do |customer| - customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => customer.checkout_count) - customers_array << customer_hash - end + customers = Customer.index_customers render( - json: customers_array.to_json + json: customers.to_json ) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 2c08c7030..9e0fdb634 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,7 +5,7 @@ def self.index_customers customers = Customer.all customers_array = [] customers.each do |customer| - customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => 0) + customer_hash = customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]).merge('movies_checked_out_count' => customer.checkout_count) customers_array << customer_hash end return customers_array