From b0d8baaec60a41d6c7e8fa29e5bea8df6a0b65f6 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Mon, 7 May 2018 14:06:47 -0700 Subject: [PATCH 01/59] initial rails project created with special API template. --- .gitignore | 16 ++ Gemfile | 50 ++++++ Gemfile.lock | 154 ++++++++++++++++++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 35 ++++ bin/spring | 17 ++ bin/update | 29 ++++ config.ru | 5 + config/application.rb | 40 +++++ config/boot.rb | 3 + config/cable.yml | 10 ++ config/database.yml | 85 ++++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 ++++++ config/environments/production.rb | 83 ++++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 56 +++++++ config/routes.rb | 3 + config/secrets.yml | 32 ++++ config/spring.rb | 6 + db/schema.rb | 18 ++ 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 54 files changed, 925 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 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..78bff8d26 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..e547d2449 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,154 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.1 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..2fe7718ea --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..abc82221c --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..c79bf8071 --- /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: a0de3085bc1784c99e152b25dfe980aa8bc7a70d3ff2b47d0df52d7e77fa4554590d980517a18fa349fa19c4eddff9b77bc2187be506705879641bb2ef76681f + +test: + secret_key_base: 23ae9e746bc5c12ed7d3749c726315f6da3edc81fddd6b0ad84a37be55f7f3b8c49261e4ce39dfed4499ac9cc85548f6f53561e21b8a1727fcaf2c0c1d4360b8 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end 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 e94fc6d40470577119e8b5d50694a4b04a82c50a Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 15:13:34 -0700 Subject: [PATCH 02/59] added zomg --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..c4035106f 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', as: 'zomg' end From 1c5fed60d922ef21ca93696f46fbc489c6132140 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 15:36:42 -0700 Subject: [PATCH 03/59] added zong to app contoller --- app/controllers/application_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..7eed21804 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,4 @@ class ApplicationController < ActionController::API + def zomg + end end From 0a210181fe0cd1dc167616b028cd27d712f0a745 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 16:40:47 -0700 Subject: [PATCH 04/59] generated movie model --- app/models/movie.rb | 2 ++ db/migrate/20180507233706_create_movies.rb | 12 ++++++++++++ db/schema.rb | 11 ++++++++++- test/fixtures/movies.yml | 11 +++++++++++ test/models/movie_test.rb | 9 +++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20180507233706_create_movies.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb 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/20180507233706_create_movies.rb b/db/migrate/20180507233706_create_movies.rb new file mode 100644 index 000000000..674ab9ae8 --- /dev/null +++ b/db/migrate/20180507233706_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.text :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..c4216f5a2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,18 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20180507233706) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "movies", force: :cascade do |t| + t.string "title" + t.text "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/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 9d453573df37019cacd15c7276b4dd71000b15f7 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 16:56:13 -0700 Subject: [PATCH 05/59] started model for movie --- app/models/movie.rb | 2 ++ test/fixtures/movies.yml | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..aed1e9d89 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,4 @@ class Movie < ApplicationRecord + + validates :title#, presence: true, end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..4060693c1 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,14 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +# one: {} +# # column: value +# # +# two: {} +# # column: value + +day: + title: Independents Day + overview: The best worst movie ever + :release_date: 1996-07-04 + inventory: 10 From a5ff98728f8c44fd5e1b2d05fac08a3f53703a0f Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 17:07:22 -0700 Subject: [PATCH 06/59] generate customer model --- app/models/customer.rb | 2 ++ db/migrate/20180508000424_create_customers.rb | 15 +++++++++++++++ db/schema.rb | 14 +++++++++++++- test/fixtures/customers.yml | 11 +++++++++++ test/models/customer_test.rb | 9 +++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20180508000424_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/20180508000424_create_customers.rb b/db/migrate/20180508000424_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180508000424_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index c4216f5a2..e74751d9e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,23 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180507233706) do +ActiveRecord::Schema.define(version: 20180508000424) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "movies", force: :cascade do |t| t.string "title" t.text "overview" diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end From ff83391bcba913a2872f8a627e82d2b87cf64974 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 17:14:58 -0700 Subject: [PATCH 07/59] made customer yml --- app/models/customer.rb | 7 +++++++ test/fixtures/customers.yml | 26 ++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..427a87fd4 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,9 @@ class Customer < ApplicationRecord + validates :name + validates :registered_at + validates :address + validates :city + validates :state + validates :postal_code + validates :phone end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..f4b75c1e3 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,11 +1,17 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +ada: + name: Ada Lovelace + registered_at: Wed, 16 Apr 2017 21:40:20 -0700 + address: 123 Developers Academy Way + city: Seattle + state: WA + postal_code: 98102 + phone: (206) 949-6758 -# This model initially had no columns defined. If you add columns to the -# model remove the "{}" from the fixture names and add the columns immediately -# below each fixture, per the syntax in the comments below -# -one: {} -# column: value -# -two: {} -# column: value +grace: + name: Grace Hopper + registered_at: Mon, 30 Apr 2019 21:40:20 -0700 + address: 42 Pi Street + city: Atlanta + state: GA + postal_code: 30064 + phone: (770) 951-1599 From c52f9c284bc2f7ca9473f07249ab987b17809e70 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 17:37:42 -0700 Subject: [PATCH 08/59] added general validation tests for customer --- app/models/customer.rb | 14 +++++----- app/models/movie.rb | 2 +- test/models/customer_test.rb | 53 +++++++++++++++++++++++++++++++++--- 3 files changed, 57 insertions(+), 12 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 427a87fd4..06a15431a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,9 @@ class Customer < ApplicationRecord - validates :name - validates :registered_at - validates :address - validates :city - validates :state - validates :postal_code - validates :phone + validates :name, presence: true + # validates :registered_at + # validates :address + # validates :city + # validates :state + # validates :postal_code + # validates :phone end diff --git a/app/models/movie.rb b/app/models/movie.rb index aed1e9d89..8d3c78d8b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,4 @@ class Movie < ApplicationRecord - validates :title#, presence: true, + # validates :title#, presence: true, end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..0aad69af6 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,54 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? - end + # VALIDATE =================================================================== + describe "validate" do + let(:customer) { customers(:ada) } + let(:info) { + { + name: "Kathryn", + registered_at: DateTime.new("Wed, 16 Apr 2017 21:40:20 -0700"), + address: "321 Foo Street", + city: "Seattle", + state: "Washington", + postal_code: "12345", + phone: "(206) 123-4567" + } + } + + # general ------------------------------------------------------------------ + it "must be valid" do + customers(:ada).must_be :valid? + end + + it "must respond correctly after validation" do + customer.must_respond_to :name + customer.name.must_equal customers(:ada).name + + customer.must_respond_to :registered_at + customer.registered_at.must_equal customers(:ada).registered_at + + customer.must_respond_to :address + customer.address.must_equal customers(:ada).address + + customer.must_respond_to :city + customer.city.must_equal customers(:ada).city + + customer.must_respond_to :state + customer.state.must_equal customers(:ada).state + + customer.must_respond_to :postal_code + customer.postal_code.must_equal customers(:ada).postal_code + + customer.must_respond_to :phone + customer.phone.must_equal customers(:ada).phone + end + + # name --------------------------------------------------------------------- + it "must be valid" do + customers(:ada).must_be :valid? + end + + end # end of describe "validate" end From d51b5ce43caa724f7f677be68fa1c03c9dec7c77 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 17:55:53 -0700 Subject: [PATCH 09/59] added customer validation tests for name --- test/models/customer_test.rb | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0aad69af6..9f7ab22e8 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -8,7 +8,7 @@ let(:info) { { name: "Kathryn", - registered_at: DateTime.new("Wed, 16 Apr 2017 21:40:20 -0700"), + registered_at: "Wed, 16 Apr 2017 21:40:20 -0700", address: "321 Foo Street", city: "Seattle", state: "Washington", @@ -46,8 +46,22 @@ end # name --------------------------------------------------------------------- - it "must be valid" do - customers(:ada).must_be :valid? + it "must not validate with an invalid name" do + info[:name] = nil + customer = Customer.create(info) + customer.valid?.must_equal false + customer.errors.keys.must_equal [:name] + + info[:name] = " " + Customer.create(info).valid?.must_equal false + + info[:name] = "" + Customer.create(info).valid?.must_equal false + end + + it "must allow duplicate name" do + info[:name] = customers(:ada).name + Customer.create(info).valid?.must_equal true end end # end of describe "validate" From 112eca31f4905f69909fac06b9cab0bf187bb953 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 18:57:48 -0700 Subject: [PATCH 10/59] added registered_at tests for customer model --- app/models/customer.rb | 14 +++++++++++++- test/models/customer_test.rb | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 06a15431a..47a220374 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,21 @@ class Customer < ApplicationRecord validates :name, presence: true - # validates :registered_at + validate :date_in_future_or_error + # validates :address # validates :city # validates :state # validates :postal_code # validates :phone + + + private + + def date_in_future_or_error + if registered_at.nil? || registered_at > DateTime.now + # TODO: needed? || (!created_at.nil? && registered_at > created_at) + errors.add(:registered_at, "Invalid registration date") + end + end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 9f7ab22e8..dce7d1042 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -64,5 +64,27 @@ Customer.create(info).valid?.must_equal true end + # registered_at ------------------------------------------------------------ + it "must not validate with an invalid registered_at" do + info[:registered_at] = nil + customer = Customer.create(info) + customer.valid?.must_equal false + customer.errors.keys.must_equal [:registered_at] + + info[:registered_at] = DateTime.now + 1 + Customer.create(info).valid?.must_equal false + + info[:registered_at] = "foo" + Customer.create(info).valid?.must_equal false + end + + it "must allow registered_at today or before" do + info[:registered_at] = DateTime.now + Customer.create(info).valid?.must_equal true + + info[:registered_at] = DateTime.yesterday + Customer.create(info).valid?.must_equal true + end + end # end of describe "validate" end From a003bb30b7027e29fdcf603970cff7f2a5883f0e Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 19:01:19 -0700 Subject: [PATCH 11/59] added validation to city and address --- app/models/customer.rb | 11 +++++---- test/models/customer_test.rb | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 47a220374..96c3119b8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,12 +1,11 @@ class Customer < ApplicationRecord validates :name, presence: true validate :date_in_future_or_error - - # validates :address - # validates :city - # validates :state - # validates :postal_code - # validates :phone + validates :address, presence: true + validates :city, presence: true + # validates :state, presence: true + # validates :postal_code, presence: true + # validates :phone, presence: true private diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index dce7d1042..568ffbcd5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -64,6 +64,11 @@ Customer.create(info).valid?.must_equal true end + it "must allow name of one character" do + info[:name] = "a" + Customer.create(info).valid?.must_equal true + end + # registered_at ------------------------------------------------------------ it "must not validate with an invalid registered_at" do info[:registered_at] = nil @@ -86,5 +91,43 @@ Customer.create(info).valid?.must_equal true end + # address ------------------------------------------------------------------ + it "must not validate with an invalid address" do + info[:address] = nil + customer = Customer.create(info) + customer.valid?.must_equal false + customer.errors.keys.must_equal [:address] + + info[:address] = " " + Customer.create(info).valid?.must_equal false + + info[:address] = "" + Customer.create(info).valid?.must_equal false + end + + it "must allow address of one character" do + info[:address] = "a" + Customer.create(info).valid?.must_equal true + end + + # city --------------------------------------------------------------------- + it "must not validate with an invalid city" do + info[:city] = nil + customer = Customer.create(info) + customer.valid?.must_equal false + customer.errors.keys.must_equal [:city] + + info[:city] = " " + Customer.create(info).valid?.must_equal false + + info[:city] = "" + Customer.create(info).valid?.must_equal false + end + + it "must allow city of one character" do + info[:city] = "a" + Customer.create(info).valid?.must_equal true + end + end # end of describe "validate" end From d30c7fc0e169c50675d676f78517c34af8bc5ab9 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 19:05:33 -0700 Subject: [PATCH 12/59] added basic validation tests for customer model --- app/models/customer.rb | 6 ++-- test/models/customer_test.rb | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 96c3119b8..a98ef0315 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,9 +3,9 @@ class Customer < ApplicationRecord validate :date_in_future_or_error validates :address, presence: true validates :city, presence: true - # validates :state, presence: true - # validates :postal_code, presence: true - # validates :phone, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true private diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 568ffbcd5..a8f1aa499 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -129,5 +129,62 @@ Customer.create(info).valid?.must_equal true end + # state --------------------------------------------------------------------- + it "must not validate with an invalid state" do + info[:state] = nil + customer = Customer.create(info) + customer.valid?.must_equal false + customer.errors.keys.must_equal [:state] + + info[:state] = " " + Customer.create(info).valid?.must_equal false + + info[:state] = "" + Customer.create(info).valid?.must_equal false + end + + it "must allow state of one character" do + info[:state] = "a" + Customer.create(info).valid?.must_equal true + end + + # postal_code -------------------------------------------------------------- + it "must not validate with an invalid postal_code" do + info[:postal_code] = nil + customer = Customer.create(info) + customer.valid?.must_equal false + customer.errors.keys.must_equal [:postal_code] + + info[:postal_code] = " " + Customer.create(info).valid?.must_equal false + + info[:postal_code] = "" + Customer.create(info).valid?.must_equal false + end + + it "must allow postal_code of one character" do + info[:postal_code] = "1" + Customer.create(info).valid?.must_equal true + end + + # phone -------------------------------------------------------------------- + it "must not validate with an invalid phone" do + info[:phone] = nil + customer = Customer.create(info) + customer.valid?.must_equal false + customer.errors.keys.must_equal [:phone] + + info[:phone] = " " + Customer.create(info).valid?.must_equal false + + info[:phone] = "" + Customer.create(info).valid?.must_equal false + end + + it "must allow phone of one character" do + info[:phone] = "2" + Customer.create(info).valid?.must_equal true + end + end # end of describe "validate" end From a3a315aaae65325ea80cbe2144d37fed73db66e2 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 19:29:26 -0700 Subject: [PATCH 13/59] minor changes to customer model tests --- app/models/customer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index a98ef0315..a0f22301d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord + validates :name, presence: true validate :date_in_future_or_error validates :address, presence: true From 912ac16c435a4cbe86dc591f0f33684b01bef870 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 19:40:58 -0700 Subject: [PATCH 14/59] added customer show route --- app/controllers/customers_controller.rb | 2 ++ config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 7 +++++++ 3 files changed, 10 insertions(+) create mode 100644 app/controllers/customers_controller.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..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index c4035106f..784153a2a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do get '/zomg', to: 'application#zomg', as: 'zomg' + resources :customers, only: :show 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 From 8e279039c532e9bcef786297e7c790aa717a7b83 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 19:41:59 -0700 Subject: [PATCH 15/59] ...and by customer show I mean customer index --- app/controllers/customers_controller.rb | 1 + app/models/customer.rb | 1 - config/routes.rb | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..f7ee68140 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,3 @@ class CustomersController < ApplicationController + end diff --git a/app/models/customer.rb b/app/models/customer.rb index a0f22301d..596738684 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,7 +8,6 @@ class Customer < ApplicationRecord validates :postal_code, presence: true validates :phone, presence: true - private def date_in_future_or_error diff --git a/config/routes.rb b/config/routes.rb index 784153a2a..838512a4b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do get '/zomg', to: 'application#zomg', as: 'zomg' - resources :customers, only: :show + resources :customers, only: :index end From b6231e3f4f0d73f0ce3939af096c5071f2fe1f43 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Mon, 7 May 2018 19:48:45 -0700 Subject: [PATCH 16/59] made index in customer controller --- app/controllers/customers_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f7ee68140..12f3e4dc3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,3 +1,11 @@ class CustomersController < ApplicationController - + + def index + customers = Customer.all + render json: customers.as_json( + only:[:id, :name, :registered_at, :postal_code, :phone]), status: :ok + # TODO: add movies_checked_out_count when rentals are made + # :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count + end + end From a67da5082a14a034038869cb3a55e438ce11214c Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 06:35:43 -0700 Subject: [PATCH 17/59] The things I did on Monday afternoon that were not borked, namely, those that had to do with movie. --- app/models/movie.rb | 2 ++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/movie_test.rb | 9 +++++++++ 3 files changed, 24 insertions(+) create mode 100644 app/models/movie.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb 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/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..a9c472182 --- /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: MyText + release_date: 2018-05-07 + inventory: 1 + +two: + title: MyString + overview: MyText + release_date: 2018-05-07 + 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 bd857859035c550b7ce9b403d71dc25d36d70877 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 07:08:08 -0700 Subject: [PATCH 18/59] committing what wasn't broken after bad migration --- test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 2 files changed, 20 insertions(+) create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dab870f0f --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + check_out_date: 2018-05-07 + due_date: 2018-05-07 + check_in_date: 2018-05-07 + +two: + check_out_date: 2018-05-07 + due_date: 2018-05-07 + check_in_date: 2018-05-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 40c9768a8d16445a9d24054b2a5af52a72c8c4b7 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 07:17:29 -0700 Subject: [PATCH 19/59] rebuilt rental-related database stuff after bad migration-a-gogo. --- db/migrate/20180508141030_create_rentals.rb | 12 ++++++++++++ .../20180508141445_add_customer_to_rentals.rb | 5 +++++ .../20180508141557_add_movie_to_rentals.rb | 5 +++++ db/schema.rb | 16 +++++++++++++++- 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180508141030_create_rentals.rb create mode 100644 db/migrate/20180508141445_add_customer_to_rentals.rb create mode 100644 db/migrate/20180508141557_add_movie_to_rentals.rb diff --git a/db/migrate/20180508141030_create_rentals.rb b/db/migrate/20180508141030_create_rentals.rb new file mode 100644 index 000000000..83bb39ae0 --- /dev/null +++ b/db/migrate/20180508141030_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + + t.date :check_out_date + t.date :due_date + t.date :check_in_date + + t.timestamps + end + end +end diff --git a/db/migrate/20180508141445_add_customer_to_rentals.rb b/db/migrate/20180508141445_add_customer_to_rentals.rb new file mode 100644 index 000000000..f1d18a119 --- /dev/null +++ b/db/migrate/20180508141445_add_customer_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerToRentals < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20180508141557_add_movie_to_rentals.rb b/db/migrate/20180508141557_add_movie_to_rentals.rb new file mode 100644 index 000000000..9a3641926 --- /dev/null +++ b/db/migrate/20180508141557_add_movie_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieToRentals < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index e74751d9e..fc57ecc3d 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: 20180508000424) do +ActiveRecord::Schema.define(version: 20180508141557) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,18 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.date "check_out_date" + t.date "due_date" + t.date "check_in_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From e9c7c40b95904be0746790bfd158ca7d5c6ac545 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 08:45:05 -0700 Subject: [PATCH 20/59] first round of movie model tests passing after some fails. Want to make more fails before completely approving these, but they're good enough to push. Fail for date-object test still present because the test is still in draft form. --- app/models/movie.rb | 8 +++- app/models/rental.rb | 2 + test/fixtures/movies.yml | 42 ++++++++++++++++++- test/models/movie_test.rb | 86 +++++++++++++++++++++++++++++++++++++-- 4 files changed, 133 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 8d3c78d8b..94df2faae 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,10 @@ class Movie < ApplicationRecord - # validates :title#, presence: true, + has_many :rentals + + validates :title, presence: true, uniqueness: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 4060693c1..654c80063 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -13,5 +13,45 @@ day: title: Independents Day overview: The best worst movie ever - :release_date: 1996-07-04 + release_date: 1996-07-04 inventory: 10 +breakfast: + title: Breakfast at Tiffany's + overview: The original manic, pixie dreamgirl takes Manhattan + release_date: 1961-04-11 + inventory: 2 +backbone: + title: The Devil's Backbone + overview: As close as Guillermo del Toro ever gets to 'understated'. + release_date: 2001-04-20 + inventory: 5 +get: + title: Get Out + overview: The truest horror movie you'll ever see. + release_date: 2017-02-24 + inventory: 15 +once: + title: Once Upon a Time in Anatolia + overview: Want to watch something really long? Here you go!! + release_date: 2011-09-23 + inventory: 1 +synedoche: + title: Synecdoche, New York + overview: Of all Charlie Kauffman movies, this is the Charlie Kauffman-est. + release_date: 2008-11-21 + inventory: 3 +after: + title: After Last Season + overview: Some movies are so bad, they're good. And some movies are much, much worse. + release_date: 2009-06-05 + inventory: 12 +wanda: + title: Wanda + overview: Rarely seen, feminist touchstone crime film. + release_date: 1974-02-28 + inventory: 1 +lights: + title: City Lights + overview: The Little Tramp's best and most heartbreaking work. + release_date: 1931-03-07 + inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..b1c9975db 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,89 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? + let(:movie_new) { Movie.new } + let(:day) { movies(:day)} + + + describe "relations" do + + it "has many rentals" do + end + + it "returns an empty array if it has not been rented" do + end + + end + + describe "validations" do + + it "must be valid with expected paramater input" do + value(day).must_be :valid? + end + + it "has validation for empty parameters" do + movie_new.valid?.must_equal false + end + + it "has validation for title presence" do + day.title = nil + day.valid?.must_equal false + day.errors.messages.must_include :title + + day.title = "" + day.valid?.must_equal false + day.errors.messages.must_include :title + end + + it "has validation for title uniqueness" do + day_2 = Movie.new({ title: day.title, overview: "The worst, best movie ever", release_date: 1996-07-04, inventory: 1}) + day_2.valid?.must_equal false + day_2.errors.messages.must_include :title + end + + it "has validation for release_date presence" do + day.release_date = nil + day.valid?.must_equal false + day.errors.messages.must_include :release_date + + day.release_date = "" + day.valid?.must_equal false + day.errors.messages.must_include :release_date + end + + it "has validation for release_date's status as a Date object" do + + day.release_date = "July Fourth, ninety-six" + day.valid?.must_equal false + day.errors.messages.must_include :release_date + + day.release_date = 2 + day.valid?.must_equal false + day.errors.messages.must_include :release_date + end + + it "has validation for inventory presence" do + day.inventory = nil + day.valid?.must_equal false + day.errors.messages.must_include :inventory + + day.inventory = "" + day.valid?.must_equal false + day.errors.messages.must_include :inventory + end + + it "has validation for release_date's status as an integer" do + + day.inventory = "three on-hand" + day.valid?.must_equal false + day.errors.messages.must_include :inventory + + day.release_date = 3.1415 + day.valid?.must_equal false + day.errors.messages.must_include :inventory + end + end + end From 430a80673f6ac728c9ce9bbb15327c3f593b43b0 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 08:46:20 -0700 Subject: [PATCH 21/59] added a comment to failing, draft test to make its status clear. --- test/models/movie_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index b1c9975db..fcd74e5b9 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -54,6 +54,8 @@ it "has validation for release_date's status as a Date object" do + #THIS IS A DRAFT TEST. + day.release_date = "July Fourth, ninety-six" day.valid?.must_equal false day.errors.messages.must_include :release_date From 4e89020d5c44cf9edb2c2fcc38b17a64f360caab Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 09:12:52 -0700 Subject: [PATCH 22/59] added route for customers index --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 838512a4b..4a6d135b5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do get '/zomg', to: 'application#zomg', as: 'zomg' - resources :customers, only: :index + resources :customers, only: :index end From 2281e18e40a8259f1549e7086232a9078632a918 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 09:55:55 -0700 Subject: [PATCH 23/59] Basic controller files for movies created. --- app/controllers/movies_controller.rb | 10 ++++++++++ config/routes.rb | 6 ++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+) 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..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index c4035106f..759ef62b3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,9 @@ Rails.application.routes.draw do + get 'movies/index' + + get 'movies/show' + + get 'movies/create' + get '/zomg', to: 'application#zomg', as: 'zomg' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end From 04fa87b21e0235e00b83748debaf5e1291005682 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 10:39:26 -0700 Subject: [PATCH 24/59] created test for customer index --- test/controllers/customers_controller_test.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..5faaaff28 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,10 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "must get the index" do + get customers_path + must_respond_with :ok + end + end end From 98cf0b8124e6f077fe2a47ea8181f1bd949eecc3 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 11:26:42 -0700 Subject: [PATCH 25/59] snapshot of master before changing rental model logic completely --- app/models/customer.rb | 2 ++ app/models/movie.rb | 1 + app/models/rental.rb | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 596738684..60404c45f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals validates :name, presence: true validate :date_in_future_or_error diff --git a/app/models/movie.rb b/app/models/movie.rb index 94df2faae..6bd78bd30 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,7 @@ class Movie < ApplicationRecord has_many :rentals + has_many :customers, through: :rentals validates :title, presence: true, uniqueness: true validates :overview, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..574b0c6aa 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,26 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + validates :checked_out, inclusion: { in: [true, false] }, + exclusion: { in: [nil] } + + def self.check_out_date + return created_at.to_date + end + + def self.due_date + return created_at.to_date.next_week + end + + def self.overdue? + return checked_out && DateTime.now > due_date + end + + def self.return_rental + raise ArgumentError.new("Not checked out") if !checked_out + checked_out = false + movie.available_inventory += 1 + end + end From 41f1c25e46be65e7d706dd561f21bdbc5c02e8a2 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 11:35:54 -0700 Subject: [PATCH 26/59] removed columns from rental model --- db/migrate/20180508182942_change_rental_model.rb | 6 ++++++ db/schema.rb | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20180508182942_change_rental_model.rb diff --git a/db/migrate/20180508182942_change_rental_model.rb b/db/migrate/20180508182942_change_rental_model.rb new file mode 100644 index 000000000..07b9a7c27 --- /dev/null +++ b/db/migrate/20180508182942_change_rental_model.rb @@ -0,0 +1,6 @@ +class ChangeRentalModel < ActiveRecord::Migration[5.1] + def change + remove_column :rentals, :due_date, :date + remove_column :rentals, :check_out_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index fc57ecc3d..e08159d28 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: 20180508141557) do +ActiveRecord::Schema.define(version: 20180508182942) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,8 +37,6 @@ end create_table "rentals", force: :cascade do |t| - t.date "check_out_date" - t.date "due_date" t.date "check_in_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false From 03f5ecc087c6bf1a4ae80cd6d8ed7957cc2fdc4d Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 12:06:19 -0700 Subject: [PATCH 27/59] modified yml for rental model and laid out some model logic --- app/models/rental.rb | 58 +++++++++++++++++++++++++-------------- test/fixtures/rentals.yml | 12 ++++---- 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 574b0c6aa..59ce39dbe 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,25 +2,43 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validates :checked_out, inclusion: { in: [true, false] }, - exclusion: { in: [nil] } - - def self.check_out_date - return created_at.to_date - end - - def self.due_date - return created_at.to_date.next_week - end - - def self.overdue? - return checked_out && DateTime.now > due_date - end - - def self.return_rental - raise ArgumentError.new("Not checked out") if !checked_out - checked_out = false - movie.available_inventory += 1 - end + # after_commit :decrease_inventory, on: create + + # First video + validates :valid_check_in_date + + # validates :check_in_date, inclusion: { in: [true, false] }, + # exclusion: { in: [nil] } + + # def self.check_out_date + # return created_at.to_date + # end + # + # def self.due_date + # return created_at.to_date.next_week + # end + # + # def self.overdue? + # return checked_out && DateTime.now > due_date + # end + # + # def self.return_rental + # raise ArgumentError.new("Not checked out") if !checked_out + # checked_out = false + # movie.available_inventory += 1 + # end + + private + + # def self.decrease_inventory + # movie.available_inventory += 1 + # end + + + def valid_check_in_date + errors.add("Invalid check-in") if !check_in_date && check_in_date > Date.now + errors.add("Cannot change check-in date") if check_in_date + end + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dab870f0f..ffe7d2ce9 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +get_rental: check_out_date: 2018-05-07 - due_date: 2018-05-07 - check_in_date: 2018-05-07 + movie: get + customer: ada -two: +day_rental: check_out_date: 2018-05-07 - due_date: 2018-05-07 - check_in_date: 2018-05-07 + movie: day + customer: grace From 1e90053b45ad8d5349b47286022925715a027006 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 12:20:26 -0700 Subject: [PATCH 28/59] added initial validiation test and relationship test for rental model --- app/models/rental.rb | 6 ++++-- test/fixtures/rentals.yml | 8 ++++---- test/models/rental_test.rb | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 59ce39dbe..3f0a7639e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,7 +5,7 @@ class Rental < ApplicationRecord # after_commit :decrease_inventory, on: create # First video - validates :valid_check_in_date + validate :valid_check_in_date # validates :check_in_date, inclusion: { in: [true, false] }, # exclusion: { in: [nil] } @@ -36,7 +36,9 @@ class Rental < ApplicationRecord def valid_check_in_date - errors.add("Invalid check-in") if !check_in_date && check_in_date > Date.now + if !check_in_date.nil? && check_in_date > Date.today + errors.add("Invalid check-in") + end errors.add("Cannot change check-in date") if check_in_date end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index ffe7d2ce9..bc7bb02c8 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -get_rental: - check_out_date: 2018-05-07 +ada_get: + check_in_date: nil movie: get customer: ada -day_rental: - check_out_date: 2018-05-07 +grace_day: + check_in_date: nil movie: day customer: grace diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..4d7f7d89f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,41 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:ada_get) } + let(:info) { + { + check_in_date: "2018-05-07", + movie: movies(:breakfast), + customer: customers(:grace) + } + } - it "must be valid" do - value(rental).must_be :valid? + # VALIDATION ================================================================= + describe "valid" do + it "must be valid" do + rental.must_be :valid? + end + + it "must respond correctly" do + rental.must_respond_to :check_in_date + rental.check_in_date.must_be_nil + end + + it "must have relationships" do + rental.must_respond_to :customer + rental.customer.must_equal customers(:ada) + rental.customer.must_be_kind_of Customer + + rental.must_respond_to :movie + rental.movie.must_equal movies(:get) + rental.movie.must_be_kind_of Movie + + end + + # # check_in_date + # it "must be valid" do + # rental.must_be :valid? + # end end + end From 4c1fa04d9d2fa3922de08aa7fe0167ce74a10465 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 12:24:14 -0700 Subject: [PATCH 29/59] added relationship tests to rental model --- test/models/rental_test.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 4d7f7d89f..7e788da27 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -21,15 +21,19 @@ rental.check_in_date.must_be_nil end - it "must have relationships" do + it "must have relationships with customer" do rental.must_respond_to :customer rental.customer.must_equal customers(:ada) rental.customer.must_be_kind_of Customer + rental.customer.movies.must_include rental.movie # through relationship + end + it "must have relationships with movie" do rental.must_respond_to :movie rental.movie.must_equal movies(:get) rental.movie.must_be_kind_of Movie - + rental.movie.rentals.must_include rental + rental.movie.customers.must_include rental.customer # through relationship end # # check_in_date From 52bbbad521f1fbdaf80821c5475ab62bb9286b76 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 13:35:00 -0700 Subject: [PATCH 30/59] cleaned up date validation for rental model --- app/models/rental.rb | 26 +++++++------------------- test/models/rental_test.rb | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 3f0a7639e..98a3014d7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,13 +2,9 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - # after_commit :decrease_inventory, on: create - # First video - validate :valid_check_in_date - - # validates :check_in_date, inclusion: { in: [true, false] }, - # exclusion: { in: [nil] } + validates :check_in_date, inclusion: { :in => (Date.new(2013,12,31)..Date.today) }, + allow_nil: true # def self.check_out_date # return created_at.to_date @@ -28,19 +24,11 @@ class Rental < ApplicationRecord # movie.available_inventory += 1 # end - private - - # def self.decrease_inventory - # movie.available_inventory += 1 - # end - +private - def valid_check_in_date - if !check_in_date.nil? && check_in_date > Date.today - errors.add("Invalid check-in") - end - errors.add("Cannot change check-in date") if check_in_date + def valid_check_in_date + if !check_in_date.nil? && check_in_date > Date.today + errors.add(:check_in_date, "Invalid check-in") end - - + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 7e788da27..bb7aac54d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -21,6 +21,7 @@ rental.check_in_date.must_be_nil end + # relationships ------------------------------------------------------------ it "must have relationships with customer" do rental.must_respond_to :customer rental.customer.must_equal customers(:ada) @@ -36,10 +37,38 @@ rental.movie.customers.must_include rental.customer # through relationship end - # # check_in_date - # it "must be valid" do - # rental.must_be :valid? - # end + # check_in_date ------------------------------------------------------------ + it "must allow nil check_in_date" do + info[:check_in_date] = nil + rental = Rental.create(info) + rental.must_be :valid? + end + + it "must allow check_in_date to change from nil" do + info[:check_in_date] = nil + rental = Rental.create(info) + # puts "_____" + # puts rental.inspect + + rental.update(check_in_date: Date.today) + rental.must_be :valid? + # puts rental.errors.inspect + end + + it "must not allow invalid check_in_date" do + info[:check_in_date] = Date.tomorrow + bad_rental = Rental.create(info) + bad_rental.valid?.must_equal false + bad_rental.errors.keys.must_equal [:check_in_date] + end + + it "must not allow invalid check_in_date" do + info[:check_in_date] = Date.tomorrow + bad_rental = Rental.new(info) + bad_rental.valid?.must_equal false + bad_rental.errors.keys.must_equal [:check_in_date] + end + end end From e6c6ca106f81dbdfc311a942e10840d7681c0a67 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 13:46:13 -0700 Subject: [PATCH 31/59] undid all the changes I made in an effort to get the output of the available_inventory method into the database. Starting fresh with passing tests. --- app/controllers/movies_controller.rb | 17 ++++++++ app/models/movie.rb | 7 ++++ ...190035_add_availableinventory_to_movies.rb | 5 +++ ...3_remove_availableinventory_from_movies.rb | 5 +++ db/schema.rb | 2 +- test/fixtures/movies.yml | 8 ++-- test/models/movie_test.rb | 39 ++++++++++++++++++- 7 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20180508190035_add_availableinventory_to_movies.rb create mode 100644 db/migrate/20180508203533_remove_availableinventory_from_movies.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..32b23ca6a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,10 +1,27 @@ class MoviesController < ApplicationController def index + movies = Movie.all + render :json => movies.as_json(only: [:id, :title, :release_date]), status: :ok end def show + movie = Movie.find_by(id: ) + render :json => movies.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok end def create end + + private + + def user_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end + + +title +overview +release_date +inventory (total) +available_inventory diff --git a/app/models/movie.rb b/app/models/movie.rb index 94df2faae..5739f125f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,7 @@ class Movie < ApplicationRecord + attr_accessor :available_inventory + has_many :rentals validates :title, presence: true, uniqueness: true @@ -7,4 +9,9 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + def available_inventory + #Note: This is a placeholder method, and it's here just so that Movie's show method will serve the right stuff. It will have to evolve in later waves. + + self.inventory + end end diff --git a/db/migrate/20180508190035_add_availableinventory_to_movies.rb b/db/migrate/20180508190035_add_availableinventory_to_movies.rb new file mode 100644 index 000000000..c913af583 --- /dev/null +++ b/db/migrate/20180508190035_add_availableinventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableinventoryToMovies < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/migrate/20180508203533_remove_availableinventory_from_movies.rb b/db/migrate/20180508203533_remove_availableinventory_from_movies.rb new file mode 100644 index 000000000..2e6ad7358 --- /dev/null +++ b/db/migrate/20180508203533_remove_availableinventory_from_movies.rb @@ -0,0 +1,5 @@ +class RemoveAvailableinventoryFromMovies < ActiveRecord::Migration[5.1] + def change + remove_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index fc57ecc3d..cac103b82 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: 20180508141557) do +ActiveRecord::Schema.define(version: 20180508203533) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 654c80063..5e5e9a280 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -17,17 +17,17 @@ day: inventory: 10 breakfast: title: Breakfast at Tiffany's - overview: The original manic, pixie dreamgirl takes Manhattan + overview: The original manic pixie dreamgirl takes Manhattan release_date: 1961-04-11 inventory: 2 backbone: title: The Devil's Backbone - overview: As close as Guillermo del Toro ever gets to 'understated'. + overview: As close as Guillermo del Toro ever gets to understatement. release_date: 2001-04-20 inventory: 5 get: title: Get Out - overview: The truest horror movie you'll ever see. + overview: We have met the enemy and he is us. release_date: 2017-02-24 inventory: 15 once: @@ -52,6 +52,6 @@ wanda: inventory: 1 lights: title: City Lights - overview: The Little Tramp's best and most heartbreaking work. + overview: The Little Tramp's most heartbreaking work. This cut lacks the legendary drain-poking scene. release_date: 1931-03-07 inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index fcd74e5b9..58a3427f3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -54,6 +54,7 @@ it "has validation for release_date's status as a Date object" do + skip #THIS IS A DRAFT TEST. day.release_date = "July Fourth, ninety-six" @@ -75,17 +76,51 @@ day.errors.messages.must_include :inventory end - it "has validation for release_date's status as an integer" do + it "has validation for inventory's status as a postive integer" do + + day.inventory = 0 + day.valid?.must_equal true day.inventory = "three on-hand" day.valid?.must_equal false day.errors.messages.must_include :inventory - day.release_date = 3.1415 + day.inventory = 3.1415 day.valid?.must_equal false day.errors.messages.must_include :inventory + + day.inventory = -7 + day.valid?.must_equal false + day.errors.messages.must_include :inventory + end + + end + + describe "methods" do + + describe "available_inventory" do + + let(:breakfast) { movies(:breakfast)} + + it "returns the correct figure for a given movie with one or more copies available" do + + day.available_inventory.must_equal 10 + + end + + it "returns the correct figure for a given movie with zero copies available" do + + #This version of this test is sort of a place-holder: Once we get checkout mechanisms working in wave 3 and later, it will have to be dramatically redone. + + breakfast.inventory = 0 + + breakfast.available_inventory.must_equal 0 + + end + end + end end From 51f8390b9423ee76fbb193263b98f5a758dad710 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 14:22:15 -0700 Subject: [PATCH 32/59] rental model date validates and tears --- app/models/rental.rb | 8 +++++--- test/models/rental_test.rb | 27 ++++++++++++++------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 98a3014d7..a0c052a74 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,8 +3,7 @@ class Rental < ApplicationRecord belongs_to :movie - validates :check_in_date, inclusion: { :in => (Date.new(2013,12,31)..Date.today) }, - allow_nil: true + validate :valid_check_in_date # def self.check_out_date # return created_at.to_date @@ -27,8 +26,11 @@ class Rental < ApplicationRecord private def valid_check_in_date - if !check_in_date.nil? && check_in_date > Date.today + return if check_in_date.nil? + if check_in_date > Date.today || (!created_at.nil? && check_in_date < created_at.to_date) errors.add(:check_in_date, "Invalid check-in") end + + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index bb7aac54d..714993c21 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -42,31 +42,32 @@ info[:check_in_date] = nil rental = Rental.create(info) rental.must_be :valid? + rental.check_in_date.must_be_nil + end - it "must allow check_in_date to change from nil" do - info[:check_in_date] = nil + it "must allow check_in_date of today" do + info[:check_in_date] = Date.today rental = Rental.create(info) - # puts "_____" - # puts rental.inspect - - rental.update(check_in_date: Date.today) rental.must_be :valid? - # puts rental.errors.inspect + rental.check_in_date.must_equal Date.today end - it "must not allow invalid check_in_date" do + it "must not allow check in date after today" do info[:check_in_date] = Date.tomorrow bad_rental = Rental.create(info) bad_rental.valid?.must_equal false bad_rental.errors.keys.must_equal [:check_in_date] end - it "must not allow invalid check_in_date" do - info[:check_in_date] = Date.tomorrow - bad_rental = Rental.new(info) - bad_rental.valid?.must_equal false - bad_rental.errors.keys.must_equal [:check_in_date] + it "must not allow check in date before created_at" do + rental.update(created_at: "2017-02-04") + + # rental.must_be :valid? # just checking to be sure + rental.update(check_in_date: "2017-02-03") + + rental.valid?.must_equal false + rental.errors.keys.must_equal [:check_in_date] end end From 0d7974cf07f6a819c26d3a7ea568716ba3229b56 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 14:25:43 -0700 Subject: [PATCH 33/59] tidied up --- app/models/rental.rb | 29 +++++++++++++++-------------- test/models/rental_test.rb | 13 +++++++++---- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index a0c052a74..3164a75bd 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,20 +2,23 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validate :valid_check_in_date - # def self.check_out_date - # return created_at.to_date - # end - # - # def self.due_date - # return created_at.to_date.next_week - # end - # - # def self.overdue? - # return checked_out && DateTime.now > due_date - # end + def self.check_out_date + return created_at.to_date + end + + def self.due_date + return created_at.to_date.next_week + end + + def self.overdue + return checked_out && Date.now > due_date + end + + def self.checked_out + return !check_out_date.nil? + end # # def self.return_rental # raise ArgumentError.new("Not checked out") if !checked_out @@ -30,7 +33,5 @@ def valid_check_in_date if check_in_date > Date.today || (!created_at.nil? && check_in_date < created_at.to_date) errors.add(:check_in_date, "Invalid check-in") end - - end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 714993c21..898e9c103 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -62,14 +62,19 @@ it "must not allow check in date before created_at" do rental.update(created_at: "2017-02-04") - - # rental.must_be :valid? # just checking to be sure rental.update(check_in_date: "2017-02-03") - rental.valid?.must_equal false rental.errors.keys.must_equal [:check_in_date] end - end + end # end of VALIDATION + + # CHECK_OUT_DATE ============================================================= + # describe "valid" do + # it "must be valid" do + # rental.must_be :valid? + # end + # end + end From 7a58880e4dad4865be2eb96db97f1e43f44df2f2 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 14:30:18 -0700 Subject: [PATCH 34/59] created rentals controller and updated routes --- app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 3 files changed, 11 insertions(+) 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..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index b8d195357..81a4a16e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,4 +7,6 @@ get '/zomg', to: 'application#zomg', as: 'zomg' resources :customers, only: :index + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 874e6789a4650f85f6713871137920c9f66947e9 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 15:29:41 -0700 Subject: [PATCH 35/59] added rental controller checkout logic --- app/controllers/rentals_controller.rb | 20 ++++++++++++++++++++ app/models/rental.rb | 14 ++++++++------ test/fixtures/customers.yml | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..9108148cd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,22 @@ class RentalsController < ApplicationController + + def checkout + rental = Rental.create(rental_params) + if rental.valid? + render json: { + id: rental.id, + due_date: rental.due_date, + checked_out?: rental.checked_out?, + overdue?: rental.overdue? + }, status: :ok + else + render json: { errors: rental.errors.messages }, + status: :bad_request + end + end + + private + def rental_params + params.require(:rental).permit(:check_in_date, :movie_id, :customer_id) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 3164a75bd..445d72e4d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,19 +4,19 @@ class Rental < ApplicationRecord validate :valid_check_in_date - def self.check_out_date + def check_out_date return created_at.to_date end - def self.due_date + def due_date return created_at.to_date.next_week end - def self.overdue - return checked_out && Date.now > due_date + def is_overdue? + return checked_out? && Date.today > due_date end - def self.checked_out + def is_checked_out? return !check_out_date.nil? end # @@ -30,7 +30,9 @@ def self.checked_out def valid_check_in_date return if check_in_date.nil? - if check_in_date > Date.today || (!created_at.nil? && check_in_date < created_at.to_date) + if check_in_date > Date.today || (!created_at.nil? && check_in_date < created_at.to_date) || + # TODO: test these last two!! + check_in_date < customer.registered_at || check_in_date < movie.release_date errors.add(:check_in_date, "Invalid check-in") end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index f4b75c1e3..17bf4c96a 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -9,7 +9,7 @@ ada: grace: name: Grace Hopper - registered_at: Mon, 30 Apr 2019 21:40:20 -0700 + registered_at: Mon, 30 Apr 2018 21:40:20 -0700 address: 42 Pi Street city: Atlanta state: GA From e0d66de31ca90d6ea4a792d376cd0b3eefb99904 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 15:53:50 -0700 Subject: [PATCH 36/59] fix some problems I definitely caused --- app/controllers/rentals_controller.rb | 6 +++--- app/models/rental.rb | 20 ++++++++++---------- test/models/rental_test.rb | 20 ++++++++++++++------ 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9108148cd..bacbbccc6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,9 +5,9 @@ def checkout if rental.valid? render json: { id: rental.id, - due_date: rental.due_date, - checked_out?: rental.checked_out?, - overdue?: rental.overdue? + due_date: rental.get_due_date, + checked_out?: rental.is_checked_out?, + overdue?: rental.is_overdue? }, status: :ok else render json: { errors: rental.errors.messages }, diff --git a/app/models/rental.rb b/app/models/rental.rb index 445d72e4d..1892f8806 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,24 +2,24 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validate :valid_check_in_date + validate :valid_get_check_in_date - def check_out_date - return created_at.to_date + def get_check_out_date + return created_at.to_date if !created_at.nil? end - def due_date - return created_at.to_date.next_week + def get_due_date + return get_check_out_date.next_week end def is_overdue? - return checked_out? && Date.today > due_date + return is_checked_out? && Date.today > get_due_date end def is_checked_out? - return !check_out_date.nil? + return get_check_out_date.nil? end - # + # def self.return_rental # raise ArgumentError.new("Not checked out") if !checked_out # checked_out = false @@ -28,9 +28,9 @@ def is_checked_out? private - def valid_check_in_date + def valid_get_check_in_date return if check_in_date.nil? - if check_in_date > Date.today || (!created_at.nil? && check_in_date < created_at.to_date) || + if check_in_date > Date.today || (!created_at.nil? && check_in_date < get_check_out_date) || # TODO: test these last two!! check_in_date < customer.registered_at || check_in_date < movie.release_date errors.add(:check_in_date, "Invalid check-in") diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 898e9c103..b5ad0654e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -69,12 +69,20 @@ end # end of VALIDATION - # CHECK_OUT_DATE ============================================================= - # describe "valid" do - # it "must be valid" do - # rental.must_be :valid? - # end - # end + # get_check_out_date ============================================================= + describe "get_check_out_date" do + it "has a get_check_out_date" do + rental.must_respond_to :get_check_out_date + end + + it "has a checkout date that is a Date" do + rental.get_check_out_date.must_be_kind_of Date + end + + it "sets its get_check_out_date to be the date created" do + rental.get_check_out_date.must_equal rental.created_at.to_date + end + end end From 8aeb2ad6bb2b70a51229337c81cf31eb97c7b80d Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 15:54:03 -0700 Subject: [PATCH 37/59] roughed out the controller for Movie. --- app/controllers/movies_controller.rb | 32 ++++++++++++++++++++-------- app/models/movie.rb | 4 +--- app/models/rental.rb | 2 +- config/routes.rb | 2 +- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 32b23ca6a..62c53601c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,5 @@ class MoviesController < ApplicationController + def index movies = Movie.all render :json => movies.as_json(only: [:id, :title, :release_date]), status: :ok @@ -6,22 +7,35 @@ def index def show movie = Movie.find_by(id: ) - render :json => movies.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + if movie + render :json { + id: movie.id, + title: movie.title, + overview: movie.overview, + release_date: movie.release_date, + inventory: movie.inventory, + available_inventory: movie.available_inventory + }, status: ok + else + render json: {ok: false}, status: :not_found + end end def create + movie = Movie.create(rental_params) + if movie.valid? + render json: { + id: movie.id + }, status: :ok + else + render json: { errors: movie.errors.messages }, + status: :bad_request + end end private - def user_params + def movie_params params.require(:movie).permit(:title, :overview, :release_date, :inventory) end end - - -title -overview -release_date -inventory (total) -available_inventory diff --git a/app/models/movie.rb b/app/models/movie.rb index c2c637093..a60e75099 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,5 @@ class Movie < ApplicationRecord - attr_accessor :available_inventory - has_many :rentals has_many :customers, through: :rentals @@ -11,7 +9,7 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } def available_inventory - #Note: This is a placeholder method, and it's here just so that Movie's show method will serve the right stuff. It will have to evolve in later waves. + #Note: This is a placeholder method, and it's here just so that Movie's show method will serve up the right stuff during early-wave tests. It will have to evolve in later waves. self.inventory end diff --git a/app/models/rental.rb b/app/models/rental.rb index 445d72e4d..03a8fee0f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -17,7 +17,7 @@ def is_overdue? end def is_checked_out? - return !check_out_date.nil? + return check_out_date.nil? end # # def self.return_rental diff --git a/config/routes.rb b/config/routes.rb index 81a4a16e1..18e391957 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ get 'movies/show' - get 'movies/create' + post 'movies/create' get '/zomg', to: 'application#zomg', as: 'zomg' resources :customers, only: :index From fa3dfca73dfc032109d0fe0e02e571581f3a6b6d Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Tue, 8 May 2018 15:58:58 -0700 Subject: [PATCH 38/59] this holds a teensy, teensy change to the schema that was produced by a merge conflict. It has zero effects on the functionality of anything. --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index e08159d28..f4ba1d3b6 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: 20180508182942) do +ActiveRecord::Schema.define(version: 20180508203533) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From cfd24b7c571f60eeca3bf40ae61a729e76a81fcc Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 17:19:33 -0700 Subject: [PATCH 39/59] timezones broke test so set time --- app/models/rental.rb | 4 +++- config/application.rb | 2 ++ test/models/rental_test.rb | 43 +++++++++++++++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 1892f8806..e10ade130 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -13,11 +13,13 @@ def get_due_date end def is_overdue? + puts is_checked_out? + puts Date.today > get_due_date return is_checked_out? && Date.today > get_due_date end def is_checked_out? - return get_check_out_date.nil? + return check_in_date.nil? end # def self.return_rental diff --git a/config/application.rb b/config/application.rb index 2fe7718ea..23c51b790 100644 --- a/config/application.rb +++ b/config/application.rb @@ -36,5 +36,7 @@ class Application < Rails::Application # Middleware like session, flash, cookies can be added back manually. # Skip views, helpers and assets when generating a new resource. config.api_only = true + + config.time_zone = 'Pacific Time (US & Canada)' end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index b5ad0654e..22863903e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -69,7 +69,7 @@ end # end of VALIDATION - # get_check_out_date ============================================================= + # GET_CHECK_OUT_DATE ========================================================= describe "get_check_out_date" do it "has a get_check_out_date" do rental.must_respond_to :get_check_out_date @@ -84,5 +84,46 @@ end end + # GET_DUE_DATE =============================================================== + describe "get_due_date" do + it "has a get_due_date" do + rental.must_respond_to :get_due_date + end + + it "has a get_due_date date that is a Date" do + rental.get_due_date.must_be_kind_of Date + end + + it "sets its get_due_date to be the date created + 1 week" do + rental.get_due_date.must_equal rental.created_at.to_date.next_week + end + end + + # IS_OVERDUE? ================================================================ + describe "is_overdue?" do + it "has a is_overdue?" do + rental.must_respond_to :is_overdue? + end + + it "initializes with is_overdue?" do + new_rental = Rental.create(info) + new_rental.is_overdue?.must_equal false + end + + it "sets to true after a week and one day checked out" do + new_rental = Rental.create(info) + new_rental.update(created_at: Date.yesterday.last_week) + new_rental.update(check_in_date: nil) + puts new_rental.created_at + puts new_rental.get_due_date + puts new_rental.check_in_date + new_rental.is_overdue?.must_equal true + end + + # it "sets its get_due_date to be the date created + 1 week" do + # rental.get_due_date.must_equal rental.created_at.to_date.next_week + # end + end + end From 4b6d48931d36913c7f33bc2e4231a89db19a9361 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Tue, 8 May 2018 17:32:24 -0700 Subject: [PATCH 40/59] additional date methods for rental --- app/models/customer.rb | 2 +- app/models/rental.rb | 2 -- test/models/customer_test.rb | 4 ++-- test/models/rental_test.rb | 21 ++++++++++++++------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 60404c45f..08cda1c36 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -13,7 +13,7 @@ class Customer < ApplicationRecord private def date_in_future_or_error - if registered_at.nil? || registered_at > DateTime.now + if registered_at.nil? || registered_at > DateTime.current # TODO: needed? || (!created_at.nil? && registered_at > created_at) errors.add(:registered_at, "Invalid registration date") end diff --git a/app/models/rental.rb b/app/models/rental.rb index e10ade130..47d51b5aa 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -13,8 +13,6 @@ def get_due_date end def is_overdue? - puts is_checked_out? - puts Date.today > get_due_date return is_checked_out? && Date.today > get_due_date end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a8f1aa499..3cd7d240e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -76,7 +76,7 @@ customer.valid?.must_equal false customer.errors.keys.must_equal [:registered_at] - info[:registered_at] = DateTime.now + 1 + info[:registered_at] = DateTime.current + 1 Customer.create(info).valid?.must_equal false info[:registered_at] = "foo" @@ -84,7 +84,7 @@ end it "must allow registered_at today or before" do - info[:registered_at] = DateTime.now + info[:registered_at] = DateTime.current Customer.create(info).valid?.must_equal true info[:registered_at] = DateTime.yesterday diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 22863903e..da3efd48f 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -107,22 +107,29 @@ it "initializes with is_overdue?" do new_rental = Rental.create(info) + new_rental.update(check_in_date: nil) + new_rental.is_overdue?.must_equal false + end + + it "is still false on the day it's due" do + new_rental = Rental.create(info) + new_rental.update(created_at: new_rental.get_due_date) new_rental.is_overdue?.must_equal false end - it "sets to true after a week and one day checked out" do + it "sets to true after a week and one day and checked out" do new_rental = Rental.create(info) new_rental.update(created_at: Date.yesterday.last_week) new_rental.update(check_in_date: nil) - puts new_rental.created_at - puts new_rental.get_due_date - puts new_rental.check_in_date new_rental.is_overdue?.must_equal true end - # it "sets its get_due_date to be the date created + 1 week" do - # rental.get_due_date.must_equal rental.created_at.to_date.next_week - # end + it "is not overdue if not checked out" do + new_rental = Rental.create(info) + new_rental.update(created_at: Date.yesterday.last_week) + new_rental.update(check_in_date: Date.current) + new_rental.is_overdue?.must_equal false + end end From acb445a95fee7b9ca2914b764667dcc29822b157 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 08:46:01 -0700 Subject: [PATCH 41/59] Full set of movie controller tests are written and passing, after appropriate fails. --- app/controllers/movies_controller.rb | 24 ++- config/routes.rb | 8 +- test/controllers/movies_controller_test.rb | 184 +++++++++++++++++++-- test/models/movie_test.rb | 3 +- 4 files changed, 194 insertions(+), 25 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 62c53601c..4060a6804 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,3 +1,5 @@ + + class MoviesController < ApplicationController def index @@ -6,29 +8,33 @@ def index end def show - movie = Movie.find_by(id: ) - if movie - render :json { + movie = Movie.find_by(id: params[:id]) + if !movie.nil? + render :json => { id: movie.id, title: movie.title, overview: movie.overview, release_date: movie.release_date, inventory: movie.inventory, - available_inventory: movie.available_inventory - }, status: ok + available_inventory: movie.available_inventory, + ok: true + } else render json: {ok: false}, status: :not_found end end def create - movie = Movie.create(rental_params) + movie = Movie.create(movie_params) if movie.valid? render json: { - id: movie.id - }, status: :ok + id: movie.id, + ok: true }, status: :ok else - render json: { errors: movie.errors.messages }, + render json: { + errors: movie.errors.messages, + ok: false + }, status: :bad_request end end diff --git a/config/routes.rb b/config/routes.rb index 18e391957..c61379e25 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,12 @@ Rails.application.routes.draw do - get 'movies/index' - get 'movies/show' - - post 'movies/create' + resources :movies, only: [:index, :show, :create] get '/zomg', to: 'application#zomg', as: 'zomg' + resources :customers, only: :index + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' post '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..eee6adf80 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,183 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end - it "should get show" do - get movies_show_url - value(response).must_be :success? + describe "index" do + + it "must have a functional route" do + + get movies_path + must_respond_with :ok + + end + + it "must return JSON" do + + get movies_url + response.header['Content-Type'].must_include 'json' + + end + + it "must return an Array of the correct length" do + + get movies_url + body = JSON.parse(response.body) + + body.must_be_kind_of Array + body.length.must_equal Movie.count + + end + + it "returns JSON with exactly the required fields" do + required_index_keys = %w(id release_date title) + get movies_url + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal required_index_keys + end + + end + + end + + describe "show" do + + it "must have a working route" do + get movie_url(movies(:breakfast).id) + value(response).must_be :success? + end + + it "must return JSON" do + + get movie_url(movies(:wanda).id) + response.header['Content-Type'].must_include 'json' + + end + + it "must return the correct HTTP status messsage for an existing movie" do + + get movie_url(movies(:lights).id) + must_respond_with :ok + + end + + it "must return the correct collection of JSON fields, which must contain the correct info for the movie " do + + #Arrange/Act + get movie_url(movies(:once).id) + + #Obtain and organize resulting data + body = JSON.parse(response.body) + + #Form of JSON outpout must be correct + body.must_be_kind_of Hash + body.keys.count.must_equal 7 + + #Specific JSON keys must be correct + required_show_keys = %w(available_inventory id inventory ok overview release_date title) + body.keys.sort.must_equal required_show_keys + + #Information assigned to the keys must be correct + body["title"].must_equal "Once Upon a Time in Anatolia" + body["inventory"].must_equal 1 + body["overview"].must_equal "Want to watch something really long? Here you go!!" + + #The expected information must correspond to what's in the database + confirm_info_movie = Movie.find_by(title: body["title"]) + confirm_info_movie.id.must_equal movies(:once).id + confirm_info_movie.inventory.must_equal movies(:once).inventory + confirm_info_movie.release_date.must_equal movies(:once).release_date + + end + + it "must provide the correct response for a non-existent movie" do + + #Arrange + unmovie = movies(:after) + unmovie.destroy + + #Act + get movie_url(movies(:after).id) + + #Organize/interpret resulting + body = JSON.parse(response.body) + + #Assert: + ### HTTP response must be correct + must_respond_with :not_found + + ###Form of JSON outpout must be correct + body.must_be_kind_of Hash + body.keys.count.must_equal 1 + body.keys.must_include "ok" + + ###Content of JSON output must be correct + body["ok"].must_equal false + + end + end - it "should get create" do - get movies_create_url - value(response).must_be :success? + describe "create" do + + let(:movie_data) { + { + title: "Mothlight", + overview: "Three life-changing minutes of dead moths.", + release_date: Date.parse('01-01-1963'), + inventory: 27, + } + } + + it "creates a new movie when given complete, valid data" do + + before_count = Movie.all.count + + post movies_path, params: {movie: + + { title: "Mothlight", + overview: "Three life-changing minutes of dead moths.", + release_date: Date.parse('01-01-1963'), + inventory: 27,} + } + + must_respond_with :success + after_count = Movie.all.count + + test_movie = Movie.last + + (after_count - before_count).must_equal 1 + + test_movie.title.must_equal "Mothlight" + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.wont_include "errors" + body.keys.must_include "id" + Movie.find(body["id"]).title.must_equal "Mothlight" + body.must_include "ok" + body["ok"].must_equal true + + end + + it "does not create a new movie when given incomplete data" do + + movie_data[:title] = nil + + proc { + post movies_url, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "title" + body.must_include "ok" + body["ok"].must_equal false + + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 58a3427f3..ebb5ee916 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -92,6 +92,7 @@ day.inventory = -7 day.valid?.must_equal false day.errors.messages.must_include :inventory + end end @@ -105,7 +106,6 @@ it "returns the correct figure for a given movie with one or more copies available" do day.available_inventory.must_equal 10 - end it "returns the correct figure for a given movie with zero copies available" do @@ -115,7 +115,6 @@ breakfast.inventory = 0 breakfast.available_inventory.must_equal 0 - end end From 4f1dde0d365a621b63f41486c8c170e1da626193 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 09:13:55 -0700 Subject: [PATCH 42/59] Okay, so there was one fail in the Movies controller test. But I fixed it. --- test/controllers/movies_controller_test.rb | 35 ++++++++++++---------- test/models/movie_test.rb | 8 +++-- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index eee6adf80..bb32b2778 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -131,32 +131,37 @@ it "creates a new movie when given complete, valid data" do + #Arrange before_count = Movie.all.count - post movies_path, params: {movie: - - { title: "Mothlight", - overview: "Three life-changing minutes of dead moths.", - release_date: Date.parse('01-01-1963'), - inventory: 27,} - } + #Act + post movies_path, params: {movie: movie_data} + #Assert / Validate test must_respond_with :success - after_count = Movie.all.count + #Gather and organize result data + after_count = Movie.all.count test_movie = Movie.last - - (after_count - before_count).must_equal 1 - - test_movie.title.must_equal "Mothlight" - body = JSON.parse(response.body) + + #Assert: + #The resulting JSON mast have the correct format and baseline content. body.must_be_kind_of Hash body.wont_include "errors" + body.keys.count.must_equal 2 body.keys.must_include "id" - Movie.find(body["id"]).title.must_equal "Mothlight" - body.must_include "ok" + body.keys.must_include "ok" body["ok"].must_equal true + Movie.find(body["id"]).title.must_equal "Mothlight" + + #A new movie object must be created + (after_count - before_count).must_equal 1 + + #The new object's attributes must contain the correct information. + test_movie.title.must_equal "Mothlight" + test_movie.overview.must_equal "Three life-changing minutes of dead moths." + test_movie.inventory.must_equal 27 end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ebb5ee916..79bbf62b6 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -54,16 +54,20 @@ it "has validation for release_date's status as a Date object" do - skip #THIS IS A DRAFT TEST. - day.release_date = "July Fourth, ninety-six" + day.release_date = "Jooon Forth, ninety-six" day.valid?.must_equal false day.errors.messages.must_include :release_date day.release_date = 2 day.valid?.must_equal false day.errors.messages.must_include :release_date + + day.release_date = Date.parse(1996-07-04) + day.valid?.must_equal true + day.errors.messages.wont_include :release_date + day.errors.messages.must_be_nil end it "has validation for inventory presence" do From 9cbbc9e0f24805e2f61baeba105d9110644fc13f Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Wed, 9 May 2018 10:40:19 -0700 Subject: [PATCH 43/59] cleaned up rental model and rental model tests --- app/models/application_record.rb | 16 ++++++++++++++++ app/models/rental.rb | 33 +++++++++++++++++++++++++++----- test/models/rental_test.rb | 8 +++++++- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84..ba3ef34db 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,19 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + + + end +# +# module ComparableDates +# +# def is_after_customer_registration? +# end +# end + +# class Date +# def is_after(other) +# raise if !other.is_a?(Date) && !other.is_a?(DateTime) +# return self < other +# end +# end diff --git a/app/models/rental.rb b/app/models/rental.rb index 47d51b5aa..2a62548be 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,21 +1,28 @@ class Rental < ApplicationRecord + # include ComparableDates + belongs_to :customer belongs_to :movie validate :valid_get_check_in_date + # Returns the rental checkout date as a Date. def get_check_out_date - return created_at.to_date if !created_at.nil? + return created_at.to_date end + # Returns the rental due date as a Date. def get_due_date return get_check_out_date.next_week end + # Returns 'true' if rental is overdue, meaning due date was at least one day ago. + # Otherwise, returns 'false'. def is_overdue? - return is_checked_out? && Date.today > get_due_date + return is_checked_out? && !get_due_date.future? end + # Returns 'true' if rental is checked out. Otherwise, returns 'false'. def is_checked_out? return check_in_date.nil? end @@ -28,12 +35,28 @@ def is_checked_out? private + # If check_in_date is: + # 1) not nil, + # 2) not a Date, + # 3) after today, + # 4) after checkout date (only if created_at is not nil), + # 5) after when the customer registered, or + # 6) after the movie release date def valid_get_check_in_date return if check_in_date.nil? - if check_in_date > Date.today || (!created_at.nil? && check_in_date < get_check_out_date) || - # TODO: test these last two!! - check_in_date < customer.registered_at || check_in_date < movie.release_date + if !check_in_date.is_a?(Date) || (check_in_date.future? || + (!created_at.nil? && check_in_date < get_check_out_date) || + check_in_date < customer.registered_at || + check_in_date < movie.release_date ) errors.add(:check_in_date, "Invalid check-in") end end + + def is_after_customer_registration? + return check_in_date < (customer.registered_at) + end + + def is_after_movie_release? + return check_in_date < movie.release_date + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index da3efd48f..78e7ad70e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -43,7 +43,6 @@ rental = Rental.create(info) rental.must_be :valid? rental.check_in_date.must_be_nil - end it "must allow check_in_date of today" do @@ -53,6 +52,13 @@ rental.check_in_date.must_equal Date.today end + it "must not allow a number as a date" do + info[:check_in_date] = 3 + bad_rental = Rental.create(info) + bad_rental.valid?.must_equal false + bad_rental.errors.keys.must_equal [:check_in_date] + end + it "must not allow check in date after today" do info[:check_in_date] = Date.tomorrow bad_rental = Rental.create(info) From a0a88a94043a0aee7d479a19d60e1ddee36fe8c6 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 10:45:46 -0700 Subject: [PATCH 44/59] Movie model and controller tests are now finalized, except for tests of movie relationships and the new testes that the available_inventory method will soon need. --- app/models/movie.rb | 14 +++++++++++++- test/models/movie_test.rb | 9 +++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index a60e75099..e16cde8ab 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,14 +3,26 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + validate :valid_release_date validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + def available_inventory #Note: This is a placeholder method, and it's here just so that Movie's show method will serve up the right stuff during early-wave tests. It will have to evolve in later waves. - self.inventory end + + private + + def valid_release_date + unless release_date.nil? + if !release_date.is_a?(Date) + errors.add(:release_date, "invalid release date") + end + end + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 79bbf62b6..42f431fae 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -56,6 +56,11 @@ #THIS IS A DRAFT TEST. + day.release_date = Date.parse("1996-07-04") + day.valid?.must_equal true + day.errors.messages.wont_include :release_date + day.errors.messages.must_be_empty + day.release_date = "Jooon Forth, ninety-six" day.valid?.must_equal false day.errors.messages.must_include :release_date @@ -64,10 +69,6 @@ day.valid?.must_equal false day.errors.messages.must_include :release_date - day.release_date = Date.parse(1996-07-04) - day.valid?.must_equal true - day.errors.messages.wont_include :release_date - day.errors.messages.must_be_nil end it "has validation for inventory presence" do From e2fc23ecb9c41c64155ebf8c3837baeb429ffaca Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 12:39:00 -0700 Subject: [PATCH 45/59] First relationship test for Movie model is passing, after appropriate fails. --- test/fixtures/rentals.yml | 5 +++++ test/models/movie_test.rb | 23 ++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index bc7bb02c8..694a6970d 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -9,3 +9,8 @@ grace_day: check_in_date: nil movie: day customer: grace + +ada_day: + check_in_date: nil + movie: day + customer: ada diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 42f431fae..3be08159c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -4,14 +4,31 @@ let(:movie_new) { Movie.new } let(:day) { movies(:day)} - + let(:breakfast) { movies(:breakfast)} + let(:ada) {customers(:ada)} + let(:grace_day_rental) { rentals(:grace_day)} describe "relations" do it "has many rentals" do + + ada_day_rental = Rental.new( { + check_in_date: nil, + movie: day, + customer: ada, + } + ) + + day.rentals.count.must_equal 2 + day.rentals[0].must_be_instance_of Rental + day.rentals[0].customer.id.must_equal (customers(:grace).id) + day.rentals[1].customer.id.must_equal (customers(:ada).id) + end + it "returns an empty array if it has not been rented" do + end end @@ -54,8 +71,6 @@ it "has validation for release_date's status as a Date object" do - #THIS IS A DRAFT TEST. - day.release_date = Date.parse("1996-07-04") day.valid?.must_equal true day.errors.messages.wont_include :release_date @@ -106,8 +121,6 @@ describe "available_inventory" do - let(:breakfast) { movies(:breakfast)} - it "returns the correct figure for a given movie with one or more copies available" do day.available_inventory.must_equal 10 From 43b73d420c73eae810a6a873a6eb0d0f06c61e8d Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 12:48:38 -0700 Subject: [PATCH 46/59] all tests for Movie model relationships now completed. --- test/models/movie_test.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3be08159c..195bce3b6 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,10 +3,14 @@ describe Movie do let(:movie_new) { Movie.new } - let(:day) { movies(:day)} + let(:get) { movies(:get)} let(:breakfast) { movies(:breakfast)} + let(:day) { movies(:day)} let(:ada) {customers(:ada)} + + let(:grace_day_rental) { rentals(:grace_day)} + let(:ada_get_rental) { rentals(:ada_day)} describe "relations" do @@ -27,7 +31,14 @@ end - it "returns an empty array if it has not been rented" do + it "has an empty ActiveRecord relation for 'rentals' if it hasn't even been rented" do + + # Validate the test + day.rentals.wont_be_empty + get.rentals.wont_be_empty + + #Assert + breakfast.rentals.must_be_empty end From 709c204c53a67bcb0d10b8cdeffb8548d9294757 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 13:19:46 -0700 Subject: [PATCH 47/59] refactored Movie model test with mixed succes. --- test/models/movie_test.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 195bce3b6..010fdfb19 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,26 +3,22 @@ describe Movie do let(:movie_new) { Movie.new } - let(:get) { movies(:get)} - let(:breakfast) { movies(:breakfast)} + let(:day) { movies(:day)} - let(:ada) {customers(:ada)} + let(:breakfast) { movies(:breakfast)} + let(:get) { movies(:get)} + let(:ada) {customers(:ada)} + let(:grace) {customers(:grace)} + let(:ada_get_rental) { rentals(:ada_get)} let(:grace_day_rental) { rentals(:grace_day)} - let(:ada_get_rental) { rentals(:ada_day)} + let(:ada_day_rental) { rentals(:ada_day)} describe "relations" do it "has many rentals" do - ada_day_rental = Rental.new( { - check_in_date: nil, - movie: day, - customer: ada, - } - ) - day.rentals.count.must_equal 2 day.rentals[0].must_be_instance_of Rental day.rentals[0].customer.id.must_equal (customers(:grace).id) @@ -109,6 +105,9 @@ it "has validation for inventory's status as a postive integer" do + day.inventory = 2 + day.valid?.must_equal true + day.inventory = 0 day.valid?.must_equal true @@ -135,6 +134,7 @@ it "returns the correct figure for a given movie with one or more copies available" do day.available_inventory.must_equal 10 + end it "returns the correct figure for a given movie with zero copies available" do From e7386b5d23937465f7a6ab6d69d53eb01a1737a6 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 13:47:38 -0700 Subject: [PATCH 48/59] tests for movies model method available_inventory are written, and failing appropriately. --- test/controllers/movies_controller_test.rb | 4 +- test/fixtures/rentals.yml | 5 +++ test/models/movie_test.rb | 48 +++++++++++++++++++--- 3 files changed, 50 insertions(+), 7 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index bb32b2778..1fc0027ae 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -93,11 +93,11 @@ it "must provide the correct response for a non-existent movie" do #Arrange - unmovie = movies(:after) + unmovie = movies(:backbone) unmovie.destroy #Act - get movie_url(movies(:after).id) + get movie_url(movies(:backbone).id) #Organize/interpret resulting body = JSON.parse(response.body) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 694a6970d..dc941d1b6 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -14,3 +14,8 @@ ada_day: check_in_date: nil movie: day customer: ada + +ada_after: + check_in_date: 2018-05-03 + movie: after + customer: ada diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 010fdfb19..d75855d98 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -7,13 +7,15 @@ let(:day) { movies(:day)} let(:breakfast) { movies(:breakfast)} let(:get) { movies(:get)} + let(:after) { movies(:after)} let(:ada) {customers(:ada)} let(:grace) {customers(:grace)} + let(:ada_day_rental) { rentals(:ada_day)} let(:ada_get_rental) { rentals(:ada_get)} + let(:ada_after_rental) { rentals(:ada_after)} let(:grace_day_rental) { rentals(:grace_day)} - let(:ada_day_rental) { rentals(:ada_day)} describe "relations" do @@ -131,19 +133,55 @@ describe "available_inventory" do - it "returns the correct figure for a given movie with one or more copies available" do + it "returns the correct figure for a given movie when none of the copies are checked out" do + #Validate the test + breakfast.rentals.must_be_empty + breakfast.inventory.must_equal 10 + + #Assert + day.available_inventory.must_equal 10 + + end + + it "returns the correct figure for a given movie when multiple copies are checked out" do + + #Validate the test + day.inventory.must_equal 10 + day.rentals.must_equal 2 + + ###shows that there are two open rentals + day.rentals.each do |rental| + rental.check_in_date.must_be_nil + end + + #Assert day.available_inventory.must_equal 10 end it "returns the correct figure for a given movie with zero copies available" do - #This version of this test is sort of a place-holder: Once we get checkout mechanisms working in wave 3 and later, it will have to be dramatically redone. + #Validate the test + + breakfast.rentals.must_be_empty + breakfast.inventory.must_equal 2 + + # Assert + breakfast.available_inventory.must_equal 2 + end + + it "returns the correct figure for a given movie with no current, open rentals, but which has been rented in the past" do + + #Validate the test + after.rentals.wont_be_empty + after.rentals.count.must_equal 1 + past_after_rental = after.rentals[0] + past_after_rental.check_in_date.wont_be_nil - breakfast.inventory = 0 + # Assert + after.available_inventory.must_equal 1 - breakfast.available_inventory.must_equal 0 end end From c1b5c042e1b93ea239f6a33a8a6dcee960a37b77 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 14:39:02 -0700 Subject: [PATCH 49/59] all the the tests for the Movie model method 'available_inventory' are now passing, after appropriate fails. --- app/models/movie.rb | 14 ++++++++++++-- test/fixtures/rentals.yml | 5 +++++ test/models/movie_test.rb | 35 +++++++++++++++++++++-------------- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index e16cde8ab..24c30c8d1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -11,8 +11,18 @@ class Movie < ApplicationRecord def available_inventory - #Note: This is a placeholder method, and it's here just so that Movie's show method will serve up the right stuff during early-wave tests. It will have to evolve in later waves. - self.inventory + all_rentals = self.rentals + open_rental_count = 0 + if all_rentals.count == 0 + return self.inventory + else + all_rentals.each do |rental| + if rental.check_in_date == nil + open_rental_count += 1 + end + end + end + available = self.inventory - open_rental_count end private diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc941d1b6..a32d938ac 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -19,3 +19,8 @@ ada_after: check_in_date: 2018-05-03 movie: after customer: ada + +ada_wanda: + check_in_date: nil + movie: wanda + customer: ada diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index d75855d98..f18d0eb4d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -8,14 +8,16 @@ let(:breakfast) { movies(:breakfast)} let(:get) { movies(:get)} let(:after) { movies(:after)} + let(:wanda) { movies(:wanda)} - let(:ada) {customers(:ada)} let(:grace) {customers(:grace)} + let(:ada) {customers(:ada)} + let(:grace_day_rental) { rentals(:grace_day)} let(:ada_day_rental) { rentals(:ada_day)} let(:ada_get_rental) { rentals(:ada_get)} let(:ada_after_rental) { rentals(:ada_after)} - let(:grace_day_rental) { rentals(:grace_day)} + let(:ada_wanda_rental) { rentals(:ada_wanda)} describe "relations" do @@ -137,10 +139,10 @@ #Validate the test breakfast.rentals.must_be_empty - breakfast.inventory.must_equal 10 + breakfast.inventory.must_equal 2 #Assert - day.available_inventory.must_equal 10 + breakfast.available_inventory.must_equal 2 end @@ -148,7 +150,7 @@ #Validate the test day.inventory.must_equal 10 - day.rentals.must_equal 2 + day.rentals.count.must_equal 2 ###shows that there are two open rentals day.rentals.each do |rental| @@ -156,31 +158,36 @@ end #Assert - day.available_inventory.must_equal 10 + day.available_inventory.must_equal 8 end it "returns the correct figure for a given movie with zero copies available" do - #Validate the test - - breakfast.rentals.must_be_empty - breakfast.inventory.must_equal 2 + #Validate the test and establish baseline + wanda.inventory.must_equal 1 + wanda.rentals.count.must_equal 1 + rented_wanda = wanda.rentals[0] + #### When check_in_date is nil, the movie is still checked out. + rented_wanda.check_in_date.must_be_nil # Assert - breakfast.available_inventory.must_equal 2 + wanda.available_inventory.must_equal 0 + end it "returns the correct figure for a given movie with no current, open rentals, but which has been rented in the past" do + #Validate the test after.rentals.wont_be_empty after.rentals.count.must_equal 1 - past_after_rental = after.rentals[0] - past_after_rental.check_in_date.wont_be_nil + closed_after_rental = after.rentals[0] + # having a check_in_date meams the movie has been returned. + closed_after_rental.check_in_date.wont_be_nil # Assert - after.available_inventory.must_equal 1 + after.available_inventory.must_equal 12 end From 1271dd64415db4ebf95064e962e9da19dbef8218 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Wed, 9 May 2018 14:40:47 -0700 Subject: [PATCH 50/59] initial return rental model testing --- app/models/application_record.rb | 16 --------- app/models/rental.rb | 28 ++++++++++----- test/models/rental_test.rb | 61 ++++++++++++++++++++++++++++++-- 3 files changed, 79 insertions(+), 26 deletions(-) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index ba3ef34db..10a4cba84 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,19 +1,3 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true - - - end -# -# module ComparableDates -# -# def is_after_customer_registration? -# end -# end - -# class Date -# def is_after(other) -# raise if !other.is_a?(Date) && !other.is_a?(DateTime) -# return self < other -# end -# end diff --git a/app/models/rental.rb b/app/models/rental.rb index 2a62548be..99894539b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,10 +1,13 @@ class Rental < ApplicationRecord - # include ComparableDates - belongs_to :customer belongs_to :movie + attr_readonly :created_at, :customer, :movie, :check_in_date + + # before_validation validate :valid_get_check_in_date + # validate :cannot_update, on: :return_rental + # Returns the rental checkout date as a Date. def get_check_out_date @@ -27,15 +30,24 @@ def is_checked_out? return check_in_date.nil? end - # def self.return_rental - # raise ArgumentError.new("Not checked out") if !checked_out - # checked_out = false - # movie.available_inventory += 1 - # end + def return_rental + if !is_checked_out? + raise ArgumentError.new("Cannot return an item that isn't checked out") + end + check_in_date = Date.current + end private - # If check_in_date is: +def cannot_update + puts "boo" + if !is_checked_out? + errors.add(:check_out, "Cannot return an item that isn't checked out") + end +end + + + # Adds an error message if check_in_date is: # 1) not nil, # 2) not a Date, # 3) after today, diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 78e7ad70e..1ec5fb077 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -4,7 +4,7 @@ let(:rental) { rentals(:ada_get) } let(:info) { { - check_in_date: "2018-05-07", + check_in_date: Date.current, movie: movies(:breakfast), customer: customers(:grace) } @@ -112,8 +112,8 @@ end it "initializes with is_overdue?" do + info[:check_in_date] = nil new_rental = Rental.create(info) - new_rental.update(check_in_date: nil) new_rental.is_overdue?.must_equal false end @@ -138,5 +138,62 @@ end end + # IS_CHECKED_OUT? ============================================================ + describe "is_checked_out?" do + it "has a is_checked_out?" do + rental.must_respond_to :is_checked_out? + end + + it "initializes with is_checked_out?" do + info[:check_in_date] = nil + new_rental = Rental.create(info) + new_rental.is_checked_out?.must_equal true + end + + it "is true when has a return date" do + new_rental = Rental.create(info) + new_rental.update(check_in_date: Date.current) + new_rental.is_checked_out?.must_equal false + end + end + + # RETURN_RENTAL ============================================================== + describe "return_rental" do + it "return_rental" do + rental.must_respond_to :return_rental + end + + it "must lock" do + created_at_original = rental.created_at + rental.update(check_in_date: Date.yesterday) + (created_at_original == rental.created_at).must_equal true + end + + it "initializes with return_rental" do + new_rental = Rental.create(info) + proc { + new_rental.return_rental + }.must_raise ArgumentError + end + + # it "initializes with return_rental" do + # # info[:check_in_date] = nil + # new_rental = Rental.create(info) + # puts "****" + # puts new_rental.check_in_date + # puts !new_rental.is_checked_out? + # new_rental.return_rental + # puts new_rental.is_checked_out? + # rental.valid?.must_equal false + # # new_rental.return_rental.must_equal true + # end + + # it "is true when has a return date" do + # new_rental = Rental.create(info) + # new_rental.update(check_in_date: Date.current) + # new_rental.return_rental.must_equal false + # end + end + end From f66a218d9d67eabe0726356bad1462e9e09af9f2 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Wed, 9 May 2018 17:59:22 -0700 Subject: [PATCH 51/59] added controller stuff --- app/controllers/rentals_controller.rb | 19 ++++++++++++++++++- app/models/rental.rb | 7 +++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index bacbbccc6..6789d9365 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,8 +15,25 @@ def checkout end end + def checkin + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) + if rental + puts rental.check_in_date.inspect + if !rental.is_checked_out? + render json: { errors: rental.errors.messages }, + status: :bad_request + else + rental.return_rental + rental.save + render json: {id: rental.id}, status: :ok + end + else + render json: {ok: false, errors: "Rental not found"}, status: :not_found + end + end + private def rental_params - params.require(:rental).permit(:check_in_date, :movie_id, :customer_id) + params.require(:rental).permit(:id, :check_in_date, :movie_id, :customer_id) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 99894539b..266d1efc5 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,7 +2,7 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - attr_readonly :created_at, :customer, :movie, :check_in_date + attr_readonly :created_at, :customer, :movie#, :check_in_date # before_validation validate :valid_get_check_in_date @@ -31,10 +31,13 @@ def is_checked_out? end def return_rental + puts "hiiiiii" + puts check_in_date.inspect if !is_checked_out? raise ArgumentError.new("Cannot return an item that isn't checked out") end - check_in_date = Date.current + self.check_in_date = Date.current + puts check_in_date.inspect end private From a2e4e6b8a3baf4c90b7542cbee606e85d1d1861f Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Wed, 9 May 2018 18:00:13 -0700 Subject: [PATCH 52/59] cleaned out old code --- app/controllers/rentals_controller.rb | 1 - app/models/rental.rb | 3 --- 2 files changed, 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6789d9365..17729cffc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -18,7 +18,6 @@ def checkout def checkin rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) if rental - puts rental.check_in_date.inspect if !rental.is_checked_out? render json: { errors: rental.errors.messages }, status: :bad_request diff --git a/app/models/rental.rb b/app/models/rental.rb index 266d1efc5..4d83f9baf 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -31,13 +31,10 @@ def is_checked_out? end def return_rental - puts "hiiiiii" - puts check_in_date.inspect if !is_checked_out? raise ArgumentError.new("Cannot return an item that isn't checked out") end self.check_in_date = Date.current - puts check_in_date.inspect end private From d0126a918280c19063276809cfa61e42f2c6dea6 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Wed, 9 May 2018 19:34:04 -0700 Subject: [PATCH 53/59] fixed rentals controller errors found with smoke tests --- app/controllers/rentals_controller.rb | 23 +++++++++++------------ app/models/rental.rb | 6 ++++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 17729cffc..3cfdbbee4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,31 +8,30 @@ def checkout due_date: rental.get_due_date, checked_out?: rental.is_checked_out?, overdue?: rental.is_overdue? - }, status: :ok + }, status: :ok else render json: { errors: rental.errors.messages }, - status: :bad_request + status: :bad_request end - end + end def checkin - rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) + rental = Rental.find_by(customer_id: params["customer_id"], movie_id: params["movie_id"]) if rental - if !rental.is_checked_out? - render json: { errors: rental.errors.messages }, - status: :bad_request + rental.return_rental + if rental.save + render json: {id: rental.id}, status: :ok else - rental.return_rental - rental.save - render json: {id: rental.id}, status: :ok + render json: { errors: rental.errors.messages }, + status: :bad_request end else render json: {ok: false, errors: "Rental not found"}, status: :not_found end end - private + private def rental_params - params.require(:rental).permit(:id, :check_in_date, :movie_id, :customer_id) + params.require(:rental).permit(:id, :check_in_date, :movie_id, :customer_id) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 4d83f9baf..945b83a92 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -32,10 +32,12 @@ def is_checked_out? def return_rental if !is_checked_out? - raise ArgumentError.new("Cannot return an item that isn't checked out") - end + errors.add(:check_out, "Cannot return an item that isn't checked out") + # raise ArgumentError.new("Cannot return an item that isn't checked out") + else self.check_in_date = Date.current end + end private From b671058d8bb911f15664bc00b5f99267383443d5 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Wed, 9 May 2018 19:40:38 -0700 Subject: [PATCH 54/59] Changed the movie model's strong params to make everything work. --- app/controllers/movies_controller.rb | 3 +-- test/.DS_Store | Bin 0 -> 6148 bytes 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 test/.DS_Store diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4060a6804..dc4ea615c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -34,8 +34,7 @@ def create render json: { errors: movie.errors.messages, ok: false - }, - status: :bad_request + }, status: :bad_request end end diff --git a/test/.DS_Store b/test/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Thu, 10 May 2018 09:33:23 -0700 Subject: [PATCH 55/59] fixed bug in rental model --- app/models/rental.rb | 26 ++++++++++++-------------- test/models/rental_test.rb | 6 +++--- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 945b83a92..9f7f671d2 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,12 +3,12 @@ class Rental < ApplicationRecord belongs_to :movie attr_readonly :created_at, :customer, :movie#, :check_in_date + before_update :cannot_update, on: :return_rental # before_validation validate :valid_get_check_in_date # validate :cannot_update, on: :return_rental - # Returns the rental checkout date as a Date. def get_check_out_date return created_at.to_date @@ -31,23 +31,21 @@ def is_checked_out? end def return_rental - if !is_checked_out? - errors.add(:check_out, "Cannot return an item that isn't checked out") - # raise ArgumentError.new("Cannot return an item that isn't checked out") - else - self.check_in_date = Date.current - end + # if !is_checked_out? + # errors.add(:check_out, "Cannot return an item that isn't checked out") + # else + self.check_in_date = Date.current + # end end -private + private -def cannot_update - puts "boo" - if !is_checked_out? - errors.add(:check_out, "Cannot return an item that isn't checked out") + def cannot_update + if !is_checked_out? + puts "hiiiiiii" + errors.add(:check_out, "Cannot return an item that isn't checked out") + end end -end - # Adds an error message if check_in_date is: # 1) not nil, diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1ec5fb077..6a096cb53 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -171,9 +171,9 @@ it "initializes with return_rental" do new_rental = Rental.create(info) - proc { - new_rental.return_rental - }.must_raise ArgumentError + new_rental.return_rental + new_rental.save + new_rental.errors.keys.must_equal [:check_out] end # it "initializes with return_rental" do From daadb8f0930c3ae14c12d55eb22970faf123499f Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Fri, 11 May 2018 13:22:41 -0700 Subject: [PATCH 56/59] fixed the strong params in Movie so the JSON would be properly formed. --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/movies_controller.rb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..59dd1ee152264850a9bda12586a2750618852429 GIT binary patch literal 6148 zcmeHK-EPw`6h2-`mv$g3fwW!b28oM;)=BFw5K<|f&@PY=MQ{OVOPbO}OOvWiSD+O2 zhIatofJfm8cn}@{zGHh+oR(XJkWXcQ{`rpW^SOy*A`#`eqbW59-U$2A%&(Fade+^ z(QVQr_zdN`W9k>!9A%z;)nsFa7*S&`(@#d6_bWq{AyzfOT$2KqW6g6Nj2W$sw#Z70 zN^^9=%|%zn{!XC>kJvNkCB$ZMU3!WYo?(T&hbvleOa{LK{vkb}4m}30(OMuf!=pqQ z$4{BL5`mpu&kJUgkv>_z2ctNeWV^dR#D-J4Qr>jks$0EQece4xXWh)trjxcme#x~b zes&t@^0PFJFUx-LJnGMmYd0UJN#;jMe=MD&un)?s7f}+XvvxX7!igNGt2$h_;#Q7p zJM;OS=0V-tYwj=V-hBU{QTLjSy~U#9Zr^I$KROw{dq4lM`1l3e2@^ONrCrx}0bfzL z6ym%)PU18fppE$s1RAb;AjMl_Q_mq|fwPSD3Rne91sqka@%exF=lj3uWNTIdtH6JyfGBmk zoi;+!XX{FEeAaqMCrE6}TPl<;$n{m%3w3Az+YA1 EH^mkpr~m)} literal 0 HcmV?d00001 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dc4ea615c..d2160aebd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -41,6 +41,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end From 31c19a3888e50c9c596b7e781d2bbdfed7932751 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Fri, 11 May 2018 13:29:09 -0700 Subject: [PATCH 57/59] Fixed movie controller tests to comport with change to the movie strong params. --- test/controllers/movies_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1fc0027ae..7d0836c7a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -135,7 +135,7 @@ before_count = Movie.all.count #Act - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data #Assert / Validate test must_respond_with :success @@ -170,7 +170,7 @@ movie_data[:title] = nil proc { - post movies_url, params: {movie: movie_data} + post movies_url, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request From af9c8838e2e920cd8623e8724c4f8ac0479abe93 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Fri, 11 May 2018 14:49:07 -0700 Subject: [PATCH 58/59] controller tests for customer's index method and model tests for customer's movies_checked_out method are written functionaly, and about halfway to green. --- app/controllers/customers_controller.rb | 5 +-- app/models/customer.rb | 15 ++++++++ test/controllers/customers_controller_test.rb | 37 ++++++++++++++++++- test/fixtures/customers.yml | 18 +++++++++ test/fixtures/movies.yml | 10 +++++ test/fixtures/rentals.yml | 10 +++++ test/models/customer_test.rb | 35 ++++++++++++++++++ 7 files changed, 124 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 12f3e4dc3..888d1179d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,10 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json( - only:[:id, :name, :registered_at, :postal_code, :phone]), status: :ok - # TODO: add movies_checked_out_count when rentals are made - # :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 08cda1c36..278c98955 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,6 +10,21 @@ class Customer < ApplicationRecord validates :postal_code, presence: true validates :phone, presence: true + def movies_checked_out_count + all_rentals = self.rentals + open_rentals_count = 0 + if all_rentals.count == 0 + return 0 + else + all_rentals.each do |rental| + if rental.check_in_date == nil + open_rentals_count += 1 + end + end + end + return open_rentals_count + end + private def date_in_future_or_error diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5faaaff28..59322cf11 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,10 +1,43 @@ require "test_helper" describe CustomersController do + + describe "index" do - it "must get the index" do - get customers_path + + it "have a functional route" do + get customers_url must_respond_with :ok end + + it "must return JSON" do + + get customers_url + response.header['Content-Type'].must_include 'json' + + end + + it "must return an Array of the correct length" do + + get customers_url + body = JSON.parse(response.body) + + body.must_be_kind_of Array + body.length.must_equal Customer.count + + end + + it "returns JSON with exactly the required fields" do + + required_index_keys = %w(id name movies_checked_out_count phone postal_code registered_at ) + get customers_url + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal required_index_keys + end + + end + + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 17bf4c96a..c4b904dba 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -15,3 +15,21 @@ grace: state: GA postal_code: 30064 phone: (770) 951-1599 + +dorothy: + name: Dorothy Vaughan + registered_at: Sun, 29 Apr 2018 21:40:20 -0700 + address: 3 Surd Drive + city: Hampton + state: VA + postal_code: 23668 + phone: (757) 727-2121 + +heddy: + name: Heddy LaMarr + registered_at: Sat, 28 Apr 2018 21:40:20 -0700 + address: 12 Mullholland Drive + city: Los Angeles + state: CA + postal_code: 90036 + phone: (323) 922-3441 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 5e5e9a280..fa7584bba 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -55,3 +55,13 @@ lights: overview: The Little Tramp's most heartbreaking work. This cut lacks the legendary drain-poking scene. release_date: 1931-03-07 inventory: 1 +fast: + title: Fast, Cheap, & Out-Of-Control + overview: Errol Morris spotlights a collection of charming obsessives. + release_date: 1997-09-07 + inventory: 2 +paris: + title: Paris is Burning + overview: profoundly influential documentary about the underground, gay ball scene in NYC + release_date: 1991-08-16 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a32d938ac..3267b1a70 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -24,3 +24,13 @@ ada_wanda: check_in_date: nil movie: wanda customer: ada + +dorothy_fast: + check_in_date: 2018-05-04 + movie: fast + customer: dorothy + +dorothy_paris: + check_in_date: 2018-04-30 + movie: paris + customer: dorothy diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3cd7d240e..4e0d70cc8 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -187,4 +187,39 @@ end end # end of describe "validate" + + describe "methods" do + + let(:ada) { customers(:ada) } + let(:grace) { customers(:grace) } + let(:dorothy) { customers(:dorothy) } + let(:heddy) { customers(:heddy) } + + describe "movies_checked_out_count" do + + it "must return zero for a customer who has never checked out a movie" do + + heddy.movies_checked_out_count.must_equal 0 + end + + it "returns zero for a customer who has checked out movies in the past, but who has no current, open rentals." do + + dorothy.movies_checked_out_count.must_equal 0 + end + + it "returns the currect number for a customer who has checked out movies in the past, and who has current, open rentals" do + + ada.movies_checked_out_count.must_equal 4 + + end + + it "returns the currect number for a customer who has one or more current, open rentals, but who has never returned anything" do + + grace.movies_checked_out_count.must_equal 1 + + end + + end + + end end From 572e9c84f5e77b8f16a9d4bd2434ec3f92ab0920 Mon Sep 17 00:00:00 2001 From: Victoria Garcia Date: Fri, 11 May 2018 15:44:26 -0700 Subject: [PATCH 59/59] all tests for the customers controller and model are now passing, after appropriate fails. --- app/controllers/customers_controller.rb | 18 +++++++++++++++++- test/controllers/customers_controller_test.rb | 2 +- test/models/customer_test.rb | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 888d1179d..d68f18ef9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,24 @@ class CustomersController < ApplicationController + # def index + # customers = Customer.all + # render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + # end + def index + customer_info_array = [] customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + customers.each do |customer| + customer_hash = { + id: customer.id, + name: customer.name, + registered_at: customer.registered_at, + postal_code: customer.postal_code, + phone: customer.phone, + movies_checked_out_count: customer.movies_checked_out_count} + customer_info_array << customer_hash + end + render json: customer_info_array.as_json, status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 59322cf11..c566ae7b0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,7 +29,7 @@ it "returns JSON with exactly the required fields" do - required_index_keys = %w(id name movies_checked_out_count phone postal_code registered_at ) + required_index_keys = %w(id movies_checked_out_count name phone postal_code registered_at ) get customers_url body = JSON.parse(response.body) body.each do |customer| diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 4e0d70cc8..ed3e2d5d8 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -209,7 +209,7 @@ it "returns the currect number for a customer who has checked out movies in the past, and who has current, open rentals" do - ada.movies_checked_out_count.must_equal 4 + ada.movies_checked_out_count.must_equal 3 end